Skip to content

chore: sync upstream (116 commits) - #7

Merged
EthanGunter merged 117 commits into
mainfrom
chore/sync-upstream
Nov 11, 2026
Merged

EthanGunter merged 117 commits into
mainfrom
chore/sync-upstream

Conversation

@EthanGunter

Copy link
Copy Markdown
Owner

Merges upstream/main (pingdotgg/t3code) into main with a merge commit; 116 incoming commits.

Conflicts

apps/server/src/mcp/OrchestratorMcpService.ts (scheduleTask and updateScheduledTask)

Overlaps without text conflicts

  • OrchestratorMcpService.test.ts, RpcAuthorization.test.ts: upstream adjusted existing cases; our added check-feature cases merged cleanly alongside. Kept both.
  • packages/client-runtime/package.json: upstream added a work-log/embedded-scripts export and the unbash dependency; ours added the scheduled-task-check export. Kept both.
  • Upstream did not touch apps/server/src/scheduledTasks, the scheduled task contracts, forkSchema.ts, or the migrator. The fork's check_json / last_check_json columns stay in forkSchema.ts; no upstream migration adds them.
  • No upstream commit builds a scheduled-task check or a runtime staging script, so nothing was moved onto an upstream implementation.

Left for a human

Nothing.

Checks

  • vp run typecheck: 41/41 packages pass.
  • vp test run for apps/server/src/scheduledTasks, OrchestratorMcpService.test.ts, RpcAuthorization.test.ts: 13 files, 197 tests pass.
  • vp test run packages/client-runtime/src/scheduledTaskCheck.test.ts: 5 tests pass.

Merged by Claude Fable 5.1 via Claude Code in T3 Code.

🤖 Generated with Claude Code

PixPMusic and others added 30 commits November 9, 2026 21:07
…33730)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…al (pingdotgg#33535)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…uest times out (pingdotgg#27677)

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>
…s later subagent results (pingdotgg#33469)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…to itself (pingdotgg#33695)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ame is long (pingdotgg#33181)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… the sheet (pingdotgg#33223)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Nathan Wong <20381195+thelogicmatrix@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… instead of running forever (pingdotgg#33008)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 26 commits November 10, 2026 14:35
…gg#34073)

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

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

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
… resets (pingdotgg#34106)

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

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
)

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

OpenCode image-generation tool success acknowledges a launched background job. Keep that job pending until its native outcome arrives, retain the outcome on the original tool item, and serve size-limited image previews through existing rendering and remote file paths.

Recover outcomes after stream loss, allow later exact-path notices to add previews, and clear descendant image tasks from parent rosters on completion or transport failure. Keep older-server fallback and the pinned SDK.

Validation: check:changed passed with 147 tests; required CI passed and review findings were addressed on 62addc8. Client screenshots use controlled fixtures; no paid image generation was used.

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

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

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

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

Co-authored-by: Claude Mythos 5.2 <noreply@anthropic.com>
… folder (pingdotgg#32880)

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

Co-authored-by: Md.Sadiq <mohammadsadiq4950@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ole sidebar (pingdotgg#33129)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Toggle and copy icons swap instantly through lucide-react again. Drops the
MorphIcon wrapper plus the morphicons and vanilla lucide dependencies that
only it used.
## Problem

OpenCode shell tools can return when a background command launches. T3 now keeps that command in its existing background activity UI until it exits or is stopped, retains captured output, and preserves native completion notifications and continuation turns.

## Change

The adapter scopes tracking and Stop to the owning session and its descendants. Recovery uses the experimental shell-job inventory on OpenCode 2.2.6+, with shell-list fallback on supported older servers. After a cold resume, recovered output, terminal state, and idle roster snapshots persist through the existing session event pump before another turn starts. New session-scoped activity is restricted to attached threads and uses the persisted run identity when available so it stays in the current timeline. Polling reads run outside the adapter lock, with stale results discarded after Stop, exit, or another read. Recovery and Stop retain bounded I/O. Final reads retain the output tail, including diagnostics beyond the first four pages. The SDK remains pinned to 2.0.28, and main's native goals, todo checklists, and image jobs are preserved.

## Scope and approval

Maintainer-directed implementation of native OpenCode background shell tracking from the T3 Code handoff. Scope covers shell lifecycle, output retention, recovery, ownership, and Stop using existing background activity services and rendering. The session event pump extension is needed to persist recovered activity while no turn is active. No SDK upgrade, new UI, or provider-wide infrastructure is included. The author, Yash-Singh1, is explicitly listed in the repository's [contribution-triage exemptions](https://github.com/pingdotgg/t3code/blob/main/.github/TRIAGE_EXEMPTIONS.td), verified against upstream main.

## Verification

Validation: `vp run check:changed` passes. Focused regressions cover output paging, exit codes, idle recovery, persisted run anchors, ownership, cancellation failures, and a stalled poll that must not block turn completion or Stop. Real OpenCode UI turns used MiniMax M3.1 Flash Free against isolated development state and covered launch, Details and retained output, natural completion, continuation, and explicit Stop. Cold-idle persistence and remote-server paths use protocol fixtures; native mobile was not exercised.

GPT 6.1 Sol through the Codex harness.
…xt (pingdotgg#32902)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/server/src/mcp/OrchestratorMcpService.ts
@EthanGunter
EthanGunter merged commit ceefc01 into main Nov 11, 2026
8 of 20 checks passed
@github-actions github-actions Bot added the vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. label Nov 11, 2026
@EthanGunter
EthanGunter deleted the chore/sync-upstream branch November 11, 2026 05:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.