Skip to content

fix(worktrees): accept messages while the default base loads - #82

Draft
Mjones13 wants to merge 2 commits into
work/jones-code-branding-stack-20261004from
work/graceful-worktree-start-stack-20261004
Draft

Mjones13 wants to merge 2 commits into
work/jones-code-branding-stack-20261004from
work/graceful-worktree-start-stack-20261004

Conversation

@Mjones13

@Mjones13 Mjones13 commented Oct 4, 2026 •

Copy link
Copy Markdown
Contributor

Sending the first message in New worktree mode should accept the message while the default base loads. This ports the completed graceful-start fix onto the new orchestrator: an omitted base resolves during background launch preparation, explicit branch choices stay intact, and older v2 servers receive a client-resolved base.

Web/desktop single- and multi-model sends, mobile queued sends, duplicate-tap protection and scheduled-task automatic-base roundtrips are covered. Fetched origin commit pinning uses one exact lookup; actual startup time savings remain unmeasured.

Draft checkpoint — do not merge. This PR targets #83 (work/jones-code-branding-stack-20261004) at f4df22e091cbdcd38837560984aeb6ced498dc81. Landing order is #77 → #78 → #83 → #82 after the parent integration is complete and checks are refreshed. Parent branches remain unchanged; this is a dependency chain expressed through PR bases.

Current head: 3646c69a0568def26dbacdf4ace736ecc9d5e447, a normal merge of the previous fix head 1f20e614d0f8aeed228c51e1525d06a097832a4a and the exact #83 head. Integration was conflict-free, with no history rewrite. Both contributing layer diffs are byte-identical to their originals; the comparison against #83 contains the same 42 fix paths as before.

Validation of the combined source:

  • 737 focused tests passed across 20 modules: the 17 runnable worktree-fix modules and three desktop identity/packaging modules. The packaging suite passed after linking its already-installed declared dependencies into this worktree. The inherited T3_SERVICE_LAUNCHER_CONTEXT was removed only from test children.
  • Three backend suites remain blocked by parent integration: ThreadLaunchService, GitWorkflowService, and server. Their stale native-repository imports were observed at the previous fix head; the blocking source is unchanged in this restack. The new server launch cases remain unverified.
  • Previous fix-head affected typechecks failed on both parent and candidate with matching error counts: contracts 8, shared 1, client-runtime 15, web 84, mobile 11, server 5360. These are prior-head evidence, not new-head typecheck results. Scoped lint passed with warnings at that previous head; the fix source is unchanged. New-head diff and layer-preservation checks passed.
  • The normal original commit hook reformatted previously unformatted portions of touched parent files, particularly server.test.ts; this formatting remains part of the unchanged fix layer.

Source fix: e2830622c3d1a2adf91d49cbdb9fd7270c5e477e; its recorded 379 passing tests apply to the earlier v1 implementation.

Live UI interaction, screenshots, full-stack build readiness and installed-runtime behavior are unverified. No merge or deployment occurred.

Contributing thread: 819ef712-90b8-47c6-b762-0b12d2486554, graceful worktree setup; coordinator owns publication and the isolated task worktree.

Original implementation: Jace Opus 5.5/high and Astra/xhigh. V2 integration: Astra/xhigh, Sol/xhigh client builders, and Jace Opus 5.5/high read-only assessment, through T3 Code and the Codex harness.


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

Adapt the original e2830622c graceful-start fix to the v2 launch API on
PR78. Resolve an omitted worktree base after message acceptance, preserve
explicit choices, retain older-server fallback, and capture mobile sends
synchronously. Pin the fetched origin commit with one exact lookup.

Validation: 647 distinct affected tests passed; scoped lint passed with
warnings. Three backend suites cannot load because the parent retains
stale native-creation imports. Affected typechecks fail on both parent
and candidate with matching error counts. No live UI or runtime validation.

Stack parent: 76a459d (PR78).
No merge or deployment authorized.
Integrate PR83 at f4df22e without rewriting either branch. The merge was conflict-free; preserve the worktree fix and branding changes.

Validation: 737 focused tests passed across 20 modules. Existing parent backend import and typecheck blockers remain documented. No GitHub PR merge or deployment.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant