chore: sync upstream pingdotgg/t3code (20260721) - #221
Merged
Conversation
…ingdotgg#3751) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…otgg#2093) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <jmarminge@gmail.com> Co-authored-by: root <root@localhost.localdomain>
…pingdotgg#3159) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…tgg#4163) Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…tarting an empty one (pingdotgg#3617) Co-authored-by: codex <codex@users.noreply.github.com>
…gdotgg#3869) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#4140) Co-authored-by: Julius Marminge <julius0216@outlook.com> Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…up (pingdotgg#4177) Co-authored-by: codex <codex@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#4113) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#4217) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Post-cherry-pick reconciliation of the shell/thread sync rewrite: - adopt upstream's client shell.ts + shell-sync.test.ts (drops the fork's superseded #142 replay-gap watchdog; server no longer emits 'caught-up') - remove the orphaned 'caught-up' contract member and obsolete fork shell server tests (upstream's coalescing tests cover the behavior) - keep the fork's thread reconciliation, resubscribing via subscribeDynamic (establish base once; foreground/session resubscribe via the live cursor) - add latestSequence to OrchestrationEngine test mocks; thread dispatch authority in bin.test; narrow stream-item unions past the new 'synchronized' Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…0260721 # Conflicts: # apps/server/src/orchestration/Layers/ChildThreadCoordinator.test.ts
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: aeb936280a
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
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
20 participants
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.
Nightly upstream sync of
pingdotgg/t3code→agriffiths-bots/t3code.Cherry-picked 31 upstream commits (
2640e6d..c0bb237, upstream/main). One commit (pingdotgg#4186 "Pass CLI OAuth config to hosted web deploy") applied empty — its 2-line change targets upstream's hosted web-deploy job, which this fork's Windows-only release pipeline does not have.Notable conflict resolutions
The bulk of the work was reconciling two large upstream rewrites of the shell/thread synchronization protocol (pingdotgg#4163 "Synchronize mobile threads with authoritative shell snapshots" and pingdotgg#4177 "speed up new-chat propagation and offline catch-up") against the fork's audience-scoping and thread-reconciliation features.
state/shell.ts,shell-sync.test.ts): adopted upstream's versions. Upstream's server rewrite (perf(orchestration): speed up new-chat propagation and offline catch-up pingdotgg/t3code#4177) supersedes the fork's Fix shell replay gaps #142 replay-gap watchdog (server no longer emits acaught-upmarker), so the fork's client-side watchdog was orphaned. Removed the now-deadcaught-upcontract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream'ssubscribeDynamicmodel — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker +foregroundResubscriptionsgrafted in).ws.ts): took upstream's coalescingsubscribeShell+projectUpsertOrRemove/threadUpsertOrRemovehelpers while preserving the fork'srequireAudienceOpaqueEventCursorguard andproject.data-audience-setfull-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe)..github/workflows/release.yml: kept the fork's Windows-only reusable pipeline.Verification
vp run typecheck✅vp check✅vp test run✅ — 6380 passed, 17 skipped, 0 failed (702 files)Gated by CI + the upstream-sync procedure (per-commit factory gate skipped via the audited sync escape hatch).