fix(vcs): name the branch-already-checked-out collision - #317

Draft

patroza wants to merge 93 commits into

fork/changesfrom

feat/worktrees-never-use-default-branch

Commits on Aug 4, 2026

chore(fork-base): fork workflows, stack tools, and docs
github-actions[bot]
committed
134fb81
feat(tim): import tim-smart/t3code#4

tim-smart
authored and
github-actions[bot]
committed
95b1a72
feat(tim): import tim-smart/t3code#5

tim-smart
authored and
github-actions[bot]
committed
a5a420a
feat(tim): import tim-smart/t3code#6

tim-smart
authored and
github-actions[bot]
committed
bdbf176
feat(tim): import tim-smart/t3code#7

tim-smart
authored and
github-actions[bot]
committed
58deb5f
feat(tim): import tim-smart/t3code#8

tim-smart
authored and
github-actions[bot]
committed
7343b7b
feat(tim): import tim-smart/t3code#9

tim-smart
authored and
github-actions[bot]
committed
974887c
feat(tim): import tim-smart/t3code#10

tim-smart
authored and
github-actions[bot]
committed
01a5c1e
feat(tim): import tim-smart/t3code#11

tim-smart
authored and
github-actions[bot]
committed
77ce384
feat(tim): import tim-smart/t3code#12

tim-smart
authored and
github-actions[bot]
committed
9f9948a
feat(tim): import tim-smart/t3code#13

tim-smart
authored and
github-actions[bot]
committed
74014e2
feat(tim): import tim-smart/t3code#14

tim-smart
authored and
github-actions[bot]
committed
837813f
feat(tim): import tim-smart/t3code#15

tim-smart
authored and
github-actions[bot]
committed
3e7efdf
feat(tim): import tim-smart/t3code#16

tim-smart
authored and
github-actions[bot]
committed
61bc477
feat(tim): import tim-smart/t3code#17

tim-smart
authored and
github-actions[bot]
committed
b208d1b
test(tim-compat): gate macOS bundle fixture to Darwin

patroza
authored and
github-actions[bot]
committed
4cded7e
fix(tim-compat): avoid plutil for custom open-with apps

patroza
authored and
github-actions[bot]
committed
2adb99d
fix(tim-compat): product-merge VCS #4727 with fork failureKind; green tip
github-actions[bot]
committed
83af061
fix(tim): restore resource telemetry join + TRACE2 hook exits
github-actions[bot]
committed
0cba380
fix(tim): settings search test after worktree-confirm catalog entry
github-actions[bot]
committed
3018b8d
chore: initialize upstream candidate registry

patroza
authored and
github-actions[bot]
committed
980221b
perf: import bounded web thread history (upstream #4018) (#29)

patroza
authored and
github-actions[bot]
committed
580ae52
perf: import mobile pagination and bounded replay (upstream #3510) (#35)

patroza
authored and
github-actions[bot]
committed
4eee93a
perf: import bounded long-lived state (upstream #4176) (#34)

authored and
github-actions[bot]
committed
f78195c
feat(web): import answered question timeline (upstream #4506) (#44)

patroza
authored and
github-actions[bot]
committed
59d8ed2
feat(orchestrator): import upstream follow-up queue (#4245) (#63)

patroza
authored and
github-actions[bot]
committed
cd5dafa
fix(client-runtime): re-read network status when the app resumes (upstream #4528)

patroza
authored and
github-actions[bot]
committed
e302907
perf(server): compress and cache packaged web assets (upstream #4516)

patroza
authored and
github-actions[bot]
committed
ab17ec8
perf(server): back off repeated checkpoint capture failures (upstream #4517)

patroza
authored and
github-actions[bot]
committed
f93c915
fix(server): preserve manually renamed thread titles (upstream #4558)

patroza
authored and
github-actions[bot]
committed
cb3b970
fix(candidates): rejoin follow-up queue types after tim tip green
github-actions[bot]
committed
74a5478
fix(candidates): expect thread.unsnoozed on settled turn starts
github-actions[bot]
committed
8dd6229
fix(candidates): align stale-cursor test with #5147 THREAD_RESUME_MAX_GAP
github-actions[bot]
committed
af4fea3
fix(candidates): accept interleaved sync/live after stale-cursor snapshot
github-actions[bot]
committed
d8b8d75
fix(candidates): restore SidebarV2 terminal status after restack
github-actions[bot]
committed
88da306
chore(fork): stack docs, overlays, tooling, CI, and workspace
github-actions[bot]
committed
163e7d0
feat(contracts): fork protocol and settings schema extensions
github-actions[bot]
committed
3227c20
feat(shared): shared helpers and Hermes lint guards
github-actions[bot]
committed
bafb366
feat(client-runtime): reconnect diagnostics, VCS actions, and list state
github-actions[bot]
committed
ed68534
feat(packages): ssh, tailscale, and effect-acp fork deltas
github-actions[bot]
committed
682b3ef
feat(server): queue, recovery, VCS, Jira, orchestration, and RPC auth
github-actions[bot]
committed
080c393
feat(web): sidebar, composer, timeline, search, and chrome fork product
github-actions[bot]
committed
944d1d3
feat(mobile): home modes, board, queue composer, and scroll baseline
github-actions[bot]
committed
a10ec04
feat(desktop): packaging, open-with, and backend ownership deltas
github-actions[bot]
committed
a962b7b
fix(desktop): drop obsolete requestSingleInstanceLock from update tests
github-actions[bot]
committed
439d6a0
fix(mobile,desktop): restore typecheck-green home header and update tests
github-actions[bot]
committed
fa90d1e
fix(web): isolate ProjectFavicon test so module mocks apply
github-actions[bot]
committed
f763ab0
ci(compose): run only on merges, not branch pushes
github-actions[bot]
committed
17321e0
feat(settings): default new threads to new worktree from origin (#252)

authored and
github-actions[bot]
committed
8c61eb4
ci(fork): disable Blacksmith CI path; green Tim/candidates via Fork CI
github-actions[bot]
committed
9f45178
feat(stack): introduce fork/base for fork-only CI plumbing
github-actions[bot]
committed
647cadf
fix(stack): own VS Code build task under vscode overlay
github-actions[bot]
committed
3847488
fix(desktop): restore dist:desktop:linux:dir packaging script (#258)

patroza
and
github-actions[bot]
committed
d0d649b
fix(grok): always pin Build to agent mode, never leave ask (#260)

patroza
and
github-actions[bot]
committed
1e1a4b1
fix(mobile): unique markdown table cell keys to stop render thrash (#261)

patroza
and
github-actions[bot]
committed
46f7df5
fix(web): reload on stale lazy-chunk load after deploy (#263)

authored and
github-actions[bot]
committed
38ed74f
fix(mobile): hard-unique markdown table cell keys (no table_cell:0:0) (#264)

patroza
and
github-actions[bot]
committed
5e546c7
fix(mobile): stop thread outbox drain spin on reconnect (#265)eeeeeeee

patroza
and
github-actions[bot]
committed
ba2e5da
feat(web): move message deep-link wiring onto fork/changes (#267)

patroza
and
github-actions[bot]
committed
d35922c
fix(web): open `?thread=` deep links instead of a new draft (#270)

authored and
github-actions[bot]
committed
2f32479
fix(mobile): ship EAS OTA when Free plan build quota is exhausted (#271)

patroza
and
github-actions[bot]
committed
87a555a
fix(web): deep-link open without waiting on shell membership (#272)

authored and
github-actions[bot]
committed
9756b9e
fix(stack): auto-resolve app.config overlay rebase conflicts (#274)

authored and
github-actions[bot]
committed
9c34e1f
fix(web): green SidebarV2 after restack onto candidates
github-actions[bot]
committed
153174f
fix(stack): green changes tip after restack
github-actions[bot]
committed
11eba7a
fix(mobile): align list snooze API after candidates restack
github-actions[bot]
committed
a966882
fix(server): durable restartRecovery for post-deploy turn resume (#282)

patroza
and
github-actions[bot]
committed
11c4402
feat(mobile): render settled threads as slim history rows (#283)

omegent-app[bot]
authored and
github-actions[bot]
committed
5773f2b
feat(server): blocking lifecycle scripts before worktree removal (#284)

authored and
github-actions[bot]
committed
dee36d6
ci: add one-shot deploy-key helper to force-update overlay tips (#286)

authored and
github-actions[bot]
committed
6381dac
fix(server): bound provider control commands (#288)

patroza
and
github-actions[bot]
committed
1f1e1a9
feat(server): isolate provider commands by thread (#289)

patroza
and
github-actions[bot]
committed
3dfe045
fix(server): retain Grok notification consumer for session (#291)

patroza
and
github-actions[bot]
committed
10124b6
feat(tooling): agent ship gate with draft-free push and pr:ready (#290)

authored and
github-actions[bot]
committed
ce330c9
feat(web): proactive reload affordance after web hot-swap (draft) (#294)

authored and
github-actions[bot]
committed
a94ed23
feat(tooling): shared-hooks dir so `git worktree add` sets up node_modules on any host (#295)

authored and
github-actions[bot]
committed
c81f6ae
feat(web): copy thread ID from sidebar v2 menus (#297)

authored and
github-actions[bot]
committed
0cf23ba
feat(server): include T3 thread links in Jira replies (#298)

authored and
github-actions[bot]
committed
366817b
feat(server): make web-asset serving hot-swap safe + classify web-only deploys (#293)

authored and
github-actions[bot]
committed
e71cf66
feat(server): reap idle dev stacks from a level-triggered sweep (#296)

authored and
github-actions[bot]
committed
d9356c1
fix(web): align sidebar v1 hide-settled with PR auto-settle (#299)

omegent-app[bot]
authored and
github-actions[bot]
committed
cf32ff1
Use repository-owned native Git hooks (#300)

authored and
github-actions[bot]
committed
3479290
fix(mobile): tolerate EAS CLI notices in --json output (#301)

authored and
github-actions[bot]
committed
c251bf6
Await repository preparation before worktree handoff (#303)

authored and
github-actions[bot]
committed
b41c807
fix(agent): gate undrafting a PR instead of refusing it (#302)

authored and
github-actions[bot]
committed
9a42ebc
test(stack): stop the git fixtures inheriting the caller's repository (#304)

committed
3a9751b
fix(agent): run the pre-push gate without pnpm exec (#305)

committed
a979f68
fix(vcs): treat bare repositories as valid worktree sources (#307)

patroza
and
github-actions[bot]
committed
ce7be30
fix(desktop): isolate DesktopPreReadyPlatform electron mock test
github-actions[bot]
committed
aba397c
fix(agent): static pre-push gate on draft and no-PR pushes (#311)

patroza
and
github-actions[bot]
authored
3e71802
fix(hooks): wipe TS project emit on branch checkout (#308)

patroza
and
github-actions[bot]
authored
a167af1
fix(server): do not block command readiness on recovery turns (#313)

patroza
and
github-actions[bot]
authored
c1d5d69
fix(vcs): name the branch-already-checked-out collision

github-actions[bot]
and
claude
committed
93e282c