Merge pull request #1 from postmeridiem/windows-support

Windows desktop support + crash-survivable observability + CI/release pipeline (v2.5.0)

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.44.1"
+}

.gitea/workflows/test.yml

@@ -1,92 +0,0 @@
-# Gitea Actions workflow for clide.
-#
-# NOT YET ACTIVATED. Gitea Actions must be enabled in the instance
-# settings before this runs; until then the file is just a ready-made
-# pipeline Claude + the user can review.
-#
-# When the repo eventually lands on GitHub, copy this file verbatim to
-# `.github/workflows/test.yml` — Gitea Actions consumes GitHub-Actions
-# syntax, so no rewrite is needed.
-
-name: test
-on:
-  push:
-    branches: [main]
-  pull_request:
-
-jobs:
-  unit:
-    name: unit + widget + golden + a11y
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with: { channel: stable, cache: true }
-      - run: dart pub get
-      - run: (cd app && flutter pub get)
-      - run: ci/test.sh
-      - run: ci/test_a11y.sh
-      - run: ci/coverage_gate.sh
-
-  integration:
-    name: integration_test (xvfb)
-    runs-on: ubuntu-latest
-    needs: unit
-    steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with: { channel: stable, cache: true }
-      - run: sudo apt-get update && sudo apt-get install -y xvfb ninja-build libgtk-3-dev
-      - run: dart pub get
-      - run: (cd app && flutter pub get)
-      - uses: coactions/setup-xvfb@v1
-        with: { run: ci/test_integration.sh }
-
-  startup-bundle:
-    name: bundle smoke (xvfb 5s)
-    runs-on: ubuntu-latest
-    needs: unit
-    steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with: { channel: stable, cache: true }
-      - run: sudo apt-get update && sudo apt-get install -y xvfb ninja-build libgtk-3-dev
-      - run: dart pub get
-      - run: (cd app && flutter pub get)
-      - run: ci/smoke_bundle.sh
-
-  e2e:
-    name: daemon subprocess + web WASM smoke
-    runs-on: ubuntu-latest
-    needs: unit
-    steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with: { channel: stable, cache: true }
-      - uses: actions/setup-node@v4
-        with: { node-version: 20 }
-      - run: dart pub get
-      - run: (cd app && flutter pub get)
-      - run: (cd tools/ui && npm install && npx playwright install --with-deps chromium)
-      - run: ci/test_e2e.sh
-
-  docs:
-    name: dart doc (lib API)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with: { channel: stable, cache: true }
-      - run: dart pub get
-      - name: dart doc --validate-links (fail on warning)
-        run: |
-          set -o pipefail
-          dart doc --validate-links 2>&1 | tee dartdoc.log
-          if grep -q "^  warning:" dartdoc.log; then
-            echo "::error::dartdoc emitted warnings — see log above"
-            exit 1
-          fi
-      - uses: actions/upload-artifact@v4
-        with:
-          name: dart-api-docs
-          path: doc/api/

.githooks/post-checkout

@@ -1,3 +1,9 @@
 #!/bin/sh
-# pql: source .pql/hooks/post-checkout (rebuild pql.db on branch checkout)
+# pql: source .pql/hooks/post-checkout (rebuild pql.db on branch checkout).
-. "$(git rev-parse --show-toplevel)/.pql/hooks/post-checkout"
+# The pql hook is untracked (a local `pql init` install), so a fresh
+# `git worktree add` has no .pql/hooks — source it only when present, and
+# always exit 0: post-checkout is best-effort and must never abort the
+# checkout / worktree creation.
+hook="$(git rev-parse --show-toplevel)/.pql/hooks/post-checkout"
+if [ -f "$hook" ]; then . "$hook"; fi
+exit 0

.github/workflows/release.yml

@@ -0,0 +1,104 @@
+name: release
+
+# Build + publish versioned Windows and Linux release bundles when the version
+# in pubspec.yaml changes on main. The `version` job only proceeds when the
+# v<version> tag doesn't already exist, so an unrelated pubspec edit is a no-op.
+#
+# FIRST CUT — neither build has run in CI yet (Windows has never been built at
+# all), so expect to iterate on these from the first run's logs. The repo's own
+# `make` targets are the build contract (gen-build-info + clide-cli + flutter
+# build, all wired in `make build`).
+
+on:
+  push:
+    branches: [main]
+    paths: ['pubspec.yaml']
+  workflow_dispatch:
+
+permissions:
+  contents: write   # create the tag + the release
+
+jobs:
+  version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.v.outputs.version }}
+      fresh: ${{ steps.v.outputs.fresh }}
+    steps:
+      - uses: actions/checkout@v4
+        with: { fetch-depth: 0 }   # tags, to tell new vs. already-released
+      - id: v
+        shell: bash
+        run: |
+          version=$(awk -F': *' '/^version:/ {gsub(/[" ]/,"",$2); print $2; exit}' pubspec.yaml)
+          echo "version=$version" >> "$GITHUB_OUTPUT"
+          if git rev-parse "v$version" >/dev/null 2>&1; then
+            echo "fresh=false" >> "$GITHUB_OUTPUT"
+            echo "v$version already tagged — nothing to release."
+          else
+            echo "fresh=true" >> "$GITHUB_OUTPUT"
+            echo "v$version is new — building."
+          fi
+
+  build-linux:
+    needs: version
+    if: needs.version.outputs.fresh == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with: { channel: stable }
+      - run: sudo apt-get update && sudo apt-get install -y ninja-build libgtk-3-dev
+      - run: make dugite-fetch
+      - run: make build            # gen-build-info + clide-cli + flutter build linux
+      - name: package
+        run: tar -C build/linux/x64/release/bundle -czf clide-linux-x64-${{ needs.version.outputs.version }}.tar.gz .
+      - uses: actions/upload-artifact@v4
+        with: { name: linux, path: clide-linux-x64-*.tar.gz }
+
+  build-windows:
+    needs: version
+    if: needs.version.outputs.fresh == 'true'
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with: { channel: stable }
+      - run: choco install -y make
+      - name: build
+        shell: bash
+        run: make dugite-fetch && make build   # MSVC + bash already on windows-latest
+      - name: package
+        shell: pwsh
+        run: Compress-Archive -Path build/windows/x64/runner/Release/* -DestinationPath clide-windows-x64-${{ needs.version.outputs.version }}.zip
+      - uses: actions/upload-artifact@v4
+        with: { name: windows, path: clide-windows-x64-*.zip }
+
+  publish:
+    needs: [version, build-linux, build-windows]
+    if: needs.version.outputs.fresh == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: changelog notes for this version
+        shell: bash
+        run: |
+          ver="${{ needs.version.outputs.version }}"
+          # Pull the entries under `## [<version>]` — the changelog cut that the
+          # version-bump commit lands per the changelog discipline — as the
+          # release body; fall back to a one-liner if the section is absent.
+          awk -v ver="$ver" '
+            $0 ~ "^## \\[" ver "\\]" {grab=1; next}
+            grab && /^## \[/ {exit}
+            grab {print}
+          ' CHANGELOG.md > release-notes.md
+          [ -s release-notes.md ] || echo "Release v$ver." > release-notes.md
+      - uses: actions/download-artifact@v4
+        with: { path: dist }
+      - uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ needs.version.outputs.version }}
+          name: clide v${{ needs.version.outputs.version }}
+          body_path: release-notes.md     # the version's CHANGELOG section
+          generate_release_notes: true    # + auto commit list appended
+          files: dist/**/*                # the built versioned bundles

.github/workflows/test.yml

@@ -0,0 +1,144 @@
+name: test
+
+# Linux CI for clide (GitHub Actions). Moved here from .gitea/workflows/ when CI
+# consolidated onto GitHub (the primary remote); the Gitea secondary has Actions
+# disabled. Pairs with windows.yml (ConPTY suite on windows-latest) and
+# release.yml (versioned release bundles).
+#
+# Steps go through the make targets (the repo's tooling-discipline rule: the
+# make layer sets up the environment — gen-build-info etc. — and stays correct
+# if a wrapped script moves).
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  unit:
+    name: unit + widget + golden + a11y + coverage gate
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with: { channel: stable, cache: true }
+      - run: flutter pub get
+      - name: install pql
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release download --repo postmeridiem/pql --pattern 'pql_*_Linux_x86_64.tar.gz' --output /tmp/pql.tgz
+          tar -xzf /tmp/pql.tgz -C /tmp
+          sudo install -m 0755 /tmp/pql /usr/local/bin/pql
+          pql --version
+          # The pql tests query the repo's vault, but .pql/pql.db is gitignored
+          # (the post-checkout hook rebuilds it from the committed changelog).
+          # A fresh CI checkout has the changelog but no db — materialize it,
+          # and sync decision records from the governance/ DQR markdown tree
+          # (tickets come from the changelog; decisions from `decisions sync`).
+          pql plan import
+          pql decisions sync
+      # test-coverage runs the full fast suite WITH coverage (it includes the
+      # a11y suite — see the push-check note in the Makefile), which is what
+      # coverage-gate consumes.
+      - run: make test-coverage
+      - run: make coverage-gate
+
+  integration:
+    name: integration_test (xvfb)
+    runs-on: ubuntu-latest
+    needs: unit
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with: { channel: stable, cache: true }
+      - run: sudo apt-get update && sudo apt-get install -y xvfb ninja-build libgtk-3-dev
+      - run: flutter pub get
+      - name: install pql
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release download --repo postmeridiem/pql --pattern 'pql_*_Linux_x86_64.tar.gz' --output /tmp/pql.tgz
+          tar -xzf /tmp/pql.tgz -C /tmp
+          sudo install -m 0755 /tmp/pql /usr/local/bin/pql
+          pql --version
+          # The pql tests query the repo's vault, but .pql/pql.db is gitignored
+          # (the post-checkout hook rebuilds it from the committed changelog).
+          # A fresh CI checkout has the changelog but no db — materialize it,
+          # and sync decision records from the governance/ DQR markdown tree
+          # (tickets come from the changelog; decisions from `decisions sync`).
+          pql plan import
+          pql decisions sync
+      - uses: coactions/setup-xvfb@v1
+        with: { run: make test-integration }
+
+  startup-bundle:
+    name: bundle smoke (xvfb 5s)
+    runs-on: ubuntu-latest
+    needs: unit
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with: { channel: stable, cache: true }
+      - run: sudo apt-get update && sudo apt-get install -y xvfb ninja-build libgtk-3-dev
+      - run: flutter pub get
+      - name: install pql
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release download --repo postmeridiem/pql --pattern 'pql_*_Linux_x86_64.tar.gz' --output /tmp/pql.tgz
+          tar -xzf /tmp/pql.tgz -C /tmp
+          sudo install -m 0755 /tmp/pql /usr/local/bin/pql
+          pql --version
+          # The pql tests query the repo's vault, but .pql/pql.db is gitignored
+          # (the post-checkout hook rebuilds it from the committed changelog).
+          # A fresh CI checkout has the changelog but no db — materialize it,
+          # and sync decision records from the governance/ DQR markdown tree
+          # (tickets come from the changelog; decisions from `decisions sync`).
+          pql plan import
+          pql decisions sync
+      # Point the real release app's crash logs at an uploadable workspace dir
+      # (T-436): if the bundle wedges on boot, the watchdog heartbeat/sample +
+      # FileLogSink land here and get uploaded below. CLIDE_LOG=debug so the
+      # file sink captures info/debug, not just the release-default warn.
+      - name: bundle smoke (logs → artifact)
+        env:
+          CLIDE_LOG: debug
+          CLIDE_LOG_DIR: ${{ github.workspace }}/clide-logs
+        run: make smoke-bundle
+      - name: Upload crash logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: bundle-crash-logs
+          path: ${{ github.workspace }}/clide-logs
+          if-no-files-found: ignore
+
+  # The web-WASM Playwright job is withheld: `flutter build web --wasm` cannot
+  # compile the tree since the tree-sitter/PTY dart:ffi pivot (dart:ffi is
+  # unavailable on the wasm target). Whether the web target gets conditional-
+  # import fences or is dropped is an open question — see Q-50 in
+  # governance/questions/architecture.md. Re-add the job (setup-node, npm
+  # install + playwright install in tools/ui, `make test-e2e`) when Q-50
+  # resolves toward keeping it.
+
+  docs:
+    name: dart doc (lib API)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with: { channel: stable, cache: true }
+      - run: flutter pub get
+      - name: dart doc --validate-links (fail on warning)
+        run: |
+          set -o pipefail
+          dart doc --validate-links 2>&1 | tee dartdoc.log
+          if grep -q "^  warning:" dartdoc.log; then
+            echo "::error::dartdoc emitted warnings — see log above"
+            exit 1
+          fi
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dart-api-docs
+          path: doc/api/

.github/workflows/windows-soak.yml

@@ -0,0 +1,115 @@
+name: windows-soak
+
+# ConPTY orphan-leak soak on a GitHub-hosted Windows runner — the cheap
+# alternative to a dedicated Windows VM. The freeze hypothesis (T-424) is that
+# each WindowsPty.start() leaks its conhost/OpenConsole host because the child
+# is not in a kill-on-close Job Object; across many runs those hosts pile up
+# until the box starves. tools/windows-verify/soak-conpty.ps1 reproduces that
+# WITHOUT crashing: it runs the ConPTY suite many times IN ONE job and counts
+# the hosts that survive each dart.exe exit. A throwaway runner is fine — we
+# watch the accumulation (the leading indicator), not the reboot. The repeated
+# runs happen inside this single job, so the leak can build up here even though
+# the runner is discarded afterwards (cf. the note in windows.yml, which only
+# runs the suite once).
+#
+# Diagnostic, never a gate: it always exits 0 and just publishes the verdict +
+# CSV. Runs on demand (workflow_dispatch) and when the soak kit itself changes.
+
+on:
+  workflow_dispatch:
+    inputs:
+      iterations:
+        description: How many times to run the ConPTY suite (clean-path soak)
+        default: "25"
+      kill_iterations:
+        description: Spawn+force-kill cycles (abrupt-death orphan probe)
+        default: "15"
+      ptys_per_iter:
+        description: WindowsPty sessions spawned per kill cycle
+        default: "2"
+  push:
+    branches: [windows-support]
+    paths:
+      - tools/windows-verify/**
+      - .github/workflows/windows-soak.yml
+
+jobs:
+  conpty-soak:
+    runs-on: windows-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: flutter --version
+      - run: flutter pub get
+      - name: ConPTY orphan-leak soak
+        shell: pwsh
+        run: |
+          $iters = "${{ github.event.inputs.iterations }}"
+          if (-not $iters) { $iters = "25" }
+          tools/windows-verify/soak-conpty.ps1 -Iterations ([int]$iters) -OutDir "$env:GITHUB_WORKSPACE/soak-out"
+      - name: Publish verdict to job summary
+        if: always()
+        shell: pwsh
+        run: |
+          $s = Get-ChildItem "$env:GITHUB_WORKSPACE/soak-out/*.summary.txt" -ErrorAction SilentlyContinue | Select-Object -First 1
+          if ($s) { Get-Content $s.FullName | Add-Content $env:GITHUB_STEP_SUMMARY }
+      - name: Upload soak CSV + summary
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: conpty-soak
+          path: soak-out
+          if-no-files-found: warn
+
+  conpty-kill-probe:
+    # Abrupt-death half: force-kill the parent dart.exe mid-life (no close(),
+    # no Job Object) and count the ConPTY hosts that survive. This is the path
+    # the freeze hypothesis (T-424) actually implicates — the clean-path soak
+    # above never exercises it. Diagnostic only; always succeeds.
+    runs-on: windows-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: flutter --version
+      - run: flutter pub get
+      - name: ConPTY abrupt-death orphan probe
+        shell: pwsh
+        # CLIDE_LOG_DIR makes the probe emit FFI breadcrumbs (T-436): when a
+        # parent is force-killed mid-life, its reader/waiter isolates' last
+        # crumb ("ReadFile enter" / "WaitForSingleObject enter") is fsynced to
+        # clide-pty.crumbs.log and uploaded below — naming what the wedged
+        # isolate was doing at the instant of death.
+        env:
+          CLIDE_LOG_DIR: ${{ github.workspace }}/kill-crumbs
+        run: |
+          $iters = "${{ github.event.inputs.kill_iterations }}"
+          if (-not $iters) { $iters = "15" }
+          $ptys = "${{ github.event.inputs.ptys_per_iter }}"
+          if (-not $ptys) { $ptys = "2" }
+          tools/windows-verify/soak-conpty-kill.ps1 -Iterations ([int]$iters) -PtysPerIter ([int]$ptys) -OutDir "$env:GITHUB_WORKSPACE/kill-out"
+      - name: Publish verdict to job summary
+        if: always()
+        shell: pwsh
+        run: |
+          $s = Get-ChildItem "$env:GITHUB_WORKSPACE/kill-out/*.summary.txt" -ErrorAction SilentlyContinue | Select-Object -First 1
+          if ($s) { Get-Content $s.FullName | Add-Content $env:GITHUB_STEP_SUMMARY }
+      - name: Upload kill-probe CSV + summary
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: conpty-kill-probe
+          path: kill-out
+          if-no-files-found: warn
+      - name: Upload FFI breadcrumbs (last act of each killed reader/waiter)
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: conpty-kill-crumbs
+          path: ${{ github.workspace }}/kill-crumbs
+          if-no-files-found: ignore

.github/workflows/windows.yml

@@ -0,0 +1,48 @@
+name: windows
+
+# Windows CI on GitHub-hosted runners — the only hosted Windows available, and
+# GitHub is clide's primary remote (the Gitea secondary is self-hosted Linux and
+# keeps running the Linux suite). This is the first real execution of the ConPTY
+# backend (lib/src/pty/windows_pty.dart), so expect genuine failures until the
+# Windows fixes land (T-424). Keep this OUT of required status checks until it's
+# reliably green — it reports + uploads artifacts without blocking merges. Each
+# run is a fresh, discarded runner, so the accumulation freeze (which needs
+# repeated runs on one machine) can't build up here.
+
+on:
+  push:
+    branches: [main, windows-support]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  windows-pty:
+    runs-on: windows-latest
+    timeout-minutes: 25
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: flutter --version
+      - run: flutter pub get
+      # No `flutter analyze` here: it's platform-agnostic — the Linux job already
+      # analyzes windows_pty.dart and everything else statically, and the
+      # `flutter build windows` release job catches Windows-specific compile
+      # errors. Skipping it also avoids needing `make gen-build-info`, since the
+      # pty tests import the pty libraries directly, not the build_info-bearing
+      # barrel (lib/clide.dart). This job's unique value is running real ConPTY.
+      - name: ConPTY + Windows-arg unit tests
+        # windows_pty_test.dart drives real ConPTY (it self-skips off-Windows);
+        # the args/size suites are the pure-logic coverage. --timeout 60s so a
+        # wedged reader fails fast instead of hanging the runner.
+        run: dart test --concurrency=1 --timeout 60s test/pty/windows_pty_test.dart test/pty/windows_pty_args_test.dart test/pty/pty_size_test.dart
+      - name: Upload test output / logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-test-output
+          # T-425 (crash-survivable FileLogSink) writes under %LOCALAPPDATA%\clide\logs;
+          # add that path here once it lands so a freeze leaves a downloadable log.
+          path: test/.test-output
+          if-no-files-found: ignore

.gitignore

@@ -58,6 +58,8 @@ tools/ui/.serve.pid
 /native/linux-x64/clide
 /native/macos-arm64/clide
 /native/macos-x64/clide
+/native/windows-x64/clide.exe
+/native/windows-x64/clide.obj
 
 # -- Test, coverage, profile output ------------------------------------
 *.test

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "cc0734ac716fbb8b90f3f9db8020958b1553afa7"
+  revision: "c9a6c484230f8b5e408ec57be1ef71dee1e77020"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: cc0734ac716fbb8b90f3f9db8020958b1553afa7
+      create_revision: c9a6c484230f8b5e408ec57be1ef71dee1e77020
-      base_revision: cc0734ac716fbb8b90f3f9db8020958b1553afa7
+      base_revision: c9a6c484230f8b5e408ec57be1ef71dee1e77020
-    - platform: web
+    - platform: windows
-      create_revision: cc0734ac716fbb8b90f3f9db8020958b1553afa7
+      create_revision: c9a6c484230f8b5e408ec57be1ef71dee1e77020
-      base_revision: cc0734ac716fbb8b90f3f9db8020958b1553afa7
+      base_revision: c9a6c484230f8b5e408ec57be1ef71dee1e77020
 
   # User provided section
 

.pql/changelog/ticket_deps/2026-06.sql

@@ -26,3 +26,12 @@ INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updat
 INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB3DMF20SYFDT6WX2RFBQXKW', '06FB3DNQZKV20F7YG5PJH8V8SM', '2026-06-10 13:27:09', '2026-06-10 13:27:09', NULL, '1d5185ae9c9676bd70d0e02e3a5e79a1', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
 INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB3DQEMTDHF8SV27AKAB8JHW', '06FB3DNQZKV20F7YG5PJH8V8SM', '2026-06-10 13:27:10', '2026-06-10 13:27:10', NULL, '90dca94aa700c143290b2b1afaca09ed', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
 INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB3DMF20SYFDT6WX2RFBQXKW', '06FB3DP48FS33CQGRDF7EB9GT0', '2026-06-10 13:27:10', '2026-06-10 13:27:10', NULL, '9b9081edc77f0e9a4b689bbc191771db', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB3DJZDDZ00BSA04B660RS7M', '06FB3DQEMTDHF8SV27AKAB8JHW', '2026-06-10 13:27:05', '2026-06-12 01:11:12', NULL, '17f1c884268a172f803f407a2ad47c8c', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB3DQEMTDHF8SV27AKAB8JHW', '06FB3DN94MBCTYJW17ZCYVSXE0', '2026-06-10 13:27:09', '2026-06-12 01:11:17', NULL, 'a67368ff15089dce57838840632fe07e', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB3DQEMTDHF8SV27AKAB8JHW', '06FB3DNQZKV20F7YG5PJH8V8SM', '2026-06-10 13:27:10', '2026-06-12 01:11:22', NULL, '0ec8ff6c455136e45fbb1d06a2a690f1', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB3DMF20SYFDT6WX2RFBQXKW', '06FB3DP48FS33CQGRDF7EB9GT0', '2026-06-10 13:27:10', '2026-06-12 01:11:26', NULL, '3c985828c591c88d492eb261c6d26d33', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB3DQEMTDHF8SV27AKAB8JHW', '06FB3DMF20SYFDT6WX2RFBQXKW', '2026-06-12 01:11:31', '2026-06-12 01:11:31', NULL, '81fd318a43138a3bef82e31f928ff0b2', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKMV7Y13PAYKZC0WB4FQXKC', '06FBKMXSVCE98K1H76N00TYCQR', '2026-06-12 03:16:35', '2026-06-12 03:16:35', NULL, '28d9785a1f9696b6b579a1dbb9fdb889', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKMV7Y13PAYKZC0WB4FQXKC', '06FBKN09R21H3AWR2Q2ZTSGNSW', '2026-06-12 03:16:40', '2026-06-12 03:16:40', NULL, '7e00348c10432c65b03f9dce36520e48', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKMXSVCE98K1H76N00TYCQR', '06FBKN2MP35NPPK1BRDYY2M428', '2026-06-12 03:16:44', '2026-06-12 03:16:44', NULL, 'a6b1c20279ac30f692a30c802cf8f3e5', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);
+INSERT INTO ticket_deps (blocker_record_id, blocked_record_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKMV7Y13PAYKZC0WB4FQXKC', '06FBKN4QVFVE51MY2N0CWCVXHM', '2026-06-12 03:16:49', '2026-06-12 03:16:49', NULL, '9063328f18ba32c0737997ac9af0911a', 2) ON CONFLICT(blocker_record_id, blocked_record_id) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_deps.updated_at OR (excluded.updated_at = ticket_deps.updated_at AND excluded.hash > ticket_deps.hash);

.pql/changelog/ticket_idmap/2026-06.sql

@@ -177,3 +177,87 @@ INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_
 INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB5CW7JPT6BR2RWMNYVCXJ50', 'T-350', '2026-06-10 18:02:50', '2026-06-10 18:02:50', NULL, 'a5c0c22d84621b14a5208317414d6026', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
 INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB5HMYDXP62RKH3HP55T6AYG', 'T-351', '2026-06-10 18:23:41', '2026-06-10 18:23:41', NULL, '9d2da44c16c5aa38c0a36e4b00ef5f15', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
 INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FB5M14B76B31654D959XM5AC', 'T-352', '2026-06-10 18:34:05', '2026-06-10 18:34:05', NULL, '3fe3e1d5fb7c0fbd084b45116575ad98', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBAWHM1SQ1686ZJ8JQCFQ1ZW', 'T-353', '2026-06-11 06:50:21', '2026-06-11 06:50:21', NULL, '53374633101d04f94981baaf4f2e0315', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBDSJYQFDNKP4KA1JAEDSS8W', 'T-354', '2026-06-11 13:36:51', '2026-06-11 13:36:51', NULL, '32bb5d359401599022a8771031d8a08a', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBDSKGAHYHH2NPZK8B6EV4D4', 'T-355', '2026-06-11 13:36:55', '2026-06-11 13:36:55', NULL, '2eb6809e958613a924b35e080ab17609', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBDSM0PRGYR61R0NWYAT9VDC', 'T-356', '2026-06-11 13:37:00', '2026-06-11 13:37:00', NULL, 'bdb597080218a3e8783f6c5cf74c529a', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBDSPECQ0FPKB9SYTD7KZSBM', 'T-357', '2026-06-11 13:37:19', '2026-06-11 13:37:19', NULL, '96cf88e036dc3a45487cdbffff26cdde', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBDSQ2GBSP0ZH4RHZG2PMR0R', 'T-358', '2026-06-11 13:37:25', '2026-06-11 13:37:25', NULL, '2a656aaec54bf50c34c7e28347b1fb29', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBGHNEQTAEPGNJKN42C1E8', 'T-359', '2026-06-11 21:54:36', '2026-06-11 21:54:36', NULL, '1930fad7b18c79cf97d913d8372b77bd', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBJ5T7HAQ9CA8XQMX43A2C', 'T-360', '2026-06-11 21:54:49', '2026-06-11 21:54:49', NULL, '1ffef3c00cdca28566ab67a11ec17e53', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBKK2TZQK683J8FS0ZH5A4', 'T-361', '2026-06-11 21:55:01', '2026-06-11 21:55:01', NULL, '5f8bdede98496496bf031a40a09dee16', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBN5F0F8SDF15P21DNKT1W', 'T-362', '2026-06-11 21:55:13', '2026-06-11 21:55:13', NULL, '610e74eb7b4ff9db3949ed01a0268380', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBPQE4J4YBJX92812ZK6DR', 'T-363', '2026-06-11 21:55:26', '2026-06-11 21:55:26', NULL, '5daf7bcd9ccdc37f8aed531ef12d395f', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBR4636GSRJBWFJDAZ6ZA0', 'T-364', '2026-06-11 21:55:38', '2026-06-11 21:55:38', NULL, '025de46ba9e8d005fd8b1f74687cd8b6', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBSG6356MZJ2DCCCSBMBGM', 'T-365', '2026-06-11 21:55:49', '2026-06-11 21:55:49', NULL, 'b366b41e4737a2761a01284fd7dd44e0', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBV0465906BY3QFAY9F1YM', 'T-366', '2026-06-11 21:56:01', '2026-06-11 21:56:01', NULL, '8a75dc7dea83a0e643d1912bda46dd57', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBWE2W1226T58CX37E50HC', 'T-367', '2026-06-11 21:56:13', '2026-06-11 21:56:13', NULL, '578b51eafd19044dc0e2720f6e55d633', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHBYTJ4E7ZBY6DWWNT1S16M', 'T-368', '2026-06-11 21:56:33', '2026-06-11 21:56:33', NULL, '0df409c83fe28af2d49a156118ed6ece', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHC0HYRZ86CWW0DDQJ5CAQM', 'T-369', '2026-06-11 21:56:47', '2026-06-11 21:56:47', NULL, '7f47ddc3e84f9fea915200992a5a0baf', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHC2NM7AYKENZ0ZD49HAX1W', 'T-370', '2026-06-11 21:57:04', '2026-06-11 21:57:04', NULL, '1908b7c0903c389ad5b743fb89ca32e0', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHC46SEHH8NQY481VMGK66R', 'T-371', '2026-06-11 21:57:17', '2026-06-11 21:57:17', NULL, '2095f10159561a5e81b2a9b990c79fa2', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHC5ZE4EZEGXK8YY8J86CM0', 'T-372', '2026-06-11 21:57:31', '2026-06-11 21:57:31', NULL, '9d22f370e726af56d47d6c8acd93bc87', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHC7KDFW07S8WTCC3MD71J0', 'T-373', '2026-06-11 21:57:44', '2026-06-11 21:57:44', NULL, '231c399183a83e569c0645e1d149625f', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHC90B72A270CAKA7AP1ZX8', 'T-374', '2026-06-11 21:57:56', '2026-06-11 21:57:56', NULL, '9832ac0b3e0bebd85f3271a5ea96d4ed', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCAFKK334YNJXZJQG4J6AW', 'T-375', '2026-06-11 21:58:08', '2026-06-11 21:58:08', NULL, 'de3569d098b5c4cf6a3d49ee3d33d1c9', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCC6AR37VTF4SY8DR99JHC', 'T-376', '2026-06-11 21:58:22', '2026-06-11 21:58:22', NULL, 'fe23c94d8971d21963a2b2e2739e05a3', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCEC25337J2AXXQNST56Y4', 'T-377', '2026-06-11 21:58:40', '2026-06-11 21:58:40', NULL, '1585df7f3826ddbcef8a030ffd1e0890', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCG84F4SPFW111CC4K26A8', 'T-378', '2026-06-11 21:58:55', '2026-06-11 21:58:55', NULL, 'c6b0d9d124401f1d2bdc403567cbfdf8', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCJEYHC91PMVNVWVHBR2RG', 'T-379', '2026-06-11 21:59:13', '2026-06-11 21:59:13', NULL, '0d9aed402c9840ef6fb75edfcfcbc3f4', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCM1RBAF72SCZBKRTXJSYC', 'T-380', '2026-06-11 21:59:26', '2026-06-11 21:59:26', NULL, '1a0d767f30c9bc0e9c96f39d468ca67b', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCP03EJ9CDBGZGRPD19N8W', 'T-381', '2026-06-11 21:59:42', '2026-06-11 21:59:42', NULL, 'cfac236e079164f9588d936f5101c71c', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCQHZQ0NKY1VRWWPSNZT84', 'T-382', '2026-06-11 21:59:55', '2026-06-11 21:59:55', NULL, 'b54be44ec4cfbbc649324471a5e2141f', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCST6CQ449VJGAP6C5KZ5W', 'T-383', '2026-06-11 22:00:14', '2026-06-11 22:00:14', NULL, '0e18de4e94e4fcf36fc40de763522cbd', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCVPGCKEGDC54KKQ120SRM', 'T-384', '2026-06-11 22:00:29', '2026-06-11 22:00:29', NULL, '57d7b6a6c05791acadd1cebe611c8991', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHCXFF5V1RT6QJETS2K4C0G', 'T-385', '2026-06-11 22:00:44', '2026-06-11 22:00:44', NULL, 'ebda2dd9c7dfe92bab2260dc34212ac4', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHD098CV2N73823KX4Z99P4', 'T-386', '2026-06-11 22:01:07', '2026-06-11 22:01:07', NULL, 'de90501f2d4be80231651d25d04f4649', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHD2FWTDFYA00W4QXTE41M0', 'T-387', '2026-06-11 22:01:25', '2026-06-11 22:01:25', NULL, '8a247364a872c223b37682c6496d3920', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHD4QYHYRTK0SGRZCBSHSQ0', 'T-388', '2026-06-11 22:01:43', '2026-06-11 22:01:43', NULL, 'cc238ee850d4d0ed90d05b9a42c8d506', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHD6FQMXMQQQ877KMNCK6QC', 'T-389', '2026-06-11 22:01:57', '2026-06-11 22:01:57', NULL, 'bb0657e304f4ad1445d756ef7170c62d', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHD8F2NBEFZNPKSJ9W253J0', 'T-390', '2026-06-11 22:02:14', '2026-06-11 22:02:14', NULL, '35453f0d8c7e0fb89c243481f870de03', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHDAK04ZA0PBT69ZWNBXPSR', 'T-391', '2026-06-11 22:02:31', '2026-06-11 22:02:31', NULL, '0647245b4da95532bb3abd6f20cd87de', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHDC7B2MFQZVR1K9E30FXDR', 'T-392', '2026-06-11 22:02:44', '2026-06-11 22:02:44', NULL, 'a1612ff75df3d134b8e05c716d24ebfe', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHDE5A3965GNRFS5WPZW878', 'T-393', '2026-06-11 22:03:00', '2026-06-11 22:03:00', NULL, 'f8f29fb8b31cc8afdd8af989c3f711f1', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHDGPXQN31NNRPJ00PFRAG4', 'T-394', '2026-06-11 22:03:21', '2026-06-11 22:03:21', NULL, 'f9cee5dc96cedfabc3eaaf7352e732c8', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBHDH8TE9MJBXZ4GQ5YT10JM', 'T-395', '2026-06-11 22:03:26', '2026-06-11 22:03:26', NULL, '382a5742e32da0f38c1e143715a0b656', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBJAXQHCKHS8ZSDZNM9NH7QM', 'T-396', '2026-06-12 00:11:50', '2026-06-12 00:11:50', NULL, '20577481e56f82bb0df9e56a266303c9', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBJM6XXQZ3EMGRC13XRYVBEM', 'T-397', '2026-06-12 00:52:25', '2026-06-12 00:52:25', NULL, 'bf89e25b384be60faa65e9eb1ec2fab9', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKMV7Y13PAYKZC0WB4FQXKC', 'T-398', '2026-06-12 03:15:00', '2026-06-12 03:15:00', NULL, 'd0ed46ee279c148f1d76683e86e0d4aa', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKMXSVCE98K1H76N00TYCQR', 'T-399', '2026-06-12 03:15:21', '2026-06-12 03:15:21', NULL, 'eacf3522aeb2bccbaf006c9703b9794d', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKN09R21H3AWR2Q2ZTSGNSW', 'T-400', '2026-06-12 03:15:41', '2026-06-12 03:15:41', NULL, 'a7971f428145d04ae82d4cd89f3eeb9d', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKN2MP35NPPK1BRDYY2M428', 'T-401', '2026-06-12 03:16:00', '2026-06-12 03:16:00', NULL, '29980034db5fe381473b156ece7d8a1a', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKN4QVFVE51MY2N0CWCVXHM', 'T-402', '2026-06-12 03:16:18', '2026-06-12 03:16:18', NULL, 'c65717bf20ea6886ef7a86f5cb4b2929', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKP67X1Y1FEE9T5R0E5DA9C', 'T-403', '2026-06-12 03:20:52', '2026-06-12 03:20:52', NULL, '372a686b214820b5d093b11b9f3d57a5', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKP8KFAF526ZNXBQS98DPPG', 'T-404', '2026-06-12 03:21:11', '2026-06-12 03:21:11', NULL, 'c479a9dea6687b553bc638a9849cc5de', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKPAZR4XEV8YW3PVR2XJBFC', 'T-405', '2026-06-12 03:21:31', '2026-06-12 03:21:31', NULL, 'e4e1695f838b8fbf02aae49a6f2df4fe', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKPD85PFBPJJTQ0WS3PWWXR', 'T-406', '2026-06-12 03:21:49', '2026-06-12 03:21:49', NULL, '689352238d2050a3769b2a9613f0a793', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBKPFTC7H5NY0XHBTEGF8XQ4', 'T-407', '2026-06-12 03:22:10', '2026-06-12 03:22:10', NULL, '129d2b3c31022d53025a3e28169a060e', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBN3VTK2MYQQ173MSJN6E1DM', 'T-408', '2026-06-12 06:40:25', '2026-06-12 06:40:25', NULL, '0353aaab57a40900b00883fb12e135f7', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBN3VYR84023Z5XFEX9DS0S0', 'T-409', '2026-06-12 06:40:26', '2026-06-12 06:40:26', NULL, '69c280319335a8d0ef646998f4531e96', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBP3EZC7AJANXZVF3D91QYWM', 'T-410', '2026-06-12 08:58:29', '2026-06-12 08:58:29', NULL, '4f726d1a66d38d14018a62c8d24ffe62', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBP3GM6V0RZBY2PXE9ZQFR88', 'T-411', '2026-06-12 08:58:42', '2026-06-12 08:58:42', NULL, 'bdd3f8b13caf25677ac661ec29599488', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBP3J7TXMG0F9E2WQDENPVJG', 'T-412', '2026-06-12 08:58:55', '2026-06-12 08:58:55', NULL, 'e56d50bc6fc04f6d646f22c104e63183', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBP3KRWM65MD3DS251NN9YX0', 'T-413', '2026-06-12 08:59:08', '2026-06-12 08:59:08', NULL, 'b5247ea05c106500682be978a47e61ee', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBP3P8YERJ5R7ENSD675BX00', 'T-414', '2026-06-12 08:59:28', '2026-06-12 08:59:28', NULL, '7d973f16c99441dbba0f8df89a665b32', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBP3P91QQQDT5J50F52FPCKM', 'T-415', '2026-06-12 08:59:28', '2026-06-12 08:59:28', NULL, 'a2dea9268d44b9e8a1fd746bbb947c92', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBPQ8QNGJFFK7G24CBWQAR2C', 'T-416', '2026-06-12 10:25:00', '2026-06-12 10:25:00', NULL, 'f8c2a125e661607d5dd0c73cd2c3f2ab', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBQ4BYD4STCKCY8JNKF23Q4W', 'T-417', '2026-06-12 11:22:15', '2026-06-12 11:22:15', NULL, '15aa9b25417162126cbcde174d3537da', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBQ595H08JFTRFSR90GSZQ0G', 'T-418', '2026-06-12 11:26:14', '2026-06-12 11:26:14', NULL, '000e07ae64b08273a2d2d9f8a77d193f', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FBTTMGKSYMTF8M1KQWTG774W', 'T-419', '2026-06-12 19:58:58', '2026-06-12 19:58:58', NULL, 'd2b01a2c3d1ce24cc863ac6d9d814d3d', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FC2XY1T85A65YY9SG25VVEY4', 'T-420', '2026-06-13 14:51:51', '2026-06-13 14:51:51', NULL, '16ea4c9353a56798b894ab3d85fb7b56', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCDG3T4A7CYPTG535KVAVH6C', 'T-421', '2026-06-14 15:29:23', '2026-06-14 15:29:23', NULL, 'a28eed4b57104034c5216344a326195c', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCDKX4CVHWVGDAJC6X09602M', 'T-422', '2026-06-14 15:45:57', '2026-06-14 15:45:57', NULL, '5701c634f5737a2ba1612deab8df7049', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCDM61KAA3GV3CVTE8PAZ8N0', 'T-423', '2026-06-14 15:47:10', '2026-06-14 15:47:10', NULL, 'ce7dfb8b9bd088b4c2e8ddfacc8d2124', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCENXW1VF7VXQX64982X171R', 'T-424', '2026-06-14 18:14:36', '2026-06-14 18:14:36', NULL, 'ecbed75dcd34c39bcbd86e60d6f4a2c2', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCENXXZFBZ0HVD1VCW4ZASCC', 'T-425', '2026-06-14 18:14:36', '2026-06-14 18:14:36', NULL, 'b09fc55465f7de02cf98f69c99e0e6e3', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCEP60AS6AF654SWA189A5ZR', 'T-426', '2026-06-14 18:15:42', '2026-06-14 18:15:42', NULL, '91f50c6e38332047f8619db428d4b376', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCEP642C8ZZ1T20RXQQ3143M', 'T-427', '2026-06-14 18:15:43', '2026-06-14 18:15:43', NULL, '55a937def177025ef6b61a222d88b142', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCEP67ZHMBFW0GRH9JKDMQ7R', 'T-428', '2026-06-14 18:15:44', '2026-06-14 18:15:44', NULL, '185e7d3ce8529fbe1f4543f4c635f200', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCEP6BDBHGMK9VCRV6JQ00TW', 'T-429', '2026-06-14 18:15:45', '2026-06-14 18:15:45', NULL, 'ef268614a716384a7597b3e304a6c176', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCEP6EVN9S35T02MHA2AS7YW', 'T-430', '2026-06-14 18:15:46', '2026-06-14 18:15:46', NULL, 'd6333df4da5b7ab8958149a9f0d17974', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCGJ30V24BJB001GZCR5QKTC', 'T-431', '2026-06-14 22:37:27', '2026-06-14 22:37:27', NULL, 'b886820e87f5abd329126bf5e9f1a3da', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCM9ER04JVFW8CN3JW1AWYA8', 'T-432', '2026-06-15 07:18:58', '2026-06-15 07:18:58', NULL, '71f3e4c95f66abc5e7e5820548201e41', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCM9F446MZFXVHH65Q6CKTPM', 'T-433', '2026-06-15 07:19:01', '2026-06-15 07:19:01', NULL, 'b9a361f2c29b286bc808dbea57a05a7e', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCM9FHC8VX50759X35VNER1R', 'T-434', '2026-06-15 07:19:04', '2026-06-15 07:19:04', NULL, '403c4c8aa5659bb379cb8add9dff800b', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCM9FYDEXCM15FXTER032K84', 'T-435', '2026-06-15 07:19:08', '2026-06-15 07:19:08', NULL, '7c2ed604aecea99b742b341166cf2257', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);
+INSERT INTO ticket_idmap (record_id, ticket_id, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCM9GAQ2G0KCVMZS67SK3324', 'T-436', '2026-06-15 07:19:11', '2026-06-15 07:19:11', NULL, '3114ab57de9b03aa1e745af01001eee1', 2) ON CONFLICT(record_id) DO UPDATE SET ticket_id=excluded.ticket_id, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_idmap.updated_at OR (excluded.updated_at = ticket_idmap.updated_at AND excluded.hash > ticket_idmap.hash);

.pql/changelog/ticket_labels/2026-06.sql

@@ -0,0 +1,2 @@
+INSERT INTO ticket_labels (ticket_record_id, label, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCDG3T4A7CYPTG535KVAVH6C', 'multi-window', '2026-06-14 15:29:27', '2026-06-14 15:29:27', NULL, 'ce03f8eb534bc45e2c1c12e9b30a2c30', 2) ON CONFLICT(ticket_record_id, label) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_labels.updated_at OR (excluded.updated_at = ticket_labels.updated_at AND excluded.hash > ticket_labels.hash);
+INSERT INTO ticket_labels (ticket_record_id, label, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FCDG3T4A7CYPTG535KVAVH6C', 'ipc', '2026-06-14 15:29:28', '2026-06-14 15:29:28', NULL, 'e6789b66db5c1de85daf6fc8d3474449', 2) ON CONFLICT(ticket_record_id, label) DO UPDATE SET updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > ticket_labels.updated_at OR (excluded.updated_at = ticket_labels.updated_at AND excluded.hash > ticket_labels.hash);

CHANGELOG.md

@@ -16,6 +16,322 @@ heading, and (b) bumping `pubspec.yaml` `version:` in the same commit.
 
 ## [Unreleased]
 
+### Added
+
+- **Crash-survivable logging.** clide writes a durable JSON-lines log to a
+  persistent per-platform dir (Windows `%LOCALAPPDATA%`, macOS `~/Library/Logs`,
+  Linux `$XDG_STATE_HOME`), fsyncing warn/error + pty/ffi records immediately so
+  a freeze leaves on-disk evidence. `CLIDE_LOG` (dart-define / env) or the
+  `app.log.level` setting sets verbosity (warn in release, info in debug);
+  `CLIDE_LOG_DIR` redirects where the logs land. (T-432, T-436)
+- **PTY FFI breadcrumbs.** Each PTY backend drops a breadcrumb before/after
+  every risky syscall (`CreatePseudoConsole`/`CreateProcessW`/`ReadFile`,
+  `posix_spawn`/`read`); the reader/waiter isolates fsync their OWN file handle
+  so a wedged isolate's last crumb survives a freeze that also froze the main
+  isolate — naming the wedge after the fact. Per-syscall crumbs at debug level.
+  (T-434)
+- **Crash-diagnostic watchdog.** A dedicated isolate fsyncs a heartbeat every
+  ~500ms (bounding a freeze to ~500ms) and every ~2s samples this process's
+  thread / handle / child-host / RSS counts to `clide-watchdog.log` — a climbing
+  child or thread count is the leak signature. Survives a frozen main isolate;
+  spawn failure is non-fatal. (T-435)
+- **Live log-verbosity toggle.** The output dock's Level chip now sets the
+  running logger's level and persists `app.log.level` (not just a view filter),
+  and `clide log level [<level>]` does the same from the CLI — D-6 parity. The
+  choice survives restart. (T-433)
+
+## [2.5.0] — 2026-06-14
+
+### Added
+
+- **Experimental Windows desktop support.** clide builds and runs on Windows —
+  ConPTY-backed terminals, an AF_UNIX `clide` CLI client, PowerShell as the
+  default shell, and a `make build-windows` target. Preview quality: ConPTY
+  child-process reaping under sustained use is still being hardened. (T-424)
+- **Vim `ctrl+w` window commands.** Under the vim preset, `ctrl+w` followed by
+  h/l (focus left/right panel), j (toggle dock), w / ctrl+w (cycle panels),
+  shift+w (cycle back), o (focus mode), or q/c (close editor). A new global
+  multi-chord matcher in the shell resolves these from any focus; bare `ctrl+w`
+  still closes the editor after the ambiguity timeout. (T-404)
+- **Workspace tab cycling with ctrl+pagedown / ctrl+pageup.** New
+  `workspace.tab.next` / `workspace.tab.previous` commands cycle the workspace
+  tab strip with wraparound, bound across every preset. (T-405)
+- **Vim normal-mode navigation works outside the editor.** Under the vim preset,
+  a focused file tree or conversation now responds to j/k, ctrl+d/ctrl+u, gg/G,
+  and (tree) h/l/o — a selection cursor in the tree, scrolling in the
+  conversation. Each pane runs its own sequence matcher; an `editor.focused`
+  flag keeps these keys as buffer motions while the editor holds focus. (T-406)
+- **Claude Code Workflow runs surface in the conversation and sidebar.** A
+  `Workflow` tool-use renders a dedicated run card — phase groups, per-agent
+  rows with live spinner/check status, usage, and the script — driven by the
+  harness's out-of-band progress events. The Activity tab adds a WORKFLOWS
+  section showing each run's done/total agent count. (T-416)
+- **Session controls and live usage in the Claude sidebar Activity tab.** A
+  SESSION strip offers clear/compact/fork/resume buttons (same code path as the
+  typed commands), and a refresh control fetches `/usage` — plan usage renders
+  as a USAGE block (session and weekly percentages). The runtime row now also
+  shows the session's effort level. (T-415)
+- **The Claude sidebar Config tab is a live control panel.** Model, effort, and
+  permission mode are popover controls showing the running session's values;
+  picking an option drives the session through the same path as the typed slash
+  command. The sidebar tables also got a visual pass — larger type, accent
+  section headers, more breathing room. (T-414)
+- **The TUI command family opens clide surfaces.** `/permissions` sets the mode
+  directly or opens a picker; `/status`, `/config`, `/mcp`, `/agents`, `/hooks`
+  jump to the matching Claude sidebar tab; `/memory` opens CLAUDE.md in the
+  editor; `/help` shows clide's own command summary. (T-413)
+- **`/effort` works in the Claude pane.** With a level (`/effort xhigh`) the
+  session restarts in place carrying `--effort` — resume keeps the
+  conversation; bare `/effort` opens a picker with the five levels and the
+  current one marked. The active effort shows in the session status. (T-412)
+- **TUI-only slash commands get a helpful notice instead of failing.** A typed
+  `/cost` or `/doctor` no longer errors raw from the CLI or leaks to the model
+  as literal text — known TUI-only commands route to a muted notice card with
+  the clide-native way. CLI-local output (like `/usage`) renders as a "clide"
+  card, never fake Claude prose. (T-411)
+- **`/model` works in the Claude pane.** With a name (`/model sonnet`) it
+  switches the live session's model over the control channel; bare `/model`
+  opens a picker in the interaction zone with the CLI's model list and the
+  current model marked. A rejected name rolls back and raises a toast. (T-408)
+
+### Removed
+
+- **tmux is no longer a required tool.** clide stopped spawning tmux when Claude
+  session persistence moved to `--resume` (D-77); the toolchain no longer probes
+  for it or warns when it's absent, on any platform.
+
+### Fixed
+
+- **`ClaudeConfig` no longer crashes on a project switch that races teardown.**
+  `setProjectDir` / `refresh` / `ensureProbe` now skip `notifyListeners()` if the
+  config was disposed during their async load (the guard `load()` already had).
+
+## [2.4.1] — 2026-06-12
+
+### Fixed
+
+- **`Shift+;` types a colon again — double-Shift no longer fires on chorded
+  Shift.** The double-tap detector counted any Shift press as a tap, even
+  mid-chord, and never saw keys the focused editor consumed; a tap now
+  requires a clean press-and-release, observed at the raw-keyboard level.
+  (T-409)
+
+## [2.4.0] — 2026-06-12
+
+### Added
+
+- **Live tail inside expanded Bash activity cards.** A Bash card that follows a
+  file (`tail -f …`) now shows a live, scrolling read-only tail of that file
+  below the result — connected only while the card is expanded. Commands with no
+  followable file show a muted "nothing to follow" note. (T-325)
+
+- **Double-tap-modifier shortcuts (e.g. double-Shift "Search Everywhere").**
+  The keymap can now bind a bare modifier and a double-tap sequence
+  (`shift shift`). All four presets (default, vim, vscode, jetbrains) map
+  double-Shift to the quick-open finder — JetBrains' "Search Everywhere"
+  gesture, aliased to clide's existing fuzzy file finder. (T-341)
+
+### Changed
+
+- **Each spawned subagent gets its own collapsing activity card.** A fan-out of
+  N agents no longer merges into one "Activity / N steps" cluster — each spawn is
+  its own card with its prompt and nested run. Non-agent tool calls still group
+  as before. (T-342)
+
+### Removed
+
+- **Dead-code sweep.** The legacy free-function git API (with its latent
+  pipe deadlock), ToolCheck, the fd-passing-era libc bindings, the GraphView
+  placeholder, the superseded ColumnHat widget, the tmux-era
+  TranscriptPublisher, the committed `ptyc` binary, and the unused
+  `mocktail` dev-dependency (D-25 amended) are gone. (T-385)
+
+- **Dead welcome-screen tiles.** "Clone from git…" and "Start a Claude
+  session" did nothing on tap and advertised shortcuts that were never
+  registered; the tips card now lists only shortcuts that exist in the
+  default keymap. Each tile returns when its flow ships. (T-383)
+
+### Fixed
+
+- **Terminal CSI sequences with intermediate bytes no longer mis-dispatch.**
+  The parser dropped intermediates, so e.g. VT420 scroll-left (`CSI 5 SP @`)
+  executed as "insert 5 blank characters"; such sequences are now reported
+  as unknown instead. (T-123)
+
+- **PTY master fd no longer leaks when a child exits on its own.** Every
+  terminal or Claude pane whose process ended naturally left its pty device
+  open for the life of the app; natural exit now releases the fd. (T-360)
+
+- **Closing a terminal pane now closes its shell.** Pane disposal looked up
+  the kernel illegally and swallowed the failure, so `pane.close` was never
+  sent — the backend PTY and daemon pane leaked on every closed terminal
+  pane, and Claude panes leaked a settings listener the same way. (T-366)
+
+- **Scrolling up during a streaming reply no longer fights the auto-scroll.**
+  The conversation followed the tail on every streamed token regardless of
+  scroll position, dragging a reader back to the bottom; it now follows only
+  while already pinned there. (T-368)
+
+- **The terminal no longer crashes on truncated SGR color sequences.**
+  `ESC[38m` and friends threw a RangeError inside the emulator; incomplete
+  38/48 sequences are now ignored, and colon-form truecolor/256-color
+  sub-parameters (`38:2:r:g:b`, ITU T.416) parse like the semicolon form
+  instead of being mangled. (T-369)
+
+- **File listing flags symlinks again and the workspace walk no longer
+  follows them.** Symlink detection was dead code, so `files.walk` (and the
+  search engine on top of it) silently descended symlinked directories —
+  including ones pointing outside the workspace. (T-365)
+
+- **Search-and-replace now honors its include/exclude globs.** The filters
+  were accepted but never applied, so replace could rewrite files outside
+  the scope the user typed; replace now uses the same glob filtering as
+  search. (T-364)
+
+- **Switching projects releases the previous workspace's services.** The old
+  file watcher, pane PTYs, in-flight searches, and editor buffers were left
+  alive on every project switch, with stale watcher events leaking into the
+  new workspace. (T-367)
+
+- **Expanded activity cards are readable by screen readers again.** The
+  collapser's summarized button semantics excluded the whole card, so
+  expanding a run announced nothing inside it; the exclusion is now scoped
+  to the header and the inner cards stay in the a11y tree. (T-370)
+
+- **A crashed Claude process no longer looks like it's still thinking.**
+  stderr is now drained continuously (an undrained pipe could block the
+  child mid-turn) and the exit code is watched: when the process dies the
+  pane stops spinning, clears any unanswerable permission prompt, reports
+  the exit in the status line, and logs the stderr tail. (T-361)
+
+- **The Claude status bar populates reliably after a session starts.** The
+  session's init event often fired before the pane subscribed and the plain
+  broadcast stream dropped it, leaving the model/mode/context line blank;
+  session state streams now replay their latest value to late subscribers.
+  (T-274, T-386)
+
+- **New terminal panes open in the project root.** The shell spawned in the
+  app process's working directory — `$HOME` for desktop launches, and the
+  wrong repo after a project switch. (T-381)
+
+- **Two simultaneous spawns of the same Claude session no longer leak a
+  process.** Concurrent spawn calls for one pane id both passed the registry
+  check and the loser's live process was orphaned; spawns for an id are now
+  coalesced onto one in-flight future. (T-374)
+
+- **`/clear` in a fork pane clears instead of re-forking.** The fork source
+  took precedence on every respawn, so clearing a fork tab silently branched
+  the original conversation again; the source now seeds only the first
+  bind. (T-375)
+
+- **Pipelined IPC requests are now truly serial and framing-safe.** The
+  server's read handler could interleave concurrent requests (against
+  D-72's contract), drop or double frames split across reads, and corrupt
+  multi-byte characters split across chunks. (T-372)
+
+- **Settings survive nested structures, crashes, and corruption.** Maps
+  inside lists (the keymap overlay shape) were corrupted on save; writes
+  are now atomic (temp file + rename), and a file that fails to parse is
+  preserved as `.broken` with a logged warning instead of being silently
+  reset. (T-376)
+
+- **Markdown hard breaks break lines and images leave a visible trace.**
+  Both rendered as empty text — words on either side of a hard break glued
+  together and images vanished; breaks now emit a newline and images render
+  an italic `[image: alt]` placeholder. (T-379)
+
+- **Extension notifications actually appear on screen.** Messages pushed
+  through the kernel Notifications service (e.g. the CLI-install dogfood
+  warnings) accumulated in a list no surface rendered; they now raise
+  toasts with matching severity. (T-382)
+
+- **Failed `clide claude.*` commands now exit non-zero.** Sixteen handlers
+  reported success with an error message buried in the payload, so scripts
+  could not detect failures like an unknown permission mode; they now
+  return proper error envelopes per the D-6 contract. (T-391)
+
+- **Terminal output no longer garbles multi-byte characters split across
+  reads.** PTY output and live-tail bytes were decoded per chunk, turning a
+  rune split across reads into replacement-character noise; the terminal
+  now ingests bytes through a persistent decoder. (T-373)
+
+- **Extension lifecycle is transactional.** A throw mid-activation now
+  unwinds every contribution it had mounted (a retry no longer
+  double-applies), deactivating an extension is refused while active
+  extensions depend on it, and duplicate contribution/command ids are
+  rejected instead of silently clobbering. (T-377)
+
+- **Accepting ExitPlanMode now leaves plan mode in the conversation panel.**
+  Approving Claude's plan (the ExitPlanMode tool) transitioned the underlying
+  session out of plan mode, but clide's tracked permission mode didn't follow,
+  so the mode indicator and composer stayed stuck on "plan". The approval now
+  syncs the tracked mode to `default`. (T-337)
+
+### Security
+
+- **The MCP HTTP server now requires a per-start auth token.** The localhost
+  SSE port served the entire clide command surface unauthenticated,
+  bypassing the unix socket's 0600 gate; requests must now present the
+  token published in the 0600 `/ide` lock file. (T-362)
+
+- **`editor.open` / `editor.save` are now workspace-confined.** Both verbs
+  accepted absolute paths and `..` traversal verbatim — an unconfined read
+  and write primitive over IPC. They now pass the same path-safety guard as
+  `files.read`, including a symlink re-check at save time. (T-363)
+
+## [2.3.3] — 2026-06-11
+
+### Fixed
+
+- **Ticket/decision sidebars load on first open after a desktop launch.** A
+  desktop launch starts in HOME (not a git repo), and the daemon booted its
+  pql/git/files workspace there — so pql ran in HOME, hit a stale
+  `~/.pql/pql.db`, and the sidebars showed "pql … failed" until the project was
+  reopened (a manual refresh worked once the workspace had swapped to the repo).
+  The daemon now boots at the last opened project when the launch directory
+  isn't itself a repo, so pql targets the real workspace from the first request.
+  (T-352)
+
+### Changed
+
+- **Minimum toolchain raised to honest values.** `pubspec.yaml` now declares
+  Flutter `>=3.35.0` / Dart `>=3.9.0` (was `3.19.0` / `3.5.0`) — the real
+  minimums our deps already required (`alchemist` needs Flutter 3.32; Dart 3.9
+  ships in Flutter 3.35). The exact build toolchain is pinned in `.fvmrc`
+  (Flutter 3.44.1). Moving to the Dart 3.9 language level reformatted the tree
+  to the new "tall" style and adopted two new lints (`unnecessary_underscores`,
+  `use_null_aware_elements`). (T-353)
+
+### Security
+
+- **Dependency audit + refresh.** Reviewed every pinned and transitive
+  dependency against the GitHub Advisory Database / OSV (Pub ecosystem) — no
+  advisory affects any current or candidate version. Refreshed the safe pins:
+  `ffi` 2.1.3→2.2.0, `jovial_svg` 1.1.26→1.1.30 (pulls `jovial_misc` 0.10.0 +
+  `xml` 7.0.1), `mocktail` 1.0.4→1.0.5, and `markdown` 7.2.2→7.3.1 (unblocked by
+  the Dart 3.9 floor below). Deliberately held with reasons in `pubspec.yaml`:
+  `alchemist` (0.13 golden churn), `test` (Flutter-SDK locked). (T-353)
+- **Supply-chain gate (`make security`).** A new `security` target runs
+  `osv-scanner` over `pubspec.lock` and fails if any resolved dependency has a
+  known advisory — a hard gate on top of `dart pub`'s passive, non-failing
+  advisory print. Intended for the CI PR-merge pipeline (kept out of
+  `push-check` so dev machines don't need the scanner installed); run locally
+  any time with `make security`. (T-353)
+
+## [2.3.2] — 2026-06-11
+
+### Fixed
+
+- **Ticket and decision sidebars reliably load on first open (real fix).** The
+  2.3.1 re-fetch-on-open helped only when a project is picked *after* the window
+  is up; with sticky-startup the project opens during boot, before the panes
+  mount, so they never saw the event. The underlying cause was a race: the boot
+  IPC-server swap (to the launch CWD) and the project-open swap (to the repo)
+  ran concurrently, and the late-finishing boot swap could clobber the repo
+  bind — leaving the daemon's pql/git/files pointed at the launch directory
+  (HOME) and the sidebars erroring on a stale/global pql.db. Swaps are now
+  serialized so the repo bind always wins. (T-352)
+
 ## [2.3.1] — 2026-06-10
 
 ### Fixed

CLAUDE.md

@@ -9,7 +9,7 @@ An IDE for Claude Code CLI. Single Flutter package at the repo root.
 - **`lib/`** — all Dart code. Subsystem handlers (`lib/src/daemon/`, `lib/src/pty/`, `lib/src/ipc/`, `lib/src/git/`, `lib/src/pql/`), kernel services (`lib/kernel/`), UI widgets (`lib/widgets/`), built-in extensions (`lib/builtin/`), and the extension framework (`lib/extension/`). The Flutter app hosts the IPC server in-process (D-56). PTY spawning uses Dart FFI `posix_openpt()` + `posix_spawn()` directly.
 - **[`pql`](https://github.com/postmeridiem/pql)** — external supporter tool. Clide wraps it for every query surface; never re-implements it.
 
-tmux owns Claude session persistence (D-41) — the app re-attaches on restart via `tmux new-session -A`. Native rendering — markdown, canvas, graph — is Dart/Flutter (`CustomPaint` + widgets), not third-party packages.
+Claude session persistence is `--resume <session-id>` against Claude Code's transcript files (D-77, superseding the original tmux-backed D-41) — the app re-attaches on restart, no tmux required. Native rendering — markdown, canvas, graph — is Dart/Flutter (`CustomPaint` + widgets), not third-party packages.
 
 Design doc: [`docs/initial-plan.md`](docs/initial-plan.md). Decisions: [`governance/`](governance/) (`D-NNN` confirmed, `Q-NNN` open, `R-NNN` rejected — see [`governance/README.md`](governance/README.md)). Python Textual predecessor under [`legacy/`](legacy/).
 

Makefile

@@ -148,7 +148,7 @@ changelog-gate: ## Changelog concision gate — fails on `## [Unreleased]` bulle
 	ci/changelog_gate.sh
 
 .PHONY: smoke-bundle
-smoke-bundle: ## Build Linux release bundle and run it under xvfb for 5s.
+smoke-bundle: gen-build-info ## Build Linux release bundle and run it under xvfb for 5s.
 	ci/smoke_bundle.sh
 
 # -- web UI harness ------------------------------------------------------
@@ -182,6 +182,10 @@ build-linux: gen-build-info ## flutter build linux (desktop bundle).
 build-macos: gen-build-info ## flutter build macos (desktop bundle).
 	flutter build macos
 
+.PHONY: build-windows
+build-windows: gen-build-info ## flutter build windows (desktop bundle).
+	flutter build windows
+
 # -- install / uninstall -----------------------------------------------------
 
 # Install prefix. Bundle lands at $(INSTALL_PREFIX)/clide/ with a
@@ -196,6 +200,9 @@ ifeq ($(FLUTTER_OS),linux)
 else ifeq ($(FLUTTER_OS),macos)
   BUNDLE_DIR := build/macos/Build/Products/Release/clide.app
   CLI_BUNDLE_DEST := $(BUNDLE_DIR)/Contents/MacOS/clide-cli
+else ifeq ($(FLUTTER_OS),windows)
+  BUNDLE_DIR := build/windows/x64/runner/Release
+  CLI_BUNDLE_DEST := $(BUNDLE_DIR)/clide-cli.exe
 endif
 
 ICON_SIZES := 16 32 48 128 192 256 512
@@ -291,7 +298,11 @@ dugite-clean: ## Remove the dugite-native directory.
 # target picks up whatever `cc` is on PATH.
 
 CLIDE_CLI_SRC := native/clide-cli/clide.c
-CLIDE_CLI_BIN := native/$(if $(filter Darwin,$(shell uname -s)),macos,linux)-$(shell uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/')/clide
+ifeq ($(FLUTTER_OS),windows)
+  CLIDE_CLI_BIN := native/windows-x64/clide.exe
+else
+  CLIDE_CLI_BIN := native/$(if $(filter Darwin,$(shell uname -s)),macos,linux)-$(shell uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/')/clide
+endif
 CC ?= cc
 
 .PHONY: clide-cli
@@ -299,7 +310,11 @@ clide-cli: $(CLIDE_CLI_BIN) ## Compile the C `clide` shell client.
 
 $(CLIDE_CLI_BIN): $(CLIDE_CLI_SRC)
 	@mkdir -p $(dir $(CLIDE_CLI_BIN))
+ifeq ($(FLUTTER_OS),windows)
+	ci/build_cli_windows.sh
+else
 	$(CC) -std=c99 -O2 -Wall -Wextra -o $(CLIDE_CLI_BIN) $(CLIDE_CLI_SRC)
+endif
 	@echo "==> built $(CLIDE_CLI_BIN)"
 
 .PHONY: clide-cli-clean
@@ -309,8 +324,8 @@ clide-cli-clean: ## Remove the compiled C `clide` client.
 # -- security -------------------------------------------------------------
 
 .PHONY: security
-security: ## Dart advisory review.
+security: ## Supply-chain gate — osv-scanner over pubspec.lock (CI PR-merge pipeline; run locally on demand). Fails on a known advisory.
-	@echo "security: Dart advisories reviewed manually before pubspec.yaml bumps."
+	ci/osv_scan.sh
 
 # -- pre-push gate --------------------------------------------------------
 
@@ -319,6 +334,10 @@ decisions-validate: ## Parser dry-run over governance/{decisions,questions,rejec
 	pql decisions validate
 
 .PHONY: push-check
+# NOTE: the `security` (osv-scanner) gate is deliberately NOT in push-check —
+# it runs in the CI PR-merge pipeline (where the scanner is provisioned) so we
+# don't force every dev machine to install osv-scanner. Run it locally any time
+# with `make security`.
 push-check: decisions-validate changelog-gate test-coverage coverage-gate test-core ## Pre-push gate (fast — <2 min target). Order is fail-fast: instant gates (decisions, changelog) first, then the coverage suite + gate (the expensive, most-likely-to-fail stage) BEFORE test-core — a coverage miss aborts here instead of after running everything, so a fix doesn't force a full re-run of the rest. test-coverage already runs the a11y suite (test/a11y), so no separate test-a11y pass.
 
 .PHONY: push-check-full

assets/keymaps/default.yaml

@@ -58,8 +58,10 @@ bindings:
   # only claims ctrl+p for selectPrevious `when: palette.open`, so this
   # is conflict-free. Arrow/enter/escape inside the overlay are handled
   # locally by the widget.
+  # `shift shift` (double-tap) is the JetBrains "Search Everywhere" gesture;
+  # clide aliases it to the quick-open finder across all presets (T-341).
   - intent: quickOpen.open
-    keys: [ctrl+p, meta+p]
+    keys: [ctrl+p, meta+p, shift shift]
     when: "!palette.open"
   # Nav stays on arrows/ctrl+n (not ctrl+p — that's the open chord and
   # would collide while the overlay is up).

assets/keymaps/jetbrains.yaml

@@ -12,11 +12,12 @@
 # IntelliJ's editor-scoped contexts have no producer yet, so global chords
 # stay ungated (they're global in IntelliJ too).
 #
+# "Search Everywhere" (double-Shift) maps to clide's quick-open finder via
+# the `shift shift` double-tap gesture (T-341) — see the quick-open binding.
+#
 # Not bound — no clide command analogue (kept out of scope per the ticket):
 # Run (Shift+F10), Debug (Shift+F9), Rename/Refactor (Shift+F6), Settings
-# (Ctrl+Alt+S). And "Search Everywhere" (double-Shift) is not expressible by
+# (Ctrl+Alt+S).
-# the current chord matcher (bare/double modifiers unsupported) — tracked by
-# T-341; Go to File / Find Action below are the practical stand-ins.
 
 name: jetbrains
 
@@ -52,8 +53,10 @@ bindings:
   # -- Quick open: Go to File / Go to Class / Recent Files --------------
   # win/linux: Ctrl+Shift+N, Ctrl+N, Ctrl+E.  mac: Cmd+Shift+O, Cmd+O,
   # Cmd+E. clide has one fuzzy file finder, so all land on quick-open.
+  # `shift shift` (double-tap) is IntelliJ's "Search Everywhere"; clide
+  # aliases it to the quick-open finder (T-341).
   - intent: quickOpen.open
-    keys: [ctrl+shift+n, ctrl+n, ctrl+e, meta+shift+o, meta+o, meta+e]
+    keys: [ctrl+shift+n, ctrl+n, ctrl+e, meta+shift+o, meta+o, meta+e, shift shift]
     when: "!palette.open"
   - intent: quickOpen.selectNext
     keys: down

assets/keymaps/vim.yaml

@@ -34,8 +34,9 @@ bindings:
   - intent: dismiss
     keys: escape
     when: palette.open
+  # `shift shift` (double-tap) aliases to quick-open across presets (T-341).
   - intent: quickOpen.open
-    keys: [ctrl+p, meta+p]
+    keys: [ctrl+p, meta+p, shift shift]
     when: "!palette.open"
   - intent: quickOpen.selectNext
     keys: [down, ctrl+n]
@@ -62,6 +63,71 @@ bindings:
   - intent: text.scaleReset
     keys: [ctrl+0, meta+0]
 
+  # ---- Pane navigation (non-editor panes) ------------------------------
+  # When a non-editor pane holds focus (file tree, conversation, lists), the
+  # same motion keys mean NAVIGATION, not buffer edits (T-406). The
+  # `!editor.focused` guard keeps these out of the editor's way; the editor
+  # publishes `editor.focused` while it has focus. These MUST precede the
+  # editor motions below — the resolver takes the first matching binding in
+  # file order, so with a pane focused (editor.focused false) nav wins, and
+  # with the editor focused the `!editor.focused` clause fails and the buffer
+  # motion below wins. Each pane runs its own SequenceMatcher (PaneKeyNav).
+  - intent: nav.down
+    keys: j
+    when: "vim.normal && !editor.focused"
+  - intent: nav.up
+    keys: k
+    when: "vim.normal && !editor.focused"
+  - intent: nav.pageDown
+    keys: ctrl+d
+    when: "vim.normal && !editor.focused"
+  - intent: nav.pageUp
+    keys: ctrl+u
+    when: "vim.normal && !editor.focused"
+  - intent: nav.top
+    keys: "g g" # gg
+    when: "vim.normal && !editor.focused"
+  - intent: nav.bottom
+    keys: shift+g # G
+    when: "vim.normal && !editor.focused"
+  - intent: nav.expandOrRight
+    keys: l
+    when: "vim.normal && !editor.focused"
+  - intent: nav.collapseOrLeft
+    keys: h
+    when: "vim.normal && !editor.focused"
+  - intent: nav.activate
+    keys: [o, enter]
+    when: "vim.normal && !editor.focused"
+
+  # ---- ctrl+w window-command family (T-404) ----------------------------
+  # Multi-chord sequences resolved by the GLOBAL matcher (root_shell), so they
+  # work from any focus. Bare ctrl+w still closes the editor after the ambiguity
+  # timeout (the editor.close binding below / contributions layer). The 3-column
+  # clide layout approximates vim's window grid: h/l focus left/right panels,
+  # j toggles the dock, o is "only" (focus mode), q/c close the editor.
+  - intent: command:panel.focus.left
+    keys: ctrl+w h
+    when: "vim.normal || vim.visual"
+  - intent: command:panel.focus.right
+    keys: ctrl+w l
+    when: "vim.normal || vim.visual"
+  - intent: command:dock.toggle
+    keys: ctrl+w j
+    when: "vim.normal || vim.visual"
+  - intent: focus.nextPanel
+    keys: [ctrl+w w, ctrl+w ctrl+w]
+    when: "vim.normal || vim.visual"
+  - intent: focus.previousPanel
+    keys: ctrl+w shift+w # ctrl+w W
+    when: "vim.normal || vim.visual"
+  - intent: command:panel.focusMode
+    keys: ctrl+w o
+    when: "vim.normal || vim.visual"
+  - intent: command:editor.close
+    keys: [ctrl+w q, ctrl+w c]
+    when: "vim.normal || vim.visual"
+
   # ---- Mode transitions ------------------------------------------------
   - intent: command:vim.mode.visual
     keys: v

assets/keymaps/vscode.yaml

@@ -51,8 +51,9 @@ bindings:
     when: palette.open
 
   # -- Quick open / Go to File (Ctrl+P) ---------------------------------
+  # `shift shift` (double-tap) aliases to quick-open across presets (T-341).
   - intent: quickOpen.open
-    keys: [ctrl+p, meta+p]
+    keys: [ctrl+p, meta+p, shift shift]
     when: "!palette.open"
   - intent: quickOpen.selectNext
     keys: [down, ctrl+n]

assets/licenses.yaml

@@ -39,7 +39,7 @@ self:
   # Auto-synced from pubspec.yaml `version:` by `make gen-build-info`
   # (runs implicitly on every build/run/test). Don't hand-edit; bump
   # pubspec instead.
-  version: "2.3.1"
+  version: "2.5.0"
   homepage: https://github.com/postmeridiem/clide
   license: MIT
   license_file: assets/LICENSE
@@ -116,7 +116,7 @@ dependencies:
 
   - name: ffi
     kind: dart-package
-    version: "2.1.3"
+    version: "2.2.0"
     homepage: https://pub.dev/packages/ffi
     license: BSD-3-Clause
     purpose: >-
@@ -171,7 +171,7 @@ dependencies:
 
   - name: jovial_svg
     kind: dart-package
-    version: "1.1.26"
+    version: "1.1.30"
     homepage: https://pub.dev/packages/jovial_svg
     license: BSD-3-Clause
     purpose: >-
@@ -182,7 +182,7 @@ dependencies:
 
   - name: markdown
     kind: dart-package
-    version: "7.2.2"
+    version: "7.3.1"
     homepage: https://pub.dev/packages/markdown
     license: BSD-3-Clause
     purpose: >-
@@ -205,15 +205,6 @@ dependencies:
 # Build-time-only dependencies — test runners, mocks, lints. Tracked
 # here for audit completeness; NOT rendered in the About screen.
 dev_dependencies:
-  - name: mocktail
-    kind: dart-package
-    version: "1.0.4"
-    homepage: https://pub.dev/packages/mocktail
-    license: MIT
-    purpose: >-
-      Mocks at IO / IPC boundaries. ChangeNotifier facades use
-      hand-rolled fakes instead of mocks (D-025).
-
   - name: alchemist
     kind: dart-package
     version: "0.12.1"

ci/build_cli_windows.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+# Build the C `clide` client with MSVC on Windows (Git Bash / MSYS).
+# Wrapped by `make clide-cli` — don't run directly (see CLAUDE.md
+# tooling discipline). Finds the VC++ toolset via vswhere, loads the
+# x64 dev environment, compiles:
+#   native/clide-cli/clide.c -> native/windows-x64/clide.exe
+# ws2_32.lib supplies winsock (AF_UNIX socket support).
+set -e
+
+VSWHERE="/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe"
+if [ ! -x "$VSWHERE" ]; then
+  echo "vswhere.exe not found — install Visual Studio (Build Tools) with the C++ workload" >&2
+  exit 1
+fi
+VSROOT=$("$VSWHERE" -products '*' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath | tr -d '\r')
+if [ -z "$VSROOT" ]; then
+  echo "no Visual Studio C++ x64 toolset found (vswhere returned nothing)" >&2
+  exit 1
+fi
+
+mkdir -p native/windows-x64
+# A generated .bat sidesteps the unwinnable sh->cmd quote escaping for
+# the space-laden VS path. //c keeps MSYS from path-mangling cmd's /c
+# switch; /Fo drops the .obj next to the .exe so the repo root stays
+# clean.
+BAT=$(mktemp --suffix=.bat)
+trap 'rm -f "$BAT"' EXIT
+cat > "$BAT" <<EOF
+@call "$VSROOT\\Common7\\Tools\\VsDevCmd.bat" -arch=amd64 -no_logo
+@cl /nologo /O2 /W4 /D_CRT_SECURE_NO_WARNINGS native\\clide-cli\\clide.c /Fonative\\windows-x64\\ /Fe:native\\windows-x64\\clide.exe ws2_32.lib
+EOF
+cmd.exe //c "$(cygpath -w "$BAT")"
+rm -f native/windows-x64/clide.obj

ci/osv_scan.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Supply-chain gate — fails the push if any resolved dependency in
+# pubspec.lock has a known advisory (OSV / GitHub Advisory Database).
+#
+# Complements `dart pub get`'s passive advisory print (informational,
+# non-failing) with a hard, fail-closed gate. Native deps (dugite,
+# tree-sitter, wasmtime) are vendored by SHA and not in a lockfile OSV
+# reads — they're reviewed separately on bump (D-42, CLAUDE.md supply chain).
+set -euo pipefail
+cd "$(dirname "$0")/.."
+
+# Resolve osv-scanner: PATH first, then a brew prefix (the git pre-push hook
+# may run with a leaner PATH than the dev's interactive shell).
+OSV="$(command -v osv-scanner || true)"
+if [[ -z "$OSV" ]] && command -v brew >/dev/null 2>&1; then
+  cand="$(brew --prefix 2>/dev/null)/bin/osv-scanner"
+  [[ -x "$cand" ]] && OSV="$cand"
+fi
+if [[ -z "$OSV" ]]; then
+  echo "==> osv gate: osv-scanner not found on PATH." >&2
+  echo "    Install it:  brew install osv-scanner" >&2
+  echo "    (or:         go install github.com/google/osv-scanner/v2/cmd/osv-scanner@latest)" >&2
+  exit 2
+fi
+
+echo "==> osv gate: scanning pubspec.lock for known advisories"
+if "$OSV" scan source --lockfile=pubspec.lock; then
+  echo "==> osv gate OK: no known advisories"
+else
+  echo "==> osv gate FAIL: a dependency has a known advisory (see above)." >&2
+  echo "    Bump the affected package (+ its assets/licenses.yaml entry), or" >&2
+  echo "    document an explicit, justified exception before pushing." >&2
+  exit 1
+fi

ci/test.sh

@@ -35,7 +35,12 @@ echo "==> dart test (pty — unreliable under the flutter test runner; serial)"
 # --concurrency=1: these spawn real PTYs and compete for fds when run in
 # parallel, which flaked them (registry/session). Serialize — the proper fix
 # for resource-bound tests, vs. the old per-test `retry:` band-aid. (T-193)
-dart test -r "$REPORTER" --concurrency=1 --tags pty test/pty/session_test.dart test/panes/registry_test.dart
+# windows_pty_test is the ConPTY sibling of session_test; each suite
+# self-skips off-platform, so the union always contributes tests.
+# --timeout 60s matches the flutter lines below: a wedged PTY test (e.g. a
+# ConPTY reader blocked forever in ReadFile) fails fast instead of hanging the
+# whole serial run.
+dart test -r "$REPORTER" --concurrency=1 --timeout 60s --tags pty test/pty/session_test.dart test/panes/registry_test.dart test/pty/windows_pty_test.dart
 
 # The parallel pool excludes both pty (runs under dart test, above) and
 # serial-tagged tests (concurrency-vulnerable — run in their own --concurrency=1

ci/test_integration.sh

@@ -3,10 +3,16 @@
 # start" regression gate. Flutter integration tests prefer one file at
 # a time on desktop; we iterate to avoid the "Unable to start the app"
 # error that hits when they run as a batch.
+#
+# -d linux pins the desktop device explicitly: the GitHub ubuntu-latest
+# runner exposes BOTH a linux desktop AND a chrome web device, so a bare
+# `flutter test integration_test/...` aborts with "More than one device
+# connected" before it ever compiles (the dev box / old Gitea runner only
+# had the one device, so this was latent until CI moved to GitHub).
 set -euo pipefail
 cd "$(dirname "$0")/.."
 
 for f in integration_test/*_test.dart; do
   echo "==> integration_test: $f"
-  flutter test "$f"
+  flutter test -d linux "$f"
 done

dartdoc_options.yaml

@@ -0,0 +1,17 @@
+# dartdoc configuration.
+#
+# clide is an application, not a published library — its lib/ API docs are not
+# a consumed surface. The dart-doc CI gate (.github/workflows/test.yml) exists
+# to catch real doc-comment defects: unresolved [symbol] references. That check
+# stays strict (unresolved-doc-reference is NOT ignored).
+#
+# The "broken-link" category, by contrast, is pure rendering noise here:
+#   - The README is dartdoc's landing page; its repo-relative links
+#     ([CLAUDE.md], [docs/…], [LICENSE]) are correct on GitHub but don't resolve
+#     once copied into the generated API site.
+#   - The generated Phosphor icon font (lib/widgets/src/icons/phosphor_glyphs.g.dart,
+#     1512 glyphs) produces broken cross-links to its own library page.
+# Neither is a fixable doc-quality problem, so the category is ignored.
+dartdoc:
+  ignore:
+    - broken-link

docs/claude-design/themes/clide_theme.dart

@@ -71,112 +71,112 @@ class ClideTheme {
 
   // ─── ThemeData ────────────────────────────────────────────────────────
   static ThemeData get data => ThemeData(
-        useMaterial3: true,
+    useMaterial3: true,
-        brightness: Brightness.dark,
+    brightness: Brightness.dark,
-        scaffoldBackgroundColor: _bg,
+    scaffoldBackgroundColor: _bg,
-        canvasColor: _bg,
+    canvasColor: _bg,
 
-        colorScheme: const ColorScheme.dark(
+    colorScheme: const ColorScheme.dark(
-          brightness: Brightness.dark,
+      brightness: Brightness.dark,
-          primary: _accent,
+      primary: _accent,
-          onPrimary: Color(0xFF0D1020),
+      onPrimary: Color(0xFF0D1020),
-          secondary: _synKeyword,
+      secondary: _synKeyword,
-          onSecondary: Color(0xFF0D1020),
+      onSecondary: Color(0xFF0D1020),
-          surface: _surface,
+      surface: _surface,
-          onSurface: _textHi,
+      onSurface: _textHi,
-          surfaceContainerHighest: _surfaceHi,
+      surfaceContainerHighest: _surfaceHi,
-          outline: _border,
+      outline: _border,
-          outlineVariant: _borderHi,
+      outlineVariant: _borderHi,
-          error: _err,
+      error: _err,
-          onError: Color(0xFF0D1020),
+      onError: Color(0xFF0D1020),
-        ),
+    ),
 
-        textTheme: const TextTheme(
+    textTheme: const TextTheme(
-          // Josefin Sans Light for display; JetBrains Mono for code/body.
+      // Josefin Sans Light for display; JetBrains Mono for code/body.
-          displayLarge: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 48, height: 1.1, letterSpacing: 0.2, color: _textHi),
+      displayLarge: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 48, height: 1.1, letterSpacing: 0.2, color: _textHi),
-          displayMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 34, height: 1.15, letterSpacing: 0.2, color: _textHi),
+      displayMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 34, height: 1.15, letterSpacing: 0.2, color: _textHi),
-          headlineSmall: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 20, height: 1.2, letterSpacing: 0.2, color: _textHi),
+      headlineSmall: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 20, height: 1.2, letterSpacing: 0.2, color: _textHi),
-          titleMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 14, height: 1.3, letterSpacing: 0.3, color: _text),
+      titleMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 14, height: 1.3, letterSpacing: 0.3, color: _text),
-          labelSmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w500, fontSize: 10, height: 1.2, letterSpacing: 1.0, color: _textMute),
+      labelSmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w500, fontSize: 10, height: 1.2, letterSpacing: 1.0, color: _textMute),
-          bodyMedium: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 12, height: 1.45, color: _textHi),
+      bodyMedium: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 12, height: 1.45, color: _textHi),
-          bodySmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 11, height: 1.4, color: _text),
+      bodySmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 11, height: 1.4, color: _text),
-        ),
+    ),
 
-        dividerTheme: const DividerThemeData(color: _border, thickness: 1, space: 1),
+    dividerTheme: const DividerThemeData(color: _border, thickness: 1, space: 1),
 
-        cardTheme: CardThemeData(
+    cardTheme: CardThemeData(
-          color: _surface,
+      color: _surface,
-          elevation: 0,
+      elevation: 0,
-          shape: RoundedRectangleBorder(
+      shape: RoundedRectangleBorder(
-            side: const BorderSide(color: _border),
+        side: const BorderSide(color: _border),
-            borderRadius: BorderRadius.circular(6),
+        borderRadius: BorderRadius.circular(6),
-          ),
+      ),
-          margin: EdgeInsets.zero,
+      margin: EdgeInsets.zero,
-        ),
+    ),
 
-        inputDecorationTheme: InputDecorationTheme(
+    inputDecorationTheme: InputDecorationTheme(
-          isDense: true,
+      isDense: true,
-          filled: true,
+      filled: true,
-          fillColor: _bgSunken,
+      fillColor: _bgSunken,
-          hintStyle: const TextStyle(color: _textMute),
+      hintStyle: const TextStyle(color: _textMute),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+      contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
-          border: OutlineInputBorder(
+      border: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(4),
+        borderRadius: BorderRadius.circular(4),
-            borderSide: const BorderSide(color: _border),
+        borderSide: const BorderSide(color: _border),
-          ),
+      ),
-          enabledBorder: OutlineInputBorder(
+      enabledBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(4),
+        borderRadius: BorderRadius.circular(4),
-            borderSide: const BorderSide(color: _border),
+        borderSide: const BorderSide(color: _border),
-          ),
+      ),
-          focusedBorder: OutlineInputBorder(
+      focusedBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(4),
+        borderRadius: BorderRadius.circular(4),
-            borderSide: const BorderSide(color: _accent, width: 1.5),
+        borderSide: const BorderSide(color: _accent, width: 1.5),
-          ),
+      ),
-        ),
+    ),
 
-        elevatedButtonTheme: ElevatedButtonThemeData(
+    elevatedButtonTheme: ElevatedButtonThemeData(
-          style: ElevatedButton.styleFrom(
+      style: ElevatedButton.styleFrom(
-            backgroundColor: _accent,
+        backgroundColor: _accent,
-            foregroundColor: const Color(0xFF0D1020),
+        foregroundColor: const Color(0xFF0D1020),
-            padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
+        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
-            textStyle: const TextStyle(fontFamily: 'JetBrains Mono', fontSize: 12, fontWeight: FontWeight.w500),
+        textStyle: const TextStyle(fontFamily: 'JetBrains Mono', fontSize: 12, fontWeight: FontWeight.w500),
-          ),
+      ),
-        ),
+    ),
-        textButtonTheme: TextButtonThemeData(
+    textButtonTheme: TextButtonThemeData(
-          style: TextButton.styleFrom(
+      style: TextButton.styleFrom(
-            foregroundColor: _accent,
+        foregroundColor: _accent,
-            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
+        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
-            textStyle: const TextStyle(fontFamily: 'JetBrains Mono', fontSize: 12),
+        textStyle: const TextStyle(fontFamily: 'JetBrains Mono', fontSize: 12),
-          ),
+      ),
-        ),
+    ),
 
-        // Pill-style chips (matches the Projects row in the dashboard).
+    // Pill-style chips (matches the Projects row in the dashboard).
-        chipTheme: ChipThemeData(
+    chipTheme: ChipThemeData(
-          backgroundColor: _surface,
+      backgroundColor: _surface,
-          side: const BorderSide(color: _borderHi),
+      side: const BorderSide(color: _borderHi),
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
-          labelStyle: const TextStyle(fontFamily: 'JetBrains Mono', fontSize: 11, color: _text),
+      labelStyle: const TextStyle(fontFamily: 'JetBrains Mono', fontSize: 11, color: _text),
-          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-        ),
+    ),
 
-        iconTheme: const IconThemeData(color: _textDim, size: 14),
+    iconTheme: const IconThemeData(color: _textDim, size: 14),
 
-        tooltipTheme: TooltipThemeData(
+    tooltipTheme: TooltipThemeData(
-          decoration: BoxDecoration(
+      decoration: BoxDecoration(
-            color: _surfaceHi,
+        color: _surfaceHi,
-            border: Border.all(color: _borderHi),
+        border: Border.all(color: _borderHi),
-            borderRadius: BorderRadius.circular(3),
+        borderRadius: BorderRadius.circular(3),
-          ),
+      ),
-          textStyle: const TextStyle(fontFamily: 'JetBrains Mono', fontSize: 11, color: _textHi),
+      textStyle: const TextStyle(fontFamily: 'JetBrains Mono', fontSize: 11, color: _textHi),
-        ),
+    ),
 
-        scrollbarTheme: ScrollbarThemeData(
+    scrollbarTheme: ScrollbarThemeData(
-          thumbColor: WidgetStatePropertyAll(_border),
+      thumbColor: WidgetStatePropertyAll(_border),
-          thickness: const WidgetStatePropertyAll(6),
+      thickness: const WidgetStatePropertyAll(6),
-          radius: const Radius.circular(3),
+      radius: const Radius.circular(3),
-        ),
+    ),
-      );
+  );
 }
 
 /// Raw color tokens — use when Material widgets can't carry the meaning.

docs/claude-design/themes/midnight_theme.dart

@@ -63,33 +63,33 @@ class MidnightTheme {
   );
 
   static ThemeData get data => ThemeData(
-        useMaterial3: true,
+    useMaterial3: true,
-        brightness: Brightness.dark,
+    brightness: Brightness.dark,
-        scaffoldBackgroundColor: _bg,
+    scaffoldBackgroundColor: _bg,
-        canvasColor: _bg,
+    canvasColor: _bg,
-        colorScheme: const ColorScheme.dark(
+    colorScheme: const ColorScheme.dark(
-          primary: _accent,
+      primary: _accent,
-          onPrimary: Color(0xFF0B1220),
+      onPrimary: Color(0xFF0B1220),
-          secondary: _synKeyword,
+      secondary: _synKeyword,
-          onSecondary: Color(0xFF0B1220),
+      onSecondary: Color(0xFF0B1220),
-          surface: _surface,
+      surface: _surface,
-          onSurface: _textHi,
+      onSurface: _textHi,
-          surfaceContainerHighest: _surfaceHi,
+      surfaceContainerHighest: _surfaceHi,
-          outline: _border,
+      outline: _border,
-          outlineVariant: _borderHi,
+      outlineVariant: _borderHi,
-          error: _err,
+      error: _err,
-          onError: Color(0xFF0B1220),
+      onError: Color(0xFF0B1220),
-        ),
+    ),
-        textTheme: const TextTheme(
+    textTheme: const TextTheme(
-          displayLarge: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 48, color: _textHi),
+      displayLarge: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 48, color: _textHi),
-          displayMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 34, color: _textHi),
+      displayMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 34, color: _textHi),
-          headlineSmall: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 20, color: _textHi),
+      headlineSmall: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 20, color: _textHi),
-          titleMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 14, color: _text),
+      titleMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 14, color: _text),
-          labelSmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w500, fontSize: 10, letterSpacing: 1.0, color: _textMute),
+      labelSmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w500, fontSize: 10, letterSpacing: 1.0, color: _textMute),
-          bodyMedium: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 12, height: 1.45, color: _textHi),
+      bodyMedium: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 12, height: 1.45, color: _textHi),
-          bodySmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 11, color: _text),
+      bodySmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 11, color: _text),
-        ),
+    ),
-        dividerTheme: const DividerThemeData(color: _border, thickness: 1, space: 1),
+    dividerTheme: const DividerThemeData(color: _border, thickness: 1, space: 1),
-        iconTheme: const IconThemeData(color: _textDim, size: 14),
+    iconTheme: const IconThemeData(color: _textDim, size: 14),
-      );
+  );
 }

docs/claude-design/themes/paper_theme.dart

@@ -65,33 +65,33 @@ class PaperTheme {
   );
 
   static ThemeData get data => ThemeData(
-        useMaterial3: true,
+    useMaterial3: true,
-        brightness: Brightness.light,
+    brightness: Brightness.light,
-        scaffoldBackgroundColor: _bg,
+    scaffoldBackgroundColor: _bg,
-        canvasColor: _bg,
+    canvasColor: _bg,
-        colorScheme: const ColorScheme.light(
+    colorScheme: const ColorScheme.light(
-          primary: _accent,
+      primary: _accent,
-          onPrimary: Color(0xFFFBF8F1),
+      onPrimary: Color(0xFFFBF8F1),
-          secondary: _info,
+      secondary: _info,
-          onSecondary: Color(0xFFFBF8F1),
+      onSecondary: Color(0xFFFBF8F1),
-          surface: _surface,
+      surface: _surface,
-          onSurface: _textHi,
+      onSurface: _textHi,
-          surfaceContainerHighest: _surfaceHi,
+      surfaceContainerHighest: _surfaceHi,
-          outline: _border,
+      outline: _border,
-          outlineVariant: _borderHi,
+      outlineVariant: _borderHi,
-          error: _err,
+      error: _err,
-          onError: Color(0xFFFBF8F1),
+      onError: Color(0xFFFBF8F1),
-        ),
+    ),
-        textTheme: const TextTheme(
+    textTheme: const TextTheme(
-          displayLarge: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 48, color: _textHi),
+      displayLarge: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 48, color: _textHi),
-          displayMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 34, color: _textHi),
+      displayMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 34, color: _textHi),
-          headlineSmall: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 20, color: _textHi),
+      headlineSmall: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 20, color: _textHi),
-          titleMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 14, color: _text),
+      titleMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 14, color: _text),
-          labelSmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w500, fontSize: 10, letterSpacing: 1.0, color: _textDim),
+      labelSmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w500, fontSize: 10, letterSpacing: 1.0, color: _textDim),
-          bodyMedium: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 12, height: 1.45, color: _textHi),
+      bodyMedium: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 12, height: 1.45, color: _textHi),
-          bodySmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 11, color: _text),
+      bodySmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 11, color: _text),
-        ),
+    ),
-        dividerTheme: const DividerThemeData(color: _border, thickness: 1, space: 1),
+    dividerTheme: const DividerThemeData(color: _border, thickness: 1, space: 1),
-        iconTheme: const IconThemeData(color: _text, size: 14),
+    iconTheme: const IconThemeData(color: _text, size: 14),
-      );
+  );
 }

docs/claude-design/themes/terminal_theme.dart

@@ -65,34 +65,34 @@ class TerminalTheme {
   );
 
   static ThemeData get data => ThemeData(
-        useMaterial3: true,
+    useMaterial3: true,
-        brightness: Brightness.dark,
+    brightness: Brightness.dark,
-        scaffoldBackgroundColor: _bg,
+    scaffoldBackgroundColor: _bg,
-        canvasColor: _bg,
+    canvasColor: _bg,
-        colorScheme: const ColorScheme.dark(
+    colorScheme: const ColorScheme.dark(
-          primary: _accent,
+      primary: _accent,
-          onPrimary: Color(0xFF000000),
+      onPrimary: Color(0xFF000000),
-          secondary: _info,
+      secondary: _info,
-          onSecondary: Color(0xFF000000),
+      onSecondary: Color(0xFF000000),
-          surface: _surface,
+      surface: _surface,
-          onSurface: _textHi,
+      onSurface: _textHi,
-          surfaceContainerHighest: _surfaceHi,
+      surfaceContainerHighest: _surfaceHi,
-          outline: _border,
+      outline: _border,
-          outlineVariant: _borderHi,
+      outlineVariant: _borderHi,
-          error: _err,
+      error: _err,
-          onError: Color(0xFF000000),
+      onError: Color(0xFF000000),
-        ),
+    ),
-        textTheme: const TextTheme(
+    textTheme: const TextTheme(
-          displayLarge: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 48, color: _textHi),
+      displayLarge: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 48, color: _textHi),
-          displayMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 34, color: _textHi),
+      displayMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w300, fontSize: 34, color: _textHi),
-          headlineSmall: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 20, color: _textHi),
+      headlineSmall: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 20, color: _textHi),
-          titleMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 14, color: _text),
+      titleMedium: TextStyle(fontFamily: 'Josefin Sans', fontWeight: FontWeight.w400, fontSize: 14, color: _text),
-          // Terminal mockups go full-mono even for display.
+      // Terminal mockups go full-mono even for display.
-          labelSmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w500, fontSize: 10, letterSpacing: 1.0, color: _textMute),
+      labelSmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w500, fontSize: 10, letterSpacing: 1.0, color: _textMute),
-          bodyMedium: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 12, height: 1.45, color: _textHi),
+      bodyMedium: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 12, height: 1.45, color: _textHi),
-          bodySmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 11, color: _text),
+      bodySmall: TextStyle(fontFamily: 'JetBrains Mono', fontWeight: FontWeight.w400, fontSize: 11, color: _text),
-        ),
+    ),
-        dividerTheme: const DividerThemeData(color: _border, thickness: 1, space: 1),
+    dividerTheme: const DividerThemeData(color: _border, thickness: 1, space: 1),
-        iconTheme: const IconThemeData(color: _textDim, size: 14),
+    iconTheme: const IconThemeData(color: _textDim, size: 14),
-      );
+  );
 }

docs/claude-design/tokens/clide_tokens.dart

@@ -10,13 +10,7 @@
 import 'dart:ui' show Color;
 
 class ClideTheme {
-  const ClideTheme({
+  const ClideTheme({required this.name, required this.dark, required this.subtitle, required this.palette, required this.syntax});
-    required this.name,
-    required this.dark,
-    required this.subtitle,
-    required this.palette,
-    required this.syntax,
-  });
   final String name;
   final bool dark;
   final String subtitle;

fable-ous.md

@@ -0,0 +1,428 @@
+# fable-ous.md
+
+*A fable about clide, as told by Fable.*
+
+*Produced by 13 parallel subsystem reviewers reading ~58k LOC of Dart, ~100 raw
+findings put through 70 adversarial verification passes (exactly one finding was
+refuted — it had missed D-14), 5 feature-ideation lenses, and a full read of the
+pql planning vault: 94 confirmed decisions, 24 open questions, 11 rejected
+alternatives, 358 tickets. Everything below cites real file:line evidence that a
+skeptical second agent re-read and failed to knock down.*
+
+---
+
+## TL;DR scoreboard
+
+| Dimension | Verdict |
+|---|---|
+| Build health | **Green.** `make analyze` 0 issues, 1383 tests pass, format clean, coverage 95.30% over the 95 floor |
+| Documentation discipline | **Best-in-class.** Near-every file cites its D-NNN/T-NNN; zero TODO/FIXME debt in 58k LOC |
+| Honesty | **High.** CHANGELOG claims verified against code; stubs self-describe as stubs |
+| Real bugs found | ~14 distinct high-severity, ~35 medium — mostly in process lifecycle, a11y, and terminal conformance |
+| Systemic risks | Broadcast-streams-without-replay, silent `catch (_)`, kernel lookup in `dispose()`, copy-paste drift |
+| Release process | **Stalled.** No git tag since v2.1.0 despite five CHANGELOG releases; `ci/release.sh` is a stub |
+| Killer-feature headroom | Enormous — the moats (owned agent loop, owned renderer, pql vault) are real and barely exploited |
+
+The fable in one sentence: **a castle with exceptional masonry, a few unlocked
+side doors, and a dragon hoard of features in the basement nobody has spent yet.**
+
+---
+
+## Part I — The state of the realm (what's genuinely excellent)
+
+Credit where due, because this codebase does several things better than most
+production repos:
+
+- **Governance traceability is real, not ceremonial.** Nearly every non-trivial
+  declaration carries its ticket/decision id. Multiple reviewers independently
+  called it "the best I've seen at this scale." Code-to-decision drift is
+  *auditable from the code itself* — and indeed most drift findings below were
+  found exactly that way.
+- **Schema-validated IPC dispatch (D-74)** is beautifully executed: schemas
+  co-registered with handlers, the MCP tool surface and `clide capabilities`
+  both generated from the same registry (`lib/src/daemon/dispatcher.dart:90-137`)
+  so three surfaces cannot drift apart.
+- **The keymap subsystem (D-82)** — layered precedence, headless
+  `SequenceMatcher`, clock-injected `ModifierTapTracker` — is exemplary,
+  near-fully test-mirrored design.
+- **`ClideTappable`, the anchored-overlay/menu family (D-88), reduced-motion
+  honoring in every animated primitive** — the owned widget layer is coherent
+  and disciplined.
+- **Battle scars are encoded where they happened.** `pumpAsync` documents why
+  `pumpAndSettle` wedges; `KernelFixture` encodes the T-280 teardown-hang fix;
+  flake postmortems live as comments in the test that almost shipped them.
+- **Security instincts**: 0600 socket + live-listener probe before unlink, git
+  argv hardening with `--` terminators, `path_safety.dart` documenting its
+  threat models inline, workspace-relative binary resolution forbidden (T-98).
+- **Zero TODO/FIXME/HACK** across the tree. The clean-board policy is lived.
+
+Patterns worth *extending* (the reviewers kept wishing other code did this):
+the coalesced-notify `Timer(Duration.zero)` trick in `ConversationController`,
+the pure-Dart-core/thin-Flutter-shell split, and `RecordingEventSink`-style
+event-driven test waits.
+
+---
+
+## Part II — The bestiary (bugs I would fix, in order)
+
+### 🐉 Dragons (high severity, verified, fix this week)
+
+1. **Every naturally-exited PTY leaks its master fd — forever.**
+   `lib/src/pty/native_pty.dart:444-450` — on child EOF, `_reap()` sets
+   `_dead = true` but never closes `_fd`; a later `close()` short-circuits at
+   `if (_dead) return;` (line 460) so `_nativeClose(_fd)` (line 477) never runs.
+   Two reviewers found this independently. Every terminal/Claude pane whose
+   child exits on its own leaks an fd and a pty device for the life of the app.
+
+2. **The Claude child process is observed only via stdout.** Three reviewers
+   converged here. `lib/builtin/claude/src/stream_json_session.dart:43-78` —
+   stderr is *never drained* (≥64KB of `--verbose` spew = pipe fills = child
+   blocks mid-turn = the flagship pane wedges with zero diagnostics), and
+   nothing watches `exitCode` or `onDone` (line 303), so a crashed/dead
+   session just looks… thoughtful. Drain stderr into a ring buffer, surface a
+   terminal `SessionEnded` state. This also intersects T-283 (no resume
+   timeout/fallback).
+
+3. **The MCP HTTP server exposes the entire dispatcher with zero auth.**
+   `lib/src/ipc/mcp_server.dart:138-195`, started unconditionally at boot
+   (`lib/main.dart:174-180`). D-71's threat model ("another user on the same
+   host should not drive my IDE") is enforced with 0600 on the unix socket —
+   and then bypassed wholesale by an unauthenticated localhost HTTP port that,
+   since D-86, serves *every* clide verb as a tool. Generate a token in the
+   lock file (Claude Code's own `/ide` lock format has a slot for it), require
+   the header.
+
+4. **`editor.open`/`editor.save` skip path confinement entirely.**
+   `lib/src/editor/registry.dart:215-219` returns absolute paths verbatim, no
+   `..` normalization, no `path_safety` call — an unconfined read *and write*
+   primitive over IPC while `files.read` is carefully guarded. Same family:
+   **`search.replace` silently ignores its include/exclude globs**
+   (`lib/src/search/replace_engine.dart:124-143`) and will happily rewrite
+   files outside the filter the user typed; and **`listDir`'s symlink
+   detection is dead code** (`lib/src/files/listing.dart:46-54` — `stat()`
+   follows links, so `isSymlink` is always false) which means `walkFiles`
+   descends symlinked dirs the docs claim it skips.
+
+5. **Closing a terminal pane never closes the shell.**
+   `lib/builtin/terminal/src/terminal_pane.dart:131-137` calls
+   `ClideKernel.of(context)` from `dispose()` — illegal ancestor lookup,
+   swallowed by `catch (_)` — so `pane.close` is never sent and the backend
+   PTY + daemon pane leak. The same idiom leaks the settings listener in every
+   disposed `ClaudePane` (`claude_pane.dart:460-466`). Combined with dragon #1
+   this is a two-stage leak pipeline. Cache the kernel ref in
+   `didChangeDependencies`, delete the catch-all.
+
+6. **Project switch leaks the entire previous workspace.**
+   `lib/main.dart:335-344` — a new dispatcher gets fresh `PaneRegistry`,
+   `FilesService`, `EditorRegistry`, etc., but nothing calls the old set's
+   `shutdown()` methods (which exist and have zero callers). Old watchers keep
+   emitting into the new workspace's bus.
+
+7. **T-274's root cause, found and verified:** the status bar is empty because
+   `statusStream` is a plain broadcast controller — the `system/init` event
+   fires while `spawn()` is still awaiting a 256KB transcript-tail read, before
+   the pane ever subscribes (`claude_pane.dart:322`,
+   `session_orchestrator.dart:222-225`). Seed from `session.status` on bind, or
+   make it replay-latest. (The broadcast-without-replay shape is a recurring
+   bug factory — see Part III.)
+
+8. **Auto-scroll yanks a scrolled-up reader to the bottom on every streamed
+   token.** `conversation_view.dart:268-277` — the `_atBottom` pin exists but
+   is only consulted on viewport *resize*, not on new items. Anyone reading
+   earlier output during a long streaming reply is dragged to the bottom
+   continuously. One-line gate + the missing twin test.
+
+9. **The terminal can crash on garbled output.** SGR 38/48 extended-color
+   parsing does unguarded `params[i + 1]` lookahead
+   (`lib/src/terminal/src/core/escape/parser.dart:501-516`) — `printf '\e[38m'`
+   throws RangeError inside `Terminal.write`. An emulator must never throw on
+   hostile bytes. While in there: colon-form SGR sub-parameters are mangled
+   into bogus params.
+
+10. **A11y has drifted despite being a Tier-0 contract.** Two independent
+    verified findings: `ClideCollapserCard`'s `excludeSemantics: true` wipes
+    *every expanded child* from the a11y tree
+    (`lib/widgets/src/clide_collapser_card.dart:92-101`) — a screen-reader user
+    can expand a run and hear nothing; and the three a11y gate tests
+    hand-enumerate their subjects and have measurably fallen behind `lib/`
+    (contrast checks fewer themes than `main.dart:443-454` loads; i18n checks 4
+    of 8 namespaces). The gates stay green while covering less. Make `lib/`
+    export the canonical lists and iterate them in the gates.
+
+### 🦂 Scorpions (medium — real, will sting eventually)
+
+- **D-72's "serial dispatch" isn't.** `lib/src/ipc/server.dart:151-180` uses an
+  `async` onData without pausing the subscription — pipelined requests
+  interleave, and the shared `StringBuffer` framing can drop/double lines.
+  `client.cast<List<int>>().transform(utf8.decoder).transform(LineSplitter())`
+  + `await for` fixes framing, UTF-8 split chunks, and serialization at once.
+- **Split-chunk UTF-8 corruption is endemic at byte→String seams**: the
+  terminal's only ingestion API is `write(String)` (`terminal.dart:218`) so
+  both consumers decode per-chunk; `FileTailFollower` starts mid-character by
+  construction. Add `writeBytes()` with a persistent chunked decoder.
+- **`Orchestrator.spawn()` races itself** — check-then-act across two awaits;
+  concurrent spawns for one id leak a live `claude` process
+  (`session_orchestrator.dart:191-249`). Hold a `Map<String, Future<ManagedSession>>`.
+- **Fork panes misbehave on `/clear`, `/resume`, `/fork`** —
+  `widget.forkSourceId` wins forever, so `/clear` *re-forks the original
+  conversation* instead of clearing (`claude_pane.dart:266-281`).
+- **Settings persistence corrupts maps-inside-lists on write**
+  (`settings.dart:199-219` emits `toString()`), breaking the documented keymap
+  overlay across restarts; writes are non-atomic and a parse failure silently
+  resets all settings.
+- **Extension activation isn't transactional** — a throw mid-contribution
+  leaves contributions mounted while the extension records as failed; retry
+  double-applies (`extensions_manager.dart:133-192`). Plus: disabling an
+  extension ignores dependents, and registries clobber silently on id
+  collision — fine among curated builtins, hazardous the day Tier-6 Lua lands.
+- **Terminal conformance debt** (the fork fixes what it trips over but has no
+  vttest-style suite): HTS is a no-op (`isSetAt` instead of `setAt`,
+  `terminal.dart:423`), DECCKM is tracked but never consumed, legacy mouse rows
+  are off-by-one *and the test enshrines the bug*, CPR replies 0-based where
+  every real terminal is 1-based, scrollback is maintained but structurally
+  unreachable (`ViewportOffset.zero()` pinned every build,
+  `terminal_view.dart:224`).
+- **Markdown renderer**: hard breaks and images render as empty text (words
+  glue together; `clide_markdown.dart:408-410`), and the whole document
+  re-parses with sync `existsSync()` calls *inside build* on every streaming
+  delta — multiplied by the conversation view re-deriving everything O(n) per
+  notification and token streaming re-encoding the full reply per delta
+  (O(n²) churn, `stream_json_session.dart:410-431`).
+- **Terminal panes spawn in `Directory.current`**, not the open project root
+  (`terminal_pane.dart:69`) — desktop launches get `$HOME` shells.
+- **The Notifications service renders nowhere** — `notify.dart` has zero widget
+  consumers; cli_install's dogfood warnings vanish into an unrendered list
+  while `ToastService` sits right there.
+- **Welcome screen no-ops**: "Clone from git…" and "Start a Claude session"
+  advertise shortcuts that don't exist and do nothing on tap
+  (`welcome_view.dart:173-174`).
+- **`make test-e2e`/`ui-dev`/`ui-smoke` are dead** — `tools/ui/*.sh` still `cd`
+  into the removed `app/` directory; the staged Gitea CI workflow would fail in
+  three independent ways on activation, while D-32 calls it "ready."
+
+### 🐀 Rats (low, but they breed)
+
+Dead code worth a one-day extermination sweep: the entire legacy free-function
+git API (~250 LOC duplicating `GitClient`, kept alive only by tests, *with its
+own latent pipe-deadlock bug*), `ToolCheck`, ~60% of `ffi/libc.dart` (fd-passing
+era), `GraphView` (unreachable placeholder), `ColumnHat` (duplicated
+line-for-line in app.dart, kept alive by a zero-coverage test), the tmux-era
+team pipeline (`TranscriptPublisher`, `TeamMemberJoined` — *nothing emits these
+events*, yet the team roster UI still listens to them exclusively, meaning team
+tiles are populated by ghosts), the dead `ptyc` binary still committed in
+`native/linux-x64/` against D-62/D-63, and `mocktail` — pinned, documented in
+D-25 as the IO-mocking strategy, and imported by exactly zero files.
+
+---
+
+## Part III — Patterns I would change (the systemic stuff)
+
+1. **Broadcast streams that carry state need replay-latest.** This one shape
+   caused T-274, the meta sidebar's manual compensation, and the
+   prompt-stream's `initialData` workaround. Write a tiny `ValueStream` wrapper
+   once; retrofit `statusStream`, `busyStream`, `pendingPromptStream`.
+
+2. **Ban `catch (_) {}` on I/O and lifecycle paths.** The silent-swallow idiom
+   turned an illegal-lookup-in-dispose into two resource leaks and turned
+   process-spawn failures into blank panes. Cleanup paths may swallow; spawn,
+   read, and dispose paths must log through the kernel Logger they already have.
+
+3. **Sync I/O in async handlers on the single isolate.** `files.read` does a
+   sync 10MB read; the replace engine reads and rewrites the workspace
+   synchronously *while grep right next to it fans out to isolates per D-79*.
+   Decide the rule (offload above N KB), write it into a D-record, apply it.
+
+4. **Path confinement belongs at the dispatch layer, not per-verb.** files.read
+   remembered, search.replace half-remembered, editor.* forgot. A confinement
+   check keyed off the co-registered schema (the registry already knows which
+   params are paths) ends the per-verb lottery.
+
+5. **Copy-paste is the repo's main duplication tax.** The welcome screen clones
+   FileActions' entire open-folder flow verbatim; palette and quick-open are
+   ~230-line near-twins; three private "tail a growing file" implementations in
+   the claude builtin alone; five hand-rolled `_userErr` helpers; five
+   copy-pasted git test sandboxes (none isolating host git config); two
+   parallel ANSI flag enums that already drifted (strikethrough is stored but
+   never painted). Each is small; together they're how a solo-dev repo rots.
+
+6. **Hand-enumerated lists drift; export the truth.** Bundled themes (already
+   drifted between `main.dart` and the testmode harness — catppuccin is
+   silently unvalidated), a11y gate subjects, i18n namespaces. One exported
+   const each, consumed by both sides.
+
+7. **The claude builtin returns `ok` with an `error` payload in 16 handlers**,
+   drifting from the D-6 exit-code contract every other subsystem honors. A
+   scripted `clide claude.agent.set-permission-mode bogus` exits 0 today.
+
+8. **God-files**: `app.dart` (1187 LOC, five concerns — split plan is in the
+   findings), `claude_meta_sidebar.dart` (1192), `parser.dart` (1139, T-123
+   already exists — and the split should also fix `_consumeCsi` discarding
+   intermediate bytes, which permanently blocks DECSCUSR/DECSTR).
+
+9. **Docs drift at the front door**: CLAUDE.md and README still say "tmux owns
+   Claude session persistence (D-41)" — superseded by D-75/D-77 per
+   `docs/architecture.md`; README says "Pre-v2.0 (2.0.0-dev)" at v2.3.3 and
+   headlines "canvas and graph surfaces" that are a 17-line stub and a flat
+   ListView respectively. clide's honesty is its brand; the README is the one
+   place currently off-brand.
+
+10. **Close the release loop.** Five CHANGELOG releases since the last git tag;
+    `ci/release.sh` exits 64 and references the dissolved sidecar; the pre-push
+    fast path's safety argument cites "release CI on tagged versions" that
+    doesn't exist; and the fast path skips ALL tests for pushes touching
+    `test/`, `ci/`, or the hook itself. Back-tag 2.2.0–2.3.3, add tagging to
+    the git-commit skill ritual, widen the fast-path regex. (This is also the
+    blocking prerequisite your own T-47 refinement identified for self-update.)
+
+---
+
+## Part IV — Killer features (the dragon hoard)
+
+Five ideation lenses, 27 proposals, deduplicated and ranked. The convergence
+test mattered: **two lenses independently invented the flight recorder, and two
+independently invented the visual canvas round-trip** — when separate agents
+with different briefs land on the same feature, that's the market talking.
+
+Clide's structural moats, verified against code: it *spawns and owns* the agent
+process (D-77/D-78) where competitors are sandboxed extension guests; it owns
+every pixel (terminal, markdown, canvas); everything is local-and-committed
+(transcripts, costs, decisions, tickets) where competitors' business models
+require cloud custody; and the pql vault is structured planning data no
+mainstream IDE has an analogue for.
+
+### Tier 1 — do these (high leverage, mostly M-effort, plumbing exists)
+
+1. **Agent Blame + Session Flight Recorder** `[L]` — gutter action on any line:
+   *which session, which turn, which prompt, which permission grant, what it
+   cost* — opening the native conversation at the exact `tool_use`. Timeline
+   scrubber to replay a session. The transcript pipeline
+   (`transcript_reader.dart`, `session_index.dart`) already parses everything
+   needed. Cursor/Copilot cannot ship this: their logs live server-side by
+   business design. *Two lenses converged here.*
+
+2. **Context X-ray** `[M]` — per-card token attribution ("this 40KB Bash tail
+   is 12% of your window") + a real compaction indicator. `stream_json_session.dart`
+   already parses usage and contextWindow per event; the renderer owns the
+   cards. Fixes T-244 (invisible compaction) as a side effect. Context is the
+   scarcest resource in agent pairing and every tool renders it as one opaque
+   percentage.
+
+3. **Trust Ledger + decision-aware permission prompts** `[M]` — every
+   permission rule with provenance (which prompt, which session, which ticket),
+   ticket-scoped expiry; and when a `can_use_tool` request arrives, chip the
+   relevant D-record onto the card (edit touching pubspec.yaml → D-31
+   prefer-zero-deps, one keystroke to deny *with the decision cited*).
+   Governance stops being documentation and becomes live agent policy. No
+   competitor has a queryable in-repo decision system to even attempt this.
+
+4. **Agent Activity HUD** `[M]` — four backlog tickets and one open question
+   are secretly one feature: build T-59's `OperationsRegistry` once and feed it
+   git/pql progress (T-59), sidebar badges (T-58), compaction state (T-244),
+   the status strip (T-274), with Q-34's budget slot reserved. Fix the T-274
+   plumbing bug first or the HUD inherits blank-slot syndrome.
+
+5. **Active Ticket Context** `[S]` ← *cheapest win in the whole list* — picking
+   up a ticket binds it to the session: a "working on T-244" chip, auto
+   `in_progress` flip, `(T-NNN)` pre-suggested in commit messages, changelog
+   reminder on done. Makes kanban ambient instead of homework, and makes every
+   trail/ledger feature below reliable.
+
+### Tier 2 — the differentiators (L/XL, each could headline a release)
+
+6. **Twin-timeline rewind** `[L]` — snapshot the worktree as hidden git refs
+   (`git write-tree` → `refs/clide/checkpoints`) at every turn boundary, keyed
+   to turn uuid; every user-message card gains "restore files to before this."
+   Claude's `/rewind` only restores what Claude itself edited; clide owns both
+   timelines.
+
+7. **Visual Dialog** `[L]` — one bidirectional scene schema: Claude draws
+   (D-91 canvas cards), the user annotates in the interaction zone (T-260), and
+   the annotations return as *structured geometry + flattened PNG*, not prose.
+   Merge the T-317/T-318 and T-260 specs into one protocol before they become
+   two dialects. *Two lenses converged here.*
+
+8. **Immortal terminals** `[M]` — T-258 (terminal as editor-mode peer) fused
+   with T-325 live-tails: any long process — user shell *or* agent-spawned
+   build — promotes to a full tmux-backed surface that survives restart.
+   "The build that never dies" is structural for clide, a plugin fantasy for
+   Electron. Resolve Q-27 (swap vs split) as part of it, as T-258 already notes.
+
+9. **Local cost ledger** `[M]` — per-turn cost/tokens persisted against the
+   active pql ticket; the board shows what each feature actually cost.
+   Flat-subscription opacity is the competitors' business model; turn-level
+   local cost data is clide's birthright. (Tokens primary, dollars advisory —
+   subscription auth reports notional costs.)
+
+10. **Label-routed work queues / ticket dispatch** `[M→XL]` — T-277 labels +
+    the shipped pick-up path turn the board into an agent control surface;
+    the XL extension dispatches a ticket to a teammate session in an isolated
+    git worktree (SpawnSpec.cwd already exists). Local, no-telemetry
+    background agents with the work item, isolation, review surface, and audit
+    trail all in-repo.
+
+### Tier 3 — moonshots (XL, pick one per quarter, they compound)
+
+11. **Semantic terminal** — OSC 133 markers (clide spawns the shell, injection
+    is trivial) lift scrollback into foldable command regions with recognizers
+    for test runners and stack traces; real widgets between rows is something
+    xterm.js structurally cannot do. *Note: fix the scrollback-unreachable bug
+    first — a semantic scrollback you can't scroll is a koan.*
+12. **Living codebase map** — tree-sitter imports + pql links + git churn on
+    the owned canvas, with live agent heat from `tool_use` events: watch Claude
+    *move through your codebase* in real time.
+13. **Live mixed documents** — fenced blocks in the owned markdown renderer
+    become live embeds (canvas scenes, pql query results, decision cards,
+    confirm-gated command buttons). Notebook-grade, zero webview. The
+    `ClideMarkdownHooks` seam already exists.
+14. **Remote Claude over SSH** — T-329 is fully ticketed and undersold: agent
+    on the buildbox, permission prompts rendering natively local. VS Code
+    Remote moves the editor; nobody remotes the *agent control channel*.
+15. **Sealed-workspace mode** — an egress-audit proxy around the whole agent
+    stack, operationalizing D-60/D-64 into a provable property. The one
+    feature in this list competitors *cannot* copy without breaking their own
+    products.
+
+### Honorable mentions
+
+Plan-to-Board bridge (ExitPlanMode approval files the plan as a ticket tree),
+Release Cockpit (renders `[Unreleased]` with word-count badges + one-action
+release cut — would also unstall Part III #10), Daily Helm ("since you were
+last here" pulse on the welcome screen, computed from data the repo already
+commits), Total-recall conversation search (D-79 grep over the transcript
+corpus + fork-from-here), Shared Gaze (attach editor selection/scroll context
+to each outgoing turn), Speakable Layouts (`clide layout apply review.yaml` —
+the agent stages your workspace), Agent fleet tray (enumerate per-workspace
+sockets, show every repo's agent state — *requires fixing T-247's stale-socket
+litter first*), Governance Graph (the D/Q/R/T web as a navigable map — gives
+the placeholder graph view a flagship dataset).
+
+---
+
+## Part V — If I were you, Monday morning
+
+1. **One leak-fix commit**: PTY fd on natural exit + kernel-lookup-in-dispose
+   (terminal & claude panes) + project-switch service disposal. Three findings,
+   one theme, one afternoon.
+2. **One Claude-resilience commit**: drain stderr, watch exitCode, seed status
+   on bind, gate auto-scroll on `_atBottom`. The flagship pane stops having
+   silent failure modes.
+3. **One security commit**: MCP auth token + editor.* path confinement +
+   search.replace glob filter + symlink-walk fix.
+4. **One rat-extermination day**: dead git API, ToolCheck, libc bindings,
+   ColumnHat, GraphView, tmux-era team pipeline, ptyc binary, mocktail. The
+   diff is gloriously red and the coverage denominator thanks you.
+5. **Tag your releases.** Five releases of honest changelog work are currently
+   unaddressable commits.
+6. Then go build the **Active Ticket chip** (S!) and the **Context X-ray**, and
+   let clide start showing people things no other IDE can.
+
+---
+
+*Findings methodology: every medium/high claim above survived an independent
+adversarial re-read of the cited lines (one claim did not — the proposed
+"can't-disable core extensions" guard, which D-14 deliberately rejects, so it
+stays out of this report). The full per-finding evidence, severities, and
+suggested fixes live in the review transcripts; ~34 additional low-severity
+findings were verified by citation only.*
+
+*— Fable, 2026-06-11*

governance/README.md

@@ -66,7 +66,7 @@ You might also want, project-permitting:
 - [D-22: WCAG-AA contrast gate on bundled themes](decisions/accessibility.md#d-22-wcag-aa-contrast-gate-on-bundled-themes) — _accessibility_
 - [D-23: Test pyramid — seven layers](decisions/testing.md#d-23-test-pyramid--seven-layers) — _testing_
 - [D-24: Golden tests — primitives only, Alchemist + Ahem](decisions/testing.md#d-24-golden-tests--primitives-only-alchemist--ahem) — _testing_
-- [D-25: Mocks — mocktail at IO, hand-rolled fakes for ChangeNotifiers](decisions/testing.md#d-25-mocks--mocktail-at-io-hand-rolled-fakes-for-changenotifiers) — _testing_
+- [D-25: Mocks — hand-rolled fakes throughout; mocktail dropped](decisions/testing.md#d-25-mocks--hand-rolled-fakes-throughout-mocktail-dropped) — _testing_
 - [D-26: Web driver — raw Playwright + Flutter semantics](decisions/testing.md#d-26-web-driver--raw-playwright--flutter-semantics) — _testing_
 - [D-27: Startup regression gate](decisions/testing.md#d-27-startup-regression-gate) — _testing_
 - [D-28: Test organisation — mirror `lib/` in `test/`](decisions/testing.md#d-28-test-organisation--mirror-lib-in-test) — _testing_
@@ -133,6 +133,14 @@ You might also want, project-permitting:
 - [D-89: inline pasted-image thumbnails that expand to the lightbox](decisions/design.md#d-89-inline-pasted-image-thumbnails-that-expand-to-the-lightbox) — _design_
 - [D-90: clide:// deep links — paranoid allowlist + user confirmation](decisions/architecture.md#d-90-clide-deep-links--paranoid-allowlist--user-confirmation) — _architecture_
 - [D-91: Unified conversation drawing card backed by a canvas renderer](decisions/architecture.md#d-91-unified-conversation-drawing-card-backed-by-a-canvas-renderer) — _architecture_
+- [D-92: Ship pql bundled with clide](decisions/tooling.md#d-92-ship-pql-bundled-with-clide) — _tooling_
+- [D-93: clide writes no directories of its own into the workspace](decisions/architecture.md#d-93-clide-writes-no-directories-of-its-own-into-the-workspace) — _architecture_
+- [D-94: Workspace mode is a first-class, extensible declared capability](decisions/architecture.md#d-94-workspace-mode-is-a-first-class-extensible-declared-capability) — _architecture_
+- [D-95: Workspace validity and onboarding flow](decisions/architecture.md#d-95-workspace-validity-and-onboarding-flow) — _architecture_
+- [D-96: Remote-execution footprint — no-install ssh-exec](decisions/architecture.md#d-96-remote-execution-footprint--no-install-ssh-exec) — _architecture_
+- [D-97: ssh:// workspace URI + system-ssh auth](decisions/architecture.md#d-97-ssh-workspace-uri--system-ssh-auth) — _architecture_
+- [D-98: Remote-tool contract + connect preflight](decisions/architecture.md#d-98-remote-tool-contract--connect-preflight) — _architecture_
+- [D-99: Remote session identity keyed on (host, workspace)](decisions/architecture.md#d-99-remote-session-identity-keyed-on-host-workspace) — _architecture_
 
 ## Open questions
 
@@ -152,7 +160,6 @@ You might also want, project-permitting:
 - [Q-17: Icon set growth](questions/process.md#q-17-icon-set-growth) — _process_
 - [Q-18: Theme hot-reload in release builds](questions/process.md#q-18-theme-hot-reload-in-release-builds) — _process_
 - [Q-20: Kernel DB service — namespaced SQL access?](questions/process.md#q-20-kernel-db-service--namespaced-sql-access) — _process_
-- [Q-23: SSH-remote development — run clide against a remote workspace](questions/architecture.md#q-23-ssh-remote-development--run-clide-against-a-remote-workspace) — _architecture_
 - [Q-25: Body text face — mono everywhere vs Josefin Sans UI + mono code](questions/architecture.md#q-25-body-text-face--mono-everywhere-vs-josefin-sans-ui--mono-code) — _architecture_
 - [Q-26: Small screen layout (< 1000px)](questions/architecture.md#q-26-small-screen-layout--1000px) — _architecture_
 - [Q-27: Two-editor split](questions/architecture.md#q-27-two-editor-split) — _architecture_
@@ -160,6 +167,23 @@ You might also want, project-permitting:
 - [Q-30: Focus behavior when editor is dirty and viewer is peeked](questions/architecture.md#q-30-focus-behavior-when-editor-is-dirty-and-viewer-is-peeked) — _architecture_
 - [Q-31: XWayland fallback for frameless — proper Wayland protocol needed](questions/architecture.md#q-31-xwayland-fallback-for-frameless--proper-wayland-protocol-needed) — _architecture_
 - [Q-34: How + when to surface the account/team token budget given upstream doesn't expose it](questions/architecture.md#q-34-how--when-to-surface-the-accountteam-token-budget-given-upstream-doesnt-expose-it) — _architecture_
+- [Q-35: Agent Blame + Session Flight Recorder — implement?](questions/design.md#q-35-agent-blame--session-flight-recorder--implement) — _design_
+- [Q-36: Context X-ray — implement?](questions/design.md#q-36-context-x-ray--implement) — _design_
+- [Q-37: Trust Ledger + decision-aware permission prompts — implement?](questions/design.md#q-37-trust-ledger--decision-aware-permission-prompts--implement) — _design_
+- [Q-38: Agent Activity HUD — implement?](questions/design.md#q-38-agent-activity-hud--implement) — _design_
+- [Q-39: Active Ticket Context — implement?](questions/design.md#q-39-active-ticket-context--implement) — _design_
+- [Q-40: Twin-timeline rewind — implement?](questions/design.md#q-40-twin-timeline-rewind--implement) — _design_
+- [Q-41: Visual Dialog — one bidirectional scene schema — implement?](questions/design.md#q-41-visual-dialog--one-bidirectional-scene-schema--implement) — _design_
+- [Q-42: Immortal terminals — implement?](questions/design.md#q-42-immortal-terminals--implement) — _design_
+- [Q-43: Local cost ledger — implement?](questions/design.md#q-43-local-cost-ledger--implement) — _design_
+- [Q-44: Label-routed work queues / ticket dispatch — implement?](questions/design.md#q-44-label-routed-work-queues--ticket-dispatch--implement) — _design_
+- [Q-45: Semantic terminal — implement?](questions/design.md#q-45-semantic-terminal--implement) — _design_
+- [Q-46: Living codebase map — implement?](questions/design.md#q-46-living-codebase-map--implement) — _design_
+- [Q-47: Live mixed documents — implement?](questions/design.md#q-47-live-mixed-documents--implement) — _design_
+- [Q-48: Sealed-workspace mode — implement?](questions/design.md#q-48-sealed-workspace-mode--implement) — _design_
+- [Q-49: Review honorable mentions — which, if any, get promoted?](questions/design.md#q-49-review-honorable-mentions--which-if-any-get-promoted) — _design_
+- [Q-50: Web/WASM target after the dart:ffi pivot — fence, fix, or drop?](questions/architecture.md#q-50-webwasm-target-after-the-dartffi-pivot--fence-fix-or-drop) — _architecture_
+- [Q-51: Unify workspace lifecycle on a single fenced open primitive](questions/architecture.md#q-51-unify-workspace-lifecycle-on-a-single-fenced-open-primitive) — _architecture_
 
 ## Resolved questions
 
@@ -169,6 +193,7 @@ You might also want, project-permitting:
 - [Q-19: (withdrawn)](questions/process.md#q-19-withdrawn) — _process_
 - [Q-21: Pql absorbs planning vs keeps separate](questions/architecture.md#q-21-pql-absorbs-planning-vs-keeps-separate) — _architecture_
 - [Q-22: Ticket persistence strategy](questions/architecture.md#q-22-ticket-persistence-strategy) — _architecture_
+- [Q-23: SSH-remote development — run clide against a remote workspace](questions/architecture.md#q-23-ssh-remote-development--run-clide-against-a-remote-workspace) — _architecture_
 - [Q-28: Terminal strip scope — shell only or logs/errors/tests](questions/architecture.md#q-28-terminal-strip-scope--shell-only-or-logserrorstests) — _architecture_
 - [Q-32: MCP tool surface — minimum slash-ide or extended clide tools?](questions/architecture.md#q-32-mcp-tool-surface--minimum-slash-ide-or-extended-clide-tools) — _architecture_
 - [Q-33: MCP transport — SSE, WebSocket, stdio, or all?](questions/architecture.md#q-33-mcp-transport--sse-websocket-stdio-or-all) — _architecture_

governance/decisions/architecture.md

@@ -23,6 +23,7 @@ Core, rendering, IPC, kernel, panel manager.
 
 ### D-4: Ignore file strategy
 - **Date:** 2026-04-20 (was ADR 0004; ported from the claudian lineage)
+- **Amendment (2026-06-11):** Per [D-93](#d-93-clide-writes-no-directories-of-its-own-into-the-workspace), clide no longer writes a `.clide/` directory into the repo; only `.pql/` is added to `.gitignore` at install time. The `.clide/` mention below is retained for history.
 - **Decision:** One mechanism everywhere: the `ignore_files:` list in `.pql/config.yaml`. Ordered list of gitignore-shaped files; later entries win on per-pattern conflicts. pql defaults to `ignore_files: [.gitignore]`. Per [D-3](#d-3-pql-as-supporter-tool-clide-wraps-never-duplicates), clide writes the list on load — `[.gitignore, .clideignore]` if `.clideignore` exists, else `[.gitignore]`. `.clideignore` carries **only** the clide-specific deviations from `.gitignore` (supports `!pattern` negations); never duplicate gitignore's contents. Walker magic: none except `.git/` — every other tool-owned dir (`.pql/`, `.clide/`) is added to `.gitignore` at install time; exclusion flows through the normal `ignore_files:` chain.
 - **Context:** Every file-enumerating surface in clide (pql query panels, canvas drivers, graph view, file watchers, pane lists, file tree) needs to skip the obvious junk — `vendor/`, `node_modules/`, `dist/`, build artifacts — or results drown in noise. Clide's working assumption is that the git repo *is* the workspace — no separate "vault" concept.
 - **Rationale:** Users get one config knob, in a file they might already know (pql users) or never need to touch (clide-only users). `.clideignore` is short by design — it's deltas, not a full list. Sidecar consumers read the same key and apply identical precedence, so Claude and the user always see the same filtered surface.
@@ -72,7 +73,7 @@ Core, rendering, IPC, kernel, panel manager.
 ### D-10: State management — `ChangeNotifier` + `ListenableBuilder`
 - **Date:** 2026-04-21
 - **Decision:** Per-feature state uses `ChangeNotifier` exposed through a feature facade (singleton-per-kernel); widgets subscribe via `ListenableBuilder`. No Riverpod, Provider, BLoC, or Redux.
-- **Rationale:** SDK-shipped, zero deps, trivial to fake in tests (hand-rolled fakes in [D-25](testing.md#d-25-mocks--mocktail-at-io-hand-rolled-fakes-for-changenotifiers)). Violates [D-31 prefer-zero-deps](tooling.md#d-31-prefer-zero-deps-exact-pin) otherwise. See [R-8](../rejected/architecture.md#r-8-riverpod--provider--bloc-for-state).
+- **Rationale:** SDK-shipped, zero deps, trivial to fake in tests (hand-rolled fakes in [D-25](testing.md#d-25-mocks--hand-rolled-fakes-throughout-mocktail-dropped)). Violates [D-31 prefer-zero-deps](tooling.md#d-31-prefer-zero-deps-exact-pin) otherwise. See [R-8](../rejected/architecture.md#r-8-riverpod--provider--bloc-for-state).
 - **Cost:** No codegen ergonomics; manual `notifyListeners()` discipline. The `ListenableBuilder.listenable` contract rejects rebuilds outside the subscribed notifier — intentional.
 - **Raised by:** 2026-04-21 planning.
 
@@ -190,6 +191,7 @@ Core, rendering, IPC, kernel, panel manager.
 
 ### D-53: State persistence across sessions
 - **Date:** 2026-04-22
+- **Amendment (2026-06-11):** Per [D-93](#d-93-clide-writes-no-directories-of-its-own-into-the-workspace), this state moves from in-repo `.clide/settings.yaml` to user-scope storage keyed by workspace-path hash. The `.clide/settings.yaml` references below are retained for history.
 - **Decision:** The following layout state is persisted across app restarts: collapse state of left and right panels, active left section (tickets/decisions/files/git/pr), active right context type, pql pane expanded/collapsed, editor split ratio when open, fuzzy find recent picks. Stored via `SettingsStore` in project-scoped settings (`.clide/settings.yaml`).
 - **Rationale:** Users expect their workspace layout to survive restarts. Without persistence, every launch starts at the default layout preset, which is disorienting when the user has customised their column widths and panel states.
 - **Cost:** Adds write-on-change to several layout operations. Must handle migration if the setting keys evolve. `.clide/settings.yaml` is already gitignored, so personal layout state stays personal.
@@ -469,4 +471,67 @@ Core, rendering, IPC, kernel, panel manager.
 - **Relationship:** Narrows [Q-4](../questions/architecture.md#q-4-canvas-schema-compatibility-with-obsidian) — clide's canvas is its own HTML-canvas-inspired JSON; Obsidian `.canvas` is an *import* format via conversion, not the native schema. Consumes the stdin/`--file` JSON input plumbing (T-315). Subsumes the standalone icon card (T-313) and image-annotation work (T-316) as templates of this card. **Merges the former Tier-5 "canvas and graph view" epic (T-7) into one canvas epic (T-317):** the Tier-5 canvas *pane* (T-322, interactive/editable — distinct from the display-only conversation card) and graph *view* (T-323) consume the same shared renderer; T-7 is cancelled as superseded. The conversation drawing card stays display-only per [D-78]; the canvas pane is a full interactive pane. (D-17 "panels are extension-shaped" is unaffected and still governs the panes.)
 - **Raised by:** 2026-06-10 — user, while refining the icon-preview card (T-313): "make it all into one drawing card that receives a json input and selects based on the context inside the json what to draw … pull the entire thing closer to a dynamic canvas than a bunch of one-off renderers." Clarified the model is HTML `<canvas>` (not Obsidian's), templates-over-primitives, per-object label/description, and reuse as the `.canvas` renderer; before/after comparisons, SVGs, icons, and graphs all become things you send into the card.
 
+### D-93: clide writes no directories of its own into the workspace
+- **Date:** 2026-06-11
+- **Decision:** clide-the-IDE contributes **zero** directories to a workspace. The only tool-owned directories physically written into a repo are `.git/` (git's, brought by the user) and `.pql/` (pql's repo data — index + planning changelog). All IDE-local per-workspace state — panel collapse, active sections, split ratios, project theme, recent picks ([D-53](#d-53-state-persistence-across-sessions)), and any future per-repo extension DB — moves to **user scope**, stored outside the repo and keyed by a hash of the workspace path, the same convention the IPC socket already uses ([D-70](#d-70-ipc-socket-path-is-per-workspace-deterministic)). If clide ever needs shared, *committed* per-repo config, it lives as clide-owned keys in `.pql/config.yaml` (the existing `ignore_files:` precedent, [D-3](#d-3-pql-as-supporter-tool-clide-wraps-never-duplicates)/[D-4](#d-4-ignore-file-strategy)) — never a new directory.
+- **Context:** clide previously wrote project-scoped settings to an in-repo `.clide/` directory ([D-53](#d-53-state-persistence-across-sessions)). Even gitignored, that put an IDE scratch dir physically inside the user's repo. "Written in the repo" — not "checked in" — is the thing being minimized.
+- **Rationale:** One tool dir in the repo (`.pql/`), and it earns its place because it holds data *about* the repo. Personal IDE state is not repo data, so it belongs in user scope — exactly where [D-70](#d-70-ipc-socket-path-is-per-workspace-deterministic) and [D-41](#d-41-claude-panes-one-primary-per-repo-tmux-backed) already keep per-workspace runtime state. Nothing shared is lost: `.clide/settings.yaml` was already gitignored, so it was never committed anyway.
+- **Cost:** A one-time migration of any existing in-repo `.clide/settings.yaml` to user scope, then dropping the dir. Per-workspace state inherits [D-70](#d-70-ipc-socket-path-is-per-workspace-deterministic)'s trade-off: moving or renaming a repo re-keys it and resets personal layout.
+- **Amends [D-4](#d-4-ignore-file-strategy):** D-4's clause "`.clide/`) is added to `.gitignore` at install time" is moot — clide no longer writes `.clide/` into the repo. Only `.pql/` is added to `.gitignore` at install time.
+- **Amends [D-53](#d-53-state-persistence-across-sessions):** persisted layout state moves from in-repo `.clide/settings.yaml` to user-scope storage keyed by workspace-path hash.
+- **Cross-reference:** [D-3](#d-3-pql-as-supporter-tool-clide-wraps-never-duplicates), [D-4](#d-4-ignore-file-strategy), [D-53](#d-53-state-persistence-across-sessions), [D-70](#d-70-ipc-socket-path-is-per-workspace-deterministic), [D-41](#d-41-claude-panes-one-primary-per-repo-tmux-backed).
+- **Raised by:** 2026-06-11 — user: "I am not a fan of IDEs tossing in multiple dirs … only the pql dir which contains repo data gets [written] in repo."
+
+### D-94: Workspace mode is a first-class, extensible declared capability
+- **Date:** 2026-06-11
+- **Decision:** A clide workspace runs in exactly one **mode** at a time, drawn from an open, extensible vocabulary — initially `edit` (full local read/write; the default) and `read` (read-only; no writable `.pql/`), with `remote`, `ssh`, and `webui` reserved as future values. Every extension declares the modes it supports in its manifest (`modes: [edit, read]`); an extension with no declaration is assumed `edit`-only. The extension host activates an extension only when the active workspace mode is in its declared set — unsupported extensions stay dormant. New modes are added as new vocabulary values **without schema changes**; the open SSH-remote question ([Q-23](../questions/architecture.md#q-23-ssh-remote-development--run-clide-against-a-remote-workspace)) is expected to resolve *into* a mode value, not a parallel mechanism.
+- **Context:** Read-mode degrade ([D-95](#d-95-workspace-validity-and-onboarding-flow)) needs to know which extensions remain functional without pql and without write access. A boolean `read_mode_safe` would answer only today's question and would not compose with the `remote`/`ssh`/`webui` modes already on the horizon.
+- **Rationale:** Modelling capability as a declared mode set is uniform and future-proof — one mechanism the host gates on, one place extensions opt in, and third-party extensions participate by declaring. Reserving the future values now means remote/ssh/webui work plugs into an existing seam instead of inventing its own.
+- **Cost:** Every builtin extension must declare its modes (a one-time classification pass); the host gains mode-gating logic; the vocabulary is open-ended and must stay coherent as values accrue. Defaulting an undeclared extension to `edit`-only is conservative but may surprise authors.
+- **Cross-reference:** [D-17](extensions.md#d-17-panels-are-extension-shaped-from-day-one), [D-95](#d-95-workspace-validity-and-onboarding-flow), [Q-23](../questions/architecture.md#q-23-ssh-remote-development--run-clide-against-a-remote-workspace).
+- **Raised by:** 2026-06-11 — user: "read_mode_safe: true is not leaving space for further modes (ssh mode, remote mode, webui mode, read mode, edit mode). Prepare it for that."
+
+### D-95: Workspace validity and onboarding flow
+- **Date:** 2026-06-11
+- **Decision:** A clide workspace is valid only when it is a git repo with an initialized `.pql/`. Two consequences. **(1) Git is a precondition the user owns.** clide never auto-runs `git init`; opening a non-git folder *offers* initialization (**default no**, with a guard that warns when a parent `.git` would make this a nested repo) or lets the user pick another folder. **(2) pql is clide-provisioned.** Because pql now ships bundled ([D-92](tooling.md#d-92-ship-pql-bundled-with-clide)), an uninitialized repo triggers a **required, idempotent** prep flow that reconciles state (virgin / pql-user / partially-init / fully-init / previously-declined) and **discloses exactly what it writes** — `.gitignore` entries for `.pql/`, pql's config, and (only on opt-in) git hooks. The mandatory floor is pql **config + index** (the files/query/ignore engine); the **planning layer** (decisions/tickets + the changelog hooks of [D-67](process.md#d-67-pql-changelog-files-are-committed-alongside-code), which alter the user's git workflow) is a **contextual opt-in** offered when the user first opens the Decisions or Tickets surface — never forced at onboarding. A writable repo with no `.pql/` is *invalid-until-initialized*; a repo clide **cannot** write (read-only mount, no permission) degrades to **read mode** ([D-94](#d-94-workspace-mode-is-a-first-class-extensible-declared-capability)) — file tree, editor, and the pure-Dart content search ([D-79](#d-79-workspace-content-search-is-a-pure-dart-in-process-engine-outside-pql)) stay live; pql-backed surfaces go dark behind a clear banner. A decline is remembered in user scope, keyed by repo path; clide does not re-nag, and an explicit "initialize workspace" command is always available.
+- **Context:** [D-4](#d-4-ignore-file-strategy) already specified that `.pql/` is "added to `.gitignore` at install time" — presuming an install-time event that never had a trigger. Bundling pql ([D-92](tooling.md#d-92-ship-pql-bundled-with-clide)) is what makes "pql required" honest: clide can always provide the means to create `.pql/`. This record is that missing trigger.
+- **Rationale:** pql is clide's core query/ignore engine, not just the ticket board, so a repo without it is degraded for *core editing*, not only planning — gating on `.pql/` is truthful. Git, by contrast, is a foundational, identity-level user decision (and `git init` in the wrong place is a footgun), so clide offers but never imposes it. Splitting the mandatory config+index from the opt-in planning hooks keeps the invasive git-workflow change consensual and contextual. Read-mode degrade keeps clide usable as an editor on repos it cannot write — consistent with [D-80](#d-80-filesread-allows-trusted-claude-config-roots-beyond-the-workspace)'s read appetite — instead of refusing them outright.
+- **Cost:** An onboarding/state-reconciliation flow with a disclosing modal. The installer must handle the known hooks gotcha (`pql init` writes to `.git/hooks` and ignores an existing `core.hooksPath`) — it must not silently clobber a repo that sets `core.hooksPath`. The read-mode path gates extensions by their declared modes ([D-94](#d-94-workspace-mode-is-a-first-class-extensible-declared-capability)) and must provide graceful fallbacks where pql surfaces go dark.
+- **Cross-reference:** [D-3](#d-3-pql-as-supporter-tool-clide-wraps-never-duplicates), [D-4](#d-4-ignore-file-strategy), [D-67](process.md#d-67-pql-changelog-files-are-committed-alongside-code), [D-79](#d-79-workspace-content-search-is-a-pure-dart-in-process-engine-outside-pql), [D-80](#d-80-filesread-allows-trusted-claude-config-roots-beyond-the-workspace), [D-92](tooling.md#d-92-ship-pql-bundled-with-clide), [D-94](#d-94-workspace-mode-is-a-first-class-extensible-declared-capability).
+- **Raised by:** 2026-06-11 — user, this planning session: a repo without `.pql/` is "invalid for clide"; non-git folder → "offer default no"; planning hooks contextual; unwritable repos degrade.
+
+### D-96: Remote-execution footprint — no-install ssh-exec
+- **Date:** 2026-06-12
+- **Decision:** SSH-remote workspaces (T-329, shape A of [Q-23](../questions/architecture.md#q-23-ssh-remote-development--run-clide-against-a-remote-workspace)) use **stock OpenSSH only — nothing clide-specific is ever installed on the remote.** Interactive surfaces (terminal panes, the Claude process) run over `ssh -tt` PTY channels; command-style subsystems (git, pql, file ops, search) run as exec channels multiplexed over a persistent **ControlMaster** connection; file watching degrades to **polling** (debounced mtime/git-status sweep, `inotifywait` used opportunistically when present) that emits the same FileChange events, so the UI layer is unaware of the difference. Subsystems reach the remote through a `RemoteExecutionContext` seam instead of bare `Process.run`/`File`/`Directory`. The rejected alternative — an auto-pushed self-managed remote agent (VS Code Remote model) — would have bought native inotify and a stateful remote backend at the price of deploying and version-managing clide components on the remote.
+- **Rationale:** The user's standing constraint is decisive: no clide components to install, update, GC, or version-reconcile on remote machines. Zero-footprint also dissolves the agent model's open sub-questions (placement, multi-client sharing, version skew, cleanup) — they simply don't arise. The costs (per-command round-trip, polling watcher) are bounded and amortizable (ControlMaster reuses one authenticated connection); the agent model's costs are operational and permanent.
+- **D-56 reconciliation:** [D-56](#d-56-dissolve-daemon-process-flutter-app-hosts-ipc-server)'s "single process" rule is *strengthened*, not bent: with no-install there is no second clide process anywhere — the local Flutter app remains the only clide process, and the remote side is plain sshd + the tools already on the box. [D-5](#d-5-dart-core-sidecar-dissolved-ptyc-as-pql-peer) is likewise untouched — ssh is an external tool clide shells out to, not a second core language or runtime.
+- **Cost:** Every remote command pays an SSH round-trip (ControlMaster removes handshake cost, not latency). Watching is polling-grade — change events arrive on the sweep cadence, not instantly. The execution-context seam must be threaded through each subsystem that touches the filesystem or spawns processes; that sweep is the bulk of T-336. No stateful remote backend means event streams are synthesized locally from command results.
+- **Cross-reference:** Resolves [Q-23](../questions/architecture.md#q-23-ssh-remote-development--run-clide-against-a-remote-workspace). [D-97](#d-97-ssh-workspace-uri--system-ssh-auth) (naming + auth), [D-98](#d-98-remote-tool-contract--connect-preflight) (what must exist remotely), [D-99](#d-99-remote-session-identity-keyed-on-host-workspace) (identity), [D-94](#d-94-workspace-mode-is-a-first-class-extensible-declared-capability) (remote workspaces surface as a workspace mode — the reserved `ssh` value — so extensions gate on it declaratively). Implemented by the T-329 epic; execution layer is T-336.
+- **Raised by:** 2026-06-12 — user, resolving the T-330 footprint spike: "go with the no-install ssh-exec model."
+
+### D-97: ssh:// workspace URI + system-ssh auth
+- **Date:** 2026-06-12
+- **Decision:** A remote workspace is named by the URI `ssh://[user@]host[:port]/abs/remote/path`. `host` may be a `~/.ssh/config` alias; user/port are optional and, when absent, resolve through ssh's own config machinery. **Auth delegates entirely to system ssh** — agent, keys, `~/.ssh/config`, ProxyJump, all of it; clide never stores credentials or implements an auth flow of its own. v1 connections run ssh in **BatchMode** (non-interactive): when auth would prompt, the connect fails with an actionable message ("set up key auth / ssh-agent for <host>") instead of clide hosting a password dialog. Windows (no standard ssh config surface) is an acknowledged v1 gap. The `WorkspaceRef` value type (T-332) is the canonical carrier — parse/round-trip of this URI, `host:path` display form, bare-path = local.
+- **Rationale:** Matches the epic's locked auth posture and pql's "wrap, don't duplicate" instinct applied to OpenSSH: the user's existing ssh config is the source of truth, and anything clide reimplements (agents, prompts, jump hosts) would be a worse, second implementation of it. BatchMode keeps the failure mode crisp instead of wedging a TTY prompt inside a GUI flow.
+- **Cost:** First-run UX depends on the user's ssh hygiene — no in-app password fallback. Host-alias resolution means the same workspace can be reachable under two names (`buildbox` vs `buildbox.lan`) and be keyed as two identities ([D-99](#d-99-remote-session-identity-keyed-on-host-workspace) keys on the *given* host string; aliasing dedupe is deliberately not attempted).
+- **Cross-reference:** [D-96](#d-96-remote-execution-footprint--no-install-ssh-exec), [D-99](#d-99-remote-session-identity-keyed-on-host-workspace). Implemented by T-332 (WorkspaceRef landed 2026-06-12; open-flow pending T-336).
+- **Raised by:** 2026-06-12 — T-330 spike artifacts, URI shape locked at epic planning (2026-06-10).
+
+### D-98: Remote-tool contract + connect preflight
+- **Date:** 2026-06-12
+- **Decision:** What must exist on the remote, and what merely degrades. **Required:** a POSIX shell and `git` — without them the workspace cannot open (workspace validity, [D-95](#d-95-workspace-validity-and-onboarding-flow), requires a git repo). **Optional, degrading:** `pql` — absent, the planning/query surfaces (tickets, decisions, vault queries) go dark behind a banner, mirroring [D-95](#d-95-workspace-validity-and-onboarding-flow)'s read-mode degrade; clide cannot provision pql remotely under [D-96](#d-96-remote-execution-footprint--no-install-ssh-exec)'s no-install rule, so the banner tells the user what to install where. **Optional, degrading:** `claude` — absent, the Claude pane is disabled with a notice; terminal/editor/git stay fully live. On connect, a single batched preflight command probes all of these (one round-trip: `command -v` + version for each) and the result drives the degrade set; a missing *required* tool fails the open with the probe output.
+- **Rationale:** The contract keeps "remote" honest without smuggling an installer in: clide states what it found, works with what's there, and never mutates the remote toolset. One batched probe respects the per-command latency cost [D-96](#d-96-remote-execution-footprint--no-install-ssh-exec) accepts. Folding pql-absence into the existing degrade vocabulary (D-94 modes / D-95 banner) reuses a shipped pattern instead of inventing a remote-special one.
+- **Cost:** A degraded-but-open remote workspace is a new partial state to keep coherent (which surfaces dark, which live). Version *skew* (remote pql older than the bundled local one) is real and detected by the preflight but only surfaced, not reconciled, in v1.
+- **Cross-reference:** [D-92](tooling.md#d-92-ship-pql-bundled-with-clide) (bundling is local-only under no-install), [D-94](#d-94-workspace-mode-is-a-first-class-extensible-declared-capability), [D-95](#d-95-workspace-validity-and-onboarding-flow), [D-96](#d-96-remote-execution-footprint--no-install-ssh-exec).
+- **Raised by:** 2026-06-12 — T-330 spike artifacts ("decide the remote-tool contract: what must exist remotely, whether pql is hard-required or degrades, and how a preflight surfaces what is missing").
+
+### D-99: Remote session identity keyed on (host, workspace)
+- **Date:** 2026-06-12
+- **Decision:** Workspace-keyed identity generalizes from *path* to *(host, path)* — local workspaces are `(null, path)`, so nothing changes for them. Consequences: Claude session identity ([D-41](#d-41-claude-panes-one-primary-per-repo-tmux-backed)'s one-primary-per-repo, [D-77](#d-77-drive-claude-via-the-stream-json-control-protocol-teams-become-a-clide-owned-coordination-layer)'s stream-json sessions) re-keys on (host, repo) — the same repo path on two hosts (or local + remote) is two distinct sessions, never one; Claude's `--resume` transcripts live on the host where claude runs (the remote's `~/.claude/…`), which falls out naturally because claude is spawned remotely. Per-workspace user-scope state ([D-93](#d-93-clide-writes-no-directories-of-its-own-into-the-workspace)/[D-70](#d-70-ipc-socket-path-is-per-workspace-deterministic)'s path-hash keying) hashes the WorkspaceRef canonical URI instead of the bare path — same generalization, same machinery. The host string is taken as given (alias ≠ FQDN; no dedupe, per [D-97](#d-97-ssh-workspace-uri--system-ssh-auth)).
+- **Rationale:** Path-only keying would silently fuse two different machines' checkouts of the same repo path into one session/layout/socket identity — wrong in every case. Hashing the canonical URI is the smallest amendment that fixes this everywhere at once, because every consumer already keys off one derived string.
+- **Amends [D-41](#d-41-claude-panes-one-primary-per-repo-tmux-backed) / [D-77](#d-77-drive-claude-via-the-stream-json-control-protocol-teams-become-a-clide-owned-coordination-layer):** "per repo" reads as "per (host, repo)" throughout; local keeps its existing identity (null host hashes identically to the pre-amendment bare path — no migration).
+- **Cost:** Renaming a host alias re-keys its sessions and layout state (accepted; same trade-off D-70 already made for moved repos).
+- **Cross-reference:** [D-41](#d-41-claude-panes-one-primary-per-repo-tmux-backed), [D-70](#d-70-ipc-socket-path-is-per-workspace-deterministic), [D-77](#d-77-drive-claude-via-the-stream-json-control-protocol-teams-become-a-clide-owned-coordination-layer), [D-93](#d-93-clide-writes-no-directories-of-its-own-into-the-workspace), [D-96](#d-96-remote-execution-footprint--no-install-ssh-exec), [D-97](#d-97-ssh-workspace-uri--system-ssh-auth). Implemented across T-332 (identity carrier) and T-333 (session re-key).
+- **Raised by:** 2026-06-12 — T-330 spike artifacts ("session identity keyed on (host, repo) amending D-41/D-77").
+
 ---

governance/decisions/testing.md

@@ -18,10 +18,10 @@ Test pyramid, drivers, client-side constraint.
 - **Cost:** Goldens have zero real text; layouts rely on widget tests. Acceptable.
 - **Raised by:** 2026-04-21 planning.
 
-### D-25: Mocks — mocktail at IO, hand-rolled fakes for ChangeNotifiers
+### D-25: Mocks — hand-rolled fakes throughout; mocktail dropped
-- **Date:** 2026-04-21
+- **Date:** 2026-04-21 (amended 2026-06-12)
-- **Decision:** `mocktail 1.0.4` mocks IO boundaries (sockets, processes, `dart:io` File/Directory). `ChangeNotifier` facades get hand-rolled fakes — tiny classes that extend `ChangeNotifier` with test-controlled setters. No `mocktail` for notifiers.
+- **Decision:** Test doubles are hand-rolled fakes — tiny classes that extend the real base (`ChangeNotifier` facades, `StreamJsonProcess`, `DaemonClient`) with test-controlled setters. **Amendment (2026-06-12, T-385):** `mocktail` was originally pinned for IO boundaries, but after the T-91 coverage drive it had zero imports — every IO seam ended up with an injected hand-rolled fake (`FakeDaemonClient`, fake process factories, recording event sinks) instead. The unused dep is dropped; the no-mocks-for-notifiers rule stands and in practice covers IO seams too.
-- **Rationale:** Mocking a `ChangeNotifier` with a generated mock hides subscription bugs — `notifyListeners` becomes a mock call instead of actually firing. Hand-rolled fakes exercise the real subscription machinery.
+- **Rationale:** Mocking a `ChangeNotifier` with a generated mock hides subscription bugs — `notifyListeners` becomes a mock call instead of actually firing. Hand-rolled fakes exercise the real subscription machinery. The same held at IO seams: constructor-injected fakes kept tests on real control flow.
 - **Cost:** Roughly 20 lines per fake. Rounds out to less code than configuring a mocktail whenCall chain.
 - **Raised by:** 2026-04-21 planning.
 

governance/decisions/tooling.md

@@ -91,4 +91,13 @@ Toolchain, supply chain, CI, ignore strategy.
 - **Cross-reference:** [D-31](#d-31-prefer-zero-deps-exact-pin), [D-42](#d-42-dependencies-documented-in-licensesyaml), [D-61](#d-61-dependency-vetting-checklist), `POLICY.md`.
 - **Raised by:** 2026-04-26 policy-to-decision migration (T-28).
 
+### D-92: Ship pql bundled with clide
+- **Date:** 2026-06-11
+- **Decision:** clide ships `pql` as a vendored, version-pinned native binary — the same model used for git via dugite ([D-59](#d-59-bundled-git-via-dugite-native)). The pinned binary lives under `native/<platform>/` with a `BUILD.md` provenance record ([D-63](#d-63-vendored-binary-rebuild-process)) and an `assets/licenses.yaml` entry ([D-42](#d-42-dependencies-documented-in-licensesyaml), [D-65](#d-65-license-compatibility-matrix)). Resolution order is: `CLIDE_PQL_BIN` env override (dev escape hatch — e.g. pointing at a pql built side-by-side) → bundled binary resolved against the **install directory** (next to the executable, never workspace-relative) → system `pql` on PATH. The bundled copy never self-updates — the pin is the contract, so `pql self-update` is inert for it. A version floor is enforced *softly*: if the resolved pql (override or PATH) is older than the pinned floor, the Problems panel surfaces it rather than clide silently mis-driving an incompatible binary. CI runs the in-tree binary instead of provisioning pql on the runner.
+- **Context:** pql is clide's files/query/ignore engine **and** its planning engine ([D-3](architecture.md#d-3-pql-as-supporter-tool-clide-wraps-never-duplicates)), yet it was an unmanaged external dependency: users installed and updated it themselves, with no version pin. Beyond the "update the binary, then install it" friction, an old PATH pql replaying the changelog ([D-67](process.md#d-67-pql-changelog-files-are-committed-alongside-code)) is a latent *corruption* risk, not merely a missing-feature one. This is a distribution gap, not an architecture one.
+- **Rationale:** Bundling makes a fresh clone/install work with zero separate pql setup, pins the version clide was tested against (closing the changelog-schema-skew risk), and reuses the proven dugite pattern and its supply-chain gates ([D-60](#d-60-no-network-on-default-launch-path)/[D-61](#d-61-dependency-vetting-checklist)/[D-63](#d-63-vendored-binary-rebuild-process)). It is **additive, not a fork**: pql stays a standalone tool, clide still wraps and never reimplements ([D-3](architecture.md#d-3-pql-as-supporter-tool-clide-wraps-never-duplicates)), and pql's universality for terminal/VS Code users is untouched. pql being a pure-Go, no-CGo static binary makes per-platform bundling cheap.
+- **Cost:** A pinned binary per shipped platform (linux-x64 now; macOS arm64/x64 when those builds land), each carried through the [D-63](#d-63-vendored-binary-rebuild-process) rebuild ritual on every pql release — the same bump cadence as dugite and tree-sitter. Resolving the bundled binary against the install dir and **never** a workspace-relative path is mandatory: a repo could otherwise plant `native/pql` and gain code execution (the T-98 dugite lesson).
+- **Cross-reference:** [D-3](architecture.md#d-3-pql-as-supporter-tool-clide-wraps-never-duplicates), [D-59](#d-59-bundled-git-via-dugite-native), [D-60](#d-60-no-network-on-default-launch-path), [D-61](#d-61-dependency-vetting-checklist), [D-63](#d-63-vendored-binary-rebuild-process), [D-42](#d-42-dependencies-documented-in-licensesyaml), [D-65](#d-65-license-compatibility-matrix), [D-67](process.md#d-67-pql-changelog-files-are-committed-alongside-code).
+- **Raised by:** 2026-06-11 — user: "pql updates live outside this repo and people have to first update the pql binaries and install them."
+
 ---

governance/questions/architecture.md

@@ -60,9 +60,15 @@ ticket persistence.
 - **Source:** 2026-04-21 planning.
 
 ### Q-23: SSH-remote development — run clide against a remote workspace
-- **Status:** Open
+- **Status:** Resolved → [D-96](../decisions/architecture.md#d-96-remote-execution-footprint--no-install-ssh-exec), [D-97](../decisions/architecture.md#d-97-ssh-workspace-uri--system-ssh-auth), [D-98](../decisions/architecture.md#d-98-remote-tool-contract--connect-preflight), [D-99](../decisions/architecture.md#d-99-remote-session-identity-keyed-on-host-workspace)
+- **Resolved (2026-06-12):** Shape (A) — execution remote, UI local — with the **no-install ssh-exec** footprint (user pick): stock OpenSSH only, `ssh -tt` PTYs + ControlMaster exec channels, polling watcher, zero clide components on the remote (D-96). Naming/auth via `ssh://` URI + system ssh in BatchMode (D-97); remote-tool contract with batched connect preflight (D-98); session + state identity re-keyed on (host, repo), amending D-41/D-77 (D-99). Implementation: T-329 epic, execution layer T-336.
 - **Question:** Clide today assumes the workspace, the daemon, and the Flutter UI all run on the same machine. A growing class of users edits on remote systems (build servers, GPU boxes, cloud dev environments). What's the architecture for "open repo on host-B from UI on host-A"? Two shapes: (A) daemon-on-remote — clide's Dart daemon runs on the remote; the app talks to it over an SSH-tunnelled unix socket or a dedicated TCP socket (mTLS?), pty/process/filesystem work stays server-side; local app is pure UI. (B) filesystem-mounted — remote mounted via sshfs/9p/rclone, daemon runs locally against the mount; simpler but every fs op + git call crosses the network, and PTYs get complicated (local shell on remote filesystem? ssh-exec per command?). (A) matches VS Code Remote / JetBrains Gateway; (B) matches nothing load-bearing. Sub-questions either way: auth (ssh-agent? per-project keys? OIDC?), tmux / Claude session persistence semantics (does primary-per-repo re-key on host + repo?), multi-host identity in `.pql/pql.db`, latency tolerance for the event stream, re-sync on disconnect.
-- **Context:** Surfaced 2026-04-22 during Tier-1 planning. Not a Tier 1 concern — terminal + Claude panes land local-first — but the daemon/IPC seam decisions (notably `D-5` and `D-6`) constrain the future answer. Worth scoping before Tier 6 (extension API) so third-party extensions don't accrue assumptions the remote path would have to unwind.
+- **Context:** Surfaced 2026-04-22 during Tier-1 planning. Not a Tier 1 concern — terminal + Claude panes land local-first — but the daemon/IPC seam decisions (notably `D-5` and `D-6`) constrain the future answer. Worth scoping before Tier 6 (extension API) so third-party extensions don't accrue assumptions the remote path would have to unwind. The 2026-06-11 Fable review (fable-ous.md Part IV, Tier 3 #14) reframed the differentiator and ranked T-329 as undersold: the agent runs on the buildbox while permission prompts render natively local — VS Code Remote moves the *editor*; nobody remotes the *agent control channel*. That framing favours shape (A).
+- **Triage (2026-06-12):** Shape (A) is effectively settled (T-329 epic locked: execution remote, UI + clipboard local, system ssh auth for v1). The model-independent backbone is proceeding: Phase 1 (T-331, `DaemonTransport` seam) landed. What remains open is the **footprint model** — the user decision T-330 gates on:
+  1. **No-install ssh-exec** — zero remote footprint; stock `ssh -tt` PTYs + ControlMaster command channels; watching degrades to polling; heavier subsystem surface locally.
+  2. **Auto-pushed self-managed agent** (VS Code Remote model) — clide deploys/version-checks a headless agent binary on connect; native inotify + stateful backend; but installs clide components on the remote, which the user has said they don't want to manage.
+
+  If (2), the agent sub-questions need answers before T-336 expands: placement (per-host `~/.clide/agent` likely), GC on disconnect/version-bump/repo-removal, multi-client sharing (IpcServer is already multi-connection, D-72), version skew (version-named binaries coexist). Either way the **remote-tool contract** needs a D-record: what must exist remotely (git/shell at minimum), whether pql is hard-required or degrades, and how a connect-preflight surfaces gaps. Evidence gap: the ControlMaster per-command latency probe (T-330) needs a reachable sshd — none in the dev environment; run it against a real remote before deciding if latency is the deciding factor.
 - **Source:** 2026-04-22 planning (user-raised).
 
 ### Q-22: Ticket persistence strategy
@@ -153,4 +159,16 @@ ticket persistence.
 - **Context:** The only unshipped piece of the otherwise-complete native-Claude epic (T-132). Blocked on data availability, not on clide work — hence a question (when/how to revisit) rather than active scope. Option (c) interacts with D-75's "version-pinned coupling to CC internals" posture. Resolved by T-158 when a viable path lands.
 - **Source:** 2026-06-09 — split out of T-132 / T-158 (was "blocked on upstream"); project memory `claude-usage-budget-not-exposed`, GitHub anthropics/claude-code#44328.
 
+### Q-50: Web/WASM target after the dart:ffi pivot — fence, fix, or drop?
+- **Status:** Open
+- **Question:** `flutter build web --wasm` no longer compiles: the tree-sitter FFI pivot and the native PTY both import `dart:ffi` unconditionally, which the wasm target forbids. That kills `make test-e2e` / `ui-dev` / `ui-smoke` and the Playwright harness regardless of the `cd app` staleness T-384 fixed. Options: (a) fence every `dart:ffi` import behind conditional imports with web stubs (ongoing tax on every future native binding, for a target CLAUDE.md calls "a happy accident"); (b) keep the harness parked and re-evaluate if/when a web build matters (D-26's Playwright driver stays dormant); (c) drop the web target + `tools/ui/` harness formally and amend D-26/D-32. The guardrail says don't compromise desktop fidelity for web — (a) leans against it; (b) defers; (c) is honest but irreversible-ish.
+- **Context:** Surfaced 2026-06-12 while fixing T-384 (dead make targets). The mechanical path fixes (post app/-flattening) are done; the Gitea workflow's e2e job is withheld with a pointer here. The startup-regression gate (D-27) and integration tests are unaffected — only the browser/Playwright surface is blocked.
+- **Source:** T-384 / 2026-06-11 Fable review (epic T-359).
+
+### Q-51: Unify workspace lifecycle on a single fenced open primitive
+- **Status:** Open
+- **Question:** There is no single "open workspace X" primitive — only two half-primitives in different layers. `project.open(root)` (`lib/kernel/src/project.dart`) is the only repo-targeting path and is intrinsically *in-place*: it rebuilds services in the same process, reusing the shared `daemonBus`. `newWindow()` (`lib/builtin/menubar/src/file_actions.dart`) spawns a blank detached `Process.start` with no repo argument and no env scrubbing. To open a repo in a *new* window you must spawn a blank window and then run the in-place switch inside it. Should both fold behind one `WorkspaceService.open(root, {target: thisWindow | newWindow})` that is the *sole* deriver of IPC identity from a root — and, more fundamentally, should in-place switching survive at all, or should `workspace ⇒ window ⇒ process ⇒ socket ⇒ bus ⇒ session-id` be strictly one-to-one so the leak/bleed class becomes structurally impossible?
+- **Context:** Surfaced 2026-06-14 from [T-421](../../) (status-bar branch bleeds across parallel windows). The same root cause — scattered, per-entry-point workspace lifecycle with no single fencing owner — already produced T-367 (in-place switch leaked the entire previous service set) and T-269 (kept the previous repo's Claude session). If in-place switching is abolished, the teardown burden those tickets patch disappears entirely. Relevant decisions: [D-70](../decisions/architecture.md) (per-workspace socket path), [D-56](../decisions/architecture.md) (one server per workspace), [D-72](../decisions/architecture.md) (multi-connection serial dispatch).
+- **Source:** T-421 / 2026-06-14 user review.
+
 ---

governance/questions/design.md

@@ -0,0 +1,100 @@
+# Open Questions — Design
+
+Feature proposals from the 2026-06-11 Fable review (fable-ous.md Part IV,
+epic [T-359]). Each asks the same question — are we going to implement this
+feature? — so the answer can resolve into a D-record (and an initiative
+ticket) or an R-record. Effort tags `[S/M/L/XL]` come from the review.
+
+---
+
+### Q-35: Agent Blame + Session Flight Recorder — implement?
+- **Status:** Open
+- **Question:** Are we going to implement agent blame — a gutter action on any line answering *which session, which turn, which prompt, which permission grant, what it cost*, opening the native conversation at the exact `tool_use` — plus a timeline scrubber to replay a session? `[L]`
+- **Context:** Two ideation lenses independently invented this. The transcript pipeline (`transcript_reader.dart`, `session_index.dart`) already parses everything needed. Cursor/Copilot cannot ship it: their logs live server-side by business design — local-and-committed transcripts are a structural moat.
+- **Source:** fable-ous.md Part IV, Tier 1 #1 (2026-06-11 Fable review).
+
+### Q-36: Context X-ray — implement?
+- **Status:** Open
+- **Question:** Are we going to implement per-card token attribution ("this 40KB Bash tail is 12% of your window") plus a real compaction indicator? `[M]`
+- **Context:** `stream_json_session.dart` already parses usage and contextWindow per event; the renderer owns the cards. Would fix T-244 (invisible compaction) as a side effect. Context is the scarcest resource in agent pairing and every tool renders it as one opaque percentage.
+- **Source:** fable-ous.md Part IV, Tier 1 #2 (2026-06-11 Fable review).
+
+### Q-37: Trust Ledger + decision-aware permission prompts — implement?
+- **Status:** Open
+- **Question:** Are we going to implement a permission-rule ledger with provenance (which prompt, which session, which ticket; ticket-scoped expiry), and decision-aware prompts that chip the relevant D-record onto a `can_use_tool` card (edit touching pubspec.yaml → [D-31](../decisions/tooling.md#d-31-prefer-zero-deps-exact-pin), one keystroke to deny *with the decision cited*)? `[M]`
+- **Context:** Governance stops being documentation and becomes live agent policy. No competitor has a queryable in-repo decision system to attempt this. Builds on the D-78 interaction-zone prompt surface.
+- **Source:** fable-ous.md Part IV, Tier 1 #3 (2026-06-11 Fable review).
+
+### Q-38: Agent Activity HUD — implement?
+- **Status:** Open
+- **Question:** Are we going to build the `OperationsRegistry` (T-59) once and feed it git/pql progress (T-59), sidebar badges (T-58), compaction state (T-244), and the status strip (T-274), with [Q-34](architecture.md#q-34-how--when-to-surface-the-accountteam-token-budget-given-upstream-doesnt-expose-it)'s budget slot reserved? `[M]`
+- **Context:** Four backlog tickets and one open question are secretly one feature. Prerequisite: fix the T-274 plumbing bug first or the HUD inherits blank-slot syndrome (root cause is on T-274; the ValueStream retrofit is T-386).
+- **Source:** fable-ous.md Part IV, Tier 1 #4 (2026-06-11 Fable review).
+
+### Q-39: Active Ticket Context — implement?
+- **Status:** Open
+- **Question:** Are we going to bind picking up a ticket to the session — a "working on T-NNN" chip, auto `in_progress` flip, `(T-NNN)` pre-suggested in commit messages, changelog reminder on done? `[S]`
+- **Context:** Cheapest win in the review's whole feature list. Makes kanban ambient instead of homework, and makes trail/ledger features (Q-35, Q-43) reliable by giving every turn a ticket anchor.
+- **Source:** fable-ous.md Part IV, Tier 1 #5 (2026-06-11 Fable review).
+
+### Q-40: Twin-timeline rewind — implement?
+- **Status:** Open
+- **Question:** Are we going to snapshot the worktree as hidden git refs (`git write-tree` → `refs/clide/checkpoints`) at every turn boundary, keyed to turn uuid, so every user-message card gains "restore files to before this"? `[L]`
+- **Context:** Claude's `/rewind` only restores what Claude itself edited; clide owns both timelines. Needs a retention/GC policy for the checkpoint refs.
+- **Source:** fable-ous.md Part IV, Tier 2 #6 (2026-06-11 Fable review).
+
+### Q-41: Visual Dialog — one bidirectional scene schema — implement?
+- **Status:** Open
+- **Question:** Are we going to define one bidirectional scene schema where Claude draws ([D-91](../decisions/architecture.md#d-91-unified-conversation-drawing-card-backed-by-a-canvas-renderer) canvas cards), the user annotates in the interaction zone (T-260), and annotations return as *structured geometry + flattened PNG*, not prose?
+- **Context:** Two lenses converged here. The T-317/T-318 and T-260 specs should merge into one protocol *before* they become two dialects — this question is urgent in ordering even if the build is later. `[L]`
+- **Source:** fable-ous.md Part IV, Tier 2 #7 (2026-06-11 Fable review).
+
+### Q-42: Immortal terminals — implement?
+- **Status:** Open
+- **Question:** Are we going to fuse T-258 (terminal as editor-mode peer) with T-325 live-tails so any long process — user shell *or* agent-spawned build — promotes to a full tmux-backed surface that survives restart? `[M]`
+- **Context:** "The build that never dies" is structural for clide, a plugin fantasy for Electron competitors. Resolving [Q-27](architecture.md#q-27-two-editor-split) (swap vs split) is part of it, as T-258 already notes.
+- **Source:** fable-ous.md Part IV, Tier 2 #8 (2026-06-11 Fable review).
+
+### Q-43: Local cost ledger — implement?
+- **Status:** Open
+- **Question:** Are we going to persist per-turn cost/tokens against the active pql ticket so the board shows what each feature actually cost? (Tokens primary, dollars advisory — subscription auth reports notional costs.) `[M]`
+- **Context:** Flat-subscription opacity is the competitors' business model; turn-level local cost data is clide's birthright. Depends on Q-39 (active ticket binding) for reliable attribution.
+- **Source:** fable-ous.md Part IV, Tier 2 #9 (2026-06-11 Fable review).
+
+### Q-44: Label-routed work queues / ticket dispatch — implement?
+- **Status:** Open
+- **Question:** Are we going to turn the board into an agent control surface — T-277 labels + the shipped pick-up path routing work queues, with an XL extension dispatching a ticket to a teammate session in an isolated git worktree (`SpawnSpec.cwd` already exists)? `[M→XL]`
+- **Context:** Local, no-telemetry background agents with the work item, isolation, review surface, and audit trail all in-repo.
+- **Source:** fable-ous.md Part IV, Tier 2 #10 (2026-06-11 Fable review).
+
+### Q-45: Semantic terminal — implement?
+- **Status:** Open
+- **Question:** Are we going to inject OSC 133 markers (clide spawns the shell, injection is trivial) to lift scrollback into foldable command regions, with recognizers for test runners and stack traces, and real widgets between rows? `[XL]`
+- **Context:** xterm.js structurally cannot do widgets between rows. Hard prerequisite: the scrollback-unreachable bug (in T-378) — a semantic scrollback you can't scroll is a koan.
+- **Source:** fable-ous.md Part IV, Tier 3 #11 (2026-06-11 Fable review).
+
+### Q-46: Living codebase map — implement?
+- **Status:** Open
+- **Question:** Are we going to render tree-sitter imports + pql links + git churn on the owned canvas, with live agent heat from `tool_use` events — watching Claude move through the codebase in real time? `[XL]`
+- **Context:** Needs the canvas surface (T-317 family) and the tree-sitter FFI work to be solid first.
+- **Source:** fable-ous.md Part IV, Tier 3 #12 (2026-06-11 Fable review).
+
+### Q-47: Live mixed documents — implement?
+- **Status:** Open
+- **Question:** Are we going to make fenced blocks in the owned markdown renderer live embeds — canvas scenes, pql query results, decision cards, confirm-gated command buttons? Notebook-grade, zero webview. `[XL]`
+- **Context:** The `ClideMarkdownHooks` seam already exists.
+- **Source:** fable-ous.md Part IV, Tier 3 #13 (2026-06-11 Fable review).
+
+### Q-48: Sealed-workspace mode — implement?
+- **Status:** Open
+- **Question:** Are we going to build an egress-audit proxy around the whole agent stack, operationalizing [D-60](../decisions/tooling.md#d-60-no-network-on-default-launch-path)/[D-64](../decisions/architecture.md#d-64-no-telemetry--architectural-commitment) into a provable property? `[XL]`
+- **Context:** The one feature in the review's list competitors cannot copy without breaking their own products.
+- **Source:** fable-ous.md Part IV, Tier 3 #15 (2026-06-11 Fable review).
+
+### Q-49: Review honorable mentions — which, if any, get promoted?
+- **Status:** Open
+- **Question:** Which of the review's honorable mentions, if any, do we promote to tickets: Plan-to-Board bridge (ExitPlanMode approval files the plan as a ticket tree), Release Cockpit (renders `[Unreleased]` + one-action release cut — would also unstall the release-loop story T-393), Daily Helm (since-you-were-last-here pulse on the welcome screen), Total-recall conversation search (D-79 grep over the transcript corpus + fork-from-here), Shared Gaze (attach editor selection/scroll context to outgoing turns), Speakable Layouts (`clide layout apply review.yaml`), Agent fleet tray (per-workspace sockets — requires T-247's stale-socket fix first), Governance Graph (the D/Q/R/T web as a navigable map)?
+- **Context:** Kept as one record to avoid fifteen low-signal questions; promote individually as appetite appears.
+- **Source:** fable-ous.md Part IV, honorable mentions (2026-06-11 Fable review).
+
+---

integration_test/app_starts_test.dart

@@ -33,23 +33,13 @@ void main() {
       tester.view.resetDevicePixelRatio();
     });
 
-    final themes = [
+    final themes = [await const ThemeLoader().fromAsset(rootBundle, 'lib/kernel/src/theme/themes/summer-night.yaml')];
-      await const ThemeLoader().fromAsset(
-        rootBundle,
-        'lib/kernel/src/theme/themes/summer-night.yaml',
-      ),
-    ];
     final services = await KernelServices.boot(
       appDir: await Directory.systemTemp.createTemp('clide_intg_'),
       bundledThemes: themes,
       i18nLoader: AssetCatalogLoader(bundle: rootBundle),
-      preloadNamespaces: const [
+      preloadNamespaces: const ['builtin.welcome', 'builtin.ipc-status', 'builtin.theme-picker', 'builtin.default-layout'],
-        'builtin.welcome',
+      daemonClientFactory: (log, events, _, _) => FakeDaemonClient(log: log, events: events),
-        'builtin.ipc-status',
-        'builtin.theme-picker',
-        'builtin.default-layout',
-      ],
-      daemonClientFactory: (log, events, _, __) => FakeDaemonClient(log: log, events: events),
       autoStartDaemonClient: false,
     );
     services.extensions

integration_test/extension_lifecycle_test.dart

@@ -25,22 +25,13 @@ void main() {
       tester.view.resetDevicePixelRatio();
     });
 
-    final themes = [
+    final themes = [await const ThemeLoader().fromAsset(rootBundle, 'lib/kernel/src/theme/themes/summer-night.yaml')];
-      await const ThemeLoader().fromAsset(
-        rootBundle,
-        'lib/kernel/src/theme/themes/summer-night.yaml',
-      ),
-    ];
     final services = await KernelServices.boot(
       appDir: await Directory.systemTemp.createTemp('clide_lc_'),
       bundledThemes: themes,
       i18nLoader: AssetCatalogLoader(bundle: rootBundle),
-      preloadNamespaces: const [
+      preloadNamespaces: const ['builtin.welcome', 'builtin.ipc-status', 'builtin.default-layout'],
-        'builtin.welcome',
+      daemonClientFactory: (log, events, _, _) => FakeDaemonClient(log: log, events: events),
-        'builtin.ipc-status',
-        'builtin.default-layout',
-      ],
-      daemonClientFactory: (log, events, _, __) => FakeDaemonClient(log: log, events: events),
       autoStartDaemonClient: false,
     );
     services.extensions

integration_test/theme_picker_test.dart

@@ -16,22 +16,13 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   testWidgets('theme.pick command opens modal; selecting dismisses it', (tester) async {
-    final themes = [
+    final themes = [await const ThemeLoader().fromAsset(rootBundle, 'lib/kernel/src/theme/themes/summer-night.yaml')];
-      await const ThemeLoader().fromAsset(
-        rootBundle,
-        'lib/kernel/src/theme/themes/summer-night.yaml',
-      ),
-    ];
     final services = await KernelServices.boot(
       appDir: await Directory.systemTemp.createTemp('clide_theme_intg_'),
       bundledThemes: themes,
       i18nLoader: AssetCatalogLoader(bundle: rootBundle),
-      preloadNamespaces: const [
+      preloadNamespaces: const ['builtin.welcome', 'builtin.theme-picker', 'builtin.default-layout'],
-        'builtin.welcome',
+      daemonClientFactory: (log, events, _, _) => FakeDaemonClient(log: log, events: events),
-        'builtin.theme-picker',
-        'builtin.default-layout',
-      ],
-      daemonClientFactory: (log, events, _, __) => FakeDaemonClient(log: log, events: events),
       autoStartDaemonClient: false,
     );
     services.extensions

lib/builtin/claude/src/activity_cluster.dart

@@ -7,7 +7,7 @@
 /// This file is pure (no Flutter): it turns a flat [ConversationItem] list
 /// into a list of [RenderGroup]s — each either a first-class [StickyItem] or
 /// a foldable [FoldedCluster]. The widget layer renders sticky items as
-/// before and clusters as one [activity card]. Kept separate + unit-tested
+/// before and clusters as one `activity card`. Kept separate + unit-tested
 /// because the fold rules are the load-bearing part.
 library;
 
@@ -74,6 +74,14 @@ final class EditRun extends RenderGroup {
 /// Tools whose result is a diff the user wants to keep first-class at L1/L2.
 bool isDiffTool(String name) => const {'Edit', 'Write', 'MultiEdit', 'NotebookEdit', 'Update'}.contains(name);
 
+/// Tool names that spawn a sub-agent (sidechain): Claude Code emits `Task`,
+/// the Agent SDK surface uses `Agent`. An agent spawn is ALWAYS its own
+/// first-class collapsing card — it breaks the Activity cluster so a fan-out
+/// of N agents reads as N cards, never one merged "Activity / N steps" card
+/// (T-342). Each card carries its own folded prompt (T-263) + nested run
+/// (T-264); the fold mechanics are unchanged, only the grouping boundary.
+bool isAgentTool(String name) => name == 'Task' || name == 'Agent';
+
 /// The file an edit tool-use targets, or null if [it] isn't a same-file edit
 /// (used to group consecutive edits, T-296).
 String? editFilePath(ConversationItem it) {
@@ -159,6 +167,13 @@ bool _isFoldable(ConversationItem item, FoldLevel level, Map<String, String> too
     case AssistantThinkingMessage():
       return level != FoldLevel.tools;
     case AssistantToolUse(:final name):
+      // An Agent/Task spawn is always its own first-class card (T-342) — it
+      // breaks the cluster at every level, including L3, so parallel agents
+      // never merge into one Activity card.
+      if (isAgentTool(name)) return false;
+      // A Workflow run is a first-class orchestration card too (T-416): it owns
+      // the live agent fan-out, so it never folds into a generic Activity card.
+      if (name == 'Workflow') return false;
       // The Edit/Write call stays first-class with its diff at L1/L2.
       if (level == FoldLevel.everything) return true;
       return !isDiffTool(name);

lib/builtin/claude/src/agent_bootstrap.dart

@@ -42,7 +42,8 @@ const List<String> clideAllowedToolsArgs = ['--allowedTools', clideBashAllowRule
 /// the orient-snapshot (`clide status`) and live pane/editor reflection
 /// arrive with Epic C (T-218..T-221) and are deliberately left out so the
 /// note never points the agent at a command that returns nothing yet.
-String clideContextNote(String workspaceRoot) => 'You are running inside clide, an IDE that is hosting this session. clide exposes its IDE '
+String clideContextNote(String workspaceRoot) =>
+    'You are running inside clide, an IDE that is hosting this session. clide exposes its IDE '
     'surface as a `clide` command on your PATH; drive it with `clide <subsystem> <verb>`. '
     'Subsystems that respond today: `files` (workspace tree — `clide files root`, `files list`), '
     '`editor` (`clide editor open <path>`, `editor active`), `git` (`clide git status`), '
@@ -61,16 +62,8 @@ String clideContextNote(String workspaceRoot) => 'You are running inside clide,
 ///   * `CLIDE_WORKSPACE` — the workspace root.
 ///   * `PATH` — prepended with [clideCliDir] when it is non-null (i.e. `clide`
 ///     is not already resolvable), otherwise left untouched.
-Map<String, String> agentEnvDelta({
+Map<String, String> agentEnvDelta({required String workspaceRoot, required String socketPath, required String? currentPath, required String? clideCliDir}) {
-  required String workspaceRoot,
+  final delta = <String, String>{'CLIDE_SOCK': socketPath, 'CLIDE_WORKSPACE': workspaceRoot};
-  required String socketPath,
-  required String? currentPath,
-  required String? clideCliDir,
-}) {
-  final delta = <String, String>{
-    'CLIDE_SOCK': socketPath,
-    'CLIDE_WORKSPACE': workspaceRoot,
-  };
   if (clideCliDir != null && clideCliDir.isNotEmpty) {
     delta['PATH'] = (currentPath == null || currentPath.isEmpty) ? clideCliDir : '$clideCliDir:$currentPath';
   }
@@ -85,11 +78,7 @@ Map<String, String> agentEnvDelta({
 ///
 /// [candidateDirs] is an ordered fallback list; [isExecutableFile] probes
 /// `<dir>/clide`. Both are injected so the resolver is pure and testable.
-String? resolveClideCliDir({
+String? resolveClideCliDir({required String? currentPath, required List<String> candidateDirs, required bool Function(String path) isExecutableFile}) {
-  required String? currentPath,
-  required List<String> candidateDirs,
-  required bool Function(String path) isExecutableFile,
-}) {
   if (currentPath != null) {
     for (final dir in currentPath.split(':')) {
       if (dir.isNotEmpty && isExecutableFile('$dir/clide')) return null;
@@ -142,21 +131,9 @@ AgentBootstrap agentBootstrap(String workspaceRoot, {Map<String, String>? base})
     '$workspaceRoot/native/${nativeClideDirName()}',
     File(Platform.resolvedExecutable).parent.path,
   ];
-  final cliDir = resolveClideCliDir(
+  final cliDir = resolveClideCliDir(currentPath: currentPath, candidateDirs: candidates, isExecutableFile: _isExecutableFile);
-    currentPath: currentPath,
+  final delta = agentEnvDelta(workspaceRoot: workspaceRoot, socketPath: workspaceSocketPath(workspaceRoot), currentPath: currentPath, clideCliDir: cliDir);
-    candidateDirs: candidates,
+  return AgentBootstrap(envDelta: {...?base, ...delta}, extraArgs: ['--allowedTools', clideBashAllowRule]);
-    isExecutableFile: _isExecutableFile,
-  );
-  final delta = agentEnvDelta(
-    workspaceRoot: workspaceRoot,
-    socketPath: workspaceSocketPath(workspaceRoot),
-    currentPath: currentPath,
-    clideCliDir: cliDir,
-  );
-  return AgentBootstrap(
-    envDelta: {...?base, ...delta},
-    extraArgs: ['--allowedTools', clideBashAllowRule],
-  );
 }
 
 bool _isExecutableFile(String path) {

lib/builtin/claude/src/bash_tail_source.dart

@@ -0,0 +1,119 @@
+/// Detect the file a Bash command follows, for the live-tail sub-card (T-325).
+///
+/// Claude Code runs every Bash tool itself and clide only sees the final
+/// `tool_result` block — we never tap the running command's stdout. So instead
+/// of mirroring the process, we detect a *file-backed source* the command
+/// reads/follows and open our own read-only follower on the same file.
+///
+/// Deliberately conservative (the ticket's "small, explicit allowlist"): only
+/// the read/follow verbs below, only a single file argument, and only paths
+/// that resolve INSIDE the workspace. Anything else — a pipe into `tail`, a
+/// redirect, two files, a path outside the repo — returns null so the caller
+/// shows a "nothing to follow" affordance instead of following the wrong thing.
+library;
+
+import 'dart:io';
+
+import 'package:clide/src/files/path_safety.dart';
+
+/// Verbs whose single file argument clide can independently follow read-only.
+const Set<String> _followVerbs = {'tail', 'cat', 'less'};
+
+/// The file [command] reads/follows that clide can mirror read-only, as an
+/// absolute path inside [workspaceRoot] — or null when there is no single,
+/// safe, file-backed source. See the library doc for the policy.
+String? detectBashTailSource(String command, {required Directory workspaceRoot}) {
+  String? found;
+  for (final segment in _commandSegments(command)) {
+    final tokens = _tokenize(segment);
+    if (tokens.isEmpty || !_followVerbs.contains(tokens.first)) continue;
+    final files = _fileArgs(tokens.first, tokens.sublist(1));
+    if (files.length != 1) continue; // 0 → reads stdin (a pipe); >1 → ambiguous
+
+    final String resolved;
+    try {
+      resolved = resolveUnderRoot(workspaceRoot, files.single);
+    } on PathOutsideRoot {
+      continue; // outside the workspace → don't follow (v1 policy)
+    }
+    if (found != null && found != resolved) return null; // two distinct sources
+    found = resolved;
+  }
+  return found;
+}
+
+/// Whether [command] expresses an intent to FOLLOW a file — used to decide
+/// when to surface the live-tail segment at all, so ordinary commands (`ls`,
+/// `git status`, a plain `cat`) get no segment, but a `tail …` with no
+/// followable file still shows the "nothing to follow" note. v1 triggers on
+/// `tail` or a follow flag (`-f`/`-F`/`--follow`); `cat`/`less` are detectable
+/// sources but don't trigger the UI on their own (T-325).
+bool bashHasTailIntent(String command) {
+  for (final segment in _commandSegments(command)) {
+    final tokens = _tokenize(segment);
+    if (tokens.isEmpty) continue;
+    if (tokens.first == 'tail') return true;
+    if (tokens.any((t) => t == '-f' || t == '-F' || t == '--follow')) return true;
+  }
+  return false;
+}
+
+/// Split a command line into command/pipeline segments on `|`, `;`, `&`. The
+/// doubled forms (`&&`, `||`) fall out as empty middles and are dropped.
+Iterable<String> _commandSegments(String command) => command.split(RegExp(r'[|;&]')).where((s) => s.trim().isNotEmpty);
+
+/// Positional (non-flag) file arguments for [verb]. Skips flags, consumes the
+/// value of `tail -n N` / `-c N`, honours `--` (end of options), and stops at a
+/// redirect (`>` / `<`) — everything after a redirect targets a fd, not the
+/// command's input.
+List<String> _fileArgs(String verb, List<String> args) {
+  final files = <String>[];
+  for (var i = 0; i < args.length; i++) {
+    final a = args[i];
+    if (a == '--') {
+      files.addAll(args.sublist(i + 1).where((t) => !t.contains('>') && !t.contains('<')));
+      break;
+    }
+    if (a.contains('>') || a.contains('<')) break; // a redirect ends positional args
+    if (a.startsWith('-')) {
+      if (verb == 'tail' && (a == '-n' || a == '-c') && i + 1 < args.length) i++; // -n N / -c N
+      continue;
+    }
+    files.add(a);
+  }
+  return files;
+}
+
+/// Minimal shell tokeniser: splits on whitespace, honours single/double quotes
+/// (no escape or expansion handling — enough to recover file arguments).
+List<String> _tokenize(String s) {
+  final out = <String>[];
+  final buf = StringBuffer();
+  String? quote;
+  var has = false;
+  for (var i = 0; i < s.length; i++) {
+    final ch = s[i];
+    if (quote != null) {
+      if (ch == quote) {
+        quote = null;
+      } else {
+        buf.write(ch);
+      }
+      has = true;
+    } else if (ch == '"' || ch == "'") {
+      quote = ch;
+      has = true;
+    } else if (ch == ' ' || ch == '\t') {
+      if (has) {
+        out.add(buf.toString());
+        buf.clear();
+        has = false;
+      }
+    } else {
+      buf.write(ch);
+      has = true;
+    }
+  }
+  if (has) out.add(buf.toString());
+  return out;
+}

lib/builtin/claude/src/claude_banner.dart

@@ -35,20 +35,12 @@ class ClaudeBanner extends StatelessWidget {
         children: [
           const ClideSvgView.asset('assets/logo/logo.svg', width: 60, height: 60),
           const SizedBox(height: 18),
-          ClideText(
+          ClideText('Claude', fontSize: clideFontDialogTitle, color: claudeAccent, fontWeight: FontWeight.w500),
-            'Claude',
-            fontSize: clideFontDialogTitle,
-            color: claudeAccent,
-            fontWeight: FontWeight.w500,
-          ),
           const SizedBox(height: 2),
           ClideText(role, fontSize: clideFontSmall, muted: true, fontFamily: clideMonoFamily),
           const SizedBox(height: 16),
           if (ws != null) ClideText(ws, fontSize: clideFontCaption, muted: true),
-          if (statusLine != null) ...[
+          if (statusLine != null) ...[const SizedBox(height: 2), ClideText(statusLine!, fontSize: clideFontSmall, muted: true, fontFamily: clideMonoFamily)],
-            const SizedBox(height: 2),
-            ClideText(statusLine!, fontSize: clideFontSmall, muted: true, fontFamily: clideMonoFamily),
-          ],
           const SizedBox(height: 16),
           const ClideText('Warming up — your conversation will appear here.', fontSize: clideFontSmall, muted: true),
         ],

lib/builtin/claude/src/claude_composer.dart

@@ -352,7 +352,12 @@ class _ClaudeComposerState extends State<ClaudeComposer> {
     }
   }
 
-  void _applyHistory(String text) => _applyValue(TextEditingValue(text: text, selection: TextSelection.collapsed(offset: text.length)));
+  void _applyHistory(String text) => _applyValue(
+    TextEditingValue(
+      text: text,
+      selection: TextSelection.collapsed(offset: text.length),
+    ),
+  );
 
   /// Set the controller without it being treated as a user edit (so the
   /// preview doesn't overwrite the persisted draft or exit navigation).
@@ -368,10 +373,7 @@ class _ClaudeComposerState extends State<ClaudeComposer> {
     final tokens = _attachments.map((a) => a.pathToken);
     if (text.trim().isEmpty && _attachments.isEmpty) return;
     // Typed text first, then the attachment @path references.
-    final message = [
+    final message = [if (text.trim().isNotEmpty) text, ...tokens].join(' ');
-      if (text.trim().isNotEmpty) text,
-      ...tokens,
-    ].join(' ');
     widget.onSubmit(message);
     _controller.clear();
     setState(() => _attachments.clear());
@@ -454,11 +456,7 @@ class _ClaudeComposerState extends State<ClaudeComposer> {
               if (_attachments.isNotEmpty)
                 Padding(
                   padding: const EdgeInsets.only(bottom: 8),
-                  child: Wrap(
+                  child: Wrap(spacing: 6, runSpacing: 6, children: [for (final a in _attachments) _chip(theme, a)]),
-                    spacing: 6,
-                    runSpacing: 6,
-                    children: [for (final a in _attachments) _chip(theme, a)],
-                  ),
                 ),
               Row(
                 crossAxisAlignment: CrossAxisAlignment.end,
@@ -489,13 +487,7 @@ class _ClaudeComposerState extends State<ClaudeComposer> {
                           },
                           child: Stack(
                             children: [
-                              if (!hasText)
+                              if (!hasText) Positioned(left: 0, top: 0, right: 0, child: ClideText(widget.hint, muted: true, fontSize: clideFontBody)),
-                                Positioned(
-                                  left: 0,
-                                  top: 0,
-                                  right: 0,
-                                  child: ClideText(widget.hint, muted: true, fontSize: clideFontBody),
-                                ),
                               EditableText(
                                 controller: _controller,
                                 focusNode: _focus,
@@ -516,10 +508,7 @@ class _ClaudeComposerState extends State<ClaudeComposer> {
                     const SizedBox(width: 8),
                     Padding(
                       padding: const EdgeInsets.only(bottom: 2),
-                      child: PermissionModeControl(
+                      child: PermissionModeControl(mode: widget.permissionMode!, onSelect: widget.onSetPermissionMode!),
-                        mode: widget.permissionMode!,
-                        onSelect: widget.onSetPermissionMode!,
-                      ),
                     ),
                   ],
                 ],
@@ -548,12 +537,7 @@ class _ClaudeComposerState extends State<ClaudeComposer> {
           _chipLeading(theme, a),
           const SizedBox(width: 6),
           Flexible(
-            child: ClideText(
+            child: ClideText(a.fileName, fontSize: clideFontSmall, maxLines: 1, overflow: TextOverflow.ellipsis),
-              a.fileName,
-              fontSize: clideFontSmall,
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
-            ),
           ),
           const SizedBox(width: 4),
           Semantics(

lib/builtin/claude/src/claude_config.dart

@@ -94,13 +94,7 @@ class ClaudePermissions {
 /// + plugin + MCP), the skill names, the default model and permission mode.
 @immutable
 class ClaudeProbe {
-  const ClaudeProbe({
+  const ClaudeProbe({required this.version, required this.slashCommands, required this.skills, this.model, this.permissionMode});
-    required this.version,
-    required this.slashCommands,
-    required this.skills,
-    this.model,
-    this.permissionMode,
-  });
 
   final String version;
   final List<String> slashCommands;
@@ -109,12 +103,12 @@ class ClaudeProbe {
   final String? permissionMode;
 
   Map<String, Object?> toJson() => {
-        'version': version,
+    'version': version,
-        'slash_commands': slashCommands,
+    'slash_commands': slashCommands,
-        'skills': skills,
+    'skills': skills,
-        if (model != null) 'model': model,
+    if (model != null) 'model': model,
-        if (permissionMode != null) 'permission_mode': permissionMode,
+    if (permissionMode != null) 'permission_mode': permissionMode,
-      };
+  };
 
   /// Build from a stream-json `init` event object. Returns null if it doesn't
   /// look like an init event (no version field).
@@ -130,12 +124,12 @@ class ClaudeProbe {
   }
 
   static ClaudeProbe fromCache(Map<String, Object?> j) => ClaudeProbe(
-        version: (j['version'] as String?) ?? '',
+    version: (j['version'] as String?) ?? '',
-        slashCommands: _stringList(j['slash_commands']),
+    slashCommands: _stringList(j['slash_commands']),
-        skills: _stringList(j['skills']),
+    skills: _stringList(j['skills']),
-        model: j['model'] as String?,
+    model: j['model'] as String?,
-        permissionMode: j['permission_mode'] as String?,
+    permissionMode: j['permission_mode'] as String?,
-      );
+  );
 }
 
 List<String> _stringList(Object? v) => v is List ? v.whereType<String>().toList(growable: false) : const [];
@@ -151,29 +145,14 @@ typedef ClaudeInitProbe = Future<String?> Function();
 /// Returns a change stream for [dir] (fires on any file event under it).
 typedef ClaudeConfigWatch = Stream<void> Function(Directory dir);
 
-/// Modest version-agnostic fallback used when the probe is unavailable, so
+/// Fallback used when the probe is unavailable. Mirrors the builtins a real
-/// the typeahead still offers the common built-ins.
+/// CLI advertises in its stream-json `initialize` handshake (probed against
-const List<String> kFallbackSlashCommands = [
+/// 2.1.175) — i.e. the ones that genuinely work headless. It deliberately
-  'add-dir',
+/// does NOT list TUI-only commands (config, permissions, status, doctor, …):
-  'agents',
+/// this list doubles as the router's "advertised" set (T-411), and a TUI-only
-  'clear',
+/// token here would be forwarded to the CLI and error. The composer unions
-  'compact',
+/// [kClideOwnedCommands] on top for the typeahead (T-162).
-  'config',
+const List<String> kFallbackSlashCommands = ['clear', 'compact', 'context', 'init', 'review', 'security-review', 'usage'];
-  'context',
-  'cost',
-  'doctor',
-  'exit',
-  'help',
-  'init',
-  'mcp',
-  'memory',
-  'model',
-  'permissions',
-  'resume',
-  'review',
-  'status',
-  'usage',
-];
 
 class ClaudeConfig extends ChangeNotifier {
   ClaudeConfig({
@@ -184,13 +163,13 @@ class ClaudeConfig extends ChangeNotifier {
     ClaudeInitProbe? initProbe,
     ClaudeConfigWatch? watch,
     Duration debounce = const Duration(milliseconds: 150),
-  })  : _globalDir = globalDir,
+  }) : _globalDir = globalDir,
-        _cacheDir = cacheDir,
+       _cacheDir = cacheDir,
-        _projectDir = projectDir,
+       _projectDir = projectDir,
-        _versionRunner = versionRunner ?? _defaultVersionRunner,
+       _versionRunner = versionRunner ?? _defaultVersionRunner,
-        _initProbe = initProbe ?? _defaultInitProbe,
+       _initProbe = initProbe ?? _defaultInitProbe,
-        _watch = watch,
+       _watch = watch,
-        _debounceFor = debounce;
+       _debounceFor = debounce;
 
   final Directory _globalDir;
   final Directory _cacheDir;
@@ -259,6 +238,7 @@ class ClaudeConfig extends ChangeNotifier {
     _version = _parseVersion(await _guard(_versionRunner));
     await _readProbeCache();
     await _loadDiskConfig();
+    if (_disposed) return; // activation fired-and-forgot; teardown won
     _startWatchers();
     notifyListeners();
   }
@@ -277,6 +257,7 @@ class ClaudeConfig extends ChangeNotifier {
       if (probe == null) return; // stay on the static fallback
       _probe = probe;
       await _writeProbeCache(probe);
+      if (_disposed) return; // a slow probe racing a teardown mustn't notify a disposed notifier
       notifyListeners();
     } finally {
       _probing = false;
@@ -288,6 +269,7 @@ class ClaudeConfig extends ChangeNotifier {
   /// not re-resolved (the binary doesn't change under us at runtime).
   Future<void> refresh() async {
     await _loadDiskConfig();
+    if (_disposed) return; // a watcher-driven refresh racing a teardown mustn't notify a disposed notifier
     notifyListeners();
   }
 
@@ -298,12 +280,19 @@ class ClaudeConfig extends ChangeNotifier {
     _stopWatching();
     _projectDir = dir;
     await _loadDiskConfig();
+    if (_disposed) return; // a project switch racing a teardown mustn't notify a disposed notifier
     _startWatchers();
     notifyListeners();
   }
 
+  /// Set when [dispose] runs. The fire-and-forget [load] from extension
+  /// activation checks this so a teardown racing an in-flight load can't
+  /// notify (or start watchers on) a disposed notifier.
+  bool _disposed = false;
+
   @override
   void dispose() {
+    _disposed = true;
     _stopWatching();
     super.dispose();
   }
@@ -400,10 +389,7 @@ class ClaudeConfig extends ChangeNotifier {
   /// Global first so that local entries, added later, win on collisions.
   List<(ConfigScope, Directory)> _scopeDirs() {
     final pd = _projectDir;
-    return [
+    return [(ConfigScope.global, _globalDir), if (pd != null) (ConfigScope.local, Directory('${pd.path}/.claude'))];
-      (ConfigScope.global, _globalDir),
-      if (pd != null) (ConfigScope.local, Directory('${pd.path}/.claude')),
-    ];
   }
 
   Future<List<ClaudeSkill>> _loadSkills(Directory scopeDir, ConfigScope scope) async {
@@ -415,12 +401,7 @@ class ClaudeConfig extends ChangeNotifier {
       final manifest = File('${entry.path}/SKILL.md');
       if (!await manifest.exists()) continue;
       final fm = _parseFrontmatter(await manifest.readAsString());
-      out.add(ClaudeSkill(
+      out.add(ClaudeSkill(name: fm.name ?? _basename(entry.path), description: fm.description, scope: scope, path: manifest.path));
-        name: fm.name ?? _basename(entry.path),
-        description: fm.description,
-        scope: scope,
-        path: manifest.path,
-      ));
     }
     return out;
   }
@@ -432,11 +413,7 @@ class ClaudeConfig extends ChangeNotifier {
     await for (final entry in dir.list()) {
       if (entry is! File || !entry.path.endsWith('.md')) continue;
       final base = _basename(entry.path);
-      out.add(ClaudeCommand(
+      out.add(ClaudeCommand(name: base.substring(0, base.length - 3), scope: scope, path: entry.path));
-        name: base.substring(0, base.length - 3),
-        scope: scope,
-        path: entry.path,
-      ));
     }
     return out;
   }
@@ -449,11 +426,7 @@ class ClaudeConfig extends ChangeNotifier {
     await for (final entry in dir.list()) {
       if (entry is! File || !entry.path.endsWith('.md')) continue;
       final base = _basename(entry.path);
-      out.add(ClaudeAgent(
+      out.add(ClaudeAgent(name: base.substring(0, base.length - 3), scope: scope, path: entry.path));
-        name: base.substring(0, base.length - 3),
-        scope: scope,
-        path: entry.path,
-      ));
     }
     return out;
   }
@@ -472,11 +445,7 @@ class ClaudeConfig extends ChangeNotifier {
   ClaudePermissions _permissionsOf(Map<String, Object?> settings) {
     final p = settings['permissions'];
     if (p is! Map) return const ClaudePermissions();
-    return ClaudePermissions(
+    return ClaudePermissions(allow: _stringList(p['allow']), deny: _stringList(p['deny']), ask: _stringList(p['ask']));
-      allow: _stringList(p['allow']),
-      deny: _stringList(p['deny']),
-      ask: _stringList(p['ask']),
-    );
   }
 
   // ---- Watching -----------------------------------------------------------
@@ -573,9 +542,7 @@ class ClaudeConfig extends ChangeNotifier {
   /// Claude's `mcpServers` is a `Map<String, {...config}>` keyed on server name.
   static List<ClaudeMcpServer> _parseMcpServers(Object? raw) {
     if (raw is! Map) return const [];
-    return [
+    return [for (final key in raw.keys) ClaudeMcpServer(name: '$key')];
-      for (final key in raw.keys) ClaudeMcpServer(name: '$key'),
-    ];
   }
 
   static List<T> _dedupeByName<T>(List<T> all, String Function(T) nameOf) {
@@ -608,14 +575,7 @@ Future<String?> _defaultVersionRunner() async {
 
 Future<String?> _defaultInitProbe() async {
   try {
-    final r = await Process.run('claude', [
+    final r = await Process.run('claude', ['-p', '.', '--no-session-persistence', '--output-format', 'stream-json', '--verbose']);
-      '-p',
-      '.',
-      '--no-session-persistence',
-      '--output-format',
-      'stream-json',
-      '--verbose',
-    ]);
     return r.stdout as String?;
   } catch (_) {
     return null;

lib/builtin/claude/src/claude_pane.dart

@@ -14,6 +14,7 @@ import 'clipboard_paste.dart';
 import 'activity_cluster.dart' show foldLevelFromName, kActivityFoldLevelKey;
 import 'conversation_controller.dart';
 import 'conversation_view.dart';
+import 'model_picker_card.dart';
 import 'permission_mode_control.dart';
 import 'prompt_card.dart';
 import 'session_index.dart';
@@ -24,6 +25,7 @@ import 'slash_commands.dart';
 import 'stream_json_session.dart';
 import 'task_list.dart';
 import 'transcript_reader.dart';
+import 'workflow_run.dart';
 
 /// The Claude conversation pane. Drives `claude` over the stream-json control
 /// protocol (D-77/D-78): a [StreamJsonSession] owns the process, its events
@@ -71,7 +73,11 @@ class ClaudePane extends StatefulWidget {
 
 class _ClaudePaneState extends State<ClaudePane> {
   StreamSubscription<SessionStatus>? _statusSub;
+  StreamSubscription<SessionEnd>? _endSub;
   StreamSubscription<ProjectOpened>? _projectSub;
+  StreamSubscription<Message>? _commandSub;
+  StreamSubscription<String>? _modelErrorSub;
+  StreamSubscription<Map<String, WorkflowRun>>? _workflowsSub;
   ConversationController? _conversation;
   StreamJsonSession? _session;
   SessionStatus _status = const SessionStatus();
@@ -80,6 +86,21 @@ class _ClaudePaneState extends State<ClaudePane> {
   String? _error;
   String _statusLine = 'starting…';
 
+  /// One-shot fork source: seeds the first bind, then cleared so /clear,
+  /// /resume, and respawns operate on this pane's own session (T-375).
+  late String? _forkSource = widget.forkSourceId;
+
+  /// Whether a bare `/model` opened the picker in the interaction zone
+  /// (T-408). An open prompt takes precedence; the picker shows once it
+  /// resolves.
+  bool _modelPickerOpen = false;
+  bool _effortPickerOpen = false;
+  bool _permissionPickerOpen = false;
+
+  /// Effort level this pane's session runs at (`--effort`, T-412). Null =
+  /// the CLI default. Set by /effort; carried by every respawn.
+  String? _effort;
+
   bool _spawned = false;
 
   /// Per-session composer draft (text + caret), held here so an unsent
@@ -141,6 +162,10 @@ class _ClaudePaneState extends State<ClaudePane> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
+    // Cache the kernel for dispose() — ancestor lookups there are illegal,
+    // and the old lookup-and-swallow leaked the settings listener on every
+    // disposed pane (T-366).
+    _kernel = ClideKernel.of(context);
     // Spawn once, after the kernel is available.
     if (!_spawned) {
       _spawned = true;
@@ -155,6 +180,18 @@ class _ClaudePaneState extends State<ClaudePane> {
       // GlobalKey and spawns once, so without this it would keep the previous
       // repo's session after a switch (T-269).
       _projectSub = ClideKernel.of(context).events.on<ProjectOpened>().listen(_onProjectChanged);
+      // Sidebar controls (and any future surface) drive this pane's session by
+      // publishing slash-command text on builtin.claude/command (T-414) —
+      // executed through the exact _send routing the composer uses, so the
+      // control and the typed command are one code path (D-6). Only the
+      // primary pane listens: the controls target the primary session, and a
+      // second listener would double-execute.
+      if (widget.isPrimary) {
+        _commandSub = ClideKernel.of(context).messages.subscribe(publisher: 'builtin.claude', channel: 'command').listen((msg) {
+          final text = msg.data['text'] as String?;
+          if (text != null && text.isNotEmpty) _send(text);
+        });
+      }
       // Re-fold the conversation when the activity fold-level setting changes
       // (claude.activity.fold-level command, T-235).
       ClideKernel.of(context).settings.addListener(_onSettingsChanged);
@@ -168,11 +205,18 @@ class _ClaudePaneState extends State<ClaudePane> {
   @override
   void dispose() {
     activeClaudeConfig?.removeListener(_onConfigChanged);
-    _kernel()?.settings.removeListener(_onSettingsChanged);
+    _kernel?.settings.removeListener(_onSettingsChanged);
     _projectSub?.cancel();
+    _commandSub?.cancel();
     _projectSub = null;
     _statusSub?.cancel();
     _statusSub = null;
+    _endSub?.cancel();
+    _endSub = null;
+    _modelErrorSub?.cancel();
+    _modelErrorSub = null;
+    _workflowsSub?.cancel();
+    _workflowsSub = null;
     // The orchestrator owns the session, so disposing this pane does NOT kill
     // it — that's what lets a hidden/kept-alive pane keep its session (T-169).
     // A secondary tab being *closed* is a real teardown, so close its session;
@@ -197,9 +241,12 @@ class _ClaudePaneState extends State<ClaudePane> {
         sub.cancel();
         if (!c.isCompleted) c.complete();
       });
-      await c.future.timeout(const Duration(seconds: 10), onTimeout: () {
+      await c.future.timeout(
-        sub.cancel();
+        const Duration(seconds: 10),
-      });
+        onTimeout: () {
+          sub.cancel();
+        },
+      );
       if (!mounted) return;
     }
     return _spawn();
@@ -221,6 +268,15 @@ class _ClaudePaneState extends State<ClaudePane> {
   Future<void> _rebindToActiveProject() async {
     _statusSub?.cancel();
     _statusSub = null;
+    _endSub?.cancel();
+    _endSub = null;
+    _modelErrorSub?.cancel();
+    _modelErrorSub = null;
+    _workflowsSub?.cancel();
+    _workflowsSub = null;
+    _modelPickerOpen = false;
+    _effortPickerOpen = false;
+    _permissionPickerOpen = false;
     await activeSessionOrchestrator?.close(_orchId); // kills the old repo's session
     _conversation = null;
     _session = null;
@@ -260,24 +316,31 @@ class _ClaudePaneState extends State<ClaudePane> {
     }
 
     final ManagedSession managed;
-    final forkSource = widget.forkSourceId;
+    final forkSource = _forkSource;
     if (forkSource != null) {
       // Fork pane: branch source session into a new clide-managed session.
       // The clide-internal id is a fresh UUID; the real claude session id is
       // assigned by `--fork-session` and arrives in the init event (T-172).
       _sessionId ??= freshSessionId();
       try {
-        managed = await orch.spawn(SpawnSpec(
+        managed = await orch.spawn(
-          id: _orchId,
+          SpawnSpec(
-          role: 'fork ${widget.secondaryIndex}',
+            id: _orchId,
-          sessionId: _sessionId!,
+            role: 'fork ${widget.secondaryIndex}',
-          cwd: repoRoot,
+            sessionId: _sessionId!,
-          forkSourceSessionId: forkSource,
+            cwd: repoRoot,
-        ));
+            forkSourceSessionId: forkSource,
+            effort: _effort,
+          ),
+        );
       } catch (e) {
         if (mounted) setState(() => _error = 'Could not start fork: $e');
         return;
       }
+      // One-shot: the fork source seeds only the FIRST bind. Leaving it set
+      // made /clear re-fork the original conversation instead of clearing —
+      // every later respawn must operate on this pane's own session (T-375).
+      _forkSource = null;
       if (!mounted) return;
       setState(() => _statusLine = 'fork of $forkSource');
     } else {
@@ -291,14 +354,17 @@ class _ClaudePaneState extends State<ClaudePane> {
       final resume = await File(transcriptFile).exists();
 
       try {
-        managed = await orch.spawn(SpawnSpec(
+        managed = await orch.spawn(
-          id: _orchId,
+          SpawnSpec(
-          role: widget.isPrimary ? 'primary' : 'session ${widget.secondaryIndex}',
+            id: _orchId,
-          sessionId: _sessionId!,
+            role: widget.isPrimary ? 'primary' : 'session ${widget.secondaryIndex}',
-          cwd: repoRoot,
+            sessionId: _sessionId!,
-          resume: resume,
+            cwd: repoRoot,
-          transcriptPath: resume ? transcriptFile : null,
+            resume: resume,
-        ));
+            transcriptPath: resume ? transcriptFile : null,
+            effort: _effort,
+          ),
+        );
       } catch (e) {
         if (mounted) setState(() => _error = 'Could not start claude: $e');
         return;
@@ -309,19 +375,52 @@ class _ClaudePaneState extends State<ClaudePane> {
 
     _session = managed.session;
     _conversation = managed.conversation;
+    // The wire never reports effort — record what this session was spawned
+    // with so the status line / sidebar can show it (T-412).
+    if (_effort != null) managed.session.noteEffort(_effort!);
     // Diagnostic (T-274 follow-up): record how this pane bound its session —
     // a fresh spawn vs connecting to existing on-disk history (the seed read
     // from the transcript/sidecar). Surfaces the resume path in `make run`.
     final seeded = _conversation?.items.length ?? 0;
-    _kernel()?.log.info(
+    _kernel?.log.info(
-          'claude',
+      'claude',
-          'pane $_orchId bound session ${_sessionId ?? '?'} in $repoRoot — '
+      'pane $_orchId bound session ${_sessionId ?? '?'} in $repoRoot — '
-              '${seeded > 0 ? 'connected to history ($seeded seeded item(s))' : 'fresh session (no history)'}',
+          '${seeded > 0 ? 'connected to history ($seeded seeded item(s))' : 'fresh session (no history)'}',
-        );
+    );
     _statusSub = managed.session.statusStream.listen((s) {
       if (!mounted) return;
       setState(() => _status = s);
     });
+    // Workflow runs arrive on out-of-band system events that add no
+    // conversation item, so the view won't rebuild on its own — drive a
+    // rebuild as the run map changes so the workflow card updates live (T-416).
+    _workflowsSub = managed.session.workflowsStream.listen((_) {
+      if (!mounted) return;
+      setState(() {});
+    });
+    // A rejected /model change (unknown name) rolls back silently in the
+    // status — say why out loud (T-408).
+    _modelErrorSub = managed.session.modelErrors.listen((msg) {
+      _kernel?.notify.warn(msg, title: 'model');
+    });
+    // Surface a dead process instead of letting it look thoughtful (T-361):
+    // late binders read the replayed end; live sessions stream it.
+    final alreadyEnded = managed.session.end;
+    if (alreadyEnded != null) {
+      _onSessionEnd(alreadyEnded);
+    } else {
+      _endSub = managed.session.endedStream.listen(_onSessionEnd);
+    }
+  }
+
+  /// The claude process exited under this pane's live session. Stop looking
+  /// busy, say so in the status line, and log the drained stderr tail —
+  /// the diagnostics that used to vanish (T-361).
+  void _onSessionEnd(SessionEnd end) {
+    if (!mounted) return;
+    final tail = end.stderrTail.isEmpty ? '' : '; stderr tail:\n${end.stderrTail.join('\n')}';
+    _kernel?.log.warn('claude', 'session $_orchId exited (code ${end.exitCode})$tail');
+    setState(() => _statusLine = 'claude exited (code ${end.exitCode}) — /clear to restart');
   }
 
   // Send composed text to Claude over the stream-json channel. Commands clide
@@ -341,10 +440,152 @@ class _ClaudePaneState extends State<ClaudePane> {
       case 'fork':
         _forkSession();
         return;
+      case 'model':
+        _modelCommand(slashCommandArg(text) ?? '');
+        return;
+      case 'effort':
+        _effortCommand(slashCommandArg(text) ?? '');
+        return;
+      case 'permissions':
+        _permissionsCommand(slashCommandArg(text) ?? '');
+        return;
+      case 'status':
+        _openMetaTab('activity');
+        return;
+      case 'config':
+      case 'mcp':
+      case 'agents':
+      case 'hooks':
+        _openMetaTab('config');
+        return;
+      case 'memory':
+        _openMemory();
+        return;
+      case 'help':
+        _helpCommand();
+        return;
+    }
+    // Route the rest (T-411): a known TUI-only builtin never reaches the
+    // session — forwarded it would error (or, un-advertised, bracket-paste to
+    // the model as literal text, burning a turn). It becomes a local notice
+    // card pointing at the clide-native way instead.
+    final advertised = activeClaudeConfig?.slashCommands ?? kFallbackSlashCommands;
+    if (routeSlashCommand(text, advertised: advertised) == SlashRoute.unavailable) {
+      _session?.addLocalNotice(tuiOnlyNotice(slashCommandToken(text)!));
+      return;
     }
     _session?.send(text);
   }
 
+  /// clide-owned `/model` (T-408): with an argument, set the model directly;
+  /// bare, open the picker in the interaction zone (D-78).
+  void _modelCommand(String arg) {
+    if (_session == null) return;
+    if (arg.isNotEmpty) {
+      _session!.setModel(arg);
+      return;
+    }
+    setState(() => _modelPickerOpen = true);
+  }
+
+  void _pickModel(String value) {
+    _session?.setModel(value);
+    _closeModelPicker();
+  }
+
+  void _closeModelPicker() {
+    setState(() => _modelPickerOpen = false);
+    _composerFocus.requestFocus();
+  }
+
+  /// clide-owned `/effort` (T-412): with a level, respawn-with-resume carrying
+  /// `--effort`; bare, open the picker. No set_effort control subtype exists
+  /// (probed 2.1.175), so the respawn IS the mechanism — resume keeps the
+  /// conversation, only the process restarts.
+  void _effortCommand(String arg) {
+    if (_session == null) return;
+    if (arg.isEmpty) {
+      setState(() => _effortPickerOpen = true);
+      return;
+    }
+    if (!kEffortLevels.any((l) => l.value == arg)) {
+      _session!.addLocalNotice('unknown effort "$arg" — levels: ${kEffortLevels.map((l) => l.value).join(', ')}');
+      return;
+    }
+    _setEffort(arg);
+  }
+
+  void _pickEffort(String value) {
+    _closeEffortPicker();
+    _setEffort(value);
+  }
+
+  void _closeEffortPicker() {
+    setState(() => _effortPickerOpen = false);
+    _composerFocus.requestFocus();
+  }
+
+  void _setEffort(String level) {
+    final sid = _sessionId;
+    if (sid == null) return;
+    _effort = level;
+    _kernel?.notify.info('effort $level — restarting the session to apply', title: 'effort');
+    unawaited(_respawnWithSession(sid));
+  }
+
+  /// clide-owned `/permissions` (T-413): with a mode, set it directly over
+  /// set_permission_mode; bare, open a picker — the same interaction-zone
+  /// pattern as /model and /effort.
+  void _permissionsCommand(String arg) {
+    final s = _session;
+    if (s == null) return;
+    if (arg.isEmpty) {
+      setState(() => _permissionPickerOpen = true);
+      return;
+    }
+    if (!kPermissionModes.any((m) => m.value == arg)) {
+      s.addLocalNotice('unknown permission mode "$arg" — modes: ${kPermissionModes.map((m) => m.value).join(', ')}');
+      return;
+    }
+    s.setPermissionMode(arg);
+  }
+
+  void _pickPermissionMode(String value) {
+    _closePermissionPicker();
+    _session?.setPermissionMode(value);
+  }
+
+  void _closePermissionPicker() {
+    setState(() => _permissionPickerOpen = false);
+    _composerFocus.requestFocus();
+  }
+
+  /// Navigate to the Claude sidebar and select a sub-tab (T-413): the
+  /// /status//config//mcp//agents//hooks commands land here.
+  void _openMetaTab(String tab) {
+    final k = _kernel;
+    if (k == null) return;
+    k.panels.activateTab(Slots.sidebar, 'claude.meta');
+    k.messages.publish('builtin.claude', 'meta.tab', {'tab': tab});
+  }
+
+  /// clide-owned `/memory` (T-413): open the workspace CLAUDE.md in the editor.
+  void _openMemory() {
+    final root = _repoRoot;
+    if (root == null) return;
+    unawaited(_ipc()?.request('editor.open', args: {'path': '$root/CLAUDE.md'}));
+  }
+
+  /// clide-owned `/help` (T-413): a local summary card — never the CLI's TUI
+  /// help, which doesn't exist headless.
+  void _helpCommand() {
+    final advertised = (activeClaudeConfig?.slashCommands ?? kFallbackSlashCommands).where((c) => !kClideOwnedCommands.contains(c)).toList()..sort();
+    _session?.addLocalNotice(
+      'clide commands: ${(kClideOwnedCommands.toList()..sort()).map((c) => '/$c').join(' ')}\n'
+      'claude commands & skills: ${advertised.map((c) => '/$c').join(' ')}',
+    );
+  }
+
   /// Record a submitted prompt in the active session's history (T-163),
   /// de-duping immediate repeats. Empty/whitespace prompts are skipped.
   void _appendHistory(String text) {
@@ -369,7 +610,7 @@ class _ClaudePaneState extends State<ClaudePane> {
   /// background tap must never pull focus from (or resurrect) the composer
   /// over an open prompt.
   void _focusComposerOnTap() {
-    if (_session?.pendingPrompt != null) return;
+    if (_session?.pendingPrompt != null || _modelPickerOpen || _effortPickerOpen || _permissionPickerOpen) return;
     _composerFocus.requestFocus();
   }
 
@@ -421,18 +662,12 @@ class _ClaudePaneState extends State<ClaudePane> {
   /// re-bind the pane to it.
   Future<void> _resumeFlow() async {
     final root = _repoRoot;
-    final dialog = _kernel()?.dialog;
+    final dialog = _kernel?.dialog;
     if (root == null || dialog == null) return;
     final dir = Directory(claudeProjectDir(root));
     final sessions = await listSessions(dir);
     if (!mounted) return;
-    final picked = await dialog.show<String>(
+    final picked = await dialog.show<String>((ctx, dismiss) => SessionPickerDialog(sessions: sessions, onPick: (id) => dismiss(id), onCancel: dismiss));
-      (ctx, dismiss) => SessionPickerDialog(
-        sessions: sessions,
-        onPick: (id) => dismiss(id),
-        onCancel: dismiss,
-      ),
-    );
     if (picked == null || !mounted) return;
     setState(() => _statusLine = 'resuming…');
     await _respawnWithSession(picked);
@@ -445,6 +680,15 @@ class _ClaudePaneState extends State<ClaudePane> {
   Future<void> _respawnWithSession(String sessionId, {bool clearTranscript = false}) async {
     _statusSub?.cancel();
     _statusSub = null;
+    _endSub?.cancel();
+    _endSub = null;
+    _modelErrorSub?.cancel();
+    _modelErrorSub = null;
+    _workflowsSub?.cancel();
+    _workflowsSub = null;
+    _modelPickerOpen = false;
+    _effortPickerOpen = false;
+    _permissionPickerOpen = false;
     await activeSessionOrchestrator?.close(_orchId); // kills the old session
     // Erase only after the process is dead, so claude isn't mid-write.
     final root = _repoRoot;
@@ -460,15 +704,10 @@ class _ClaudePaneState extends State<ClaudePane> {
 
   // -- helpers --------------------------------------------------------------
 
-  DaemonClient? _ipc() => _kernel()?.ipc;
+  DaemonClient? _ipc() => _kernel?.ipc;
 
-  KernelServices? _kernel() {
+  /// Cached in didChangeDependencies (T-366); see note there.
-    try {
+  KernelServices? _kernel;
-      return ClideKernel.of(context);
-    } catch (_) {
-      return null;
-    }
-  }
 
   // -- build ----------------------------------------------------------------
 
@@ -479,10 +718,7 @@ class _ClaudePaneState extends State<ClaudePane> {
 
     final Widget body;
     if (_error != null) {
-      body = Padding(
+      body = Padding(padding: const EdgeInsets.all(16), child: ClideText(_error!, muted: true));
-        padding: const EdgeInsets.all(16),
-        child: ClideText(_error!, muted: true),
-      );
     } else if (_conversation != null) {
       // Rebuild conversation + composer zone together on each prompt change so
       // the view hides a prompted tool-use card the moment its prompt appears
@@ -504,10 +740,11 @@ class _ClaudePaneState extends State<ClaudePane> {
                   onTap: _focusComposerOnTap,
                   child: ConversationView(
                     controller: _conversation!,
-                    foldLevel: foldLevelFromName(_kernel()?.settings.get<String>(kActivityFoldLevelKey)),
+                    foldLevel: foldLevelFromName(_kernel?.settings.get<String>(kActivityFoldLevelKey)),
                     hiddenToolUseIds: _session?.promptedToolUseIds ?? const <String>{},
                     toolUseOutcomes: _session?.toolUseOutcomes ?? const <String, bool>{},
                     quietErrorToolUseIds: _session?.quietErrorToolUseIds ?? const <String>{},
+                    workflows: _session?.workflows ?? const <String, WorkflowRun>{},
                     emptyState: ClaudeBanner(
                       role: widget.isPrimary ? 'primary' : 'session ${widget.secondaryIndex}',
                       workspace: _repoRoot,
@@ -520,13 +757,40 @@ class _ClaudePaneState extends State<ClaudePane> {
               // with the conversation; renders nothing when there are no tasks.
               ListenableBuilder(
                 listenable: _conversation!,
-                builder: (_, __) => ClaudeTaskDock(tasks: taskListFrom(_conversation!.items)),
+                builder: (_, _) => ClaudeTaskDock(tasks: taskListFrom(_conversation!.items)),
               ),
               // An open prompt takes the composer's space and hides the text
               // input until it's answered, so interaction stays out of the
-              // conversation stream (D-78).
+              // conversation stream (D-78). The /model picker uses the same
+              // slot; a prompt outranks it (T-408).
               if (prompt != null && _session != null)
                 ToolPromptCard(prompt: prompt, onResolve: _session!.resolvePrompt)
+              else if (_modelPickerOpen && _session != null)
+                ModelPickerCard(
+                  models: _session!.availableModels.isEmpty ? kFallbackModels : _session!.availableModels,
+                  currentModel: _status.model,
+                  onPick: _pickModel,
+                  onCancel: _closeModelPicker,
+                )
+              else if (_effortPickerOpen && _session != null)
+                ModelPickerCard(
+                  title: 'effort',
+                  models: kEffortLevels,
+                  currentModel: _status.effort,
+                  // Exact match — containment would mark `high` inside `xhigh`.
+                  isCurrent: (o, c) => c != null && o.value == c,
+                  onPick: _pickEffort,
+                  onCancel: _closeEffortPicker,
+                )
+              else if (_permissionPickerOpen && _session != null)
+                ModelPickerCard(
+                  title: 'permissions',
+                  models: kPermissionModes,
+                  currentModel: _status.permissionMode,
+                  isCurrent: (o, c) => c != null && o.value == c,
+                  onPick: _pickPermissionMode,
+                  onCancel: _closePermissionPicker,
+                )
               else
                 StreamBuilder<bool>(
                   stream: _session?.busyStream,
@@ -557,22 +821,11 @@ class _ClaudePaneState extends State<ClaudePane> {
       body = const Center(child: ClideText('starting…', muted: true));
     }
 
-    final content = widget.showChrome
+    final content = widget.showChrome ? ClidePaneChrome(title: title, subtitle: _error ?? _statusLine, child: body) : body;
-        ? ClidePaneChrome(
-            title: title,
-            subtitle: _error ?? _statusLine,
-            child: body,
-          )
-        : body;
 
     // Surface this pane's status to the bottom status-bar slot while it's
     // the focused pane (T-150).
-    return ClidePane(
+    return ClidePane(contributionId: widget.contributionId, active: widget.active, statusWidget: _statusWidget(tokens), child: content);
-      contributionId: widget.contributionId,
-      active: widget.active,
-      statusWidget: _statusWidget(tokens),
-      child: content,
-    );
   }
 }
 
@@ -590,13 +843,7 @@ class _ModeBadge extends StatelessWidget {
     return Semantics(
       label: 'permission mode: ${permissionModeLabel(mode)}',
       excludeSemantics: true,
-      child: ClideText(
+      child: ClideText(permissionModeLabel(mode), fontSize: clideFontSmall, fontFamily: clideMonoFamily, color: permissionModeColor(mode, tokens), maxLines: 1),
-        permissionModeLabel(mode),
-        fontSize: clideFontSmall,
-        fontFamily: clideMonoFamily,
-        color: permissionModeColor(mode, tokens),
-        maxLines: 1,
-      ),
     );
   }
 }

lib/builtin/claude/src/claude_session_host.dart

@@ -85,11 +85,13 @@ class ClaudeSessionHostState extends State<ClaudeSessionHost> {
   /// Public entry point used by the `claude.new-secondary` command.
   void addSecondary() {
     final index = _nextSecondary++;
-    _controller.add(MultitabEntry<_Session>(
+    _controller.add(
-      id: 'secondary-$index',
+      MultitabEntry<_Session>(
-      title: 'session $index',
+        id: 'secondary-$index',
-      payload: _Session(isPrimary: false, secondaryIndex: index),
+        title: 'session $index',
-    ));
+        payload: _Session(isPrimary: false, secondaryIndex: index),
+      ),
+    );
   }
 
   /// Open a new pane as a fork of [sourceClaudeSessionId] (T-172).
@@ -99,11 +101,13 @@ class ClaudeSessionHostState extends State<ClaudeSessionHost> {
   /// without touching the original.
   void addFork(String sourceClaudeSessionId) {
     final index = _nextSecondary++;
-    _controller.add(MultitabEntry<_Session>(
+    _controller.add(
-      id: 'secondary-$index',
+      MultitabEntry<_Session>(
-      title: 'fork $index',
+        id: 'secondary-$index',
-      payload: _Session(isPrimary: false, secondaryIndex: index, forkSourceId: sourceClaudeSessionId),
+        title: 'fork $index',
-    ));
+        payload: _Session(isPrimary: false, secondaryIndex: index, forkSourceId: sourceClaudeSessionId),
+      ),
+    );
   }
 
   @override

lib/builtin/claude/src/claude_stats.dart

@@ -8,12 +8,7 @@ library;
 import 'dart:convert';
 
 class DailyActivity {
-  const DailyActivity({
+  const DailyActivity({required this.date, required this.messageCount, required this.sessionCount, required this.toolCallCount});
-    required this.date,
-    required this.messageCount,
-    required this.sessionCount,
-    required this.toolCallCount,
-  });
 
   final String date; // "YYYY-MM-DD" (sorts chronologically as a string)
   final int messageCount;
@@ -54,12 +49,14 @@ ClaudeStats parseClaudeStats(String jsonStr) {
   if (da is List) {
     for (final e in da) {
       if (e is! Map) continue;
-      daily.add(DailyActivity(
+      daily.add(
-        date: '${e['date']}',
+        DailyActivity(
-        messageCount: _int(e['messageCount']),
+          date: '${e['date']}',
-        sessionCount: _int(e['sessionCount']),
+          messageCount: _int(e['messageCount']),
-        toolCallCount: _int(e['toolCallCount']),
+          sessionCount: _int(e['sessionCount']),
-      ));
+          toolCallCount: _int(e['toolCallCount']),
+        ),
+      );
     }
   }
   return ClaudeStats(lastComputed: j['lastComputedDate'] as String?, daily: daily);

lib/builtin/claude/src/claude_status.dart

@@ -53,8 +53,8 @@ String nextSafePermissionMode(String current) {
 }
 
 /// Status-line segments split around the permission-mode badge so the UI can
-/// render the mode as an interactive control between them (T-226). [leading]
+/// render the mode as an interactive control between them (T-226). `leading`
-/// is the model; [trailing] joins context / cost / rate-limit. Either may be
+/// is the model; `trailing` joins context / cost / rate-limit. Either may be
 /// null when there's nothing to show.
 ({String? leading, String? trailing}) statusSegmentsAroundMode(SessionStatus s) {
   final trailing = [
@@ -62,10 +62,7 @@ String nextSafePermissionMode(String current) {
     if (s.cost != null) '\$${s.cost!.toStringAsFixed(2)}',
     if (s.rateLimitInfo != null) s.rateLimitInfo!,
   ].join('  ·  ');
-  return (
+  return (leading: s.model != null ? shortModelLabel(s.model!) : null, trailing: trailing.isEmpty ? null : trailing);
-    leading: s.model != null ? shortModelLabel(s.model!) : null,
-    trailing: trailing.isEmpty ? null : trailing,
-  );
 }
 
 /// Friendly label for Claude's permission modes.
@@ -95,3 +92,41 @@ String formatTokenCount(int n) {
   if (n >= 1000) return '${(n / 1000).round()}k';
   return '$n';
 }
+
+/// Parsed `/usage` output (T-415). The CLI answers a forwarded `/usage`
+/// headless and free (probed 2.1.175, num_turns 0) with plain text:
+///
+///   Current session: 15% used · resets Jun 12, 3:39pm (Europe/Amsterdam)
+///   Current week (all models): 53% used · resets Jun 15, 6:59pm (…)
+///   Current week (Sonnet only): 0% used
+class ClaudeUsage {
+  const ClaudeUsage({this.session, this.week, this.weekSonnet});
+
+  /// The value text per line (e.g. `15% used · resets Jun 12, 3:39pm`),
+  /// timezone parenthetical stripped. Null when the line wasn't present.
+  final String? session;
+  final String? week;
+  final String? weekSonnet;
+
+  bool get isEmpty => session == null && week == null && weekSonnet == null;
+}
+
+/// Parse `/usage` response text into a [ClaudeUsage], or null when [text]
+/// isn't usage output. Tolerant of label drift: any `Current …: …% used`
+/// line is matched by its key phrase.
+ClaudeUsage? parseUsageText(String text) {
+  if (!text.contains('% used')) return null;
+  String? valueOf(String keyPhrase) {
+    for (final line in text.split('\n')) {
+      if (!line.contains(keyPhrase)) continue;
+      final colon = line.indexOf(':');
+      if (colon < 0) continue;
+      // Strip the trailing timezone parenthetical — noise at sidebar width.
+      return line.substring(colon + 1).replaceAll(RegExp(r'\s*\([^)]*\)\s*$'), '').trim();
+    }
+    return null;
+  }
+
+  final usage = ClaudeUsage(session: valueOf('Current session'), week: valueOf('(all models)'), weekSonnet: valueOf('(Sonnet only)'));
+  return usage.isEmpty ? null : usage;
+}

lib/builtin/claude/src/claude_task_dock.dart

@@ -62,10 +62,7 @@ class _ClaudeTaskDockState extends State<ClaudeTaskDock> {
                 ClideDivider(),
                 Padding(
                   padding: const EdgeInsets.fromLTRB(10, 4, 10, 6),
-                  child: Column(
+                  child: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [for (final t in tasks) _taskRow(tokens, t)]),
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [for (final t in tasks) _taskRow(tokens, t)],
-                  ),
                 ),
               ],
             ],
@@ -76,20 +73,22 @@ class _ClaudeTaskDockState extends State<ClaudeTaskDock> {
   }
 
   Widget _summaryRow(SurfaceTokens tokens, String summary, String? current) => Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+    padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
-        child: Row(
+    child: Row(
-          children: [
+      children: [
-            ClideIcon(_expanded ? const ChevronDownIcon() : const ChevronRightIcon(), size: 12, color: tokens.globalTextMuted),
+        ClideIcon(_expanded ? const ChevronDownIcon() : const ChevronRightIcon(), size: 12, color: tokens.globalTextMuted),
-            const SizedBox(width: 8),
+        const SizedBox(width: 8),
-            ClideText(summary, fontSize: clideFontCaption, color: tokens.globalTextMuted),
+        ClideText(summary, fontSize: clideFontCaption, color: tokens.globalTextMuted),
-            if (!_expanded && current != null) ...[
+        if (!_expanded && current != null) ...[
-              const SizedBox(width: 10),
+          const SizedBox(width: 10),
-              Expanded(child: ClideText(current, fontSize: clideFontCaption, color: tokens.globalTextMuted, maxLines: 1, overflow: TextOverflow.ellipsis)),
+          Expanded(
-            ] else
+            child: ClideText(current, fontSize: clideFontCaption, color: tokens.globalTextMuted, maxLines: 1, overflow: TextOverflow.ellipsis),
-              const Spacer(),
+          ),
-          ],
+        ] else
-        ),
+          const Spacer(),
-      );
+      ],
+    ),
+  );
 
   Widget _taskRow(SurfaceTokens tokens, TaskItem t) {
     final (String glyph, Color color, String word) = switch (t.status) {
@@ -106,14 +105,13 @@ class _ClaudeTaskDockState extends State<ClaudeTaskDock> {
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Padding(padding: const EdgeInsets.only(top: 1), child: ClideIcon(PhosphorIcons.byName(glyph), size: 13, color: color)),
+            Padding(
+              padding: const EdgeInsets.only(top: 1),
+              child: ClideIcon(PhosphorIcons.byName(glyph), size: 13, color: color),
+            ),
             const SizedBox(width: 8),
             Expanded(
-              child: ClideText(
+              child: ClideText(t.text, fontSize: clideFontCaption, color: t.status == TaskStatus.completed ? tokens.globalTextMuted : tokens.globalForeground),
-                t.text,
-                fontSize: clideFontCaption,
-                color: t.status == TaskStatus.completed ? tokens.globalTextMuted : tokens.globalForeground,
-              ),
             ),
           ],
         ),

lib/builtin/claude/src/clipboard_paste.dart

@@ -99,16 +99,10 @@ String pasteCacheDir() {
 /// written to [tempDir] (default [pasteCacheDir]) and attached by its
 /// path. Returns an empty list when the clipboard holds neither, so the
 /// composer pastes text instead.
-Future<List<ComposerAttachment>> resolveClipboardAttachment(
+Future<List<ComposerAttachment>> resolveClipboardAttachment(ClipboardSource source, {Directory? tempDir, DateTime Function() now = DateTime.now}) async {
-  ClipboardSource source, {
-  Directory? tempDir,
-  DateTime Function() now = DateTime.now,
-}) async {
   final files = await source.readFiles();
   if (files.isNotEmpty) {
-    return [
+    return [for (final p in files) ComposerAttachment(path: p, isImage: _looksLikeImage(p))];
-      for (final p in files) ComposerAttachment(path: p, isImage: _looksLikeImage(p)),
-    ];
   }
 
   final image = await source.readImage();

lib/builtin/claude/src/conversation_card.dart

@@ -183,20 +183,13 @@ class _ConversationCardState extends State<ConversationCard> {
         if (!_collapsed) ...[
           const SizedBox(height: 4),
           widget.body,
-          for (final seg in widget.extraSegments) ...[
+          for (final seg in widget.extraSegments) ...[_segmentLabel(tokens, seg.label), seg.child],
-            _segmentLabel(tokens, seg.label),
-            seg.child,
-          ],
         ],
       ],
     );
     return Padding(
       padding: widget.margin,
-      child: MouseRegion(
+      child: MouseRegion(onEnter: (_) => setState(() => _hover = true), onExit: (_) => setState(() => _hover = false), child: _frame(tokens, content)),
-        onEnter: (_) => setState(() => _hover = true),
-        onExit: (_) => setState(() => _hover = false),
-        child: _frame(tokens, content),
-      ),
     );
   }
 
@@ -289,11 +282,7 @@ class _ConversationCardState extends State<ConversationCard> {
         onTap: () => setState(() => _collapsed = !_collapsed),
         builder: (_, hovered, pressed) => Padding(
           padding: const EdgeInsets.only(right: 6),
-          child: ClideIcon(
+          child: ClideIcon(_collapsed ? PhosphorIcons.byName('caret-right') : PhosphorIcons.byName('caret-down'), size: 12, color: tokens.globalTextMuted),
-            _collapsed ? PhosphorIcons.byName('caret-right') : PhosphorIcons.byName('caret-down'),
-            size: 12,
-            color: tokens.globalTextMuted,
-          ),
         ),
       ),
     );
@@ -330,15 +319,15 @@ class _ConversationCardState extends State<ConversationCard> {
   /// A muted sub-label + hairline divider introducing an [CardSegment] below
   /// the primary body (T-262), so CALL/PROMPT/RESULT read as distinct parts.
   Widget _segmentLabel(SurfaceTokens tokens, String label) => Padding(
-        padding: const EdgeInsets.only(top: 8, bottom: 4),
+    padding: const EdgeInsets.only(top: 8, bottom: 4),
-        child: Row(
+    child: Row(
-          children: [
+      children: [
-            ClideText(label, fontSize: clideFontMeta, color: tokens.globalTextMuted, fontFamily: clideMonoFamily),
+        ClideText(label, fontSize: clideFontMeta, color: tokens.globalTextMuted, fontFamily: clideMonoFamily),
-            const SizedBox(width: 8),
+        const SizedBox(width: 8),
-            Expanded(child: Container(height: 1, color: tokens.panelBorder)),
+        Expanded(child: Container(height: 1, color: tokens.panelBorder)),
-          ],
+      ],
-        ),
+    ),
-      );
+  );
 
   List<Widget> _actions(SurfaceTokens tokens) {
     final items = <_ActionItem>[];
@@ -360,12 +349,7 @@ class _ConversationCardState extends State<ConversationCard> {
             onTap: items[i].onTap,
             builder: (_, hovered, pressed) => Padding(
               padding: const EdgeInsets.only(left: 10),
-              child: ClideText(
+              child: ClideText(items[i].label, fontSize: clideFontMeta, color: tokens.globalTextMuted, fontFamily: clideMonoFamily),
-                items[i].label,
-                fontSize: clideFontMeta,
-                color: tokens.globalTextMuted,
-                fontFamily: clideMonoFamily,
-              ),
             ),
           ),
         ),

lib/builtin/claude/src/conversation_controller.dart

@@ -21,26 +21,20 @@ class ConversationController extends ChangeNotifier {
   /// over stream-json so the pane would otherwise start empty. [onDispose]
   /// is invoked from [dispose] — wire it to the reader's `dispose` so
   /// cancelling the view tears down the underlying tail.
-  ConversationController({
+  ConversationController({required Stream<ConversationItem> stream, Iterable<ConversationItem>? seed, Future<void> Function()? onDispose})
-    required Stream<ConversationItem> stream,
+    : _onDispose = onDispose {
-    Iterable<ConversationItem>? seed,
-    Future<void> Function()? onDispose,
-  }) : _onDispose = onDispose {
     if (seed != null) _items.addAll(seed);
     _sub = stream.listen(_onItem);
   }
 
   /// Build a controller fed from the kernel [MessageBus] — it consumes
-  /// the [ConversationItem]s a [TranscriptPublisher] writes onto
+  /// the [ConversationItem]s a `TranscriptPublisher` writes onto
-  /// [publisher]/[channel]. Decouples the view from the reader so several
+  /// `publisher`/[channel]. Decouples the view from the reader so several
   /// panels can render the same conversation (team work, T-139/T-140).
-  factory ConversationController.fromBus({
+  factory ConversationController.fromBus({required MessageBus messages, String channel = ClaudeConversation.leadChannel, Future<void> Function()? onDispose}) {
-    required MessageBus messages,
+    final stream = messages
-    String channel = ClaudeConversation.leadChannel,
+        .subscribe(publisher: ClaudeConversation.publisher, channel: channel)
-    Future<void> Function()? onDispose,
+        .map((m) => m.data[ClaudeConversation.itemKey] as ConversationItem);
-  }) {
-    final stream =
-        messages.subscribe(publisher: ClaudeConversation.publisher, channel: channel).map((m) => m.data[ClaudeConversation.itemKey] as ConversationItem);
     return ConversationController(stream: stream, onDispose: onDispose);
   }
 

lib/builtin/claude/src/conversation_view.dart

@@ -14,15 +14,22 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:clide/builtin/claude/src/activity_cluster.dart';
+import 'package:clide/builtin/claude/src/bash_tail_source.dart';
+import 'package:clide/builtin/claude/src/claude_status.dart' show shortModelLabel;
 import 'package:clide/builtin/claude/src/conversation_card.dart';
 import 'package:clide/builtin/claude/src/conversation_controller.dart';
+import 'package:clide/builtin/claude/src/file_tail_follower.dart';
 import 'package:clide/builtin/claude/src/image_thumbnail.dart';
 import 'package:clide/builtin/claude/src/prompt_card.dart';
 import 'package:clide/builtin/claude/src/transcript_reader.dart';
+import 'package:clide/builtin/claude/src/workflow_run.dart';
 import 'package:clide/kernel/src/facade.dart';
+import 'package:clide/kernel/src/keymap/intents.dart';
+import 'package:clide/kernel/src/keymap/pane_key_nav.dart';
 import 'package:clide/kernel/src/syntax/language_map.dart';
 import 'package:clide/kernel/src/theme/controller.dart';
 import 'package:clide/kernel/src/theme/tokens.dart';
+import 'package:clide/src/terminal/terminal.dart';
 import 'package:clide/widgets/widgets.dart';
 import 'package:flutter/widgets.dart';
 
@@ -35,11 +42,18 @@ class ConversationView extends StatefulWidget {
     this.hiddenToolUseIds = const <String>{},
     this.toolUseOutcomes = const <String, bool>{},
     this.quietErrorToolUseIds = const <String>{},
+    this.workflows = const <String, WorkflowRun>{},
     this.foldLevel = FoldLevel.tools,
   });
 
   final ConversationController controller;
 
+  /// Live Workflow runs keyed by their launching `Workflow` tool-use id
+  /// (T-416). A `Workflow` tool-use card with a matching run renders the
+  /// dedicated run card (phases, agent rows, status) instead of the generic
+  /// tool card; absent (pre-progress, or on reload) it falls back to generic.
+  final Map<String, WorkflowRun> workflows;
+
   /// How aggressively consecutive meta items (tool calls/results, thinking)
   /// fold into collapsible activity cards (T-230). Default L1 ([FoldLevel.tools]).
   final FoldLevel foldLevel;
@@ -181,11 +195,9 @@ class _ConversationViewState extends State<ConversationView> {
   /// - [runByToolUseId]: the rest of the run — prose / thinking / tool cards —
   ///   nested in a holder UNDER the Agent card (T-264), with a successful
   ///   sidechain tool result left out (it folds into its own tool card).
-  ({
+  ({Set<String> ownedSidechainUuids, Map<String, List<UserMessage>> promptsByToolUseId, Map<String, List<ConversationItem>> runByToolUseId}) _sidechainFold(
-    Set<String> ownedSidechainUuids,
+    List<ConversationItem> items,
-    Map<String, List<UserMessage>> promptsByToolUseId,
+  ) {
-    Map<String, List<ConversationItem>> runByToolUseId,
-  }) _sidechainFold(List<ConversationItem> items) {
     final agentByMsgUuid = <String, AssistantToolUse>{
       for (final it in items)
         if (it is AssistantToolUse && _isAgentTool(it.name)) it.uuid: it,
@@ -207,6 +219,15 @@ class _ConversationViewState extends State<ConversationView> {
       if (it is AssistantToolUse) toolUseIds.add(it.toolUseId);
     }
 
+    // With more than one agent in the turn (a parallel fan-out), the
+    // "nearest preceding agent" fallback is unsafe: an item with no
+    // parent_tool_use_id and no rooted parentUuid chain would mis-file into
+    // whichever agent was emitted last — landing in a SIBLING agent's card.
+    // Drop the fallback in that case so an unattributable item orphans
+    // (rendered inline) rather than cross-attributed (T-342). A single agent
+    // has only one possible owner, so the fallback stays safe there.
+    final multipleAgents = agentByToolUseId.length > 1;
+
     AssistantToolUse? resolveOwner(ConversationItem item, AssistantToolUse? nearest) {
       // Direct route: stream-json hands us the spawning Agent's tool-use id on
       // the item itself (T-338) — no chain to walk.
@@ -225,7 +246,7 @@ class _ConversationViewState extends State<ConversationView> {
         if (sidechainByUuid[parent] != true) break; // left the run's chain
         cur = parent;
       }
-      return nearest;
+      return multipleAgents ? null : nearest;
     }
 
     final owned = <String>{};
@@ -258,9 +279,13 @@ class _ConversationViewState extends State<ConversationView> {
   void _onChanged() {
     if (!mounted) return;
     setState(() {});
-    // Follow the tail — jump to the bottom after the new item lays out.
+    // Follow the tail — but only when already pinned to it. New items arrive
+    // on every streamed token; jumping unconditionally yanks a reader who
+    // scrolled up back to the bottom for the whole reply (T-368, twin of the
+    // T-297 resize gate).
+    if (!_atBottom) return;
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (_scroll.hasClients) {
+      if (_scroll.hasClients && _atBottom) {
         _scroll.jumpTo(_scroll.position.maxScrollExtent);
       }
     });
@@ -308,39 +333,41 @@ class _ConversationViewState extends State<ConversationView> {
           // visible list don't reattach State to the wrong card (T-285).
           return switch (g) {
             StickyItem(:final item) => _ConversationTurn(
-                key: ValueKey('turn.${item.uuid}'),
+              key: ValueKey('turn.${item.uuid}'),
-                item: item,
+              item: item,
-                tokens: tokens,
+              tokens: tokens,
-                collapseTools: true,
+              collapseTools: true,
-                toolUseOutcomes: widget.toolUseOutcomes,
+              toolUseOutcomes: widget.toolUseOutcomes,
-                quietErrorToolUseIds: widget.quietErrorToolUseIds,
+              quietErrorToolUseIds: widget.quietErrorToolUseIds,
-                toolUseById: widget.controller.toolUseById,
+              toolUseById: widget.controller.toolUseById,
-                resultByToolUseId: resultByToolUseId,
+              resultByToolUseId: resultByToolUseId,
-                promptsByToolUseId: fold.promptsByToolUseId,
+              promptsByToolUseId: fold.promptsByToolUseId,
-                runByToolUseId: fold.runByToolUseId,
+              runByToolUseId: fold.runByToolUseId,
-              ),
+              workflows: widget.workflows,
+            ),
             FoldedCluster(:final items) => _ActivityCard(
-                key: ValueKey('cluster.${items.first.uuid}'),
+              key: ValueKey('cluster.${items.first.uuid}'),
-                items: items,
+              items: items,
-                tokens: tokens,
+              tokens: tokens,
-                toolUseOutcomes: widget.toolUseOutcomes,
+              toolUseOutcomes: widget.toolUseOutcomes,
-                quietErrorToolUseIds: widget.quietErrorToolUseIds,
+              quietErrorToolUseIds: widget.quietErrorToolUseIds,
-                toolUseById: widget.controller.toolUseById,
+              toolUseById: widget.controller.toolUseById,
-                resultByToolUseId: resultByToolUseId,
+              resultByToolUseId: resultByToolUseId,
-                promptsByToolUseId: fold.promptsByToolUseId,
+              promptsByToolUseId: fold.promptsByToolUseId,
-                runByToolUseId: fold.runByToolUseId,
+              runByToolUseId: fold.runByToolUseId,
-              ),
+              workflows: widget.workflows,
+            ),
             EditRun(:final edits) => _EditRunCard(
-                key: ValueKey('edits.${edits.first.uuid}'),
+              key: ValueKey('edits.${edits.first.uuid}'),
-                edits: edits,
+              edits: edits,
-                tokens: tokens,
+              tokens: tokens,
-                toolUseOutcomes: widget.toolUseOutcomes,
+              toolUseOutcomes: widget.toolUseOutcomes,
-                quietErrorToolUseIds: widget.quietErrorToolUseIds,
+              quietErrorToolUseIds: widget.quietErrorToolUseIds,
-                toolUseById: widget.controller.toolUseById,
+              toolUseById: widget.controller.toolUseById,
-                resultByToolUseId: resultByToolUseId,
+              resultByToolUseId: resultByToolUseId,
-                promptsByToolUseId: fold.promptsByToolUseId,
+              promptsByToolUseId: fold.promptsByToolUseId,
-                runByToolUseId: fold.runByToolUseId,
+              runByToolUseId: fold.runByToolUseId,
-              ),
+            ),
           };
         },
       ),
@@ -362,10 +389,48 @@ class _ConversationViewState extends State<ConversationView> {
         return list;
       },
     );
-    return ColoredBox(
+    final body = ColoredBox(
       color: tokens.panelBackground,
       child: widget.wrapInSelectionArea ? ClideSelectionArea(child: sized) : sized,
     );
+    // Vim nav scrolls the conversation while this region holds focus under the
+    // vim preset (T-406): j/k by a line, ctrl+d/u by half a viewport, gg/G to
+    // the ends — G also re-arms follow-tail so new output keeps it pinned.
+    return PaneKeyNav(onNav: _onNav, child: body);
+  }
+
+  /// One "line" of scroll for j/k — a few text rows' worth.
+  static const double _lineScroll = 48;
+
+  void _onNav(NavIntent intent, int count) {
+    if (!_scroll.hasClients) return;
+    final p = _scroll.position;
+    final half = p.viewportDimension / 2;
+    switch (intent) {
+      case NavDownIntent():
+        _scrollBy(_lineScroll * count);
+      case NavUpIntent():
+        _scrollBy(-_lineScroll * count);
+      case NavPageDownIntent():
+        _scrollBy(half);
+      case NavPageUpIntent():
+        _scrollBy(-half);
+      case NavTopIntent():
+        _scroll.jumpTo(0);
+        _atBottom = false;
+      case NavBottomIntent():
+        _scroll.jumpTo(p.maxScrollExtent);
+        _atBottom = true; // re-arm follow-tail (T-297)
+      case NavExpandOrRightIntent() || NavCollapseOrLeftIntent() || NavActivateIntent():
+        break; // a reader pane has no expand/activate semantics
+    }
+  }
+
+  void _scrollBy(double delta) {
+    final p = _scroll.position;
+    final target = (p.pixels + delta).clamp(0.0, p.maxScrollExtent);
+    _scroll.jumpTo(target);
+    _atBottom = (p.maxScrollExtent - target) <= _bottomEpsilon;
   }
 }
 
@@ -373,9 +438,9 @@ class _ConversationViewState extends State<ConversationView> {
 /// used for the "claude" message card's stripe + label.
 const claudeAccent = Color(0xFFD97757);
 
-/// The tool names that launch a sub-agent (sidechain). Claude Code emits
+/// The tool names that launch a sub-agent (sidechain) — shared with the
-/// `Task`; the Agent SDK surface uses `Agent` — accept both (T-263).
+/// grouping pass so "is this an agent spawn?" has one definition (T-342).
-bool _isAgentTool(String name) => name == 'Task' || name == 'Agent';
+bool _isAgentTool(String name) => isAgentTool(name);
 
 /// Open a governance/ticket record clicked in the conversation (T-279) in its
 /// context-pane reader, reusing the existing `selection` MessageBus addressing
@@ -413,7 +478,67 @@ String? resolveWorkspaceFilePath(String? root, String raw) {
 /// Open a clicked workspace file reference in the editor, jumping to [line]
 /// when present — the Dart-side twin of `clide editor open <path>` (T-300, D-6).
 void _openFile(BuildContext context, String path, int? line) {
-  unawaited(ClideKernel.of(context).ipc.request('editor.open', args: {'path': path, if (line != null) 'line': line}));
+  unawaited(ClideKernel.of(context).ipc.request('editor.open', args: {'path': path, 'line': ?line}));
+}
+
+/// A live, read-only tail of the file a Bash command follows (T-325).
+///
+/// Mounts when the Bash card is EXPANDED — the collapser builds its children
+/// lazily (clide_collapser_card.dart), so initialising here and tearing down in
+/// [dispose] gives the "connect on expand, disconnect on collapse" lifecycle
+/// for free. Resolves the followed file from the command against the open
+/// workspace; when there's no independent file-backed source (a pipe into
+/// `tail`, a path outside the repo) it shows a muted note instead of an empty
+/// terminal.
+class _BashLiveTail extends StatefulWidget {
+  const _BashLiveTail({required this.command});
+
+  final String command;
+
+  @override
+  State<_BashLiveTail> createState() => _BashLiveTailState();
+}
+
+class _BashLiveTailState extends State<_BashLiveTail> {
+  Terminal? _terminal;
+  FileTailFollower? _follower;
+  bool _resolved = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (_resolved) return; // resolve once — InheritedWidget access needs context
+    _resolved = true;
+    final root = ClideKernel.of(context).project.current;
+    final source = root == null ? null : detectBashTailSource(widget.command, workspaceRoot: root);
+    if (source == null) return; // no file-backed source → muted note in build
+    final term = Terminal(maxLines: 1000);
+    _terminal = term;
+    // writeBytes: the follower's chunk boundaries are arbitrary (it can even
+    // start mid-rune by construction) — keep decode state across reads (T-373).
+    _follower = FileTailFollower(source, onData: term.writeBytes);
+    unawaited(_follower!.start());
+  }
+
+  @override
+  void dispose() {
+    _follower?.stop();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final term = _terminal;
+    if (term == null) {
+      return ClideText('no independent source to follow', muted: true, fontSize: clideFontMeta);
+    }
+    return SizedBox(
+      height: 160,
+      child: ClipRect(
+        child: ClidePtyView(terminal: term, label: 'live tail', fontSize: clideFontMeta),
+      ),
+    );
+  }
 }
 
 /// One conversation item, rendered by kind.
@@ -429,6 +554,7 @@ class _ConversationTurn extends StatelessWidget {
     this.resultByToolUseId = const <String, ToolResultMessage>{},
     this.promptsByToolUseId = const <String, List<UserMessage>>{},
     this.runByToolUseId = const <String, List<ConversationItem>>{},
+    this.workflows = const <String, WorkflowRun>{},
   });
 
   final ConversationItem item;
@@ -464,6 +590,9 @@ class _ConversationTurn extends StatelessWidget {
   /// thinking, tool cards) nested under the Agent card in a holder (T-264).
   final Map<String, List<ConversationItem>> runByToolUseId;
 
+  /// Live Workflow runs keyed by launching tool-use id (T-416).
+  final Map<String, WorkflowRun> workflows;
+
   @override
   Widget build(BuildContext context) {
     final i = item;
@@ -474,63 +603,74 @@ class _ConversationTurn extends StatelessWidget {
       // sidechain prompt here is an orphan one (its Agent card couldn't be
       // resolved) — folded prompts are suppressed upstream (T-263).
       UserMessage() when i.injected || i.isSidechain => ConversationCard(
-          // Framed like every other card (T-306) — just muted + collapsed, not
+        // Framed like every other card (T-306) — just muted + collapsed, not
-          // the blue "you" accent (D-78); bare read as unfinished next to the
+        // the blue "you" accent (D-78); bare read as unfinished next to the
-          // carded tool calls.
+        // carded tool calls.
-          variant: ConversationCardVariant.bordered,
+        variant: ConversationCardVariant.bordered,
-          accent: tokens.globalTextMuted,
+        accent: tokens.globalTextMuted,
-          label: i.isSidechain ? 'agent prompt' : 'context',
+        label: i.isSidechain ? 'agent prompt' : 'context',
-          copyText: i.text,
+        copyText: i.text,
-          collapsible: true,
+        collapsible: true,
-          collapsedByDefault: true,
+        collapsedByDefault: true,
-          collapsedSummary: _firstLine(i.text),
+        collapsedSummary: _firstLine(i.text),
-          margin: _childMargin,
+        margin: _childMargin,
-          body: ClideText(i.text, muted: true, fontSize: clideFontMeta),
+        body: ClideText(i.text, muted: true, fontSize: clideFontMeta),
-        ),
+      ),
       UserMessage() => ConversationCard(
-          accent: tokens.globalFocus,
+        accent: tokens.globalFocus,
-          label: 'you',
+        label: 'you',
-          copyText: i.text,
+        copyText: i.text,
-          margin: _childMargin,
+        margin: _childMargin,
-          // Pasted-image @path tokens render as inline thumbnails that open the
+        // Pasted-image @path tokens render as inline thumbnails that open the
-          // lightbox (T-236/T-254); copyText keeps the original text verbatim.
+        // lightbox (T-236/T-254); copyText keeps the original text verbatim.
-          body: ClideMarkdown(
+        body: ClideMarkdown(
-            i.text,
+          i.text,
-            onRecordTap: (id) => _openRecord(context, id),
+          onRecordTap: (id) => _openRecord(context, id),
-            onImageToken: (path) => ImageThumbnail(path: path, size: 48),
+          onImageToken: (path) => ImageThumbnail(path: path, size: 48),
-            onLinkTap: (url) => _openUrl(context, url),
+          onLinkTap: (url) => _openUrl(context, url),
-            resolveFileRef: (p) => _resolveRepoFile(context, p),
+          resolveFileRef: (p) => _resolveRepoFile(context, p),
-            onOpenFile: (path, line) => _openFile(context, path, line),
+          onOpenFile: (path, line) => _openFile(context, path, line),
-          ),
         ),
+      ),
+      // CLI-local output (model "<synthetic>": a forwarded local command's
+      // response or a clide-injected notice, T-411) is not Claude speaking —
+      // framed + muted like the context card (T-306), attributed to clide.
+      AssistantTextMessage() when i.synthetic => ConversationCard(
+        variant: ConversationCardVariant.bordered,
+        accent: tokens.globalTextMuted,
+        label: 'clide',
+        copyText: i.text,
+        margin: _childMargin,
+        body: ClideText(i.text, muted: true, fontSize: clideFontMeta),
+      ),
       // Sub-agent (sidechain) prose is NOT the main Claude — attribute it to the
       // agent with a muted accent, never the coral "claude" brand (T-265). The
       // coral claudeAccent is reserved for the real main-thread Claude.
       AssistantTextMessage() => ConversationCard(
-          accent: i.isSidechain ? tokens.globalTextMuted : claudeAccent,
+        accent: i.isSidechain ? tokens.globalTextMuted : claudeAccent,
-          label: i.isSidechain ? 'agent' : 'claude',
+        label: i.isSidechain ? 'agent' : 'claude',
-          copyText: i.text,
+        copyText: i.text,
-          margin: _childMargin,
+        margin: _childMargin,
-          body: ClideMarkdown(
+        body: ClideMarkdown(
-            i.text,
+          i.text,
-            onRecordTap: (id) => _openRecord(context, id),
+          onRecordTap: (id) => _openRecord(context, id),
-            onLinkTap: (url) => _openUrl(context, url),
+          onLinkTap: (url) => _openUrl(context, url),
-            resolveFileRef: (p) => _resolveRepoFile(context, p),
+          resolveFileRef: (p) => _resolveRepoFile(context, p),
-            onOpenFile: (path, line) => _openFile(context, path, line),
+          onOpenFile: (path, line) => _openFile(context, path, line),
-          ),
         ),
+      ),
       AssistantThinkingMessage() => ConversationCard(
-          // Framed + muted like the context card (T-306).
+        // Framed + muted like the context card (T-306).
-          variant: ConversationCardVariant.bordered,
+        variant: ConversationCardVariant.bordered,
-          accent: tokens.globalTextMuted,
+        accent: tokens.globalTextMuted,
-          label: i.isSidechain ? 'agent thinking' : 'thinking',
+        label: i.isSidechain ? 'agent thinking' : 'thinking',
-          copyText: i.thinking,
+        copyText: i.thinking,
-          collapsible: true,
+        collapsible: true,
-          collapsedByDefault: true,
+        collapsedByDefault: true,
-          collapsedSummary: _firstLine(i.thinking),
+        collapsedSummary: _firstLine(i.thinking),
-          margin: _childMargin,
+        margin: _childMargin,
-          body: ClideText(i.thinking, muted: true, fontSize: clideFontMeta),
+        body: ClideText(i.thinking, muted: true, fontSize: clideFontMeta),
-        ),
+      ),
       AssistantToolUse() => collapseTools ? _toolUseCollapser(i) : _toolContentCard(i),
       ToolResultMessage() => _toolResult(i),
       ImageMessage() => _image(context, i),
@@ -566,16 +706,13 @@ class _ConversationTurn extends StatelessWidget {
                     image: ClideFileImage(m.path),
                     fit: BoxFit.contain,
                     alignment: Alignment.centerLeft,
-                    errorBuilder: (_, __, ___) => _imagePlaceholder(m.path),
+                    errorBuilder: (_, _, _) => _imagePlaceholder(m.path),
                   ),
                 ),
               ),
             ),
           ),
-          if (caption != null && caption.isNotEmpty) ...[
+          if (caption != null && caption.isNotEmpty) ...[const SizedBox(height: 4), ClideText(caption, fontSize: clideFontMeta, color: tokens.globalTextMuted)],
-            const SizedBox(height: 4),
-            ClideText(caption, fontSize: clideFontMeta, color: tokens.globalTextMuted),
-          ],
         ],
       ),
     );
@@ -583,34 +720,30 @@ class _ConversationTurn extends StatelessWidget {
 
   void _openLightbox(BuildContext context, String path) {
     ClideKernel.of(context).dialog.show<Object>(
-          (ctx, dismiss) => ClideLightbox(
+      (ctx, dismiss) => ClideLightbox(
-            onDismiss: dismiss,
+        onDismiss: dismiss,
-            child: Image(
+        child: Image(image: ClideFileImage(path), fit: BoxFit.contain, errorBuilder: (_, _, _) => _imagePlaceholder(path)),
-              image: ClideFileImage(path),
+      ),
-              fit: BoxFit.contain,
+    );
-              errorBuilder: (_, __, ___) => _imagePlaceholder(path),
-            ),
-          ),
-        );
   }
 
   Widget _imagePlaceholder(String path) => Container(
-        padding: const EdgeInsets.all(12),
+    padding: const EdgeInsets.all(12),
-        decoration: BoxDecoration(
+    decoration: BoxDecoration(
-          border: Border.all(color: tokens.panelBorder),
+      border: Border.all(color: tokens.panelBorder),
-          borderRadius: BorderRadius.circular(4),
+      borderRadius: BorderRadius.circular(4),
+    ),
+    child: Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        ClideIcon(PhosphorIcons.byName('image'), size: 16, color: tokens.globalTextMuted),
+        const SizedBox(width: 8),
+        Flexible(
+          child: ClideText('could not load $path', fontSize: clideFontMeta, color: tokens.globalTextMuted, maxLines: 1),
         ),
-        child: Row(
+      ],
-          mainAxisSize: MainAxisSize.min,
+    ),
-          children: [
+  );
-            ClideIcon(PhosphorIcons.byName('image'), size: 16, color: tokens.globalTextMuted),
-            const SizedBox(width: 8),
-            Flexible(
-              child: ClideText('could not load $path', fontSize: clideFontMeta, color: tokens.globalTextMuted, maxLines: 1),
-            ),
-          ],
-        ),
-      );
 
   /// A standalone tool use (T-305): every tool use is a collapser over a
   /// one-item list. The collapser carries the echoed last line, the count, and
@@ -619,6 +752,13 @@ class _ConversationTurn extends StatelessWidget {
   /// and its own per-item mark. An Agent/Task call also nests its visible
   /// sub-agent run in a second collapser below (T-264).
   Widget _toolUseCollapser(AssistantToolUse t) {
+    // A Workflow tool-use with a live run (T-416) renders the dedicated run
+    // card — phases, agent rows, status — instead of the generic tool card. No
+    // run yet (pre-progress, or on reload where the system events are gone)
+    // falls through to the generic collapser below.
+    if (t.name == 'Workflow' && workflows[t.toolUseId] != null) {
+      return _workflowCard(t, workflows[t.toolUseId]!);
+    }
     final outcome = toolUseOutcomes[t.toolUseId];
     final color = outcome == null ? tokens.globalFocus : (outcome ? tokens.statusSuccess : tokens.statusError);
     final collapser = ClideCollapserCard(
@@ -662,6 +802,99 @@ class _ConversationTurn extends StatelessWidget {
     );
   }
 
+  /// A dedicated card for a Workflow run (T-416): the harness's multi-agent
+  /// orchestration. The collapser header carries the run's live status (spinner
+  /// while running, check when done) and a `done/total agents` counter; the body
+  /// lists each fanned-out agent — grouped under phase headers when the workflow
+  /// declared phases — plus the run's usage and the orchestration script.
+  Widget _workflowCard(AssistantToolUse t, WorkflowRun run) {
+    final title = run.name ?? 'workflow';
+    final color = run.done ? tokens.statusSuccess : tokens.globalFocus;
+    final counter = run.agentCount == 0 ? 'starting' : '${run.doneCount}/${run.agentCount} agents';
+    final detail = run.done ? (run.summary ?? run.description) : run.description;
+    final collapsedSummary = (detail == null || detail == title) ? title : '$title · $detail';
+    return ClideCollapserCard(
+      label: 'workflow',
+      color: color,
+      collapsedSummary: collapsedSummary,
+      counter: counter,
+      status: run.done ? ClideRunStatus.success : ClideRunStatus.running,
+      children: [_workflowBody(t, run)],
+    );
+  }
+
+  Widget _workflowBody(AssistantToolUse t, WorkflowRun run) {
+    final agents = run.orderedAgents;
+    final phases = run.orderedPhases;
+    final rows = <Widget>[];
+    if (phases.isEmpty) {
+      rows.addAll(agents.map(_workflowAgentRow));
+    } else {
+      for (final p in phases) {
+        rows.add(
+          Padding(
+            padding: const EdgeInsets.only(top: 6, bottom: 2),
+            child: ClideText(p.title.toUpperCase(), muted: true, fontSize: clideFontMeta - 1, fontWeight: FontWeight.w600),
+          ),
+        );
+        rows.addAll(agents.where((a) => a.phaseIndex == p.index).map(_workflowAgentRow));
+      }
+      // Agents the deltas never tagged with a phase still render, after the
+      // phased groups, so nothing fanned out is silently dropped.
+      rows.addAll(agents.where((a) => a.phaseIndex == null).map(_workflowAgentRow));
+    }
+    if (rows.isEmpty) {
+      rows.add(ClideText('Launching…', muted: true, fontSize: clideFontMeta));
+    }
+
+    final script = t.input['script'];
+    return ConversationCard(
+      variant: ConversationCardVariant.bordered,
+      accent: run.done ? tokens.statusSuccess : tokens.globalFocus,
+      label: run.name ?? 'workflow',
+      copyText: script is String ? script : const JsonEncoder.withIndent('  ').convert(t.input),
+      body: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: rows),
+      extraSegments: [
+        if (run.totalTokens != null && run.totalTokens! > 0)
+          CardSegment(
+            label: 'usage',
+            child: ClideText('${run.totalTokens} tokens${run.durationMs != null ? ' · ${run.durationMs} ms' : ''}', muted: true, fontSize: clideFontMeta),
+          ),
+        if (script is String)
+          CardSegment(
+            label: 'script',
+            child: ClideCodeBlock(source: script, language: 'javascript'),
+          ),
+      ],
+      margin: const EdgeInsets.only(bottom: kClideCardHeaderPadH),
+    );
+  }
+
+  /// One agent row in a workflow card: a state glyph (spinner while running, a
+  /// muted check once done), the agent's label, and its model (T-416).
+  Widget _workflowAgentRow(WorkflowAgent a) {
+    final done = a.state == WorkflowAgentState.done;
+    final Widget glyph = done
+        ? ClideIcon(PhosphorIcons.byName('check'), size: 12, color: tokens.statusSuccess)
+        : ClideSpinner(size: 12, color: tokens.globalTextMuted);
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 2),
+      child: Row(
+        children: [
+          SizedBox(width: 16, child: Center(child: glyph)),
+          const SizedBox(width: 6),
+          Expanded(
+            child: ClideText(a.label, fontSize: clideFontMeta, maxLines: 1, overflow: TextOverflow.ellipsis),
+          ),
+          if (a.model != null && a.model!.isNotEmpty) ...[
+            const SizedBox(width: 8),
+            ClideText(shortModelLabel(a.model!), muted: true, fontSize: clideFontMeta - 1),
+          ],
+        ],
+      ),
+    );
+  }
+
   /// The inner content card for a tool use (T-305): the call body + folded
   /// CALL/PROMPT/RESULT segments + its own per-item status mark, with NO own
   /// collapse caret — the enclosing collapser owns collapse. Used both as a
@@ -685,8 +918,23 @@ class _ConversationTurn extends StatelessWidget {
     // (note E): call input (body) → prompt → returned result.
     final segments = <CardSegment>[
       for (final p in promptsByToolUseId[t.toolUseId] ?? const <UserMessage>[])
-        CardSegment(label: 'prompt', child: ClideText(p.text, muted: true, fontSize: clideFontMeta)),
+        CardSegment(
-      if (succeeded && !(isAgent && hasRun)) CardSegment(label: 'result', child: ClideCodeBlock(source: result.content, language: _resultLanguage(t))),
+          label: 'prompt',
+          child: ClideText(p.text, muted: true, fontSize: clideFontMeta),
+        ),
+      if (succeeded && !(isAgent && hasRun))
+        CardSegment(
+          label: 'result',
+          child: ClideCodeBlock(source: result.content, language: _resultLanguage(t)),
+        ),
+      // T-325: a Bash card that follows a file (`tail -f …`) gets a live,
+      // scrolling tail of that file below the result — connected lazily, only
+      // while the card is expanded (the collapser builds segments on expand).
+      if (t.name == 'Bash' && t.input['command'] is String && bashHasTailIntent(t.input['command'] as String))
+        CardSegment(
+          label: 'live tail',
+          child: _BashLiveTail(command: t.input['command'] as String),
+        ),
     ];
 
     // A resolved permission-prompted call is tinted green if approved / red if
@@ -757,12 +1005,7 @@ class _ConversationTurn extends StatelessWidget {
         collapsible: quiet || multiline,
         collapsedByDefault: quiet, // genuine errors stay expanded; a denial folds
         collapsedSummary: (quiet || multiline) ? _firstLine(t.content) : null,
-        body: ClideText(
+        body: ClideText(t.content, fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: quiet ? tokens.globalTextMuted : tokens.statusError),
-          t.content,
-          fontSize: clideFontMeta,
-          fontFamily: clideMonoFamily,
-          color: quiet ? tokens.globalTextMuted : tokens.statusError,
-        ),
       );
     }
 
@@ -783,12 +1026,7 @@ class _ConversationTurn extends StatelessWidget {
       collapsedSummary: multiline ? _firstLine(t.content) : null,
       body: isOutputTool
           ? ClideCodeBlock(source: t.content, language: 'text')
-          : ClideText(
+          : ClideText(t.content, fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: tokens.globalForeground),
-              t.content,
-              fontSize: clideFontMeta,
-              fontFamily: clideMonoFamily,
-              color: tokens.globalForeground,
-            ),
     );
   }
 
@@ -824,6 +1062,7 @@ class _ActivityCard extends StatelessWidget {
     required this.resultByToolUseId,
     required this.promptsByToolUseId,
     required this.runByToolUseId,
+    this.workflows = const <String, WorkflowRun>{},
   });
 
   final List<ConversationItem> items;
@@ -834,6 +1073,7 @@ class _ActivityCard extends StatelessWidget {
   final Map<String, ToolResultMessage> resultByToolUseId;
   final Map<String, List<UserMessage>> promptsByToolUseId;
   final Map<String, List<ConversationItem>> runByToolUseId;
+  final Map<String, WorkflowRun> workflows;
 
   @override
   Widget build(BuildContext context) {
@@ -855,6 +1095,7 @@ class _ActivityCard extends StatelessWidget {
             resultByToolUseId: resultByToolUseId,
             promptsByToolUseId: promptsByToolUseId,
             runByToolUseId: runByToolUseId,
+            workflows: workflows,
           ),
       ],
     );

lib/builtin/claude/src/extension.dart

@@ -5,6 +5,7 @@ import 'package:clide/clide.dart';
 import 'package:clide/builtin/claude/src/activity_cluster.dart' show foldLevelFromName, kActivityFoldLevelKey, nextFoldLevel;
 import 'package:clide/builtin/claude/src/claude_config.dart';
 import 'package:clide/builtin/claude/src/claude_status.dart' show nextSafePermissionMode;
+import 'package:clide/builtin/claude/src/conversation_view.dart' show claudeAccent;
 import 'package:clide/builtin/claude/src/claude_session_host.dart';
 import 'package:clide/builtin/claude/src/session_orchestrator.dart';
 import 'package:clide/builtin/claude/src/pane_context_status.dart';
@@ -21,6 +22,18 @@ import 'package:clide/kernel/kernel.dart';
 import 'package:clide/widgets/widgets.dart';
 import 'package:flutter/widgets.dart';
 
+/// D-6 contract (T-391): a failed command returns an ERROR envelope (non-zero
+/// CLI exit), never `ok` with an `error` field a script can't detect.
+IpcResponse _userErr(String msg, {String? hint}) => IpcResponse.err(
+  id: '',
+  error: IpcError(code: IpcExitCode.userError, kind: IpcErrorKind.userError, message: msg, hint: hint),
+);
+
+IpcResponse _notFound(String msg) => IpcResponse.err(
+  id: '',
+  error: IpcError(code: IpcExitCode.notFound, kind: IpcErrorKind.notFound, message: msg),
+);
+
 class ClaudeExtension extends ClideExtension {
   @override
   String get id => 'builtin.claude';
@@ -48,270 +61,266 @@ class ClaudeExtension extends ClideExtension {
 
   @override
   List<ContributionPoint> get contributions => [
-        TabContribution(
+    TabContribution(
-          id: 'claude.primary',
+      id: 'claude.primary',
-          slot: Slots.workspace,
+      slot: Slots.workspace,
-          title: 'Claude',
+      title: 'Claude',
-          titleKey: 'tab.title',
+      titleKey: 'tab.title',
-          i18nNamespace: id,
+      i18nNamespace: id,
-          priority: 90,
+      priority: 90,
-          build: (_) => TeamPanelHost(lead: ClaudeSessionHost(key: _hostKey)),
+      build: (_) => TeamPanelHost(lead: ClaudeSessionHost(key: _hostKey)),
-        ),
+    ),
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.new-secondary',
+      id: 'claude.new-secondary',
-          command: 'claude.new-secondary',
+      command: 'claude.new-secondary',
-          title: 'Claude: open a secondary session',
+      title: 'Claude: open a secondary session',
-          run: (_) async {
+      run: (_) async {
-            _hostKey.currentState?.addSecondary();
+        _hostKey.currentState?.addSecondary();
-            return IpcResponse.ok(id: '', data: const {'status': 'spawned'});
+        return IpcResponse.ok(id: '', data: const {'status': 'spawned'});
-          },
+      },
-        ),
+    ),
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.kill-all-sessions',
+      id: 'claude.kill-all-sessions',
-          command: 'claude.kill-all-sessions',
+      command: 'claude.kill-all-sessions',
-          title: 'Claude: kill all sessions for this repo',
+      title: 'Claude: kill all sessions for this repo',
-          run: _killAllSessions,
+      run: _killAllSessions,
-        ),
+    ),
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.session-storage',
+      id: 'claude.session-storage',
-          command: 'claude.session-storage',
+      command: 'claude.session-storage',
-          title: 'Claude: session storage (disk usage + cleanup)',
+      title: 'Claude: session storage (disk usage + cleanup)',
-          run: _manageStorage,
+      run: _manageStorage,
-        ),
+    ),
-        // T-235: cycle how aggressively the activity card folds meta steps
+    // T-235: cycle how aggressively the activity card folds meta steps
-        // (none → tools → thinking → everything), persisted app-wide. The panes
+    // (none → tools → thinking → everything), persisted app-wide. The panes
-        // read kActivityFoldLevelKey and rebuild via the settings notifier.
+    // read kActivityFoldLevelKey and rebuild via the settings notifier.
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.activity.fold-level',
+      id: 'claude.activity.fold-level',
-          command: 'claude.activity.fold-level',
+      command: 'claude.activity.fold-level',
-          title: 'Claude: cycle activity fold level',
+      title: 'Claude: cycle activity fold level',
-          run: _cycleFoldLevel,
+      run: _cycleFoldLevel,
-        ),
+    ),
-        // T-171: agent roster controls (D-6 CLI/UI parity).
+    // T-171: agent roster controls (D-6 CLI/UI parity).
-        // Usage: clide claude.agent.show <sessionId>
+    // Usage: clide claude.agent.show <sessionId>
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.agent.show',
+      id: 'claude.agent.show',
-          command: 'claude.agent.show',
+      command: 'claude.agent.show',
-          title: 'Claude: show an agent session pane',
+      title: 'Claude: show an agent session pane',
-          run: (args) async {
+      run: (args) async {
-            final id = args.firstOrNull;
+        final id = args.firstOrNull;
-            if (id == null) return IpcResponse.ok(id: '', data: const {'error': 'missing session id'});
+        if (id == null) return _userErr('missing session id');
-            _orchestrator?.show(id);
+        _orchestrator?.show(id);
-            return IpcResponse.ok(id: '', data: {'id': id, 'status': 'shown'});
+        return IpcResponse.ok(id: '', data: {'id': id, 'status': 'shown'});
-          },
+      },
-        ),
+    ),
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.agent.hide',
+      id: 'claude.agent.hide',
-          command: 'claude.agent.hide',
+      command: 'claude.agent.hide',
-          title: 'Claude: hide an agent session pane',
+      title: 'Claude: hide an agent session pane',
-          run: (args) async {
+      run: (args) async {
-            final id = args.firstOrNull;
+        final id = args.firstOrNull;
-            if (id == null) return IpcResponse.ok(id: '', data: const {'error': 'missing session id'});
+        if (id == null) return _userErr('missing session id');
-            _orchestrator?.hide(id);
+        _orchestrator?.hide(id);
-            return IpcResponse.ok(id: '', data: {'id': id, 'status': 'hidden'});
+        return IpcResponse.ok(id: '', data: {'id': id, 'status': 'hidden'});
-          },
+      },
-        ),
+    ),
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.agent.close',
+      id: 'claude.agent.close',
-          command: 'claude.agent.close',
+      command: 'claude.agent.close',
-          title: 'Claude: close (kill) an agent session',
+      title: 'Claude: close (kill) an agent session',
-          run: (args) async {
+      run: (args) async {
-            final id = args.firstOrNull;
+        final id = args.firstOrNull;
-            if (id == null) return IpcResponse.ok(id: '', data: const {'error': 'missing session id'});
+        if (id == null) return _userErr('missing session id');
-            await _orchestrator?.close(id);
+        await _orchestrator?.close(id);
-            return IpcResponse.ok(id: '', data: {'id': id, 'status': 'closed'});
+        return IpcResponse.ok(id: '', data: {'id': id, 'status': 'closed'});
-          },
+      },
-        ),
+    ),
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.agent.mute',
+      id: 'claude.agent.mute',
-          command: 'claude.agent.mute',
+      command: 'claude.agent.mute',
-          title: 'Claude: mute broker delivery to an agent session',
+      title: 'Claude: mute broker delivery to an agent session',
-          run: (args) async {
+      run: (args) async {
-            final id = args.firstOrNull;
+        final id = args.firstOrNull;
-            if (id == null) return IpcResponse.ok(id: '', data: const {'error': 'missing session id'});
+        if (id == null) return _userErr('missing session id');
-            _orchestrator?.mute(id);
+        _orchestrator?.mute(id);
-            return IpcResponse.ok(id: '', data: {'id': id, 'status': 'muted'});
+        return IpcResponse.ok(id: '', data: {'id': id, 'status': 'muted'});
-          },
+      },
-        ),
+    ),
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.agent.unmute',
+      id: 'claude.agent.unmute',
-          command: 'claude.agent.unmute',
+      command: 'claude.agent.unmute',
-          title: 'Claude: unmute broker delivery to an agent session',
+      title: 'Claude: unmute broker delivery to an agent session',
-          run: (args) async {
+      run: (args) async {
-            final id = args.firstOrNull;
+        final id = args.firstOrNull;
-            if (id == null) return IpcResponse.ok(id: '', data: const {'error': 'missing session id'});
+        if (id == null) return _userErr('missing session id');
-            _orchestrator?.unmute(id);
+        _orchestrator?.unmute(id);
-            return IpcResponse.ok(id: '', data: {'id': id, 'status': 'unmuted'});
+        return IpcResponse.ok(id: '', data: {'id': id, 'status': 'unmuted'});
-          },
+      },
-        ),
+    ),
-        // Usage: clide claude.agent.inject-message <sessionId> <text...>
+    // Usage: clide claude.agent.inject-message <sessionId> <text...>
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.agent.inject-message',
+      id: 'claude.agent.inject-message',
-          command: 'claude.agent.inject-message',
+      command: 'claude.agent.inject-message',
-          title: 'Claude: inject a text turn into an agent session',
+      title: 'Claude: inject a text turn into an agent session',
-          run: (args) async {
+      run: (args) async {
-            final id = args.firstOrNull;
+        final id = args.firstOrNull;
-            if (id == null) return IpcResponse.ok(id: '', data: const {'error': 'missing session id'});
+        if (id == null) return _userErr('missing session id');
-            final text = args.skip(1).join(' ');
+        final text = args.skip(1).join(' ');
-            if (text.isEmpty) return IpcResponse.ok(id: '', data: const {'error': 'missing message text'});
+        if (text.isEmpty) return _userErr('missing message text');
-            _orchestrator?.injectMessage(id, text);
+        _orchestrator?.injectMessage(id, text);
-            return IpcResponse.ok(id: '', data: {'id': id, 'status': 'injected'});
+        return IpcResponse.ok(id: '', data: {'id': id, 'status': 'injected'});
-          },
+      },
-        ),
+    ),
-        // T-181: set permission mode for an agent session (D-6 CLI/UI parity).
+    // T-181: set permission mode for an agent session (D-6 CLI/UI parity).
-        // Usage: clide claude.agent.set-permission-mode <sessionId> <mode>
+    // Usage: clide claude.agent.set-permission-mode <sessionId> <mode>
-        // <mode> must be one of: default, acceptEdits, plan, bypassPermissions.
+    // <mode> must be one of: default, acceptEdits, plan, bypassPermissions.
-        // Note: bypassPermissions is accepted via CLI — the footgun guard is the
+    // Note: bypassPermissions is accepted via CLI — the footgun guard is the
-        // UI's confirm dialog; the CLI caller is responsible for their own safety.
+    // UI's confirm dialog; the CLI caller is responsible for their own safety.
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.agent.set-permission-mode',
+      id: 'claude.agent.set-permission-mode',
-          command: 'claude.agent.set-permission-mode',
+      command: 'claude.agent.set-permission-mode',
-          title: 'Claude: set permission mode for an agent session',
+      title: 'Claude: set permission mode for an agent session',
-          run: (args) async {
+      run: (args) async {
-            final id = args.firstOrNull;
+        final id = args.firstOrNull;
-            if (id == null) return IpcResponse.ok(id: '', data: const {'error': 'missing session id'});
+        if (id == null) return _userErr('missing session id');
-            final mode = args.length >= 2 ? args[1] : null;
+        final mode = args.length >= 2 ? args[1] : null;
-            if (mode == null) return IpcResponse.ok(id: '', data: const {'error': 'missing mode (default|acceptEdits|plan|bypassPermissions)'});
+        if (mode == null) return _userErr('missing mode (default|acceptEdits|plan|bypassPermissions)');
-            const valid = {'default', 'acceptEdits', 'plan', 'bypassPermissions'};
+        const valid = {'default', 'acceptEdits', 'plan', 'bypassPermissions'};
-            if (!valid.contains(mode)) {
+        if (!valid.contains(mode)) {
-              return IpcResponse.ok(id: '', data: {'error': 'unknown mode "$mode"; use one of: ${valid.join(', ')}'});
+          return _userErr('unknown mode "$mode"; use one of: ${valid.join(', ')}');
-            }
+        }
-            _orchestrator?.byId(id)?.session.setPermissionMode(mode);
+        _orchestrator?.byId(id)?.session.setPermissionMode(mode);
-            return IpcResponse.ok(id: '', data: {'id': id, 'mode': mode, 'status': 'sent'});
+        return IpcResponse.ok(id: '', data: {'id': id, 'mode': mode, 'status': 'sent'});
-          },
+      },
-        ),
+    ),
-        // T-226: cycle the primary session's permission mode through the safe
+    // T-226: cycle the primary session's permission mode through the safe
-        // trio. Palette-discoverable counterpart to the composer's Ctrl/Cmd+M.
+    // trio. Palette-discoverable counterpart to the composer's Ctrl/Cmd+M.
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.mode.cycle',
+      id: 'claude.mode.cycle',
-          command: 'claude.mode.cycle',
+      command: 'claude.mode.cycle',
-          title: 'Claude: Cycle permission mode',
+      title: 'Claude: Cycle permission mode',
-          run: (_) async {
+      run: (_) async {
-            final managed = _orchestrator?.byId('primary');
+        final managed = _orchestrator?.byId('primary');
-            if (managed == null) return IpcResponse.ok(id: '', data: const {'error': 'no primary session'});
+        if (managed == null) return _notFound('no primary session');
-            final next = nextSafePermissionMode(managed.session.status.permissionMode ?? 'default');
+        final next = nextSafePermissionMode(managed.session.status.permissionMode ?? 'default');
-            managed.session.setPermissionMode(next);
+        managed.session.setPermissionMode(next);
-            return IpcResponse.ok(id: '', data: {'mode': next, 'status': 'sent'});
+        return IpcResponse.ok(id: '', data: {'mode': next, 'status': 'sent'});
-          },
+      },
-        ),
+    ),
-        // Usage: clide claude.task.reassign <taskId> <toSessionId>
+    // Usage: clide claude.task.reassign <taskId> <toSessionId>
-        CommandContribution(
+    CommandContribution(
-          id: 'claude.task.reassign',
+      id: 'claude.task.reassign',
-          command: 'claude.task.reassign',
+      command: 'claude.task.reassign',
-          title: 'Claude: reassign a shared task to an agent',
+      title: 'Claude: reassign a shared task to an agent',
-          run: (args) async {
+      run: (args) async {
-            if (args.length < 2) return IpcResponse.ok(id: '', data: const {'error': 'usage: <taskId> <sessionId>'});
+        if (args.length < 2) return _userErr('usage: <taskId> <sessionId>');
-            final taskId = args[0];
+        final taskId = args[0];
-            final toId = args[1];
+        final toId = args[1];
-            final ok = _orchestrator?.broker.reassignTask(taskId, toId) ?? false;
+        final ok = _orchestrator?.broker.reassignTask(taskId, toId) ?? false;
-            return IpcResponse.ok(id: '', data: {'taskId': taskId, 'toId': toId, 'ok': ok});
+        if (!ok) return _notFound('could not reassign task "$taskId" to "$toId"');
-          },
+        return IpcResponse.ok(id: '', data: {'taskId': taskId, 'toId': toId, 'ok': true});
-        ),
+      },
-        // T-180: full team chat pane opened as a workspace tab.
+    ),
-        // Shares the TeamChatModel with the sidebar widget.
+    // T-180: full team chat pane opened as a workspace tab.
-        TabContribution(
+    // Shares the TeamChatModel with the sidebar widget.
-          id: 'claude.team-chat',
+    TabContribution(
-          slot: Slots.workspace,
+      id: 'claude.team-chat',
-          title: 'Team Chat',
+      slot: Slots.workspace,
-          titleKey: 'tab.title',
+      title: 'Team Chat',
-          i18nNamespace: id,
+      titleKey: 'tab.title',
-          priority: 85,
+      i18nNamespace: id,
-          build: (_) {
+      priority: 85,
-            final orch = _orchestrator;
+      build: (_) {
-            if (orch == null) return const SizedBox.shrink();
+        final orch = _orchestrator;
-            return TeamChatPane(model: orch.chatModel, broker: orch.broker);
+        if (orch == null) return const SizedBox.shrink();
-          },
+        return TeamChatPane(model: orch.chatModel, broker: orch.broker);
-        ),
+      },
-        // CLI parity: open the team chat pane from the shell.
+    ),
-        // Usage: clide claude.team-chat.open
+    // CLI parity: open the team chat pane from the shell.
-        CommandContribution(
+    // Usage: clide claude.team-chat.open
-          id: 'claude.team-chat.open',
+    CommandContribution(
-          command: 'claude.team-chat.open',
+      id: 'claude.team-chat.open',
-          title: 'Claude: open the team chat pane',
+      command: 'claude.team-chat.open',
-          run: (args) async {
+      title: 'Claude: open the team chat pane',
-            _ctx?.panels.activateTab(Slots.workspace, 'claude.team-chat');
+      run: (args) async {
-            return IpcResponse.ok(id: '', data: const {'status': 'opened'});
+        _ctx?.panels.activateTab(Slots.workspace, 'claude.team-chat');
-          },
+        return IpcResponse.ok(id: '', data: const {'status': 'opened'});
-        ),
+      },
-        // Usage: clide claude.team-chat.post [@name] <text...>
+    ),
-        // Posts a message into the broker channel as the user.
+    // Usage: clide claude.team-chat.post [@name] <text...>
-        // Leading @name tag selects the recipient; omit for broadcast.
+    // Posts a message into the broker channel as the user.
-        CommandContribution(
+    // Leading @name tag selects the recipient; omit for broadcast.
-          id: 'claude.team-chat.post',
+    CommandContribution(
-          command: 'claude.team-chat.post',
+      id: 'claude.team-chat.post',
-          title: 'Claude: post a message into the team channel as the user',
+      command: 'claude.team-chat.post',
-          run: (args) async {
+      title: 'Claude: post a message into the team channel as the user',
-            if (args.isEmpty) return IpcResponse.ok(id: '', data: const {'error': 'usage: [@name] <text>'});
+      run: (args) async {
-            final raw = args.join(' ');
+        if (args.isEmpty) return _userErr('usage: [@name] <text>');
-            String? recipient;
+        final raw = args.join(' ');
-            String body = raw;
+        String? recipient;
-            if (raw.startsWith('@')) {
+        String body = raw;
-              final ws = raw.indexOf(RegExp(r'\s'));
+        if (raw.startsWith('@')) {
-              if (ws > 0) {
+          final ws = raw.indexOf(RegExp(r'\s'));
-                final tag = raw.substring(1, ws);
+          if (ws > 0) {
-                recipient = (tag == 'team' || tag.isEmpty) ? null : tag;
+            final tag = raw.substring(1, ws);
-                body = raw.substring(ws).trim();
+            recipient = (tag == 'team' || tag.isEmpty) ? null : tag;
-              }
+            body = raw.substring(ws).trim();
-            }
+          }
-            _orchestrator?.chatModel.postAsUser(body, toName: recipient);
+        }
-            return IpcResponse.ok(id: '', data: {'status': 'posted', if (recipient != null) 'to': recipient});
+        _orchestrator?.chatModel.postAsUser(body, toName: recipient);
-          },
+        return IpcResponse.ok(id: '', data: {'status': 'posted', 'to': ?recipient});
-        ),
+      },
-        // claude.agent.fork: branch a managed session into a new fork session
+    ),
-        // (T-172, D-6 CLI/UI parity for the roster fork button).
+    // claude.agent.fork: branch a managed session into a new fork session
-        // Usage: clide claude.agent.fork <sourceSessionId> [<cwd>]
+    // (T-172, D-6 CLI/UI parity for the roster fork button).
-        // <sourceSessionId>: the clide-internal id of the session to fork.
+    // Usage: clide claude.agent.fork <sourceSessionId> [<cwd>]
-        // <cwd>: optional working directory; defaults to the source session's cwd.
+    // <sourceSessionId>: the clide-internal id of the session to fork.
-        CommandContribution(
+    // <cwd>: optional working directory; defaults to the source session's cwd.
-          id: 'claude.agent.fork',
+    CommandContribution(
-          command: 'claude.agent.fork',
+      id: 'claude.agent.fork',
-          title: 'Claude: fork a managed session into a new branch session',
+      command: 'claude.agent.fork',
-          run: (args) async {
+      title: 'Claude: fork a managed session into a new branch session',
-            final sourceId = args.firstOrNull;
+      run: (args) async {
-            if (sourceId == null) {
+        final sourceId = args.firstOrNull;
-              return IpcResponse.ok(id: '', data: const {'error': 'usage: claude.agent.fork <sourceSessionId> [<cwd>]'});
+        if (sourceId == null) {
-            }
+          return _userErr('usage: claude.agent.fork <sourceSessionId> [<cwd>]');
-            final orch = _orchestrator;
+        }
-            if (orch == null) {
+        final orch = _orchestrator;
-              return IpcResponse.ok(id: '', data: const {'error': 'orchestrator unavailable'});
+        if (orch == null) {
-            }
+          return IpcResponse.err(
-            final source = orch.byId(sourceId);
+            id: '',
-            if (source == null) {
+            error: IpcError(code: IpcExitCode.toolError, kind: IpcErrorKind.toolError, message: 'orchestrator unavailable'),
-              return IpcResponse.ok(id: '', data: {'error': 'unknown session "$sourceId"'});
+          );
-            }
+        }
-            final cwd = args.length >= 2 ? args[1] : source.cwd;
+        final source = orch.byId(sourceId);
-            final forkId = 'fork:$sourceId-${DateTime.now().millisecondsSinceEpoch}';
+        if (source == null) {
-            await orch.spawn(SpawnSpec(
+          return _notFound('unknown session "$sourceId"');
-              id: forkId,
+        }
-              role: 'fork of $sourceId',
+        final cwd = args.length >= 2 ? args[1] : source.cwd;
-              sessionId: forkId,
+        final forkId = 'fork:$sourceId-${DateTime.now().millisecondsSinceEpoch}';
-              cwd: cwd,
+        await orch.spawn(SpawnSpec(id: forkId, role: 'fork of $sourceId', sessionId: forkId, cwd: cwd, forkSourceSessionId: source.sessionId));
-              forkSourceSessionId: source.sessionId,
+        return IpcResponse.ok(id: '', data: {'forkId': forkId, 'sourceId': sourceId, 'status': 'spawned'});
-            ));
+      },
-            return IpcResponse.ok(id: '', data: {'forkId': forkId, 'sourceId': sourceId, 'status': 'spawned'});
+    ),
-          },
+    // Always-pickable left-panel tab: Claude activity (from
-        ),
+    // stats-cache.json) + the team roster when a team is running (T-141).
-        // Always-pickable left-panel tab: Claude activity (from
+    TabContribution(
-        // stats-cache.json) + the team roster when a team is running (T-141).
+      id: 'claude.meta',
-        TabContribution(
+      slot: Slots.sidebar,
-          id: 'claude.meta',
+      title: 'Activity',
-          slot: Slots.sidebar,
+      icon: PhosphorIcons.byName('robot'),
-          title: 'Activity',
+      // Claude's accent marks Claude's own panel in the rail (T-418) —
-          icon: PhosphorIcons.byName('robot'),
+      // nominative use per the licenses.yaml trademark note.
-          priority: 60,
+      iconColor: claudeAccent,
-          build: (_) => const ClaudeMetaSidebar(),
+      priority: 60,
-        ),
+      build: (_) => const ClaudeMetaSidebar(),
-        // In-pane status slot (T-145): the active Claude pane publishes
+    ),
-        // its model · permission-mode · context line here.
+    // In-pane status slot (T-145): the active Claude pane publishes
-        // flex: 1 → StatusbarHost wraps this in Flexible(loose) so the slot
+    // its model · permission-mode · context line here.
-        // yields width under pressure and ClideMarquee scrolls (T-160).
+    // flex: 1 → StatusbarHost wraps this in Flexible(loose) so the slot
-        StatusItemContribution(
+    // yields width under pressure and ClideMarquee scrolls (T-160).
-          id: 'claude.status-context',
+    StatusItemContribution(id: 'claude.status-context', priority: 50, flex: 1, build: (_) => const PaneContextStatusItem()),
-          priority: 50,
+  ];
-          flex: 1,
-          build: (_) => const PaneContextStatusItem(),
-        ),
-      ];
 
   @override
   Future<void> activate(ClideExtensionContext ctx) async {
@@ -399,13 +408,15 @@ class ClaudeExtension extends ClideExtension {
     }
     final target = _orchestrator?.byId('primary') ?? _orchestrator?.visibleSessions.firstOrNull;
     if (target == null) return;
-    target.conversation.inject(ImageMessage(
+    target.conversation.inject(
-      uuid: 'image-${DateTime.now().microsecondsSinceEpoch}',
+      ImageMessage(
-      timestamp: DateTime.now(),
+        uuid: 'image-${DateTime.now().microsecondsSinceEpoch}',
-      isSidechain: false,
+        timestamp: DateTime.now(),
-      path: path,
+        isSidechain: false,
-      caption: m.data['caption'] as String?,
+        path: path,
-    ));
+        caption: m.data['caption'] as String?,
+      ),
+    );
   }
 
   @override
@@ -466,9 +477,7 @@ class ClaudeExtension extends ClideExtension {
     if (root == null || home == null) return IpcResponse.ok(id: '', data: const {});
     final dir = Directory('$home/.claude/projects/${root.replaceAll('/', '-')}');
     final sessions = await listSessions(dir);
-    await ctx.dialog.show<Object>(
+    await ctx.dialog.show<Object>((c, dismiss) => SessionStorageDialog(dir: dir, sessions: sessions, onClose: dismiss));
-      (c, dismiss) => SessionStorageDialog(dir: dir, sessions: sessions, onClose: dismiss),
-    );
     return IpcResponse.ok(id: '', data: const {'status': 'shown'});
   }
 }

lib/builtin/claude/src/file_tail_follower.dart

@@ -0,0 +1,80 @@
+/// Read-only file follower for the Bash live-tail sub-card (T-325).
+///
+/// clide can't see a running Bash command's stdout (Claude Code owns the
+/// process), so to "watch the same output" we open our OWN read-only follower
+/// on the file the command tails. This never spawns a process and never
+/// touches Claude's command — it just reads the file as it grows, like
+/// `tail -f`, and hands new bytes to `onData`.
+///
+/// Pure dart:io/dart:async (no Flutter) so it's unit-testable. Polls rather
+/// than using a watcher so it works uniformly across platforms and survives
+/// truncation/rotation (size shrinking → re-read from the top).
+library;
+
+import 'dart:async';
+import 'dart:io';
+import 'dart:typed_data';
+
+class FileTailFollower {
+  FileTailFollower(this.path, {required this.onData, this.tailBytes = 16384, this.interval = const Duration(milliseconds: 300)});
+
+  /// Absolute path of the file to follow.
+  final String path;
+
+  /// New bytes appended since the last read (or the initial tail window).
+  final void Function(Uint8List bytes) onData;
+
+  /// On first read, start this many bytes from the end (a `tail -c` window)
+  /// rather than dumping the whole file.
+  final int tailBytes;
+
+  final Duration interval;
+
+  int _pos = 0;
+  bool _primed = false;
+  bool _stopped = false;
+  Timer? _timer;
+
+  /// Begin following: emit the initial tail window, then poll for growth.
+  Future<void> start() async {
+    await pollOnce();
+    if (_stopped) return;
+    _timer = Timer.periodic(interval, (_) => pollOnce());
+  }
+
+  /// One read cycle. Public so tests can drive it deterministically without
+  /// waiting on the timer. Reads any bytes appended since the last position
+  /// (or, on the first call, the trailing [tailBytes]); resets to the top if
+  /// the file shrank (truncated/rotated).
+  Future<void> pollOnce() async {
+    if (_stopped) return;
+    final file = File(path);
+    if (!await file.exists()) return; // not created yet — keep waiting
+    final length = await file.length();
+
+    if (!_primed) {
+      _pos = length > tailBytes ? length - tailBytes : 0;
+      _primed = true;
+    } else if (length < _pos) {
+      _pos = 0; // truncated / rotated → re-read from the top
+    }
+    if (length <= _pos) return;
+
+    final raf = await file.open();
+    try {
+      await raf.setPosition(_pos);
+      final bytes = await raf.read(length - _pos);
+      _pos = length;
+      if (!_stopped && bytes.isNotEmpty) onData(Uint8List.fromList(bytes));
+    } finally {
+      await raf.close();
+    }
+  }
+
+  /// Stop following and release the timer. Idempotent.
+  void stop() {
+    _stopped = true;
+    _timer?.cancel();
+    _timer = null;
+  }
+}

lib/builtin/claude/src/image_thumbnail.dart

@@ -17,15 +17,11 @@ import 'package:flutter/widgets.dart';
 /// Open [path] full-size in the lightbox via the kernel dialog router.
 void openImageLightbox(BuildContext context, String path) {
   ClideKernel.of(context).dialog.show<Object>(
-        (ctx, dismiss) => ClideLightbox(
+    (ctx, dismiss) => ClideLightbox(
-          onDismiss: dismiss,
+      onDismiss: dismiss,
-          child: Image(
+      child: Image(image: ClideFileImage(path), fit: BoxFit.contain, errorBuilder: (ctx, _, _) => _placeholder(ctx, 48)),
-            image: ClideFileImage(path),
+    ),
-            fit: BoxFit.contain,
+  );
-            errorBuilder: (ctx, _, __) => _placeholder(ctx, 48),
-          ),
-        ),
-      );
 }
 
 Widget _placeholder(BuildContext context, double size) {
@@ -64,13 +60,7 @@ class ImageThumbnail extends StatelessWidget {
           ),
           child: ClipRRect(
             borderRadius: BorderRadius.circular(radius),
-            child: Image(
+            child: Image(image: ClideFileImage(path), width: size, height: size, fit: BoxFit.cover, errorBuilder: (ctx, _, _) => _placeholder(ctx, size)),
-              image: ClideFileImage(path),
-              width: size,
-              height: size,
-              fit: BoxFit.cover,
-              errorBuilder: (ctx, _, __) => _placeholder(ctx, size),
-            ),
           ),
         ),
       ),

lib/builtin/claude/src/meta_sidebar/activity_tab.dart

@@ -0,0 +1,141 @@
+/// The Activity tab: session controls, usage, stats (stats-cache.json), and
+/// the primary session's live runtime row. Split out of
+/// claude_meta_sidebar.dart (T-395); session controls + the usage block are
+/// the power-panel additions (T-415).
+library;
+
+import 'package:clide/builtin/claude/src/claude_config.dart';
+import 'package:clide/builtin/claude/src/claude_stats.dart';
+import 'package:clide/builtin/claude/src/claude_status.dart' show ClaudeUsage, formatTokenCount, permissionModeLabel, shortModelLabel;
+import 'package:clide/builtin/claude/src/meta_sidebar/models.dart';
+import 'package:clide/builtin/claude/src/transcript_reader.dart' show SessionStatus;
+import 'package:clide/builtin/claude/src/workflow_run.dart';
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+class ActivityTabView extends StatelessWidget {
+  const ActivityTabView({
+    super.key,
+    required this.stats,
+    required this.primaryStatus,
+    required this.config,
+    this.usage,
+    this.workflows = const <String, WorkflowRun>{},
+  });
+
+  final ClaudeStats stats;
+  final SessionStatus? primaryStatus;
+  final ClaudeConfig? config;
+
+  /// Parsed `/usage` output for the usage block, refreshed via the refresh
+  /// control (T-415). Null until the first refresh.
+  final ClaudeUsage? usage;
+
+  /// Live Workflow runs in the primary session, keyed by launching tool-use id
+  /// (T-416). Rendered as an aggregate WORKFLOWS section — one row per run with
+  /// its done/total agent count and running/done state.
+  final Map<String, WorkflowRun> workflows;
+
+  /// Publish a slash command for the primary pane to execute — the session
+  /// controls are the same code path as typing the command (D-6).
+  void _command(BuildContext context, String text) {
+    ClideKernel.of(context).messages.publish('builtin.claude', 'command', {'text': text});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final tokens = ClideTheme.of(context).surface;
+    final latest = stats.latest;
+    final u = usage;
+    final sections = <MetaSection>[
+      ..._workflowSection(tokens),
+      if (u != null)
+        MetaSection('USAGE', [
+          if (u.session != null) MetaRow('session', u.session!),
+          if (u.week != null) MetaRow('week (all)', u.week!),
+          if (u.weekSonnet != null) MetaRow('week (sonnet)', u.weekSonnet!),
+        ]),
+      if (latest != null)
+        MetaSection('TODAY', [
+          MetaRow('messages', '${latest.messageCount}'),
+          MetaRow('sessions', '${latest.sessionCount}'),
+          MetaRow('tool calls', '${latest.toolCallCount}'),
+        ]),
+      if (latest != null) MetaSection('LIFETIME', [MetaRow('messages', '${stats.lifetimeMessages}'), MetaRow('sessions', '${stats.lifetimeSessions}')]),
+      ..._runtimeSection(tokens),
+    ];
+
+    return ListView(
+      padding: const EdgeInsets.all(12),
+      children: [
+        // SESSION control strip (T-415): drives the primary session through
+        // the builtin.claude/command bus — identical to typing the command.
+        Padding(
+          padding: const EdgeInsets.only(bottom: 8),
+          child: ClideText('SESSION', fontSize: clideFontSmall, color: tokens.sidebarSectionHeader),
+        ),
+        Row(
+          children: [
+            _control(context, tokens, 'clear', 'trash', '/clear'),
+            _control(context, tokens, 'compact', 'arrows-in-simple', '/compact'),
+            _control(context, tokens, 'fork', 'git-branch', '/fork'),
+            _control(context, tokens, 'resume', 'clock-counter-clockwise', '/resume'),
+            const Spacer(),
+            _control(context, tokens, 'refresh usage', 'arrow-clockwise', '/usage'),
+          ],
+        ),
+        const SizedBox(height: 6),
+        if (sections.isEmpty) metaPlaceholder('No activity recorded yet.') else ...metaTableChildren(tokens, sections),
+      ],
+    );
+  }
+
+  Widget _control(BuildContext context, SurfaceTokens tokens, String label, String glyph, String command) {
+    return Semantics(
+      button: true,
+      label: '$label session',
+      excludeSemantics: true,
+      onTap: () => _command(context, command),
+      child: ClideTappable(
+        tooltip: '$label  ·  $command',
+        onTap: () => _command(context, command),
+        builder: (ctx, hovered, _) => Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+          child: ClideIcon(PhosphorIcons.byName(glyph), size: 15, color: hovered ? tokens.globalForeground : tokens.globalTextMuted),
+        ),
+      ),
+    );
+  }
+
+  /// An aggregate WORKFLOWS section while one or more workflow runs exist this
+  /// session (T-416): a row per run — its name and `done/total agents`, tinted
+  /// focus while running and success once complete.
+  List<MetaSection> _workflowSection(SurfaceTokens tokens) {
+    final runs = workflows.values.toList();
+    if (runs.isEmpty) return const [];
+    return [
+      MetaSection('WORKFLOWS', [
+        for (final r in runs)
+          MetaRow(
+            r.name ?? r.taskId ?? 'workflow',
+            r.agentCount == 0 ? (r.done ? 'done' : 'starting') : '${r.doneCount}/${r.agentCount} agents${r.done ? ' ✓' : ''}',
+            valueColor: r.done ? tokens.statusSuccess : tokens.globalFocus,
+          ),
+      ]),
+    ];
+  }
+
+  List<MetaSection> _runtimeSection(SurfaceTokens tokens) {
+    final st = primaryStatus;
+    final skills = config?.skills.length;
+    final rows = <MetaRow>[
+      if (st?.model != null) MetaRow('model', shortModelLabel(st!.model!), valueColor: tokens.globalFocus),
+      if (st?.effort != null) MetaRow('effort', st!.effort!),
+      if (st?.contextTokens != null) MetaRow('context', '${formatTokenCount(st!.contextTokens!)} ctx'),
+      if (st?.permissionMode != null) MetaRow('mode', permissionModeLabel(st!.permissionMode!)),
+      if (skills != null) MetaRow('skills', '$skills'),
+    ];
+    return rows.isEmpty ? const [] : [MetaSection('RUNTIME · primary', rows)];
+  }
+}

lib/builtin/claude/src/meta_sidebar/config_tab.dart

@@ -0,0 +1,360 @@
+/// The Config tab (T-183): the settings table over [ClaudeConfig] plus the
+/// skills/agents/commands/hooks/permissions/MCP accordion. Split out of
+/// claude_meta_sidebar.dart (T-395). The accordion's expansion state lives in
+/// the parent (it survives tab switches) and arrives as a prop + toggle
+/// callback.
+///
+/// T-414 makes the settings table a control panel: model / effort /
+/// permission-mode rows are live popover controls. Picking an option
+/// publishes the explicit slash command (`/model sonnet`) on the
+/// `builtin.claude`/`command` channel; the primary Claude pane executes it
+/// through the same `_send` routing the composer uses — one implementation,
+/// two surfaces (D-6).
+library;
+
+import 'package:clide/builtin/claude/src/claude_config.dart';
+import 'package:clide/builtin/claude/src/claude_status.dart' show permissionModeLabel;
+import 'package:clide/builtin/claude/src/meta_sidebar/models.dart';
+import 'package:clide/builtin/claude/src/stream_json_session.dart' show ModelOption, kEffortLevels, kFallbackModels, kPermissionModes;
+import 'package:clide/builtin/claude/src/transcript_reader.dart' show SessionStatus;
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+class ConfigTabView extends StatelessWidget {
+  const ConfigTabView({super.key, required this.config, required this.expanded, required this.onToggleSection, this.status, this.models});
+
+  final ClaudeConfig? config;
+
+  /// The primary session's live status — drives the control rows' current
+  /// values. Null before the session reports (controls fall back to the
+  /// probe/settings values).
+  final SessionStatus? status;
+
+  /// Models selectable for the primary session (from its `initialize`
+  /// response); falls back to [kFallbackModels].
+  final List<ModelOption>? models;
+
+  /// Sections currently expanded — owned by the parent state.
+  final Set<ConfigSection> expanded;
+  final void Function(ConfigSection section) onToggleSection;
+
+  @override
+  Widget build(BuildContext context) {
+    final tokens = ClideTheme.of(context).surface;
+    final cfg = config;
+    if (cfg == null) {
+      return metaPlaceholder('Claude environment not loaded.');
+    }
+    final settings = cfg.settings;
+    final model = status?.model ?? cfg.probe?.model ?? settings['model']?.toString() ?? 'default';
+    final outputStyle = settings['outputStyle']?.toString() ?? 'default';
+    final mode = status?.permissionMode ?? cfg.probe?.permissionMode ?? settings['permissionMode']?.toString() ?? 'default';
+    final effort = status?.effort ?? settings['effortLevel']?.toString() ?? 'default';
+
+    final children = <Widget>[
+      // Pinned SETTINGS control panel — not collapsible.
+      Padding(
+        padding: const EdgeInsets.only(bottom: 8),
+        child: ClideText('SETTINGS', fontSize: clideFontSmall, color: tokens.sidebarSectionHeader),
+      ),
+      SettingControlRow(
+        label: 'model',
+        value: model,
+        valueColor: tokens.globalFocus,
+        options: (models == null || models!.isEmpty) ? kFallbackModels : models!,
+        isActive: (o) => o.value == model || model.toLowerCase().contains(o.value.toLowerCase()),
+        command: 'model',
+      ),
+      SettingControlRow(label: 'effort', value: effort, options: kEffortLevels, isActive: (o) => o.value == effort, command: 'effort'),
+      SettingControlRow(
+        label: 'permission mode',
+        value: permissionModeLabel(mode),
+        options: kPermissionModes,
+        isActive: (o) => o.value == mode,
+        command: 'permissions',
+      ),
+      _configRow(tokens, 'output style', outputStyle),
+      _configRow(tokens, 'source', '~/.claude + .claude'),
+
+      // ---- Accordion sections ----
+      for (final section in ConfigSection.values) _accordion(context, tokens, cfg, section),
+
+      // Footer hint.
+      Padding(
+        padding: const EdgeInsets.only(top: 12),
+        child: ClideText('expand a list to see all · click a skill/agent/command → opens its .md', muted: true, fontSize: clideFontSmall),
+      ),
+    ];
+
+    return ListView(padding: const EdgeInsets.all(12), children: children);
+  }
+
+  /// One read-only key→value row in the pinned SETTINGS table.
+  Widget _configRow(SurfaceTokens tokens, String label, String value, {Color? valueColor}) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: kMetaRowPitch),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(
+            width: kMetaLabelColumnWidth,
+            child: ClideText(label, muted: true, fontSize: kMetaFont),
+          ),
+          Expanded(
+            child: ClideText(value, fontSize: kMetaFont, color: valueColor ?? tokens.globalForeground),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _sectionLabel(ConfigSection section) => switch (section) {
+    ConfigSection.skills => 'SKILLS',
+    ConfigSection.agents => 'AGENTS',
+    ConfigSection.commands => 'COMMANDS',
+    ConfigSection.hooks => 'HOOKS',
+    ConfigSection.permissions => 'PERMISSIONS',
+    ConfigSection.mcpServers => 'MCP SERVERS',
+  };
+
+  int _sectionCount(ClaudeConfig config, ConfigSection section) => switch (section) {
+    ConfigSection.skills => config.skills.length,
+    ConfigSection.agents => config.agents.length,
+    ConfigSection.commands => config.commands.length,
+    ConfigSection.hooks => config.hooks.length,
+    ConfigSection.permissions => config.permissions.allow.length + config.permissions.deny.length + config.permissions.ask.length,
+    ConfigSection.mcpServers => config.mcpServers.length,
+  };
+
+  Widget _accordion(BuildContext context, SurfaceTokens tokens, ClaudeConfig config, ConfigSection section) {
+    final isExpanded = expanded.contains(section);
+    final children = isExpanded ? _sectionChildren(context, tokens, config, section) : const <Widget>[];
+    return ClideAccordion(
+      label: _sectionLabel(section),
+      count: _sectionCount(config, section),
+      expanded: isExpanded,
+      onToggle: () => onToggleSection(section),
+      children: children,
+    );
+  }
+
+  List<Widget> _sectionChildren(BuildContext context, SurfaceTokens tokens, ClaudeConfig config, ConfigSection section) {
+    switch (section) {
+      case ConfigSection.skills:
+        return [for (final skill in config.skills) _fileRow(context, tokens, skill.name, skill.path)];
+      case ConfigSection.agents:
+        return [for (final agent in config.agents) _fileRow(context, tokens, agent.name, agent.path)];
+      case ConfigSection.commands:
+        return [for (final cmd in config.commands) _fileRow(context, tokens, cmd.name, cmd.path)];
+      case ConfigSection.hooks:
+        return [
+          for (final hook in config.hooks)
+            Padding(
+              padding: const EdgeInsets.only(left: 16, top: 2, bottom: 2),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  ClideText(hook.event, fontSize: clideFontSmall, color: tokens.sidebarSectionHeader),
+                  for (final cmd in hook.commands)
+                    Padding(
+                      padding: const EdgeInsets.only(left: 8, top: 1),
+                      child: ClideText(cmd, fontSize: clideFontSmall, muted: true),
+                    ),
+                ],
+              ),
+            ),
+        ];
+      case ConfigSection.permissions:
+        return _permissionRows(tokens, config.permissions);
+      case ConfigSection.mcpServers:
+        return [
+          for (final srv in config.mcpServers)
+            Padding(
+              padding: const EdgeInsets.only(left: 16, top: 2, bottom: 2),
+              child: ClideText(srv.name, fontSize: clideFontSmall, color: tokens.globalForeground),
+            ),
+        ];
+    }
+  }
+
+  /// A tappable row for file-backed items (skills, agents, commands).
+  /// All config items are .md files — opens in the markdown reader panel
+  /// via the kernel MessageBus (D-6, T-183).
+  Widget _fileRow(BuildContext context, SurfaceTokens tokens, String name, String? path) {
+    final row = Padding(
+      padding: const EdgeInsets.only(left: 16, top: 2, bottom: 2),
+      child: ClideText(name, fontSize: clideFontSmall, color: path != null ? tokens.globalFocus : tokens.globalForeground),
+    );
+    if (path == null) return row;
+    void openMarkdown() => ClideKernel.of(context).messages.publish('builtin.markdown', 'selection', {'path': path});
+    return Semantics(
+      button: true,
+      label: name,
+      excludeSemantics: true,
+      onTap: openMarkdown,
+      child: ClideTappable(
+        tooltip: path,
+        onTap: openMarkdown,
+        builder: (ctx, hovered, _) => Padding(
+          padding: const EdgeInsets.only(left: 16, top: 2, bottom: 2),
+          child: ClideText(name, fontSize: clideFontSmall, color: hovered ? tokens.globalForeground : tokens.globalFocus),
+        ),
+      ),
+    );
+  }
+
+  /// Renders grouped allow/ask/deny permission rows, colour-coded by kind.
+  List<Widget> _permissionRows(SurfaceTokens tokens, ClaudePermissions perms) {
+    // allow → statusSuccess, ask → statusWarning, deny → statusError
+    Color kindColor(ConfigPermKind k) => switch (k) {
+      ConfigPermKind.allow => tokens.statusSuccess,
+      ConfigPermKind.ask => tokens.statusWarning,
+      ConfigPermKind.deny => tokens.statusError,
+    };
+
+    String kindLabel(ConfigPermKind k) => switch (k) {
+      ConfigPermKind.allow => 'allow',
+      ConfigPermKind.ask => 'ask',
+      ConfigPermKind.deny => 'deny',
+    };
+
+    final groups = [(ConfigPermKind.allow, perms.allow), (ConfigPermKind.ask, perms.ask), (ConfigPermKind.deny, perms.deny)];
+
+    final rows = <Widget>[];
+    for (final (kind, rules) in groups) {
+      if (rules.isEmpty) continue;
+      final color = kindColor(kind);
+      rows.add(
+        Padding(
+          padding: const EdgeInsets.only(left: 16, top: 4),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(
+                width: 36,
+                child: ClideText(kindLabel(kind), fontSize: clideFontSmall, color: color),
+              ),
+              const SizedBox(width: 8),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    for (final rule in rules)
+                      Padding(
+                        padding: const EdgeInsets.only(bottom: 1),
+                        child: ClideText(rule, fontSize: clideFontSmall, color: tokens.globalForeground),
+                      ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+    return rows;
+  }
+}
+
+/// One live setting row (T-414): label + current value as a popover control on
+/// the owned anchored-menu primitive. Picking an option publishes the explicit
+/// slash command on `builtin.claude`/`command`; the primary Claude pane
+/// executes it through its normal `_send` routing — so the sidebar control and
+/// the typed command are literally the same code path (D-6).
+class SettingControlRow extends StatefulWidget {
+  const SettingControlRow({
+    super.key,
+    required this.label,
+    required this.value,
+    required this.options,
+    required this.isActive,
+    required this.command,
+    this.valueColor,
+  });
+
+  final String label;
+
+  /// Current value, displayed on the trigger.
+  final String value;
+  final Color? valueColor;
+
+  final List<ModelOption> options;
+  final bool Function(ModelOption option) isActive;
+
+  /// The slash-command token this control drives (`model`, `effort`,
+  /// `permissions`); a pick publishes `/<command> <option.value>`.
+  final String command;
+
+  @override
+  State<SettingControlRow> createState() => _SettingControlRowState();
+}
+
+class _SettingControlRowState extends State<SettingControlRow> {
+  final ClideOverlayController _overlay = ClideOverlayController();
+
+  void _pick(String value) {
+    ClideKernel.of(context).messages.publish('builtin.claude', 'command', {'text': '/${widget.command} $value'});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final tokens = ClideTheme.of(context).surface;
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: kMetaRowPitch),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          SizedBox(
+            width: kMetaLabelColumnWidth,
+            child: ClideText(widget.label, muted: true, fontSize: kMetaFont),
+          ),
+          Expanded(
+            child: ClideAnchoredOverlay(
+              controller: _overlay,
+              align: ClideAnchorAlign.start,
+              overlayBuilder: (ctx, c) => ClideMenu(
+                onClose: c.close,
+                entries: [
+                  for (final o in widget.options)
+                    ClideMenuItem(
+                      label: o.description.isEmpty ? o.displayName : '${o.displayName} — ${o.description}',
+                      active: widget.isActive(o),
+                      semanticLabel: '${widget.label}: ${o.displayName}',
+                      onSelect: () => _pick(o.value),
+                    ),
+                ],
+              ),
+              anchor: Semantics(
+                button: true,
+                label: '${widget.label}: ${widget.value}. Click to change.',
+                excludeSemantics: true,
+                onTap: _overlay.toggle,
+                child: ClideTappable(
+                  tooltip: 'change ${widget.label}',
+                  onTap: _overlay.toggle,
+                  builder: (ctx, hovered, _) => DecoratedBox(
+                    decoration: BoxDecoration(color: hovered ? tokens.listItemHoverBackground : null, borderRadius: BorderRadius.circular(4)),
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Flexible(
+                            child: ClideText(widget.value, fontSize: kMetaFont, color: widget.valueColor ?? tokens.globalForeground, maxLines: 1),
+                          ),
+                          const SizedBox(width: 4),
+                          ClideIcon(PhosphorIcons.byName('caret-down'), size: 10, color: hovered ? tokens.globalForeground : tokens.globalTextMuted),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/builtin/claude/src/meta_sidebar/icon_button.dart

@@ -0,0 +1,37 @@
+/// A single icon-button used by the roster row controls + task rows.
+/// Split out of claude_meta_sidebar.dart (T-395). Promote to
+/// lib/widgets/ only when a second consumer appears.
+library;
+
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+class MetaIconButton extends StatelessWidget {
+  const MetaIconButton({super.key, required this.painter, required this.tooltip, required this.color, required this.onTap});
+
+  final ClideIconPainter painter;
+  final String tooltip;
+  final Color color;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    // Icon-only button: expose the tooltip text as the Semantics button label
+    // so AT (and widget tests) can find and activate it by name.
+    return Semantics(
+      button: true,
+      label: tooltip,
+      excludeSemantics: true,
+      onTap: onTap,
+      child: ClideTappable(
+        tooltip: tooltip,
+        onTap: onTap,
+        builder: (ctx, hovered, _) => Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 3, vertical: 2),
+          child: ClideIcon(painter, size: 12, color: hovered ? ClideTheme.of(ctx).surface.globalForeground : color),
+        ),
+      ),
+    );
+  }
+}

lib/builtin/claude/src/meta_sidebar/inject_field.dart

@@ -0,0 +1,37 @@
+/// Inline text input for injecting a message into a session (T-171).
+/// Submits on Enter; Cancel is handled by the parent's icon button.
+/// Split out of claude_meta_sidebar.dart (T-395).
+library;
+
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+class InjectTextField extends StatelessWidget {
+  const InjectTextField({super.key, required this.controller, required this.tokens, required this.onSubmit});
+
+  final TextEditingController controller;
+  final SurfaceTokens tokens;
+  final void Function(String text) onSubmit;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 22,
+      padding: const EdgeInsets.symmetric(horizontal: 6),
+      decoration: BoxDecoration(
+        color: tokens.panelBackground,
+        border: Border.all(color: tokens.panelBorder),
+        borderRadius: BorderRadius.circular(3),
+      ),
+      child: EditableText(
+        controller: controller,
+        focusNode: FocusNode(debugLabel: 'inject-${controller.hashCode}')..requestFocus(),
+        style: TextStyle(fontFamily: 'JetBrains Mono', fontSize: clideFontSmall, color: tokens.globalForeground, height: 1.4),
+        cursorColor: tokens.globalFocus,
+        backgroundCursorColor: tokens.globalTextMuted,
+        onSubmitted: onSubmit,
+      ),
+    );
+  }
+}

lib/builtin/claude/src/meta_sidebar/models.dart

@@ -0,0 +1,83 @@
+/// Shared models + table geometry for the Claude meta sidebar's tabs.
+/// Split out of claude_meta_sidebar.dart (T-395).
+library;
+
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+/// The shared label-column width + row pitch the Activity and Config tables
+/// both use, so toggling between tabs keeps every value at the same x and y.
+const double kMetaLabelColumnWidth = 110;
+const double kMetaRowPitch = 6;
+
+/// Type scale for the sidebar tables (T-414 styling pass): labels/values read
+/// at meta size (13) — the old 12px-everything read as bland and cramped.
+const double kMetaFont = clideFontMeta;
+
+/// The sidebar's sub-tabs.
+enum SidebarTab { activity, team, config }
+
+// T-183: accordion sections for the Config tab.
+enum ConfigSection { skills, agents, commands, hooks, permissions, mcpServers }
+
+/// Permission kind for colour-coding in the Config tab (T-183).
+enum ConfigPermKind { allow, ask, deny }
+
+class MetaSection {
+  const MetaSection(this.header, this.rows);
+  final String header;
+  final List<MetaRow> rows;
+}
+
+class MetaRow {
+  const MetaRow(this.label, this.value, {this.valueColor});
+  final String label;
+  final String value;
+  final Color? valueColor;
+}
+
+/// The muted empty-state body shared by every tab.
+Widget metaPlaceholder(String text) => Padding(
+  padding: const EdgeInsets.all(12),
+  child: ClideText(text, muted: true, fontSize: kMetaFont),
+);
+
+/// Key→value sections on the shared table geometry (Activity + Config).
+Widget buildMetaTable(SurfaceTokens tokens, List<MetaSection> sections) =>
+    ListView(padding: const EdgeInsets.all(12), children: metaTableChildren(tokens, sections));
+
+/// The table rows without the enclosing ListView, for tabs that compose extra
+/// widgets around the sections (the Activity tab's control strip, T-415).
+List<Widget> metaTableChildren(SurfaceTokens tokens, List<MetaSection> sections) {
+  final children = <Widget>[];
+  for (var i = 0; i < sections.length; i++) {
+    final s = sections[i];
+    children.add(
+      Padding(
+        padding: EdgeInsets.only(top: i == 0 ? 0 : 18, bottom: 8),
+        child: ClideText(s.header, fontSize: clideFontSmall, color: tokens.sidebarSectionHeader),
+      ),
+    );
+    for (final r in s.rows) {
+      children.add(
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: kMetaRowPitch),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(
+                width: kMetaLabelColumnWidth,
+                child: ClideText(r.label, muted: true, fontSize: kMetaFont),
+              ),
+              Expanded(
+                child: ClideText(r.value, fontSize: kMetaFont, color: r.valueColor ?? tokens.globalForeground),
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+  }
+  return children;
+}

lib/builtin/claude/src/meta_sidebar/permission_badge.dart

@@ -0,0 +1,84 @@
+/// Clickable permission-mode badge shown in each roster row (T-181).
+/// Split out of claude_meta_sidebar.dart (T-395).
+library;
+
+import 'package:clide/builtin/claude/src/claude_status.dart' show permissionModeLabel;
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/services.dart' show HardwareKeyboard;
+import 'package:flutter/widgets.dart';
+
+/// Maps a permission-mode string to a single-letter badge label.
+String permissionModeBadgeLabel(String mode) => switch (mode) {
+  'acceptEdits' => 'A',
+  'plan' => 'P',
+  'bypassPermissions' => 'B',
+  _ => 'D', // default
+};
+
+/// - Plain click → cycles the safe trio: default → acceptEdits → plan → default.
+/// - Shift-click → shows the bypass confirm inline in the parent row.
+///
+/// The badge reflects the LIVE mode from `SessionStatus.permissionMode`
+/// (T-157). It is a custom painted label (no Material), consistent with the
+/// rendering stack rules (D-7, CLAUDE.md guardrails).
+class PermissionModeBadge extends StatelessWidget {
+  const PermissionModeBadge({super.key, required this.mode, required this.tokens, required this.onCycle, required this.onBypass});
+
+  final String mode;
+  final SurfaceTokens tokens;
+
+  /// Called on a plain click — the parent cycles to the next safe mode.
+  final VoidCallback onCycle;
+
+  /// Called on a shift-click — the parent shows the bypass confirm.
+  final VoidCallback onBypass;
+
+  @override
+  Widget build(BuildContext context) {
+    final label = permissionModeBadgeLabel(mode);
+    final isBypass = mode == 'bypassPermissions';
+    final badgeColor = isBypass ? const Color(0xFFF06C6F) : tokens.globalFocus;
+
+    final tooltip =
+        'Permission mode: ${permissionModeLabel(mode)}. '
+        'Click to cycle default/acceptEdits/plan; Shift-click for bypassPermissions.';
+
+    return Padding(
+      padding: const EdgeInsets.only(top: 3),
+      child: Semantics(
+        button: true,
+        label: 'Permission mode: $label',
+        excludeSemantics: true,
+        onTap: () {
+          if (HardwareKeyboard.instance.isShiftPressed) {
+            onBypass();
+          } else {
+            onCycle();
+          }
+        },
+        child: ClideTappable(
+          tooltip: tooltip,
+          onTap: () {
+            if (HardwareKeyboard.instance.isShiftPressed) {
+              onBypass();
+            } else {
+              onCycle();
+            }
+          },
+          builder: (ctx, hovered, _) => Container(
+            width: 16,
+            height: 14,
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+              color: badgeColor.withAlpha(hovered ? 51 : 26),
+              borderRadius: BorderRadius.circular(2),
+              border: Border.all(color: badgeColor.withAlpha(hovered ? 180 : 100), width: 1),
+            ),
+            child: ClideText(label, fontSize: 9, color: badgeColor),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/builtin/claude/src/meta_sidebar/roster_row.dart

@@ -0,0 +1,273 @@
+/// A single agent roster row: color dot + name + status sub-text +
+/// controls (T-171). Split out of claude_meta_sidebar.dart (T-395).
+///
+/// Controls (trailing region):
+/// - permission-mode badge (T-181) — D/A/P cycles the safe trio; shift-click
+///   reaches bypassPermissions behind a confirm
+/// - eye / eye-slash — show / hide the session pane
+/// - speaker / speaker-slash — mute / unmute broker delivery
+/// - inject (chat icon) — expand the inline message input
+/// - fork (git-branch icon) — open a new pane branching from this session (T-172)
+/// - close (×) — kill the session
+library;
+
+import 'package:clide/builtin/claude/src/claude_status.dart' show formatTokenCount, permissionModeLabel, shortModelLabel;
+import 'package:clide/builtin/claude/src/meta_sidebar/icon_button.dart';
+import 'package:clide/builtin/claude/src/meta_sidebar/inject_field.dart';
+import 'package:clide/builtin/claude/src/meta_sidebar/permission_badge.dart';
+import 'package:clide/builtin/claude/src/session_orchestrator.dart';
+import 'package:clide/builtin/claude/src/team_panel_host.dart' show teamColor;
+import 'package:clide/builtin/claude/src/transcript_reader.dart' show SessionStatus;
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+class AgentRosterRow extends StatefulWidget {
+  const AgentRosterRow({
+    super.key,
+    required this.member,
+    required this.status,
+    required this.orchestrator,
+    required this.injectingAgentId,
+    required this.injectController,
+    required this.onToggleInject,
+    required this.onInjectSubmit,
+    required this.onClose,
+    required this.onSetPermissionMode,
+    required this.onFork,
+  });
+
+  final TeamMemberJoined member;
+  final SessionStatus? status;
+  final ClaudeSessionOrchestrator? orchestrator;
+
+  /// The member name currently in inject mode (null = none).
+  final String? injectingAgentId;
+
+  /// Shared text controller for the inject field (cleared on submit/cancel).
+  final TextEditingController injectController;
+
+  final void Function(String memberName) onToggleInject;
+  final void Function(String memberName, String text) onInjectSubmit;
+  final void Function(String memberName) onClose;
+
+  /// Called when the badge cycles to a new `mode` string for this member.
+  /// Handles both safe-trio clicks and confirmed bypass. The parent sends
+  /// the mode to the session via `StreamJsonSession.setPermissionMode`.
+  final void Function(String memberName, String mode) onSetPermissionMode;
+
+  /// Called when the fork button is tapped (T-172). The session id of the
+  /// member's managed session is passed so the host can open a fork pane.
+  final void Function(String memberName) onFork;
+
+  @override
+  State<AgentRosterRow> createState() => _AgentRosterRowState();
+}
+
+class _AgentRosterRowState extends State<AgentRosterRow> {
+  /// Whether the bypass-confirm inline prompt is showing.
+  bool _confirmingBypass = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final tokens = ClideTheme.of(context).surface;
+    final managed = widget.orchestrator?.byMemberName(widget.member.name);
+    final color = teamColor(widget.member.color, fallback: tokens.globalForeground);
+    final st = widget.status;
+    final model = st?.model ?? widget.member.model;
+    final sub = [
+      widget.member.agentType,
+      if (model != null) shortModelLabel(model),
+      if (st?.permissionMode != null) permissionModeLabel(st!.permissionMode!),
+      if (st?.contextTokens != null) '${formatTokenCount(st!.contextTokens!)} ctx',
+    ].join('  ·  ');
+
+    final isVisible = managed?.visible ?? true;
+    final isMuted = managed?.muted ?? false;
+    final isInjecting = widget.injectingAgentId == widget.member.name;
+    final currentMode = st?.permissionMode ?? 'default';
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // Color dot
+              Padding(
+                padding: const EdgeInsets.only(top: 3),
+                child: Container(
+                  width: 8,
+                  height: 8,
+                  decoration: BoxDecoration(color: color, shape: BoxShape.circle),
+                ),
+              ),
+              const SizedBox(width: 8),
+              // Name + status
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    ClideText(widget.member.name, fontSize: clideFontSmall, color: tokens.globalForeground, maxLines: 1, overflow: TextOverflow.ellipsis),
+                    if (sub.isNotEmpty) ClideText(sub, muted: true, fontSize: clideFontSmall, maxLines: 1, overflow: TextOverflow.ellipsis),
+                    // T-181: permission-mode badge (inline below the status sub-text).
+                    if (managed != null)
+                      PermissionModeBadge(
+                        mode: currentMode,
+                        tokens: tokens,
+                        onCycle: () {
+                          final next = _nextSafeMode(currentMode);
+                          widget.onSetPermissionMode(widget.member.name, next);
+                        },
+                        onBypass: () => setState(() => _confirmingBypass = true),
+                      ),
+                  ],
+                ),
+              ),
+              const SizedBox(width: 4),
+              // Trailing controls (T-171).
+              // T-172 seam: append a fork icon button to this row.
+              if (managed != null) _buildControls(context, tokens, managed, isVisible, isMuted, isInjecting),
+            ],
+          ),
+          // Bypass confirm: replaces inject field area when active.
+          if (_confirmingBypass) _buildBypassConfirm(tokens),
+          // Inline inject-message field — visible only when toggled.
+          if (isInjecting && !_confirmingBypass) _buildInjectField(context, tokens),
+        ],
+      ),
+    );
+  }
+
+  /// Safe-mode cycle: default → acceptEdits → plan → default (T-181).
+  static String _nextSafeMode(String current) {
+    const cycle = ['default', 'acceptEdits', 'plan'];
+    final idx = cycle.indexOf(current);
+    return cycle[(idx + 1) % cycle.length];
+  }
+
+  Widget _buildBypassConfirm(SurfaceTokens tokens) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 16, top: 4),
+      child: Row(
+        children: [
+          Expanded(
+            child: ClideText('Enable bypassPermissions? All tool calls will be auto-allowed.', fontSize: clideFontSmall, color: tokens.globalTextMuted),
+          ),
+          const SizedBox(width: 4),
+          // Confirm
+          Semantics(
+            button: true,
+            label: 'Confirm bypass',
+            excludeSemantics: true,
+            onTap: () {
+              setState(() => _confirmingBypass = false);
+              widget.onSetPermissionMode(widget.member.name, 'bypassPermissions');
+            },
+            child: ClideTappable(
+              tooltip: 'Confirm',
+              onTap: () {
+                setState(() => _confirmingBypass = false);
+                widget.onSetPermissionMode(widget.member.name, 'bypassPermissions');
+              },
+              builder: (ctx, hovered, _) => Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 3, vertical: 2),
+                child: ClideText('OK', fontSize: clideFontSmall, color: hovered ? tokens.globalForeground : tokens.globalFocus),
+              ),
+            ),
+          ),
+          const SizedBox(width: 4),
+          // Cancel
+          Semantics(
+            button: true,
+            label: 'Cancel bypass',
+            excludeSemantics: true,
+            onTap: () => setState(() => _confirmingBypass = false),
+            child: ClideTappable(
+              tooltip: 'Cancel',
+              onTap: () => setState(() => _confirmingBypass = false),
+              builder: (ctx, hovered, _) => Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 3, vertical: 2),
+                child: ClideText('Cancel', fontSize: clideFontSmall, color: hovered ? tokens.globalForeground : tokens.globalTextMuted),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildControls(BuildContext context, SurfaceTokens tokens, ManagedSession managed, bool isVisible, bool isMuted, bool isInjecting) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        // Show / hide
+        MetaIconButton(
+          painter: isVisible ? PhosphorIcons.byName('eye') : PhosphorIcons.byName('eye-slash'),
+          tooltip: isVisible ? 'Hide pane' : 'Show pane',
+          color: tokens.globalTextMuted,
+          onTap: () => isVisible ? widget.orchestrator!.hide(managed.id) : widget.orchestrator!.show(managed.id),
+        ),
+        // Mute / unmute
+        MetaIconButton(
+          painter: isMuted ? PhosphorIcons.byName('eye-slash') : PhosphorIcons.byName('eye'),
+          // NOTE: We use eye/eyeSlash as stand-ins until a dedicated speaker
+          // icon is added to PhosphorIcons (no speaker codepoint yet).
+          // The semantic tooltip still says mute/unmute so AT users are clear.
+          tooltip: isMuted ? 'Unmute messages' : 'Mute messages',
+          color: isMuted ? tokens.globalFocus : tokens.globalTextMuted,
+          onTap: () => isMuted ? widget.orchestrator!.unmute(managed.id) : widget.orchestrator!.mute(managed.id),
+        ),
+        // Inject message
+        MetaIconButton(
+          painter: PhosphorIcons.byName('chat-circle'),
+          tooltip: 'Inject message',
+          color: isInjecting ? tokens.globalFocus : tokens.globalTextMuted,
+          onTap: () => widget.onToggleInject(widget.member.name),
+        ),
+        // Fork session (T-172): branch into a new pane without touching the original.
+        MetaIconButton(
+          painter: PhosphorIcons.byName('git-branch'),
+          tooltip: 'Fork session',
+          color: tokens.globalTextMuted,
+          onTap: () => widget.onFork(widget.member.name),
+        ),
+        // Close session
+        MetaIconButton(
+          painter: PhosphorIcons.byName('x'),
+          tooltip: 'Close session',
+          color: tokens.globalTextMuted,
+          onTap: () => widget.onClose(widget.member.name),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildInjectField(BuildContext context, SurfaceTokens tokens) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 16, top: 4),
+      child: Row(
+        children: [
+          Expanded(
+            child: InjectTextField(
+              controller: widget.injectController,
+              tokens: tokens,
+              onSubmit: (text) {
+                if (text.trim().isNotEmpty) widget.onInjectSubmit(widget.member.name, text.trim());
+              },
+            ),
+          ),
+          const SizedBox(width: 4),
+          MetaIconButton(
+            painter: PhosphorIcons.byName('x'),
+            tooltip: 'Cancel',
+            color: tokens.globalTextMuted,
+            onTap: () => widget.onToggleInject(widget.member.name),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/builtin/claude/src/meta_sidebar/tab_strip.dart

@@ -0,0 +1,58 @@
+/// The Activity / Team / Config sub-tab strip — same interaction as the pql
+/// panel's view tabs, with an underline under the active tab. Split out of
+/// claude_meta_sidebar.dart (T-395).
+library;
+
+import 'package:clide/builtin/claude/src/meta_sidebar/models.dart';
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+class SidebarTabStrip extends StatelessWidget {
+  const SidebarTabStrip({super.key, required this.current, required this.memberCount, required this.onPick});
+  final SidebarTab current;
+  final int memberCount;
+  final ValueChanged<SidebarTab> onPick;
+
+  @override
+  Widget build(BuildContext context) {
+    final tokens = ClideTheme.of(context).surface;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      decoration: BoxDecoration(
+        border: Border(bottom: BorderSide(color: tokens.panelBorder)),
+      ),
+      child: Row(
+        children: [
+          for (final t in SidebarTab.values)
+            Padding(
+              padding: const EdgeInsets.only(right: 16),
+              child: Semantics(
+                button: true,
+                selected: t == current,
+                label: _label(t),
+                excludeSemantics: true,
+                onTap: () => onPick(t),
+                child: ClideTappable(
+                  onTap: () => onPick(t),
+                  builder: (ctx, hovered, _) => Container(
+                    padding: const EdgeInsets.only(bottom: 3),
+                    decoration: BoxDecoration(
+                      border: Border(bottom: BorderSide(color: t == current ? tokens.globalFocus : const Color(0x00000000), width: 2)),
+                    ),
+                    child: ClideText(_label(t), fontSize: clideFontSmall, color: t == current || hovered ? tokens.globalForeground : tokens.globalTextMuted),
+                  ),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  String _label(SidebarTab t) => switch (t) {
+    SidebarTab.activity => 'Activity',
+    SidebarTab.team => memberCount == 0 ? 'Team' : 'Team · $memberCount',
+    SidebarTab.config => 'Config',
+  };
+}

lib/builtin/claude/src/meta_sidebar/task_row.dart

@@ -0,0 +1,76 @@
+/// One row in the Team tab's TASKS section: status marker + title +
+/// owner + reassign control (T-171). Split out of
+/// claude_meta_sidebar.dart (T-395).
+library;
+
+import 'package:clide/builtin/claude/src/meta_sidebar/icon_button.dart';
+import 'package:clide/builtin/claude/src/team_broker.dart' show TeamBroker, TeamTask;
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+class TaskRow extends StatelessWidget {
+  const TaskRow({super.key, required this.task, required this.members, required this.broker});
+
+  final TeamTask task;
+  final List<TeamMemberJoined> members;
+  final TeamBroker? broker;
+
+  @override
+  Widget build(BuildContext context) {
+    final tokens = ClideTheme.of(context).surface;
+    final marker = switch (task.status) {
+      'done' => '✓',
+      'claimed' => '◈',
+      _ => '○',
+    };
+    final markerColor = switch (task.status) {
+      'done' => tokens.globalTextMuted,
+      'claimed' => tokens.globalFocus,
+      _ => tokens.globalForeground,
+    };
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 2),
+      child: Row(
+        children: [
+          ClideText(marker, fontSize: clideFontSmall, color: markerColor),
+          const SizedBox(width: 6),
+          Expanded(
+            child: ClideText(
+              task.title,
+              fontSize: clideFontSmall,
+              color: task.status == 'done' ? tokens.globalTextMuted : tokens.globalForeground,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+          if (task.owner != null)
+            Padding(
+              padding: const EdgeInsets.only(left: 4),
+              child: ClideText(task.owner!, fontSize: clideFontSmall, color: tokens.globalFocus),
+            ),
+          // Reassign: cycle to the next roster member.
+          if (broker != null && broker!.members.length > 1)
+            MetaIconButton(
+              painter: PhosphorIcons.byName('arrow-clockwise'),
+              tooltip: 'Reassign task',
+              color: tokens.globalTextMuted,
+              onTap: () => _reassign(context),
+            ),
+        ],
+      ),
+    );
+  }
+
+  void _reassign(BuildContext context) {
+    final b = broker;
+    if (b == null || members.isEmpty) return;
+    final brokerMembers = b.members;
+    if (brokerMembers.isEmpty) return;
+    // Cycle to the next member after the current owner.
+    final currentIndex = brokerMembers.indexWhere((m) => m.name == task.owner);
+    final nextIndex = (currentIndex + 1) % brokerMembers.length;
+    b.reassignTask(task.id, brokerMembers[nextIndex].id);
+  }
+}

lib/builtin/claude/src/meta_sidebar/team_tab.dart

@@ -0,0 +1,98 @@
+/// The Team tab: the roster cockpit (T-171) — per-member rows with
+/// controls, the TASKS section, and the MESSAGES chat feed (T-180).
+/// Stateless and props-driven; the parent owns the member list, inject
+/// state, and orchestrator wiring. Split out of claude_meta_sidebar.dart
+/// (T-395).
+library;
+
+import 'package:clide/builtin/claude/src/meta_sidebar/models.dart';
+import 'package:clide/builtin/claude/src/meta_sidebar/roster_row.dart';
+import 'package:clide/builtin/claude/src/meta_sidebar/task_row.dart';
+import 'package:clide/builtin/claude/src/session_orchestrator.dart';
+import 'package:clide/builtin/claude/src/team_broker.dart' show TeamTask;
+import 'package:clide/builtin/claude/src/team_chat_sidebar.dart' show TeamChatSidebar;
+import 'package:clide/builtin/claude/src/transcript_reader.dart' show SessionStatus;
+import 'package:clide/kernel/kernel.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/widgets.dart';
+
+class TeamTabView extends StatelessWidget {
+  const TeamTabView({
+    super.key,
+    required this.members,
+    required this.memberStatus,
+    required this.orchestrator,
+    required this.tasks,
+    required this.injectingAgentId,
+    required this.injectController,
+    required this.onToggleInject,
+    required this.onInjectSubmit,
+    required this.onClose,
+    required this.onSetPermissionMode,
+    required this.onFork,
+    required this.onOpenChatPane,
+  });
+
+  final List<TeamMemberJoined> members;
+  final Map<String, SessionStatus> memberStatus;
+  final ClaudeSessionOrchestrator? orchestrator;
+  final List<TeamTask> tasks;
+  final String? injectingAgentId;
+  final TextEditingController injectController;
+  final void Function(String memberName) onToggleInject;
+  final void Function(String memberName, String text) onInjectSubmit;
+  final void Function(String memberName) onClose;
+  final void Function(String memberName, String mode) onSetPermissionMode;
+  final void Function(String memberName) onFork;
+  final VoidCallback onOpenChatPane;
+
+  @override
+  Widget build(BuildContext context) {
+    final tokens = ClideTheme.of(context).surface;
+    if (members.isEmpty) {
+      return metaPlaceholder('No team active.');
+    }
+    final children = <Widget>[
+      for (final m in members)
+        AgentRosterRow(
+          key: ValueKey(m.agentId),
+          member: m,
+          status: memberStatus[m.agentId],
+          orchestrator: orchestrator,
+          injectingAgentId: injectingAgentId,
+          injectController: injectController,
+          onToggleInject: onToggleInject,
+          onInjectSubmit: onInjectSubmit,
+          onClose: onClose,
+          onSetPermissionMode: onSetPermissionMode,
+          onFork: onFork,
+        ),
+    ];
+
+    if (tasks.isNotEmpty) {
+      children.add(const SizedBox(height: 12));
+      children.add(_taskSection(tokens));
+    }
+
+    // MESSAGES section (T-180): live broker chat feed + quick-post composer.
+    final chatModel = orchestrator?.chatModel;
+    final broker = orchestrator?.broker;
+    if (chatModel != null && broker != null) {
+      children.add(const SizedBox(height: 12));
+      children.add(TeamChatSidebar(model: chatModel, broker: broker, onPopOut: onOpenChatPane));
+    }
+
+    return ListView(padding: const EdgeInsets.all(12), children: children);
+  }
+
+  Widget _taskSection(SurfaceTokens tokens) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        ClideText('TASKS', fontSize: clideFontSmall, color: tokens.globalTextMuted),
+        const SizedBox(height: 4),
+        for (final t in tasks) TaskRow(task: t, members: members, broker: orchestrator?.broker),
+      ],
+    );
+  }
+}

lib/builtin/claude/src/model_picker_card.dart

@@ -0,0 +1,183 @@
+/// The `/model` picker for the interaction zone (T-408, D-78): a bare
+/// `/model` swaps this card in for the composer; picking an entry sends
+/// `set_model` over the control channel and the composer returns. Esc
+/// cancels. Like [ToolPromptCard], it lives in the composer zone — never
+/// inline in the conversation.
+///
+/// Keyboard: number keys pick directly (CLI muscle memory, T-240), Up/Down
+/// move the highlight, Enter picks the highlighted entry, Esc cancels.
+library;
+
+import 'package:clide/builtin/claude/src/stream_json_session.dart';
+import 'package:clide/kernel/src/theme/controller.dart';
+import 'package:clide/kernel/src/theme/tokens.dart';
+import 'package:clide/widgets/widgets.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+
+/// Whether [option] is the session's current model. Options carry aliases
+/// (`sonnet`) or full ids while the status holds the full id
+/// (`claude-sonnet-4-6`), so match on equality or alias containment.
+bool modelOptionIsCurrent(ModelOption option, String? currentModel) {
+  if (currentModel == null || option.value == 'default') return false;
+  if (option.value == currentModel) return true;
+  return currentModel.toLowerCase().contains(option.value.toLowerCase());
+}
+
+class ModelPickerCard extends StatefulWidget {
+  const ModelPickerCard({
+    super.key,
+    required this.models,
+    this.currentModel,
+    required this.onPick,
+    required this.onCancel,
+    this.title = 'model',
+    this.isCurrent = modelOptionIsCurrent,
+  });
+
+  /// Selectable entries, in display order. Callers pass [kFallbackModels]
+  /// when the session hasn't reported its list yet.
+  final List<ModelOption> models;
+
+  /// The session's current model (full id), to mark the active entry.
+  final String? currentModel;
+
+  /// Called once with the picked [ModelOption.value].
+  final void Function(String value) onPick;
+
+  /// Called when the user dismisses the picker without choosing.
+  final VoidCallback onCancel;
+
+  /// Header label. The /effort picker reuses this card with its own title
+  /// and an exact-match [isCurrent] (T-412).
+  final String title;
+
+  /// Marks the active entry. The model default ([modelOptionIsCurrent]) also
+  /// alias-matches (`sonnet` ⊂ `claude-sonnet-4-6`); effort needs exact match
+  /// (`high` would falsely match inside `xhigh`).
+  final bool Function(ModelOption option, String? current) isCurrent;
+
+  @override
+  State<ModelPickerCard> createState() => _ModelPickerCardState();
+}
+
+class _ModelPickerCardState extends State<ModelPickerCard> {
+  late int _highlight = _initialHighlight();
+
+  int _initialHighlight() {
+    for (var i = 0; i < widget.models.length; i++) {
+      if (widget.isCurrent(widget.models[i], widget.currentModel)) return i;
+    }
+    return 0;
+  }
+
+  KeyEventResult _onKey(FocusNode node, KeyEvent e) {
+    if (e is! KeyDownEvent || !node.hasPrimaryFocus) return KeyEventResult.ignored;
+    final hw = HardwareKeyboard.instance;
+    if (hw.isControlPressed || hw.isAltPressed || hw.isMetaPressed) return KeyEventResult.ignored;
+    final key = e.logicalKey;
+    if (key == LogicalKeyboardKey.escape) {
+      widget.onCancel();
+      return KeyEventResult.handled;
+    }
+    if (key == LogicalKeyboardKey.arrowDown) {
+      setState(() => _highlight = (_highlight + 1) % widget.models.length);
+      return KeyEventResult.handled;
+    }
+    if (key == LogicalKeyboardKey.arrowUp) {
+      setState(() => _highlight = (_highlight - 1 + widget.models.length) % widget.models.length);
+      return KeyEventResult.handled;
+    }
+    if (key == LogicalKeyboardKey.enter || key == LogicalKeyboardKey.numpadEnter) {
+      widget.onPick(widget.models[_highlight].value);
+      return KeyEventResult.handled;
+    }
+    final digit = _digitOf(key);
+    if (digit != null && digit >= 1 && digit <= widget.models.length) {
+      widget.onPick(widget.models[digit - 1].value);
+      return KeyEventResult.handled;
+    }
+    return KeyEventResult.ignored;
+  }
+
+  static int? _digitOf(LogicalKeyboardKey key) {
+    const digits = [
+      LogicalKeyboardKey.digit1,
+      LogicalKeyboardKey.digit2,
+      LogicalKeyboardKey.digit3,
+      LogicalKeyboardKey.digit4,
+      LogicalKeyboardKey.digit5,
+      LogicalKeyboardKey.digit6,
+      LogicalKeyboardKey.digit7,
+      LogicalKeyboardKey.digit8,
+      LogicalKeyboardKey.digit9,
+    ];
+    const numpad = [
+      LogicalKeyboardKey.numpad1,
+      LogicalKeyboardKey.numpad2,
+      LogicalKeyboardKey.numpad3,
+      LogicalKeyboardKey.numpad4,
+      LogicalKeyboardKey.numpad5,
+      LogicalKeyboardKey.numpad6,
+      LogicalKeyboardKey.numpad7,
+      LogicalKeyboardKey.numpad8,
+      LogicalKeyboardKey.numpad9,
+    ];
+    var i = digits.indexOf(key);
+    if (i < 0) i = numpad.indexOf(key);
+    return i < 0 ? null : i + 1;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final tokens = ClideTheme.of(context).surface;
+    return Focus(
+      autofocus: true,
+      onKeyEvent: _onKey,
+      child: Container(
+        width: double.infinity,
+        decoration: BoxDecoration(
+          color: tokens.panelBackground,
+          border: Border(top: BorderSide(color: tokens.statusInfo, width: 2)),
+        ),
+        padding: const EdgeInsets.fromLTRB(16, 12, 16, 12),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Row(
+              children: [
+                ClideText(widget.title, fontSize: clideFontSmall, fontFamily: clideMonoFamily, color: tokens.statusInfo),
+                const Spacer(),
+                ClideText('↑↓ · 1-${widget.models.length} · Enter · Esc', fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: tokens.globalTextMuted),
+              ],
+            ),
+            const SizedBox(height: 8),
+            for (var i = 0; i < widget.models.length; i++) _row(tokens, i),
+            const SizedBox(height: 6),
+            Row(
+              children: [
+                const Spacer(),
+                ClideButton(label: 'cancel', variant: ClideButtonVariant.subtle, onPressed: widget.onCancel),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _row(SurfaceTokens tokens, int i) {
+    final m = widget.models[i];
+    final current = widget.isCurrent(m, widget.currentModel);
+    final highlighted = i == _highlight;
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 4),
+      child: ClideButton(
+        label: '${i + 1}. ${current ? '●' : '○'} ${m.displayName}${m.description.isEmpty ? '' : ' — ${m.description}'}',
+        variant: highlighted ? ClideButtonVariant.primary : ClideButtonVariant.subtle,
+        onPressed: () => widget.onPick(m.value),
+      ),
+    );
+  }
+}

lib/builtin/claude/src/permission_mode_control.dart

@@ -67,24 +67,24 @@ class _PermissionModeControlState extends State<PermissionModeControl> {
   }
 
   List<ClideMenuEntry> _entries(SurfaceTokens tokens) => [
-        for (final m in kSafePermissionCycle)
+    for (final m in kSafePermissionCycle)
-          ClideMenuItem(
+      ClideMenuItem(
-            leading: permissionModeIcon(m),
+        leading: permissionModeIcon(m),
-            color: permissionModeColor(m, tokens),
+        color: permissionModeColor(m, tokens),
-            label: permissionModeLabel(m),
+        label: permissionModeLabel(m),
-            active: m == widget.mode,
+        active: m == widget.mode,
-            onSelect: () => widget.onSelect(m),
+        onSelect: () => widget.onSelect(m),
-          ),
+      ),
-        const ClideMenuSeparator(),
+    const ClideMenuSeparator(),
-        ClideMenuItem(
+    ClideMenuItem(
-          leading: permissionModeIcon('bypassPermissions'),
+      leading: permissionModeIcon('bypassPermissions'),
-          color: permissionModeColor('bypassPermissions', tokens),
+      color: permissionModeColor('bypassPermissions', tokens),
-          label: permissionModeLabel('bypassPermissions'),
+      label: permissionModeLabel('bypassPermissions'),
-          enabled: false,
+      enabled: false,
-          active: widget.mode == 'bypassPermissions',
+      active: widget.mode == 'bypassPermissions',
-          onSelect: () {},
+      onSelect: () {},
-        ),
+    ),
-      ];
+  ];
 
   @override
   Widget build(BuildContext context) {
@@ -94,11 +94,7 @@ class _PermissionModeControlState extends State<PermissionModeControl> {
       side: ClideAnchorSide.above,
       align: ClideAnchorAlign.end,
       offset: const Offset(0, -6),
-      overlayBuilder: (ctx, ctrl) => ClideMenu(
+      overlayBuilder: (ctx, ctrl) => ClideMenu(onClose: ctrl.close, minWidth: 180, entries: _entries(ClideTheme.of(ctx).surface)),
-        onClose: ctrl.close,
-        minWidth: 180,
-        entries: _entries(ClideTheme.of(ctx).surface),
-      ),
       anchor: ListenableBuilder(
         listenable: _overlay,
         builder: (ctx, _) {
@@ -116,9 +112,7 @@ class _PermissionModeControlState extends State<PermissionModeControl> {
                 alignment: Alignment.center,
                 decoration: BoxDecoration(
                   color: hovered ? tokens.listItemHoverBackground : null,
-                  border: Border.all(
+                  border: Border.all(color: open ? tokens.globalFocus : (hovered ? tokens.panelActiveBorder : tokens.globalBorder)),
-                    color: open ? tokens.globalFocus : (hovered ? tokens.panelActiveBorder : tokens.globalBorder),
-                  ),
                   borderRadius: BorderRadius.circular(4),
                 ),
                 child: ClideIcon(permissionModeIcon(widget.mode), size: 16, color: permissionModeColor(widget.mode, tokens)),

lib/builtin/claude/src/prompt_card.dart

@@ -5,7 +5,7 @@
 /// Rendered in the composer zone (not inline in the conversation) so
 /// interaction and conversation widgets don't mix — the pane swaps it in for
 /// the text input while a prompt is open. The decision is returned via
-/// [onResolve]; the pane then removes the card.
+/// `onResolve`; the pane then removes the card.
 ///
 /// Plain [ClideButton]s (Semantics buttons → keyboard/AT reachable), no
 /// hover-revealed chrome that would fight the buttons.
@@ -27,7 +27,8 @@ const _kOther = '\u0000other';
 /// Preformatted note for the "Deny & simplify" permission option (T-311): deny
 /// THIS action and ask Claude to reformulate it more simply, explicitly without
 /// touching the permission surface (memories / settings).
-const _kDenySimplifyNote = 'Denied — this action is too complex for the permission system to approve cleanly. '
+const _kDenySimplifyNote =
+    'Denied — this action is too complex for the permission system to approve cleanly. '
     'Please retry with a simpler, more granular approach (break it into smaller steps or use a plainer command) '
     'to avoid this permission prompt. This is a one-off for THIS action only: do not add a memory and do not '
     'change permission settings — just reformulate and try again. Do not narrate or explain the change; '
@@ -295,11 +296,13 @@ class _ToolPromptCardState extends State<ToolPromptCard> {
         [
           if (_q.isNotEmpty) _questionBody(tokens, 0),
           const SizedBox(height: 6),
-          Row(children: [
+          Row(
-            ClideButton(label: 'Submit', variant: ClideButtonVariant.primary, onPressed: (_q.isNotEmpty && _answer(0).isNotEmpty) ? _submit : null),
+            children: [
-            const Spacer(),
+              ClideButton(label: 'Submit', variant: ClideButtonVariant.primary, onPressed: (_q.isNotEmpty && _answer(0).isNotEmpty) ? _submit : null),
-            _chatInstead(tokens),
+              const Spacer(),
-          ]),
+              _chatInstead(tokens),
+            ],
+          ),
         ],
       );
     }
@@ -312,11 +315,13 @@ class _ToolPromptCardState extends State<ToolPromptCard> {
           const SizedBox(height: 8),
           for (var i = 0; i < _q.length; i++) _reviewRow(tokens, i),
           const SizedBox(height: 6),
-          Row(children: [
+          Row(
-            ClideButton(label: '‹ Back', onPressed: () => setState(() => _step = _q.length - 1)),
+            children: [
-            const SizedBox(width: 8),
+              ClideButton(label: '‹ Back', onPressed: () => setState(() => _step = _q.length - 1)),
-            ClideButton(label: 'Submit answers', variant: ClideButtonVariant.primary, onPressed: _allAnswered ? _submit : null),
+              const SizedBox(width: 8),
-          ]),
+              ClideButton(label: 'Submit answers', variant: ClideButtonVariant.primary, onPressed: _allAnswered ? _submit : null),
+            ],
+          ),
         ],
       );
     }
@@ -330,19 +335,14 @@ class _ToolPromptCardState extends State<ToolPromptCard> {
         const SizedBox(height: 10),
         _questionBody(tokens, _step),
         const SizedBox(height: 6),
-        Row(children: [
+        Row(
-          if (_step > 0) ...[
+          children: [
-            ClideButton(label: '‹ Back', onPressed: () => setState(() => _step--)),
+            if (_step > 0) ...[ClideButton(label: '‹ Back', onPressed: () => setState(() => _step--)), const SizedBox(width: 8)],
-            const SizedBox(width: 8),
+            ClideButton(label: last ? 'Review ›' : 'Next ›', variant: ClideButtonVariant.primary, onPressed: answered ? () => setState(() => _step++) : null),
+            const Spacer(),
+            _chatInstead(tokens),
           ],
-          ClideButton(
+        ),
-            label: last ? 'Review ›' : 'Next ›',
-            variant: ClideButtonVariant.primary,
-            onPressed: answered ? () => setState(() => _step++) : null,
-          ),
-          const Spacer(),
-          _chatInstead(tokens),
-        ]),
       ],
     );
   }
@@ -354,12 +354,17 @@ class _ToolPromptCardState extends State<ToolPromptCard> {
       final done = _answer(i).isNotEmpty;
       final text = '${i + 1} · $head${done ? ' ✓' : ''}';
       if (i == _step) {
-        chips.add(Container(
+        chips.add(
-          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+          Container(
-          decoration: BoxDecoration(
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
-              color: tokens.globalFocus.withValues(alpha: 0.18), border: Border.all(color: tokens.statusInfo), borderRadius: BorderRadius.circular(4)),
+            decoration: BoxDecoration(
-          child: ClideText(text, fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: tokens.globalForeground),
+              color: tokens.globalFocus.withValues(alpha: 0.18),
-        ));
+              border: Border.all(color: tokens.statusInfo),
+              borderRadius: BorderRadius.circular(4),
+            ),
+            child: ClideText(text, fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: tokens.globalForeground),
+          ),
+        );
       } else {
         chips.add(ClideText(text, fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: done ? tokens.statusSuccess : tokens.globalTextMuted));
       }
@@ -376,8 +381,13 @@ class _ToolPromptCardState extends State<ToolPromptCard> {
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          SizedBox(width: 110, child: ClideText(head, fontSize: clideFontMeta, color: tokens.globalTextMuted)),
+          SizedBox(
-          Expanded(child: ClideText('→ ${_answer(qi)}', fontSize: clideFontSmall, color: tokens.globalForeground)),
+            width: 110,
+            child: ClideText(head, fontSize: clideFontMeta, color: tokens.globalTextMuted),
+          ),
+          Expanded(
+            child: ClideText('→ ${_answer(qi)}', fontSize: clideFontSmall, color: tokens.globalForeground),
+          ),
         ],
       ),
     );
@@ -403,10 +413,7 @@ class _ToolPromptCardState extends State<ToolPromptCard> {
             _optButton(qi, _kOther, 'Other…', q.multiSelect, '', q.options.length + 1),
           ],
         ),
-        if (hasOther) ...[
+        if (hasOther) ...[const SizedBox(height: 8), _NoteField(controller: _other[qi], placeholder: 'type your answer…')],
-          const SizedBox(height: 8),
-          _NoteField(controller: _other[qi], placeholder: 'type your answer…'),
-        ],
         const SizedBox(height: 8),
         _NoteField(controller: _qnote[qi], placeholder: '+ note (optional)'),
       ],
@@ -499,10 +506,7 @@ Widget toolInputBody(SurfaceTokens tokens, String toolName, Map<String, dynamic>
 /// / timeout annotations.
 Widget toolBashBody(SurfaceTokens tokens, Map<String, dynamic> input) {
   final cmd = (input['command'] as String? ?? '').trimRight();
-  final notes = <String>[
+  final notes = <String>[if (input['run_in_background'] == true) 'background', if (input['timeout'] is num) 'timeout ${input['timeout']}ms'];
-    if (input['run_in_background'] == true) 'background',
-    if (input['timeout'] is num) 'timeout ${input['timeout']}ms',
-  ];
   return Column(
     crossAxisAlignment: CrossAxisAlignment.stretch,
     mainAxisSize: MainAxisSize.min,
@@ -564,19 +568,14 @@ Widget toolReadLikeBody(SurfaceTokens tokens, String toolName, Map<String, dynam
     if (pat != null && pat.isNotEmpty) extra.add('"$pat"');
   }
   final label = [path.toString(), ...extra].where((s) => s.isNotEmpty).join('  ');
-  return ClideText(
+  return ClideText(label.isNotEmpty ? label : toolName, fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: tokens.globalForeground);
-    label.isNotEmpty ? label : toolName,
-    fontSize: clideFontMeta,
-    fontFamily: clideMonoFamily,
-    color: tokens.globalForeground,
-  );
 }
 
 /// A muted file path line, shared across tool bodies.
 Widget toolPathLine(SurfaceTokens tokens, String path) => Padding(
-      padding: const EdgeInsets.only(bottom: 6),
+  padding: const EdgeInsets.only(bottom: 6),
-      child: ClideText(path, fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: tokens.globalTextMuted),
+  child: ClideText(path, fontSize: clideFontMeta, fontFamily: clideMonoFamily, color: tokens.globalTextMuted),
-    );
+);
 
 // -- shared note / free-text field -------------------------------------------
 
@@ -613,7 +612,7 @@ class _NoteFieldState extends State<_NoteField> {
         children: [
           ValueListenableBuilder<TextEditingValue>(
             valueListenable: widget.controller,
-            builder: (_, v, __) => v.text.isEmpty ? ClideText(widget.placeholder, muted: true, fontSize: clideFontSmall) : const SizedBox.shrink(),
+            builder: (_, v, _) => v.text.isEmpty ? ClideText(widget.placeholder, muted: true, fontSize: clideFontSmall) : const SizedBox.shrink(),
           ),
           EditableText(
             controller: widget.controller,
@@ -652,14 +651,9 @@ List<_Question> _parseQuestions(Map<String, dynamic> input) {
   return [
     for (final q in raw)
       if (q is Map)
-        _Question(
+        _Question(q['question'] as String? ?? '', q['header'] as String? ?? '', q['multiSelect'] as bool? ?? false, [
-          q['question'] as String? ?? '',
+          for (final o in (q['options'] as List? ?? const []))
-          q['header'] as String? ?? '',
+            if (o is Map) _Option(o['label'] as String? ?? '', o['description'] as String? ?? ''),
-          q['multiSelect'] as bool? ?? false,
+        ]),
-          [
-            for (final o in (q['options'] as List? ?? const []))
-              if (o is Map) _Option(o['label'] as String? ?? '', o['description'] as String? ?? ''),
-          ],
-        ),
   ];
 }

lib/builtin/claude/src/session_index.dart

@@ -13,13 +13,7 @@ import 'dart:io';
 
 /// One session in the workspace, summarised for the picker.
 class SessionSummary {
-  const SessionSummary({
+  const SessionSummary({required this.id, required this.modified, this.firstUser, this.lastUser, this.sizeBytes = 0});
-    required this.id,
-    required this.modified,
-    this.firstUser,
-    this.lastUser,
-    this.sizeBytes = 0,
-  });
 
   /// The session id (the `<uuid>` of `<uuid>.jsonl`).
   final String id;
@@ -94,11 +88,7 @@ String? _userTextOf(String line) {
 /// Sessions in [dir] (the munged project dir), most-recently-modified first,
 /// capped at [max]. Each is summarised by bookend user prompts read from a
 /// bounded [window] at each end of its transcript.
-Future<List<SessionSummary>> listSessions(
+Future<List<SessionSummary>> listSessions(Directory dir, {int max = 20, int window = 128 * 1024}) async {
-  Directory dir, {
-  int max = 20,
-  int window = 128 * 1024,
-}) async {
   if (!await dir.exists()) return const [];
   final files = <File>[];
   await for (final e in dir.list(followLinks: false)) {
@@ -109,13 +99,15 @@ Future<List<SessionSummary>> listSessions(
     final stat = await f.stat();
     final bookends = await _bookends(f, window);
     final id = _sessionId(f.path);
-    summaries.add(SessionSummary(
+    summaries.add(
-      id: id,
+      SessionSummary(
-      modified: stat.modified,
+        id: id,
-      firstUser: bookends.first,
+        modified: stat.modified,
-      lastUser: bookends.last,
+        firstUser: bookends.first,
-      sizeBytes: stat.size + await _dirSize(Directory('${dir.path}/$id')),
+        lastUser: bookends.last,
-    ));
+        sizeBytes: stat.size + await _dirSize(Directory('${dir.path}/$id')),
+      ),
+    );
   }
   summaries.sort((a, b) => b.modified.compareTo(a.modified));
   return summaries.length > max ? summaries.sublist(0, max) : summaries;

lib/builtin/claude/src/session_orchestrator.dart

@@ -2,8 +2,8 @@
 ///
 /// A session is a `claude` stream-json process clide spawns and renders; a
 /// pane is just a *view* on one. The orchestrator decouples a session's
-/// lifecycle from any pane: [spawn] starts and registers it, [show]/[hide]
+/// lifecycle from any pane: `spawn` starts and registers it, `show`/`hide`
-/// toggle visibility WITHOUT tearing the process down, and [close] kills it.
+/// toggle visibility WITHOUT tearing the process down, and `close` kills it.
 /// This is the one primitive behind teammate / secondary tab / forked branch
 /// (Phase 2): they are all just managed sessions shown as panes.
 ///
@@ -32,11 +32,7 @@ const _resumeTailBytes = 256 * 1024;
 
 /// Creates the subprocess for a session — production uses
 /// [ClaudeStreamJsonProcess.start]; tests inject a fake.
-typedef ProcessFactory = Future<StreamJsonProcess> Function({
+typedef ProcessFactory = Future<StreamJsonProcess> Function({required List<String> sessionArgs, required String cwd, Map<String, String>? env});
-  required List<String> sessionArgs,
-  required String cwd,
-  Map<String, String>? env,
-});
 
 /// What to spawn. [id] is the orchestrator's stable key (e.g. `primary`,
 /// `teammate:tyre`); [sessionId] is claude's `--session-id`.
@@ -53,6 +49,7 @@ class SpawnSpec {
     this.team = false,
     this.memberName,
     this.forkSourceSessionId,
+    this.effort,
   });
 
   final String id;
@@ -85,6 +82,12 @@ class SpawnSpec {
   /// Takes precedence over [resume]/[sessionId] for arg selection.
   final String? forkSourceSessionId;
 
+  /// Effort level passed to `claude --effort` (low/medium/high/xhigh/max,
+  /// T-412). Null spawns without the flag — the CLI uses its configured
+  /// default (settings.json `effortLevel`). No set_effort control subtype
+  /// exists, so changing effort means respawn-with-resume carrying this.
+  final String? effort;
+
   /// Whether this spec spawns a forked session.
   bool get isFork => forkSourceSessionId != null;
 }
@@ -150,10 +153,7 @@ ClaudeSessionOrchestrator? activeSessionOrchestrator;
 
 class ClaudeSessionOrchestrator extends ChangeNotifier {
   ClaudeSessionOrchestrator({ProcessFactory? processFactory}) : _factory = processFactory ?? _spawnClaude {
-    _chatModel = TeamChatModel(
+    _chatModel = TeamChatModel(broker: broker, sessionResolver: (name) => byMemberName(name)?.session);
-      broker: broker,
-      sessionResolver: (name) => byMemberName(name)?.session,
-    );
   }
 
   final ProcessFactory _factory;
@@ -181,9 +181,9 @@ class ClaudeSessionOrchestrator extends ChangeNotifier {
 
   /// Just the sessions a pane should currently render.
   List<ManagedSession> get visibleSessions => [
-        for (final m in _sessions.values)
+    for (final m in _sessions.values)
-          if (m.visible) m,
+      if (m.visible) m,
-      ];
+  ];
 
   ManagedSession? byId(String id) => _sessions[id];
 
@@ -195,7 +195,28 @@ class ClaudeSessionOrchestrator extends ChangeNotifier {
   /// (T-269): the existing session belongs to the old repo, so it is torn down
   /// and a fresh one spawned for the new repo — a pane must never inherit
   /// another workspace's conversation.
-  Future<ManagedSession> spawn(SpawnSpec spec) async {
+  Future<ManagedSession> spawn(SpawnSpec spec) {
+    // Serialize concurrent spawns per id (T-374): the body check-then-acts
+    // on _sessions across two awaits, so two racing callers would both
+    // pass the check and the loser's live claude process would be orphaned.
+    // The first caller installs the future synchronously; the rest await
+    // it. (A racing different-cwd spawn for the same id also coalesces —
+    // the workspace-switch flow is sequential, so that pair never races.)
+    final inFlight = _spawning[spec.id];
+    if (inFlight != null) return inFlight;
+    final f = _spawn(spec);
+    _spawning[spec.id] = f;
+    unawaited(
+      f.then<void>((_) {}, onError: (Object _) {}).whenComplete(() {
+        if (identical(_spawning[spec.id], f)) _spawning.remove(spec.id);
+      }),
+    );
+    return f;
+  }
+
+  final Map<String, Future<ManagedSession>> _spawning = {};
+
+  Future<ManagedSession> _spawn(SpawnSpec spec) async {
     final existing = _sessions[spec.id];
     if (existing != null) {
       if (existing.cwd == spec.cwd) return existing;
@@ -228,14 +249,11 @@ class ClaudeSessionOrchestrator extends ChangeNotifier {
       '--append-system-prompt',
       preambles.join('\n\n'),
       ...bootstrap.extraArgs,
+      if (spec.effort != null) ...['--effort', spec.effort!],
       ...sessionArgs,
     ];
 
-    final proc = await _factory(
+    final proc = await _factory(sessionArgs: sessionArgs, cwd: spec.cwd, env: bootstrap.envDelta);
-      sessionArgs: sessionArgs,
-      cwd: spec.cwd,
-      env: bootstrap.envDelta,
-    );
     final session = StreamJsonSession(proc, mcpServers: mcpServers)..start();
     final seed = spec.resume && spec.transcriptPath != null ? await _readTranscriptTail(spec.transcriptPath!) : null;
     final conversation = ConversationController(stream: session.items, seed: seed, onDispose: session.dispose);
@@ -362,7 +380,8 @@ class ClaudeSessionOrchestrator extends ChangeNotifier {
   }
 
   /// The team-awareness preamble injected via `--append-system-prompt` (T-170).
-  static String _teamSystemPrompt(String name, String role) => 'You are part of a clide-managed agent team. Your name is "$name" and your role is "$role". '
+  static String _teamSystemPrompt(String name, String role) =>
+      'You are part of a clide-managed agent team. Your name is "$name" and your role is "$role". '
       'Coordinate with teammates using the clide-team MCP tools: '
       'send_message(to, text) to message one teammate by name, broadcast(text) to message all, '
       'list_teammates() to see the roster, inbox() to read messages sent to you, and '

lib/builtin/claude/src/session_picker.dart

@@ -12,12 +12,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 
 class SessionPickerDialog extends StatefulWidget {
-  const SessionPickerDialog({
+  const SessionPickerDialog({super.key, required this.sessions, required this.onPick, required this.onCancel});
-    super.key,
-    required this.sessions,
-    required this.onPick,
-    required this.onCancel,
-  });
 
   final List<SessionSummary> sessions;
   final void Function(String id) onPick;
@@ -92,11 +87,7 @@ class _SessionPickerDialogState extends State<SessionPickerDialog> {
               )
             else
               Flexible(
-                child: ListView.builder(
+                child: ListView.builder(shrinkWrap: true, itemCount: widget.sessions.length, itemBuilder: (ctx, i) => _row(theme, i)),
-                  shrinkWrap: true,
-                  itemCount: widget.sessions.length,
-                  itemBuilder: (ctx, i) => _row(theme, i),
-                ),
               ),
           ],
         ),
@@ -117,13 +108,7 @@ class _SessionPickerDialogState extends State<SessionPickerDialog> {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              ClideText(
+              ClideText(s.label, fontSize: clideFontSmall, color: theme.globalForeground, maxLines: 2, overflow: TextOverflow.ellipsis),
-                s.label,
-                fontSize: clideFontSmall,
-                color: theme.globalForeground,
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-              ),
               const SizedBox(height: 2),
               ClideText(relativeTime(s.modified), muted: true, fontSize: clideFontSmall),
             ],

lib/builtin/claude/src/session_storage.dart

@@ -17,13 +17,7 @@ import 'package:flutter/widgets.dart';
 typedef SessionDeleter = Future<void> Function(Directory dir, String id);
 
 class SessionStorageDialog extends StatefulWidget {
-  const SessionStorageDialog({
+  const SessionStorageDialog({super.key, required this.dir, required this.sessions, required this.onClose, this.deleter = deleteSession});
-    super.key,
-    required this.dir,
-    required this.sessions,
-    required this.onClose,
-    this.deleter = deleteSession,
-  });
 
   final Directory dir;
   final List<SessionSummary> sessions;
@@ -79,19 +73,11 @@ class _SessionStorageDialogState extends State<SessionStorageDialog> {
           children: [
             Padding(
               padding: const EdgeInsets.fromLTRB(14, 12, 14, 4),
-              child: ClideText(
+              child: ClideText('Session storage  ·  ${formatBytes(_total)} total', fontSize: clideFontBody, color: theme.globalForeground),
-                'Session storage  ·  ${formatBytes(_total)} total',
-                fontSize: clideFontBody,
-                color: theme.globalForeground,
-              ),
             ),
             Padding(
               padding: const EdgeInsets.fromLTRB(14, 0, 14, 8),
-              child: ClideText(
+              child: ClideText('Deleting a session you are currently using will break that pane.', muted: true, fontSize: clideFontSmall),
-                'Deleting a session you are currently using will break that pane.',
-                muted: true,
-                fontSize: clideFontSmall,
-              ),
             ),
             if (_sessions.isEmpty)
               Padding(
@@ -100,11 +86,7 @@ class _SessionStorageDialogState extends State<SessionStorageDialog> {
               )
             else
               Flexible(
-                child: ListView.builder(
+                child: ListView.builder(shrinkWrap: true, itemCount: _sessions.length, itemBuilder: (ctx, i) => _row(theme, _sessions[i])),
-                  shrinkWrap: true,
-                  itemCount: _sessions.length,
-                  itemBuilder: (ctx, i) => _row(theme, _sessions[i]),
-                ),
               ),
           ],
         ),

lib/builtin/claude/src/slash_commands.dart

@@ -30,8 +30,29 @@ bool isKnownSlashCommand(String text, Iterable<String> known) {
 /// Slash commands clide handles itself instead of forwarding to Claude:
 /// Claude Code's own handling forks the session to a new id that clide's
 /// transcript reader can't follow, so clide owns the semantics (T-156).
-/// `/fork` branches the current session into a new pane (T-172).
+/// `/fork` branches the current session into a new pane (T-172). `/model`
-const Set<String> kClideOwnedCommands = {'clear', 'resume', 'fork'};
+/// is interactive in the CLI's TUI only — forwarded it does nothing — so
+/// clide owns it as a set_model control request / picker (T-408). `/effort`
+/// has no control subtype, so clide owns it as a respawn-with-resume
+/// carrying `--effort` (T-412). `/permissions` is a picker over
+/// set_permission_mode; the rest navigate to clide surfaces (T-413):
+/// /status//config//mcp//agents//hooks → the Claude sidebar tabs,
+/// /memory → CLAUDE.md in the editor, /help → a local command summary.
+const Set<String> kClideOwnedCommands = {
+  'clear',
+  'resume',
+  'fork',
+  'model',
+  'effort',
+  'permissions',
+  'status',
+  'config',
+  'mcp',
+  'agents',
+  'hooks',
+  'memory',
+  'help',
+};
 
 /// The clide-owned command in [text] (a single-line leading-slash token in
 /// [kClideOwnedCommands]), or null.
@@ -40,6 +61,93 @@ String? clideOwnedCommand(String text) {
   return token != null && kClideOwnedCommands.contains(token) ? token : null;
 }
 
+/// Where slash input goes (T-411). One source of truth so a TUI-only command
+/// neither errors raw from the CLI nor bracket-pastes to the model as text
+/// (burning a real turn — observed with /effort on claude 2.1.175).
+enum SlashRoute {
+  /// clide implements it natively ([kClideOwnedCommands]).
+  owned,
+
+  /// The CLI handles it headless — advertised in the `initialize` handshake's
+  /// `slash_commands` (skills + the headless builtins: compact, context, …).
+  forward,
+
+  /// A known TUI-only builtin: never forwarded; clide shows a local notice
+  /// with the clide-native way ([kTuiOnlyCommands]).
+  unavailable,
+}
+
+/// Claude Code TUI-only builtins (probed against 2.1.175: not advertised in
+/// stream-json, and forwarding would either error "isn't available in this
+/// environment" or — worse, for un-advertised tokens — bracket-paste to the
+/// model as literal text). Value = the clide-native pointer shown in the
+/// notice card. Commands clide later implements move to [kClideOwnedCommands].
+const Map<String, String> kTuiOnlyCommands = {
+  'effort': '', // owned (T-412) — only routes here if ever removed from owned
+  'status': '', // owned (T-413)
+  'cost': 'cost and context usage live in the Claude sidebar (Activity tab)',
+  'context': '', // advertised on current CLIs — only routes here on older ones
+  'help': '', // owned (T-413)
+  'config': '', // owned (T-413)
+  'permissions': '', // owned (T-413)
+  'memory': '', // owned (T-413)
+  'mcp': '', // owned (T-413)
+  'agents': '', // owned (T-413)
+  'hooks': '', // owned (T-413)
+  'todos': "Claude's task list docks above the composer",
+  'model': '', // owned (T-408) — only routes here if ever removed from owned
+  'doctor': 'run `claude doctor` in a terminal',
+  'login': 'run `claude` in a terminal and use /login there',
+  'logout': 'run `claude` in a terminal and use /logout there',
+  'exit': 'close the pane or switch sessions instead',
+  'vim': 'clide ships its own editor vim mode',
+  'add-dir': '',
+  'bashes': '',
+  'bug': '',
+  'export': '',
+  'fast': '',
+  'ide': "you're already in one",
+  'install-github-app': '',
+  'migrate-installer': '',
+  'output-style': '',
+  'pr-comments': '',
+  'privacy-settings': '',
+  'release-notes': '',
+  'rewind': '',
+  'statusline': '',
+  'terminal-setup': '',
+  'upgrade': '',
+};
+
+/// Route [text] (composer input). Null when it isn't slash-command input —
+/// send it as a normal message. Precedence: owned > advertised > TUI-only
+/// catalog > forward (unknown tokens stay literal text via bracketed paste).
+SlashRoute? routeSlashCommand(String text, {required Iterable<String> advertised}) {
+  final token = slashCommandToken(text);
+  if (token == null) return null;
+  if (kClideOwnedCommands.contains(token)) return SlashRoute.owned;
+  if (advertised.contains(token)) return SlashRoute.forward;
+  if (kTuiOnlyCommands.containsKey(token)) return SlashRoute.unavailable;
+  return SlashRoute.forward;
+}
+
+/// The notice text for a TUI-only [token] — the CLI's own phrasing plus the
+/// clide-native pointer when the catalog has one.
+String tuiOnlyNotice(String token) {
+  final hint = kTuiOnlyCommands[token] ?? '';
+  final base = "/$token is a Claude Code TUI command — it isn't available in clide's conversation pane.";
+  return hint.isEmpty ? base : '$base\n→ $hint';
+}
+
+/// The argument text after the command token — `"/model sonnet"` → `"sonnet"`
+/// — trimmed; empty when there is none (`"/model"`). Null when [text] isn't
+/// single-line leading-slash input.
+String? slashCommandArg(String text) {
+  if (slashCommandToken(text) == null) return null;
+  final ws = text.indexOf(RegExp(r'\s'));
+  return ws < 0 ? '' : text.substring(ws + 1).trim();
+}
+
 bool _isWs(String c) => c == ' ' || c == '\t' || c == '\n';
 
 /// An in-progress slash query at the cursor — the `/` position and the word

lib/builtin/claude/src/stream_json_session.dart

@@ -19,8 +19,12 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:clide/builtin/claude/src/transcript_reader.dart';
+import 'package:clide/builtin/claude/src/workflow_run.dart';
+import 'package:clide/src/util/value_stream.dart';
 
 /// The claude subprocess, abstracted so tests drive it without spawning.
+/// Fakes `extend` this and override what they drive; the defaults below
+/// describe a process with no real child behind it.
 abstract class StreamJsonProcess {
   /// stdout, one JSON event per line.
   Stream<String> get lines;
@@ -30,21 +34,47 @@ abstract class StreamJsonProcess {
 
   /// Terminate the process.
   Future<void> kill();
+
+  /// The last lines of the child's stderr, drained continuously so the pipe
+  /// can never fill and block the child mid-turn (T-361). Default: none.
+  List<String> get stderrTail => const [];
+
+  /// Completes with the child's exit code, or null when there is no real
+  /// process to watch (fakes that never "exit").
+  Future<int>? get exitCode => null;
+}
+
+/// A bounded FIFO of the most recent lines — the stderr tail kept for
+/// post-mortem diagnostics while the stream itself is drained and dropped.
+class BoundedLineBuffer {
+  BoundedLineBuffer({this.cap = 100});
+
+  final int cap;
+  final List<String> _lines = [];
+
+  void add(String line) {
+    _lines.add(line);
+    if (_lines.length > cap) _lines.removeAt(0);
+  }
+
+  List<String> get lines => List.unmodifiable(_lines);
 }
 
 /// Production [StreamJsonProcess] backed by a real `claude` process.
-class ClaudeStreamJsonProcess implements StreamJsonProcess {
+class ClaudeStreamJsonProcess extends StreamJsonProcess {
-  ClaudeStreamJsonProcess._(this._proc);
+  ClaudeStreamJsonProcess._(this._proc) {
+    // Drain stderr from the moment the process exists — with --verbose the
+    // CLI chats on stderr, and an undrained 64KB pipe blocks the child
+    // mid-turn with zero diagnostics (T-361). Keep a tail for post-mortems.
+    _proc.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_stderr.add, onError: (Object _) {});
+  }
 
   final Process _proc;
+  final BoundedLineBuffer _stderr = BoundedLineBuffer();
 
   /// Spawn `claude` in stream-json mode. [sessionArgs] is `['--session-id', id]`
   /// for a new session or `['--resume', id]` to resume an existing one (T-161).
-  static Future<ClaudeStreamJsonProcess> start({
+  static Future<ClaudeStreamJsonProcess> start({required List<String> sessionArgs, required String cwd, Map<String, String>? env}) async {
-    required List<String> sessionArgs,
-    required String cwd,
-    Map<String, String>? env,
-  }) async {
     final proc = await Process.start(
       'claude',
       [
@@ -79,6 +109,12 @@ class ClaudeStreamJsonProcess implements StreamJsonProcess {
   Future<void> kill() async {
     _proc.kill();
   }
+
+  @override
+  List<String> get stderrTail => _stderr.lines;
+
+  @override
+  Future<int> get exitCode => _proc.exitCode;
 }
 
 /// An in-process MCP server clide hosts for a session, entirely over the
@@ -112,6 +148,53 @@ abstract class McpServer {
   Future<Map<String, dynamic>> callTool(String name, Map<String, dynamic> arguments);
 }
 
+/// A model selectable for a session, from the `initialize` control_response's
+/// `models[]` (T-408). Pure data, Flutter-free.
+class ModelOption {
+  const ModelOption({required this.value, required this.displayName, this.description = ''});
+
+  /// The id/alias sent in `set_model` — e.g. `default`, `sonnet`, `opus`.
+  final String value;
+
+  /// Human label, e.g. `Sonnet`.
+  final String displayName;
+
+  /// One-line blurb shown muted next to the label.
+  final String description;
+}
+
+/// Effort levels `claude --effort` accepts (probed against 2.1.175). There is
+/// NO set_effort control subtype (probed: rejected), so changing effort
+/// respawns the session with the flag — resume keeps the conversation (T-412).
+/// Expressed as [ModelOption]s so the /effort picker reuses the /model card.
+const List<ModelOption> kEffortLevels = [
+  ModelOption(value: 'low', displayName: 'low', description: 'fastest, minimal thinking'),
+  ModelOption(value: 'medium', displayName: 'medium', description: 'balanced'),
+  ModelOption(value: 'high', displayName: 'high', description: 'thorough'),
+  ModelOption(value: 'xhigh', displayName: 'xhigh', description: 'deeper reasoning'),
+  ModelOption(value: 'max', displayName: 'max', description: 'maximum thinking budget'),
+];
+
+/// Permission modes for the /permissions picker (T-413), set over the
+/// set_permission_mode control request. Bypass is last and explicit — the
+/// footgun stays visible but never the default reach (T-181).
+const List<ModelOption> kPermissionModes = [
+  ModelOption(value: 'default', displayName: 'default', description: 'ask before sensitive tools'),
+  ModelOption(value: 'acceptEdits', displayName: 'acceptEdits', description: 'auto-approve file edits'),
+  ModelOption(value: 'plan', displayName: 'plan', description: 'read-only planning mode'),
+  ModelOption(value: 'bypassPermissions', displayName: 'bypassPermissions', description: 'no prompts at all — careful'),
+];
+
+/// Fallback picker entries for when the `initialize` response hasn't arrived
+/// (or carried no models): the stable aliases every claude build accepts
+/// (T-408). `default` resets to the CLI's configured model.
+const List<ModelOption> kFallbackModels = [
+  ModelOption(value: 'default', displayName: 'Default', description: 'recommended — the CLI\'s configured model'),
+  ModelOption(value: 'sonnet', displayName: 'Sonnet', description: 'fast, great for everyday tasks'),
+  ModelOption(value: 'opus', displayName: 'Opus', description: 'most capable'),
+  ModelOption(value: 'haiku', displayName: 'Haiku', description: 'fastest, lightweight'),
+];
+
 /// An interactive prompt Claude is blocked on, from the stream-json control
 /// channel (a `can_use_tool` control_request) — a tool needing permission, or
 /// an `AskUserQuestion`. Pure data; the decision goes back via
@@ -176,10 +259,10 @@ final class AllowTool extends ToolDecision {
   final String? followUpNote;
   @override
   Map<String, dynamic> toJson() => {
-        'behavior': 'allow',
+    'behavior': 'allow',
-        'updatedInput': updatedInput,
+    'updatedInput': updatedInput,
-        if (updatedPermissions != null && updatedPermissions!.isNotEmpty) 'updatedPermissions': updatedPermissions,
+    if (updatedPermissions != null && updatedPermissions!.isNotEmpty) 'updatedPermissions': updatedPermissions,
-      };
+  };
 }
 
 /// Deny the tool with a user-facing [message] (required by the protocol).
@@ -198,6 +281,15 @@ final class DenyTool extends ToolDecision {
 
 /// Parses a [StreamJsonProcess]'s events into conversation items + status,
 /// answers control-channel prompts, and sends user messages.
+/// Terminal session end: the claude process exited (crash or otherwise).
+/// Carries the exit code and the drained stderr tail for diagnostics.
+class SessionEnd {
+  const SessionEnd({required this.exitCode, required this.stderrTail});
+
+  final int exitCode;
+  final List<String> stderrTail;
+}
+
 class StreamJsonSession {
   StreamJsonSession(this._proc, {List<McpServer> mcpServers = const []}) : _mcpServers = mcpServers;
 
@@ -208,13 +300,36 @@ class StreamJsonSession {
   /// round-trips are answered by [_handleMcpMessage].
   final List<McpServer> _mcpServers;
   final _items = StreamController<ConversationItem>.broadcast();
-  final _statusCtl = StreamController<SessionStatus>.broadcast();
+  // State, not events — replay-latest so a subscriber that binds after the
+  // init event still sees the current status (T-386; root cause of T-274).
+  final _statusCtl = ValueStream<SessionStatus>();
   final _sessionIdCtl = StreamController<String>.broadcast();
   StreamSubscription<String>? _sub;
   SessionStatus _status = const SessionStatus();
   String? _claudeSessionId;
   int _localSeq = 0;
 
+  /// The `initialize` handshake's request id — its control_response carries
+  /// the selectable `models[]` (T-408).
+  String? _initRequestId;
+
+  /// In-flight `set_model` request ids → the model the status held before the
+  /// optimistic merge, so an error response can roll it back (T-408).
+  final _pendingSetModel = <String, String?>{};
+
+  List<ModelOption> _availableModels = const [];
+
+  /// Models selectable for this session, from the `initialize` response.
+  /// Empty until that response arrives (callers fall back to
+  /// [kFallbackModels]).
+  List<ModelOption> get availableModels => _availableModels;
+
+  final _modelErrorCtl = StreamController<String>.broadcast();
+
+  /// Errors from rejected `set_model` requests (e.g. an unknown model name),
+  /// for the pane to surface (T-408).
+  Stream<String> get modelErrors => _modelErrorCtl.stream;
+
   /// Token-by-token streaming state (T-168, wire shape verified by T-184).
   ///
   /// With `--include-partial-messages`, claude emits the in-progress reply as
@@ -241,7 +356,7 @@ class StreamJsonSession {
   /// Prompts awaiting a [resolvePrompt] decision, in arrival order. The head
   /// is the one currently shown in the composer zone.
   final _queue = <ToolPrompt>[];
-  final _pendingCtl = StreamController<ToolPrompt?>.broadcast();
+  final _pendingCtl = ValueStream<ToolPrompt?>.seeded(null);
 
   /// tool_use_ids that surfaced as a prompt — the view hides their raw
   /// tool-use card while pending (it shows as a prompt) but keeps the result.
@@ -263,10 +378,24 @@ class StreamJsonSession {
   Map<String, bool> get toolUseOutcomes => _toolUseOutcome;
   Set<String> get quietErrorToolUseIds => _quietErrorToolUses;
 
+  /// Live Workflow runs, keyed by their launching `Workflow` tool-use id
+  /// (T-416). Accumulated from the out-of-band `system` task_* events the
+  /// harness emits while a workflow runs in the background; the conversation
+  /// card and the sidebar indicator both read this snapshot. Ephemeral — the
+  /// events aren't in the resumed transcript, so this is empty on reload.
+  final _workflows = <String, WorkflowRun>{};
+  final _workflowsCtl = ValueStream<Map<String, WorkflowRun>>.seeded(const {});
+
+  /// The current workflow runs, keyed by launching tool-use id.
+  Map<String, WorkflowRun> get workflows => Map.unmodifiable(_workflows);
+
+  /// Emits the workflow-run map whenever a `system` task event updates it.
+  Stream<Map<String, WorkflowRun>> get workflowsStream => _workflowsCtl.stream;
+
   /// Whether a turn is in flight (between a send and claude's `result`). Drives
   /// the composer's Stop affordance.
   bool _busy = false;
-  final _busyCtl = StreamController<bool>.broadcast();
+  final _busyCtl = ValueStream<bool>.seeded(false);
   bool get busy => _busy;
   Stream<bool> get busyStream => _busyCtl.stream;
 
@@ -303,23 +432,41 @@ class StreamJsonSession {
   /// The latest known status — the current value [statusStream] last emitted.
   SessionStatus get status => _status;
 
+  /// Non-null once the claude process has exited (T-361). Late binders read
+  /// this; live listeners get [endedStream]. Never set by a deliberate
+  /// [dispose] — only by the process dying underneath a live session.
+  SessionEnd? get end => _end;
+  SessionEnd? _end;
+  final _endCtl = StreamController<SessionEnd>.broadcast();
+  bool _disposed = false;
+
+  /// Fires once when the process exits while the session is still live —
+  /// a crashed/dead session must not just look thoughtful (T-361).
+  Stream<SessionEnd> get endedStream => _endCtl.stream;
+
   /// Begin consuming the process's event stream.
   void start() {
     _sub = _proc.lines.listen(_onLine, onError: (Object _) {});
-    // Declaring our in-process MCP servers in the `initialize` handshake is what
+    // Watch the process itself: stdout EOF alone is ambiguous, the exit
-    // makes claude drive their JSON-RPC over `mcp_message` (T-170). Only sent
+    // code is not (T-361).
-    // when we actually host a server, so a plain session is unchanged.
+    final exit = _proc.exitCode;
-    if (_mcpServers.isNotEmpty) {
+    if (exit != null) unawaited(exit.then(_onExit));
-      _proc.writeLine(jsonEncode({
+    // The `initialize` handshake is side-effect-free (verified in the protocol
+    // spike) and does double duty: declaring our in-process MCP servers is what
+    // makes claude drive their JSON-RPC over `mcp_message` (T-170), and the
+    // response's `models[]` feeds the /model picker (T-408).
+    _initRequestId = 'init-${_localSeq++}';
+    _proc.writeLine(
+      jsonEncode({
         'type': 'control_request',
-        'request_id': 'init-${_localSeq++}',
+        'request_id': _initRequestId,
         'request': {
           'subtype': 'initialize',
           'hooks': <String, dynamic>{},
           'sdkMcpServers': [for (final s in _mcpServers) s.name],
         },
-      }));
+      }),
-    }
+    );
   }
 
   void _onLine(String line) {
@@ -347,6 +494,12 @@ class StreamJsonSession {
       _onControlRequest(ev);
       return;
     }
+    // Responses to OUR control requests: the initialize result (models) and
+    // set_model acks/errors (T-408).
+    if (ev['type'] == 'control_response') {
+      _onControlResponse(ev);
+      return;
+    }
     // A `result` ends the turn — clear the busy/interruptible state and reset
     // streaming state so the next turn is fresh.
     if (ev['type'] == 'result') {
@@ -363,6 +516,15 @@ class StreamJsonSession {
       return;
     }
 
+    // Workflow run progress (T-416): the harness reports a backgrounded Workflow
+    // tool's fan-out on out-of-band `system` task_* events keyed by the
+    // launching tool-use id. Fold them into the run snapshot and notify; they
+    // carry no conversation item, so don't fall through to the parser.
+    if (isWorkflowSystemEvent(ev)) {
+      _onWorkflowEvent(ev);
+      return;
+    }
+
     // Finalise a streamed reply: when the real text `assistant` event for a
     // message we streamed arrives, reuse the placeholder's `partial-<id>` uuid
     // so the controller replaces the placeholder in place rather than appending
@@ -436,6 +598,15 @@ class StreamJsonSession {
     }
   }
 
+  /// Fold one workflow `system` task event into its run snapshot, keyed by the
+  /// launching tool-use id, and publish the updated map (T-416).
+  void _onWorkflowEvent(Map<String, dynamic> ev) {
+    final id = ev['tool_use_id'] as String;
+    final prior = _workflows[id] ?? WorkflowRun(toolUseId: id);
+    _workflows[id] = prior.foldEvent(ev);
+    _workflowsCtl.add(Map.unmodifiable(_workflows));
+  }
+
   /// Handle an inbound `control_request`. `can_use_tool` becomes a [ToolPrompt]
   /// item the UI resolves; every other subtype is answered with an error so
   /// the turn never hangs waiting on us (D-78).
@@ -448,15 +619,17 @@ class StreamJsonSession {
       final input = (request['input'] as Map?)?.cast<String, dynamic>() ?? <String, dynamic>{};
       final tuid = request['tool_use_id'] as String? ?? '';
       if (tuid.isNotEmpty) _promptedToolUses.add(tuid);
-      _queue.add(ToolPrompt(
+      _queue.add(
-        promptId: rid,
+        ToolPrompt(
-        toolName: toolName,
+          promptId: rid,
-        displayName: request['display_name'] as String? ?? toolName,
+          toolName: toolName,
-        description: request['description'] as String?,
+          displayName: request['display_name'] as String? ?? toolName,
-        toolUseId: request['tool_use_id'] as String? ?? '',
+          description: request['description'] as String?,
-        input: input,
+          toolUseId: request['tool_use_id'] as String? ?? '',
-        permissionSuggestions: (request['permission_suggestions'] as List?) ?? const [],
+          input: input,
-      ));
+          permissionSuggestions: (request['permission_suggestions'] as List?) ?? const [],
+        ),
+      );
       _pendingCtl.add(pendingPrompt);
       return; // awaits resolvePrompt
     }
@@ -465,10 +638,12 @@ class StreamJsonSession {
       unawaited(_handleMcpMessage(rid, request.cast<String, dynamic>()));
       return;
     }
-    _proc.writeLine(jsonEncode({
+    _proc.writeLine(
-      'type': 'control_response',
+      jsonEncode({
-      'response': {'subtype': 'error', 'request_id': rid, 'error': 'Unsupported control request subtype: ${request['subtype']}'},
+        'type': 'control_response',
-    }));
+        'response': {'subtype': 'error', 'request_id': rid, 'error': 'Unsupported control request subtype: ${request['subtype']}'},
+      }),
+    );
   }
 
   /// Answer an `mcp_message` control_request: dispatch its JSON-RPC to the named
@@ -489,14 +664,16 @@ class StreamJsonSession {
     } else {
       mcpResponse = await _dispatchMcp(server, message);
     }
-    _proc.writeLine(jsonEncode({
+    _proc.writeLine(
-      'type': 'control_response',
+      jsonEncode({
-      'response': {
+        'type': 'control_response',
-        'subtype': 'success',
+        'response': {
-        'request_id': rid,
+          'subtype': 'success',
-        'response': {'mcp_response': mcpResponse}
+          'request_id': rid,
-      },
+          'response': {'mcp_response': mcpResponse},
-    }));
+        },
+      }),
+    );
   }
 
   McpServer? _mcpServerNamed(String? name) {
@@ -559,11 +736,21 @@ class StreamJsonSession {
       _toolUseOutcome[prompt.toolUseId] = decision is AllowTool;
       if (decision is DenyTool && decision.quiet) _quietErrorToolUses.add(prompt.toolUseId);
     }
-    _proc.writeLine(jsonEncode({
+    _proc.writeLine(
-      'type': 'control_response',
+      jsonEncode({
-      'response': {'subtype': 'success', 'request_id': promptId, 'response': decision.toJson()},
+        'type': 'control_response',
-    }));
+        'response': {'subtype': 'success', 'request_id': promptId, 'response': decision.toJson()},
+      }),
+    );
     if (decision is AllowTool) {
+      // Approving ExitPlanMode leaves plan mode. The CLI performs the
+      // transition itself on the approval, so we don't send a
+      // set_permission_mode control request — we just sync our tracked status
+      // (exits to 'default', matching Claude Code) so the permission-mode
+      // indicator and composer reflect the change (T-337).
+      if (prompt.toolName == 'ExitPlanMode') {
+        _mergeStatus(const SessionStatus(permissionMode: 'default'));
+      }
       // The prompt card is ephemeral (it vanishes once resolved), so leave a
       // compact record of an answered question in the conversation log (D-78).
       if (prompt.isQuestion) {
@@ -652,28 +839,39 @@ class StreamJsonSession {
   /// so it renders immediately (stream-json doesn't replay stdin without
   /// `--replay-user-messages`).
   void send(String text) {
-    _proc.writeLine(jsonEncode({
+    _proc.writeLine(
-      'type': 'user',
+      jsonEncode({
-      'message': {'role': 'user', 'content': text},
+        'type': 'user',
-    }));
+        'message': {'role': 'user', 'content': text},
-    _items.add(UserMessage(
+      }),
-      uuid: 'local-${_localSeq++}',
+    );
-      timestamp: DateTime.now(),
+    _items.add(UserMessage(uuid: 'local-${_localSeq++}', timestamp: DateTime.now(), isSidechain: false, text: text));
-      isSidechain: false,
-      text: text,
-    ));
     _setBusy(true);
   }
 
+  /// Inject a clide-local notice card into the conversation — nothing is sent
+  /// to claude. Used by the slash-command router for TUI-only commands
+  /// (T-411); renders as the muted synthetic "clide" card.
+  void addLocalNotice(String text) {
+    _items.add(AssistantTextMessage(uuid: 'local-${_localSeq++}', timestamp: DateTime.now(), isSidechain: false, text: text, synthetic: true));
+  }
+
+  /// Record the effort level this session was spawned with (`--effort`,
+  /// T-412). The wire never reports effort, so the spawner tells the status
+  /// what it set; the status line / sidebar read it from [SessionStatus].
+  void noteEffort(String level) => _mergeStatus(SessionStatus(effort: level));
+
   /// Interrupt the running turn (the escape hatch for a runaway — D-78). Sends
   /// the `interrupt` control_request; claude cancels the current turn and ends
   /// it with a `result`, which clears [busy]. Safe to call when idle.
   void interrupt() {
-    _proc.writeLine(jsonEncode({
+    _proc.writeLine(
-      'type': 'control_request',
+      jsonEncode({
-      'request_id': 'interrupt-${_localSeq++}',
+        'type': 'control_request',
-      'request': {'subtype': 'interrupt'},
+        'request_id': 'interrupt-${_localSeq++}',
-    }));
+        'request': {'subtype': 'interrupt'},
+      }),
+    );
   }
 
   /// Set the session's permission mode (T-181, D-77). Sends a
@@ -685,11 +883,13 @@ class StreamJsonSession {
   /// cockpit badge's plain click; bypassPermissions is reachable only via a
   /// confirmed shift-click (T-181).
   void setPermissionMode(String mode) {
-    _proc.writeLine(jsonEncode({
+    _proc.writeLine(
-      'type': 'control_request',
+      jsonEncode({
-      'request_id': 'set-perm-${_localSeq++}',
+        'type': 'control_request',
-      'request': {'subtype': 'set_permission_mode', 'mode': mode},
+        'request_id': 'set-perm-${_localSeq++}',
-    }));
+        'request': {'subtype': 'set_permission_mode', 'mode': mode},
+      }),
+    );
     // Optimistically reflect the change so the badge / status line update
     // immediately (T-250) — the control_request emits no status event, and a
     // fresh system/init only arrives later. The next init reconciles if the
@@ -697,13 +897,85 @@ class StreamJsonSession {
     _mergeStatus(SessionStatus(permissionMode: mode));
   }
 
+  /// Set the model for subsequent turns (T-408). Sends a `set_model`
+  /// control_request; [model] is an alias (`sonnet`, `opus`) or full id, and
+  /// `default` resets to the CLI's configured model. The status merges
+  /// optimistically (mirroring [setPermissionMode]); an error response rolls
+  /// it back and surfaces on [modelErrors].
+  void setModel(String model) {
+    final rid = 'set-model-${_localSeq++}';
+    _pendingSetModel[rid] = _status.model;
+    _proc.writeLine(
+      jsonEncode({
+        'type': 'control_request',
+        'request_id': rid,
+        'request': {'subtype': 'set_model', 'model': model},
+      }),
+    );
+    // `default` resolves to a model only the CLI knows — leave the status to
+    // the next assistant event in that case.
+    if (model != 'default') _mergeStatus(SessionStatus(model: model));
+  }
+
+  /// A `control_response` to one of our requests: capture the initialize
+  /// result's `models[]`, and roll back + surface a rejected set_model (T-408).
+  void _onControlResponse(Map<String, dynamic> ev) {
+    final resp = ev['response'];
+    if (resp is! Map) return;
+    final rid = resp['request_id'] as String?;
+    if (rid == null) return;
+    final isError = resp['subtype'] == 'error';
+    if (rid == _initRequestId && !isError) {
+      final result = resp['response'];
+      final models = result is Map ? result['models'] : null;
+      if (models is List) {
+        _availableModels = List.unmodifiable([
+          for (final m in models)
+            if (m is Map && m['value'] is String)
+              ModelOption(
+                value: m['value'] as String,
+                displayName: m['displayName'] as String? ?? m['value'] as String,
+                description: m['description'] as String? ?? '',
+              ),
+        ]);
+      }
+      return;
+    }
+    if (_pendingSetModel.containsKey(rid)) {
+      final previous = _pendingSetModel.remove(rid);
+      if (isError) {
+        if (previous != null) _mergeStatus(SessionStatus(model: previous));
+        _modelErrorCtl.add(resp['error'] as String? ?? 'model change rejected');
+      }
+    }
+  }
+
+  /// The process exited under a live session. Flip every "in flight"
+  /// surface off so the pane reflects reality instead of spinning forever.
+  void _onExit(int code) {
+    if (_disposed || _end != null) return;
+    _end = SessionEnd(exitCode: code, stderrTail: _proc.stderrTail);
+    _setBusy(false);
+    // A prompt pending against a dead process can never be answered —
+    // clear it so the composer comes back.
+    if (_queue.isNotEmpty) {
+      _queue.clear();
+      _pendingCtl.add(null);
+    }
+    _endCtl.add(_end!);
+  }
+
   Future<void> dispose() async {
+    _disposed = true; // deliberate teardown — suppress the exit-watch path
     await _sub?.cancel();
     await _proc.kill();
     await _items.close();
     await _statusCtl.close();
+    await _workflowsCtl.close();
     await _sessionIdCtl.close();
     await _pendingCtl.close();
     await _busyCtl.close();
+    await _endCtl.close();
+    await _modelErrorCtl.close();
   }
 }

lib/builtin/claude/src/task_list.dart

@@ -47,7 +47,7 @@ List<TaskItem> taskListFrom(List<ConversationItem> items) {
 }
 
 TaskStatus _statusFrom(Object? raw) => switch (raw) {
-      'in_progress' => TaskStatus.inProgress,
+  'in_progress' => TaskStatus.inProgress,
-      'completed' => TaskStatus.completed,
+  'completed' => TaskStatus.completed,
-      _ => TaskStatus.pending,
+  _ => TaskStatus.pending,
-    };
+};

lib/builtin/claude/src/team_broker.dart

@@ -35,13 +35,7 @@ class TeamMemberRef {
 
 /// A message left for a member, in arrival order.
 class TeamMessage {
-  const TeamMessage({
+  const TeamMessage({required this.from, required this.text, required this.at, this.to, this.broadcast = false});
-    required this.from,
-    required this.text,
-    required this.at,
-    this.to,
-    this.broadcast = false,
-  });
   final String from;
 
   /// Recipient name: a single member's display name (direct message), `null`
@@ -52,13 +46,7 @@ class TeamMessage {
   final DateTime at;
   final bool broadcast;
 
-  Map<String, dynamic> toJson() => {
+  Map<String, dynamic> toJson() => {'from': from, if (to != null) 'to': to, 'text': text, 'at': at.toIso8601String(), if (broadcast) 'broadcast': true};
-        'from': from,
-        if (to != null) 'to': to,
-        'text': text,
-        'at': at.toIso8601String(),
-        if (broadcast) 'broadcast': true,
-      };
 }
 
 /// A shared task. Status is one of `open` / `claimed` / `done`.
@@ -69,12 +57,7 @@ class TeamTask {
   String status;
   String? owner;
 
-  Map<String, dynamic> toJson() => {
+  Map<String, dynamic> toJson() => {'id': id, 'title': title, 'status': status, if (owner != null) 'owner': owner};
-        'id': id,
-        'title': title,
-        'status': status,
-        if (owner != null) 'owner': owner,
-      };
 }
 
 /// Pushes [text] into the member identified by [toMemberId] as a user message
@@ -304,7 +287,7 @@ class TeamBroker {
       return {'ok': true, 'task': t.toJson()};
     }
     return {
-      'tasks': [for (final t in _tasks.values) t.toJson()]
+      'tasks': [for (final t in _tasks.values) t.toJson()],
     };
   }
 
@@ -362,25 +345,26 @@ class TeamMcpServer implements McpServer {
         return _result(broker.claimTask(memberId, id: arguments['id'] as String?, title: arguments['title'] as String?));
       case 'task_status':
         return _result(
-            broker.taskStatus(memberId, id: arguments['id'] as String?, status: arguments['status'] as String?, title: arguments['title'] as String?));
+          broker.taskStatus(memberId, id: arguments['id'] as String?, status: arguments['status'] as String?, title: arguments['title'] as String?),
+        );
       default:
         return _error('Unknown team tool: $name');
     }
   }
 
   Map<String, dynamic> _result(Map<String, dynamic> value) => {
-        'content': [
+    'content': [
-          {'type': 'text', 'text': jsonEncode(value)},
+      {'type': 'text', 'text': jsonEncode(value)},
-        ],
+    ],
-        'isError': value['ok'] == false,
+    'isError': value['ok'] == false,
-      };
+  };
 
   Map<String, dynamic> _error(String message) => {
-        'content': [
+    'content': [
-          {'type': 'text', 'text': message},
+      {'type': 'text', 'text': message},
-        ],
+    ],
-        'isError': true,
+    'isError': true,
-      };
+  };
 }
 
 const _toolDefs = <Map<String, dynamic>>[

lib/builtin/claude/src/team_chat_model.dart

@@ -5,8 +5,8 @@
 /// and the full workspace pane read from this one model — they share state,
 /// they do NOT each hold their own copy.
 ///
-/// [postAsUser] is the user's write path: it routes by @tag (one agent or
+/// `postAsUser` is the user's write path: it routes by @tag (one agent or
-/// broadcast) and, when the interrupt flag is set, calls [interrupt()] on the
+/// broadcast) and, when the interrupt flag is set, calls `interrupt()` on the
 /// target session THEN delivers the message.
 ///
 /// Flutter-free on purpose: this module (like [TeamBroker]) runs under
@@ -29,11 +29,7 @@ typedef SessionResolver = StreamJsonSession? Function(String memberName);
 /// Lifetime matches the orchestrator: created once, subscribed to the broker,
 /// disposed when the orchestrator is torn down.
 class TeamChatModel {
-  TeamChatModel({
+  TeamChatModel({required TeamBroker broker, SessionResolver? sessionResolver}) : _broker = broker, _sessionResolver = sessionResolver {
-    required TeamBroker broker,
-    SessionResolver? sessionResolver,
-  })  : _broker = broker,
-        _sessionResolver = sessionResolver {
     _sub = broker.messages.listen(_onMessage);
   }
 

lib/builtin/claude/src/team_chat_sidebar.dart

@@ -2,7 +2,7 @@
 ///
 /// Displays the live broker chat timeline as colour-coded rows and provides a
 /// quick @-post composer. Tapping the pop-out icon opens the full chat pane
-/// ([claude.team-chat] workspace tab).
+/// (`claude.team-chat` workspace tab).
 ///
 /// Both this widget and [TeamChatPane] read from the same [TeamChatModel] —
 /// there is one model, two surfaces.
@@ -26,12 +26,7 @@ import 'package:flutter/widgets.dart';
 /// [onPopOut] is called when the user taps the pop-out icon to open the full
 ///   pane — the extension wires this to `panels.activateTab`.
 class TeamChatSidebar extends StatefulWidget {
-  const TeamChatSidebar({
+  const TeamChatSidebar({super.key, required this.model, required this.broker, required this.onPopOut});
-    super.key,
-    required this.model,
-    required this.broker,
-    required this.onPopOut,
-  });
 
   final TeamChatModel model;
   final TeamBroker broker;
@@ -149,11 +144,7 @@ class _TeamChatSidebarState extends State<TeamChatSidebar> {
                 onTap: widget.onPopOut,
                 builder: (ctx, hovered, _) => Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 2, vertical: 1),
-                  child: ClideIcon(
+                  child: ClideIcon(PhosphorIcons.byName('arrows-out-simple'), size: 10, color: hovered ? tokens.globalForeground : tokens.globalTextMuted),
-                    PhosphorIcons.byName('arrows-out-simple'),
-                    size: 10,
-                    color: hovered ? tokens.globalForeground : tokens.globalTextMuted,
-                  ),
                 ),
               ),
             ),
@@ -177,13 +168,7 @@ class _TeamChatSidebarState extends State<TeamChatSidebar> {
           formatLabel: (n) => '@$n',
           child: Focus(
             onKeyEvent: _handleKeyEvent,
-            child: _ChatInputField(
+            child: _ChatInputField(controller: _controller, focusNode: _focusNode, tokens: tokens, onSubmit: _submit, placeholder: '@name or @team …'),
-              controller: _controller,
-              focusNode: _focusNode,
-              tokens: tokens,
-              onSubmit: _submit,
-              placeholder: '@name or @team …',
-            ),
           ),
         ),
       ],
@@ -200,11 +185,7 @@ class _TeamChatSidebarState extends State<TeamChatSidebar> {
 /// Reads from the same [TeamChatModel] as [TeamChatSidebar]. Supports the
 /// interrupt tickbox and full @-completion.
 class TeamChatPane extends StatefulWidget {
-  const TeamChatPane({
+  const TeamChatPane({super.key, required this.model, required this.broker});
-    super.key,
-    required this.model,
-    required this.broker,
-  });
 
   final TeamChatModel model;
   final TeamBroker broker;
@@ -231,11 +212,7 @@ class _TeamChatPaneState extends State<TeamChatPane> {
         // Scroll to bottom on new message.
         WidgetsBinding.instance.addPostFrameCallback((_) {
           if (_scrollController.hasClients) {
-            _scrollController.animateTo(
+            _scrollController.animateTo(_scrollController.position.maxScrollExtent, duration: const Duration(milliseconds: 120), curve: Curves.easeOut);
-              _scrollController.position.maxScrollExtent,
-              duration: const Duration(milliseconds: 120),
-              curve: Curves.easeOut,
-            );
           }
         });
       }
@@ -297,11 +274,7 @@ class _TeamChatPaneState extends State<TeamChatPane> {
     final text = raw.trim();
     if (text.isEmpty) return;
     final parsed = parseAtTag(text);
-    widget.model.postAsUser(
+    widget.model.postAsUser(parsed.body.isEmpty ? text : parsed.body, toName: parsed.recipient, interrupt: _interrupt);
-      parsed.body.isEmpty ? text : parsed.body,
-      toName: parsed.recipient,
-      interrupt: _interrupt,
-    );
     _controller.clear();
   }
 
@@ -340,11 +313,7 @@ class _TeamChatPaneState extends State<TeamChatPane> {
                   controller: _scrollController,
                   padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
                   itemCount: messages.length,
-                  itemBuilder: (_, i) => _ChatRow(
+                  itemBuilder: (_, i) => _ChatRow(key: ValueKey(messages[i].at.microsecondsSinceEpoch), message: messages[i], tokens: tokens),
-                    key: ValueKey(messages[i].at.microsecondsSinceEpoch),
-                    message: messages[i],
-                    tokens: tokens,
-                  ),
                 ),
         ),
         // Composer + interrupt tickbox.
@@ -375,24 +344,13 @@ class _TeamChatPaneState extends State<TeamChatPane> {
                           margin: const EdgeInsets.only(right: 5),
                           decoration: BoxDecoration(
                             color: _interrupt ? tokens.globalFocus.withAlpha(40) : const Color(0x00000000),
-                            border: Border.all(
+                            border: Border.all(color: _interrupt ? tokens.globalFocus : tokens.globalTextMuted, width: 1),
-                              color: _interrupt ? tokens.globalFocus : tokens.globalTextMuted,
-                              width: 1,
-                            ),
                             borderRadius: BorderRadius.circular(2),
                           ),
-                          child: _interrupt
+                          child: _interrupt ? Center(child: ClideIcon(PhosphorIcons.byName('check'), size: 9, color: tokens.globalFocus)) : null,
-                              ? Center(
-                                  child: ClideIcon(PhosphorIcons.byName('check'), size: 9, color: tokens.globalFocus),
-                                )
-                              : null,
                         ),
                       ),
-                      ClideText(
+                      ClideText('Interrupt', fontSize: clideFontSmall, color: _interrupt ? tokens.globalForeground : tokens.globalTextMuted),
-                        'Interrupt',
-                        fontSize: clideFontSmall,
-                        color: _interrupt ? tokens.globalForeground : tokens.globalTextMuted,
-                      ),
                     ],
                   ),
                 ),
@@ -405,13 +363,7 @@ class _TeamChatPaneState extends State<TeamChatPane> {
                 formatLabel: (n) => '@$n',
                 child: Focus(
                   onKeyEvent: _handleKeyEvent,
-                  child: _ChatInputField(
+                  child: _ChatInputField(controller: _controller, focusNode: _focusNode, tokens: tokens, onSubmit: _submit, placeholder: '@name or @team …'),
-                    controller: _controller,
-                    focusNode: _focusNode,
-                    tokens: tokens,
-                    onSubmit: _submit,
-                    placeholder: '@name or @team …',
-                  ),
                 ),
               ),
             ],
@@ -439,8 +391,8 @@ class _ChatRow extends StatelessWidget {
     final toLabel = message.broadcast
         ? '→ all'
         : message.to != null
-            ? '→ ${message.to}'
+        ? '→ ${message.to}'
-            : null;
+        : null;
 
     return Padding(
       padding: const EdgeInsets.only(bottom: 3),
@@ -451,10 +403,7 @@ class _ChatRow extends StatelessWidget {
           Container(
             padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),
             margin: const EdgeInsets.only(right: 5, top: 1),
-            decoration: BoxDecoration(
+            decoration: BoxDecoration(color: senderColor.withAlpha(30), borderRadius: BorderRadius.circular(2)),
-              color: senderColor.withAlpha(30),
-              borderRadius: BorderRadius.circular(2),
-            ),
             child: ClideText(message.from, fontSize: clideFontSmall, color: senderColor),
           ),
           if (toLabel != null)
@@ -480,13 +429,7 @@ class _ChatRow extends StatelessWidget {
 
 /// Inline text input for the chat composer.
 class _ChatInputField extends StatelessWidget {
-  const _ChatInputField({
+  const _ChatInputField({required this.controller, required this.focusNode, required this.tokens, required this.onSubmit, required this.placeholder});
-    required this.controller,
-    required this.focusNode,
-    required this.tokens,
-    required this.onSubmit,
-    required this.placeholder,
-  });
 
   final TextEditingController controller;
   final FocusNode focusNode;
@@ -507,12 +450,7 @@ class _ChatInputField extends StatelessWidget {
       child: EditableText(
         controller: controller,
         focusNode: focusNode,
-        style: TextStyle(
+        style: TextStyle(fontFamily: 'JetBrains Mono', fontSize: clideFontSmall, color: tokens.globalForeground, height: 1.4),
-          fontFamily: 'JetBrains Mono',
-          fontSize: clideFontSmall,
-          color: tokens.globalForeground,
-          height: 1.4,
-        ),
         cursorColor: tokens.globalFocus,
         backgroundCursorColor: tokens.globalTextMuted,
         onSubmitted: onSubmit,

lib/builtin/claude/src/team_panel_host.dart

@@ -51,10 +51,7 @@ class _TeamPanelHostState extends State<TeamPanelHost> {
   void _onJoined(TeamMemberJoined m) {
     if (_controllers.containsKey(m.agentId)) return;
     final kernel = ClideKernel.of(context);
-    _controllers[m.agentId] = ConversationController.fromBus(
+    _controllers[m.agentId] = ConversationController.fromBus(messages: kernel.messages, channel: ClaudeConversation.teammateChannel(m.agentId));
-      messages: kernel.messages,
-      channel: ClaudeConversation.teammateChannel(m.agentId),
-    );
     setState(() => _members.add(m));
   }
 
@@ -92,11 +89,7 @@ class _TeamPanelHostState extends State<TeamPanelHost> {
               }),
             ),
             Expanded(
-              child: _TeammateGrid(
+              child: _TeammateGrid(members: _members, controllers: _controllers, tokens: tokens),
-                members: _members,
-                controllers: _controllers,
-                tokens: tokens,
-              ),
             ),
           ],
         );
@@ -145,11 +138,7 @@ class _TeammateGrid extends StatelessWidget {
         children: [
           for (var r = 0; r < rows; r++)
             Expanded(
-              child: Row(
+              child: Row(children: [for (var c = 0; c < cols; c++) Expanded(child: _cell(r * cols + c))]),
-                children: [
-                  for (var c = 0; c < cols; c++) Expanded(child: _cell(r * cols + c)),
-                ],
-              ),
             ),
         ],
       ),

lib/builtin/claude/src/ticket_pick_up.dart

@@ -36,10 +36,13 @@ Future<bool> applyTicketPickUp(
   final id = data['id'] as String?;
   final status = data['status'] as String?;
   if (id != null && id.isNotEmpty && kPickUpStartableStatuses.contains(status)) {
-    final resp = await ipc.request('pql.tickets.status', args: {
+    final resp = await ipc.request(
-      'ids': [id],
+      'pql.tickets.status',
-      'status': 'in_progress',
+      args: {
-    });
+        'ids': [id],
+        'status': 'in_progress',
+      },
+    );
     if (resp.ok) messages.publish('builtin.tickets', 'changed', {'id': id});
   }
   return true;

lib/builtin/claude/src/transcript_publisher.dart

@@ -1,18 +1,14 @@
-/// Bridges a [TranscriptReader] onto the kernel [MessageBus] (epic T-132,
+/// Bus addressing for Claude conversation content (epic T-132, D-75).
-/// D-75).
 ///
-/// One reader tails a workspace transcript; this publisher republishes
+/// The tmux-era `TranscriptPublisher` that used to live here (one reader
-/// every [ConversationItem] as a bus [Message]. Any number of Claude
+/// tailing a transcript, republished onto the bus) had no production
-/// panels can then subscribe to the same conversation via the bus instead
+/// constructor calls after the stream-json pivot (D-77) and was removed
-/// of each owning its own reader — the decoupling the team panels
+/// in the T-385 dead-code sweep. The [ClaudeConversation] channel/key
-/// (T-139/T-140) need, where a single observer feeds the lead tile plus a
+/// constants remain — the meta sidebar and team panel host still consume
-/// tile per teammate.
+/// them for member-status messages.
 library;
 
-import 'dart:async';
-
 import 'package:clide/builtin/claude/src/transcript_reader.dart';
-import 'package:clide/kernel/src/events/message_bus.dart';
 
 /// Bus addressing for Claude conversation content.
 abstract final class ClaudeConversation {
@@ -29,7 +25,7 @@ abstract final class ClaudeConversation {
   /// Channel for a teammate's conversation (team work, T-139/T-140).
   static String teammateChannel(String agentId) => 'conversation/$agentId';
 
-  /// Key under which the [ConversationItem] travels in a [Message]'s data.
+  /// Key under which the [ConversationItem] travels in a bus message's data.
   static const itemKey = 'item';
 
   /// Shared channel carrying each team member's live status (T-157). Every
@@ -38,43 +34,9 @@ abstract final class ClaudeConversation {
 
   /// Encode [status] for [agentId] as a [memberStatusChannel] message body.
   static Map<String, Object?> memberStatusData(String agentId, SessionStatus status) => {
-        'agentId': agentId,
+    'agentId': agentId,
-        if (status.model != null) 'model': status.model,
+    if (status.model != null) 'model': status.model,
-        if (status.permissionMode != null) 'permissionMode': status.permissionMode,
+    if (status.permissionMode != null) 'permissionMode': status.permissionMode,
-        if (status.contextTokens != null) 'contextTokens': status.contextTokens,
+    if (status.contextTokens != null) 'contextTokens': status.contextTokens,
-      };
+  };
-}
-
-class TranscriptPublisher {
-  /// Starts republishing [reader]'s items onto [messages] under
-  /// [ClaudeConversation.publisher] / [channel]. The subscription is
-  /// attached synchronously, so a controller that subscribes before the
-  /// reader's first poll never misses the initial tail.
-  TranscriptPublisher({
-    required MessageBus messages,
-    required TranscriptReader reader,
-    this.channel = ClaudeConversation.leadChannel,
-  })  : _messages = messages,
-        _reader = reader {
-    _sub = _reader.stream.listen((item) {
-      _messages.publish(ClaudeConversation.publisher, channel, {
-        ClaudeConversation.itemKey: item,
-      });
-    });
-  }
-
-  final MessageBus _messages;
-  final TranscriptReader _reader;
-  final String channel;
-  late final StreamSubscription<ConversationItem> _sub;
-
-  /// Live session status (model / permission-mode / context) from the
-  /// underlying reader — passed through for the status strip (T-145).
-  Stream<SessionStatus> get statusStream => _reader.statusStream;
-
-  /// Stops publishing and tears down the underlying reader.
-  Future<void> dispose() async {
-    await _sub.cancel();
-    await _reader.dispose();
-  }
 }

lib/builtin/claude/src/transcript_reader.dart

@@ -24,7 +24,7 @@
 ///
 /// # Version drift-guard
 /// If the envelope `version` field has an unfamiliar major version the reader
-/// warns via [onWarn] (or stderr if omitted) and degrades gracefully — it
+/// warns via `onWarn` (or stderr if omitted) and degrades gracefully — it
 /// parses whatever it can and skips the rest rather than crashing.
 library;
 
@@ -114,12 +114,19 @@ final class AssistantTextMessage extends ConversationItem {
     super.parentUuid,
     super.parentToolUseId,
     required this.text,
+    this.synthetic = false,
   });
 
   final String text;
 
+  /// CLI-local output, not the model: the wire marks it `model: "<synthetic>"`
+  /// (a forwarded local command's response — /usage output, "/x isn't
+  /// available in this environment", …). clide-injected notices use it too.
+  /// Rendered as a muted "clide" card, never coral Claude prose (T-411).
+  final bool synthetic;
+
   @override
-  String toString() => 'AssistantTextMessage(${_shortId(uuid)}, ${text.length} chars)';
+  String toString() => 'AssistantTextMessage(${_shortId(uuid)}, ${text.length} chars${synthetic ? ', synthetic' : ''})';
 }
 
 /// Extended thinking block from an assistant turn.
@@ -171,13 +178,7 @@ final class AssistantToolUse extends ConversationItem {
 /// driver has already resolved (workspace-relative paths are resolved before
 /// injection); [caption] is an optional one-line label.
 final class ImageMessage extends ConversationItem {
-  const ImageMessage({
+  const ImageMessage({required super.uuid, required super.timestamp, required super.isSidechain, required this.path, this.caption});
-    required super.uuid,
-    required super.timestamp,
-    required super.isSidechain,
-    required this.path,
-    this.caption,
-  });
 
   /// Absolute path to the image file on disk.
   final String path;
@@ -215,14 +216,7 @@ const _isolateParseThreshold = 64 * 1024;
 const _knownMajorVersions = {1, 2};
 
 /// Record types to skip (do not emit as conversation items).
-const _skipTypes = {
+const _skipTypes = {'attachment', 'system', 'last-prompt', 'permission-mode', 'file-history-snapshot', 'queue-operation'};
-  'attachment',
-  'system',
-  'last-prompt',
-  'permission-mode',
-  'file-history-snapshot',
-  'queue-operation',
-};
 
 /// Tails Claude Code's transcript JSONL and emits [ConversationItem]s.
 ///
@@ -233,7 +227,7 @@ class TranscriptReader {
   /// [pollInterval] controls how often the reader polls for new data and
   /// session switches (default 500 ms).
   ///
-  /// [onWarn] receives warning messages from the version drift-guard.
+  /// `onWarn` receives warning messages from the version drift-guard.
   /// If omitted, warnings are written to stderr.
   TranscriptReader(
     this.workspacePath, {
@@ -242,11 +236,11 @@ class TranscriptReader {
     String? projectsBase,
     int? initialTailBytes,
     String? file,
-  })  : _pollInterval = pollInterval,
+  }) : _pollInterval = pollInterval,
-        _onWarn = onWarn ?? _defaultWarn,
+       _onWarn = onWarn ?? _defaultWarn,
-        _projectsBase = projectsBase ?? _defaultProjectsBase(),
+       _projectsBase = projectsBase ?? _defaultProjectsBase(),
-        _initialTailBytes = initialTailBytes ?? _defaultInitialTailBytes,
+       _initialTailBytes = initialTailBytes ?? _defaultInitialTailBytes,
-        _explicitFile = file;
+       _explicitFile = file;
 
   final String workspacePath;
   final Duration _pollInterval;
@@ -425,7 +419,7 @@ class TranscriptReader {
   }
 
   /// Parse a single JSONL line into its items (forwarding any version
-  /// warnings to [onWarn]). Public so tests exercise the real parser.
+  /// warnings to `onWarn`). Public so tests exercise the real parser.
   List<ConversationItem> parseLine(String line) {
     final parsed = parseTranscriptChunk(line);
     for (final w in parsed.warnings) {
@@ -439,14 +433,7 @@ class TranscriptReader {
 /// (T-145, T-168). All fields nullable — a chunk only carries what it saw,
 /// and the reader [merge]s deltas into a running status.
 class SessionStatus {
-  const SessionStatus({
+  const SessionStatus({this.model, this.permissionMode, this.contextTokens, this.cost, this.contextWindow, this.rateLimitInfo, this.effort});
-    this.model,
-    this.permissionMode,
-    this.contextTokens,
-    this.cost,
-    this.contextWindow,
-    this.rateLimitInfo,
-  });
 
   /// Assistant `message.model`, e.g. `claude-opus-4-7`.
   final String? model;
@@ -471,17 +458,24 @@ class SessionStatus {
   /// `"rate limited — resets 14:32"` (T-168). Null when not rate-limited.
   final String? rateLimitInfo;
 
-  bool get isEmpty => model == null && permissionMode == null && contextTokens == null && cost == null && contextWindow == null && rateLimitInfo == null;
+  /// The session's effort level (`--effort`, T-412). The wire never reports
+  /// it — clide records what it spawned with via [StreamJsonSession.noteEffort];
+  /// null means the CLI default (settings.json `effortLevel`).
+  final String? effort;
+
+  bool get isEmpty =>
+      model == null && permissionMode == null && contextTokens == null && cost == null && contextWindow == null && rateLimitInfo == null && effort == null;
 
   /// Overlay [other]'s non-null fields onto this one.
   SessionStatus merge(SessionStatus other) => SessionStatus(
-        model: other.model ?? model,
+    model: other.model ?? model,
-        permissionMode: other.permissionMode ?? permissionMode,
+    permissionMode: other.permissionMode ?? permissionMode,
-        contextTokens: other.contextTokens ?? contextTokens,
+    contextTokens: other.contextTokens ?? contextTokens,
-        cost: other.cost ?? cost,
+    cost: other.cost ?? cost,
-        contextWindow: other.contextWindow ?? contextWindow,
+    contextWindow: other.contextWindow ?? contextWindow,
-        rateLimitInfo: other.rateLimitInfo ?? rateLimitInfo,
+    rateLimitInfo: other.rateLimitInfo ?? rateLimitInfo,
-      );
+    effort: other.effort ?? effort,
+  );
 
   @override
   bool operator ==(Object other) =>
@@ -491,10 +485,11 @@ class SessionStatus {
       other.contextTokens == contextTokens &&
       other.cost == cost &&
       other.contextWindow == contextWindow &&
-      other.rateLimitInfo == rateLimitInfo;
+      other.rateLimitInfo == rateLimitInfo &&
+      other.effort == effort;
 
   @override
-  int get hashCode => Object.hash(model, permissionMode, contextTokens, cost, contextWindow, rateLimitInfo);
+  int get hashCode => Object.hash(model, permissionMode, contextTokens, cost, contextWindow, rateLimitInfo, effort);
 }
 
 /// Result of [parseTranscriptChunk]: items, version-drift warnings, and
@@ -509,13 +504,13 @@ class _StatusAcc {
   int? contextWindow;
   String? rateLimitInfo;
   SessionStatus toStatus() => SessionStatus(
-        model: model,
+    model: model,
-        permissionMode: permissionMode,
+    permissionMode: permissionMode,
-        contextTokens: contextTokens,
+    contextTokens: contextTokens,
-        cost: cost,
+    cost: cost,
-        contextWindow: contextWindow,
+    contextWindow: contextWindow,
-        rateLimitInfo: rateLimitInfo,
+    rateLimitInfo: rateLimitInfo,
-      );
+  );
 }
 
 // ---------------------------------------------------------------------------
@@ -550,8 +545,10 @@ void _parseLineInto(String line, List<ConversationItem> out, List<String> warnin
     final majorStr = dotIdx > 0 ? rawVersion.substring(0, dotIdx) : rawVersion;
     final major = int.tryParse(majorStr);
     if (major != null && !_knownMajorVersions.contains(major)) {
-      warnings.add('unfamiliar transcript version "$rawVersion" (major=$major); '
+      warnings.add(
-          'parsing will degrade gracefully');
+        'unfamiliar transcript version "$rawVersion" (major=$major); '
+        'parsing will degrade gracefully',
+      );
     }
   }
 
@@ -600,7 +597,9 @@ void _extractAssistantStatus(Map<String, dynamic> envelope, _StatusAcc status) {
   final message = envelope['message'] as Map?;
   if (message == null) return;
   final model = message['model'] as String?;
-  if (model != null && model.isNotEmpty) status.model = model;
+  // "<synthetic>" marks CLI-local output (a forwarded local command's
+  // response) — not a model switch; it must not clobber the tracked model.
+  if (model != null && model.isNotEmpty && model != kSyntheticModel) status.model = model;
   final usage = message['usage'] as Map?;
   if (usage != null) {
     int n(String k) => (usage[k] as num?)?.toInt() ?? 0;
@@ -628,14 +627,17 @@ void _parseUserInto(
 
   if (content is String) {
     if (content.isNotEmpty) {
-      out.add(UserMessage(
+      out.add(
+        UserMessage(
           uuid: uuid,
           timestamp: timestamp,
           isSidechain: isSidechain,
           parentUuid: parentUuid,
           parentToolUseId: parentToolUseId,
           text: content,
-          injected: injected));
+          injected: injected,
+        ),
+      );
     }
     return;
   }
@@ -650,16 +652,18 @@ void _parseUserInto(
         if (text.isNotEmpty) textParts.add(text);
       case 'tool_result':
         final rawContent = item['content'];
-        out.add(ToolResultMessage(
+        out.add(
-          uuid: uuid,
+          ToolResultMessage(
-          timestamp: timestamp,
+            uuid: uuid,
-          isSidechain: isSidechain,
+            timestamp: timestamp,
-          parentUuid: parentUuid,
+            isSidechain: isSidechain,
-          parentToolUseId: parentToolUseId,
+            parentUuid: parentUuid,
-          toolUseId: item['tool_use_id'] as String? ?? '',
+            parentToolUseId: parentToolUseId,
-          content: rawContent is String ? rawContent : jsonEncode(rawContent),
+            toolUseId: item['tool_use_id'] as String? ?? '',
-          isError: item['is_error'] as bool? ?? false,
+            content: rawContent is String ? rawContent : jsonEncode(rawContent),
-        ));
+            isError: item['is_error'] as bool? ?? false,
+          ),
+        );
       default:
         break;
     }
@@ -669,6 +673,9 @@ void _parseUserInto(
   }
 }
 
+/// The model marker on CLI-local output (forwarded local-command responses).
+const String kSyntheticModel = '<synthetic>';
+
 void _parseAssistantInto(
   Map<String, dynamic> envelope,
   String uuid,
@@ -682,6 +689,7 @@ void _parseAssistantInto(
   if (message == null) return;
   final content = message['content'];
   if (content is! List) return;
+  final synthetic = (message['model'] as String?) == kSyntheticModel;
 
   for (final item in content) {
     if (item is! Map) continue;
@@ -689,27 +697,46 @@ void _parseAssistantInto(
       case 'text':
         final text = item['text'] as String? ?? '';
         if (text.isNotEmpty) {
-          out.add(AssistantTextMessage(
+          out.add(
-              uuid: uuid, timestamp: timestamp, isSidechain: isSidechain, parentUuid: parentUuid, parentToolUseId: parentToolUseId, text: text));
+            AssistantTextMessage(
+              uuid: uuid,
+              timestamp: timestamp,
+              isSidechain: isSidechain,
+              parentUuid: parentUuid,
+              parentToolUseId: parentToolUseId,
+              text: text,
+              synthetic: synthetic,
+            ),
+          );
         }
       case 'thinking':
         final thinking = item['thinking'] as String? ?? '';
         if (thinking.isNotEmpty) {
-          out.add(AssistantThinkingMessage(
+          out.add(
-              uuid: uuid, timestamp: timestamp, isSidechain: isSidechain, parentUuid: parentUuid, parentToolUseId: parentToolUseId, thinking: thinking));
+            AssistantThinkingMessage(
+              uuid: uuid,
+              timestamp: timestamp,
+              isSidechain: isSidechain,
+              parentUuid: parentUuid,
+              parentToolUseId: parentToolUseId,
+              thinking: thinking,
+            ),
+          );
         }
       case 'tool_use':
         final rawInput = item['input'];
-        out.add(AssistantToolUse(
+        out.add(
-          uuid: uuid,
+          AssistantToolUse(
-          timestamp: timestamp,
+            uuid: uuid,
-          isSidechain: isSidechain,
+            timestamp: timestamp,
-          parentUuid: parentUuid,
+            isSidechain: isSidechain,
-          parentToolUseId: parentToolUseId,
+            parentUuid: parentUuid,
-          toolUseId: item['id'] as String? ?? '',
+            parentToolUseId: parentToolUseId,
-          name: item['name'] as String? ?? '',
+            toolUseId: item['id'] as String? ?? '',
-          input: rawInput is Map ? rawInput.cast<String, dynamic>() : <String, dynamic>{},
+            name: item['name'] as String? ?? '',
-        ));
+            input: rawInput is Map ? rawInput.cast<String, dynamic>() : <String, dynamic>{},
+          ),
+        );
       default:
         break;
     }

lib/builtin/claude/src/workflow_run.dart

@@ -0,0 +1,234 @@
+/// Live state of a Claude Code Workflow run (T-416).
+///
+/// A Workflow is the harness's multi-agent orchestration tool. The model calls
+/// it as an ordinary `tool_use` (`name: "Workflow"`, `input: {script}`); the
+/// tool returns immediately ("launched in background") and the run's real
+/// progress arrives out-of-band on stream-json `type: "system"` events keyed by
+/// the launching tool-use id. This file is the pure, Flutter-free model that
+/// folds those events into a snapshot the conversation/sidebar surfaces render.
+///
+/// Wire shape (captured by the T-416 spike, claude 2.1.175):
+///   - `task_started`    — task_id, tool_use_id, description, workflow_name,
+///                          prompt (script source)
+///   - `task_progress`   — usage{total_tokens,tool_uses,duration_ms}, summary,
+///                          and `workflow_progress[]`, a DELTA list mixing
+///                          `{type:"workflow_phase", index, title}` and
+///                          `{type:"workflow_agent", index, label, phaseIndex?,
+///                          phaseTitle?, model, state(start|progress|done),
+///                          agentId?}` — partial, merged by index.
+///   - `task_updated`    — patch{status, end_time}
+///   - `task_notification` — terminal status:"completed", summary, usage
+///
+/// Limit: these events are ephemeral (not persisted to the resumed transcript
+/// JSONL), so live progress shows during the session; on reload only the tool
+/// card + its "launched in background" result survive.
+library;
+
+/// Lifecycle of a single workflow agent, from its `state` field.
+enum WorkflowAgentState { start, progress, done, unknown }
+
+WorkflowAgentState parseWorkflowAgentState(Object? raw) => switch (raw) {
+  'start' || 'queued' || 'running' => WorkflowAgentState.start,
+  'progress' => WorkflowAgentState.progress,
+  'done' || 'complete' || 'completed' => WorkflowAgentState.done,
+  _ => WorkflowAgentState.unknown,
+};
+
+/// One phase declared by `meta.phases` / a `phase()` call.
+class WorkflowPhase {
+  const WorkflowPhase({required this.index, required this.title});
+
+  final int index;
+  final String title;
+}
+
+/// One agent fanned out by the workflow. Fields accrete across `task_progress`
+/// deltas — a later delta fills in `agentId` / upgrades `model` / advances
+/// `state`, so [mergeDelta] overlays non-null fields onto the prior snapshot.
+class WorkflowAgent {
+  const WorkflowAgent({
+    required this.index,
+    required this.label,
+    this.model,
+    this.state = WorkflowAgentState.start,
+    this.agentId,
+    this.phaseIndex,
+    this.phaseTitle,
+  });
+
+  final int index;
+  final String label;
+  final String? model;
+  final WorkflowAgentState state;
+  final String? agentId;
+  final int? phaseIndex;
+  final String? phaseTitle;
+
+  /// Fold a raw `workflow_agent` delta entry onto this snapshot, keeping prior
+  /// values where the delta omits a field.
+  WorkflowAgent mergeDelta(Map<String, dynamic> e) => WorkflowAgent(
+    index: index,
+    label: (e['label'] as String?)?.isNotEmpty == true ? e['label'] as String : label,
+    model: (e['model'] as String?) ?? model,
+    state: e.containsKey('state') ? parseWorkflowAgentState(e['state']) : state,
+    agentId: (e['agentId'] as String?) ?? agentId,
+    phaseIndex: (e['phaseIndex'] as num?)?.toInt() ?? phaseIndex,
+    phaseTitle: (e['phaseTitle'] as String?) ?? phaseTitle,
+  );
+
+  static WorkflowAgent fromDelta(Map<String, dynamic> e) => WorkflowAgent(
+    index: (e['index'] as num).toInt(),
+    label: (e['label'] as String?) ?? '',
+    model: e['model'] as String?,
+    state: parseWorkflowAgentState(e['state']),
+    agentId: e['agentId'] as String?,
+    phaseIndex: (e['phaseIndex'] as num?)?.toInt(),
+    phaseTitle: e['phaseTitle'] as String?,
+  );
+}
+
+/// An immutable snapshot of one workflow run. [foldEvent] returns a new snapshot
+/// with a single `system` task event applied (the session keeps one per
+/// launching tool-use id and replaces it as events arrive).
+class WorkflowRun {
+  const WorkflowRun({
+    required this.toolUseId,
+    this.taskId,
+    this.name,
+    this.description,
+    this.summary,
+    this.done = false,
+    this.totalTokens,
+    this.toolUses,
+    this.durationMs,
+    this.phases = const {},
+    this.agents = const {},
+  });
+
+  /// The launching `Workflow` tool-use id — the join key to the conversation
+  /// card and across all of this run's system events.
+  final String toolUseId;
+
+  /// The harness task id (e.g. `wy01fihjt`), assigned at `task_started`.
+  final String? taskId;
+
+  /// `workflow_name` from `meta.name`.
+  final String? name;
+  final String? description;
+  final String? summary;
+
+  /// True once a `task_updated{status:completed}` or `task_notification`
+  /// terminal event lands.
+  final bool done;
+
+  final int? totalTokens;
+  final int? toolUses;
+  final int? durationMs;
+
+  /// Phase index → phase. Empty for a phase-less workflow.
+  final Map<int, WorkflowPhase> phases;
+
+  /// Agent index → agent snapshot.
+  final Map<int, WorkflowAgent> agents;
+
+  bool get running => !done;
+  int get agentCount => agents.length;
+  int get doneCount => agents.values.where((a) => a.state == WorkflowAgentState.done).length;
+
+  /// Agents in index order — the order the script fanned them out.
+  List<WorkflowAgent> get orderedAgents {
+    final list = agents.values.toList()..sort((a, b) => a.index.compareTo(b.index));
+    return list;
+  }
+
+  /// Phases in index order.
+  List<WorkflowPhase> get orderedPhases {
+    final list = phases.values.toList()..sort((a, b) => a.index.compareTo(b.index));
+    return list;
+  }
+
+  WorkflowRun _copyWith({
+    String? taskId,
+    String? name,
+    String? description,
+    String? summary,
+    bool? done,
+    int? totalTokens,
+    int? toolUses,
+    int? durationMs,
+    Map<int, WorkflowPhase>? phases,
+    Map<int, WorkflowAgent>? agents,
+  }) => WorkflowRun(
+    toolUseId: toolUseId,
+    taskId: taskId ?? this.taskId,
+    name: name ?? this.name,
+    description: description ?? this.description,
+    summary: summary ?? this.summary,
+    done: done ?? this.done,
+    totalTokens: totalTokens ?? this.totalTokens,
+    toolUses: toolUses ?? this.toolUses,
+    durationMs: durationMs ?? this.durationMs,
+    phases: phases ?? this.phases,
+    agents: agents ?? this.agents,
+  );
+
+  /// Apply one `system` task event ([ev]) and return the updated snapshot.
+  /// [ev] must already be the decoded envelope; unknown subtypes return `this`.
+  WorkflowRun foldEvent(Map<String, dynamic> ev) {
+    switch (ev['subtype']) {
+      case 'task_started':
+        return _copyWith(taskId: ev['task_id'] as String?, name: ev['workflow_name'] as String?, description: ev['description'] as String?);
+      case 'task_progress':
+        return _foldProgress(ev);
+      case 'task_updated':
+        final patch = ev['patch'];
+        final status = patch is Map ? patch['status'] as String? : null;
+        return _copyWith(done: status == 'completed' || status == 'failed' ? true : null);
+      case 'task_notification':
+        final status = ev['status'] as String?;
+        return _copyWith(done: status == 'completed' || status == 'failed' ? true : null, summary: ev['summary'] as String?)._foldUsage(ev['usage']);
+      default:
+        return this;
+    }
+  }
+
+  WorkflowRun _foldProgress(Map<String, dynamic> ev) {
+    final phases = Map<int, WorkflowPhase>.from(this.phases);
+    final agents = Map<int, WorkflowAgent>.from(this.agents);
+    final progress = ev['workflow_progress'];
+    if (progress is List) {
+      for (final raw in progress) {
+        if (raw is! Map) continue;
+        final e = raw.cast<String, dynamic>();
+        final idx = (e['index'] as num?)?.toInt();
+        if (idx == null) continue;
+        switch (e['type']) {
+          case 'workflow_phase':
+            phases[idx] = WorkflowPhase(index: idx, title: (e['title'] as String?) ?? 'phase $idx');
+          case 'workflow_agent':
+            final prior = agents[idx];
+            agents[idx] = prior != null ? prior.mergeDelta(e) : WorkflowAgent.fromDelta(e);
+        }
+      }
+    }
+    return _copyWith(summary: ev['summary'] as String?, phases: phases, agents: agents)._foldUsage(ev['usage']);
+  }
+
+  WorkflowRun _foldUsage(Object? usage) {
+    if (usage is! Map) return this;
+    return _copyWith(
+      totalTokens: (usage['total_tokens'] as num?)?.toInt(),
+      toolUses: (usage['tool_uses'] as num?)?.toInt(),
+      durationMs: (usage['duration_ms'] as num?)?.toInt(),
+    );
+  }
+}
+
+/// The `system` subtypes that carry workflow run progress (T-416). Other system
+/// subtypes (`init`, `hook_*`, `thinking_tokens`) are unrelated and left alone.
+const Set<String> kWorkflowSystemSubtypes = {'task_started', 'task_progress', 'task_updated', 'task_notification'};
+
+/// True when [ev] is a `system` event carrying workflow run progress that names
+/// a launching tool-use id we can key on.
+bool isWorkflowSystemEvent(Map<String, dynamic> ev) =>
+    ev['type'] == 'system' && kWorkflowSystemSubtypes.contains(ev['subtype']) && (ev['tool_use_id'] as String?)?.isNotEmpty == true;

lib/builtin/cli_install/src/extension.dart

@@ -61,30 +61,23 @@ class CliInstallExtension extends ClideExtension {
 
   @override
   List<ContributionPoint> get contributions => [
-        CommandContribution(
+    CommandContribution(
-          id: 'clide.installCli',
+      id: 'clide.installCli',
-          command: 'clide.installCli',
+      command: 'clide.installCli',
-          title: "clide: Install 'clide' command in PATH",
+      title: "clide: Install 'clide' command in PATH",
-          run: (_) async {
+      run: (_) async {
-            final r = _resolved.install();
+        final r = _resolved.install();
-            final ctx = _ctx;
+        final ctx = _ctx;
-            if (r.ok) {
+        if (r.ok) {
-              ctx?.notify.success(r.message, title: 'clide CLI installed');
+          ctx?.notify.success(r.message, title: 'clide CLI installed');
-              return IpcResponse.ok(id: '', data: {
+          return IpcResponse.ok(id: '', data: {'installed': r.installedPath, 'onPath': r.onPath});
-                'installed': r.installedPath,
+        }
-                'onPath': r.onPath,
+        ctx?.notify.error(r.message, title: 'clide CLI install failed');
-              });
+        return IpcResponse.err(
-            }
+          id: '',
-            ctx?.notify.error(r.message, title: 'clide CLI install failed');
+          error: IpcError(code: IpcExitCode.toolError, kind: IpcErrorKind.toolError, message: r.message),
-            return IpcResponse.err(
+        );
-              id: '',
+      },
-              error: IpcError(
+    ),
-                code: IpcExitCode.toolError,
+  ];
-                kind: IpcErrorKind.toolError,
-                message: r.message,
-              ),
-            );
-          },
-        ),
-      ];
 }

lib/builtin/decisions/src/decision_colors.dart

@@ -1,34 +1,22 @@
 import 'dart:ui' show Color;
 
 class DecisionTypeColors {
-  const DecisionTypeColors({
+  const DecisionTypeColors({required this.confirmed, required this.question, required this.rejected});
-    required this.confirmed,
-    required this.question,
-    required this.rejected,
-  });
 
   final Color confirmed;
   final Color question;
   final Color rejected;
 
   Color forType(String? type) => switch (type) {
-        'confirmed' => confirmed,
+    'confirmed' => confirmed,
-        'question' => question,
+    'question' => question,
-        'rejected' => rejected,
+    'rejected' => rejected,
-        _ => confirmed,
+    _ => confirmed,
-      };
+  };
 
-  static const dark = DecisionTypeColors(
+  static const dark = DecisionTypeColors(confirmed: Color(0xFF7DD3A8), question: Color(0xFFE6C370), rejected: Color(0xFFE87D7D));
-    confirmed: Color(0xFF7DD3A8),
-    question: Color(0xFFE6C370),
-    rejected: Color(0xFFE87D7D),
-  );
 
-  static const light = DecisionTypeColors(
+  static const light = DecisionTypeColors(confirmed: Color(0xFF1D7A4E), question: Color(0xFFB08A20), rejected: Color(0xFFC03030));
-    confirmed: Color(0xFF1D7A4E),
-    question: Color(0xFFB08A20),
-    rejected: Color(0xFFC03030),
-  );
 
   static DecisionTypeColors forTheme({required bool dark}) => dark ? DecisionTypeColors.dark : DecisionTypeColors.light;
 }

lib/builtin/decisions/src/decision_detail_view.dart

@@ -110,10 +110,7 @@ class _DecisionDetailViewState extends State<DecisionDetailView> {
     return ClidePaneChrome(
       title: id,
       subtitle: title,
-      leading: ReaderPinButton(
+      leading: ReaderPinButton(pinned: _nav?.hasPinned ?? false, onTap: _decision != null ? _onPin : null),
-        pinned: _nav?.hasPinned ?? false,
-        onTap: _decision != null ? _onPin : null,
-      ),
       trailing: [
         ReaderActionBar(
           canGoBack: _nav?.canGoBack ?? false,
@@ -144,7 +141,11 @@ class _DecisionDetailViewState extends State<DecisionDetailView> {
                     children: [
                       ClideTooltip(
                         message: type ?? 'confirmed',
-                        child: Container(width: 10, height: 10, decoration: BoxDecoration(color: typeColor, shape: BoxShape.circle)),
+                        child: Container(
+                          width: 10,
+                          height: 10,
+                          decoration: BoxDecoration(color: typeColor, shape: BoxShape.circle),
+                        ),
                       ),
                       const SizedBox(width: 8),
                       ClideText(id, fontSize: clideFontSmall, color: typeColor, fontFamily: clideMonoFamily),
@@ -159,21 +160,12 @@ class _DecisionDetailViewState extends State<DecisionDetailView> {
                   ),
                   const SizedBox(height: 8),
                   ClideText(title, fontSize: 15, fontWeight: FontWeight.w500),
-                  if (date != null) ...[
+                  if (date != null) ...[const SizedBox(height: 6), ClideText(date, muted: true, fontSize: clideFontSmall, fontFamily: clideMonoFamily)],
-                    const SizedBox(height: 6),
+                  if (status != null && status != 'active') ...[const SizedBox(height: 8), _StatusBadge(status: status, tokens: tokens)],
-                    ClideText(date, muted: true, fontSize: clideFontSmall, fontFamily: clideMonoFamily),
-                  ],
-                  if (status != null && status != 'active') ...[
-                    const SizedBox(height: 8),
-                    _StatusBadge(status: status, tokens: tokens),
-                  ],
                 ],
               ),
             ),
-            if (body != null && body.isNotEmpty) ...[
+            if (body != null && body.isNotEmpty) ...[const SizedBox(height: 12), ClideMarkdown(body, onRecordTap: (id) => _navigateToRecord(context, id))],
-              const SizedBox(height: 12),
-              ClideMarkdown(body, onRecordTap: (id) => _navigateToRecord(context, id)),
-            ],
             if (refs.isNotEmpty) ...[
               const SizedBox(height: 16),
               ClideText('CROSS-REFERENCES', fontSize: clideFontSmall, color: tokens.sidebarSectionHeader, fontFamily: clideMonoFamily),

lib/builtin/decisions/src/decisions_view.dart

@@ -139,12 +139,14 @@ class _DecisionsViewState extends State<DecisionsView> {
     final hasFilter = lf.isNotEmpty;
     final filtered = hasFilter
         ? _decisions
-            .where((d) =>
+              .where(
-                d.id.toLowerCase().contains(lf) ||
+                (d) =>
-                d.title.toLowerCase().contains(lf) ||
+                    d.id.toLowerCase().contains(lf) ||
-                (d.domain ?? '').toLowerCase().contains(lf) ||
+                    d.title.toLowerCase().contains(lf) ||
-                (d.type ?? '').contains(lf))
+                    (d.domain ?? '').toLowerCase().contains(lf) ||
-            .toList()
+                    (d.type ?? '').contains(lf),
+              )
+              .toList()
         : _decisions;
 
     final confirmed = filtered.where((d) => d.type == 'confirmed').toList();
@@ -158,7 +160,9 @@ class _DecisionsViewState extends State<DecisionsView> {
       children: [
         Row(
           children: [
-            Expanded(child: ClideFilterBox(address: 'decisions.panel', hint: 'Filter decisions…', onChanged: (v) => setState(() => _filter = v))),
+            Expanded(
+              child: ClideFilterBox(address: 'decisions.panel', hint: 'Filter decisions…', onChanged: (v) => setState(() => _filter = v)),
+            ),
             Padding(
               padding: const EdgeInsets.only(right: 8),
               child: ClideTappable(
@@ -180,39 +184,66 @@ class _DecisionsViewState extends State<DecisionsView> {
                   ClideAccordion(
                     label: 'CONFIRMED',
                     count: confirmed.length,
-                    leading: Container(width: 8, height: 8, decoration: BoxDecoration(color: typeColors.confirmed, shape: BoxShape.circle)),
+                    leading: Container(
+                      width: 8,
+                      height: 8,
+                      decoration: BoxDecoration(color: typeColors.confirmed, shape: BoxShape.circle),
+                    ),
                     expanded: hasFilter || _isSectionExpanded('confirmed'),
                     onToggle: () => _toggleSection('confirmed'),
                     children: [
                       for (final d in confirmed)
                         _DecisionCard(
-                            entry: d, tokens: tokens, typeColors: typeColors, focused: d.id == _focusedId, focusKey: d.id == _focusedId ? _focusedKey : null)
+                          entry: d,
+                          tokens: tokens,
+                          typeColors: typeColors,
+                          focused: d.id == _focusedId,
+                          focusKey: d.id == _focusedId ? _focusedKey : null,
+                        ),
                     ],
                   ),
                 if (questions.isNotEmpty)
                   ClideAccordion(
                     label: 'QUESTIONS',
                     count: questions.length,
-                    leading: Container(width: 8, height: 8, decoration: BoxDecoration(color: typeColors.question, shape: BoxShape.circle)),
+                    leading: Container(
+                      width: 8,
+                      height: 8,
+                      decoration: BoxDecoration(color: typeColors.question, shape: BoxShape.circle),
+                    ),
                     expanded: hasFilter || _isSectionExpanded('question'),
                     onToggle: () => _toggleSection('question'),
                     children: [
                       for (final d in questions)
                         _DecisionCard(
-                            entry: d, tokens: tokens, typeColors: typeColors, focused: d.id == _focusedId, focusKey: d.id == _focusedId ? _focusedKey : null)
+                          entry: d,
+                          tokens: tokens,
+                          typeColors: typeColors,
+                          focused: d.id == _focusedId,
+                          focusKey: d.id == _focusedId ? _focusedKey : null,
+                        ),
                     ],
                   ),
                 if (rejected.isNotEmpty)
                   ClideAccordion(
                     label: 'REJECTED',
                     count: rejected.length,
-                    leading: Container(width: 8, height: 8, decoration: BoxDecoration(color: typeColors.rejected, shape: BoxShape.circle)),
+                    leading: Container(
+                      width: 8,
+                      height: 8,
+                      decoration: BoxDecoration(color: typeColors.rejected, shape: BoxShape.circle),
+                    ),
                     expanded: hasFilter || _isSectionExpanded('rejected'),
                     onToggle: () => _toggleSection('rejected'),
                     children: [
                       for (final d in rejected)
                         _DecisionCard(
-                            entry: d, tokens: tokens, typeColors: typeColors, focused: d.id == _focusedId, focusKey: d.id == _focusedId ? _focusedKey : null)
+                          entry: d,
+                          tokens: tokens,
+                          typeColors: typeColors,
+                          focused: d.id == _focusedId,
+                          focusKey: d.id == _focusedId ? _focusedKey : null,
+                        ),
                     ],
                   ),
               ],
@@ -233,12 +264,12 @@ class _DecisionEntry {
   final String? status;
 
   factory _DecisionEntry.fromJson(Map<String, dynamic> json) => _DecisionEntry(
-        id: json['id'] as String? ?? '',
+    id: json['id'] as String? ?? '',
-        title: json['title'] as String? ?? '',
+    title: json['title'] as String? ?? '',
-        type: json['type'] as String?,
+    type: json['type'] as String?,
-        domain: json['domain'] as String?,
+    domain: json['domain'] as String?,
-        status: json['status'] as String?,
+    status: json['status'] as String?,
-      );
+  );
 }
 
 class _DecisionCard extends StatelessWidget {
@@ -271,7 +302,11 @@ class _DecisionCard extends StatelessWidget {
                 children: [
                   ClideTooltip(
                     message: entry.type ?? 'confirmed',
-                    child: Container(width: 8, height: 8, decoration: BoxDecoration(color: typeColor, shape: BoxShape.circle)),
+                    child: Container(
+                      width: 8,
+                      height: 8,
+                      decoration: BoxDecoration(color: typeColor, shape: BoxShape.circle),
+                    ),
                   ),
                   const SizedBox(width: 6),
                   ClideText(entry.id, fontSize: clideFontSmall, color: tokens.globalTextMuted, fontFamily: clideMonoFamily),

lib/builtin/decisions/src/extension.dart

@@ -37,21 +37,21 @@ class DecisionsExtension extends ClideExtension {
 
   @override
   List<ContributionPoint> get contributions => [
-        TabContribution(
+    TabContribution(
-          id: 'decisions.panel',
+      id: 'decisions.panel',
-          slot: Slots.sidebar,
+      slot: Slots.sidebar,
-          title: 'Decisions',
+      title: 'Decisions',
-          titleKey: 'tab.title',
+      titleKey: 'tab.title',
-          i18nNamespace: id,
+      i18nNamespace: id,
-          icon: PhosphorIcons.byName('lightbulb'),
+      icon: PhosphorIcons.byName('lightbulb'),
-          build: (_) => const DecisionsView(),
+      build: (_) => const DecisionsView(),
-        ),
+    ),
-        TabContribution(
+    TabContribution(
-          id: 'decisions.detail',
+      id: 'decisions.detail',
-          slot: Slots.contextPanel,
+      slot: Slots.contextPanel,
-          title: 'Decision',
+      title: 'Decision',
-          icon: PhosphorIcons.byName('lightbulb'),
+      icon: PhosphorIcons.byName('lightbulb'),
-          build: (_) => const DecisionDetailView(),
+      build: (_) => const DecisionDetailView(),
-        ),
+    ),
-      ];
+  ];
 }

lib/builtin/deeplink/src/deep_link.dart

@@ -23,9 +23,9 @@ class DeepLinkAction {
 
   /// A human-readable description for the confirmation prompt.
   String get describe => switch (name) {
-        'open' => 'Open  $path${line != null ? '  (line $line)' : ''}',
+    'open' => 'Open  $path${line != null ? '  (line $line)' : ''}',
-        _ => name,
+    _ => name,
-      };
+  };
 }
 
 /// Parse [url] into a [DeepLinkAction], or null when it is malformed, not a

lib/builtin/deeplink/src/extension.dart

@@ -25,13 +25,8 @@ class DeepLinkExtension extends ClideExtension {
 
   @override
   List<ContributionPoint> get contributions => [
-        CommandContribution(
+    CommandContribution(id: 'deeplink.invoke', command: 'deeplink.invoke', title: 'Open a clide:// deep link', run: _invoke),
-          id: 'deeplink.invoke',
+  ];
-          command: 'deeplink.invoke',
-          title: 'Open a clide:// deep link',
-          run: _invoke,
-        ),
-      ];
 
   @override
   Future<void> activate(ClideExtensionContext ctx) async => _ctx = ctx;

lib/builtin/default_layout/src/extension.dart

@@ -15,101 +15,71 @@ class DefaultLayoutExtension extends ClideExtension {
 
   @override
   List<ContributionPoint> get contributions => [
-        _preset ?? classicPreset(),
+    _preset ?? classicPreset(),
-        CommandContribution(
+    CommandContribution(id: 'layout.reset', command: 'layout.reset', title: 'Layout: Reset to Classic', run: _reset),
-          id: 'layout.reset',
+    CommandContribution(id: 'palette.toggle', command: 'palette.toggle', title: 'Command Palette', defaultBinding: 'ctrl+shift+p', run: _togglePalette),
-          command: 'layout.reset',
+    // Collapse toggles (D-051, D-054)
-          title: 'Layout: Reset to Classic',
+    CommandContribution(
-          run: _reset,
+      id: 'sidebar.collapse',
-        ),
+      command: 'sidebar.collapse',
-        CommandContribution(
+      title: 'Toggle Sidebar Collapse',
-          id: 'palette.toggle',
+      defaultBinding: 'ctrl+shift+1',
-          command: 'palette.toggle',
+      run: _collapseSidebar,
-          title: 'Command Palette',
+    ),
-          defaultBinding: 'ctrl+shift+p',
+    CommandContribution(
-          run: _togglePalette,
+      id: 'context.collapse',
-        ),
+      command: 'context.collapse',
-        // Collapse toggles (D-051, D-054)
+      title: 'Toggle Context Panel Collapse',
-        CommandContribution(
+      defaultBinding: 'ctrl+shift+3',
-          id: 'sidebar.collapse',
+      run: _collapseContext,
-          command: 'sidebar.collapse',
+    ),
-          title: 'Toggle Sidebar Collapse',
+    // Panel focus (D-054)
-          defaultBinding: 'ctrl+shift+1',
+    CommandContribution(id: 'panel.focus.left', command: 'panel.focus.left', title: 'Focus Left Panel', defaultBinding: 'ctrl+1', run: _focusLeft),
-          run: _collapseSidebar,
+    CommandContribution(id: 'panel.focus.middle', command: 'panel.focus.middle', title: 'Focus Middle Panel', defaultBinding: 'ctrl+2', run: _focusMiddle),
-        ),
+    CommandContribution(id: 'panel.focus.right', command: 'panel.focus.right', title: 'Focus Right Panel', defaultBinding: 'ctrl+3', run: _focusRight),
-        CommandContribution(
+    // Focus mode (D-052, D-054)
-          id: 'context.collapse',
+    CommandContribution(id: 'panel.focusMode', command: 'panel.focusMode', title: 'Toggle Focus Mode', defaultBinding: 'ctrl+.', run: _toggleFocusMode),
-          command: 'context.collapse',
+    CommandContribution(
-          title: 'Toggle Context Panel Collapse',
+      id: 'panel.focusMode.exit',
-          defaultBinding: 'ctrl+shift+3',
+      command: 'panel.focusMode.exit',
-          run: _collapseContext,
+      title: 'Exit Focus Mode',
-        ),
+      defaultBinding: 'escape',
-        // Panel focus (D-054)
+      // Stand down in Vim insert/visual mode so Esc returns to normal
-        CommandContribution(
+      // mode instead of closing the editor (T-257). Symmetric with
-          id: 'panel.focus.left',
+      // vim.yaml's `vim.mode.normal` (escape when vim.insert||vim.visual).
-          command: 'panel.focus.left',
+      bindingWhen: '!vim.insert && !vim.visual',
-          title: 'Focus Left Panel',
+      run: _exitFocusMode,
-          defaultBinding: 'ctrl+1',
+    ),
-          run: _focusLeft,
+    // Editor split (D-049, D-054)
-        ),
+    CommandContribution(id: 'editor.open', command: 'editor.open', title: 'Open Editor', defaultBinding: 'ctrl+e', run: _openEditor),
-        CommandContribution(
+    CommandContribution(id: 'editor.close', command: 'editor.close', title: 'Close Editor', defaultBinding: 'ctrl+w', run: _closeEditor),
-          id: 'panel.focus.middle',
+    // Workspace tab cycling (T-405). Preset-neutral ctrl+pagedown/up across every
-          command: 'panel.focus.middle',
+    // preset; the vim preset additionally binds gt/gT to these (T-405 part 2,
-          title: 'Focus Middle Panel',
+    // once a global multi-chord matcher lands — see T-404).
-          defaultBinding: 'ctrl+2',
+    CommandContribution(
-          run: _focusMiddle,
+      id: 'workspace.tab.next',
-        ),
+      command: 'workspace.tab.next',
-        CommandContribution(
+      title: 'Next Workspace Tab',
-          id: 'panel.focus.right',
+      defaultBinding: 'ctrl+pagedown',
-          command: 'panel.focus.right',
+      run: _nextWorkspaceTab,
-          title: 'Focus Right Panel',
+    ),
-          defaultBinding: 'ctrl+3',
+    CommandContribution(
-          run: _focusRight,
+      id: 'workspace.tab.previous',
-        ),
+      command: 'workspace.tab.previous',
-        // Focus mode (D-052, D-054)
+      title: 'Previous Workspace Tab',
-        CommandContribution(
+      defaultBinding: 'ctrl+pageup',
-          id: 'panel.focusMode',
+      run: _prevWorkspaceTab,
-          command: 'panel.focusMode',
+    ),
-          title: 'Toggle Focus Mode',
+    // Sidebar section switching (D-054): alt+1 through alt+5
-          defaultBinding: 'ctrl+.',
+    for (var i = 0; i < 5; i++)
-          run: _toggleFocusMode,
+      CommandContribution(
-        ),
+        id: 'sidebar.section.${i + 1}',
-        CommandContribution(
+        command: 'sidebar.section.${i + 1}',
-          id: 'panel.focusMode.exit',
+        title: 'Sidebar: Section ${i + 1}',
-          command: 'panel.focusMode.exit',
+        defaultBinding: 'alt+${i + 1}',
-          title: 'Exit Focus Mode',
+        run: (args) => _switchSidebarSection(i),
-          defaultBinding: 'escape',
+      ),
-          // Stand down in Vim insert/visual mode so Esc returns to normal
+  ];
-          // mode instead of closing the editor (T-257). Symmetric with
-          // vim.yaml's `vim.mode.normal` (escape when vim.insert||vim.visual).
-          bindingWhen: '!vim.insert && !vim.visual',
-          run: _exitFocusMode,
-        ),
-        // Editor split (D-049, D-054)
-        CommandContribution(
-          id: 'editor.open',
-          command: 'editor.open',
-          title: 'Open Editor',
-          defaultBinding: 'ctrl+e',
-          run: _openEditor,
-        ),
-        CommandContribution(
-          id: 'editor.close',
-          command: 'editor.close',
-          title: 'Close Editor',
-          defaultBinding: 'ctrl+w',
-          run: _closeEditor,
-        ),
-        // Sidebar section switching (D-054): alt+1 through alt+5
-        for (var i = 0; i < 5; i++)
-          CommandContribution(
-            id: 'sidebar.section.${i + 1}',
-            command: 'sidebar.section.${i + 1}',
-            title: 'Sidebar: Section ${i + 1}',
-            defaultBinding: 'alt+${i + 1}',
-            run: (args) => _switchSidebarSection(i),
-          ),
-      ];
 
   @override
   Future<void> activate(ClideExtensionContext ctx) async {
@@ -242,6 +212,27 @@ class DefaultLayoutExtension extends ClideExtension {
     return IpcResponse.ok(id: '', data: {'focused': 'workspace'});
   }
 
+  Future<IpcResponse> _nextWorkspaceTab(List<String> args) => _cycleWorkspaceTab(forward: true);
+  Future<IpcResponse> _prevWorkspaceTab(List<String> args) => _cycleWorkspaceTab(forward: false);
+
+  /// Cycle the workspace tab strip with wraparound (T-405). A no-op when there
+  /// are fewer than two tabs. Activating a tab also focuses the workspace slot
+  /// so the newly-shown pane takes keyboard focus.
+  Future<IpcResponse> _cycleWorkspaceTab({required bool forward}) async {
+    final ctx = _ctx;
+    if (ctx == null) return _notActivated();
+    final tabs = ctx.panels.tabsFor(Slots.workspace);
+    if (tabs.length < 2) return IpcResponse.ok(id: '', data: const {'cycled': false});
+    final active = ctx.panels.activeTabIn(Slots.workspace);
+    final cur = tabs.indexWhere((t) => t.id == active);
+    final start = cur < 0 ? 0 : cur;
+    final next = (start + (forward ? 1 : -1) + tabs.length) % tabs.length;
+    final nextId = tabs[next].id;
+    ctx.panels.activateTab(Slots.workspace, nextId);
+    ctx.focus.setActive(slot: Slots.workspace, contributionId: nextId);
+    return IpcResponse.ok(id: '', data: {'active': nextId});
+  }
+
   Future<IpcResponse> _focusRight(List<String> args) async {
     final ctx = _ctx;
     if (ctx == null) return _notActivated();
@@ -313,11 +304,7 @@ class DefaultLayoutExtension extends ClideExtension {
   }
 
   static IpcResponse _notActivated() => IpcResponse.err(
-        id: '',
+    id: '',
-        error: IpcError(
+    error: IpcError(code: IpcExitCode.toolError, kind: IpcErrorKind.toolError, message: 'not activated'),
-          code: IpcExitCode.toolError,
+  );
-          kind: IpcErrorKind.toolError,
-          message: 'not activated',
-        ),
-      );
 }

lib/builtin/diff/src/diff_controller.dart

@@ -50,18 +50,12 @@ class DiffController extends ChangeNotifier {
   }
 
   /// Load diffs. Optionally filter to [paths] and toggle [staged].
-  Future<void> load({
+  Future<void> load({bool staged = false, List<String> paths = const []}) async {
-    bool staged = false,
-    List<String> paths = const [],
-  }) async {
     _staged = staged;
     _loading = true;
     notifyListeners();
 
-    final r = await ipc.request('git.diff', args: {
+    final r = await ipc.request('git.diff', args: {'staged': staged, if (paths.isNotEmpty) 'paths': paths});
-      'staged': staged,
-      if (paths.isNotEmpty) 'paths': paths,
-    });
 
     _loading = false;
     if (!r.ok) {

lib/builtin/diff/src/diff_view.dart

@@ -98,24 +98,11 @@ class _DiffViewState extends State<DiffView> {
               if (c.error != null)
                 Padding(
                   padding: const EdgeInsets.all(12),
-                  child: ClideText(
+                  child: ClideText(c.error!, color: tokens.statusError),
-                    c.error!,
-                    color: tokens.statusError,
-                  ),
-                ),
-              if (c.loading && c.diffs.isEmpty)
-                const Padding(
-                  padding: EdgeInsets.all(12),
-                  child: ClideText('Loading…', muted: true),
                 ),
+              if (c.loading && c.diffs.isEmpty) const Padding(padding: EdgeInsets.all(12), child: ClideText('Loading…', muted: true)),
               if (!c.loading && c.diffs.isEmpty && c.error == null)
-                Padding(
+                Padding(padding: const EdgeInsets.all(12), child: ClideText(c.showStaged ? 'No staged changes.' : 'No unstaged changes.', muted: true)),
-                  padding: const EdgeInsets.all(12),
-                  child: ClideText(
-                    c.showStaged ? 'No staged changes.' : 'No unstaged changes.',
-                    muted: true,
-                  ),
-                ),
               Expanded(
                 child: SingleChildScrollView(
                   controller: _scroll,
@@ -163,11 +150,7 @@ class _DiffToolbar extends StatelessWidget {
             label: 'show unstaged changes',
             child: GestureDetector(
               onTap: controller.showStaged ? controller.toggleStaged : null,
-              child: ClideText(
+              child: ClideText('Unstaged', fontSize: clideFontCaption, color: controller.showStaged ? tokens.globalTextMuted : tokens.globalForeground),
-                'Unstaged',
-                fontSize: clideFontCaption,
-                color: controller.showStaged ? tokens.globalTextMuted : tokens.globalForeground,
-              ),
             ),
           ),
           const SizedBox(width: 12),
@@ -177,11 +160,7 @@ class _DiffToolbar extends StatelessWidget {
             label: 'show staged changes',
             child: GestureDetector(
               onTap: controller.showStaged ? null : controller.toggleStaged,
-              child: ClideText(
+              child: ClideText('Staged', fontSize: clideFontCaption, color: controller.showStaged ? tokens.globalForeground : tokens.globalTextMuted),
-                'Staged',
-                fontSize: clideFontCaption,
-                color: controller.showStaged ? tokens.globalForeground : tokens.globalTextMuted,
-              ),
             ),
           ),
         ],
@@ -233,11 +212,7 @@ class _FileDiff extends StatelessWidget {
           child: Row(
             children: [
               Expanded(
-                child: ClideText(
+                child: ClideText(path, fontSize: clideFontCaption, color: focused ? tokens.globalFocus : tokens.panelHeaderForeground),
-                  path,
-                  fontSize: clideFontCaption,
-                  color: focused ? tokens.globalFocus : tokens.panelHeaderForeground,
-                ),
               ),
               if (additions > 0) ClideText('+$additions ', fontSize: clideFontCaption, color: tokens.statusSuccess),
               if (removals > 0) ClideText('-$removals', fontSize: clideFontCaption, color: tokens.statusError),
@@ -250,12 +225,7 @@ class _FileDiff extends StatelessWidget {
             child: ClideText(meta.join(' · '), fontSize: clideFontCaption, muted: true),
           ),
         if (!isBinary)
-          for (final hunk in hunks)
+          for (final hunk in hunks) _HunkView(hunk: (hunk as Map).cast<String, Object?>(), filePath: path, controller: controller),
-            _HunkView(
-              hunk: (hunk as Map).cast<String, Object?>(),
-              filePath: path,
-              controller: controller,
-            ),
         const SizedBox(height: 8),
       ],
     );
@@ -263,11 +233,7 @@ class _FileDiff extends StatelessWidget {
 }
 
 class _HunkView extends StatelessWidget {
-  const _HunkView({
+  const _HunkView({required this.hunk, required this.filePath, required this.controller});
-    required this.hunk,
-    required this.filePath,
-    required this.controller,
-  });
 
   final Map<String, Object?> hunk;
   final String filePath;
@@ -284,17 +250,9 @@ class _HunkView extends StatelessWidget {
       children: [
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
-          child: ClideText(
+          child: ClideText(header, fontSize: clideFontMono, muted: true, fontFamily: clideMonoFamily),
-            header,
-            fontSize: clideFontMono,
-            muted: true,
-            fontFamily: clideMonoFamily,
-          ),
         ),
-        for (final lineObj in lines)
+        for (final lineObj in lines) _DiffLineRow(line: (lineObj as Map).cast<String, Object?>()),
-          _DiffLineRow(
-            line: (lineObj as Map).cast<String, Object?>(),
-          ),
       ],
     );
   }
@@ -313,18 +271,9 @@ class _DiffLineRow extends StatelessWidget {
     final newLineNo = line['newLineNo'] as num?;
 
     final (Color bg, Color fg) = switch (kind) {
-      'addition' => (
+      'addition' => (tokens.statusSuccess.withValues(alpha: 0.15), tokens.statusSuccess),
-          tokens.statusSuccess.withValues(alpha: 0.15),
+      'removal' => (tokens.statusError.withValues(alpha: 0.15), tokens.statusError),
-          tokens.statusSuccess,
+      _ => (const Color(0x00000000), tokens.globalForeground),
-        ),
-      'removal' => (
-          tokens.statusError.withValues(alpha: 0.15),
-          tokens.statusError,
-        ),
-      _ => (
-          const Color(0x00000000),
-          tokens.globalForeground,
-        ),
     };
 
     final prefix = switch (kind) {
@@ -361,22 +310,10 @@ class _DiffLineRow extends StatelessWidget {
             ),
           ),
           const SizedBox(width: 4),
-          ClideText(
+          ClideText(prefix, fontSize: clideFontMono, color: fg, fontFamily: clideMonoFamily),
-            prefix,
-            fontSize: clideFontMono,
-            color: fg,
-            fontFamily: clideMonoFamily,
-          ),
           const SizedBox(width: 2),
           Expanded(
-            child: ClideText(
+            child: ClideText(text, fontSize: clideFontMono, color: fg, fontFamily: clideMonoFamily, maxLines: 1, overflow: TextOverflow.clip),
-              text,
-              fontSize: clideFontMono,
-              color: fg,
-              fontFamily: clideMonoFamily,
-              maxLines: 1,
-              overflow: TextOverflow.clip,
-            ),
           ),
         ],
       ),