Repository navigation
feat: integrate upstream agent, settlement and model updates (Sep 30) - #58
Merged
Merged
Conversation
nickrroberts
force-pushed
the
sync/upstream-agents-models-20260930
branch
from
September 30, 2026 15:29
29e6c48 to
b862eda
Compare
nickrroberts
force-pushed
the
sync/upstream-reliability-20260930
branch
from
September 30, 2026 15:29
4a5726d to
b3e3266
Compare
Thread transfer impact
This comment will update automatically after the next completed run. |
nickrroberts
changed the base branch from
sync/upstream-reliability-20260930
to
main
September 30, 2026 15:46
…gdotgg#13558) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit 4f27a84)
…he whole thread list (pingdotgg#13691) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit 3b0a495)
…dotgg#13689) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit 999161e)
…le (pingdotgg#13765) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit 1d6f23b)
Adds claude-sonnet-5-5 to the Claude catalog (reuses the sonnet-5 profile, requires Claude Code 2.1.284) and features it in currentModels. Sonnet 5 stays current. (cherry picked from commit 72330e2)
…otgg#13480) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit 567783e)
…gdotgg#13547) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit 6391be2) Fork adaptation: runtime info, PR linking and tool blocks move to turn/start additionalContext as upstream does, keeping Control Plane branding and the cplane MCP server name. The Project role block stays in the collaboration mode developer_instructions, because Codex truncates additionalContext entries above about 1,000 tokens and the block inlines MEMORY.md and role files. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
nickrroberts
force-pushed
the
sync/upstream-agents-models-20260930
branch
from
September 30, 2026 16:11
b862eda to
224be8c
Compare
nickrroberts
added a commit
that referenced
this pull request
Sep 30, 2026
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
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
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.
Second upstream batch after #17, stacked on #55 (base
sync/upstream-reliability-20260930; retarget tomainonce #55 merges). Cherry-picked withgit cherry-pick -x, one commit per upstream PR, rebased onmainat66555de446.Browser and MCP:
894d33419d(fix(preview): use the visible browser for new agent sessions pingdotgg/t3code#13064): new agent sessions prefer the host that owns the thread's visible browser tab. Clean apply. Our fix(browser): recover thread automation after host timeout #49 host-timeout reconnect (client-runtime rpc) and the Tell Project agents to use the built-in browser #42/Coordinator settle tool, agent turn rule, continuation result delivery #44 prompt text inassistantRuntime.tsare untouched.4f27a84631(fix(mcp): preview snapshots fit in the agent's tool output again pingdotgg/t3code#13558): preview snapshots bounded near 20 KB, andstructuredContentcarries the same bounded value. Clean apply; only the preview toolkit changes. cp_agent_* tools, the agents toolkit and multi-machine (feat: start agents on linked machines per server settings #43) code are untouched.Settlement efficiency:
3b0a495b0e(perf(server): per-thread settlement and PR checks no longer rebuild the whole thread list pingdotgg/t3code#13691): per-thread settlement and PR checks read one thread instead of the whole list. Conflict inThreadSettlementReactor.ts: kept ourisAssistantSettlementExemptfilter, so Project agents and coordinators stay exempt and settling stays coordinator-owned (fix(server): let coordinators settle agents after follow-ups #47). The per-thread read still loads the thread's project, so the exemption still sees it. Dropped one upstream test forlistThreadsWithPullRequests, which comes from perf(server): pull request sync reads only threads with linked pull requests pingdotgg/t3code#13704 (not taken).999161ef84(perf(server): stop re-running git for every project each minute pingdotgg/t3code#13689): repository identity cache keeps hits for 15 minutes. Conflict inRepositoryIdentityResolver.ts: kept ourrefinehandling, took the sharedtimeToLive.1d6f23b519(perf(server): background sweeps only read threads that can still settle pingdotgg/t3code#13765): background sweeps read only unsettled threads. Clean apply. The filter is opt-in (unsettledOnly), so client snapshots and our query additions are unchanged.Models and Codex protocol:
72330e22c0(Add Claude Sonnet 5.5 to the model manifest pingdotgg/t3code#14152): Claude Sonnet 5.5 in the bundled catalog andcurrentModels. Added only the Sonnet 5.5 entry: the fork's manifest has nocompatibilityblock and no Opus 5.5 entry.567783ecdc(fix(codex): the protocol generator runs again on Effect rc.115 pingdotgg/t3code#13480) andd5d48742c9(feat(codex): require Codex 0.156 and regenerate its protocol pingdotgg/t3code#13481): prerequisites, not on the original list. feat(codex): regenerate protocol bindings for Codex 0.159 pingdotgg/t3code#14311 regenerates the bindings on top of feat(codex): require Codex 0.156 and regenerate its protocol pingdotgg/t3code#13481's Codex 0.156 refresh, which needs fix(codex): the protocol generator runs again on Effect rc.115 pingdotgg/t3code#13480's generator fix.effect-codex-app-serverhad no fork changes, so its generated files now match upstream at422248515aexactly. feat(codex): require Codex 0.156 and regenerate its protocol pingdotgg/t3code#13481 also drops the legacythread/rollbackpath (Codex 0.156 removed it). Its compatibility-range edits were dropped, since the fork has no such system.451afcb22d(fix(codex): Pro Max accounts load, so Ultrafast shows up pingdotgg/t3code#14304): Pro Max (promax) accounts load and Ultrafast shows;PlanTypedecodes as a plain string.422248515a(feat(codex): regenerate protocol bindings for Codex 0.159 pingdotgg/t3code#14311): Codex 0.159 protocol bindings. Local Codex is 0.159.2.Instructions:
6391be2729(fix(server): newer Codex models get T3 Code's instructions again pingdotgg/t3code#13547): newer Codex models get runtime info, PR linking and tool instructions again, viaturn/start.additionalContext, re-injected after compaction. Branding kept (Control Plane,cplaneMCP server), and the browser rules from Require agents to use only the built-in Control Plane browser #56/fix(server): allow explicitly requested desktop browser use #57 (built-in browser only, explicit-request exception) carry over into the tools entry; the tools entry stays under the 4,000-byte cap test. Fork adaptation: the Project coordinator/agent block stays in the collaboration-modedeveloper_instructions, as before. Codex truncates the middle of anyadditionalContextentry above about 1,000 tokens, and the block inlines MEMORY.md and role files (16 KB caps), so moving it would cut it. A test asserts the block stays out ofadditionalContext.gpt-6.1-sol,gpt-6-astra) ship their own collaboration-mode text in the Codex catalog, and upstream says Codex then drops the clientdeveloper_instructions. So Codex agents on those models likely get no Project block, before and after this PR. Possible follow-up: send the block as thread-leveldeveloperInstructionsonthread/start/thread/resume(sessions already restart when the role changes).Not taken: pingdotgg#14290, pingdotgg#12006, pingdotgg#13302, pingdotgg#11846, pingdotgg#13501, pingdotgg#13704, pingdotgg#14198 (see #55).
Validation (local, no remote CI):
mainby name (37 ThreadSettlementReactor storage cleanup, CodexDriver/providerMaintenance npm, Cursor skills, UsageService, Antigravity, AgentSessionScanner, entrypoint, ProviderRegistry). The 52nd,AcpJsonRpcConnectionsession/load replay, is a timing flake: it failed 1 of 3 runs onmaintoo (load average 50 to 100 from parallel agents), and no commit here touches ACP.main). Prompt text tests (Tell Project agents to use the built-in browser #42/Coordinator settle tool, agent turn rule, continuation result delivery #44/Require agents to use only the built-in Control Plane browser #56/fix(server): allow explicitly requested desktop browser use #57) pass.main. client-runtime 1,690, contracts 479, effect-codex-app-server 36: all pass.main.🤖 Generated with Claude Code