Skip to content

chore: sync upstream pingdotgg/t3code (20260721) - #221

Merged
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721
Jul 21, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260721)#221
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721

Conversation

@wizzoapp

@wizzoappwizzoappBot commented Jul 21, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3codeagriffiths-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.

  • Client shell (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 a caught-up marker), so the fork's client-side watchdog was orphaned. Removed the now-dead caught-up contract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.
  • Client threads (state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream's subscribeDynamic model — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker + foregroundResubscriptions grafted in).
  • Server (ws.ts): took upstream's coalescing subscribeShell + projectUpsertOrRemove/threadUpsertOrRemove helpers while preserving the fork's requireAudienceOpaqueEventCursor guard and project.data-audience-set full-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe).
  • Additive/import merges: ClaudeAdapter (SDK executable path + worker isolation), OpenCodeAdapter (resume + MCP session), Sidebar (archive-from-context-menu + tree rows), DesktopWindow (window-bounds restore + backend-status splash), ChatComposer, model/registry tests, and the fork's superset of test files were kept.
  • .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).

nsxdavidand others added 30 commits July 21, 2026 03:08
)
Co-authored-by: Shoaib Ansari <shoaibansari@Shoaibs-Mac-mini.local>
Co-authored-by: Julius Marminge <julius0216@outlook.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>
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>
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>
wizzoappBotand others added 2 commits July 21, 2026 05:08
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-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment threadapps/web/src/components/preview/PreviewView.tsx
Comment threadapps/server/src/ws.ts
Comment threadapps/web/src/components/AppSidebarLayout.tsx

@adamfgradamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 7366840.

@adamfgr
adamfgr enabled auto-merge (squash) July 21, 2026 05:08
@adamfgr
adamfgr merged commit c767872 into mainJul 21, 2026
26 of 27 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260721 branch July 21, 2026 05:17
Sign up for freeto 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.

20 participants

@adamfgr@nsxdavid@keeperxy@carlosricojr@Bortlesboat@PieterVanZyl-Dev@McMelonTV@t3dotgg@tris203@theduke@shoaib050326@GuilhermeVieiraDev@jamesx0416@Andrew-Forster@juliusmarminge@Chrrxs@vdmkotai@UtkarshUsername@xxashxx-svg@maxwellyoung
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore: sync upstream pingdotgg/t3code (20260721) by wizzoapp[bot] · Pull Request #221 · agriffiths-bots/t3code · GitHub
Skip to content

chore: sync upstream pingdotgg/t3code (20260721) - #221

Merged
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721
Jul 21, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260721)#221
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721

Conversation

@wizzoapp

@wizzoappwizzoappBot commented Jul 21, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3codeagriffiths-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.

  • Client shell (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 a caught-up marker), so the fork's client-side watchdog was orphaned. Removed the now-dead caught-up contract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.
  • Client threads (state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream's subscribeDynamic model — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker + foregroundResubscriptions grafted in).
  • Server (ws.ts): took upstream's coalescing subscribeShell + projectUpsertOrRemove/threadUpsertOrRemove helpers while preserving the fork's requireAudienceOpaqueEventCursor guard and project.data-audience-set full-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe).
  • Additive/import merges: ClaudeAdapter (SDK executable path + worker isolation), OpenCodeAdapter (resume + MCP session), Sidebar (archive-from-context-menu + tree rows), DesktopWindow (window-bounds restore + backend-status splash), ChatComposer, model/registry tests, and the fork's superset of test files were kept.
  • .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).

nsxdavidand others added 30 commits July 21, 2026 03:08
)
Co-authored-by: Shoaib Ansari <shoaibansari@Shoaibs-Mac-mini.local>
Co-authored-by: Julius Marminge <julius0216@outlook.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>
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>
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>
wizzoappBotand others added 2 commits July 21, 2026 05:08
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-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment threadapps/web/src/components/preview/PreviewView.tsx
Comment threadapps/server/src/ws.ts
Comment threadapps/web/src/components/AppSidebarLayout.tsx

@adamfgradamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 7366840.

@adamfgr
adamfgr enabled auto-merge (squash) July 21, 2026 05:08
@adamfgr
adamfgr merged commit c767872 into mainJul 21, 2026
26 of 27 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260721 branch July 21, 2026 05:17
Sign up for freeto 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.

20 participants

@adamfgr@nsxdavid@keeperxy@carlosricojr@Bortlesboat@PieterVanZyl-Dev@McMelonTV@t3dotgg@tris203@theduke@shoaib050326@GuilhermeVieiraDev@jamesx0416@Andrew-Forster@juliusmarminge@Chrrxs@vdmkotai@UtkarshUsername@xxashxx-svg@maxwellyoung
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore: sync upstream pingdotgg/t3code (20260721) by wizzoapp[bot] · Pull Request #221 · agriffiths-bots/t3code · GitHub
Skip to content

chore: sync upstream pingdotgg/t3code (20260721) - #221

Merged
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721
Jul 21, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260721)#221
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721

Conversation

@wizzoapp

@wizzoappwizzoappBot commented Jul 21, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3codeagriffiths-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.

  • Client shell (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 a caught-up marker), so the fork's client-side watchdog was orphaned. Removed the now-dead caught-up contract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.
  • Client threads (state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream's subscribeDynamic model — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker + foregroundResubscriptions grafted in).
  • Server (ws.ts): took upstream's coalescing subscribeShell + projectUpsertOrRemove/threadUpsertOrRemove helpers while preserving the fork's requireAudienceOpaqueEventCursor guard and project.data-audience-set full-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe).
  • Additive/import merges: ClaudeAdapter (SDK executable path + worker isolation), OpenCodeAdapter (resume + MCP session), Sidebar (archive-from-context-menu + tree rows), DesktopWindow (window-bounds restore + backend-status splash), ChatComposer, model/registry tests, and the fork's superset of test files were kept.
  • .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).

nsxdavidand others added 30 commits July 21, 2026 03:08
)
Co-authored-by: Shoaib Ansari <shoaibansari@Shoaibs-Mac-mini.local>
Co-authored-by: Julius Marminge <julius0216@outlook.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>
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>
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>
wizzoappBotand others added 2 commits July 21, 2026 05:08
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-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment threadapps/web/src/components/preview/PreviewView.tsx
Comment threadapps/server/src/ws.ts
Comment threadapps/web/src/components/AppSidebarLayout.tsx

@adamfgradamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 7366840.

@adamfgr
adamfgr enabled auto-merge (squash) July 21, 2026 05:08
@adamfgr
adamfgr merged commit c767872 into mainJul 21, 2026
26 of 27 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260721 branch July 21, 2026 05:17
Sign up for freeto 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.

20 participants

@adamfgr@nsxdavid@keeperxy@carlosricojr@Bortlesboat@PieterVanZyl-Dev@McMelonTV@t3dotgg@tris203@theduke@shoaib050326@GuilhermeVieiraDev@jamesx0416@Andrew-Forster@juliusmarminge@Chrrxs@vdmkotai@UtkarshUsername@xxashxx-svg@maxwellyoung
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore: sync upstream pingdotgg/t3code (20260721) by wizzoapp[bot] · Pull Request #221 · agriffiths-bots/t3code · GitHub
Skip to content

chore: sync upstream pingdotgg/t3code (20260721) - #221

Merged
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721
Jul 21, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260721)#221
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721

Conversation

@wizzoapp

@wizzoappwizzoappBot commented Jul 21, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3codeagriffiths-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.

  • Client shell (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 a caught-up marker), so the fork's client-side watchdog was orphaned. Removed the now-dead caught-up contract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.
  • Client threads (state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream's subscribeDynamic model — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker + foregroundResubscriptions grafted in).
  • Server (ws.ts): took upstream's coalescing subscribeShell + projectUpsertOrRemove/threadUpsertOrRemove helpers while preserving the fork's requireAudienceOpaqueEventCursor guard and project.data-audience-set full-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe).
  • Additive/import merges: ClaudeAdapter (SDK executable path + worker isolation), OpenCodeAdapter (resume + MCP session), Sidebar (archive-from-context-menu + tree rows), DesktopWindow (window-bounds restore + backend-status splash), ChatComposer, model/registry tests, and the fork's superset of test files were kept.
  • .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).

nsxdavidand others added 30 commits July 21, 2026 03:08
)
Co-authored-by: Shoaib Ansari <shoaibansari@Shoaibs-Mac-mini.local>
Co-authored-by: Julius Marminge <julius0216@outlook.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>
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>
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>
wizzoappBotand others added 2 commits July 21, 2026 05:08
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-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment threadapps/web/src/components/preview/PreviewView.tsx
Comment threadapps/server/src/ws.ts
Comment threadapps/web/src/components/AppSidebarLayout.tsx

@adamfgradamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 7366840.

@adamfgr
adamfgr enabled auto-merge (squash) July 21, 2026 05:08
@adamfgr
adamfgr merged commit c767872 into mainJul 21, 2026
26 of 27 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260721 branch July 21, 2026 05:17
Sign up for freeto 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.

20 participants

@adamfgr@nsxdavid@keeperxy@carlosricojr@Bortlesboat@PieterVanZyl-Dev@McMelonTV@t3dotgg@tris203@theduke@shoaib050326@GuilhermeVieiraDev@jamesx0416@Andrew-Forster@juliusmarminge@Chrrxs@vdmkotai@UtkarshUsername@xxashxx-svg@maxwellyoung
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' chore: sync upstream pingdotgg/t3code (20260721) by wizzoapp[bot] · Pull Request #221 · agriffiths-bots/t3code · GitHub
Skip to content

chore: sync upstream pingdotgg/t3code (20260721) - #221

Merged
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721
Jul 21, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260721)#221
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721

Conversation

@wizzoapp

@wizzoappwizzoappBot commented Jul 21, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3codeagriffiths-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.

  • Client shell (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 a caught-up marker), so the fork's client-side watchdog was orphaned. Removed the now-dead caught-up contract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.
  • Client threads (state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream's subscribeDynamic model — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker + foregroundResubscriptions grafted in).
  • Server (ws.ts): took upstream's coalescing subscribeShell + projectUpsertOrRemove/threadUpsertOrRemove helpers while preserving the fork's requireAudienceOpaqueEventCursor guard and project.data-audience-set full-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe).
  • Additive/import merges: ClaudeAdapter (SDK executable path + worker isolation), OpenCodeAdapter (resume + MCP session), Sidebar (archive-from-context-menu + tree rows), DesktopWindow (window-bounds restore + backend-status splash), ChatComposer, model/registry tests, and the fork's superset of test files were kept.
  • .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).

nsxdavidand others added 30 commits July 21, 2026 03:08
)
Co-authored-by: Shoaib Ansari <shoaibansari@Shoaibs-Mac-mini.local>
Co-authored-by: Julius Marminge <julius0216@outlook.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>
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>
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>
wizzoappBotand others added 2 commits July 21, 2026 05:08
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-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment threadapps/web/src/components/preview/PreviewView.tsx
Comment threadapps/server/src/ws.ts
Comment threadapps/web/src/components/AppSidebarLayout.tsx

@adamfgradamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 7366840.

@adamfgr
adamfgr enabled auto-merge (squash) July 21, 2026 05:08
@adamfgr
adamfgr merged commit c767872 into mainJul 21, 2026
26 of 27 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260721 branch July 21, 2026 05:17
Sign up for freeto 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.

20 participants

@adamfgr@nsxdavid@keeperxy@carlosricojr@Bortlesboat@PieterVanZyl-Dev@McMelonTV@t3dotgg@tris203@theduke@shoaib050326@GuilhermeVieiraDev@jamesx0416@Andrew-Forster@juliusmarminge@Chrrxs@vdmkotai@UtkarshUsername@xxashxx-svg@maxwellyoung
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore: sync upstream pingdotgg/t3code (20260721) by wizzoapp[bot] · Pull Request #221 · agriffiths-bots/t3code · GitHub
Skip to content

chore: sync upstream pingdotgg/t3code (20260721) - #221

Merged
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721
Jul 21, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260721)#221
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721

Conversation

@wizzoapp

@wizzoappwizzoappBot commented Jul 21, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3codeagriffiths-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.

  • Client shell (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 a caught-up marker), so the fork's client-side watchdog was orphaned. Removed the now-dead caught-up contract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.
  • Client threads (state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream's subscribeDynamic model — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker + foregroundResubscriptions grafted in).
  • Server (ws.ts): took upstream's coalescing subscribeShell + projectUpsertOrRemove/threadUpsertOrRemove helpers while preserving the fork's requireAudienceOpaqueEventCursor guard and project.data-audience-set full-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe).
  • Additive/import merges: ClaudeAdapter (SDK executable path + worker isolation), OpenCodeAdapter (resume + MCP session), Sidebar (archive-from-context-menu + tree rows), DesktopWindow (window-bounds restore + backend-status splash), ChatComposer, model/registry tests, and the fork's superset of test files were kept.
  • .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).

nsxdavidand others added 30 commits July 21, 2026 03:08
)
Co-authored-by: Shoaib Ansari <shoaibansari@Shoaibs-Mac-mini.local>
Co-authored-by: Julius Marminge <julius0216@outlook.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>
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>
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>
wizzoappBotand others added 2 commits July 21, 2026 05:08
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-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment threadapps/web/src/components/preview/PreviewView.tsx
Comment threadapps/server/src/ws.ts
Comment threadapps/web/src/components/AppSidebarLayout.tsx

@adamfgradamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 7366840.

@adamfgr
adamfgr enabled auto-merge (squash) July 21, 2026 05:08
@adamfgr
adamfgr merged commit c767872 into mainJul 21, 2026
26 of 27 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260721 branch July 21, 2026 05:17
Sign up for freeto 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.

20 participants

@adamfgr@nsxdavid@keeperxy@carlosricojr@Bortlesboat@PieterVanZyl-Dev@McMelonTV@t3dotgg@tris203@theduke@shoaib050326@GuilhermeVieiraDev@jamesx0416@Andrew-Forster@juliusmarminge@Chrrxs@vdmkotai@UtkarshUsername@xxashxx-svg@maxwellyoung
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore: sync upstream pingdotgg/t3code (20260721) by wizzoapp[bot] · Pull Request #221 · agriffiths-bots/t3code · GitHub
Skip to content

chore: sync upstream pingdotgg/t3code (20260721) - #221

Merged
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721
Jul 21, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260721)#221
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721

Conversation

@wizzoapp

@wizzoappwizzoappBot commented Jul 21, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3codeagriffiths-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.

  • Client shell (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 a caught-up marker), so the fork's client-side watchdog was orphaned. Removed the now-dead caught-up contract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.
  • Client threads (state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream's subscribeDynamic model — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker + foregroundResubscriptions grafted in).
  • Server (ws.ts): took upstream's coalescing subscribeShell + projectUpsertOrRemove/threadUpsertOrRemove helpers while preserving the fork's requireAudienceOpaqueEventCursor guard and project.data-audience-set full-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe).
  • Additive/import merges: ClaudeAdapter (SDK executable path + worker isolation), OpenCodeAdapter (resume + MCP session), Sidebar (archive-from-context-menu + tree rows), DesktopWindow (window-bounds restore + backend-status splash), ChatComposer, model/registry tests, and the fork's superset of test files were kept.
  • .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).

nsxdavidand others added 30 commits July 21, 2026 03:08
)
Co-authored-by: Shoaib Ansari <shoaibansari@Shoaibs-Mac-mini.local>
Co-authored-by: Julius Marminge <julius0216@outlook.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>
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>
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>
wizzoappBotand others added 2 commits July 21, 2026 05:08
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-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment threadapps/web/src/components/preview/PreviewView.tsx
Comment threadapps/server/src/ws.ts
Comment threadapps/web/src/components/AppSidebarLayout.tsx

@adamfgradamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 7366840.

@adamfgr
adamfgr enabled auto-merge (squash) July 21, 2026 05:08
@adamfgr
adamfgr merged commit c767872 into mainJul 21, 2026
26 of 27 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260721 branch July 21, 2026 05:17
Sign up for freeto 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.

20 participants

@adamfgr@nsxdavid@keeperxy@carlosricojr@Bortlesboat@PieterVanZyl-Dev@McMelonTV@t3dotgg@tris203@theduke@shoaib050326@GuilhermeVieiraDev@jamesx0416@Andrew-Forster@juliusmarminge@Chrrxs@vdmkotai@UtkarshUsername@xxashxx-svg@maxwellyoung
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); chore: sync upstream pingdotgg/t3code (20260721) by wizzoapp[bot] · Pull Request #221 · agriffiths-bots/t3code · GitHub
Skip to content

chore: sync upstream pingdotgg/t3code (20260721) - #221

Merged
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721
Jul 21, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260721)#221
adamfgr merged 32 commits into
mainfrom
chore/upstream-sync-20260721

Conversation

@wizzoapp

@wizzoappwizzoappBot commented Jul 21, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3codeagriffiths-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.

  • Client shell (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 a caught-up marker), so the fork's client-side watchdog was orphaned. Removed the now-dead caught-up contract member and the obsolete fork shell server tests; upstream's coalescing tests cover the behavior.
  • Client threads (state/threads.ts): kept the fork's reconciliation subsystem (storage-epoch cursors, revision reconciliation, audience-scoped resume) and re-wired it onto upstream's subscribeDynamic model — establish the base snapshot once, then resume via the live cursor on foreground/session resubscribes (completion-marker + foregroundResubscriptions grafted in).
  • Server (ws.ts): took upstream's coalescing subscribeShell + projectUpsertOrRemove/threadUpsertOrRemove helpers while preserving the fork's requireAudienceOpaqueEventCursor guard and project.data-audience-set full-refresh path (projection reads are audience-scoped, so coalescing stays audience-safe).
  • Additive/import merges: ClaudeAdapter (SDK executable path + worker isolation), OpenCodeAdapter (resume + MCP session), Sidebar (archive-from-context-menu + tree rows), DesktopWindow (window-bounds restore + backend-status splash), ChatComposer, model/registry tests, and the fork's superset of test files were kept.
  • .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).

nsxdavidand others added 30 commits July 21, 2026 03:08
)
Co-authored-by: Shoaib Ansari <shoaibansari@Shoaibs-Mac-mini.local>
Co-authored-by: Julius Marminge <julius0216@outlook.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>
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>
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>
wizzoappBotand others added 2 commits July 21, 2026 05:08
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-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment threadapps/web/src/components/preview/PreviewView.tsx
Comment threadapps/server/src/ws.ts
Comment threadapps/web/src/components/AppSidebarLayout.tsx

@adamfgradamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 7366840.

@adamfgr
adamfgr enabled auto-merge (squash) July 21, 2026 05:08
@adamfgr
adamfgr merged commit c767872 into mainJul 21, 2026
26 of 27 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260721 branch July 21, 2026 05:17
Sign up for freeto 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.

20 participants

@adamfgr@nsxdavid@keeperxy@carlosricojr@Bortlesboat@PieterVanZyl-Dev@McMelonTV@t3dotgg@tris203@theduke@shoaib050326@GuilhermeVieiraDev@jamesx0416@Andrew-Forster@juliusmarminge@Chrrxs@vdmkotai@UtkarshUsername@xxashxx-svg@maxwellyoung