[mohan6623]

Claude Code resolved the conflicts in this merge of upstream v0.1.7-nightly.20261101.4048. 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 staged, but not committed. Typecheck reports 0 errors, and the hook's checks (vp fmt, vp lint on the 713 staged files, vp run knip:check) all come back clean. The unit and browser tests beside the changed files pass. Browser tests only ran after I installed Playwright's Chromium into ~/.cache; Playwright doesn't support this machine's Ubuntu 26.04, so I installed the 24.04 build with PLAYWRIGHT_HOST_PLATFORM_OVERRIDE. I didn't touch the untracked claude-summary.md and conflicted-files.txt.

Conflicts

Server

• RuntimePolicy.ts: kept both sides. The fork's repository list and upstream's managed-policy ceiling (ServerSettings, maxRuntimeMode) now sit side by side in the imports, layer requirements and returned policy.
• RuntimePolicy.test.ts: took upstream's layerWithPolicy and added the fork's repository mock to it.
• provider-cursor/driver.test.ts: upstream replaced its SDK spies with a mock HTTP client. I folded the fork's usage mock into that client, so the fork's usage-limit check still runs. In the catalog-window test, usage requests now get a 404 so they don't trip upstream's catalog-request signal.

Composer files (fork side kept)

• ComposerModelEffort.tsx, EffortGlyph.tsx, EffortGlyph.test.ts: the fork had deleted these and upstream edited them, so I kept them deleted. I also removed upstream's new ComposerModelEffort.browser.test.tsx, which tests the deleted file.
• ComposerFooterControls.tsx: dropped upstream's ComposerPermissionsSection. The fork's runtime-mode select now disables modes above an admin's ceiling and shows the reason (upstream's managed policy).
• ComposerControl.tsx: kept the fork's classes. Upstream's change was a spacing tweak (fix(web): align composer context icons and space their labels pingdotgg/t3code#28083). For the same reason I reverted that commit's gap tweaks in the three BranchToolbar* files, which git had merged without a conflict.
• ChatComposer.tsx: took upstream's managed-policy logic (disabled modes, ceiling banner, send block). It relied on a helper the fork had removed from runtimeModeConfig.ts, so I put that logic inline instead.
• ProviderModelPicker.tsx: kept the fork's picker without upstream's docked effort column. I took upstream's scroll-lock selectors and the max-w-56 cap that stops long model names pushing the composer.
• ModelPickerContent.tsx: kept the fork's fixed compact height. Upstream's changes there were all for the docked effort column, so the file now matches the fork.
• ModelListRow.tsx: kept the fork's row and added upstream's full-name tooltip when a name is cut off.

Other files

• ChatView.tsx: kept the fork's shared surfaceContentProps, now using upstream's hoisted sideChatParentPanel. Added upstream's <ChildThreadApprovals> above the fork's composer shell.
• DiffPanel.tsx: kept the fork's repository dropdown and used upstream's canSelectBranchBase condition. I replaced the fork's own resizable file tree with upstream's new FileExplorerPane. It keeps the fork's saved-width key, minimum width and drag-to-close.
• useResizableWidth.ts: the fork's drag-to-collapse runs first, then upstream's rule: save the width only if the drag moved, otherwise restore it.
• PanelLayoutControls.tsx: kept the fork's compact && "hidden" together with upstream's rightPanelOpen && condition.
• ProviderInstanceCard.tsx, SidebarDraftBlock.tsx, knip.jsonc: kept both sides' lines.
• modelTraits.ts: took upstream's extra speedLabel return field.
• Lockfile: it didn't conflict but upstream changed it, so I ran vp install, then ensure:electron.

Typecheck, test and hook fixes

• SidebarDraftBlock.browser.test.tsx: upstream's new test was missing the fork's required disabledEnvironmentIds prop, so I added it.
• DiffPanel.browser.test.tsx: upstream's new test mocked the VCS state without the fork's listRepositories, which crashed the panel. I added a stable empty mock.
• react/purity errors in Sidebar.tsx: the three flagged new Date() calls run in event handlers. Upstream marks them with oxlint-disable-next-line react/purity comments for a known oxc false positive (oxc#27309), and the merge dropped those comments. I restored them as upstream has them.
• no-unreasoned-state-sync in TimelineMinimap.tsx: the effect is fork code that clears a pending timer on unmount. That is real work outside React, so it got a reason comment rather than a rewrite.