Skip to content

merge: upstream v0.0.34-nightly.20260819.1132 (cadence pull 6, 545 commits) - #190

Merged
QuinRiva merged 552 commits into
mainfrom
t3code/upstream-sync-20260819
Aug 29, 2026
Merged

merge: upstream v0.0.34-nightly.20260819.1132 (cadence pull 6, 545 commits)#190
QuinRiva merged 552 commits into
mainfrom
t3code/upstream-sync-20260819

Conversation

@QuinRiva

Copy link
Copy Markdown
Owner

Loom had drifted a multi-week gap behind upstream — 545 commits, from v0.0.29-nightly.20260725.898 to v0.0.34-nightly.20260819.1132. This is the largest cadence pull the fork has done: 146 conflict files, resolved across three coder sessions, plus a reviewer round.

What landed

  • Upstream surfaces adopted: earlier-turn pagination, the Agents panel, and the pull-request surface — all wired through to loom's chat view rather than merged-but-unreachable. The deferred-set ledger in docs/upstream-sync/ records what was adopted, what was re-homed onto loom's shape, and what was deliberately left behind.
  • Two-lane migrations exercised for real, first time: upstream's Migrations.ts stayed byte-identical while loom's 1001+ lane replayed cleanly on a copy of a real database. The split design held with no renumbering needed.
  • Three latent projection bugs fixed in ProjectionSnapshotQuery, found while repairing merge-union damage in the server — pre-existing, not introduced by the merge.
  • Plan sidebar retired per the human ruling made during the pull: the thread-less goal overview went in favour of upstream's hero index.
  • Loom's thread-tab keyboard bindings restored — silently dropped by the merge, caught in the reviewer round.

Merge topology

Deliberately a true merge (--merge, never squash or rebase): the merge commit keeps upstream's tip as its second parent so git merge-base origin/main upstream/main advances to 36f4314ab, which is what keeps every future pull cheap.

Gates

vp run typecheck 0 errors across 15 packages · pnpm build 0 · vp check 0 · DB-copy smoke test clean (boots, migrations replay, serves).

Review

Reviewer gate resolved clean after one rework round (lost-feature audit against both parents, topology check, two-lane ledger correctness).

Standing residuals

  1. WebSocket per-turn traffic budget — the budget test now sees 52 messages/turn against a max of 21. Diagnosed as upstream's own richer streaming, not a loom regression, but the re-baseline-versus-regression decision is still open and tracked.
  2. Tooltip conversions were static-verified only; no live browser pass.
  3. Node 22.23.1 in use vs the ^24 the manifest now asks for — everything builds and runs, but the toolchain bump has not been taken.

Model: claude-opus-4-8 · Harness: T3 Code workstream (shipper sub-thread)

t3dotgg and others added 30 commits August 9, 2026 23:22
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…ing (pingdotgg#5659)

Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…g#4849)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…dotgg#5878)

Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
…tgg#5988)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…JSON body (pingdotgg#5072)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Illia Panasenko <hello@ipanasenko.me>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…shift+click and show shortcut in tooltip (pingdotgg#5994)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ontext menu (pingdotgg#5574)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Thuong Tin <thuongtin@gmail.com>
Co-authored-by: Kapish14 <kapishnarang01@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Bil0000 and others added 25 commits August 18, 2026 13:41
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
…t full speed (pingdotgg#7460)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…nt (pingdotgg#6563)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…eb/mobile/desktop green, deferred ledger

Records the measured correction (vp run was skipping apps/server while apps/web
failed, hiding 16 parse-broken files), the plan-sidebar retirement, the
markdown-links / ProcessResourceMonitor / GitVcsDriverCore / ClaudeAdapter
reconciliations, the AgentsPanel + load-earlier-turns wiring, and the deferred
chat-surface ledger. Retires the plan auto-open exception in the UI-state tiers
doc.
…, formats and passes its suites

Cadence pull 6 last mile. 306 apps/server typecheck errors -> 0 (all 15
packages), vp check 34 lint errors -> 0, and the server suite 64 failures -> 22.
The roots were spliced duplicate declarations and dropped hunks, not design
changes:

Server, production paths:
- ProviderService: duplicate runtimeEventPubSub/nowIso acquisition.
- serverRuntimeStartup: loom's reactors/welcome block duplicated ahead of
  upstream's; loom's fork sweeps and sessions.reconcile re-attached inside
  upstream's structure.
- ProviderSessionReaper: upstream's new background-work guard restored, read
  from the in-memory liveness registry instead of upstream's six-statement
  getThreadShellById (the cost this sweep exists to avoid).
- RpcAuthorization: upstream's exhaustive scope map was missing loom's 11 RPCs
  (heartbeat, absolute-path project reads, usage breakdown, workstream
  worktrees, handoff/retro draft, thread activities/lifecycle); ws.ts's dead
  RPC_REQUIRED_SCOPE map and LOOM_RPC_SCOPES deleted.
- ws.ts: dropped orchestration.getWorkflowScript handler and loom's
  remoteEditorSshHost config field restored.
- SqliteLanes: loom's read-lane orchestration mirror gained upstream's
  ThreadBackgroundLiveness/ThreadPlanProgress registries.
- ProjectionSnapshotQuery: three real defects. The shell-snapshot thread list
  had lost pinned_at/pin_order_key/title_regeneration_* (every shell snapshot
  failed to decode); the windowed message read had lost origin/controlPayload
  and loom's reasoning columns (the merged pagination path could not decode);
  and the window slice was applied AFTER unioning pinned unresolved requests,
  which dropped the very rows pinning exists to carry.
- GitManager, VcsDriverRegistry, PiDriver env, seedConfig: dropped fields and
  duplicate properties.

Tests:
- LoomMigrations: the lane assertions pinned the upstream head at 34, so every
  future pull would break them; derived from the shipped entries instead, and
  the schema-equivalence test now caps BOTH lanes at the reconciliation point.
- ~18 harnesses regained dropped layers/fields (ServerConfig, WorkspaceLease,
  BackgroundPolicy, queuedMessages, workstream thread fields), duplicate test
  bodies were de-duplicated, and upstream's mockCommandSpawnerLayer restored.
- Upstream's cursor-registry test dropped with the provider itself (Pi-first
  registry); Claude probe flag assertions moved off the pid-only fixture.

Web:
- 34 native title tooltips converted to the styled Tooltip (upstream's new
  no-native-title-tooltip rule); TooltipTrigger render keeps the same DOM.
- docs/README.md: loom's pre-split index was stacked on upstream's new one (11
  dead links); upstream's index kept with the surviving loom docs re-attached.

Gates: vp run typecheck 0 errors across 15 packages, pnpm build exit 0,
vp check 0 errors. Two-lane migration smoke on a 3.7 GB copy of the live
database: upstream 035-040 applied exactly once, fork lane 1001-1037 untouched,
idempotent on relaunch, fresh DB reaches the same object set.
…SnapshotQuery defects, migration smoke evidence
apps/web/src/routes/_chat.tsx came out of the merge byte-identical to upstream,
which took loom's useThreadTabKeyboard(routeThreadRef) call along with the two
legitimately retired sidebar-v2 lines beside it. The rest of the feature was
intact — ThreadTabsStrip mounted in three routes, useThreadTabsSync wired, the
tab.* commands still in contracts with server-side default assertions — so the
hook was defined and never called: every tab shortcut dead, the keybindings UI
still advertising them, and tab.close (mod+w) no longer consuming the key, so
mod+w closed the browser tab. Typechecks clean either way; no gate could see it.

Also records the review gate's WS-budget diagnosis (frame coalescing, not a
double-publish — a human re-baseline call) and the two rejected findings in the
state doc.
@QuinRiva
QuinRiva merged commit 969f05e into main Aug 29, 2026
3 of 4 checks passed
@QuinRiva
QuinRiva deleted the t3code/upstream-sync-20260819 branch August 29, 2026 10:37
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Aug 29, 2026
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.