Skip to content

chore(upstream): sync T3 Code before New Orchestrator - #67

Merged
Mjones13 merged 59 commits into
mainfrom
sync/upstream-before-orchestrator-20261002
Oct 3, 2026
Merged

Mjones13 merged 59 commits into
mainfrom
sync/upstream-before-orchestrator-20261002

Conversation

@Mjones13

@Mjones13 Mjones13 commented Oct 2, 2026 •

Copy link
Copy Markdown
Contributor

Problem

Bring Jones Code through the upstream changes immediately before New Orchestrator, so the earlier integration can be assessed separately from the orchestrator replacement. This PR delivers the owner-requested first source-sync batch. Runtime updates and New Orchestrator integration remain separate steps. Owner-authorized merge completed as cbc1632fed6c3569063be6cd787bb32ea12e0172; the pinned upstream cutoff remains 024d49520eadb24cc2f2cef0b0a82c33f0290813.

Change

Merge 57 upstream commits through 024d49520, the actual parent of the New Orchestrator squash. Upstream PR #2829 is excluded. The merge parents are Jones main 14811831cc8ca090257d3b8ddd127a2841179c40 and that cutoff.

Resolved all ten conflicted paths:

  • Combine upstream Working/projectless sidebar behavior with Jones workstreams, Operating views, active ordering and drag/lifecycle rules.
  • Keep native creation authority and terminal ownership guards while accepting the additive project/Scratch/RPC helpers.
  • Retain Jones PR evidence requirements and the reviewed three-workflow set. CI uses hosted Ubuntu/macOS, six serial server shards and complete aggregate Check coverage. Client-runtime retains its separate step after the parallel package batch. The four deferred release/preview workflows stay deleted.

Repair the two integration seams exposed by audit/typecheck: pass Jones runtime context to the new Claude task event, and provide a fail-on-unexpected-use Git mock in the native-bootstrap fixture. Update the workstream test for upstream's “Add project” label.

Provider identity/continuity, native authority, queues, quotas, goals, devices and the six separate Jones migrations remain preserved. Existing PR #61 overlaps OrchestrationEngine; #63 overlaps the remote-performance benchmark. Their branch changes are not incorporated. Newly opened #66 has no exact incoming-path overlap.

Verification

Source-integration head 3a1bfef9c78b0ce8d5b199fb3096f8e8b029adba, tree 1ade5b0f5c7a1ea8fa5b6594f17464fce7bd214e. Current PR head 372112dab1af41cccc4399cd4ec6c08dbc20a46d restores the existing client-runtime CI scheduling boundary; test/product source is unchanged by that correction:

  • Server: 32 focused files, 1,177 tests passed initially. The remaining transfer-budget test passed unchanged with a short, disk-backed fixture path; the original long TMPDIR inflated serialized paths. The budget was not widened. Native-bootstrap fixture recheck: 10 passed.
  • Web: eight focused files, 331 tests passed initially; the stale project-label assertion was corrected and its entire 23-test module passed.
  • Contracts: four files, 90 passed. Mobile logic: 14 files, 86 passed. Migration registration/Jones migrations: four files, 15 passed, including two modules already covered by the server run.
  • All nine affected package typechecks pass: server, web, mobile, desktop, contracts, client-runtime, shared, relay and scripts. The server's initial missing-service errors were repaired and rechecked.
  • Scoped lint succeeds with 36 warnings retained; Effect typechecks also emit nonblocking suggestions. Scoped formatting passes. No unresolved index entries or conflict markers in the resolved surfaces; source whitespace checks pass. Upstream patch-file context whitespace is retained byte-for-byte.
  • Frozen-lockfile dependency installation passed. The commit hook left the candidate tree unchanged. No local repository-wide suite was run. Initial hosted CI passed every owned job/artifact except Test and its aggregate Check: one client-runtime generated-snapshot test timed out while newly included in the parallel package batch. The correction restores Jones’s separate client-runtime step, with all 1,000 draws per schema, assertions and five-second deadline unchanged. The exact unchanged test passed locally. Fresh hosted CI on 372112dab1af41cccc4399cd4ec6c08dbc20a46d passes Test, aggregate Check and every other CI job. Both Linux CLI artifact builds and the Mac desktop artifact build also pass. All 19 repository-owned checks succeed on the current head.

UI Evidence

Pending: browser/desktop interaction captures and native iOS/Android builds/device checks, including the upstream Expo 58 / React Native 0.88 RC changes. This source integration does not claim manual UI or native-device verification. No live installation or user database was modified.

For the later orchestrator batch, pin its exact squash and compare against the accepted first-batch head, then map replaced systems to Jones features and isolated compatibility/migration tests. GitHub content mergeability will not prove behavioral compatibility.

Planning: Claude High Intelligence Plus on Jace, Claude Opus 5.5/high through claude-plan with independent GPT-6.1-Sol/xhigh synthesis. Implementation: GPT-6.1-Sol through the T3 Code Codex harness.


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

Sethmr and others added 30 commits September 30, 2026 11:46
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ad busy (#14497)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Khai Shern, Toh <khaishern8235@gmail.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…#14028)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… (#14027)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…sh (#14029)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… parent's model (#14540)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…d plugins (#14542)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…nup (#14553)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…(#14573)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…s (#12046)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…tale (#12047)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…#12048)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…URL (#12049)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…UIScreen.main (#12050)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…bers (#12051)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
t3-code Bot and others added 25 commits October 1, 2026 16:09
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ched GraphQL (#14673)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…u (#13926)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
…ode browser (#14601)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…532)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…ns (#12615)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@Mjones13
Mjones13 marked this pull request as ready for review October 3, 2026 17:02
@Mjones13
Mjones13 merged commit cbc1632 into main Oct 3, 2026
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.