Skip to content

sync: classic-merge upstream/main (d15210cd3d) into fork/dev - #489

Merged
patroza merged 157 commits into
fork/devfrom
sync/upstream-d15210cd3d
Sep 28, 2026
Merged

patroza merged 157 commits into
fork/devfrom
sync/upstream-d15210cd3d

Conversation

@patroza

@patroza patroza commented Sep 28, 2026

Copy link
Copy Markdown
Owner

Classic-merge pingdotgg/t3code main through d15210cd3d into fork/dev (149 commits after #488).

Incoming includes usage history (cursor/opencode/antigravity), OTEL, node-pty 1.2.0-beta.15, Linux .deb self-update, chat width, Claude abort before close, simctl/adb, OpenCode titles, and snapshot/WAL/settlement perf. Upstream pingdotgg#13764 (client Zustand queuedMessageStore / send-while-not-open) is not taken.

Weld: keep the fork's server-side queue (thread.message-queued, queuedMessages, pendingTurnStart, thread.steerQueuedMessage). Keep Discord origin stamping from #487/#488 (applyStoredThreadAttribution, bootstrap append copies command.source). Keep HashMap CommandReadModel, requireWorktree before thread.create, dfx: 1.0.16, msgpackr-extract: true, GitHub-hosted runners, and CheckpointReactor isolated in apps/server/vite.config.ts. VOUCHED.td stays deleted.

Merge commit f9c4318187 (parents 25ad70bef2 + d15210cd3d) plus typecheck weld follow-ups.

Land with gh pr merge --merge only after pnpm pr:ready and required checks are green.

Yash-Singh1 and others added 30 commits September 23, 2026 01:25
…3220)

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…case screenshots (pingdotgg#13316)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Exotic <118054752+extoci@users.noreply.github.com>
…otgg#11580)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…3355)

Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…2613)

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>
…otgg#13397)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6 Sol <noreply@openai.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ops startup (pingdotgg#13469)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…gdotgg#13388)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
t3dotgg and others added 22 commits September 26, 2026 02:50
…th failed repacks (pingdotgg#13812)

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

Co-authored-by: eshaan Sood <eshaansood@192.168.1.14>
Co-authored-by: Gabriel De Andrade <30420087+gabrielelpidio@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#13736)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…otgg#13935)

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Exotic <118054752+extoci@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…0cd3d

# Conflicts:
#	.github/VOUCHED.td
#	.github/workflows/deploy-relay.yml
#	.github/workflows/release.yml
#	apps/desktop/src/updates/DesktopUpdates.ts
#	apps/desktop/src/window/DesktopApplicationMenu.test.ts
#	apps/mobile/app.config.ts
#	apps/mobile/src/features/home/HomeRouteScreen.tsx
#	apps/mobile/src/features/home/HomeScreen.tsx
#	apps/mobile/src/features/threads/ThreadComposer.tsx
#	apps/mobile/src/features/threads/ThreadFeed.tsx
#	apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
#	apps/mobile/src/features/threads/thread-list-v2-items.tsx
#	apps/mobile/src/features/usage/usageProviders.ts
#	apps/server/package.json
#	apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
#	apps/server/src/mcp/PreviewAutomationBroker.test.ts
#	apps/server/src/mcp/PreviewAutomationBroker.ts
#	apps/server/src/mcp/toolkits/preview/tools.ts
#	apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
#	apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
#	apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
#	apps/server/src/orchestration/decider.ts
#	apps/server/src/orchestration/projector.ts
#	apps/server/src/persistence/Layers/Sqlite.ts
#	apps/server/src/provider/Drivers/CodexDriver.ts
#	apps/server/src/provider/Layers/ClaudeAdapter.ts
#	apps/server/src/provider/Layers/CodexAdapter.ts
#	apps/server/src/provider/Layers/CodexSessionRuntime.ts
#	apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts
#	apps/server/src/provider/Layers/ProviderRegistry.test.ts
#	apps/server/src/provider/Layers/ProviderService.test.ts
#	apps/server/src/provider/Layers/ProviderService.ts
#	apps/server/src/provider/acp/AcpSessionRuntime.ts
#	apps/server/src/relay/AgentAwarenessRelay.test.ts
#	apps/server/src/server.test.ts
#	apps/server/src/server.ts
#	apps/server/src/serverRuntimeStartup.test.ts
#	apps/web/src/components/BranchToolbar.logic.ts
#	apps/web/src/components/BranchToolbar.tsx
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/CommandPalette.logic.test.ts
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/LegacySidebar.tsx
#	apps/web/src/components/Sidebar.logic.test.ts
#	apps/web/src/components/Sidebar.logic.ts
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/ThreadStatusIndicators.tsx
#	apps/web/src/components/chat/MessagesTimeline.logic.test.ts
#	apps/web/src/components/chat/MessagesTimeline.tsx
#	apps/web/src/components/chat/ModelPickerSidebar.tsx
#	apps/web/src/components/chat/ProviderModelPicker.tsx
#	apps/web/src/components/preview/PreviewAutomationHosts.test.tsx
#	apps/web/src/components/settings/SettingsPanels.tsx
#	apps/web/src/components/usage/UsageProviderChart.test.ts
#	apps/web/src/components/usage/usageProviders.ts
#	apps/web/src/queuedMessageStore.test.ts
#	apps/web/src/queuedMessageStore.ts
#	docs/user/composer.md
#	packages/client-runtime/package.json
#	packages/client-runtime/src/state/shellSnapshotHttp.ts
#	packages/client-runtime/src/state/threadSnapshotHttp.ts
#	packages/client-runtime/src/state/threads.ts
#	packages/contracts/src/previewAutomation.ts
#	packages/contracts/src/usage.ts
#	pnpm-lock.yaml
#	scripts/build-desktop-artifact.ts
…ue fixtures

BranchToolbar lost resolveEffectiveEnvMode after the 3-way. Sidebar.logic
dropped resolveThreadRowClassName and the settled-timestamp import.
ChatView dropped reconnectingThroughVersionSkew. CommandPalette still
passed panelClassName. Thread fixtures need queuedMessages/pendingTurnStart.
ElectronUpdaterFeedUrl is not unknown[].
…weld

Projector tests cannot index threads as an array. Grok driver tests need
DirenvEnvironment. Kimi transcripts need the fast flag. Auto-settle
decider tests go through fromWireReadModel.
@github-actions github-actions Bot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Sep 28, 2026
Full vp check rejects arbitrary text sizes, raw emerald/amber, unknown
workspace-topbar, and dynamic Button classNames. Map fork-only board,
identity, and usage chrome onto theme tokens so the ship gate can publish.

Made with grok-4.6 in T3 Code.
Desktop preview tests must keep EventTarget on the document stub so
visibilitychange listeners can mount. Usage keybinding rows and command
choices share one total order: open, then page metrics, then periods.

Made with grok-4.6 in T3 Code.
…solate

Upstream added ProjectionThreadsAutoSettleDisabledAt. Fork namespace
tests assert the ledger tail. Kimi is a built-in driver, so registry
fixtures and the bundled compatibility manifest include it. Isolate the
v8 heap-snapshot mock so the partial-file cleanup assertion binds.

Made with grok-4.6 in T3 Code.
@patroza
patroza marked this pull request as ready for review September 28, 2026 12:05
The session projection can land before the failure activity. Waiting
only on stopped status races on CI.

Made with grok-4.6 in T3 Code.
@patroza
patroza merged commit 9c3d8f2 into fork/dev Sep 28, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects

None yet

Development

Successfully merging this pull request may close these issues.