Skip to content

feat: integrate upstream agent, settlement and model updates (Sep 30) - #58

Merged
nickrroberts merged 11 commits into
mainfrom
sync/upstream-agents-models-20260930
Sep 30, 2026
Merged

nickrroberts merged 11 commits into
mainfrom
sync/upstream-agents-models-20260930

Conversation

@nickrroberts

Copy link
Copy Markdown
Collaborator

Second upstream batch after #17, stacked on #55 (base sync/upstream-reliability-20260930; retarget to main once #55 merges). Cherry-picked with git cherry-pick -x, one commit per upstream PR, rebased on main at 66555de446.

Browser and MCP:

Settlement efficiency:

Models and Codex protocol:

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, via turn/start.additionalContext, re-injected after compaction. Branding kept (Control Plane, cplane MCP 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-mode developer_instructions, as before. Codex truncates the middle of any additionalContext entry 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 of additionalContext.
    • Pre-existing gap, not fixed here: gpt-6.x models (gpt-6.1-sol, gpt-6-astra) ship their own collaboration-mode text in the Codex catalog, and upstream says Codex then drops the client developer_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-level developerInstructions on thread/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):

  • server: full suite 52 failures in 11 files. 51 match main by name (37 ThreadSettlementReactor storage cleanup, CodexDriver/providerMaintenance npm, Cursor skills, UsageService, Antigravity, AgentSessionScanner, entrypoint, ProviderRegistry). The 52nd, AcpJsonRpcConnection session/load replay, is a timing flake: it failed 1 of 3 runs on main too (load average 50 to 100 from parallel agents), and no commit here touches ACP.
  • PR B targeted set after the final rebase: assistantRuntime, agents toolkit, AgentCompletionReactor, ThreadSettlementReactor, RuntimeInstructions, CodexSessionRuntime, Codex collab/provider/adapter, McpHttpServer, PreviewAutomationBroker, ThreadPullRequestReactor, ProjectionSnapshotQuery, RepositoryIdentityResolver, ClaudeModelCatalog, ModelManifest: 407 passed, 37 failed (the same storage cleanup failures as 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.
  • web: 9 failures (connectCliAuth, SnapShotCoordinator), same as main. client-runtime 1,690, contracts 479, effect-codex-app-server 36: all pass.
  • Typecheck: server, web, client-runtime, effect-codex-app-server clean; contracts has the same 2 errors as main.
  • Lint: 0 errors, warnings only, none new.

🤖 Generated with Claude Code

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Sep 30, 2026
@nickrroberts
nickrroberts force-pushed the sync/upstream-agents-models-20260930 branch from 29e6c48 to b862eda Compare September 30, 2026 15:29
@nickrroberts
nickrroberts force-pushed the sync/upstream-reliability-20260930 branch from 4a5726d to b3e3266 Compare September 30, 2026 15:29
@github-actions

Copy link
Copy Markdown

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for b862eda.

This comment will update automatically after the next completed run.

@nickrroberts
nickrroberts changed the base branch from sync/upstream-reliability-20260930 to main September 30, 2026 15:46
Bil0000 and others added 11 commits September 30, 2026 09: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)
…gg#13481)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
(cherry picked from commit d5d4874)
…4304)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
(cherry picked from commit 451afcb)
…14311)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
(cherry picked from commit 4222485)
…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
nickrroberts force-pushed the sync/upstream-agents-models-20260930 branch from b862eda to 224be8c Compare September 30, 2026 16:11
@nickrroberts
nickrroberts merged commit 0d41e99 into main Sep 30, 2026
2 checks passed
@nickrroberts
nickrroberts deleted the sync/upstream-agents-models-20260930 branch September 30, 2026 16:12
nickrroberts added a commit that referenced this pull request Sep 30, 2026
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants