[henrychu04]

Merges upstream/main at 15fe283 (105 commits since the 80a2351 sync base) into coder-only in one stage: 38 content conflicts and 166 modify/delete conflicts. It then merges coder-only three more times to pick up #293–#296.

Carried

• Side chats (feat: side chats beside the main thread pingdotgg/t3code#26901) are wired through ChatView, RightPanelTabs, RightPanelSurfaceContent, useRightPanelSurfaceClose, useComposerSend and ChatComposer, minus the preview, device, desktop and usage pieces. coderEnvironment advertises sideChats. The new "update this server" text says "Update this Coder workspace's T3 server…".
• Pin and archive projects (feat: pin favorite projects and archive old ones pingdotgg/t3code#26154, migration 076). coderEnvironment advertises projectOrganization.
• Model picker: the combined model and effort control with Show more (feat(web): pick the model and its effort from one control pingdotgg/t3code#28057, fix(web): model picker stays open until dismissed, with a Show more row pingdotgg/t3code#28076), and Ultrathink hidden (fix(web): hide Ultrathink from the Claude effort picker pingdotgg/t3code#28044).
• Context meter (feat(web): context meter fills up and shows tokens against the limit pingdotgg/t3code#27892). It lives in ThreadDetailsUsage.tsx, which the fork had cut. The file is restored with only ThreadDetailsContext; the usage-limit rows need plan windows, which stay cut. The Context window item starts hidden, because the fork never offered the retired Labs flag. thread-sidebar.md documents it.
• Claude: fix(server): changing Claude effort no longer re-sends the model pingdotgg/t3code#22272, fix(claude): retain measured usage after a steered query exits pingdotgg/t3code#25200, fix(claude): failed advisor calls no longer show as completed pingdotgg/t3code#24254.
• Codex: fix(server): Codex permission requests for glob paths no longer show as command approvals pingdotgg/t3code#24257, fix(server): show Codex tool-output images inline pingdotgg/t3code#23284 (tool-output images merged cleanly in CodexAdapterV2; no fork seam affected), fix(server): imported Codex threads keep their saved Codex names pingdotgg/t3code#24982, fix(server): the Codex plan badge updates after a ChatGPT downgrade pingdotgg/t3code#24978.
• Pi: transcripts carry their home path (fix(server): Pi transcripts carry their home path pingdotgg/t3code#28061).
• ACP: fix(acp): fail requests when stdout closes before the agent exits pingdotgg/t3code#21323, perf(acp): stop re-saving the whole terminal log on every output chunk pingdotgg/t3code#24024, perf(acp): long agent terminal output no longer ties up the server pingdotgg/t3code#24479, perf(acp): MCP calls over ACP no longer wait behind a long call pingdotgg/t3code#23834.
• GitLab: pipeline states (fix(gitlab): a failed child pipeline no longer shows as a passing check pingdotgg/t3code#24688, fix(gitlab): keep scheduled pipelines pending pingdotgg/t3code#25195).
• Git: commit hook exit codes (fix(server): every commit hook reports finishing with its real exit code pingdotgg/t3code#22939, without span events) and merge ancestry on selected-file commits (fix(server): preserve merge ancestry on selected-file commits pingdotgg/t3code#24744).
• Threads: PR watch deadline (fix(server): wake no-checks PR watches at the configured deadline pingdotgg/t3code#25437), missed thread alerts on reconnect (fix(web): thread alerts missed during a disconnect fire on reconnect pingdotgg/t3code#24493), thread families (fix(clients): stop loading thread families when opening chats pingdotgg/t3code#26762).
• Server-internal path check (refactor(server): share a path check between file readers pingdotgg/t3code#28041): apps/server/src/auth/serverInternalPaths.ts is kept, because carried AssetAccess, GitVcsDriverCore and WorkspaceFileSystem import it. cli/up.ts is dropped; only the uncarried binCli.ts imports it.
• Version copy in General settings (feat(web): copy the app version from General settings pingdotgg/t3code#24788).
• Port scanner (fix(server): preview discovery stops sending HTTP and TLS to agent-started ports pingdotgg/t3code#27893): Restore port discovery and the thread Servers section with Forward #295's restored PortScanner was upstream's 80a2351 copy, so it now takes 15fe283's rewrite, which sends no HTTP or TLS requests to unconfigured listeners. ThreadServersPanel and the guide take upstream's "local servers" wording; the Forward delta stays.
• Usage commits that touched carried code: fix(server): cleanup keeps worktrees waiting for a usage-limit reset pingdotgg/t3code#24689 (storage cleanup keeps usage-limited worktrees) and fix(server): do not freshly arm days-old usage-limit recoveries pingdotgg/t3code#21735 (recovery worker) are rate-limit recovery; fix(server): the Codex plan badge updates after a ChatGPT downgrade pingdotgg/t3code#24978 is a Codex auth label. AgentsMD keeps both kinds, so they merge as upstream. Every dashboard part of fix(server): cleanup keeps worktrees waiting for a usage-limit reset pingdotgg/t3code#24689, fix(server): do not freshly arm days-old usage-limit recoveries pingdotgg/t3code#21735, fix(usage): use the freshest reported pooled plan pingdotgg/t3code#25214, fix(usage): use each account accent colour in limit bars pingdotgg/t3code#24630, fix(web): accept comma as decimal in usage price entry pingdotgg/t3code#21939, fix(usage): combine duplicated skipped-record warnings pingdotgg/t3code#23411 and fix(server): the Codex plan badge updates after a ChatGPT downgrade pingdotgg/t3code#24978 is in cut files.

Cut

• Surfaces cut as before: mobile, desktop, relay, T3 Connect, hosted web, CLI and install, telemetry, other providers and hosts, usage dashboards, process diagnostics. The 21 modify/deletes the resolver left for a human are added to DELETED_PATHS. Upstream additions under cut paths are removed.
• fix(acp): Copilot threads get T3's tools pingdotgg/t3code#26968 HTTP MCP servers. No carried flavor sets mcpOverHttp; only Copilot's uncarried flavor did. The provider-acp adapter therefore has no mcpOverHttp, httpServers or httpMcpServers, and AcpSessionRuntime has no HTTP branch, each marked Coder:. Kilo never sets it, and no MCP server reaches an agent. Upstream's Copilot HTTP-MCP adapter test is not carried. acp-mock-agent.ts stays upstream's verbatim; it already keeps options only uncarried tests use.
• DPoP renewal in the client-runtime connection driver, and the auth or pairing edits in ws.ts and PeerLinks.ts.
• Prompt-link button in TimelineUserMessageRow's new message action row.

Adapted

• perf(web): pull request comments reuse their markdown parse pingdotgg/t3code#27808's per-repository cached remark plugins: pullRequestAutolinkPlugins adds remarkGitLabUploads, and the context keeps repositoryUrl for body splitting.
• RightPanelTabs: the fork's tab strip is inline, so a small RightPanelTabContent reads the side chat's shell where upstream's memoized RightPanelTab does.
• useRightPanelActions has no embedded flag; upstream used it only for the cut preview action bus.
• /side text-only check: reads no preview annotations, but does read machine contexts (Restore @-mentioning a machine, listing linked Coder workspaces #293 restored them).
• Fork-only ProjectSettingsPanel.test.tsx: mocks useServerConfigs and readEnvironment, which feat: pin favorite projects and archive old ones pingdotgg/t3code#26154's group update now reads.
• Docs: keep the fork's text with upstream's new facts (Shift+Tab, permissions in the model picker, pin and archive, side chats, context window).
• Bookkeeping: SYNC_BASE is now 15fe283. GitLabCli's "checked against" line moves to 15fe283 (upstream did not change GitLabCli.ts in the range). sync.md gains two lessons: carried features can live in cut files, and full-suite browser load flakes.

Coder-only merges

• Restore @-mentioning a machine, listing linked Coder workspaces #293 (machine @-mentions): carried. Thread items keep the same-server feat(web,mobile): the @ picker lists threads on linked machines pingdotgg/t3code#26201 seam.
• Carry upstream's T3 attachment toolkit over the file bridge #294 (attachment toolkit): carried; no upstream changes in the range.
• Restore port discovery and the thread Servers section with Forward #295 (port discovery and Servers): carried as above.
• Restore Kilo Code native session list and import #296 (Kilo native sessions): carried; no upstream changes in the range. coderServer.ts keeps both Layer.provideMerge(layerPortScanner) and Layer.provideMerge(AcpRegistryRuntimeCoordinator.layer).

Checks

• node scripts/sync-check.mjs: markers, lost and both-sides were all reviewed. Every lost line is a cut surface or a listed seam; the three "both sides" lines are upstream moves. unused-locals prints nothing.
• node scripts/seams-check.mjs: passes against 15fe283. No staged .orig/.rej files.
• Every typecheck in AGENTS.md passes, including typecheck:helper.
• pnpm knip:check and pnpm test:knip pass.
• vp fmt --check on changed files passes.
• pnpm build passes.
• Tests, after the Restore port discovery and the thread Servers section with Forward #295 merge (Node 24.21.0, TMPDIR=/private/tmp/...): server 3666 passed; gateway, helper and coder-cli pass; contracts, providers, source-control, client-runtime and shared pass.
• Web: 4320 of 4321 pass. The one failure, localApi.test.ts, is a hook timeout under load and passes alone.
• Earlier full runs hit many browser timeouts and ClaudeAdapterV2's "persists a todo_list…" 60-second timeout. All of them pass when rerun alone (37 browser files, the whole ClaudeAdapterV2 file). This is now noted in sync.md §7.
• After the Restore Kilo Code native session list and import #296 merge: its server tests, the AcpRegistry adapter test, providers, contracts, client-runtime, its web browser test, the typechecks and the build pass.
• Live check with the local Coder harness: every check passes except the expected ProjectConflictError on "project created" (the project persists). Covered: helper install over coder ssh, server config, file search and read, asset streaming, a 1 MiB upload, thread search, MR filters, socket reattach.

Unsure

• Context window default: upstream defaults it from the retired Labs usage flag. The fork never offered that flag, so it starts hidden.
• /side in ChatView: the "update this server" reason for side chats can only show against an older helper. The gateway installs the matching helper, so in practice it should never appear.

🤖 Generated with Claude Code

[henrychu04]

Reviewed and live-checked the merged sync on the local Coder 2.34.5 / 2.25.3 harness (fresh install + build): drive.mjs passes except the known persisted-project conflict; gateway checks (immutable static caching, helper coder stat, traffic counters, 9 MiB frame closes only that socket, disconnect cancels an in-flight connect, reconnect); port discovery with upstream's rewritten scanner (pingdotgg#27893) — terminal server discovered and attributed, Forward ready, laptop port serves the page, stop, rule kept; attachment toolkit over the real bridge (stage, relative path refused, discard); Kilo native sessions (list, import, re-import, turn resumes the native session); helper exits when the gateway stops. No new listeners or outbound calls in shipped code (fetch additions are test-only). SYNC_BASE bumped to 15fe283.