[mohan6623]

Claude Code resolved the conflicts in this merge of upstream v0.1.7-nightly.20261031.4004. 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 is resolved and fully staged, with no conflicts left. Typecheck passes (39/39), the unit tests I ran pass, and the hook's checks are clean (vp fmt, vp lint on the staged files, vp run knip:check). Nothing is committed. The browser tests (*.browser.test.tsx) did not run: Playwright can't install a browser on this runner's OS (Ubuntu 26.04). CI or the local test app will need to cover them, including ProviderModelPicker, ThreadRelationshipsControl and ChatView.

How I handled the composer

Most conflicts came from upstream pingdotgg#28057, which merges the model and effort pickers into one control. That replaces the fork's separate effort chip, so it is the kind of composer redesign the fork rejects. I rebuilt upstream in a temporary worktree with pingdotgg#28057 and its follow-ups reverted (pingdotgg#28162, pingdotgg#28307, pingdotgg#28076, pingdotgg#28044). I then put back the parts that stand on their own:

• fix(web): hide Ultrathink from the Claude effort picker pingdotgg/t3code#28044: Ultrathink is hidden from the Claude effort picker.
• fix(web): model picker stays open until dismissed, with a Show more row pingdotgg/t3code#28076: only its "Show more" row for legacy models.

Every file those commits touched was then re-merged against the fork. As a result, ComposerModelEffort.tsx was removed. The files the fork had already deleted stay deleted: ComposerContextPermissions, EffortGlyph, composerControlsOwnership and its test, ComposerPermissionsSection and its browser test, and the ComposerPermissionsSection component in ComposerFooterControls. The docs keep the fork's wording about the separate effort menu.

Conflicts

• ClaudeTaskOutputTail.ts: combined. Upstream's TMPDIR, macOS and cwd handling is kept, plus the fork's Windows fallback to <temp>/claude.
• WorkspaceFileSystem.ts: upstream's text decoding with the fork's 5 MB read cap (truncated = stat.size > readCap).
• Sidebar.tsx: the fork's environment filter now feeds upstream's useOrderWhileOpen. I renamed the fork's local set to catalogEnvironmentIds so it no longer clashes with upstream's new connectedEnvironmentIds.
• ThreadRelationshipsControl.tsx: took upstream's refactor (side chats, row render function) and added back the fork's usage={agent.usage}.
• useRightPanelActions.ts, rightPanelStore.test.ts: kept both sides.
• useSystemComposerBanners.tsx: kept the fork's spinning retry icon and added upstream's "switch the environment back on first" step.
• PreviewPanelShell.tsx: kept the fork. Upstream's fix only applies to the width animation, which the fork replaced with a slide.
• BranchToolbar.tsx, ComposerControl.tsx: kept the fork. I dropped fix(web): show the worktree picker in the composer strip at default width pingdotgg/t3code#27114 (@3xl→@xl breakpoints) and the icon-margin part of fix(web): machine label no longer shifts between one and many machines pingdotgg/t3code#28070 because both change the dock's layout. I kept fix(web): machine label no longer shifts between one and many machines pingdotgg/t3code#28070's label text-size fix.
• ChatView.tsx: brought in side chats (embedded) alongside the fork's model/context strip, files dock and header. Upstream's new sideChatParentPanel prop goes into the fork's shared surfaceContentProps.
• ChatComposer.tsx: merged the imports.
• ModelPickerContent.tsx: kept the fork's fixed compact height.
• ProviderModelPicker.tsx: shows the ACP logos and the fork's custom logo together. I left out fix(web): keep the model picker in place when its label changes pingdotgg/t3code#28307's popup alignment, which was tuned for upstream's merged trigger.
• docs/user/permission-modes.md: kept the fork's text.

Typecheck and hook fixes

• ClaudeAdapterV2.ts: upstream moved taskOutputRoot onto the live query. The fork's background-command output now receives it as an input.
• CheckpointCaptureService.test.ts: upstream's new test used isGitRepository, which the fork renamed to isCheckpointable.
• Lint:
  • node:os is now imported as NodeOS.
  • A fork comment in scripts/build-desktop-artifact.ts was cut to 4 lines.
  • The fork's peek-timer cleanup in ui/sidebar.tsx got a reason comment, since clearing a timer on unmount is a real sync.

Tests run

• Server: ClaudeTaskOutputTail, CheckpointCaptureService, WorkspaceFileSystem, ClaudeAdapterV2 (280 tests).
• Web: rightPanelStore, composerProviderState, Sidebar.logic, ChatView.logic, BranchToolbar.logic.
• Mobile: thread-settings-options.

The lockfile merged cleanly, so I ran vp install --frozen-lockfile and ensure:electron.

One untested edge case: a side chat opens its panel actions in its parent's panel, but the fork's left files dock is not routed that way.

The untracked claude-summary.md and conflicted-files.txt were already there; I left them alone and unstaged.

[chatgpt-codex-connector]

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-11-01T00:43:39.741792Z	039b986	PR opened
🔒 Security Review	✅ Completed 2026-11-01T00:44:02.552489Z	039b986	PR opened

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.