Skip to content

feat(squadrons): rename and delete a Squadron from the scope control - #247

Merged
bryantderosier merged 16 commits into
j5/mainfrom
j5/squadron-rename-delete
Sep 24, 2026
Merged

bryantderosier merged 16 commits into
j5/mainfrom
j5/squadron-rename-delete

Conversation

@bryantderosier

@bryantderosier bryantderosier commented Sep 22, 2026 •

Copy link
Copy Markdown
Collaborator

Problem

Squadrons could only be listed and created. Once one existed there was no way to fix its name or get rid of it, so mistakes and experiments piled up in the scope dropdown forever.

What this does

  • Rename and Delete actions appear in the sidebar Squadron scope dropdown, under the currently selected Squadron. Both call the owning environment, so they work local, relay, and tunnel.
  • Rename trims whitespace, rejects an empty name, and keeps the Squadron id stable. Every place that shows the name joins the squadron table live, so homes, memberships, Crews, thread cards, and Fleet follow the new name. Rename and delete also refresh the inbox list and bell count, which carry the Squadron name and rows separately from the directory.
  • Delete is a hard delete in one transaction. My rule: only live state blocks it. A Squadron with active agents or an unarchived Crew is refused with a 409 that names the counts, and the dialog shows that message verbatim. Otherwise the Squadron's history (ledger events, receipts, placements, memberships of archived agents, project references, registered machine senders) is purged and the row goes. Threads homed there keep their history and read as no known home, so they still appear under All Squadrons.
  • After a delete the ambient scope and any draft carriers pointing at that Squadron fall back to All Squadrons.
  • The purge deletes only the three ON DELETE RESTRICT tables and lets the foreign_keys pragma cascade everything else. A test reads every foreign key onto the squadron table from the live schema and asserts those tables hold no rows for the deleted Squadron.

Server: POST /api/j5/squadrons/:id/rename and POST /api/j5/squadrons/:id/delete through the existing J5 authenticated route layer. Both are POST so cross-origin browser clients pass the CORS method allowlist without touching upstream. Contracts and fetchers are J5-owned. No upstream file is touched, so FORK.md needs no new inventory case. Mobile has no Squadron code today, so this slice does not add it there. The Fleet page is deliberately left alone to avoid conflicts with #241, #242, and #244.

Screenshots

Before, on j5/main, with a Squadron selected:

Before: scope menu

After, the same menu with the selected Squadron's actions:

After: scope menu with Rename and Delete

Rename dialog:

Rename dialog

Delete confirmation:

Delete dialog

Delete refused because the Squadron has live agents and a running Crew:

Delete refused

Rename applied and reflected in the trigger and menu:

After rename

Delete applied on a Squadron with history but no live agents or Crews; the scope reset to All Squadrons:

After delete

Verification

Server squadron tests 11/11, web squadron tests 30/30, typecheck clean in apps/server, apps/web, packages/contracts, and packages/client-runtime. Real-client pass in headless Chrome against a local dev server seeded with a copy of test data: rename round-trip, refused delete, and successful delete with scope reset.

Built by a three-seat Crew (server, web, reviewer) running Claude Fable 5.1 in T3 Code through the Claude Code harness.

🤖 Generated with Claude Code

bryantderosier and others added 10 commits September 22, 2026 12:33
The sidebar Squadron scope dropdown gains a section for the selected
Squadron with Rename and Delete actions. Rename opens a dialog prefilled
with the current name that trims and disables submit on empty or
unchanged input. Delete opens a confirmation naming the Squadron, stating
that thread labels lose their Squadron home and that live members or
Crews block deletion, and shows the server's 409 message verbatim.

Both actions call the owning environment, then force-refresh that
environment's Squadron directory, requested thread homes, and the Fleet
read. After delete, the ambient scope and any draft carrier that pointed
at the deleted Squadron reset to All Squadrons.

The client commands are a local stub against the agreed PATCH/DELETE
routes until client-runtime ships renameSquadron/deleteSquadron.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
The server removes the Squadron's ledger and placement history inside the
delete transaction, so the confirmation dialog now states that alongside
the existing consequences.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Squadrons could only be listed and created. Add PATCH and DELETE routes on
/api/j5/squadrons/:id backed by new ledger and management operations.
Rename trims the name and rejects a blank one. Delete is one transaction
that first counts members, active Crews, machine participants, and the
ON DELETE RESTRICT history tables (comm events, placement events, command
receipts) and refuses with a typed SquadronDeleteBlockedError naming the
blockers, returned as HTTP 409; CASCADE tables go with the row. Contracts
and client-runtime fetchers renameSquadron/deleteSquadron are appended
next to the existing Squadron schemas.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Expose renameSquadron and deleteSquadron on the J5 environment atoms next
to createSquadron so the web scope control can run them.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
client-runtime now ships renameSquadron and deleteSquadron in the J5
environment atoms, so the temporary HTTP stub in the web state module is
gone and the web client points at those commands.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…directly

Matches createSquadron: squadronClient runs j5Environment.renameSquadron
and j5Environment.deleteSquadron itself, so the alias object and the
stub's leftover imports leave the web state module untouched.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
A delete that only worked on never-used Squadrons did not meet the ask.
Only unarchived agent members and running Crews now block deletion, named
with counts in the 409 message. Otherwise one transaction removes every
squadron-keyed row in dependency order, including the ON DELETE RESTRICT
history tables (comm events, command receipts, placement events), before
the squadron row, so threads that were homed there read as unknown-home.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…order

Two Squadrons created in the same millisecond tie on created_at and fall
back to random id order, so the assertion sorts the names first.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…schema

The purge now iterates one exported list of every table with a foreign key
onto j5_a2a_squadron, and a test reads PRAGMA foreign_key_list for the
migrated schema and asserts the list matches, so a future referencing table
fails the test instead of surfacing as a constraint error. The
archived-member delete test also seeds placement history and asserts the
thread reads as unknown home afterward. Blockers stay unarchived agent
members and running Crews; a send-only machine credential is purged with
its Squadron because it means nothing without it.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
The dialog popup lays out header, panel, and footer as a flex column. The
rename form sat between them as a plain block, so the scroll panel grew
past the popup border and the Cancel and Rename buttons rendered on a
strip below it. The form is now a flex column like the upstream wrapper
in the publish dialog, so the footer sits inside the popup again.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XL 500-999 effective changed lines (test files excluded in mixed PRs). labels Sep 22, 2026
@bryantderosier bryantderosier self-assigned this Sep 22, 2026
Jacksondr5 and others added 2 commits September 23, 2026 14:18
* fix: port main fixes stranded by the v2 rewrite

- Port thread pinning (#5312) into the orchestration-v2 command pipeline:
  thread.pin/unpin commands, thread.pinned/unpinned events, pinnedAt on the
  v2 thread state and projected shells, promotion semantics (pin clears
  settle/snooze, settle clears pin) matching the v1 decider, and client
  pin/unpin operations in the v2 dispatch style.
- Port the regenerated-title context anchoring (#5365) into
  ThreadTitleRegenerationService: pin the first user message ahead of the
  retained tail when the digest is truncated.
- Re-apply the right-panel controls positioning from #5260 to the v2
  ChatView title bar controls.
- Repair merge artifacts: committed conflict markers in BranchToolbar,
  duplicate capability keys, duplicate CommandPalette import, v1 turn
  naming in DiffPanel's focus-refresh effect, onSend signature merge.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* test(server): align migration expectations with renumbered ids

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(orchestrator): Surface waiting background work (#4378)

* fix(web): align git action progress button layout

- Match progress button spacing and single-line height to static git actions

* fix: repair conflict-marker artifacts from rebase auto-resolutions

rerere replayed stale resolutions during the rebase and committed nested
conflict markers in several files. Restore the branch-intended v2 shapes
and re-graft main's compatible additions (pending-card opacity comments,
theme-editor keybinding test, mobile scroll re-arm effects from #5566).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(server): renumber v2 migrations after main's 037_ProjectionTurnsKeysetIndex

Main owns migration numbering: 037_ProjectionTurnsKeysetIndex landed on
main (#5493), so the v2 migrations shift from 037-045 to 038-046.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: port main fixes stranded by the v2 rewrite (round 2)

Native subagent observability (#5219), wired per its spec's v2 merge plan:
- getWorkflowScript RPC re-homed onto the v2 WS surface (contracts, rpc
  group, ws handler, auth scope, client atom).
- AgentsPanel fed by the spec's mapper swap: projectedSubagentsToRuntime
  maps orchestration-v2 subagent entities into the panel model;
  deriveAgentPanelModel's v2Projection leg is now live and the v1 fold
  never runs. Agents surface wired into ChatView + RightPanelTabs.
Other ports and reconciliations:
- Shell reconnect-loop fix (#5561) ported into the v2 shell sync
  (same-session resubscribes resume from the in-memory cursor), with the
  cursor-resume regression test adapted to v2 fixtures.
- Mobile end-follow latch (#5566) ported onto the v2 ThreadFeed.
- Claude ede_diagnostic interrupt classification (#5557) ported into
  ClaudeAdapterV2 (aborted_tools/aborted_streaming => interrupted; CLI
  telemetry never becomes the failure banner). #5559 needs no v2 port
  (unknown system subtypes are already ignored).
- Plan sidebar removed from the v2 ChatView/ChatComposer per main's
  plans-fold-into-chat rework (#5558); rightPanelStore stays at main's
  surface set.
- SettingsPanels rebuilt as main's refactored version plus the branch's
  composer-context setting; sidebar snooze respects the time format
  (#4438 follow-through).
- v1-only leftovers deleted: zombie v1 adapters/ingestion/tests the v2
  rewrite removes, the v1-bound transfer-budget CI harness (#5350, needs
  a v2 rebuild), and main's v1 client pagination machinery (#5493 client
  side; the 037 keyset migration is kept — server-side v2 windowing is a
  follow-up).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore(web): prune plan-sidebar leftovers after the inline-plans rework

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): port the refined live-follow gesture gating to the v2 timeline

The rebase kept the LegendList 3.3.3 upgrade and patch from #5449 and the
mobile end-follow latch from #5566, but the v2 MessagesTimeline/ChatView
still carried the branch's blunt any-gesture-breaks-follow listeners.
Port main's #5566 web mechanics onto the v2 follow architecture:

- resolveTimelineIsAtEnd measures the 40px follow re-arm band from real
  geometry (contentLength/scroll/scrollLength minus the composer inset),
  keeping the isNearEnd fallback for older state shapes.
- Follow now breaks only on gestures that can actually leave the live
  edge: upward wheel with overflowing content, touch drags that exited
  the end band, scrollbar drags vs content clicks, and keyboard
  navigation (PageUp/Home/ArrowUp) — previously keyboard scrolling never
  broke follow and the next stream chunk yanked the view back down.
- Listener attach retries across frames so a thread switch cannot mount
  the list without its opt-out listeners.

Deliberately not ported: #5449's shouldRestorePosition disclosure
anchoring and follow-gated maintainScrollAtEnd — the v2 timeline keeps
maintainScrollAtEnd={false} with its own follow scrolls and anchor
system; flipping that core is a separate change.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): let LegendList own end-follow and disclosure anchoring (#5449)

Complete the #5449 architecture on the v2 timeline, following the
LegendList author's direction to lean on the list's native mechanisms
instead of app-side scroll layers:

- maintainScrollAtEnd is enabled and owned by LegendList, gated off only
  while the user reads history (liveFollowEnabled), while a sent turn
  anchors near the top (anchoredEndSpace), or during the two-frame settle
  of a fold toggle.
- maintainVisibleContentPosition compensates size changes natively
  ({data, size, shouldRestorePosition}); fold toggles anchor compensation
  to the toggled row via a disclosure anchor key, so the trigger stays
  under the pointer instead of the viewport chasing the end.
- ChatView's hand-rolled streaming follow (double-rAF scrollToEnd on
  every data change) is gone; the app now only owns streaming
  adjustments during anchored-end-space mode, mirroring main.
- timelineLiveFollowEnabled state mirrors the follow refs so the
  render-visible gate switches native follow off when a gesture breaks
  follow and back on when the viewport returns to the end band.

Timeline tests updated to assert the native-ownership invariants.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): show Git action success inline in panel

- Keep success feedback visible in the Git action control for 10 seconds
- Move the running elapsed timer into the panel menu slot

* fix: repair rerere-damaged files and reconcile main's round-3 features with v2

Post-rebase reconciliation sweep:
- Sidebar: main's folded Sidebar.tsx/Sidebar.logic.ts adapted to v2 shells
  (latestRun/runtime naming, waiting status instead of monitoring), with
  subagent-thread filtering and main's pinned-reorder helpers re-exported
- Pinned drag reorder (#5581) ported into v2: thread.pin orderKey +
  thread.pin.reorder command, thread.pin-reordered event, Orchestrator fold,
  ProjectionStore/Maintenance, client-runtime commands and shell mapping
- Project favicon (#4849-era) and defaultThreadEnvMode flowed through v2
  contracts (OrchestrationProjectShell, application event payloads)
- ChatView: main's #5592 header props, pull-request right-panel surfaces,
  liveAgentCount badge (#5745) wired into the v2 panel layout
- enableAssistantStreaming -> enableLegacyTokenStreaming rename applied to
  v2 RunExecutionService and replay testkit
- Removed v1 zombies resurrected by the rebase (provider service/reaper/
  ingestion + v1 layer tests, server.test.ts, integration harness)
- routeTree: main's tree + branch's /settings/scheduled-tasks route
- Misc marker-sweep syntax repairs (rpc.ts, entities.ts, localApi.test.ts,
  rightPanelStore.test.ts, GitManager.test.ts, mobile model menu helpers)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore(server): renumber v2 migrations 038-046 to 041-049 after main's 038-040

Main released ProjectionThreadsPinOrderKey (038),
ProjectionProjectsDefaultThreadEnvMode (039) and
ProjectionProjectFaviconPath (040), so the branch-private v2 stack shifts
up by three. Registry ids were already 41-49; this renames the files and
identifiers to match and updates the ledger expectations and through-id
boundaries in the migration tests (released boundary 37 -> 40).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(server): port round-3 main fixes into the v2 orchestrator

- a6c9b41f90 (agents open pasted images): ClaudeAdapterV2 now grants the
  attachments dir alongside cwd via additionalDirectories and appends
  '[Attached ... is saved at: path]' lines to the turn text so tools can
  dereference pasted images (pixels alone are not tool-readable).
- 5bb8c03664 (settle leaves monitors running): thread.settle now joins
  archive/delete in the provider-session detach set, so PR monitors, dev
  servers and subagent fleets stop when the user parks the thread. The
  settle guard already rejects active runs, and serialized dispatch closes
  the re-engage race the v1 fix handled with onlyIfSettled.
- e70cdb478d (Claude resume handshakes) and 2c7267ad43 (reaper vs live
  background subagents) are already covered structurally in v2: results
  are turn-scoped with explicit zero-turn handshake drops, and idle
  release is pinned while background work is pending.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* test(web): restore main's right-panel migration expectations after the panel-visibility merge

The keep-both merge nested main's plan-surface migration test inside a
branch popover test and dropped the threadPanelVisibilityByThreadKey key
from the migration results. Restore main's test body and include the
branch's (empty) visibility map in the expected persisted shape.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* test(server): expect attachment saved-at lines in ClaudeAdapterV2 turn text

Follow-up to the #5757 port: start and steer turns now append the
'[Attached ... is saved at: path]' line, so the adapter fixtures assert it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): restore the branch's slim chat header

The round-3 reconciliation took main's ChatHeader wholesale and wired its
full prop set, resurrecting the scripts/open-in/git-actions cluster the
branch had deliberately relocated into the thread panel. Restore the
79-line slim header (project favicon + name + thread title) and its
minimal ChatView call. #5592's header actions stay a documented v2
follow-up, as decided in round 2.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(web): add pull request actions to thread details

- Add ready, merge, and conflict-resolution actions to the PR row
- Share pull request action and handoff logic with the detail panel
- Fix thread details scrolling and row alignment

* fix(mobile): port main's composer stabilization into the v2 thread screens

Round-4 reconciliation of #5986/#5988 with the v2 cutover files:
- PendingUserInputCard adopts main's collapsible overlay redesign with the
  v2 RuntimeRequestId/responseCapability plumbing (dead provider processes
  still read-only the card)
- ThreadFeed adopts the thread-feed-live-follow transition model, the
  user-scroll settle window, momentum handoff, and env-scoped feed keys
  while keeping the v2 nearListEnd layout gating
- ThreadDetailScreen hides (not unmounts) the composer while a user-input
  request owns the slot; multi-select answers flow as arrays end to end
  (threadActivity toggle/build helpers + tests, ThreadUserInputQuestion)
- ThreadComposer keeps the v2 canStopThread stop gate under main's
  onEditorFocusChange rename; standalone stop reuses the shared renderer
- Restored the branch's steer stop/send tests alongside main's composer
  test suite

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): reconcile main's round-5 features after the rebase

- PullRequestDetailPanel takes main's #6039 rework wholesale (reactions,
  update-branch, auto-merge, in-place editing); the thread-details action
  hooks stay in usePullRequestActions with label maps extended for the
  new action variants
- CommandPalette #6330 provider subtitles adapted to the v2 shell
  (session -> runtime for provider instance and display name)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(web): prioritize pull request row actions

- Add conflict, draft, failing-check, and merge action ranking
- Show check progress and pull request details in row tooltips

* fix(web): restore main's collapse chrome and tab-status keying on the PR panel

The round-5 ChatView reconciliation kept the round-3-era PullRequestDetailPanel
call, so the panel mounted without chromeVariant="collapse" — the #6039
scroll-condensing chrome never engaged and the description scrolled under a
full-height chrome. Restore main's call exactly: collapse chrome,
composerDraftTarget for same-thread hand-offs, the isThreadOwnPullRequest
context check, and tab statuses keyed by the active surface id via
updatePullRequestTabStatus instead of a key rebuilt from the status payload.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(orchestration): bound thread history and resume payloads

- Add paginated thread history with bounded snapshots and replay limits
- Trim oversized wire payloads and support progressive mobile history loading

* feat(contracts): track thread title regeneration

- Add optional title regeneration request and start time to thread shells
- Cover cache serialization on mobile and client runtime

* fix: reconcile main's round-6 features after the rebase

- ChatView: #5880 auto-settle-on-merge setting flows into effectiveSettled,
  #5644 browser favicon project registration effect, activeProjectRef memo,
  desktopByTabId on both RightPanelTabs mounts
- server: provide ServerSecretStore to the McpSessionRegistry's
  ServerEnvironment layer (#6325 reads publish opt-in per descriptor)
- mobile: 3-way merged main's deltas into the v2 thread screens
  (NewTaskDraftScreen keeps the branch title seed + main's environmentId,
  threadListV2 keeps both new test suites, queries imports deduped)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): keep the titlebar layout controls fixed across right-panel toggles

Restores main's one-inset rule (#5226) that a rebase resolution had
overridden with a conditional right-2 offset, which made the controls jump
sideways whenever the right panel opened. Also restores the live-agent
count badge on the right-panel toggle (#5745) that the round-6 replay
dropped, and applies the same fixed-position rule to the pull requests
page: the toggle now stays mounted at one absolute inset in both states,
with a footprint spacer in the list header so the refresh button never
slides underneath it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): align titlebar clusters to one shared pixel inset

The right controls carry mr-px (main's border compensation for anchoring
inside the panel frame), which left the sidebar trigger one pixel closer
to its edge and the sheet-mode tab bar one pixel tighter than the closed
state. Mirror the pixel on the trigger and the sheet layout-controls slot
so all three read the same inset.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): size the titlebar layout-control icons like the sidebar trigger

The trigger's icon falls through to the Button default (size-4) while the
right cluster hard-coded size-3.5, so the two ends of the titlebar read a
pixel apart on every edge. All five layout-control icons now use size-4,
matching the trigger and the pull requests page's refresh icon.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* perf(server): keep shell snapshots bounded and active-only

- Omit transcript bodies from shell rows
- Query archived threads separately and stream compact resume metadata

* fix: reconcile main's round-8 features after the rebase

Re-applies the deltas that mid-stack blob reverts discarded, and merges
main's work into the v2-owned surfaces:

- keybindings: main's STATIC_KEYBINDING_COMMANDS rename plus both new
  commands (rightPanel.toggleMaximized alongside threadPanel.toggle)
- OpenInPicker: main's remote-open/SSH routing and favorite-editor
  shortcut layered onto the branch's panel/toolbar variants; the
  extracted shouldShowOpenInPicker now takes remoteOpenMode
- ChatMarkdown: main's bare-filename resolver (#6297) ported into the
  branch's module-level component factory, plus #4133 title-attribute
  stripping on links and images
- ComposerPrimaryActions: main's #4781 model (stop stays reachable, send
  joins it when Enter-to-send is unavailable) carrying the branch's
  steering send button
- ComposerPendingUserInputPanel: main's collapsible redesign with the v2
  RuntimeRequestId and responseCapability gate
- ChatComposer: main's oversized-prompt submission guard wrapping the
  branch's dispatch-mode send
- preview shell: main's container-aware width clamp ported into the
  branch's usePreviewPanelInlineSize hook
- MessagesTimeline/Sidebar: main's day-aware timestamps, code-font tool
  bodies and provider accent badges on the v2 runtime shell
- index.css: main's @variant dark migration (#6381) replaces the branch's
  standalone .dark block
- contracts: main's send-turn image mime allowlist re-homed to
  chatAttachment.ts, where v2 keeps the other send-turn limits

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(server): reject replaying a command receipt across threads in v2

Ports v1's #5246 guard into the v2 dispatcher: a stored receipt only
proves that this exact command already ran for the thread it was recorded
against, so returning it for a command aimed at a different thread reports
success for work that never happened there. The check is extracted as
canReplayCommandReceipt so the rule is unit-testable, and reuse now fails
with OrchestratorCommandIdConflictError like the v1 path.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(mobile): surface prominent activity status and metadata

- Keep prominent activity rows visible with lifecycle status and provider metadata
- Move feed sizing logic into tested helpers and preserve native measurement for activity groups

* fix: reconcile main's round-9 features after the rebase

Re-applies the deltas that mid-stack blob reverts discarded, and merges
main's round-9 work into the v2-owned surfaces:

- settings: main's Integrations page (#7082) coexists with the branch's
  Scheduled Tasks page in the path union, section labels, icons, and
  search catalog
- contracts: main's preview appearance/zoom/viewport settings imports
  restored beside the branch's modelSelection home for ModelSelection
- mobile: main's built-in themes (#6619) re-applied to the v2 thread
  screens and work log (useThemeColor over hand-rolled color-scheme
  ternaries)
- MessagesTimeline: main's #7157 cleanup adopted (toolCallExpandedBody
  class name unexported, implementation-detail test dropped)
- ChangedFilesTree: main's styled tooltip (#7209) carrying the v2 runId
- pullRequestDetail tests: branch's row-action coverage renamed onto
  main's buildAddSelectionToAgentHandoff (#6597)
- lint: migrated the six branch-owned native title tooltips that main's
  new no-native-title-tooltip rule (#7209) flags to styled Tooltips
  (GitActionsControl, QueuedRunsControl, TimelineSystemDivider,
  MessagesTimeline intent badge and MCP tool logo)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(server): honor withheld agent browser access in the v2 runtime

Ports #7083 into the v2 session path, which replaced the v1
ProviderService where main's gate lives. Instead of withholding the whole
t3-code MCP credential — on this branch it also carries the thread
orchestration and worktree toolkits — the credential is minted without
the "preview" capability when enableAgentBrowserAccess is off, so every
preview tool call rejects while orchestration stays available.

ProviderSessionManager reads the setting at prepare time (deny on an
unreadable settings file, matching main), rotates a reused credential
whose capability set no longer reflects the setting, and the session
config now carries browserToolsAvailable so the Codex adapter keeps its
developer instructions truthful via main's parameterized instruction
builders instead of the removed constants.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): restore the titlebar sizing and timeline fade lost to main's style simplification

Main's #6381 deleted the shared .workspace-topbar and scroll-fade rules
from index.css after inlining them at main's own call sites, but this
branch's slim chat chrome still references both classes. The round-8
rebase took the deletion without migrating the branch call sites, so the
header collapsed to zero height — the breadcrumb sat on the window edge,
timeline rows scrolled unfaded through it, and the thread-details popover
anchored to the collapsed header.

Restores both as composable utilities in #6381's own style: a
workspace-topbar utility for the titlebar rows, and the branch's
chat-timeline-scroll-fade mask (soft ramp plus a full-height scrollbar
column). Also drops the duplicated media override and its dead
settings-page-scroll-fade selector.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* refactor(web): finish aligning the branch with main's style simplification

A follow-up sweep against #6381 found the branch still carrying the
pre-simplification forms it replaced, which my earlier fix had papered
over with a compat utility instead of finishing the migration:

- ChatView now uses main's inlined titlebar sizing and the
  data-workspace-titlebar-controls hook on both control clusters. The
  class-based markup was silently missing the themed-toggle bridge
  (html[data-theme-id] [data-workspace-titlebar-controls] …), so custom
  themes lost their titlebar accent in the thread view.
- The scroll-to-end pill becomes main's Button size="xs" variant="glass"
  instead of a hand-rolled button recreating it.
- MessagesTimeline uses main's consolidated topbar-scroll-fade utility;
  the byte-identical chat-timeline-scroll-fade copy and the
  workspace-topbar compat utility are gone.
- The composer-glass dark rules move into nested @variant dark like
  main's (the raw .dark duplicates could drift from the nested copies
  they shadowed), including the branch-only queue strip.
- The pre-#6381 dialog-glass/dialog-backdrop/dropdown-glass class rules
  and their .dark variants are deleted: the #6381 utilities plus
  call-site shadow utilities own every declaration, and the stale
  dropdown rule still had the saturate-less backdrop-filter. The dead
  model-picker-surface dark rule goes with them.

index.css now has zero raw .dark selectors outside the variant
definitions, matching the doctrine in
.macroscope/check-run-agents/ui-consistency.md. Verified against the
emitted production CSS: dark variants compile to :is(.dark,.dark *) with
their @supports color-mix fallbacks intact.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(orchestration): show provider retries in the work log

- Complete retry items when provider activity resumes
- Keep retry progress visible across web and mobile clients

* fix: reconcile main's round-10 features after the rebase

Ten days of main (194 commits, 640 files) re-integrated with the v2
re-architecture. The headline mechanics:

- migrations: main added 041-043 (AuthSessionClientConnection,
  ProjectionThreadLinkedPullRequest, ProjectionThreadsUnsettledAt), so the
  v2 block renumbers 041-049 → 044-052 with the migration tests shifted to
  match
- contracts: OrchestrationClientOrigin (#7774) and the origin metadata
  field live in applicationEvent.ts and re-export through the legacy
  path; ProviderApprovalOption + acceptAlways + mcp-elicitation (#8058)
  land in providerPolicy.ts; OrchestrationDispatchCommandError (#8824)
  added; the send-turn image-mime home stays chatAttachment.ts
- threadSettled: main's settle-once-on-merge semantics (#7454) and
  un-settle re-anchor (#8231) hand-merged onto the v2 duck-typed shells
  (latestRun ?? latestTurn reads); web callers pass the new
  ChangeRequestSettleSource shape
- timeline anchoring: main's #7897 (follow-up sends no longer push to the
  top) ported by scanning user rows only; the branch test now encodes the
  new semantics, as does mobile's #7969 settled-pinned shelf behavior
- vcs: branch's deleteLocalBranch coexists with main's pruneWorktrees and
  the #7674 submodule checkout tests
- ws: v2 RPC surface keeps its dispatch path; main's attachment upload
  RPCs (#8048) and client-connection analytics recording are wired;
  providerUploadFeedback (#7949) fails explicitly pending a v2 route
- approvals: main's option-driven approval buttons (#8058) render through
  the v2 canRespond gate on web and mobile
- ChatView/ChatComposer/MessagesTimeline/Sidebar/session-logic/
  threadActivity keep the branch's v2 architecture; main's v1-coupled
  deltas to those files are recorded for follow-up rather than
  force-fitted

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): stop mis-marking recovered and text-reported tool failures in the v2 work log

Ports main's #7999/#7893 failure policy onto the v2 turn-item work log:
output text that reports a failure (command not found, ENOENT, nonzero
exit markers) now flags a row even when the provider item completed
"successfully", while the rendered row judges only its displayed result —
a command that merely greps for failure strings stays calm. Success now
also requires the failure check to pass, so recovered failures no longer
get the blue check.

The server half of #7893 needs no port: CodexAdapterV2 already projects
item.status directly, so a failed item never masquerades as completed.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(orchestration-v2): project linked pull requests on threads (#8160)

Main's thread↔PR linking never reached the v2 runtime: the client types
were optional stubs and the v2 server dropped the field, so linking a PR
on a v2 environment silently no-opped and #7454's settle-once logic could
never match the linked identity.

The link now flows end to end: thread.metadata.update carries an optional
linkedPullRequest (object to link, null to unlink), the orchestrator
folds it into thread state, and both shell builders project it — no
migration needed since v2 shells persist as payload JSON. The client
command sends the field and the shell mapper surfaces it, so the existing
web/mobile badge and settle plumbing light up on v2 threads.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(orchestration-v2): carry approval options and app names to the client (#8058)

Round 10 ported main's option-driven approval buttons, but v2 runtime
requests had no way to deliver the data — every approval rendered the
default button set, MCP app names never showed, and worse, the Codex
app-server's mcpServer/elicitation/request went entirely unhandled on the
v2 adapter, so ChatGPT-app access requests could never be answered.

The v2 approval_request turn item now carries optional appName and
options, the client derivation passes them into ThreadPendingApproval,
and CodexAdapterV2 handles mcpServer/elicitation/request end to end:
unsupported shapes decline immediately (mirroring the v1 runtime), and
supported ones surface a mcp-elicitation approval built from the shared
describeMcpElicitation/toMcpElicitationResponse helpers, so the persist
tiers (session / always) advertise exactly the choices the elicitation
can express.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(orchestration-v2): route Codex thread feedback uploads through v2 (#7949)

The round-10 rebase stubbed providerUploadFeedback to an explicit error
because its v1 ProviderService route died with the v2 rewrite. The route
now goes through the v2 runtime: session runtimes may expose an optional
uploadFeedback capability, the Codex adapter implements it against the
app-server's feedback/upload request, and the WS handler resolves the
thread's live provider session through ProviderSessionManagerV2 —
failing with a plain-language reason when no session has run, the session
is gone, or the driver has no feedback channel. This also un-blocks the
dormant mobile feedback UI.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(analytics): credit v2 threads and turns to the starting client (#7774)

Main records which client surface started each thread and turn; the v2
dispatch path replaced the v1 handler that did the recording, so v2
environments only reported connections. The v2 RPC layer now records
client.thread.started on thread launches (plus client.turn.requested when
the launch carries an initial message) and client.turn.requested on
message dispatches, using the connection's announced origin. Recording is
best-effort — attribution can never fail the user's command.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(grok): fail hung prompts on xAI rate-limit completions (#8358, partial)

Ports the rate-limit half of main's #8358 into the branch's reworked XAi
extension: a prompt_complete carrying stopReason rate_limit now fails the
hung prompt with the -32003 usage-limit error instead of settling it as a
normal end_turn, so the turn surfaces "usage limit reached" rather than
silently ending. The prompt-completion deferreds carry the error channel
end to end.

The exit_plan_mode approval gate from #8358 is NOT ported here: it needs
a v2 plan-flow design in AcpAdapterV2 (the v1 GrokAdapter it lived in is
gone) and is tracked separately.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(orchestration-v2): show live context usage in the meter (#8144)

The v2 context meter could only show token counts after a compaction had
already happened — v2 had no live usage plumbing at all, so main's
compaction-threshold UX was invisible on v2 threads. Provider turns now
carry an optional tokenUsage report: the Codex adapter maps the
app-server's thread/tokenUsage/updated notification (total breakdown +
model context window) onto the active provider turn, ChatView picks the
newest report out of the projection, and the meter prefers it over the
compaction fallback — so usage and remaining-context percentages update
while the turn runs.

Claude's v2 adapter does not report usage yet; its meter falls back to
compaction items as before.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): keep following the stream after returning to the live edge (#6519)

Ports main's anchor-release semantics onto the branch's timeline anchor
state: the scroll-to-end pill and a manual scroll back to the live edge
both drop the send-time anchored end space before re-enabling follow, and
the pill's scroll runs a frame later so the list measures without the
anchor space and lands on the true end. Without this the timeline could
settle into following-end with the anchor still installed — following
nothing.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(grok): capture exit_plan_mode into the v2 proposed-plan card (#8358)

Completes the deferred half of #8358: Grok's plan-approval gate now works
on the v2 runtime. The XAi extension regains main's exit-plan helpers
(request schemas, plan-markdown extraction, the abandoned-with-feedback
response, and the plan.md session-path sniffing), and the v2 ACP adapter
grows a captureProposedPlan primitive that emits a completed
proposed-plan artifact for the active turn — one plan id per turn, so
plan.md rewrites and the exit gate update a single card.

The Grok flavor wires both ends: tool calls that write plan.md under a
Grok session dir surface the plan while plan mode is still active, and
x.ai/exit_plan_mode (plus the underscore alias) captures the final plan —
request content first, then the sniffed plan.md contents, then the
empty-state placeholder — and abandons the native gate so the turn does
not hang, mirroring the Claude ExitPlanMode pattern.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): repaint the composer glass and strip the thread-panel popover chrome

Two post-rebase regressions from the round-10 index.css merge:

- The merge seam ate the closing brace of .chat-composer-glass, silently
  nesting the entire composer-glass section (shell, host, context strip,
  shoulder tab, banner cap) inside it as descendant rules that never
  matched — the composer surface stopped painting and thread content
  showed straight through the input. The brace is restored and the
  compensating over-close removed; every composer selector emits at top
  level again.

- The thread-details popover grew dropdown-glass card chrome around the
  panel: round 9 deleted the legacy components-layer .dropdown-glass rule
  in favor of the @utility, which the popover's border-0/bg-transparent
  suppressors no longer outrank (the utility emits later in the layer).
  The suppressors are now important variants, matching the !overflow
  override already there.

Verified against the emitted production CSS: shell::before is top-level,
no descendant-of-glass selectors remain, and the important suppressors
(including [backdrop-filter:none]!) are emitted.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): adopt main's attached-composer surface contract so the glass survives shoulder tabs

The composer went frameless exactly when the stash or tasks badge was
showing: main's #7150 css hides the classic shell chrome whenever the
shell :has() a shoulder tab or top drawer and repaints the glass on
[data-chat-composer-main-surface] instead — an element the branch's
composer body never rendered, since it predates the drawer system while
the badges and css came through the rebase in main's new form.

The branch composer's frame div now carries the main-surface attribute
(with main's relative z-10 stacking) so attached mode paints background,
outline, and backdrop on it and the tab connects to the surface, and
ChatView applies chat-composer-glass-shell-attached while banner items
render in the drawer slot, matching main's externalComposerDrawerAttached
wiring. Without a tab or banner the attribute is inert and the classic
shell chrome paints as before.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): converge ChatComposer on main's drawer-era body

Round 10 restored the branch's pre-#7150 composer body while its
satellites (shoulder badges, banner drawers, glass css) arrived in
main's new form, and every seam between the two was a visible bug:
opaque/frameless composer, overflowing stash tab, detached stash menu.

Rebuilt ChatComposer via a reverse three-way merge (main's body as the
base, branch delta re-applied): dispatchMode send boundary, live-capable
approval gates, latestRun reads, and the v2 context-window meter stay;
everything else now matches main, including ComposerPrimaryActions and
the sendDisabledReason send gating. Attachment uploads stay off until
the v2 claim path lands.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): collapse settled tool runs behind main's summary toggles

The v2 timeline rendered every tool call as its own raw row; main's
tool-group collapsing (generated "Ran N commands and changed M files"
summaries, the live "Running <program>" pill for the active tool run,
and the "+N previous log entries" clamp for mixed groups) never made it
into the v2 row model.

Ported the work-live/work-toggle row kinds and group summarization into
the v2 derive, keyed on v2 item types (command_execution, file_change,
file_search, dynamic_tool, subagent) and runId lifecycle instead of v1
activities. Expanded groups keep the branch's richer per-entry detail
rows (V2ItemInspector) — only the collapsed presentation converges on
main.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): surface v2 todo-list plans as task progress

v2 already projected todo_list plan artifacts (deriveActivePlanState
existed with zero consumers), but nothing rendered them: todo_list turn
items showed as a bare "Updated tasks" work row, the composer Tasks
drawer never appeared, and the working row had no current-step label.

todo_list items now become inline turn-plan chips (mini step segments,
current step, N/M count, expandable step list) that fold with their
settled turn, ChatView derives the composer Tasks drawer progress and
steps from the running run's plan artifact, and the working row shows
"Working for Xs · <current step>" like main.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): show the command on collapsed tool rows, not its stdout

Collapsed command rows rendered "Command" plus the raw result JSON as
the preview; the command itself is the useful collapsed line, so it now
renders as the row text (whitespace-collapsed, truncated) with stdout
and the full payload behind the expander. Tool-like headings drop the
bold foreground for the muted secondary-label the summary rows use, and
the "+N previous tool calls" toggle loses its bold black label for the
same muted treatment.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): collapsed tool rows preview inputs for every tool type

Extends the command-row fix to the whole preview: file-change rows were
still leaking raw diff lines into the collapsed line. workEntryPreview
now resolves input-first — command, then touched-file paths, then
detail (which is input for the remaining types: search patterns,
reasoning text, error messages) — so outputs only appear behind the
expander.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: reconcile main's round-11 features after the rebase

Round-11 rebase onto main (25 commits). Reverse-merged main's new work
into the v2 cutover files: #8395 muted ordinary-tool-failure treatment
(v2-adapted workEntrySignalsSevereFailure keyed on error items), #5931
sidebar project-filter combobox + #4c51 keyboard pin/settle with their
ChatView support graph, the auto-settle-mode migration through
threadSettled/threadListV2, #8235 file/unknown attachment schemas moved
into chatAttachment.ts with nullable attachment paths, #8481 client
analytics through the v2 ws layer, #8480 OpenCode server owner wired
into the driver beside the v2 orchestration adapter, and the mobile
semantic-theme migration applied to branch-only components.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(opencode): route child-session approvals through the v2 adapter

Ports the v2-applicable half of #8480 (the v1 adapter rewrite was not
carried; this branch's OpenCode path is OpenCodeAdapterV2). Permission
and question asks from child sessions — task subagents and their
descendants — were dropped because the adapter only looked up root
thread sessions. Related sessions now map back to the owning root
state (registered from task parts and session.created/updated parent
chains), and an ask that arrives before the relation is known resolves
it inline via session.get with a short forked backoff, then surfaces
the approval on the root turn. Replies already route by native request
id. Interrupts now tolerate the abort racing turn settlement instead
of failing the stop.

Covered by a new opencode_child_approval replay fixture where the
child asks for bash permission before the task part reveals the
relation.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: reconcile main's round-12 features after the rebase

Small rebase onto main (4 commits). The composer stash-shortcut label
and the mobile start-task menu refactor merged onto the v2 composer
bodies, and main's new auto-settle list tests are ported to the v2
thread-list test file (latestRun/RunId shapes). The auto-settle
machinery itself already matched main from the round-11 reconcile.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: restore main's automatic thread settling after the revert

Round-13 rebase onto main (2 commits). Main reverted the auto-settle
opt-in (#8596 undoing #8321), so the branch drops the ported
autoSettleMode machinery and returns to sidebarAutoSettleOnMerge with
settling-by-default, keeping only the v2 shell-shape delta in
threadSettled. The unpin confirmation (#7313) merges into the v2
thread-actions hook, and the mobile list tests re-sync to main's
reverted semantics in v2 shapes.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): restore the full-screen file-drop target over the chat column

Main's #6636 workspace file drop (drag anywhere over the chat column to
attach, with the dashed overlay) split across ChatView and the
composer. The round-10 rebase restored ChatView from the pre-#6636
backup wholesale and only the composer half was ever re-applied, so
the drop target, overlay, and drag-state plumbing vanished while
addDroppedFiles sat unused on the composer handle. Re-applies main's
ChatView half verbatim; the shared workspaceFileDrop module was
already identical to main.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(server): claim uploaded attachments at v2 dispatch

Closes the last gap from the rebase follow-up list (#8048/#8161 for
v2): pending uploads staged via the attachment upload URL flow were
never claimed by the v2 orchestrator, so the composer kept
supportsAttachmentUploads off and fell back to inline dataUrls with no
progress UI and no big-file support.

message.dispatch and thread.launch now claim pending refs at intake —
verify the staged file, copy it under a thread-scoped id (the pending
copy stays as the retry source), rewrite the refs, and release the
claimed copies if the dispatch fails. A launch carrying uploads
requires its thread id up front. The web composer reads the
attachmentUploads capability again like main, which lights up the
upload progress overlay, retry-on-failure, and PDF/ZIP attachments.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(web): show attachments on queued messages and edit them in the composer

Queued rows now render image thumbnails, and the pencil action loads the
queued message into the composer instead of an inline input: text and
stored attachments are editable (attachments removable, new images
addable), sending saves the queued run in place, and the user's own
draft is stashed untouched for the duration. queued-run.edit gains an
optional full-replacement attachments list end to end.

Built by Claude Fable 5 on Claude Code.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): drag-to-reorder queued messages and retire stale pending rows

Replaces the queue rows' up/down arrow buttons with a drag handle (arrow
keys still work on the focused handle). Also prunes optimistic queued
messages once the projection holds them: keying the prune on turn items
alone left a phantom clock row behind whenever a queued run was removed
or steered before it ever started.

Built by Claude Fable 5 on Claude Code.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: reconcile main's round-14 features after the rebase

Round-14 rebase onto main (7 commits, mostly the Expo SDK 57 upgrade
plus the mobile glass restore and codex app-server buffering fix). The
mobile composer merged main's restored glass chrome onto the v2 body,
and the lockfile is regenerated from main's SDK-57 lock with the
branch's extra dependencies installed on top.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): dedupe the composer glass styles and align the chat column width

The rebase left a stale early copy of the composer glass-host, context-strip,
and shape() fallback rules that the identical later block always overrode.
The composer shell and queue/context strips also kept main's 48rem width while
the timeline moved to the 46rem content lane; they now share
--chat-content-max-width so one owner defines the chat column.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(mobile): replace remaining dark: utilities with adaptive semantic tokens

The v2 thread surfaces still styled borders, fills, and status text with
dark:/light: pairs, which do not follow registered custom themes and now fail
the no-mobile-uniwind-theme-escape-hatches lint. Convert them to adaptive
tokens, adding the missing amber/sky badge and neutral hairline/fill entries
to the theme generator.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(lint): allowlist the queue and relationships interop boundaries

ThreadQueueControl and ThreadRelationshipsBanner read theme variables only to
tint SymbolView icons and color native modal chrome, the same reviewed interop
pattern as the existing thread-feed entries.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(server): inject HostProcessPlatform into the Grok plan extractor

The plan.md path check read process.platform and process.env directly; thread
the host platform reference and the adapter's provider environment through
GrokAdapterV2Options instead.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore: retrigger ci

The pull_request workflows never fired for 6c3b84bbfc; only the
pull_request_target ones ran.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore: refresh macroscope ui-consistency check

Its findings were fixed in 9abca06b28 and the review threads are resolved;
the check only re-evaluates on push.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: reconcile main's round-16 features after the rebase

Round-16 rebase onto main (5 commits, headlined by #8236 file
attachments in the client). Main's upload-aware send path — capability
probes, upload await/retry gating, uploaded-ref turn attachments with
dataUrl fallback, draft release on success — is woven into the v2
dispatch flow, timeline user rows render file attachments as download
links with the ChatView download handler, and the provider settings
editor cleanup keeps the branch's environment-field rows. The codex
feedback client flow stays unported, replay testkit configs gained
main's environmentThemesDir, and the rpc/settings/docs unions carry
both sides.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): keep failed tool items in the collapsed group summaries

An ordinary exit-code failure knocked its whole tool group out of the
"Ran N commands" summary (and the live pill mid-run) into the raw
"+N previous tool calls" clamp: v2's derived tone marked any
status=failed item as "error", which the grouping treats as a non-tool
row. That inverts v1's semantics and #8395's muted-failure rule — the
failed lifecycle status already carries the X marker and the summary's
includes-a-failure hint, so the tone override goes.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(server): keep Claude session approvals ephemeral

R03: Rescope Claude permission suggestions to the current session and add a whole-tool session rule when the SDK provides no suggestion.

* fix(orchestration): reanchor unsettled threads

Carry unsettledAt through v2 thread state and shells, stamp explicit and activity-driven reactivation, and clear the stamp when settling.

Finding: R11

Implemented by GPT-5.6 Sol in Codex.

* fix(server): observe pre-aborted Claude approvals

R15: Race Claude approval decisions with cancellation while checking already-aborted signals and cleaning up the listener on every exit.

* fix(server): include service launcher in bundle build

Build the service launcher after the clean CLI pack so publish and background-service installation receive the required artifact.

Audit: R01

* fix(orchestration): preserve legacy thread metadata

Import pin order, snooze state, unsettle time, and linked pull requests. Repair prior imports only where the stored v2 property is absent, so later v2 changes remain authoritative.

Finding: R08

Implemented by GPT-5.6 Sol in Codex.

* fix(web): honor disabled legacy plan mode

Force the effective composer interaction mode to build when the legacy plan setting is off, including threads and drafts with a saved plan mode.

Audit: R13

* fix(server): preserve Claude subagent models

R16: Apply authoritative assistant snapshot models to Claude subagents and buffer snapshots that arrive before task_started.

* fix(orchestration): honor migrated thread visibility in search

Use v2 ownership and lifecycle metadata when a legacy transcript belongs to a migrated thread. Legacy transcript rows remain searchable until lazy hydration finishes.

Finding: R09

Implemented by GPT-5.6 Sol in Codex.

* fix(orchestration): recreate missing worktrees before turns

Prune stale git worktree registration and recreate the saved branch at the saved path before provider startup. Recovery remains best effort so normal provider errors still report when repair is impossible.

Finding: R10

Implemented by GPT-5.6 Sol in Codex.

* fix(clients): restore Codex feedback submission

Intercept /feedback in web and mobile, show the upload result and feedback ID in the thread, and block duplicate submissions while an upload is active.

Audit: R12

* fix(server): preserve generic provider attachments

R02: Append persisted paths for every uploaded file on provider sends and steering while reserving native image payloads for supported images.

* fix(web): load workspace markdown images through assets

Classify markdown image sources and request environment-scoped asset URLs for workspace files while leaving ordinary web images direct.

Audit: R17

* fix(web): preserve Windows markdown paths

Normalize drive-path links and image sources before sanitization so file chips and signed workspace images receive usable paths.

Audit: R18

* fix(server): keep current provider context usage

R07: Project Codex last-turn and Claude assistant context usage, and retain the latest usage when terminal provider-turn updates omit it.

* fix(web): restore markdown file chip actions

Keep ordinary file-chip clicks in the in-app preview while restoring modifier-click editor opening, configured editor labels, remote gating, and reveal-in-file-manager actions.

Audit: R19

* fix(web): scope markdown actions to their environment

Use the owning thread or pull request environment for editor, shell, and remote-open actions instead of whichever environment is active. Add a multi-environment regression test for the action hooks.

Audit: R20

Implemented by GPT-5.6 Sol with Codex.

* fix(protocol): reject incompatible orchestration peers

Advertise and validate an explicit orchestration protocol before clients open RPC sessions. Announce the same protocol on WebSocket upgrades so hosts reject older clients before request decoding while preserving existing auth and relay parameters.

Audit: D03

Implemented by GPT-5.6 Sol with Codex.

* docs: explain legacy thread migration

Document which thread metadata and transcript data migrate, which runtime history does not, and how the fresh provider continuation uses the latest 32,000 characters. Add a safe read-only recovery procedure without claiming an export API.

Audit: D02

Written by GPT-5.6 Sol with Codex.

* docs: state portable handoff limits

Explain the eligible timeline items, whitespace-normalized 240-character prefixes, omitted tail risk, and practical preparation for provider or fork handoffs. Distinguish this rule from the legacy import's 32,000-character transcript suffix.

Audit: D04

Written by GPT-5.6 Sol with Codex.

* chore(repo): remove tracked audit scratch files

Remove obsolete implementation plans and the probe write marker so temporary work artifacts no longer ship with the repository.

Audit: H01

Implemented by GPT-5.6 Sol with Codex.

* fix(server): guard OpenCode prompt admission races

R14: Hold idle completion through prompt admission, reconcile status only for the current admission generation, and invalidate admission before abort.

* fix(server): restore Claude structured questions

Project AskUserQuestion as a structured user-input runtime request and return keyed answers to the Claude SDK instead of routing the tool through generic approval.

Finding: R04

Model: GPT-5.6 Sol via Codex

* fix(server): project Claude plans and todos

Translate TodoWrite and ExitPlanMode tool input into canonical todo-list and proposed-plan artifacts so every client can render Claude planning state.

Finding: R05

Model: GPT-5.6 Sol via Codex

* perf(orchestration): bound history reads in SQL

Load at most one turn-item page per thread in a fork lineage before decoding, keyed by the stable history cursor. Restrict message, plan, and handoff reads to that page plus live actionable state so cold opens and older-page requests no longer decode complete historical tables.

Finding: P01

Implemented by GPT-5.6 Sol in Codex.

* perf(orchestration): bound complete thread snapshots

Budget the serialized bounded projection after retaining live control state. Cap historical control arrays and large plan or handoff details only on the bounded route; the full thread-detail route remains available for complete text.

Finding: P02

Implemented by GPT-5.6 Sol in Codex.

* fix(server): restore Claude resume compaction

Pass the automatic compaction window to Claude and route resume-return dialogs through structured user input so users can compact, continue, or permanently dismiss the prompt.

Finding: R06

Model: GPT-5.6 Sol via Codex

* fix(server): allow protocol negotiation in CORS

Permit the canonical orchestration protocol header in browser API preflights so cross-origin web and desktop clients can negotiate compatibility while retaining authorization and DPoP headers.

Finding: D03

Model: GPT-5.6 Sol via Codex

* fix(server): preserve provider usage in persisted turns

Merge terminal provider updates with stored context usage before replacing the SQLite payload. Keep newer usage reports authoritative and verify the persisted projection after reload.

Finding: R07 follow-up

Model: GPT-5.6 Sol via Codex

* fix(server): preserve Claude planning lifecycle

Keep typed plan and todo records distinct from generic tool events, activate captured plans, and supersede older planning state within the owning thread. Ignore nested todo snapshots for the parent and retain identity across duplicate SDK messages.

Finding: R05 follow-up

Model: GPT-5.6 Sol via Codex

* fix(server): normalize Claude question answers

R04 follow-up

Convert client multi-select answer arrays to the comma-separated string shape required by the pinned Claude SDK while preserving single-select strings.

Implemented by GPT-5.6 Sol via Codex.

* fix(server): correlate OpenCode prompt admission

Stale cached user and status events could admit and complete a newly submitted OpenCode prompt. Generate the native message ID before submission and only advance admission when that exact message is observed.

Finding: R14

Implemented by GPT-5.6 Sol with Codex.

* fix(clients): anchor feedback in conversation order

R12 follow-up

Insert persistent feedback blocks by their timestamp within the canonical timeline while preserving projected row order. Keep real optimistic sends appended and suppress duplicate local messages already committed by the server.

Implemented by GPT-5.6 Sol via Codex.

* fix(web): retain markdown workspace ownership

R20 follow-up

Give inspector reasoning markdown its projected source thread and retain the explicit environment fallback for proposed plans without a thread reference. Workspace links and images now resolve through their owning environment after removal of the active-environment fallback.

Implemented by GPT-5.6 Sol via Codex.

* fix(orchestration): page history through its true end

Read the inclusive cursor, a full history page, and a look-behind row so older history does not terminate after one page.

Finding: P01 pagination termination

Model: GPT-5.6 Sol via Codex

* fix(server): cancel pending OpenCode prompts safely

Cancel pending SDK requests before aborting the native session. Preserve per-admission cancellation state and treat stopped initial prompts as interruption instead of provider failure.

Finding: R14 prompt cancellation

Model: GPT-5.6 Sol via Codex

* fix(orchestration): retain nested fork history when paging

Keep the original cursor owner through ancestor traversal and preserve the history budget across empty intermediate forks. Verify exact paged history against the complete nested projection.

Finding: P01 nested lineage

Model: GPT-5.6 Sol via Codex

* fix(server): recover OpenCode status reconciliation

Retain pending admission after transient status failures and use one generation-owned retry worker. Ignore stale timers and duplicate evidence so older prompts cannot finish newer steering.

Finding: R14 status reconciliation

Model: GPT-5.6 Sol via Codex

* fix(orchestration): select visible history before limiting SQL

Keep hidden local and inherited rows from consuming history pages. Preserve stop-request dependencies, source-run cutoffs, and imported history while loading related metadata from the selected cohort and using indexed watermark lookups.

Finding: P01 bounded history visibility

Model: GPT-5.6 Sol via Codex

* fix(web): port composer activity and grouping to orchestration v2

* fix(web): align queue headers and prevent stash overlap

* fix(web): share the outline for joined composer tabs

* fix(web): keep stash separate from the composer activity column

* refactor(web): use shared banner rows for queued messages

* fix(web): keep queued message editing inside the queue panel

* fix(web): keep queued messages in place while editing

* fix(web): match composer actions to draft and modifier state

* fix(web): keep composer shortcut tooltip stable on Mod

* feat(web): summarize T3 orchestration actions

* feat(mobile): port chat summaries and transitions to orchestration v2

Adapt grouped tool summaries and the floating working timer to V2 run, attempt, and queue state. Bring over the composer, keyboard, and disclosure transitions while retaining the V2 activity inspector and queue controls.

Keep OV2 web composer and grouping behavior intact; share only the existing command label parser with mobile.

* fix(chat): remove added tool summary status counts

* fix(mobile): keep scroll bounds current after animations

* fix: reconcile main's round-17 features after the rebase

Restores main features dropped by the policy replay: #8569 theme wiring,
settings search rework, #8803 workspace-mutation refresh (v2-adapted),
video + image previews (web and mobile, v2-adapted), #8862 Expo glass,
and the round's docs. Timeline thinking rows (#8984) stay on the v2
work-live system.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(web): port working and thinking timeline rows to orchestration v2

The v2 equivalents of main's #8984 and #8922: a "Working for ..." header
anchors the active run, the trailing live tool row survives between
actions in past tense instead of vanishing, and a shimmering Thinking
row marks reasoning gaps. During workspace preparation the header shows
"Setting up worktree..." (driven by the local dispatch flag or the v2
run's preparing status, so remote viewers see it too), the composer
footer span is gone, and draft promotion waits until the run starts or
startup fails instead of navigating mid-preparation.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: reconcile main's round-18 features after the rebase

Adopts the round's main features into the v2 architecture: the #9023
media rework (streamed videos, media-file assets, protocol-relative
links), #9098 shared live-activity row folded into the v2 working and
thinking rows, the #9084/#9078 Claude model catalog for v2 consumers,
a native #9005 OpenCode child-session abort in the v2 adapter, #9013's
landed LegendList patch, and per-environment sidebar provider entries.
For #8600 the server-side pieces land, but auto-settle evaluation stays
client-side (reading the new server-owned settings) until the v2
orchestrator grows its own settlement reactor; main's v1-only reactor
and coalescer additions are dropped with the rest of the v1 path.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* feat(server): evaluate automatic thread settlement in the v2 orchestrator

Ports #8600's server-owned settlement to orchestration v2 instead of
keeping client-side evaluation. A ThreadSettlementService sweep runs at
startup, on auto-settle settings changes, and once per minute: it
evaluates inactivity and merged or closed pull requests over v2 thread
shells and dispatches the new guarded thread.auto-settle command, which
rejects threads that changed after the sweep's snapshot or carry any
explicit override, then reuses the orchestrator's settle lifecycle.
With the server deciding, the clients drop their effectiveSettled
evaluation and partition on the persisted settledOverride like main.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: reconcile main's round-19 features after the rebase

Adopts main's round-19 features into the v2 stack: payload-budgeted
orchestration replay (#8992), sidebar row subscription leases (#9052),
tool group virtualization and scroll anchoring (#9106), repeated-command
and browser-group presentation, inline assistant citations (#9146),
per-cwd provider skills discovery (#8778), Claude composer skill
dispatch (#9128), grok health probe and model negotiation (#9154), and
the failed-tool thinking fallback (#9165).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): right-align the stash shoulder tab again

Round 17 adopted main's #8850 ComposerBanner.Attachment (mx-auto plus the
standalone drawer-inset width) without main's matching mounts, so the
stash tab's ml-auto lost to the attachment's auto right margin and the
tab centered over the composer. Column now spans its attachments like
main does, the stash tab zeroes the right margin, and the stash menu
keeps the full dock width.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(web): realign the composer and timeline with main

The branch had drifted from main's composer and work-log design in ways
unrelated to orchestration v2: a pre-revert "Working for" shoulder tab
on the composer (main reverted #8693 and re-landed #8734 without it),
an inline stash variant plus in-flow stash menu, expanded tool rows that
hid their icons, an unmounted woke-thread banner, a composer scroll
observer main never had, and a right-panel toggle that lost its
showRightPanelControl gate so it rendered twice with the panel open.

ChatComposer and its satellites now start from main's files with only
the v2 delta re-applied (dispatch modes, queued-message editing, runtime
request ids, response capability). Background tasks surface as a
ChatView banner in main's backgroundLiveness shape instead of a
composer tab. SimpleWorkEntryRow takes main's PlainWorkEntryRow body
with the V2ItemInspector kept behind the expander.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix: reconcile main's round-20 features after the rebase

Renumbers the v2 migrations 044-052 to 045-053 behind main's
044_ClearAutomaticProjectModelDefaults, and adopts main's sticky
new-thread selection (#9164), local-only worktree bases in the v2 launch
path (#8751), the PR summary read for settlement (#9176), Claude per-cwd
skills (#9210), the provider editor redesign with the branch's dedicated
environment fields re-grafted (#8508), and the client half of
continue-threads-across-restart (#9167). The server-side continuation
markers stay unported: they live in the v1 session directory, and v2
recovery terminalizes running runs on restart, so the capability is
withheld until the v2 runtime carries them.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(server): reduce v2 recovery and runtime resource usage

Index event sequence lookups, recover only threads with pending work, and page projection verification and rebuilds. Bound provider event logging and omit turn histories when resuming Codex threads.

Allow delegated thread identifiers through relay routes. Add focused regression coverage and document the performance constraints.

* fix: reconcile main updates with orchestration v2

Retain main's composer, work-log, settings, mobile and performance changes through c8f77e0d441 while preserving v2 runs, queued messages, provider handoffs and durable history.

Port native compaction and logout, asynchronous Codex questions, provider usage accounting, automatic settlement and PR refresh into the v2 services. Bound live event retention during replay and delivery, measure thread replay before decoding, and read checkpoint metadata without loading transcripts or patches.

Keep main migrations through 047 and move the v2 migrations to 048–058. Preserve the existing branch history and the pre-rebase backup.

Model: GPT-6. Harness: Codex.

* fix(orchestration): stabilize Codex turn mapping and settlement

- Preserve Codex turn identity while suppressing duplicate diff notifications
- Optimize settlement projections and isolate thread visit hand…
…-delete

# Conflicts:
#	apps/server/src/j5/a2a/SquadronHttp.ts
#	apps/server/src/j5/a2a/SquadronManagementService.ts
#	apps/web/src/j5/squadron/squadronClient.ts
#	packages/client-runtime/src/j5/http.ts
#	packages/client-runtime/src/j5/state.ts
@coderabbitai

coderabbitai Bot commented Sep 23, 2026 •

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

Configuration used: Repository: Jacksondr5/j5code/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: 7b89c329-72a9-4893-950a-fa4d972b0fb1


Comment @coderabbitai help to get the list of available commands.

Comment thread apps/server/src/j5/a2a/SquadronHttp.ts Outdated
Comment thread apps/server/src/j5/a2a/SquadronManagementService.ts
Comment thread apps/web/src/j5/squadron/SquadronRenameDialog.tsx Outdated
Comment thread apps/web/src/j5/squadron/SquadronDeleteDialog.tsx Outdated
Comment thread apps/server/src/j5/a2a/LedgerService.ts Outdated
Comment thread apps/server/src/j5/a2a/SquadronHttp.ts Outdated
Comment thread apps/server/src/j5/a2a/SquadronManagementService.ts Outdated
Comment thread apps/web/src/j5/squadron/SquadronRenameDialog.tsx Outdated
bryantderosier and others added 3 commits September 23, 2026 16:23
…rigin CORS

The browser API CORS allowlist only permits GET and POST, so PATCH and
DELETE failed their preflight from app.t3.codes, relay, tunnel, and the
desktop renderer. Both actions now POST to /api/j5/squadrons/:id/rename
and /:id/delete, which keeps every upstream file untouched. An
undecodable id now answers 404 through operationFailure and the
SquadronNotFoundError message instead of a hand-formatted copy.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…cascades

A stopped Crew keeps its unarchived instance, so the blocker now reads
"unarchived Crew" instead of "running Crew". The purge deletes only the
three ON DELETE RESTRICT tables and lets the foreign_keys pragma cascade
the rest, including grandchildren a hand-kept list could miss; the test
derives referencing tables from the live schema. Rename and delete are
single statements with RETURNING, so a concurrent delete surfaces as
SquadronNotFoundError rather than a defect.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…d while renaming

Rename and delete now also refresh the open inbox list and bell count,
which carry the Squadron name and rows separately from the directory.
A refused delete leaves the Delete button enabled so a second attempt
can succeed once blockers are archived elsewhere, the copy says archive
rather than stop, and the rename dialog ignores Escape and outside
clicks while its request is in flight.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…-delete

# Conflicts:
#	apps/server/src/j5/a2a/SquadronHttp.ts
#	apps/server/src/j5/a2a/SquadronManagementService.ts
#	apps/web/src/components/chat/MessagesTimeline.tsx
#	apps/web/src/j5/squadron/squadronClient.ts
#	packages/client-runtime/src/j5/http.ts
#	packages/client-runtime/src/j5/state.ts

@tyler-barton-horizon tyler-barton-horizon left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All eight review comments are addressed in 8ff0294, 2377bf1, and b283b15, and I verified each against the diff rather than the replies. The POST routes clear the CORS allowlist, the RETURNING statements remove the rename race, the purge correctly leans on the foreign key pragma (every non-RESTRICT key onto the Squadron cascades, grandchildren included), and the dialogs refresh the inbox and stay retryable. CI is green on the latest commit.

One non-blocking note for a follow-up: counterpartySquadron in LifecycleService.ts fails hard when neither current nor historical membership exists for the other side of an open exchange. After a Squadron purge that state is reachable only through an out-of-band archive or a crash mid-retirement, so it is unlikely, but if it ever happens the lifecycle daemon retries the same event forever and stalls every later thread retirement. Falling back to the exchange's own Squadron there would be cheap insurance.

@bryantderosier
bryantderosier merged commit 960682a into j5/main Sep 24, 2026
31 checks passed
@bryantderosier
bryantderosier deleted the j5/squadron-rename-delete branch September 24, 2026 11:41
Jacksondr5 added a commit that referenced this pull request Sep 24, 2026
…247)

Carried from j5/main 960682a onto the upstream V2 candidate.

Conflict: SquadronScopeDropdown imports unioned; rename/delete ride the shared menu, so they work from the SidebarThreadHeader scope slot.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Jacksondr5 added a commit that referenced this pull request Sep 24, 2026
…e controls

The #247 carry left two shadcn(no-restyle) errors against upstream V2's lint:
the rename dialog's gap moves to a plain wrapper inside DialogPanel, and the
scope menu's truncation moves to a span inside MenuGroupLabel.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Jacksondr5 added a commit that referenced this pull request Sep 25, 2026
Joins fork head 2cf4ad7 (j5/main, including #247, #241, #244, #242,
#214, #215, #216, #248, #249, #250, #251) with the reviewed candidate
(j5/upstream-sync-20260924-candidate), which descends from frozen upstream
67a2be0. Upstream force-rewrote history,
so per FORK.md's rewrite runbook the candidate was built from the upstream
tree with pin 62aef85 as the content base, then carried each j5/main
PR since 8f56083 onto it and adapted it to upstream V2. This merge's
tree equals the candidate tree exactly.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XL 500-999 effective changed lines (test files excluded in mixed PRs). 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.

3 participants