[mohan6623]

Claude Code resolved the conflicts in this merge of upstream v0.1.7-nightly.20261104.4151. The pre-commit hook and typecheck passed.

The sync merges this PR by itself, which builds and publishes the update.

Claude's summary

The merge of v0.1.7-nightly.20261104.4151 is fully resolved and staged. Typecheck has 0 errors, format, lint and knip pass on the staged files, and the unit tests of the changed files pass. I have not committed or pushed. One gap: the web browser tests couldn't run here because the machine has no Chromium.

Conflicts

• ComposerContextPermissions.tsx and ComposerPermissionsSection.browser.test.tsx: the fork had deleted both files when it went back to its own composer. Upstream had changed them to open the Full access menu straight from the context strip (feat(web): open full access menu from the new thread context strip pingdotgg/t3code#30275). I kept them deleted, because the fork has its own Full access chip.
• ChatView.tsx: kept the fork's import and its context-strip props (composerControlsHostRef, contextStripVisible, trailingContent={composerUsageBadge}) in place of upstream's permissions button. Upstream's other ChatView changes merged on their own: the hosted-app link in Copy thread, and environmentId on the banner lane.
• runtimeModeConfig.ts: kept the fork's Full access icon and added upstream's new resolveRuntimeModeOptions helper. I left out upstream's resolveCompatibleRuntimeMode, since nothing in the fork uses it any more.
• ChatComposer.tsx: the fork's imports, plus resolveRuntimeModeOptions, which the auto-merged code now calls.
• ModelListRow.tsx: kept the fork's row, with the name and a provider line under it. I applied upstream's fix(web): compact model picker row indicators pingdotgg/t3code#26415 change inside it: the check mark sits right after the model name, and the shortcut key comes last. This file isn't on the composer list, so I took the upstream change; it does change the model picker's look slightly.
• BranchToolbarBranchSelector.tsx: kept the fork's rule that a child repository always checks out in its own working tree. Its normal path now passes upstream's activeProjectCheckoutRoot (fix(web): picking a branch in a subfolder project keeps the thread in the project folder pingdotgg/t3code#29908, picking a branch in a subfolder project).
• RunFinalizationService.ts: kept the fork's refresh of every repository in a multi-repo project. Each repository's pull-request lookup now runs in the background, as upstream's fix(server): slow forge CLI calls no longer delay checkpoints and turn starts pingdotgg/t3code#28431 does, so a slow forge CLI doesn't hold up the next turn.
• RunFinalizationService.test.ts: started from upstream's version, added the repository-list mock its tests now need, and added the fork's three multi-repo tests back. Their mocks now record the lookup when it is requested rather than when it finishes, because the lookup now runs in the background.
• ThreadLaunchService.ts: kept the fork's choice between multi-repo and single-repo branch rename. Both kinds of rename now can't be interrupted. Only the single-repo one records the renamed branch, because cancel cleanup can only delete branches in the project's own repository (fix(server): cancelling worktree setup no longer leaves its new branch behind pingdotgg/t3code#29781).
• RuntimePolicy.test.ts and supervisor.test.ts: these were separate tests added at the same spot, so I kept both sides.

Composer audit: besides ChatView and ChatComposer, upstream didn't touch any of the listed composer files. Its changes to those two don't affect the composer's layout or look.

Other steps

• Lockfile: it changed upstream but merged without a conflict. I ran vp install and ensure:electron, which picked up Electron 44.10.1.
• Tests: server, 3 files, 62 passed; client-runtime supervisor, 60 passed; web BranchToolbar.logic, 18 passed. ProviderModelPicker.browser.test.tsx is the one that didn't run, and it covers the model list row change, so check that in the local test app.
• Pre-commit hook checks: format, lint and knip found nothing to fix.

Two untracked files, claude-summary.md and conflicted-files.txt, were already in the working tree. I left them alone.