Skip to content

chore: sync upstream v0.1.12-nightly.20261122.5085 - #62

Merged
falistos merged 48 commits into
mainfrom
sync/v0.1.12-nightly.20261122.5085
Nov 22, 2026
Merged

falistos merged 48 commits into
mainfrom
sync/v0.1.12-nightly.20261122.5085

Conversation

@falistos

Copy link
Copy Markdown

Syncs upstream nightly v0.1.12-nightly.20261122.5085 (47 upstream commits since merge base 1a9a858d45) into the fork as a merge commit (3c2368aada). Do not squash: the tag must stay an ancestor of main.

Conflicted files (2) and resolutions

Both conflicts kept both behaviours:

No conflict in the i18n catalogs (git merged the 10 web catalogs; vp run i18n:check passes, so i18n:generate had nothing to change) nor in agentContextBudget.json: upstream did not change its prompts' size, and AgentContextBudget.test.ts passes against the committed numbers (6295 / 7689 / 61425 bytes), so no agent-context-increase label.

Semantic fixes after the merge

None needed. Checked against the fork's code:

Files both sides changed that merged without conflict (41 files)

  • apps/mobile/app.config.ts
  • apps/mobile/src/state/use-thread-composer-state.ts
  • apps/server/src/mcp/OrchestratorMcpService.ts
  • apps/server/src/mcp/toolkits/project/handlers.test.ts
  • apps/server/src/mcp/toolkits/project/handlers.ts
  • apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
  • apps/server/src/orchestration-v2/Orchestrator.ts
  • apps/server/src/orchestration-v2/ProjectionStore.ts
  • apps/server/src/orchestration-v2/RestartBackgroundNote.ts
  • apps/server/src/orchestration-v2/RunExecutionService.test.ts
  • apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts
  • apps/server/src/orchestration-v2/ThreadLaunchService.ts
  • apps/server/src/orchestration-v2/ThreadSettlementService.test.ts
  • apps/server/src/orchestration-v2/ThreadSettlementService.ts
  • apps/server/src/server.ts
  • apps/server/src/vcs/GitVcsDriver.ts
  • apps/server/src/ws.test.ts
  • apps/server/src/ws.ts
  • apps/web/src/components/BackgroundThreadAnnouncer.tsx
  • apps/web/src/components/ChatView.tsx
  • apps/web/src/components/settings/ScheduledTasksSettings.browser.test.tsx
  • apps/web/src/components/settings/ScheduledTasksSettings.tsx
  • apps/web/src/components/settings/settingsSearch.ts
  • apps/web/src/i18n/translations/de.json
  • apps/web/src/i18n/translations/en.json
  • apps/web/src/i18n/translations/es.json
  • apps/web/src/i18n/translations/fr.json
  • apps/web/src/i18n/translations/ja.json
  • apps/web/src/i18n/translations/ko.json
  • apps/web/src/i18n/translations/pt-BR.json
  • apps/web/src/i18n/translations/ru.json
  • apps/web/src/i18n/translations/sv.json
  • apps/web/src/i18n/translations/zh.json
  • docs/user/source-control.md
  • docs/user/thread-sidebar.md
  • packages/client-runtime/package.json
  • packages/contracts/src/orchestrationV2.ts
  • packages/provider-acp/src/server/adapter.ts
  • packages/provider-core/src/server/ProviderAdapter.ts
  • packages/provider-cursor/src/server/adapter.test.ts
  • packages/provider-cursor/src/server/adapter.ts

Decisions

  • D1: this checkout has no fork remote, and its origin is mediavee/t3code. So the branch was pushed with an explicit URL, git push https://github.com/mediavee/t3code.git, never to pingdotgg.
  • D2: dev2's live database was still at migration 102 (dev2 does not run chore: sync upstream v0.1.12-nightly.20261121.5064 #58 yet). So the copy's migration exercised upstream's 103-105 and the fork's index and column hook, not just a no-op.
  • D3: titleRenamed is left off the fork's cross-project delegate_task launch. It changes nothing today (see above), and adding it would be a behaviour change outside a sync. It is a possible follow-up for parity with upstream's same-project launch.

Checks on 3c2368aada (clean env -i, Node 26.13.1, TMPDIR under /home/agent, T3_UPSTREAM_REF=v0.1.12-nightly.20261122.5085)

  • vp run typecheck 0 (43/43); vp check 0 (0 errors, 19 warnings); vp run i18n:check 0; upstreamMigrations.test.ts 3/3 (manifest regenerated from the tag, unchanged); AgentContextBudget.test.ts 2/2.
  • Tests, package by package (37 packages, JUnit): 30346 run, 7 failed, 32 skipped. Every failure fails the same way on the tag itself:
    • server: AntigravityInstallation (1), GrokProvider (5); 6/66 failed when rerun on a checkout of the tag.
    • desktop: browser-secret-native (no libsecret-1 pkg-config on dev2); same failure on the tag.
    • web: 643 files, 7333 passed.
  • A sqlite3 -readonly .backup copy of dev2's database (9.5 GB, non-tmpfs) migrated with this head: 102 → 105. The ledger is exactly upstream's 105 numbered migrations (diff against the tag's Migrations/NNN_*.ts list is empty). Both fork indexes exist (orchestration_v2_projection_subagents_remote_parent_done_idx, orchestration_v2_projection_turn_items_transient_failure_idx), as do scheduled_tasks.last_run_thread_id, gate_json, gate_last_hash and gate_result_json. quick_check is ok.

Merged by Claude Opus 5.5 (Claude Code in T3 Code).

StiensWout and others added 30 commits November 21, 2026 13:14
pingdotgg#40545)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#40538)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40556)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#40475)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e number, date, header and footer (pingdotgg#40568)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…board guide (pingdotgg#37758)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#40576)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40585)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ks (pingdotgg#40592)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#40587)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40595)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#40594)

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

Co-authored-by: Kevin Flores <101906409+kevincommits@users.noreply.github.com>
… drag (pingdotgg#33221)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…itle limit (pingdotgg#29830)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ests (pingdotgg#40634)

Co-authored-by: Mostafa El Ayoubi <20224923+MostafaElAyoubi@users.noreply.github.com>
pingdotgg#40633)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
navidnadali and others added 18 commits November 21, 2026 18:07
pingdotgg#40622)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…heckout (pingdotgg#38271)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#38542)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e per turn (pingdotgg#40671)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… drops its prompt (pingdotgg#40670)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ared tooltip; remark leaves the web app (pingdotgg#27866)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Gemini 4 Neon <noreply@google.com>
Co-authored-by: Noah Sigel <noah.sigel@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-foreground-muted (pingdotgg#40676)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40701)

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…not generate text (pingdotgg#40699)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s the draft (pingdotgg#40708)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…0261122.5085

# Conflicts:
#	apps/server/src/mcp/OrchestratorMcpService.test.ts
#	apps/server/src/orchestration-v2/RunExecutionService.ts
@falistos

Copy link
Copy Markdown
Author

Review of record: 3c2368a mergeable

Reviewed merge commit 3c2368aadaf238a2725aa56ebb602750676e7612 (fork/main 8d6560443e + upstream v0.1.12-nightly.20261122.5085 c9e9e7d36a, merge-base 1a9a858d45) on both Spec and Standards axes.

Summary of checks

  • Conflicted files (2):
  • Core auto-merged overlap:
    • waitForThread (OrchestratorMcpService.ts): keeps fork waitingMessages / isParentWakeRequestKind filtering and adopts upstream's forkedFrom first-run lookup and responseCapability.type === "live" blocking rule (matching the fork's own DelegatedTaskQuestionReactor.ts:191).
    • Orchestrator.ts & EffectWorker.ts: fork expireOnTurnEnd drops expired steers at Orchestrator.ts:7260-7266, before upstream's missed-steer queue placement (fix(server): a steer that missed its turn keeps its place in the queue pingdotgg/t3code#40622) at 8292-8460.
    • RestartBackgroundNote.ts & TransientFailureRecoveryWorker.ts: upstream isDeliveredProviderTurn / promptDropped (fix(server,cursor): preserve inline handoff when a failed Cursor turn drops its prompt pingdotgg/t3code#40670) does not break transient recovery (which reads ProjectionStore.getTransientFailureCandidates and Orchestrator.ts:7414-7450, not providerTurns).
    • ThreadSettlementService.ts & ProjectionStore.ts: fork settlesWithParent runs before lookupCandidates (ThreadSettlementService.ts:454), so upstream's cross-thread PR ownership guard (fix(server): a merge no longer settles an unlinked thread on another thread's PR branch pingdotgg/t3code#40564) and getThreadsWithPullRequests(..., { includeArchived: true }) leave delegated-task settlement untouched; default includeArchived remains falsy.
    • Migrations & FORK.md rules: numbered migrations under apps/server/src/persistence/Migrations/NNN_*.ts match tag v0.1.12-nightly.20261122.5085 identically; upstreamMigrations.json is unchanged; fork schema stays in Migrations/ForkIndexes.ts; desktop update feed rules are unaffected.
    • Decision D3 (titleRenamed on cross-project delegate_task): confirmed that the child keeps its title in normal operation, though for a slightly different reason than stated in the PR body—OrchestratorMcpService.ts:3149-3177 always passes a non-empty initialMessage without generateTitle, so ThreadLaunchService.ts:1449 omits titleSeed (making seedsUntitledThread false at Orchestrator.ts:7602-7606) and message count immediately becomes >= 1. (hasTitleSetBeforeFirstMessage would not itself protect a "New thread" or placeholder-shaped title if titleSeed were ever present.) Remote delegate_task goes through t3_thread_launch (apps/server/src/mcp/toolkits/project/handlers.ts:441), which already sets titleRenamed: true.

P1 findings

None.

P3 findings (follow-up issues, non-blocking)

  1. [Standards] Pre-existing fork path in ACP adapter repeats the late-sessionScoped active-status revival bug upstream fix(acp): a late session update no longer marks a stopped thread active pingdotgg/t3code#40629 fixed (PLAUSIBLE)

    • Location: packages/provider-acp/src/server/adapter.ts:2744-2761 (publishCommandRoster) vs upstream fix at packages/provider-acp/src/server/adapter.ts:5853-5858.
    • Trigger: An ACP turn spawns a client terminal and is interrupted/cancelled. finalizeTurn (adapter.ts:8717-8730) caches updatedProviderThread in providerThreadByNativeSessionId with status: "active" (for reusable disposition), clears rosterHeldThreadIds (only completed/failed turns hold the roster at 8738), emits turn.terminal (which sets the projection's provider thread to "idle"), and clears activeTurn to null (8799). When that client terminal subsequently exits or is released, onRunningChange invokes publishCommandRoster(sessionId).
    • Observable failure: With turn === null and !rosterHeldThreadIds.has(providerThread.id), publishCommandRoster emits { type: "provider_thread.updated", providerThread: { ...providerThread, updatedAt: now }, sessionScoped: true } carrying the cached status: "active". ProviderSessionManager.ts:3027 forwards sessionScoped: true updates straight to ProviderEventIngestor.ts:511-517, reviving the stopped thread's providerThread.status back to "active".
    • Pre-existing: Introduced on fork/main (6585db9b34), not by this merge; surfaced by upstream fix(acp): a late session update no longer marks a stopped thread active pingdotgg/t3code#40629 fixing the same bug on the usage/metadata emitter in the same file.
    • Concrete fix: In packages/provider-acp/src/server/adapter.ts:2755-2760, demote status from "active" to "idle" when sessionScoped is true (or turn === null), matching lines 5856-5858, and update providerThreadByNativeSessionId with the demoted snapshot.
  2. [Standards] Parity gap for D3 (titleRenamed on cross-project delegate_task) (PLAUSIBLE)

    • Location: apps/server/src/mcp/OrchestratorMcpService.ts:3149-3177.
    • Trigger: Degenerate edge case where a cross-project delegate_task passes a maintenance-only prompt (e.g. /compact) with an explicit title, followed later by a user message in that thread (Orchestrator.ts:7610-7613 checks projection.thread.titleRenamed !== true && onlyMaintenanceHistory).
    • Concrete fix: As a small follow-up outside the sync, pass ...(input.title?.trim() ? { titleRenamed: true } : {}) to threadLaunch.launch(...) at OrchestratorMcpService.ts:3154 for parity with create_threads and t3_thread_launch.

@falistos

Copy link
Copy Markdown
Author

Review of record: 3c2368a mergeable

Lead check: cross-family review (Gemini 4 Neon, high) found no P1; the two P3s become follow-up issues. No fix round needed, head unchanged.

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.