Repository navigation
Conversation
Fork-owner: direction Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: glossary Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: data-foundation Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: branding Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: query-interrupt-retry Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: partial-clone-remotes Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: macos-temp-realpath-tests Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: secret-store-atomic-create Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: launcher-test-fixtures Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: legacy-terminal-labels Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: login-shell-capture Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: grok-reasoning-effort Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: grok-background-command-end Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Upstream overlap reportBase: 67fdc53 Target: 4c3a9d5 Scanned 4 upstream commit(s). Copy this report into the absorption PR. For EVERY match replace PENDING with one decision and a rationale: keep ours; adopt upstream and delete ours; merge both. Record removed paths or the combined behavior and proof. No matches is not proof of no semantic overlap. spectrumRun council and free Spectrum conversations with durable server-authored transcripts and exact-run barriers.
directionKeep the fork mission and completion criteria explicit. No matches. glossaryKeep Chromeria and its product family terminology consistent. No matches. brandingGive desktop, web and the iOS app the Chromeria name, icons and independent identity. No matches. fork-maintenanceKeep the fork stack small, checked and rebasable on GitHub-hosted CI, including required upstream compatibility repairs.
claude-steer-queueQueue routine agent steers into Claude instead of cancelling running tools and reporting that as a user refusal.
urgent-steering-interruptionUse Stop's native scope for urgent agent restart or human Steer, while routine Claude updates queue and interruption context names the requester.
query-interrupt-retryRead an environment query again when the server answers it with an interrupt it did not choose, instead of showing the interrupt as an error. No matches. partial-clone-remotesParse No matches. provider-auto-updateLet each environment opt in to installing provider CLI updates through the same upstream update path as the Update button, regardless of provider activity.
data-foundationIsolate the Chromeria V2 database, retain passive legacy tables and deferred settings data and provide shell-only backfills and fork-origin PR lookup. Retain the mobile legacy file-cache import that upstream removed in 67661cf until every Chromeria mobile client has run it, then remove it (#620).
issues-browseList GitHub Issues of all project repositories beside PRs, with filters, parent tree and a side panel.
issues-linksLink GitHub Issues to threads, show them beside PRs and start a linked thread from an Issue.
issues-statusCompute each Issue's status from GitHub, links and thread activity; group and filter the Issues view by it and wire linked threads and Start thread.
issues-open-linksOpen GitHub /issues/N links and an Issue's pull requests in the app: the PR panel for pull requests, the Issues panel for Issues, the browser otherwise. No matches. thread-peopleLabel devices, filter threads by person and share threads, as views without access control.
child-threadsCreate native children in any project, handle descendant requests, preserve durable subtree Stop and restart outcomes, offer parked delegated completions on explicit resume, retain upstream held-queue semantics until queue resume, and expose guarded agent queue resume.
child-follow-up-wakeDeliver each finished requested follow-up once and rearm its parent wake while reusing the original delegated task and preserving its first result; exclude Monitor wakes. Upstream #17696 (c572cb7, already absorbed) fixes #13490 by creating fresh tasks, so it does not replace this adaptation. Retire when upstream preserves the same task identity and first result with equivalent per-run delivery, or the fork adopts its fresh-task lifecycle and the retained regressions pass. No matches. grok-background-command-endFinish Grok replies independently of background shells, track command ends on standalone and shared session methods, and keep command prose out of subagent identity (#435). Carries upstream #17144's command-end recognition plus fork Monitor wake reports, assertions and module-local fixture prompts. When #17144 merges, preserve these fork changes.
grok-reasoning-effortRun Grok ACP threads at the selected reasoning effort. Carries upstream pingdotgg/t3code#15319 unchanged; drop this edit and take upstream's when #15319 merges.
prism-toolkitRoute upstream delegation and top-level launches through one Prism service and coordinate persisted same-provider/model recovery with immutable per-run outcomes, indexed admitted continuation sources and current recovery intent. Recover event changes only for their thread and parent; retain startup catch-up and the shared scheduler for unresolved recovery. Own Chromeria autoResumeLimitedThreads=true; Wight consumes it and saved false overrides remain respected.
prism-settingsKeep scoped Prism kits for the delegated roles (Planner, Researcher, Designer, Worker lanes, Computer use, Roast, Reviewer, Judge) and the stored Promachos kit on its own page editable with ordered Color lists and saved settings replay. Removed role kits drop at decode; stored records that name a removed role read as its successor. Project overrides are partial role maps over the environment kits; each page resets only its own kits.
run-groupsLet one delegate_task call run several Colors of a read-only Prism role (Researcher, Designer, Roast, Reviewer, Judge) as one Run group: one command commits every member that can start, members share the caller's checkout, and the parent wakes once after every member is terminal. task_status and task_cancel take the groupId or a member; Run 1 keeps the single-task result. No matches. tool-instructionsGive every provider runtime consistent visible T3 delegation and Prism routing/recovery guidance. No matches. prism-stream-clockMeasure attempt-owned provider activity in memory and persist one idempotent healthy sample per finished provider turn across restarts, without importing v1 activities. No matches. prism-stale-turn-detectorSend one advisory parent notice for a silent active child; exclude host suspension, open tools and retired or waiting work. V2 and Prism recovery retain terminal failure delivery. No matches. wight-modeContinue idle threads until their timer or instance quota pauses them, preserving retirement and stored effort.
promachos-modeChat with the Promachos in bubbles from his persona home, using Prism for the initial launch.
scheduled-tasksExtend upstream's single scheduler with outcome checks that keep one thread working until a pinned check passes, one-shot and weekly triggers, Prism roles, shell command tasks with failure alerts, the Spectrum report completion fence, and the Chromeria v1 task import.
settings-markMark settings that Chromeria adds so the user can tell them from upstream T3 settings.
thread-parent-crumbsShow a child thread's parent and siblings in its header. No matches. contextmd-servingServe ContextMD's stored rules and Great Library pointer to agents in Chromeria threads through thin harness hooks and native session boundaries, with serving state, settlement and the serving log in the environment.
single-run-statusRead only the current run for provider turn-start and finalization status guards, preserving recovery reads for inherited background work. Drop when upstream uses equivalent filtered status reads. No matches. bounded-stored-event-replayReplay stored orchestration events from an explicit cursor through the paged event-store read, so a missing cursor cannot decode the whole log. No matches. feature-mapDraw a project's docs/map.md in a right-panel Map tab, each part coloured planned, working, broken or done from GitHub, with live base parts, scoped Chromeria marks, working-thread icons and a gaps list. No matches. macos-temp-realpath-testsInstall ownership tests compare the resolved temp root, because the server reports the real npm prefix and macOS temp dirs sit behind the /var symlink. Drop when upstream resolves the same paths in these tests. No matches. secret-store-atomic-createServerSecretStore.create writes the complete secret to a temporary file and hard-links it into place, so a creator that loses the race never reads a half-written secret. Drop when upstream makes create atomic. No matches. peer-linksPort upstream server peer links and record-first remote delegation until absorption replaces the port; retain permanent pairing-code sessions, target Prism launch intent and recovery-aware waits. Extend routing to all MCP toolkit groups while retaining caller capabilities and link-mode narrowing. Own explicit peer consent, including its mobile settings entry and destination permission checks. Replay delegated lifecycle results durably and open qualified destination work through the source client connection. Bind negotiated requests to verified durable caller identity, transfer attachment bytes through destination staging, reconcile native acceptance and retain truthful unknown outcomes for unreconcilable effects. Surface qualified descendant questions and approvals through verified mixed ancestry and the authenticated source client, with native revision guards and receipt replay. Keep source viewers and question choices readable across clients, with exact transport diagnostics behind a disclosure. Align sparse remote follow-up selection with full projections so initial work appears once. Execute typed device commands on their exact native session with current originating authority, pre-open authenticated command discovery and qualified native artifact output. Retain real remote-parent provenance in client shells, hide destination delegated children from default navigation and keep them in scoped existing search even when the parent is offline. Apply default-child hiding to phone Home, Promachos conversations and legacy rendered/jump lists while keeping existing search on full qualified shells. Open source-owned browser and device viewers through current resource-bound relays, acquire verified qualified inputs and results, and preserve exact session lifecycle across web, desktop and mobile. Keep accepted destination schedules and Spectrum rounds local within immutable contributor bounds, and recover exact disable acknowledgements after ordinary link retirement.
nested-cli-startupCarry upstream's connected-IPC gate so t3 in agent shells ignores an ancestor's launcher context. Drop this port when upstream PR #14263 is absorbed. No matches. paired-session-renewalKeep paired desktop, web and mobile sessions active through rotating device-held renewal authority, with headless approval for existing devices. No matches. thread-tool-policyEnforce opt-in exact tool allowlists and private per-thread HTTP MCP attachments independently of bare launch, rejecting harnesses and modes without native enforcement. Drop when upstream provides equivalent restrictions and durable private attachment configuration.
bare-launchStrip removable harness context, admit only named additions within caller permissions, and retain durable intent and honest native receipts across launch and recovery paths.
no-project-sidebarKeep temporary projectless threads in a collapsed sidebar section across web, desktop and native mobile. No matches. rejected-connect-linkPreserve environment-credential tunnel recovery after service shutdown on top of native rejected-link state and explicit CLI relink. No matches. network-routesLearn usable T3 Connect fallback routes from the signed-in account while preserving direct routes and sign-out cleanup. No matches. unchanged-turn-itemsIngest shared-session turn-item deliveries once across overlapping run observers, and skip unchanged snapshots at the event sink; carried upstream fix. No matches. parent-run-observersLeave app-owned child event ingestion with its own run so later parent roots release their observers at terminal; preserve native background draining and durable parent wakes. No matches. agent-web-researchRead research pages through one caller-gated MCP service with full text, typed failures, isolated headless rendering for thin/consent pages, a shared page cache, an origin limiter and provenance; optionally share one linked environment's reader with caller limits and cache ownership preserved; use a pinned zero-charge TinyFish fallback with shared quotas and bounded, nonpersistent hosted continuation; fan out locale/site discovery through SearXNG and pinned TinyFish search with per-engine health, shared spacing and budgets, and no stored SERPs. Explicit default-off session reads reuse an existing profile tab on its owner, with caller/session-private continuation and no enforced pacing.
login-shell-captureKeep installed harnesses available when the desktop login-shell capture is slow or fails, and let the server try again only when that capture did not return a PATH. No matches. legacy-terminal-labelsPreserve embedded legacy terminal labels after supplementary Unicode letters across Node runtimes. No matches. launcher-test-fixturesStop launcher test fixtures on IPC owner loss and await captured child exits during teardown. Drop when upstream provides equivalent fixture lifetime handling and regression coverage. No matches. menu-escape-focusPreserve Escape focus return when the pointer rests over a closing menu. Drop the BaseUI patch and exact version pin after upgrading to a release with equivalent late-hover-close protection, such as mui/base-ui#4893, and proving pointer-over Escape plus hover, submenu and outside-focus controls pass without the patch. Retain regression coverage until upstream provides equivalent tests.
preview-chrome-identityApply a paired Chrome identity to listed preview main-frame navigations without holding their requests, reconcile aborts with the committed page and restore after debugger reattachment. No matches. execution-purposePin typed Issue or PR purpose at run admission and retain supported native causal evidence without treating job binding as outcome ownership.
chrome-login-mirrorContinuously mirror macOS Chrome cookies into persistent desktop partitions and authenticated environment browser profiles, preserving source-only removals and complete partition keys.
usable-secret-requestsrequest_secret asks for 1-5 named fields on one card and returns a private 0600 file per field under the environment's state directory, plus a one-use secretRef for one-field requests. Answers run one at a time, values are kept exactly as typed, and files expire through the existing secret sweep. Drop when upstream returns usable secret values to agents. No matches. outside-agent-oauth-grantsApprove renewable outside OAuth clients until revoked, with fixed project-id and operation limits. Drop when upstream supports durable scoped outside-agent grants. No matches. preview-credential-fillpreview_fill_credential fills a login input in a server browser tab from the environment's rbw vault (credentialVault server setting) after an https and item-origin check, and returns only the outcome. The fill puts the tab's opener group in a login: every read is refused and session state shows Login in progress, until preview_end_login closes those tabs. Each attempt appends a value-free audit line. Drop when upstream fills credentials without exposing them to agents.
remote-secret-requestsRelay private source-client answers to a destination-owned one-use webhook request with durable retirement and receipt recovery.
preview-chrome-for-testingRun preview, research and HTML render browsers on pinned full Chrome for Testing instead of chrome-headless-shell, unpacked with checked symlinks so the macOS bundle installs. Agent tabs launch with one reduced Chrome identity (launch flag plus matching client hints) checked against the pin, the GPU on, and a reserved keep-alive page per persistent profile that the cookie mirror borrows. Agent tabs stream from the server browser; only a person's tab is hosted natively by the desktop. Carries pingdotgg/t3code#19919 so a person's tabs in background threads host natively; drop its files from this entry at the next absorption that includes it. Drop when upstream installs full Chrome for Testing safely with an equivalent identity and keep-alive. No matches. preview-tab-settlementClose a settled thread's unwatched agent tabs through the existing browser cleanup path, preserving human tabs and profile login quarantine. Drop when upstream closes equivalent tabs on thread settlement. No matches. page-subscriptionsRetain generic caller-authored page subscriptions after their creating turn, with exact-opening callback fences and a browser-free replay read for authorized named watches. Drop when upstream supports equivalent retained subscriptions. No matches. |
Review: round 3 @ 31f395dVerdict: FAIL (one blocking defect, otherwise clean). Blocking
Verified clean
Not runLocal tests skipped once CI showed the blocker; CI Test jobs were still pending at review time. |
Fork-owner: provider-auto-update Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: bounded-stored-event-replay Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: settings-mark Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: thread-people Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: issues-browse Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: issues-links Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: issues-status Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: issues-open-links Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: no-project-sidebar Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: rejected-connect-link Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: execution-purpose Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: prism-toolkit Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: run-groups Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: peer-links Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: scheduled-tasks Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: spectrum Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: wight-mode Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: promachos-mode Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: thread-tool-policy Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: thread-parent-crumbs Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: feature-map Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: menu-escape-focus Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: preview-chrome-identity Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: chrome-login-mirror Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: usable-secret-requests Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: outside-agent-oauth-grants Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: preview-credential-fill Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: preview-chrome-for-testing Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: agent-web-research Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: remote-secret-requests Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: preview-tab-settlement Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: page-subscriptions Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: tool-instructions Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
Fork-owner: fork-maintenance Fork-source: 73aa23010bb21e3b729bfedd7fd15867ab96510d Fork-base: 6577c6b Fork-registry: 73aa23010bb21e3b729bfedd7fd15867ab96510d
31f395d to
41a5439
Compare
Review: round 3 fix @ 41a5439Verdict: PASS. The blocking finding from the review of 31f395dd00 is resolved, and nothing else changed.
Reviewer: the coordinator (Claude Opus 5.5), who did not author this fix. CI on 41a5 owns typecheck and tests. |
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: unavailable · PR result: Scenario and decoded snapshot size10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
What: DO NOT MERGE proof PR for round 3: candidate C3
31f395dd001416d4bf3385a49f9480a6b42639ddis the 59-owner fork stack from round-2 C27f109cb526d7f142edb63fb7e25fae0f01d55b33replayed onto upstream T34c3a9d58184f20bd76833bd599c3544d2c09e3eb.Why: Upstream moved 4 commits past T2
67fdc53823894f96e5946da80fac5b6c34c0487dwhile C2 (#651) was in CI.So what: The coordinator on #636 owns exact-head CI, reviews and guarded landing; this PR proves C3's native ancestry and CI only.
Refs #636. Base
proof/636-upstream-4c3a9d5818is pinned at T3, so CI checks C3's native ancestry. Never merge: a squash would discard upstream history.67fdc53823894f96e5946da80fac5b6c34c0487d7f109cb526d7f142edb63fb7e25fae0f01d55b334c3a9d58184f20bd76833bd599c3544d2c09e3eb31f395dd001416d4bf3385a49f9480a6b42639ddReplay:
git rebase --onto T3 T2of C2 in worktreeabsorb-636-r3, rerere on with autoupdate off (no reused resolution). 59 owner commits, zero merges. The only other change from C2 is the reviewer's non-blocking nit from the 7f10 re-review, folded into prism-toolkit. The rollback test now starts withDROP INDEX IF EXISTS, and it fails on 6d05'sRecoveryHistory.tswithUNIQUE constraint failed: index 'fork_prism_continuation_source', the real cause.Conflict decisions
apps/server/src/server.tsProviderInstallation.layerand the fork'sProviderAutoUpdate.layer. They are distinct services: install/remove/account check vs the fork's once-per-run updater.The replayed provider-auto-update commit was committed with
--no-verify. Its pre-commit knip could not loadapps/mobile/metro.config.jsin that mid-stack snapshot, and docs/fork.md notes intermediate snapshots may not build. Format, lint, knip and both fork checks run on the final head and in CI.Overlap triage
node scripts/fork-features.mjs report T2 T3: 4 commits, 51 rows. 13 paths overlap betweenT2..T3andT2..C2:server.ts,ws.ts,ws.test.ts,AcpAdapterV2.test.ts, the testkit fixtures index, settings panel/search/nav, client-runtimestate/server.ts, contractssettings.ts, provider-acpadapter.ts,pnpm-lock.yaml. Every path match is "merge both". The conflict is above; the rest merged cleanly. Keyword-only rows are mechanically "keep ours". No fork capability was absorbed or deleted. The full report with decisions is in the comment below.Fork-owned model-facing text vs 7f10
Compared
git diff T2 C2withgit diff T3 C3per file (changed lines only) for all 17 model-facing files:orchestrationInstructions.ts,forkToolInstructions.ts, the 14apps/server/src/mcp/**/tools.ts,orchestratorMcp.ts, plus prompt files. Every fork delta is identical, and upstream T2..T3 changed none of them. Affected eval case ids: none.Proof
bash scripts/fork-check.sh --base T3bash scripts/fork-check.sh --upstream upstream(upstream/main = T3)pnpm install --frozen-lockfile(pnpm 12.14.0)RecoveryHistory.integration,providerAutoUpdate,providerInstallation,ws,AcpAdapterV2settingsSearch.test.tsvp run typecheckfor t3 server, contracts, client-runtime, shared, provider-acp, provider-cursorNo repo-wide local sweeps, no main push, no version bump; round-2 branch untouched.
browser doc: no user-visible change
Requirements and who asked: Coordinator's round-3 brief under the user's standing absorption authority: replay C2 onto T3 with the same rules, fold the reviewer's nit if trivial, open a native proof PR.
Deleted: Model evals (no fork model-facing delta changed), local repo-wide sweeps, and touching the round-2 branch.
Bottleneck: Exact-head CI on C3, then reviews and landing.
Checked myself: Resolved the conflict after reading both services, and ran the tests of every resolved or folded path. Confirmed the nit's test fails on 6d05 for the UNIQUE cause. Ran typecheck, both fork checks and the per-file model-facing comparison.
Work: Claude Opus 5.5, Claude Code harness.
🤖 Generated with Claude Code