Skip to content

feat(threads): persist manual active thread order - #9729

Merged
juliusmarminge merged 4 commits into
mainfrom
sidebar/active-order
Sep 6, 2026
Merged

feat(threads): persist manual active thread order#9729
juliusmarminge merged 4 commits into
mainfrom
sidebar/active-order

Conversation

@juliusmarminge

@juliusmarminge juliusmarminge commented Sep 4, 2026

Copy link
Copy Markdown
Member

Active threads always use their default order, so clients cannot save a manual arrangement. This adds a capability-gated thread.active.reorder command and persisted fractional order keys, using existing thread metadata events for compatibility with older clients. Reordering leaves activity timestamps unchanged; settling clears the saved active position, while pinning and snoozing preserve it.

Reordering reserves retained keys from hidden rows without writing to those rows, including when a keyless section first receives an arrangement.

Verified with 218 focused server, contract, and client-runtime tests covering command decisions, projection migration and replay, snapshots, key allocation, and ordering. This layer has no visual changes; the dependent client PRs contain the UI evidence.

Prepared with Codex.


Note

Medium Risk
Touches orchestration command handling, event projection, and a DB migration on core thread list state; behavior is heavily tested but incorrect replay or invariant gaps could mis-order threads across clients.

Overview
Adds manual ordering for active (non-pinned) threads behind a new threadActiveReorder server capability and a thread.active.reorder command that writes fractional activeOrderKey values via the existing thread.meta-updated event (older clients can ignore the new field).

Server/orchestration: The decider rejects reorder on archived, deleted, pinned, or settled threads; reorder does not advance thread activity timestamps. Settling clears activeOrderKey; pin/snooze/metadata upserts preserve it. Projection pipeline, snapshots, and SQLite migration 048 add active_order_key with replay tests so lifecycle upserts do not drop saved placement.

Client-runtime: Exposes reorderActiveThread, shell/detail merge for activeOrderKey/unsettledAt, reducer/projector parity, sortActiveThreadsByOrderKey (new/reopened threads ahead of keyed order), and wider generateSpreadPinOrderKeys for large active lists reusing the pinned reorder planner.

Reviewed by Cursor Bugbot for commit 3c0b9d9. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Persist manual active thread order across client, server, and projection

  • Adds ThreadActiveReorderCommand to the client and orchestration command unions, carrying a thread ID and a trimmed non-empty order key. The server decider emits a thread.meta-updated event with the key while preserving the thread's existing activity timestamp; deleted, pinned, and settled threads are rejected.
  • Adds an optional nullable activeOrderKey to OrchestrationThread, OrchestrationThreadShell, and ThreadMetaUpdatedPayload. The projector and applyThreadDetailEvent initialize it to null on creation, clear it on thread.settled, and apply it only when present in thread.meta-updated.
  • Client runtime gains reorderActiveThread in commands.ts and a serialized reorderActive environment command. sortActiveThreadsByOrderKey places keyless threads before keyed ones and applies deterministic thread/environment tie-breakers.
  • generateSpreadPinOrderKeys now widens the key space for larger lists. planPinnedReorder skips order keys held by hidden rows when inserting or materializing sections.
  • Migration 048 adds the active_order_key column to projected threads; the projection repository upserts and reads it. ServerEnvironment advertises threadActiveReorder in its capability descriptor.
  • Risk: mergeEnvironmentThread now takes activeOrderKey and unsettledAt from shell metadata instead of retaining cached detail values. Existing readers that relied on stale detail values for those fields will see shell-authoritative values.

Macroscope summarized 1052255.

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Sep 4, 2026
@juliusmarminge
juliusmarminge marked this pull request as ready for review September 4, 2026 17:47
@github-actions

github-actions Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 13.6 KiB 13.6 KiB −31 B (−0.2%) 15.1 KiB
Codex Thread snapshot wire 7.0 KiB 7.0 KiB +9 B (+0.1%) 7.3 KiB
Codex Live turn WebSocket wire 6.6 KiB 6.5 KiB −40 B (−0.6%) 7.8 KiB
Codex Live turn WebSocket decoded 57.1 KiB 57.0 KiB −88 B (−0.2%) 66.4 KiB
Codex Live turn messages 10 8 −2 (−20.0%) 21
Claude Total thread wire 13.6 KiB 13.6 KiB +7 B (+0.1%) 15.1 KiB
Claude Thread snapshot wire 7.0 KiB 7.1 KiB +2 B (+0.0%) 7.3 KiB
Claude Live turn WebSocket wire 6.6 KiB 6.6 KiB +5 B (+0.1%) 7.8 KiB
Claude Live turn WebSocket decoded 57.9 KiB 57.9 KiB 0 B (0.0%) 66.4 KiB
Claude Live turn messages 10 10 0 (0.0%) 21

Baseline: 29d03ec · PR result: d8f4d86 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 113.9 KiB
  • Claude decoded thread snapshot: 114.6 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

@macroscopeapp

macroscopeapp Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change introduces persistent manual active-thread ordering across the client, orchestration protocol, server projections, and database schema, with new user-visible list behavior. The capability is enabled by default and the cross-layer state and migration changes exceed a small, self-contained addition.

Not approved because:

  • Monthly spending limit reached (workspace setting). Approvability relies on correctness review in order to determine eligibility

Review your spending limits in Billing settings. You can add or adjust custom eligibility rules. Learn more.

@juliusmarminge juliusmarminge changed the title sidebar/active order feat(threads): persist manual active thread order Sep 4, 2026
@juliusmarminge
juliusmarminge force-pushed the sidebar/active-order branch 2 times, most recently from 3c0b9d9 to 1498abc Compare September 6, 2026 05:41
@juliusmarminge
juliusmarminge merged commit 2d645df into main Sep 6, 2026
25 checks passed
@juliusmarminge
juliusmarminge deleted the sidebar/active-order branch September 6, 2026 18:10
github-actions Bot added a commit to omarcresp/t3code-flake that referenced this pull request Sep 6, 2026
## What's Changed
* fix(web): show Tux icon for WSL environments by @UtkarshUsername in pingdotgg/t3code#8511
* perf(web): speed up folder menu sorting by @AksharP5 in pingdotgg/t3code#10190
* style(web): fix inconsistencies in new settings layouts by @extoci in pingdotgg/t3code#10177
* feat(threads): persist manual active thread order by @juliusmarminge in pingdotgg/t3code#9729
* feat(mobile): arrange active threads from both thread lists by @juliusmarminge in pingdotgg/t3code#9730
* feat(web): drag threads across sections with consistent motion by @juliusmarminge in pingdotgg/t3code#9731
* feat(web): simplify sidebar drag destination cues by @juliusmarminge in pingdotgg/t3code#9750
* fix(mobile): keep pending tasks queued when a send fails in flight by @juliusmarminge in pingdotgg/t3code#10245
* feat(mobile): show new-task drafts alongside pending tasks in the thread list by @juliusmarminge in pingdotgg/t3code#10260
* feat(mobile): allow several new-task drafts per project by @juliusmarminge in pingdotgg/t3code#10327
* fix(mobile): slide settled threads out before collapsing by @StiensWout in pingdotgg/t3code#10345


**Full Changelog**: pingdotgg/t3code@v0.0.39-nightly.20260906.1303...v0.0.39-nightly.20260906.1316

Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.39-nightly.20260906.1316
BarretoDiego pushed a commit to BarretoDiego/t3code that referenced this pull request Sep 7, 2026
sheehanmunim added a commit to munimtechnologies/mtcode that referenced this pull request Sep 7, 2026
Adopts upstream's manual active-thread ordering (pingdotgg#9729) in place of the
fork's own implementation, per Sheehan's call. The decider now emits
upstream's `thread.meta-updated` with `activeOrderKey` and its guards
(reject deleted/pinned/settled, retain the snooze slot, leave updatedAt
alone). The fork's `thread.active-reordered` event is no longer emitted,
but its schema, projector, ProjectionPipeline and client reducer cases are
deliberately RETAINED: shipped fork databases contain those events and
replay must keep decoding them.

Conflict resolutions worth remembering:

- ProjectionSnapshotQuery: upstream's new `getTurnStartMessage` SELECT
  omitted the fork's message-correction columns that the shared row schema
  requires, so every turn start failed to decode (`MissingKey`) and took 14
  orchestration tests with it. Added original_text, correction_target_message_id,
  correction_replacement_text and delivery_state to the SELECT.
- ProviderCommandReactor: upstream moved turn-start lookups to the projection
  and switched the handler to a thread SHELL, which carries only a truncated
  objectivePreview. The fork's Goal Continuation needs the full Objective, so
  it re-reads the detail on that path only. `buildSendTurnRequestForThread`
  also loaded the whole transcript eagerly; it now uses the shell and defers
  the detail read to the hand-off prelude that actually needs it (this is what
  upstream's "without loading old message bodies" test asserts).
- ProviderRuntimeIngestion: the fork's nullable Continuation messageId flowed
  into upstream's non-null `getThreadMessageById`; guarded.
- OpenCodeAdapter: took upstream's `textPartsByMessageId` and dropped
  partById/emittedTextByPartId/completedAssistantPartIds (no remaining uses),
  keeping the fork's turns/context-window/compaction fields.
- Migrations: upstream's ProjectionThreadBranchPullRequest appended as fork id
  52; upstream's ProjectionThreadsActiveOrderKey NOT registered again — it is
  byte-identical to the fork's already-shipped id 43.
- MessagesTimeline.logic: restored the fork's checkpoint-readiness guard that
  upstream's relocated copy lacked, so Revert stays hidden until a checkpoint
  is ready; the two fork tests that drove this through the removed
  revertTurnCountByUserMessageId prop now build a real ready-checkpoint fixture.
- threadCommands: removed duplicate ReorderActiveThreadInput/reorderActiveThread
  declarations left by a keep-both resolution.
- Re-exported helpers upstream's Knip sweep privatized but the fork imports:
  activeThreadAnchorTimestampMs.
- Sidebar.tsx keeps the FORK's drag-and-drop subsystem (drag-to-snooze, overlay
  ghost, force-settle of a running thread, sidebarActiveThreadSortOrder) over
  upstream's pingdotgg#9731/pingdotgg#9750 rework; upstream's Sidebar.drag.ts/motion.ts are now
  referenced only by their own tests.
- Guard script: upstream pingdotgg#10101 deleted the client-side ThreadChangeRequestSnapshot
  atom the linked-PR check pointed at, so the check now follows the badge to its
  new server-provided source.

Verification: all packages typecheck; server orchestration+persistence 603/603,
client-runtime 1349/1349, contracts 393/393, web unit 4427 pass. The only web
failures are the two fork Goal e2e specs, confirmed failing identically on
backup/mtcode-pre-upstream-sync-20260906b.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
aorwall added a commit to aorwall/t3code that referenced this pull request Sep 7, 2026
Merges 141 upstream commits (`b438447f6..8b2838e`) into the fork,
following the
`fork-upstream-merge` skill. Landed as a merge commit; conflicts
resolved by the
path-policy verdicts in `docs/fork/inventory.json`.

## Merge shape

563 files landed (`git diff --stat HEAD^1 HEAD`) against 563 in the
upstream
range, so no upstream work was dropped. Fork delta 720 files.

## Conflicts

14 files, resolved by concern. The merge commit message names each. Two
are worth
carrying forward:

- Upstream extracted the project action rows into
`ProjectActionsList.tsx`. The
fork's Edit gate now rides an `editable` prop that defaults to
upstream's
  always-editable behavior, so the gate survives the next extraction.
- Upstream moved the `agent-browser-access` setting onto its new
`/settings/projects` page. `settingsSearch.ts` points that item there
and drops
  a fork delta.

## Two things a clean merge did not show

**Upstream can delete an export the fork still imports.** pingdotgg#10225 removed
`ClientTracingLive` as unused. `apps/web/src/lib/runtime.ts` still
installs it,
and neither file conflicted, so the typecheck failed four ways on a
merge git
called clean. Restored with a `// Fork:` comment naming the consumer.

**A green test step can hide a suite that never finished.** `vp run -r
test`
kills the packages still running when one of them fails. A
`@t3tools/desktop`
failure truncated `apps/web` and `@t3tools/mobile` after each had
reported
hundreds of passing files, and `verify.mjs` counted any package with
labeled
output as tested. Four failing web tests went unreported. The check now
keys on
the closing `Test Files` line and runs every unfinished package alone.

## Unsupported methods

`unsupported-methods.mjs` reports 0 ADD, 0 DROP, 2 KEEP, against 61
dispatched
backend methods and 131 contract methods.

Getting there took a fix. The backend moved its dispatch from
`crates/t3code/src/lib.rs` to `crates/t3code/src/rpc/dispatch.rs`, where
every
arm is a one-line call into a handler below the match. The script read
the old
path and reported zero dispatched methods, then read the new one and
called
`vcs.switchRef` a DROP, because the `unsupported_exit` that refuses it
had moved
out of the arm. It now tries both paths and follows an arm two calls
deep.

Contract changes: `provider.consumeResetCredit` and
`server.getHostResources`
gained `UnsupportedMethodError`; `server.getUsageSummary` lost it, which
closes
the item the previous merge left open.

## Feature classification

**Usable as-is** — client-only, nothing new on the wire. Sidebar drag
across
sections with destination cues and a named drop action (pingdotgg#9731, pingdotgg#9750,
pingdotgg#10378,
pingdotgg#10453, pingdotgg#10464). Composer behavior: a multiline draft survives timeline
scrolling (pingdotgg#10444), the composer stops collapsing on blur (pingdotgg#10437) and
regains
focus when you tab back (pingdotgg#10463). Panel and preview chrome: resize the
floating
preview from any edge (pingdotgg#10467), toolbar controls stay anchored (pingdotgg#10478),
the
stuck resize cursor clears (pingdotgg#10461), the browser hides as the right
panel closes
(pingdotgg#10385), manual panel choices hold during a turn (pingdotgg#10113). Settings and
accessibility polish (pingdotgg#10177, pingdotgg#10262, pingdotgg#10415, pingdotgg#10258, pingdotgg#10124, pingdotgg#10125,
pingdotgg#10127,
pingdotgg#10128, pingdotgg#10175). Performance (pingdotgg#10413, pingdotgg#10190, pingdotgg#10118). Plus the GitHub
mark on
`github.com` links (pingdotgg#10324), the Tux icon for WSL (pingdotgg#8511), a remembered
usage
page selection (pingdotgg#10189), project settings in the legacy sidebar menu
(pingdotgg#10021),
and text-only preview snapshots (pingdotgg#10232).

**Unsupported in Moatless** — resolves to a refusal, or falls through to
its own
empty state. Each is recorded in `docs/fork/gaps.md`:

- Reset credits through the hub and CLIProxyAPI (pingdotgg#10462, pingdotgg#10395,
pingdotgg#10308).
`provider.consumeResetCredit`, new union entry. `UsageLimits.tsx`
catches the
  refusal and shows "Could not use the reset credit."
- Balancing new threads across connected machines (pingdotgg#9895, pingdotgg#10433,
pingdotgg#10407).
`server.getHostResources`, new union entry. Nothing polls until a user
picks
automatic routing, and the composer then reads "Auto balance
unavailable."
- Onboarding: import grouped by repository (pingdotgg#10493), the shared
multi-computer
  wizard (pingdotgg#10465), agent install without Node or npm (pingdotgg#10402). All ride
  `agentSessions.scan` and `.import`, an existing gap.
- Shared project defaults and scoped overrides (pingdotgg#9754). The page reads,
and every
  write goes through `server.updateSettings`, which the backend does not
  dispatch.
- Two new `orchestration.dispatchCommand` types: `thread.active.reorder`
(pingdotgg#9729)
and `thread.user-input.dismiss` (pingdotgg#10431). Both are ordinary controls, a
sidebar
drag and a Dismiss button, and a dispatched command cannot be refused
per type.
That is the standing _A command cannot be refused_ gap, now 26 members
wide.

**Backend behavior to consider reproducing in Moatless** — upstream
server fixes
whose behavior the fork's client assumes:

- Invalid script IDs no longer crash threads (pingdotgg#10019). The fork ships
project
  scripts, so this one is worth reading first.
- Settlement: settle inactive threads without a PR lookup (pingdotgg#10103), skip
disabled
settlement lookups (pingdotgg#10424), settle threads with unanswered async
questions
  (pingdotgg#10400).
- Interrupted threads stay resumable after a restart (pingdotgg#10421).
- Completed requests stay closed across clients (pingdotgg#10123).
- Placeholder branches are followed after a checkout updates (pingdotgg#10441).
- A thread's PR links without an open client (pingdotgg#10101), and checkpoints
are
  captured before a PR status refresh (pingdotgg#10347).
- Adapters declare their own context compaction (pingdotgg#10112).
- Transcripts with oversized tool records import (pingdotgg#10430), and git
status scans
  are skipped while the index is locked (pingdotgg#9845).
- Usage limits pool per provider across accounts and environments
(pingdotgg#10300). The
client renders what `server.getUsageSummary` returns, so this shows
something
  only if the Moatless payload carries per-account limits.

Mobile, marketing, desktop, provider adapters and release tooling are
not this
fork's surface and are not classified.

## Also fixed here, and not upstream's doing

- Three `browser-*` search items still routed to
`/settings/integrations`, which
the fork owns for its Moatless administration page. A non-administrator
who
  searched for them was redirected away from the result.
- `moatless/listSearch.ts` carried no fork-only declaration.
- `pnpm fmt:check` failed on 294 files, 293 of them orval output. The
generator
  now formats what it writes through an `afterAllFilesWrite` hook.
- `@t3tools/moatless-api` exported `./generated`, a barrel that is never
checked
  in.

## Verification

`inventory-check.mjs` clean. `verify.mjs` green on seven checks:
duplicate-adds,
tripwires, resolution-check, unsupported-methods, `fmt:check` (3876
files),
`lint` and `typecheck`.

`test` is red on one package, and it is the machine.
`@t3tools/desktop`'s
`bundled libsecret helper` shells out to `pkg-config` for `libsecret-1`,
which
this sandbox does not have; it fails the same way when retried alone.
Everything
else passes: `apps/web` 369 files, `t3` 291, `@t3tools/mobile` 149,
`t3code-relay` 27, `@t3tools/client-runtime` 71, plus the smaller
packages.

`spec:check` cannot run in a sandbox: it needs a sibling `moatless`
checkout or a
deployment URL and has neither.

Written by Claude Opus 5 in Claude Code.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---
Moatless task:
https://moatless.soaplabstest.com/tasks/8d348ecf-f9cb-4e65-b96b-6c1054a8ed33
colonelpanic8 added a commit to colonelpanic8/t3code that referenced this pull request Sep 7, 2026
Advance the base from upstream/main 7544d3d to 1d1bf50 (106 commits).

The v2 rewrite's deletions stand: 34 modify/delete conflicts resolved as
deletions after confirming each file is absent from pingdotgg#2829's head.

Two upstream features are dropped whole rather than half-wired, for upstream
to re-port: manual active-thread ordering (pingdotgg#9729) and branch pull-request
synchronization. Neither has a v2 command, event, projection or client model;
their additions auto-merged only into the legacy compatibility layer
(contracts/orchestration.ts, exported as ./legacy-orchestration), which is
kept internally consistent. The server no longer advertises the
threadActiveReorder capability, so capability-gated UI self-disables.

Client-side branch/CWD pull-request detection, which predates this merge and
is v2-compatible, is retained; only main's server-projected branchPullRequest
metadata path is dropped.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L 100-499 changed lines (additions + deletions). 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.

1 participant