Skip to content

Sync with upstream nightly v0.1.10-nightly.20261116.4800, with a behavior replacement ledger #417

Closed

Description

@tannerpolley

Plan step 1 of #416. See the findings comment on #416 for full detail.

Merge upstream pingdotgg up to v0.1.10-nightly.20261116.4800 into main as a real merge, following docs/operations/fork.md.

Keep a replacement ledger for every contested behavior, marking each one keep, replace (citing the upstream symbol), or retire (owner decision). Focus behavior proof on:

  • project organization;
  • issue admission and ownership;
  • delegated cancel, completion and questions;
  • Writer routing;
  • Codex/Claude recovery;
  • artifacts/PDF and notebooks.

Check migrations against a disposable seeded database, never the live one. Don't combine this with the architecture changes in the sibling sub-issues.

Mobile is out of scope.

Activity

  1. tannerpolley commented on Nov 16, 2026

    @tannerpolley
    OwnerAuthor

    T3 Code status: Done

    Issue: #417 Sync with upstream nightly v0.1.10-nightly.20261116.4800, with a behavior replacement ledger

    Thread: thread:delegated-task:command%3Amcp%3Abb4592fc-a5b1-434a-94e6-fdbd212a677b%3Adelegate-task%3Aissue-417-upstream-sync-2026-11-16-b

    Model: gpt-6.1-sol

    Branch: sync/upstream-2026-11-16

    Updated: 2026-11-17T00:11:32.773Z

  2. tannerpolley commented on Nov 16, 2026

    @tannerpolley
    OwnerAuthor

    Upstream sync behavior replacement ledger

    Target: v0.1.10-nightly.20261116.4800 (7d32075e3757ded707914e2450c3e392a9665765), merged into fork base d9c88282ab27d7e0bfa4d9fb1a9d68096c2e77ec on sync/upstream-2026-11-16. Initial merge-tree measurement: 129 files / 272 blocks; whitespace-aware reconciliation: 117 files / 262 blocks. rerere.enabled=true.

    These are behavior decisions for this sync, not the #418–#422 refactors. No product behavior is retired. An upstream replacement below retains the behavior through the cited upstream implementation. Owner policy, issue admission and historical migrations remain in the fork.

    Contested behavior Decision Resolution / upstream owner
    Project sections, nested hierarchy, drag placement, expansion and activity filtering Keep Retain SidebarProjectSections, sidebar layout service, worker controls and section-aware command-palette entry points. Integrate upstream folder-drop wrapper and row accessibility.
    Managed issues, admission, repository ownership, queue and handoffs Keep Retain issue services/commands and their transactional hooks. No migration to a different orchestration model in this sync.
    Configured model-role order, weekly headroom, Writer question routing Keep Keep target policy and DelegatedRequestRouting; upstream generic task roles do not replace owner routing.
    Delegated completion publication, cancelled/closed children, issue closeout and pending background work Keep Preserve ForkDelegatedCompletion, owner-visible routing and both cohort owners. The selective reader retains the spawning run and loads queued delivery records from completionCohort for ordinary and runless managed children. Broader execution consolidation remains #418.
    Follow-up tasks await their descendants and completion wakes Replace + Keep Adopt upstream delegatedTaskRuns and delegatedTaskAwaitsWork before fork result selection and pending-result checks. Keep fork queue promotion, provider recovery, cohorts and delivery. Upstream pingdotgg#34958 (daed1dd327) is required sync behavior.
    Selective projection reads and turn-item query planning Replace Upstream ProjectionStore.turnItemMatch and its type-index query replace the fork's bespoke recovery/conversation-index selection. Managed admission keeps its required subagent records.
    Dead provider sessions' roster, tool-call and native-subagent endings Replace Upstream writeReleasedRosterEvents, writeReleasedToolCallEvents, writeReleasedSubagentEvents own cleanup; keep fork process ownership metadata.
    Codex/Claude recovery, limit policy and reset credits Keep Preserve fork recovery/usage policy while integrating upstream transport, probe and session recovery fixes. Reset-credit automation is not retired.
    Missing worktree recreation and turn-start/rollback exclusion Replace + Keep Adopt upstream restoreMissingWorktree, withTurnStartReservation and withCheckpointRestoreReservation; retain fork managed-project-path checks.
    Worktree placement, naming, handoff and cancellation Keep + Replace Retain project-local placement and WorkspaceBinding; incorporate upstream releaseWorktreeRegistration / onWorktreeClaimed cancellation safeguards in GitVcsDriverCore.createWorktree.
    Storage retention and removal safeguards Keep + Replace Keep issue/PR retention, pending-child protection, physical path identity and explicit owner removal. Integrate upstream scratch-folder retention, branch reconciliation, linked-worktree checks and submodule inspection-before-cleaning.
    Upstream and fork migration ledgers Keep Preserve both ledgers, historical offset recovery and fork migration identities. Current-schema checks must remain read-only.
    Historical fork turn-item count cache Replace Upstream 085_TurnItemCounts owns the new run_key table. Compatibility handles the old run_id cache without deleting source turn items; historical fork migrations 2/24 still load. This cache had already been retired by fork migration 24 before this sync.
    SQLite writer responsiveness Keep + Replace Keep bounded writer-borrow yielding and incremental vacuum. Upstream nodeSqliteClient writer worker moves synchronous writes off the server thread and replaces the old checkpoint-worker setting.
    Desktop fork updates, tray, startup/migration splash and zoom Keep Keep fork UI and local install source; upstream DesktopUpdates.runUpdaterCheck owns updater reservation/check mechanics.
    Codex plugin/custom-model discovery and Claude plugin inventory Keep + Replace Preserve fork inventories/defaults and home-probe protection; integrate upstream Codex config facts and Claude inline-plugin precedence.
    Manual/bulk title regeneration feedback Replace Upstream regenerateTitle, ThreadTitleRegenerationService.Outcome and threadTitleRegenerationToast own manual feedback. Keep the fork's automatic evaluation, user-title guards and failure bookkeeping.
    PDF review comments and project artifacts Keep Preserve annotation selection/composer delivery, artifact persistence, sections and descriptions over upstream viewers.
    File refresh after workspace edits and explicit reveal Keep + Replace Upstream useAssetUrlState(..., workspaceMutationId) handles mutation re-signing; keep explicit reveal refresh and viewer revision keys.
    Notebook execution/edit/save/kernel ownership Keep Saved-notebook preview is not execution. Retain notebook service/toolkit; apply upstream McpSchema.EnabledWhen calling-thread visibility rule.
    Composer issue references and content transfer Keep + Replace Retain issue context extension and reference repair, use upstream composerDraftContent / clearStaleFileUploadMetadata for content and cross-environment uploads.
    Inline shell/process controls, silent wakes, owner-visible notifications Keep Preserve fork consumers and routing while integrating upstream notification snooze/clock and request roll-up semantics.
    Working timers and thread detail-card fit Keep + Replace Retain fork display policy; upstream toServerClock, formatWorkingTimerNow and narrowest-width sampling supply accurate remote clocks and resize bounds.
    Native question focus and inline-code selection Keep Preserve fork popup/input exclusions and span selection; include upstream dialog/menu/combobox exclusions.
    Caller-bound MCP tools and outside-client exposure Replace + Keep Adopt upstream McpToolAccess.routed registration invariant and McpInvocationContext.hiddenFromOutsideClients from pingdotgg#32764. Keep all fork tool handlers and authority checks; nine missing McpSchema.EnabledWhen annotations are restored. This prevents a production MCP-layer construction failure as well as hiding thread-only tools from outside clients.
    MCP timeline paging and completion acknowledgement Replace Upstream OrchestratorMcpService.readThread defaults cursorless agent reads to the newest items. The fork prompt-read tests request afterPosition: -1 when they need the original prompt. Upstream pageIncludesTerminalTaskResult acknowledges the final text chunk; prompt-only and truncated-result reads remain unacknowledged.
    Unadvertised-model refusal guidance Replace Use upstream advertisedModelsHint / requireAdvertisedModel formatting in both validation paths through shared unavailableModelMessage; retain fork role, provider and option policy.
    MCP contract documentation Replace Upstream OrchestratorMcpDelegateTaskInput / OrchestratorMcpDelegateTaskResult type imports replace hand-copied interfaces; fork fields remain in the actual contracts.
    Scheduled sync claim / merge ancestry Replace Correct the guide: syncs are manual, no daily task exists, last completed sync was Nov 12; sync PRs preserve the real upstream merge parent.
    Other issue-host removal / architecture simplification Keep for this sync Leave #418–#422 work separate, including removing non-GitHub write support.

    Delivered as draft PR #428, head 3f5fe1421f77058887ad672c040174f789c491b4. The initial sync merge 721ba11236c73ef1da0722bc4cff89fca5243716 retains fork base d9c88282ab27d7e0bfa4d9fb1a9d68096c2e77ec and nightly 7d32075e3757ded707914e2450c3e392a9665765 as its parents. The review fixes preserve both cohort owners, restore upstream follow-up holds, and make caller-bound fork tools satisfy upstream MCP registration and visibility checks. A subsequent normal merge integrates origin/main at 965235ad3c20c73cf919f4cfd7d5bd053b3903a7; the original upstream merge ancestry is preserved. Integrated client verification and independent review remain with the primary agent.

    Main integration: normal merge commit 3f5fe1421f77058887ad672c040174f789c491b4 joins sync head b5a15b0991d1efd66a40a8ab9baad4c5e3319497 and origin/main at 965235ad3c20c73cf919f4cfd7d5bd053b3903a7. The sole agentContextBudget.json conflict is resolved from measurement of the combined tree. #427’s queueNote and limit-ask instruction are present; the sidebar effort fixes are included.

    Completion review fixes, verified at 8d1140ebc53587560c9cef159483efe9f22428ed:

    • Keep, ordinary completion cohorts: retain the spawning run in the planner projection so child B joins child A's queued delivery without replacing its message, generation or reservation.

    • Keep, managed issue-worker completion cohorts: resolve the thread-owned cohort through completionCohort, load its queued message and reserved tasks, and include B's result before either child is marked delivered. Restart-recovery coverage includes two children.

    • Restore upstream follow-up hold: ForkDelegatedCompletion.delegatedTaskResultRun filtered only directly tagged task runs, omitting upstream's untagged grandchild-completion wake. It could publish the earlier terminal turn while the wake was running. It now starts with upstream delegatedTaskRuns, then applies the fork's promotion and provider-recovery mapping. The matching result-pending check also uses upstream delegatedTaskAwaitsWork.

    • The hold failure on initial merge 721ba11236 was a sync regression, not a pre-existing failure on fork main. Upstream fix(server): a follow-up delegated task waits for the subagents its child starts pingdotgg/t3code#34958 (daed1dd327) shipped in this nightly. Its test is byte-for-byte unchanged from the upstream tag and was demonstrated failing before this fix and passing afterward. No semantic conflict or retirement is needed.

    • All seven delegated-completion, recovery and Writer-routing files now pass: 128 tests / 7 files, including both cohort regressions. The earlier 127-pass/1-fail result at 02f797b95b is superseded.

    • The MCP registration failure exposed by that incremental check was another sync regression. The MCP follow-up below supersedes that failed agent-context gate.

    • The earlier full sync check against origin/main at 02f797b95b passed format, lint, both Knip passes, GraphQL, patches, 41 script tests and React Compiler coverage (697 files); it reported the three known mobile errors and a 900-second timeout for the 1,182-file adjacent-test batch. That broader batch remains unverified; the seven completion/recovery/Writer files above have completed successfully.

    MCP registration follow-up, verified at b5a15b0991d1efd66a40a8ab9baad4c5e3319497:

    • Upstream fix(server): outside MCP clients stop being offered thread-bound tools pingdotgg/t3code#32764 (f28c74a7d04047afb5fa421815643f6db8ca23dd) adds a registration-time invariant in McpToolAccess.routed. Production server.ts builds McpHttpServer.layer, which includes layerTools / layerOrchestratorToolkit / McpToolAccess.toLayer; therefore the missing metadata aborts MCP-layer construction at runtime, not only in tests.
    • Add the same McpSchema.EnabledWhen / hiddenFromOutsideClients annotation upstream uses to t3_issue_post, t3_issue_inbox, three owner-decision tools, propose_issue_change, request_repository_handoff, t3_request_user_input, and t3_worktree_return_to_root. The invariant and all handler permission checks remain intact.
    • Existing budget tests demonstrated the registration failure before this fix. Production toolkit registration now succeeds. The fork outside-client test additionally confirms that t3_issue_post and delegate_task are unavailable to outside clients, matching upstream's own test. Replay-backed toolkit integration uses disposable databases and fake providers.
    • Refresh the measured context budget: Claude 6,729 bytes; Codex 8,122 bytes; MCP tool-list JSON 79,244 bytes. No tool descriptions or model-facing schemas were edited to fit the budget.
    • All 240 tests / 25 files pass in one consolidated run: AgentContextBudget.test.ts, every toolkit test (including toolkits/core.test.ts), both orchestrator toolkit integration suites, device toolkit, HTTP transport, tool access/races, invocation context and advertised JSON schemas.
    • vp run check:changed 8d1140ebc53587560c9cef159483efe9f22428ed --concurrency "$AGENT_HEAVY_CORES" passes every step for this follow-up: format, lint, both Knip passes, GraphQL, all three affected package typechecks and 11 tests / 4 files. The previous MCP registration/budget gate is resolved. The earlier full-sync adjacent-test timeout remains historical, broader unverified coverage.

    Combined-tree verification at 3f5fe1421f77058887ad672c040174f789c491b4:

    • Measured budget: Claude 6,729 bytes; Codex 8,122 bytes; MCP tool-list JSON 79,439 bytes. These combined-tree values supersede the pre-main-merge measurement above.
    • The read-only admission test accepts starting or running for admitted readers; the fifth reader remains strictly queued, with the exact full-pool note checked. This matches the merged upstream task-status reporting without changing admission behavior.
    • Additional adjacent-test failures are resolved: two fixtures now implement the child-shell read used by fork completion progress, restoring all three wait-budget subscriptions. Upstream #31905 (35b88636d4) model-refusal guidance is shared by requireAdvertisedModel and the fork target validator; provider, role-order and option checks remain unchanged. The bounded suggested-model list and update-required CLI guidance are preserved.
    • The five requested files pass (82 tests); the expanded focused run passes 205 tests / 8 files, including both MCP service suites and project-handler tests. Server and web vp run typecheck both pass.
    • vp run check:changed b5a15b0991d1efd66a40a8ab9baad4c5e3319497 --concurrency "$AGENT_HEAVY_CORES" passes format, lint, both Knip passes, GraphQL, 165 adjacent tests / 12 files and React Compiler checks for both changed web files. Its broad package typecheck reports only the three known mobile errors; server and web are independently green. The five MCP service failures from the first combined-tree run are resolved.

    Initial sync validation at 721ba11236c73ef1da0722bc4cff89fca5243716:

    • Server, web, contracts and desktop typechecking: 4/4 pass.
    • Focused persistence/storage/SQLite/notebook tests: 335 pass / 7 files.
    • Focused issue ownership, delegation, Writer, workspace preparation, silent wake, artifacts and fork VCS tests: 147 pass / 11 files.
    • Frontend project sections, PDF review/viewer, notebook preview, composer transfer, title feedback and actions: 133 pass / 10 files.
    • Runtime wiring, provider sessions and usage-limit recovery: 140 pass / 4 files, including the fork release-cleanup suite. Total focused proof: 755 tests / 32 files.
    • Empty disposable worktree database: upstream migrations 1–96, fork 1–30; reopening at the current schema succeeds; PRAGMA integrity_check returns ok. The live database was not read, copied or written.
    • check:changed: format, lint, both Knip passes, GraphQL generation, dependency-patch installation, 41 script tests, and React Compiler coverage of 697 files pass. Package typechecking reports exactly the three known mobile errors. Its 1,181-file adjacent-test batch reaches the 900-second runner ceiling and is stopped. This broader batch is not verified; it is not represented as passing.

    All heavy jobs have completed or been explicitly stopped before replacement; no development server or paid provider turn was started. Mobile and #418–#422 remain out of scope.

    The only newly added workflow, issue-vouch.yml, has jobs.label.if: false in the merge. All 26 registered workflows remain disabled. GitHub returns 404 for gh workflow disable issue-vouch.yml because it is not on the default branch yet. Apply the GitHub disabled state after landing; the source guard prevents execution meanwhile.

    Complete lost-fork-code audit: 82 hunks plus two replaced files

    Command: scripts/fork-sync/lost-fork-code.py d9c88282ab27d7e0bfa4d9fb1a9d68096c2e77ec 7d32075e3757ded707914e2450c3e392a9665765 3f5fe1421f77058887ad672c040174f789c491b4; 390 shared-change files inspected, 82 hunks flagged, two replaced fork helpers, zero orphaned fork files. Each row below corresponds to one flag in script order. The hunk coordinates identify the fork-side diff from the common base, not current line numbers. Keep includes restyling/restoration; Replace identifies equivalent upstream responsibility. No retirement decision was made.

    # Flagged file / fork hunk Decision Judgment
    1 apps/desktop/src/shell/DesktopShellEnvironment.ts -699 +699,4 Keep Cache-path filtering remains; the platform delimiter is now a local value after upstream consolidated path merging.
    2 apps/desktop/src/updates/DesktopUpdates.ts -567 +575,4 Replace runUpdaterCheck restores upstream downgrade state; forkUpdates.check remains the fork update source. Upstream source.
    3 apps/server/src/mcp/OrchestratorMcpService.ts -2575 +2710,2 Keep delegateTask still applies withNote to preserve workspace notes; main #427 stores that result before appending the full-pool queueNote.
    4 apps/server/src/mcp/toolkits/orchestrator/tools.ts -91 +126 Keep The fork role, isolation, Writer and question-routing description remains, extended by main #427 to report the full repository pool and occupied slots.
    5 apps/server/src/mcp/toolkits/orchestrator/tools.ts -145 +180 Replace BackgroundWaitTool upstream description documents the current background-task contract. The fork wait tool remains registered. Upstream source.
    6 apps/server/src/mcp/toolkits/orchestrator/tools.ts -359,0 +395,115 Keep Independent worker/read-only limits and root-only application remain; main #427 adds the owner-approval instruction before a limit change.
    7 apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts -12740 +12747 Keep The roster assertion now includes native task/tool identity and awaited state; task start time remains present.
    8 apps/server/src/orchestration-v2/CheckpointRollbackService.ts -222,6 +223 Replace restoreMissingWorktree restores missing checkouts; fork managed-path validation still receives the project root. Upstream source.
    9 apps/server/src/orchestration-v2/CheckpointRollbackService.ts -381 +380 Replace withCheckpointRestoreReservation replaces a plain workspace lease and preserves exclusion against turn start. Upstream source.
    10 apps/server/src/orchestration-v2/Orchestrator.ts -6817 +7129 Replace dispatchProviderThread selects the correct prior provider record instead of a direct array search. Upstream source.
    11 apps/server/src/orchestration-v2/Orchestrator.ts -10907 +11316 Keep The cancellation read still includes command items and user messages, now narrowed to the cancelled run with settled leaf nodes omitted.
    12 apps/server/src/orchestration-v2/Orchestrator.ts -13666,10 +14131 Keep The upstream selective-reader pattern is adapted to preserve fork cohort data; it is not a complete behavioral replacement on its own. readDelegatedCompletionPlanRecords keeps the spawning run in runs and resolves both run-owned and thread-owned deliveries through fork completionCohort, loading the queued message, run and reserved tasks. Second-child regression tests cover both paths. Upstream source.
    13 apps/server/src/orchestration-v2/ProjectionControlReads.test.ts -347,3 +348,4 Keep The fixture now provides both layerSessions and upstream layerEvents, preserving the session mock.
    14 apps/server/src/orchestration-v2/ProjectionStore.ts -3436,0 +3623,10 Replace turnItemMatch and upstream type-index selection replace the bespoke recovery-index selector. Upstream source.
    15 apps/server/src/orchestration-v2/ProjectionStore.ts -3455 +3651,3 Replace turnItemMatch and upstream type-index selection replace the bespoke recovery/conversation-index branch. Upstream source.
    16 apps/server/src/orchestration-v2/ProviderSessionManager.ts -881 +934,2 Replace writeReleasedRosterEvents uses conditional writes and rechecks so a replacement session cannot lose its roster. Upstream source.
    17 apps/server/src/orchestration-v2/ProviderSessionManager.ts -913 +967 Replace writeReleasedRosterEvents processes released identities through upstream retry-safe roster cleanup. Upstream source.
    18 apps/server/src/orchestration-v2/ProviderSessionManager.ts -977,0 +1034,14 Replace writeReleasedToolCallEvents and writeReleasedSubagentEvents replace endReleasedSessionWork; they retain cutoff-time and provider-thread checks. Upstream source.
    19 apps/server/src/orchestration-v2/ProviderTurnStartService.ts -658,2 +659,3 Replace restoreMissingWorktree owns missing-checkout recreation and project lookup. Upstream source.
    20 apps/server/src/orchestration-v2/ProviderTurnStartService.ts -663 +665,4 Keep The managed-path check moved into restoreMissingWorktree and still receives project.workspaceRoot.
    21 apps/server/src/orchestration-v2/ProviderTurnStartService.ts -1888 +1926 Replace withTurnStartReservation replaces a plain workspace lease and coordinates with restore reservations. Upstream source.
    22 apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts -59,0 +73 Replace Outcome carries failure status; complete translates failed outcomes back into the fork failed-event field. Upstream source.
    23 apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts -67,0 +82 Keep complete still sets failed: true when input.outcome.status is failed.
    24 apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts -114,0 +130 Replace Outcome uses upstream failed status/message rather than the old private failed variant. Upstream source.
    25 apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts -198 +218 Replace Outcome propagates failure through upstream status and message; automatic evaluation failure bookkeeping remains. Upstream source.
    26 apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts -207 +227,4 Replace complete maps upstream Outcome to the completion event, preserving title and failed fields. Upstream source.
    27 apps/server/src/orchestration-v2/runtimeLayer.ts -332,0 +353,30 Keep The issue services and inbox layers remain. ProjectService is provided before dependent layers are built rather than as a parallel sibling, satisfying upstream worktree restoration dependencies.
    28 apps/server/src/orchestration-v2/testkit/ReplayRuntimeInstructions.ts -59,3 +107 Keep Replay still recognizes <runtime_info>; upstream expanded this to per-session model notes and compaction tracking.
    29 apps/server/src/orchestration-v2/testkit/ReplayRuntimeInstructions.ts -63 +109,18 Keep Replay still preserves the recorded runtime header; it now uses recordedNotes and the session-specific expected notes.
    30 apps/server/src/persistence/Sqlite.ts -110 +114 Keep enableIncrementalVacuum remains layered with setup; setup is now constructed for the database path.
    31 apps/server/src/persistence/Sqlite.ts -115 +119 Replace NodeSqliteClient.layer uses upstream writerWorker; the existing optional checkpointWorker switch is translated to it. Upstream source.
    32 apps/server/src/project/ProjectService.ts -431,2 +545,11 Keep Workspace refresh/root changes are still passed into sidebarLayout.withProjectChange along with section and expansion metadata.
    33 apps/server/src/project/ProjectService.ts -520 +643 Replace withDeletionLock owns deletion locking; fork child deletion still uses the guarded service path. Upstream source.
    34 apps/server/src/provider/CodexProvider.ts -622 +724 Replace probeCodexAppServerProvider consumes upstream config facts including service tier/native usage; fork custom models/plugins remain. Upstream source.
    35 apps/server/src/provider/Drivers/ClaudeSkills.ts -497 +522 Keep Plugin discovery still returns early for no prefix; the returned inventory now also includes upstream inline-plugin names.
    36 apps/server/src/provider/agentContextBudget.json -2,3 +2,3 Replace Replace the stale snapshot with combined-tree measured values from upstream utf8Bytes / layerAdvertisedTools in AgentContextBudget.test.ts: Claude 6,729; Codex 8,122; MCP list 79,439 bytes. This refreshes the expected measurement and removes no model-facing text.
    37 apps/server/src/storageCleanup.ts -1092,3 +1121,11 Keep Managed-root bounds remain, with upstream scratch folders admitted only through the explicit scratch-root path.
    38 apps/server/src/storageCleanup.ts -1095,0 +1133,2 Replace isLinkedWorktree replaces a .git file-type check and handles valid symlinked metadata. Upstream source.
    39 apps/server/src/storageCleanup.ts -1175 +1213 Keep Issue retention still blocks removal until merged/integrated; upstream branch reconciliation also permits its merged-removal policy.
    40 apps/server/src/storageCleanup.ts -1356,0 +1440,88 Keep Deleted linked-worktree cleanup remains; branchless upstream scratch-folder cleanup is now included rather than filtered out.
    41 apps/server/src/terminal/Manager.ts -2458 +2476,4 Replace resolveShellCandidates became effectful upstream; inline-shell candidate filtering still receives the resolved candidates. Upstream source.
    42 apps/server/src/vcs/GitVcsDriverCore.ts -4506,5 +4541,6 Replace releaseWorktreeRegistration and onWorktreeClaimed add upstream ownership locks/cancellation handling around the fork placement function. Upstream source.
    43 apps/server/src/vcs/GitVcsDriverCore.ts -4543,2 +4582,2 Replace releaseWorktreeRegistration cleans a cancelled registration before branch deletion; claimed worktrees survive later cancellation. Upstream source.
    44 apps/web/src/components/CommandPalette.tsx -674,0 +705,23 Replace getAddProjectInitialQuery replaces directory-string formatting; the fork section-folder choice still supplies its input. Upstream source.
    45 apps/web/src/components/CommandPalette.tsx -1899,0 +2030,33 Replace getAddProjectInitialQuery also handles the palette folder browse query; section-aware creation remains. Upstream source.
    46 apps/web/src/components/Sidebar.logic.ts -1260 +1444,6 Replace hasUnseenRunFailure replaces the fork local unseen-failure predicate in status presentation. Upstream source.
    47 apps/web/src/components/Sidebar.tsx -2451,0 +2663 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    48 apps/web/src/components/Sidebar.tsx -2452,0 +2665 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    49 apps/web/src/components/Sidebar.tsx -2455 +2668 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    50 apps/web/src/components/Sidebar.tsx -2457 +2670,8 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    51 apps/web/src/components/Sidebar.tsx -2469,0 +2690 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    52 apps/web/src/components/Sidebar.tsx -2782,0 +3016 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    53 apps/web/src/components/Sidebar.tsx -2785 +3019 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    54 apps/web/src/components/Sidebar.tsx -2786,0 +3021,2 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    55 apps/web/src/components/Sidebar.tsx -2889,0 +3126,7 Keep The context-menu call now passes upstream mouse provenance; the same scoped thread and position remain.
    56 apps/web/src/components/chat/ChatMarkdownMedia.tsx -405,0 +413,23 Keep Image error paths still use the resource path or original URL fallback, through the upstream resource union.
    57 apps/web/src/components/chat/ChatMarkdownMedia.tsx -426,8 +456 Keep Image sourcePath still uses the resource path or original URL fallback.
    58 apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx -162 +175 Keep Question focus still excludes editable targets and question popups; upstream adds other interactive-target exclusions.
    59 apps/web/src/components/chat/MarkdownCodeBlock.tsx -189 +190 Replace MarkdownCodeBlock.handleCopy uses upstream trailing-newline normalization; fork run controls remain. Upstream source.
    60 apps/web/src/components/chat/ThreadRelationshipsControl.tsx -487,0 +556,23 Keep The relationships graph still loads parent/child projections, using quiet projection hooks and upstream lineage data.
    61 apps/web/src/components/chat/TimelineWorkGroupRows.logic.ts -10,6 +10 Replace Upstream formatWorkingTimerNow and shared formatDuration replace the local elapsed formatter. Upstream source.
    62 apps/web/src/components/chat/TimelineWorkGroupRows.logic.ts -19 +14 Replace Upstream formatWorkingTimerNow applies toServerClock to its current time. Upstream source.
    63 apps/web/src/components/chat/canvasStore.test.ts -43 +43 Replace resolveThreadDetailsCardLayout upstream lane measurements change the test width; the fork minimum chat width remains. Upstream source.
    64 apps/web/src/components/chat/threadDetailsCardLayout.ts -25 +30 Keep Layout still accepts lane padding and preserves the fork 400px minimum chat width alongside the upstream lane shape.
    65 apps/web/src/components/chat/threadDetailsCardLayout.ts -33 +38 Keep The fork minimum chat width is applied using upstream narrowest-lane sampling during resize.
    66 apps/web/src/components/files/FilePreviewPanel.tsx -251,0 +261,8 Keep Explicit reveal refresh remains; upstream useAssetUrlState owns workspace-mutation refresh separately.
    67 apps/web/src/components/files/FilePreviewPanel.tsx -258 +275 Keep Viewer revision still includes revealRequestId and now also the upstream settled mutation identity.
    68 apps/web/src/components/files/PdfViewer.browser.test.tsx -162,0 +205,137 Replace testPdf is the upstream shared PDF fixture; page/offset/zoom restoration assertions remain. Upstream source.
    69 apps/web/src/components/sidebar/SidebarThreadRow.tsx -731 +714 Replace resolveSidebarRowStatus supplies upstream acknowledgement-aware status, still wrapped by fork child-needs handling. Upstream source.
    70 apps/web/src/composerDraftStore.ts -4275,4 +4335,5 Keep Content transfer keeps the source prompt and terminal/issue references; upstream content and upload metadata helpers supply the moved content.
    71 apps/web/src/hooks/useThreadActionMenu.ts -255,2 +266,3 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    72 apps/web/src/hooks/useThreadActionMenu.ts -258,3 +270,10 Replace Upstream regenerateTitle and threadTitleRegenerationToast own command completion and manual/bulk feedback; fork automatic title evaluation remains. Upstream source.
    73 apps/web/src/state/entities.ts -343,0 +344,15 Replace Upstream regenerateTitle awaits the command outcome and threadTitleRegenerationToast reports it, replacing the fork shell-event waiter/feedback helper. Automatic title evaluation remains. Upstream source.
    74 docs/orchestration-v2/orchestrator-mcp-server.md -242 +242 Replace OrchestratorMcpDelegateTaskInput is imported from contracts instead of a duplicated interface; fork role fields remain there. Upstream source.
    75 docs/orchestration-v2/orchestrator-mcp-server.md -247,0 +248 Replace OrchestratorMcpDelegateTaskInput retains isolation in the contracts-owned schema. Upstream source.
    76 docs/orchestration-v2/orchestrator-mcp-server.md -300,0 +324,2 Replace OrchestratorMcpDelegateTaskResult retains branch/worktreePath in the contracts-owned schema. Upstream source.
    77 docs/orchestration-v2/orchestrator-mcp-server.md -302,0 +328 Replace OrchestratorMcpDelegateTaskResult retains workspaceNote in the contracts-owned schema. Upstream source.
    78 packages/client-runtime/src/state/threadShell.ts -141 +152 Keep Subagent request detection is still routed through the fork owner-visibility predicate, then upstream rolledUpRequest marks user-only requests.
    79 packages/client-runtime/src/state/threadShell.ts -316 +332 Keep The same owner-visibility detection remains in thread atoms, now wrapped with upstream rolledUpRequest.
    80 packages/effect-codex-app-server/src/protocol.ts -478,0 +481,5 Replace makeCodexAppServerPatchedProtocol wraps stream defects in upstream CodexAppServerTransportError with the same read-input-stream operation. Upstream source.
    81 packages/provider-core/src/server/orchestrationInstructions.ts -31,0 +37,109 Keep Fork repository orchestration, issue ownership, typed issue changes and independent pools remain; main #427 extends the instructions with explicit approval and root/application rules for pool limits.
    82 packages/shared/src/agentAwareness.ts -99 +110 Keep Owner visibility is still passed into resolveThreadAwarenessPhaseV2; upstream rolled-up subagent requests now supply its pending-request argument.
    83 apps/server/src/orchestration-v2/ReleasedSessionWork.ts Replace The unused ReleasedSessionWork.ts implementation is removed because upstream ProviderSessionManager.writeReleasedToolCallEvents and writeReleasedSubagentEvents now own all release cleanup. Upstream source.
    84 apps/web/src/components/titleRegenerationFeedback.ts Replace Upstream regenerateTitle awaits the command outcome and threadTitleRegenerationToast reports it, replacing the fork shell-event waiter/feedback helper. Automatic title evaluation remains. Upstream source.
  3. tannerpolley commented on Nov 16, 2026

    @tannerpolley
    OwnerAuthor

    T3 Code closeout: done

    Issue: #417 Sync with upstream nightly v0.1.10-nightly.20261116.4800, with a behavior replacement ledger
    Thread: thread:delegated-task:command%3Amcp%3Abb4592fc-a5b1-434a-94e6-fdbd212a677b%3Adelegate-task%3Aissue-417-upstream-sync-2026-11-16-b
    Model: gpt-6.1-sol
    Branch: sync/upstream-2026-11-16
    Completed: 2026-11-16T22:43:55.520Z

    Opened draft PR #428 from sync/upstream-2026-11-16. It contains a real merge preserving the nightly parent, and GitHub reports it mergeable.

    Posted the behavior replacement ledger and complete audit on #417: 77 flagged hunks and two replaced helpers, each judged. No product behavior was retired, and #418–#422 remain separate. The fork guide now correctly describes manual syncs.

    Verification:

    • 755 focused tests passed across 32 files.
    • Server, web, contracts and desktop typechecks passed.
    • The empty disposable database applied all 96 upstream and 30 fork migrations, reopened successfully, and returned integrity_check: ok. Live userdata was untouched.
    • check:changed passed format, lint, unused-code checks, GraphQL generation, patch checks, script tests and React Compiler coverage. It reported the three known mobile errors; its 1,181-file test batch timed out at 900 seconds and remains unverified.

    All 26 registered workflows remain disabled. The new workflow has if: false; GitHub’s disable endpoint returns 404 until it reaches the default branch, so its remote disabled state remains a post-merge step. Independent review and the primary agent’s integrated client pass remain open.

    PR #428, head 721ba11, checks and reviews focused checks pass; known mobile errors and broad test timeout documented; no hosted checks or reviews.

  4. tannerpolley commented on Nov 16, 2026

    @tannerpolley
    OwnerAuthor

    T3 Code closeout: done

    Issue: #417 Sync with upstream nightly v0.1.10-nightly.20261116.4800, with a behavior replacement ledger
    Thread: thread:delegated-task:command%3Amcp%3Abb4592fc-a5b1-434a-94e6-fdbd212a677b%3Adelegate-task%3Aissue-417-upstream-sync-2026-11-16-b
    Model: gpt-6.1-sol
    Branch: sync/upstream-2026-11-16
    Completed: 2026-11-16T23:21:50.603Z

    Fixed both defects and pushed commit 02f797b95b to draft PR #428.

    • Ordinary delegated completions retain the spawning run in the planner projection, so the second child joins the existing queued delivery.
    • Managed issue-worker completions load the thread-owned cohort and delivery records, so the queued message includes both results before either is marked delivered.
    • Each regression was demonstrated failing before its fix and passing afterward. The changes stay within the reader’s boundary.

    Updated the behavior ledger on #417 and PR verification notes.

    Verification has open gates:

    • Server typecheck passes.
    • The seven completion, recovery and Writer-routing files report 127 passed, 1 failed. The remaining “holds a follow-up open while the child's own subagent still runs” failure also reproduces with the original sync reader at 721ba11236.
    • check:changed passed format, lint, unused-code, GraphQL, script and React Compiler checks. Typechecking reports only the three known mobile errors; its 1,182-file test batch timed out after 900 seconds.

    All background jobs finished. The checkout is clean. No force-push or merge of main was performed.

    PR #428, head 02f797b, checks and reviews local verification has the open gates above; no hosted checks or submitted reviews.

  5. tannerpolley commented on Nov 16, 2026

    @tannerpolley
    OwnerAuthor

    T3 Code closeout: done

    Issue: #417 Sync with upstream nightly v0.1.10-nightly.20261116.4800, with a behavior replacement ledger
    Thread: thread:delegated-task:command%3Amcp%3Abb4592fc-a5b1-434a-94e6-fdbd212a677b%3Adelegate-task%3Aissue-417-upstream-sync-2026-11-16-b
    Model: gpt-6.1-sol
    Branch: sync/upstream-2026-11-16
    Completed: 2026-11-16T23:31:03.504Z

    Fixed and pushed 8d1140ebc5 to PR #428.

    The fork’s result selector filtered only directly tagged runs, omitting upstream’s untagged wake for a grandchild’s completion. It now uses upstream delegatedTaskRuns before applying fork promotion and recovery handling. The pending-result check also restores upstream delegatedTaskAwaitsWork. No semantic conflict or test change was needed.

    All 128 tests in the seven requested files pass, including the unchanged upstream follow-up hold test and both cohort-delivery regressions.

    Updated the ledger on #417, correcting the earlier failure classification to sync regression.

    One separate gate remains: check:changed passes format, lint, unused-code, GraphQL and affected-package typechecks, but both AgentContextBudget.test.ts cases fail because tool registration rejects exposing t3_issue_post to outside clients. Those failures also reproduce at the previous PR head without this fix; they remain unresolved.

    The checkout is clean, all background jobs finished, and main was not merged.

    PR #428, head 8d1140e, checks and reviews completion tests pass; agent-context gate remains open; no hosted checks or submitted reviews.

  6. tannerpolley commented on Nov 16, 2026

    @tannerpolley
    OwnerAuthor

    T3 Code closeout: done

    Issue: #417 Sync with upstream nightly v0.1.10-nightly.20261116.4800, with a behavior replacement ledger
    Thread: thread:delegated-task:command%3Amcp%3Abb4592fc-a5b1-434a-94e6-fdbd212a677b%3Adelegate-task%3Aissue-417-upstream-sync-2026-11-16-b
    Model: gpt-6.1-sol
    Branch: sync/upstream-2026-11-16
    Completed: 2026-11-16T23:51:56.602Z

    Fixed and pushed b5a15b0991 to PR #428. The MCP registration and budget gate is resolved.

    Upstream #32764, commit f28c74a7d0 added the check. It runs during production MCP layer construction, so the missing metadata causes a runtime registration failure, not merely a test failure.

    Added upstream’s McpSchema.EnabledWhen: hiddenFromOutsideClients annotation to nine caller-bound fork tools, including t3_issue_post. The registration guard and handler permission checks remain intact. Tests confirm outside clients cannot access t3_issue_post.

    Updated the measured budget to:

    • Claude system append: 6,729 bytes
    • Codex additional context: 8,122 bytes
    • MCP tool-list JSON: 79,244 bytes

    Verification passed: 240 tests across 25 files, including the budget, core and MCP toolkit suites. check:changed also passed every step against the previous PR head. Updated the ledger on #417 and PR notes.

    One integration gate remains: current main conflicts only in agentContextBudget.json. I left main unmerged as requested. The combined tree will need its budget remeasured when that conflict is resolved. All background jobs finished; the checkout is clean.

    PR #428, head b5a15b0, checks and reviews local MCP checks pass; budget merge conflict remains; no hosted checks or submitted reviews.

  7. tannerpolley commented on Nov 17, 2026

    @tannerpolley
    OwnerAuthor

    T3 Code closeout: done

    Issue: #417 Sync with upstream nightly v0.1.10-nightly.20261116.4800, with a behavior replacement ledger
    Thread: thread:delegated-task:command%3Amcp%3Abb4592fc-a5b1-434a-94e6-fdbd212a677b%3Adelegate-task%3Aissue-417-upstream-sync-2026-11-16-b
    Model: gpt-6.1-sol
    Branch: sync/upstream-2026-11-16
    Completed: 2026-11-17T00:11:33.938Z

    Merged origin/main into the sync branch with normal merge commit 3f5fe1421f and pushed it to PR #428. GitHub now reports the draft PR as mergeable.

    The combined tree retains #427’s queueNote and limit-ask instruction. Remeasured budget:

    • Claude: 6,729 bytes
    • Codex: 8,122 bytes
    • MCP tool-list JSON: 79,439 bytes

    All five requested test files passed. The expanded focused run passed 205 tests across eight files, and both server and web typechecks passed. check:changed passed all 165 adjacent tests and its other checks except the three known mobile type errors.

    The broader check also exposed incomplete MCP fixtures and lost upstream model-refusal hints; both are fixed and tested. Updated the ledger and PR evidence. The checkout is clean and all background jobs finished.

    PR #428, head 3f5fe14, checks and reviews requested checks pass; known mobile errors only; no hosted checks or submitted reviews.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions