Skip to content

chore(fork): merge upstream v0.1.8-nightly.20261106.4262 - #33

Merged
tebiggs merged 198 commits into
mainfrom
sync-conflict/v0.1.8-nightly.20261106.4262
Nov 6, 2026
Merged

tebiggs merged 198 commits into
mainfrom
sync-conflict/v0.1.8-nightly.20261106.4262

Conversation

@tebiggs

@tebiggs tebiggs commented Nov 6, 2026

Copy link
Copy Markdown
Owner

Merge this with Create a merge commit, not squash, so upstream history stays intact.

Merges upstream v0.1.8-nightly.20261106.4262 into the fork.

Conflicts

  • apps/server/src/orchestration-v2/ThreadManagementService.ts: upstream's settleAfterRun now retries on run.updated until automatic follow-up runs finish (fix(server): wait for automatic follow-ups before settling threads pingdotgg/t3code#31815). Took that loop and kept the fork's fix(server): background work an agent waits on survives settles, crashes and failed wakes #14 guard as the last check before the settle dispatch: if awaited background work is pending or any run is queued, it logs and stops without settling, as before. The guard reads providerThreads in the same records query as runs.
  • apps/server/src/orchestration-v2/ThreadManagementService.test.ts: took upstream's table. The held-notification row (a queued notification run) now expects no settle, matching the fork's existing "a queued wake" case, and a new row covers an awaited background job. The mock returns providerThreads.
  • apps/mobile/src/state/use-thread-composer-state.ts: kept both sides: the fork's thread history read (fix(mobile): sequenceless delivered messages stop reappearing once paged out #18) and upstream's effect that prunes caught-up acknowledged messages.
  • apps/mobile/src/features/home/HomeScreen.tsx: took upstream's emptyTopInset for the empty state's top padding. The side padding stays on the inner view, where the fork moved it so the power and phone chips span the full width.
  • apps/server/src/provider/agentContextBudget.json: set to the measured values. That is upstream's numbers plus the fork's 32 extra tool-list bytes (48151).

Fixes to files that merged without conflicts

  • apps/mobile/src/Stack.tsx: upstream replaced HORIZONTAL_FORM_SHEET_OPTIONS and formSheetDetents with route presets. The fork's EnvironmentPower sheet now uses sheetRoute({ detent: 0.5, header: "none" }).
  • apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx: upstream dropped the useRoute import, but the fork's PhoneSection still uses it, so the import is back.

Typecheck passes for server, mobile, contracts, client-runtime, provider-core and evals. These tests pass: ThreadManagementService, AgentContextBudget and runtimeLayer on the server, and the mobile tests next to the merged files.

Model: Claude Opus 5.5. Harness: Claude Code in T3 Code.

🤖 Generated with Claude Code

saphid and others added 30 commits November 5, 2026 11:38
…eopened long threads (pingdotgg#31182)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nch argument (pingdotgg#30690)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…#25312)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
… content snapshots (pingdotgg#11869)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#31403)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…in (pingdotgg#31226)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… run (pingdotgg#30326)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…om under the pointer (pingdotgg#30346)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…1631)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng (pingdotgg#31665)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rive letter (pingdotgg#22534)

Co-authored-by: Alb11747 <40252880+Alb11747@users.noreply.github.com>
…3445)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ead (pingdotgg#26492)

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…rver reports (pingdotgg#28781)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
…tgg#28800)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ading (pingdotgg#29661)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Lucenx9 and others added 29 commits November 6, 2026 04:40
…dotgg#30798)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
… instead of ignored (pingdotgg#30973)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…en character (pingdotgg#30390)

Co-authored-by: maria-rcks <maria@kuuro.net>
…output colours (pingdotgg#21542)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#15632)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ingdotgg#31815)

Keep deferred settlement requests through automatic follow-up turns and retry from persisted run events, including replayed rejected commands. Preserve failed follow-ups and new user input, and guard settlement against newer runs.

Validated with 173 focused tests through check:changed, all CI checks on e1a41f6, and resolved agentic reviews.

Model: GPT 6.1 Sol. Harness: Codex in T3 Code.
…1799)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…tgg#31801)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…gg#31842)

Combine the ten runtime recovery collections into one SQLite statement, leaving the initial thread lookup separate. Preserve collection filters, ordering, decoding and ordered reconciliation after prior commits.

Extend startup/shutdown idempotency coverage and guard against full message and run history scans. Synthetic stress measurements show fewer database requests; overall desktop quit latency remains unmeasured.

Implemented with GPT 6.1 Sol through the Codex harness in T3 Code.
… tiles (pingdotgg#28223)

Co-authored-by: Priyansh4444 <105874877+Priyansh4444@users.noreply.github.com>
Co-authored-by: Tanner Polley <42780259+tannerpolley@users.noreply.github.com>
Co-authored-by: Maria <maria-rcks@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Alessio Fano <alessio.fano@swisscom.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@tebiggs
tebiggs merged commit 9983024 into main Nov 6, 2026
12 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.