feat(mobile): port worktree setup progress and agent handoff - #12177
Merged
juliusmarminge merged 1 commit intoSep 17, 2026
Merged
Conversation
juliusmarminge
added this pull request to stack #12178
September 17, 2026 01:32
github-actions
Bot
added
vouch:trusted
juliusmarminge
marked this pull request as ready for review
September 17, 2026 01:33
Contributor
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: unavailable · PR result: Scenario and decoded snapshot size10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
![macroscopeapp[bot]](https://avatars.githubusercontent.com/in/900172?s=60&v=4){kind=small}
Contributor
ApprovabilityVerdict: Not approved Macroscope's review found this PR not approvable — This PR adds substantial mobile worktree setup UI and changes bootstrap cancellation and local handoff behavior across mobile and shared client-runtime code. The workflow is not a small isolated change, and unresolved high-severity findings concern whether the local fallback is exposed and actually enqueued. Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more. |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Team Run ID: 📒 Files selected for processing (14)
Included review availability: Your plan provides up to 10 included reviews per hour; 8 remain after this review. 📝 WalkthroughWalkthroughChangesThe change centralizes worktree setup state resolution, adds mobile setup progress and action UI, integrates setup content into thread feeds, and reuses the runtime helpers in web code. Worktree setup integration
Priority: ➖ Normal Estimated code review effort: 4 (Complex) | ~45 minutes Change: Feature Suggested reviewers: Sequence Diagram(s)sequenceDiagram
participant ThreadRouteScreen
participant useWorktreeSetup
participant ThreadDetailScreen
participant ThreadFeed
participant WorktreeSetupCard
ThreadRouteScreen->>useWorktreeSetup: resolve live and recorded setup state
useWorktreeSetup-->>ThreadRouteScreen: return visible setup snapshot
ThreadRouteScreen->>ThreadDetailScreen: pass snapshot and setup actions
ThreadDetailScreen->>ThreadFeed: pass setup data and timing
ThreadFeed->>WorktreeSetupCard: render setup content at feed anchor
Merge Risk: ⚪ Minimal · up to No actionable current-head defect remains; the change is ready for normal merge checks. 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
Full details: Docstring CoverageExplanation Docstring coverage is 30.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 20 functions across 13 files. (1 skipped: 1 unsupported.)
✨ Finishing Touches 💡 1📝 Generate docstrings 💡
🧪 Generate unit tests (beta)
Comment |
2 tasks
github-actions Bot
added a commit
to omarcresp/t3code-flake
that referenced
this pull request
Sep 17, 2026
## What's Changed * fix(server): settle cancelled worktree setup before rollback by @juliusmarminge in pingdotgg/t3code#12176 * feat(mobile): port worktree setup progress and agent handoff by @juliusmarminge in pingdotgg/t3code#12177 * fix(server): flush checkpoint objects and refs before publishing them by @Mnigos in pingdotgg/t3code#10944 * fix(server): keep ready checkpoints when a later placeholder arrives by @Adolanium in pingdotgg/t3code#8432 * fix(server): keep VCS waits from blocking turn completion by @Vrtak-CZ in pingdotgg/t3code#11970 * fix(web): keep header spacing stable when sidebar drawer opens by @flamboh in pingdotgg/t3code#12162 * fix(web): fall back when pull request avatars fail by @tastelessjolt in pingdotgg/t3code#11728 * feat(web): enable rich text composer by default by @juliusmarminge in pingdotgg/t3code#12160 * feat(web): make keybindings searchable from settings search by @maria-rcks in pingdotgg/t3code#12175 * fix(web): preserve thread reading positions by @maria-rcks in pingdotgg/t3code#12144 * fix(diff): collapse files by default by @maria-rcks in pingdotgg/t3code#12190 * fix(web): folder links from chat open the file tree instead of a broken preview by @pc-style in pingdotgg/t3code#10909 * feat(web): command palette search matches thread IDs by @saphid in pingdotgg/t3code#11185 * fix(web): align notification icons with titles by @maria-rcks in pingdotgg/t3code#12202 * fix(skills): support unicode currency symbols as skill aliases by @WilgotM in pingdotgg/t3code#12098 * feat(settings): add automatic storage cleanup per machine and project by @maria-rcks in pingdotgg/t3code#11598 * feat(web): command palette finds the pull requests and usage pages by @flamboh in pingdotgg/t3code#12211 * feat(web): start new threads with multiple models in separate worktrees by @maria-rcks in pingdotgg/t3code#12179 ## New Contributors * @Adolanium made their first contribution in pingdotgg/t3code#8432 * @Vrtak-CZ made their first contribution in pingdotgg/t3code#11970 * @pc-style made their first contribution in pingdotgg/t3code#10909 **Full Changelog**: pingdotgg/t3code@v0.0.43-nightly.20260917.1837...v0.0.43-nightly.20260917.1851 Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.43-nightly.20260917.1851
aorwall
added a commit
to aorwall/t3code
that referenced
this pull request
Sep 18, 2026
Merges `pingdotgg/t3code` `6d1d549441` into the fork, from base `0bf2d6b010` — 50 commits. - **Landed:** 410 files against 407 in the upstream range; the gap of 3 is `docs/fork/gaps.md`, `inventory.json` and `upstream-merge-log.md`. Everything in the range landed. - **Fork delta:** 777 files. - **Verification:** all 9 `verify.mjs` checks pass, tests green in all 15 packages. - **Unsupported methods:** ADD 0, DROP 0 — `packages/contracts/src/rpc.ts` and `auth.ts` are untouched. Upstream added no WebSocket method in this range. ## The one that mattered Upstream's pingdotgg#12015 moved the **entire body of the thread route** out of `apps/web/src/routes/_chat.$environmentId.$threadId.tsx` and into a new upstream file, `apps/web/src/components/ThreadRouteView.tsx`, rendered by the `_chat` layout so a draft's promotion keeps the same `ChatView` mounted. The route file is now a seven-line stub. Three fork deltas lived in that file. They moved with it: `useAdoptedThread`, `useAutoFollowThread` and the `serverThreadAwaitingFirstAnswer` argument to `resolveThreadRouteRenderState`, all reading `target.kind === "server" ? target.threadRef : null` — a draft's reserved ref is the viewer's own work and the listing carries it without being asked. The `unlisted-thread-adoption` and `thread-follow` inventory entries were re-pointed at the new file. The fork's own delta guard is what caught this. The merge was clean and typecheck was green; `features.test.ts` failed because `useAutoFollowThread` was no longer in a file the inventory said it had to be in. ## Conflicts 8 files, each resolved with the verdict `preflight.mjs` printed. Details in the tracker entry; the short form: | file | verdict | resolution | | --- | --- | --- | | `routes/_chat.$environmentId.$threadId.tsx` | unlisted | took upstream's stub, deltas relocated (above) | | `chat/MessagesTimeline.tsx` | `message-origin-upstream-files` | both sides of `TimelineRowActivityState`, its memo and its deps merged; dropped upstream's now-unused `GitPullRequestIcon` | | `ThreadStatusIndicators.tsx` | `thread-status-indicators` | fork's memo above upstream's early return — hooks before any conditional `return null` | | `settings/ProviderInstanceCard.tsx` | unlisted, in `moatless-provider-auth` | kept the `FEATURES.providerConfiguration` ternary, took upstream's container-query classNames inside it | | `settings/SettingsPanels.tsx` | `settings-surface-gates` | re-stated the fork's browser clause onto upstream's rewritten `proactive-panels` text | | `BranchToolbar.tsx` | `branch-toolbar-gates` | import block, both sides kept | | `RightPanelTabs.tsx` | `right-panel-surfaces` | import block, both sides kept | | `pnpm-lock.yaml` | `theirs — lockfile` | `--theirs` then `vp i`, re-derived lockfile committed | ## Path policy closed a hole `resolution-check` listed eight unlisted paths both sides changed; **seven carried a real fork delta**, so next merge's `theirs` fallback would have dropped them silently. All seven are now listed — five new entries (`command-palette-gates`, `diff-panel-gates`, `provider-settings-gates`, `chat-layout-route`, `client-runtime-exports`) plus `rightPanelStore.test.ts` added to `right-panel-surfaces`. The eighth is the thread route stub, which resolved to upstream byte for byte. ## Usable as-is Client work that runs against the Moatless backend today: - **pingdotgg#12015** worktree setup card no longer flashes or shifts (the relocation above) · **pingdotgg#12144** thread reading positions are preserved · **pingdotgg#12162** header spacing stays stable when the sidebar drawer opens - **pingdotgg#8641** timestamps on tool rows and turn folds · **pingdotgg#12152** those timestamps sit before the disclosure chevron · **pingdotgg#12147** thoughts group into the changing tool activity line - **pingdotgg#12075** send-shortcut and follow-up controls · **pingdotgg#12160** rich text composer on by default · **pingdotgg#12165** composer task rows aligned · **pingdotgg#11787** tooltips on the composer's environment and workspace controls · **pingdotgg#12082** simpler agent approval prompts - **pingdotgg#12139** diff panel defaults to the working tree · **pingdotgg#12190** diff files collapse by default · **pingdotgg#12142** a linked pull request wins over an automatic diff - **pingdotgg#12143** themes picked from chat with colour previews · **pingdotgg#12138** provider settings adapt to content width · **pingdotgg#12167** follow-up and license controls aligned - **pingdotgg#12026** unsupported environments render as neutral rows with their machine icon · **pingdotgg#12030** a discovered machine's icon survives a relay refresh · **pingdotgg#12001** dropped folders become path chips locally and are refused on remote environments - **pingdotgg#11144** pull-request icon state centralised — a refactor the fork's own badge filtering now rides Not fork surfaces, landed for completeness: the mobile work (pingdotgg#11841, pingdotgg#12169, pingdotgg#12177, version bump), the CLI installer progress bar (pingdotgg#12044), docs (pingdotgg#11696), release chores and the Fable 5.1 badge (pingdotgg#12173). ## Unsupported in Moatless / needs implementation - **Pull request surface** — `FEATURES.pullRequestSurface` is off, so none of this merge's pull-request work is reachable: **pingdotgg#11994** (submit PR comments with Cmd/Ctrl+Enter), **pingdotgg#12150** (comments easier to scan, `apps/web/src/components/pullRequest/**` plus a `pullRequest.ts` contract field), **pingdotgg#12168** (cached GitHub PR details reused across entry points), **pingdotgg#12125** and **pingdotgg#11728** (author avatars and their fallback). **pingdotgg#11706** needs backend work on top: private-repository media in PR tabs goes through a new `packages/contracts/src/assets.ts` proxy that Moatless would have to serve. Opening the surface means deleting the `pullRequestSurface` entry and its gates, and dispatching `pullRequests.list` / `.detail` / `.activity` — only `pullRequests.summary` is served today. - **Keybindings settings page** — **pingdotgg#12175** turns every keybinding command into a searchable settings row pointing at `/settings/keybindings`, which `FEATURES.serverAdministration` keeps out of the sidebar and redirects on a typed URL. The rows still match in settings search and land on that redirect. Left as-is this merge — it is the same shape as the six `snap-shot-*` rows that have always done this, and the one-line fix (a `settingsPathEnabled(item.to)` filter in `filterAvailableSettingsSearchItems`) is a behaviour change that belongs outside a merge. Recorded in `gaps.md`. Closes properly when `server.upsertKeybinding` / `removeKeybinding` are dispatched. - **Device hub** — **pingdotgg#12017** (detect unsupported legacy Android command-line tools) and **pingdotgg#12033** (resolve Node for standalone helper scripts) are both `apps/server/src/device/**`. `FEATURES.deviceHub` is off and Moatless runs no device host at all, so there is nothing to do and nothing to reproduce. ## Backend behavior to consider reproducing in Moatless All recorded in `docs/fork/gaps.md`; nothing in this repository holds them open. Checkpoint and turn path, under _Runtime fixes upstream made to its own server_: - **pingdotgg#12154** keep large sparse checkouts on the fast checkpoint path — streams `git ls-files --full-name --sparse -z -v` under a 4 KiB cap and pins `sparse.expectFilesOutsideOfPatterns=false`. Without it a sparse checkout large enough to blow the output limit drops to the slow path on every checkpoint. - **pingdotgg#10944** flush checkpoint objects and refs before publishing them — otherwise a reader that acts on the announcement can find a ref pointing at an object that is not there yet. Rare, unreproducible, permanent when it lands. - **pingdotgg#8432** keep a ready checkpoint when a later placeholder arrives (`ProjectionPipeline.ts`) — the symptom is a checkpoint reverting to pending and never coming back. - **pingdotgg#11970** keep VCS waits from blocking turn completion (`ProviderRuntimeIngestion.ts`, `decider.ts`) — a slow git call between the provider's last event and the turn being marked done. Slower in a sandbox than upstream. Settlement, under _Settlement rules Moatless owns_: - **pingdotgg#12161** settle on the `thread.pull-request-linked` / `-synced` event with a per-thread sweep rather than waiting for the next periodic one. - **pingdotgg#12176** make the cancellation path uninterruptible around record-and-rollback, so a cancelled worktree setup records its settlement instead of being left mid-setup. Client features that are inert until the backend emits or honours something: - **pingdotgg#11784** provider thinking traces — `orchestration` gained a `reasoning` message role and `thread.message.reasoning.delta` / `.complete` commands behind a `reasoningMessages: true` opt-in on subscribe. The client renders them when they arrive; Moatless emits none, so there are no traces. - **pingdotgg#10822** complete counts and progressive large diffs — `review.getDiffPreview` gained an optional `file` input (one file's patch) and an optional `files` stat array ("absent on older servers"). Moatless dispatches the method and honours neither, so large diffs stay truncated with incomplete counts. - **pingdotgg#11519** native provider slash commands, exposed server-side and consumed by the mobile client. - **pingdotgg#12115** OpenCode Go, Cursor and Grok subscription limits in the usage scan. ## Verification `tripwires`, `duplicate-adds`, `resolution-check`, `inventory-check`, `unsupported-methods`, `lockfile`, `fmt:check`, `lint` and `typecheck` all pass; tests pass in all 15 packages. Two failures were found and fixed on the way: - `TS2552: Cannot find name 'label'` in `ThreadStatusIndicators.tsx` — pingdotgg#11104/pingdotgg#11180 hoisted `label` onto the presentation object and the fork's multi-link popover branch still read the removed local. - The delta-guard test failure described above. Two operational notes for the next run are in the tracker entry: `vp i` needs `NODE_OPTIONS=--max-old-space-size=6144` in this sandbox, and `--force-with-lease` needs the explicit `<ref>:<sha>` form with the SHA read from `git ls-remote`, because this clone only fetches `main` and the branch has no lease-eligible tracking ref. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- Moatless task: https://moatless.soaplabstest.com/tasks/e3e17736-1c3d-4873-b9af-c434fd31b003
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Mobile only reported “Setting up worktree…” during a task’s worktree bootstrap. It now shows the four setup stages beneath the working header, with timing and checkout progress, and a Details trigger that opens a native sheet with setup script output. iOS uses a UIKit navigation bar with Done; Android uses a native Material bottom sheet. Cancellation and Work locally remain in the sheet.
Match the web handoff: once the agent’s turn is live, the stage list collapses. A setup script that continues in the background moves into a small header control that opens Details. A clean finish removes setup; failures stay reachable. The working pill remains during agent work and is suppressed only while the setup header owns progress. Reuse the existing web visibility rules through client-runtime without changing web behavior.
Validation: 383 focused mobile and web behavior tests pass; mobile, web, and client-runtime typechecks pass; targeted lint has no errors. React Doctor reports no errors (91/100, four warnings about branching and the fixed four-row sheet). The maintainer verified the preview build on a physical iPhone and confirmed the final handoff behavior works. Cancellation settlement is covered separately by the lower PR.
UI evidence: the maintainer explicitly waived fresh matching base/head screenshots and the interaction recording after verifying the preview on a physical iPhone. The earlier simulator artifacts are unavailable and are not being presented as current evidence.
Implemented with GPT-6 in Codex.
Summary by CodeRabbit
New Features
Bug Fixes