diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gemini/settings.json b/.gemini/settings.json
index 6162388..7876ff2 100644
--- a/.gemini/settings.json
+++ b/.gemini/settings.json
@@ -9,7 +9,7 @@
           {
             "name": "trace-session-start",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini session-start"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini session-start"
           }
         ]
       }
@@ -21,7 +21,7 @@
           {
             "name": "trace-session-end-exit",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini session-end"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini session-end"
           }
         ]
       },
@@ -31,7 +31,7 @@
           {
             "name": "trace-session-end-logout",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini session-end"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini session-end"
           }
         ]
       }
@@ -42,7 +42,7 @@
           {
             "name": "trace-before-agent",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini before-agent"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini before-agent"
           }
         ]
       }
@@ -53,7 +53,7 @@
           {
             "name": "trace-after-agent",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini after-agent"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini after-agent"
           }
         ]
       }
@@ -64,7 +64,7 @@
           {
             "name": "trace-before-model",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini before-model"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini before-model"
           }
         ]
       }
@@ -75,7 +75,7 @@
           {
             "name": "trace-after-model",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini after-model"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini after-model"
           }
         ]
       }
@@ -86,7 +86,7 @@
           {
             "name": "trace-before-tool-selection",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini before-tool-selection"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini before-tool-selection"
           }
         ]
       }
@@ -98,7 +98,7 @@
           {
             "name": "trace-before-tool",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini before-tool"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini before-tool"
           }
         ]
       }
@@ -110,7 +110,7 @@
           {
             "name": "trace-after-tool",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini after-tool"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini after-tool"
           }
         ]
       }
@@ -121,7 +121,7 @@
           {
             "name": "trace-pre-compress",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini pre-compress"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini pre-compress"
           }
         ]
       }
@@ -132,7 +132,7 @@
           {
             "name": "trace-notification",
             "type": "command",
-            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks gemini notification"
+            "command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk hooks gemini notification"
           }
         ]
       }
diff --git a/.gemini/test-hooks.sh b/.gemini/test-hooks.sh
index 695ebe9..bc38745 100755
--- a/.gemini/test-hooks.sh
+++ b/.gemini/test-hooks.sh
@@ -28,7 +28,7 @@ SESSION_START_INPUT=$(cat <<EOF
 EOF
 )
 
-echo "$SESSION_START_INPUT" | go run ./cmd/trace/main.go hooks gemini session-start && echo "   ✓ session-start passed" || echo "   ✗ session-start failed"
+echo "$SESSION_START_INPUT" | go run ./cmd/hawk hooks gemini session-start && echo "   ✓ session-start passed" || echo "   ✗ session-start failed"
 
 # Test 2: Before Tool Hook
 echo ""
@@ -46,7 +46,7 @@ BEFORE_TOOL_INPUT=$(cat <<EOF
 EOF
 )
 
-echo "$BEFORE_TOOL_INPUT" | go run ./cmd/trace/main.go hooks gemini before-tool && echo "   ✓ before-tool passed" || echo "   ✗ before-tool failed"
+echo "$BEFORE_TOOL_INPUT" | go run ./cmd/hawk hooks gemini before-tool && echo "   ✓ before-tool passed" || echo "   ✗ before-tool failed"
 
 # Test 3: After Tool Hook
 echo ""
@@ -65,7 +65,7 @@ AFTER_TOOL_INPUT=$(cat <<EOF
 EOF
 )
 
-echo "$AFTER_TOOL_INPUT" | go run ./cmd/trace/main.go hooks gemini after-tool && echo "   ✓ after-tool passed" || echo "   ✗ after-tool failed"
+echo "$AFTER_TOOL_INPUT" | go run ./cmd/hawk hooks gemini after-tool && echo "   ✓ after-tool passed" || echo "   ✗ after-tool failed"
 
 # Test 4: Session End Hook
 echo ""
@@ -82,7 +82,7 @@ SESSION_END_INPUT=$(cat <<EOF
 EOF
 )
 
-echo "$SESSION_END_INPUT" | go run ./cmd/trace/main.go hooks gemini session-end && echo "   ✓ session-end passed" || echo "   ✗ session-end failed"
+echo "$SESSION_END_INPUT" | go run ./cmd/hawk hooks gemini session-end && echo "   ✓ session-end passed" || echo "   ✗ session-end failed"
 
 # Cleanup
 rm -rf "$TEMP_DIR"
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f1b4f47..ea48529 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -25,7 +25,7 @@
 
 <!--
   Trace records developer sessions. Any change that touches `redact/`,
-  `cmd/trace/cli/checkpoint/`, or transcript serialization can leak PII,
+  `cli/checkpoint/`, or transcript serialization can leak PII,
   secrets, or proprietary code if regressed.
 
   - Did you change `redact/redact.go`, `redact/pii.go`, the secret-pattern
@@ -73,7 +73,7 @@ $ golangci-lint run ./...
 - [ ] `go test -race -count=1 ./...` passes locally
 - [ ] e2e impact considered (relevant `e2e/` test added, updated, or
       verified) — n/a if change is contained to non-runtime code
-- [ ] Public APIs in `cmd/trace/cli/...` have godoc comments
+- [ ] Public APIs in `cli/...` have godoc comments
 - [ ] `CHANGELOG.md` updated under `## [Unreleased]` if user-visible
 - [ ] No regression in `redact/` tests
 - [ ] No secrets, tokens, or PII added to the repo (test fixtures use
diff --git a/.github/internal/CLAUDE.md b/.github/internal/CLAUDE.md
index 25b9dee..915a63e 100644
--- a/.github/internal/CLAUDE.md
+++ b/.github/internal/CLAUDE.md
@@ -52,7 +52,7 @@ Deprecated top-level alias (functional, prints cobra deprecation message):
 Hidden infrastructure commands: `hooks`, `migrate`, `trail`,
 `curl-bash-post-install`, `__send_analytics`.
 
-The `hideAsAlias(cmd, canonical)` helper in `cmd/trace/cli/aliascmd.go`
+The `hideAsAlias(cmd, canonical)` helper in `cli/aliascmd.go`
 marks a command Hidden and sets cobra's `Deprecated` field so the hint
 renders to stderr on every invocation while the command stays functional.
 Diagnostic subcommands live alongside `doctor.go` as `doctor_logs.go` and
@@ -85,7 +85,7 @@ mise run test:integration
 mise run test:ci
 ```
 
-This runs unit tests, integration tests, and the E2E canary (Vogon agent) in sequence. Integration tests use the `//go:build integration` build tag and are located in `cmd/trace/cli/integration_test/`.
+This runs unit tests, integration tests, and the E2E canary (Vogon agent) in sequence. Integration tests use the `//go:build integration` build tag and are located in `cli/integration_test/`.
 
 ### Running E2E Canary Tests (Vogon Agent)
 
@@ -99,7 +99,7 @@ mise run test:e2e:canary TestFoo   # Run a specific test
 - **Runs as part of `test:ci`** — canary failures block merges
 - **No API calls, no cost** — safe to run freely, unlike real agent E2E tests
 - **If a canary test fails, the bug is in the CLI or test infrastructure**, not in an agent
-- Located in `e2e/vogon/` (binary) and `cmd/trace/cli/agent/vogon/` (Agent interface)
+- Located in `e2e/vogon/` (binary) and `cli/agent/vogon/` (Agent interface)
 - The binary parses prompts via regex, creates/modifies/deletes files, and fires lifecycle hooks
 - **IMPORTANT: When changing E2E test prompt wording**, the Vogon binary (`e2e/vogon/main.go`) parses prompts with hardcoded regexes. New phrasing may not match existing patterns — always run `mise run test:e2e:canary` after changing prompt text and fix Vogon's parsing if tests fail.
 
@@ -190,7 +190,7 @@ Tests that spawn the real `trace` or `git` binary need the child to be non-inter
 For subprocesses spawning the real `trace` binary (e2e, integration tests, `trace` calling itself from a hook), prefer `execx.NonInteractive` over env-var plumbing:
 
 ```go
-import "github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
+import "github.com/GrayCodeAI/trace/cli/execx"
 
 cmd := execx.NonInteractive(ctx, getTestBinary(), "status")
 cmd.Dir = repoDir
@@ -303,7 +303,7 @@ return fmt.Errorf("unknown strategy: %s", name)
 
 ### Settings
 
-All settings access should go through the `settings` package (`cmd/trace/cli/settings/`).
+All settings access should go through the `settings` package (`cli/settings/`).
 
 **Why a separate package:**
 The `settings` package exists to avoid import cycles. The `cli` package imports `strategy`, so `strategy` cannot import `cli`. The `settings` package provides shared settings loading that both can use.
@@ -311,7 +311,7 @@ The `settings` package exists to avoid import cycles. The `cli` package imports
 **Usage:**
 
 ```go
-import "github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+import "github.com/GrayCodeAI/trace/cli/settings"
 
 // Load full settings object
 s, err := settings.Load()
@@ -341,7 +341,7 @@ if settings.IsSummarizeEnabled() {
 
 ### Logging vs User Output
 
-- **Internal/debug logging**: Use `logging.Debug/Info/Warn/Error(ctx, msg, attrs...)` from `cmd/trace/cli/logging/`. Writes to `.trace/logs/`.
+- **Internal/debug logging**: Use `logging.Debug/Info/Warn/Error(ctx, msg, attrs...)` from `cli/logging/`. Writes to `.trace/logs/`.
 - **Enabling debug/perf logs locally**: Prefer adding `"log_level": "DEBUG"` to `.trace/settings.local.json` when you need detailed hook/perf logs. This file is gitignored, so it is a low-risk local-only change. `TRACE_LOG_LEVEL=debug` also works and takes precedence.
 - **User-facing output**: Use `fmt.Fprint*(cmd.OutOrStdout(), ...)` or `cmd.ErrOrStderr()`.
 
@@ -410,7 +410,7 @@ relPath := paths.ToRelativePath("/repo/api/file.ts", repoRoot)  // returns "api/
 
 Test case in `state_test.go`: `TestFilterAndNormalizePaths_SiblingDirectories` documents this bug pattern.
 
-### Session Strategy (`cmd/trace/cli/strategy/`)
+### Session Strategy (`cli/strategy/`)
 
 The CLI uses a manual-commit strategy for managing session data and checkpoints. The strategy implements the `Strategy` interface defined in `strategy.go`.
 
@@ -463,14 +463,14 @@ The manual-commit strategy (`manual_commit*.go`) does not modify the active bran
 - `session_state.go` - Package-level session state functions (`LoadSessionState`, `SaveSessionState`, `ListSessionStates`, `FindMostRecentSession`)
 - `hooks.go` - Git hook installation
 
-#### Checkpoint Package (`cmd/trace/cli/checkpoint/`)
+#### Checkpoint Package (`cli/checkpoint/`)
 
 - `checkpoint.go` - Data types (`Checkpoint`, `TemporaryCheckpoint`, `CommittedCheckpoint`)
 - `store.go` - `GitStore` struct wrapping git repository
 - `temporary.go` - Shadow branch operations (`WriteTemporary`, `ReadTemporary`, `ListTemporary`)
 - `committed.go` - Metadata branch operations (`WriteCommitted`, `ReadCommitted`, `ListCommitted`)
 
-#### Session Package (`cmd/trace/cli/session/`)
+#### Session Package (`cli/session/`)
 
 - `session.go` - Session data types and interfaces
 - `state.go` - `StateStore` for managing `.git/trace-sessions/` files
diff --git a/.github/internal/copilot-instructions.md b/.github/internal/copilot-instructions.md
index 6677856..1b93463 100644
--- a/.github/internal/copilot-instructions.md
+++ b/.github/internal/copilot-instructions.md
@@ -121,7 +121,7 @@ Write tests that provide real value, not just coverage:
 - **Include edge cases and error conditions** - ensure error paths are properly tested
 - **When fixing bugs, write a test that surfaces the bug first** - then write the fix
 - **Unit tests**: Same directory as source, `*_test.go` files
-- **Integration tests**: `cmd/trace/cli/integration_test/`, require `//go:build integration` tag
+- **Integration tests**: `cli/integration_test/`, require `//go:build integration` tag
 
 Run `mise run test` for quick validation, `mise run test:ci` for full CI parity.
 
@@ -139,7 +139,7 @@ Run `mise run lint:full` to check all code (not just new issues).
 
 ## When Adding New Commands
 
-1. Add command in `cmd/trace/cli/` following existing patterns (look at similar commands)
+1. Add command in `cli/` following existing patterns (look at similar commands)
 2. Register in `root.go`
 3. Use `SilentError` for custom error messages
 4. Add meaningful tests that verify behavior
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c79293b..dae9e43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -152,9 +152,15 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
           cache: true
       - name: deadcode
+        # Advisory, not blocking: trace is a library with no main() entrypoint,
+        # so plain `deadcode ./...` flags the entire public API as unreachable.
+        # We run with -test (tests count as roots) for a meaningful signal, but a
+        # hard gate would false-positive on legitimate exported API — review the
+        # output in the logs instead.
         run: |
           go install golang.org/x/tools/cmd/deadcode@latest
-          deadcode ./... 2>&1 | head -50
+          deadcode -test ./... 2>&1 | tee deadcode.txt
+          echo "deadcode reported $(grep -c 'unreachable func' deadcode.txt || echo 0) unreachable funcs (advisory)"
 
   # -------------------------------------------------------------------------
   # Duplication detection — jscpd.
diff --git a/.github/workflows/e2e-checkpoints-v2.yml b/.github/workflows/e2e-checkpoints-v2.yml
deleted file mode 100644
index dfcfe73..0000000
--- a/.github/workflows/e2e-checkpoints-v2.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-name: E2E Checkpoints V2
-
-on:
-  workflow_dispatch:
-    inputs:
-      agent:
-        description: "Agent to run"
-        required: true
-        default: "vogon"
-        type: choice
-        options:
-          - vogon
-          - claude-code
-          - opencode
-          - gemini-cli
-          - factoryai-droid
-          - cursor-cli
-          - copilot-cli
-          - roger-roger
-          - codex
-      checkpoints_mode:
-        description: "Checkpoints mode to run"
-        required: true
-        default: "v2-dual-write"
-        type: choice
-        options:
-          - v2-dual-write
-          - v2-only
-
-jobs:
-  e2e-checkpoints-v2:
-    if: inputs.agent != 'copilot-cli'
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    permissions:
-      actions: read
-      contents: read
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gnome-keyring tmux
-          echo 'somecredstorepass' | gnome-keyring-daemon --unlock
-
-      - name: Setup mise
-        uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4
-
-      - name: Build trace CLI
-        run: go build -o /usr/local/bin/trace ./cmd/trace
-
-      - name: Build vogon binary
-        if: inputs.agent == 'vogon'
-        run: go build -o /usr/local/bin/vogon ./e2e/vogon
-
-      - name: Install agent CLI
-        if: inputs.agent != 'vogon'
-        run: |
-          case "${{ inputs.agent }}" in
-            claude-code) curl -fsSL https://claude.ai/install.sh | bash ;;
-            opencode)    curl -fsSL https://opencode.ai/install | bash ;;
-            gemini-cli)  npm install -g @google/gemini-cli ;;
-            codex)       npm install -g @openai/codex ;;
-            cursor-cli)  curl https://cursor.com/install -fsS | bash ;;
-            factoryai-droid) curl -fsSL https://app.factory.ai/cli | sh ;;
-            copilot-cli)  npm install -g @github/copilot  ;;
-            roger-roger) ;; # installed by mise (see mise.toml)
-          esac
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Verify roger-roger agent
-        if: inputs.agent == 'roger-roger'
-        run: |
-          set -euo pipefail
-          echo "Verifying roger-roger binaries on PATH..."
-          command -v roger-roger
-          command -v trace-agent-roger-roger
-
-      - name: Bootstrap agent
-        if: inputs.agent != 'roger-roger' && inputs.agent != 'vogon'
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
-          FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
-        run: go run ./e2e/bootstrap ${{ inputs.agent }}
-
-      - name: E2E Checkpoints V2
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          E2E_CODEX_MODEL: ${{ inputs.agent == 'codex' && 'gpt-5.1-codex-mini' || '' }}
-          CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
-          FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
-          E2E_ARTIFACT_DIR: ${{ github.workspace }}/e2e-artifacts
-          E2E_TRACE_BIN: /usr/local/bin/trace
-          E2E_CHECKPOINTS_MODE: ${{ inputs.checkpoints_mode }}
-        run: |
-          mkdir -p "$E2E_ARTIFACT_DIR"
-          mise run test:e2e --agent ${{ inputs.agent }}
-
-      - name: Upload artifacts
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: e2e-checkpoints-v2-${{ inputs.agent }}-${{ inputs.checkpoints_mode }}
-          path: e2e-artifacts/
-          retention-days: 7
-
-  e2e-checkpoints-v2-copilot:
-    if: inputs.agent == 'copilot-cli'
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    permissions:
-      actions: read
-      contents: read
-      copilot-requests: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gnome-keyring tmux
-          echo 'somecredstorepass' | gnome-keyring-daemon --unlock
-
-      - name: Setup mise
-        uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4
-
-      - name: Build trace CLI
-        run: go build -o /usr/local/bin/trace ./cmd/trace
-
-      - name: Install agent CLI
-        run: |
-          npm install -g @github/copilot
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Bootstrap agent
-        env:
-          COPILOT_GITHUB_TOKEN: ${{ github.token }}
-        run: go run ./e2e/bootstrap ${{ inputs.agent }}
-
-      - name: E2E Checkpoints V2
-        env:
-          COPILOT_GITHUB_TOKEN: ${{ github.token }}
-          E2E_ARTIFACT_DIR: ${{ github.workspace }}/e2e-artifacts
-          E2E_TRACE_BIN: /usr/local/bin/trace
-          E2E_CHECKPOINTS_MODE: ${{ inputs.checkpoints_mode }}
-        run: |
-          mkdir -p "$E2E_ARTIFACT_DIR"
-          mise run test:e2e --agent ${{ inputs.agent }}
-
-      - name: Upload artifacts
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: e2e-checkpoints-v2-${{ inputs.agent }}-${{ inputs.checkpoints_mode }}
-          path: e2e-artifacts/
-          retention-days: 7
diff --git a/.github/workflows/e2e-isolated.yml b/.github/workflows/e2e-isolated.yml
deleted file mode 100644
index 304f9ba..0000000
--- a/.github/workflows/e2e-isolated.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-name: E2E Isolated Test
-
-on:
-  workflow_dispatch:
-    inputs:
-      agent:
-        description: "Agent to test"
-        required: true
-        default: "gemini-cli"
-        type: choice
-        options: [claude-code, opencode, gemini-cli, cursor-cli, factoryai-droid, copilot-cli, roger-roger, codex]
-      test:
-        description: "Test name filter (regex)"
-        required: true
-        default: "TestInteractiveMultiStep"
-
-jobs:
-  e2e-isolated:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Setup mise
-        uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4
-
-      - name: Install system dependencies
-        run: sudo apt-get update && sudo apt-get install -y tmux
-
-      - name: Build trace CLI
-        run: go build -o /usr/local/bin/trace ./cmd/trace
-
-      - name: Install agent CLI
-        run: |
-          case "${{ inputs.agent }}" in
-            claude-code) curl -fsSL https://claude.ai/install.sh | bash ;;
-            opencode)    curl -fsSL https://opencode.ai/install | bash ;;
-            gemini-cli)  npm install -g @google/gemini-cli ;;
-            codex)       npm install -g @openai/codex ;;
-            cursor-cli)  curl https://cursor.com/install -fsS | bash ;;
-            factoryai-droid) curl -fsSL https://app.factory.ai/cli | sh ;;
-            copilot-cli)  npm install -g @github/copilot  ;;
-            roger-roger) ;; # installed by mise (see mise.toml)
-          esac
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Verify roger-roger agent
-        if: inputs.agent == 'roger-roger'
-        run: |
-          set -euo pipefail
-          echo "Verifying roger-roger binaries on PATH..."
-          command -v roger-roger
-          command -v trace-agent-roger-roger
-
-      - name: Bootstrap agent
-        if: inputs.agent != 'roger-roger'
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
-          FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
-          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-        run: go run ./e2e/bootstrap
-
-      - name: Run isolated test
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          E2E_CODEX_MODEL: ${{ inputs.agent == 'codex' && 'gpt-5.4-mini' || '' }}
-          CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
-          FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
-          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          E2E_ARTIFACT_DIR: ${{ github.workspace }}/e2e-artifacts
-          E2E_TRACE_BIN: /usr/local/bin/trace
-        run: |
-          mkdir -p "$E2E_ARTIFACT_DIR"
-          mise run test:e2e --agent ${{ inputs.agent }} "${{ inputs.test }}"
-
-      - name: Upload artifacts
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: e2e-isolated-${{ inputs.agent }}-${{ inputs.test }}
-          path: e2e-artifacts/
-          retention-days: 7
diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
deleted file mode 100644
index 42688a8..0000000
--- a/.github/workflows/e2e-windows.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: E2E Tests (Windows)
-
-on:
-  workflow_call:
-  workflow_dispatch:
-    inputs:
-      test:
-        description: "Test name filter (regex)"
-        required: false
-        default: ""
-
-concurrency:
-  group: e2e-windows-tests
-  cancel-in-progress: true
-
-jobs:
-  e2e-windows:
-    runs-on: windows-latest
-    timeout-minutes: 45
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Setup mise
-        uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4
-
-      - name: Install Claude Code
-        run: |
-          irm https://claude.ai/install.ps1 | iex
-          "$env:USERPROFILE\.local\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: Bootstrap agent
-        shell: bash
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-        run: go run ./e2e/bootstrap claude-code
-
-      - name: Run isolated test
-        shell: bash
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          E2E_ARTIFACT_DIR: ${{ github.workspace }}/e2e-artifacts
-          E2E_PARALLEL: 1
-        run: |
-          mkdir -p "$E2E_ARTIFACT_DIR"
-          mise run test:e2e --agent claude-code "${{ inputs.test }}"
-
-      - name: Upload artifacts
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: e2e-isolated-claude-code-${{ inputs.test }}
-          path: e2e-artifacts/
-          retention-days: 7
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
deleted file mode 100644
index c41abea..0000000
--- a/.github/workflows/e2e.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-name: E2E Tests
-
-on:
-  workflow_dispatch:
-    inputs:
-      agent:
-        description: 'Run a single agent (leave empty for all)'
-        required: false
-        type: choice
-        options:
-          - ''
-          - claude-code
-          - opencode
-          - gemini-cli
-          - factoryai-droid
-          - cursor-cli
-          - copilot-cli
-          - roger-roger
-          - codex
-  # Disabled: E2E tests require API keys, not suitable for automated CI
-  # push:
-    branches:
-      - main
-
-# Concurrency: only one E2E job runs at a time
-concurrency:
-  group: e2e-tests
-  cancel-in-progress: true
-
-jobs:
-  # Build the matrix dynamically so workflow_dispatch can select a single agent.
-  matrix-setup:
-    runs-on: ubuntu-latest
-    outputs:
-      agents: ${{ steps.set.outputs.agents }}
-    steps:
-      - id: set
-        run: |
-          input="${{ github.event.inputs.agent }}"
-          if [ -n "$input" ]; then
-            echo "agents=[\"$input\"]" >> "$GITHUB_OUTPUT"
-          else
-            echo 'agents=["claude-code","opencode","gemini-cli","factoryai-droid","cursor-cli","copilot-cli","roger-roger","codex"]' >> "$GITHUB_OUTPUT"
-          fi
-
-  e2e-tests:
-    needs: matrix-setup
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    permissions:
-      actions: read
-      contents: read
-      copilot-requests: write
-    strategy:
-      fail-fast: false
-      matrix:
-        agent: ${{ fromJson(needs.matrix-setup.outputs.agents) }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Setup mise
-        uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4
-
-      - name: Install system dependencies
-        run: sudo apt-get update && sudo apt-get install -y tmux
-
-      - name: Install agent CLI
-        run: |
-          case "${{ matrix.agent }}" in
-            claude-code) curl -fsSL https://claude.ai/install.sh | bash ;;
-            opencode)    curl -fsSL https://opencode.ai/install | bash ;;
-            gemini-cli)  npm install -g @google/gemini-cli ;;
-            codex)       npm install -g @openai/codex ;;
-            cursor-cli)  curl https://cursor.com/install -fsS | bash ;;
-            factoryai-droid) curl -fsSL https://app.factory.ai/cli | sh ;;
-            copilot-cli)  npm install -g @github/copilot  ;;
-            roger-roger) ;; # installed by mise (see mise.toml)
-          esac
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Verify roger-roger agent
-        if: matrix.agent == 'roger-roger'
-        run: |
-          set -euo pipefail
-          echo "Verifying roger-roger binaries on PATH..."
-          command -v roger-roger
-          command -v trace-agent-roger-roger
-
-      - name: Bootstrap agent
-        if: matrix.agent != 'roger-roger'
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
-          FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
-          COPILOT_GITHUB_TOKEN: ${{ github.token }}
-        run: go run ./e2e/bootstrap
-
-      - name: Run E2E Tests
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          E2E_CODEX_MODEL: ${{ matrix.agent == 'codex' && 'gpt-5.4-mini' || '' }}
-          CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
-          FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
-          COPILOT_GITHUB_TOKEN: ${{ github.token }}
-          E2E_CONCURRENT_TEST_LIMIT: ${{ matrix.agent == 'gemini-cli' && '6' || matrix.agent == 'factoryai-droid' && '1' || '' }}
-        run: mise run test:e2e --agent ${{ matrix.agent }} ${{ matrix.agent == 'roger-roger' && 'TestExternalAgent' || '' }}
-
-      - name: Upload artifacts
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: e2e-artifacts-${{ matrix.agent }}
-          path: e2e/artifacts/
-          retention-days: 7
-
-  e2e-windows:
-    uses: ./.github/workflows/e2e-windows.yml
-    secrets: inherit
-
-  notify-slack:
-    runs-on: ubuntu-latest
-    needs: [e2e-tests, e2e-windows]
-    if: ${{ always() && (needs.e2e-tests.result == 'failure' || needs.e2e-windows.result == 'failure') && github.event_name == 'push' }}
-    steps:
-      - name: Get failed agents
-        id: failed
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          failed=$(gh api repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs \
-            --jq '[.jobs[] | select(.conclusion == "failure") | .name | if test("\\(") then capture("\\((?<agent>[^)]+)\\)") | .agent else . end] | join(", ")')
-          echo "agents=$failed" >> "$GITHUB_OUTPUT"
-
-      - name: Notify Slack of E2E failure
-        uses: slackapi/slack-github-action@45a88b9581bfab2566dc881e2cd66d334e621e2c # v3.0.3
-        with:
-          webhook: ${{ secrets.E2E_SLACK_WEBHOOK_URL }}
-          webhook-type: incoming-webhook
-          payload: |
-            {
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": ":red_circle: *E2E Tests Failed* on `main`\n\nFailed agents: *${{ steps.failed.outputs.agents }}*\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View run details>"
-                  }
-                },
-                {
-                  "type": "context",
-                  "elements": [
-                    {
-                      "type": "mrkdwn",
-                      "text": "Commit: <${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}> by ${{ github.actor }}"
-                    }
-                  ]
-                }
-              ]
-            }
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
deleted file mode 100644
index b8ddebe..0000000
--- a/.github/workflows/nightly.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Nightly Release
-
-on:
-  schedule:
-    - cron: "0 6 * * *" # 06:00 UTC daily
-  workflow_dispatch:
-
-permissions:
-  contents: write
-
-concurrency:
-  group: nightly-release-${{ github.ref }}
-  cancel-in-progress: true
-jobs:
-  create-nightly-tag:
-    runs-on: ubuntu-latest
-    env:
-      HOMEBREW_TAP_APP_ID: ${{ secrets.HOMEBREW_TAP_APP_ID }}
-      HOMEBREW_TAP_APP_PRIVATE_KEY: ${{ secrets.HOMEBREW_TAP_APP_PRIVATE_KEY }}
-    steps:
-      - name: Generate token
-        id: app-token
-        if: ${{ env.HOMEBREW_TAP_APP_ID != '' && env.HOMEBREW_TAP_APP_PRIVATE_KEY != '' }}
-        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
-        with:
-          client-id: ${{ secrets.HOMEBREW_TAP_APP_ID }}
-          private-key: ${{ secrets.HOMEBREW_TAP_APP_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-          repositories: ${{ github.event.repository.name }}
-
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          fetch-depth: 0
-          token: ${{ steps.app-token.outputs.token || github.token }}
-
-      - name: Create nightly tag
-        run: |
-          TAG=$(scripts/create-nightly-tag.sh) && EXIT_CODE=0 || EXIT_CODE=$?
-          if [ "$EXIT_CODE" -eq 2 ]; then
-            echo "Skipping — no new nightly needed."
-            exit 0
-          elif [ "$EXIT_CODE" -ne 0 ] || [ -z "$TAG" ]; then
-            echo "::error::Failed to generate nightly tag"
-            exit 1
-          fi
-          git tag "$TAG"
-          git push origin "$TAG"
diff --git a/.gitignore b/.gitignore
index 96da6ea..ae8db96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Binaries
 /trace
+bin/
 *.exe
 *.dll
 *.so
@@ -14,3 +15,6 @@ codegraph.db
 # Bailiwick-style runtime artifacts
 *.bailiwick
 coverage.out
+
+# macOS
+.DS_Store
diff --git a/.golangci.strict.yaml b/.golangci.strict.yaml
index 9f50dd3..aae9fcd 100644
--- a/.golangci.strict.yaml
+++ b/.golangci.strict.yaml
@@ -72,9 +72,10 @@ linters:
         - G702 # command injection via taint - controlled CLI inputs
         - G705 # XSS not applicable to CLI stderr output
     dupl:
-      # Token threshold for duplication detection
-      # Lower = more sensitive (catches smaller duplicates)
-      # Default is 150. We use 75 for lint (blocks CI), `mise run dup` uses 50 (advisory)
+      # Token threshold for duplication detection.
+      # Lower = more sensitive (catches smaller duplicates).
+      # Default is 150. We use 75 for lint (blocks CI); `mise run dup` uses 50 (advisory).
+      threshold: 75
     goconst:
       min-occurrences: 6
     perfsprint:
@@ -82,7 +83,6 @@ linters:
       errorf: true
       sprintf1: true
       strconcat: false
-      threshold: 75
     errcheck:
       check-type-assertions: true
       check-blank: true
@@ -110,16 +110,15 @@ linters:
         - empty
         - stdlib
         - grpc.DialOption
-        - github.com/GrayCodeAI/trace/cmd/trace/cli/summarize.Generator
-        - github.com/GrayCodeAI/trace/cmd/trace/cli/agent\..+
-        - github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint.CommittedReader
-        - github.com/GrayCodeAI/trace/cmd/trace/cli/strategy.Strategy
+        - github.com/GrayCodeAI/trace/cli/summarize.Generator
+        - github.com/GrayCodeAI/trace/cli/agent\..+
+        - github.com/GrayCodeAI/trace/cli/checkpoint.CommittedReader
+        - github.com/GrayCodeAI/trace/cli/strategy.Strategy
         - github.com/go-git/go-git/v6/x/plugin.Signer
         - github.com/go-git/go-git/v6/plumbing/storer.ReferenceIter
         - github.com/go-git/go-git/v6/plumbing.EncodedObject
         - github.com/go-git/go-git/v6/storage.Storer
         - github.com/go-git/go-git/v6/plumbing/storer.EncodedObjectIter
-        - github.com/GrayCodeAI/trace/e2e/agents.Session
         - github.com/go-git/go-billy/v6.Filesystem
         - golang.org/x/crypto/ssh/agent.Agent
     nolintlint:
@@ -159,7 +158,7 @@ linters:
       - path: ^internal/sim/
         linters:
           - wrapcheck
-      - path: ^cmd/trace/cli/benchutil/
+      - path: ^cli/benchutil/
         linters:
           - usetesting
       - text: "`strat` is a misspelling"
diff --git a/.golangci.yml b/.golangci.yml
index e544d89..10c9c12 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -62,11 +62,7 @@ linters:
           - bodyclose
           - errcheck
           - unused
-      - path: cmd/
-        linters:
-          - errcheck
-          - noctx
-      - path: e2e/
+      - path: cli/
         linters:
           - errcheck
           - noctx
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
deleted file mode 100644
index 7b24cd4..0000000
--- a/.goreleaser.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
-# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
-version: 2
-pro: true
-
-before:
-  hooks:
-    - go mod tidy
-    - mise run completions
-
-builds:
-  - main: ./cmd/trace
-    binary: trace
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - darwin
-      - linux
-      - windows
-    goarch:
-      - amd64
-      - arm64
-    ldflags:
-      - -s -w
-      - -X github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo.Version={{.Version}}
-      - -X github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo.Commit={{.ShortCommit}}
-      - -X github.com/GrayCodeAI/trace/cmd/trace/cli/telemetry.PostHogAPIKey={{.Env.POSTHOG_API_KEY}}
-      - -X github.com/GrayCodeAI/trace/cmd/trace/cli/telemetry.PostHogEndpoint={{.Env.POSTHOG_ENDPOINT}}
-
-notarize:
-  macos:
-    - enabled: '{{ isEnvSet "MACOS_SIGN_P12" }}'
-      sign:
-        certificate: "{{.Env.MACOS_SIGN_P12}}"
-        password: "{{.Env.MACOS_SIGN_PASSWORD}}"
-      notarize:
-        issuer_id: "{{.Env.MACOS_NOTARY_ISSUER_ID}}"
-        key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}"
-        key: "{{.Env.MACOS_NOTARY_KEY}}"
-        wait: true # do not let an unusable binary slip into the wild
-
-archives:
-  - formats:
-      - tar.gz
-    format_overrides:
-      - goos: windows
-        formats:
-          - zip
-    name_template: "trace_{{ .Os }}_{{ .Arch }}"
-    files:
-      - src: completions/*
-        info:
-          owner: root
-          group: root
-          mtime: "{{ .CommitDate }}"
-      - src: LICENSE
-        info:
-          owner: root
-          group: root
-          mtime: "{{ .CommitDate }}"
-      - src: README.md
-        info:
-          owner: root
-          group: root
-          mtime: "{{ .CommitDate }}"
-
-checksum:
-  name_template: "checksums.txt"
-
-release:
-  prerelease: auto
-
-scoops:
-  - repository:
-      owner: GrayCodeAI
-      name: scoop-bucket
-      token: "{{ .Env.TAP_GITHUB_TOKEN }}"
-    homepage: "https://github.com/GrayCodeAI/trace"
-    description: "CLI for Trace"
-    license: MIT
-    skip_upload: auto
-
-homebrew_casks:
-  - name: trace
-    repository:
-      owner: GrayCodeAI
-      name: homebrew-tap
-      token: "{{ .Env.TAP_GITHUB_TOKEN }}"
-    directory: Casks
-    homepage: "https://github.com/GrayCodeAI/trace"
-    description: "CLI for Trace"
-    binaries:
-      - trace
-    generate_completions_from_executable:
-      executable: trace
-      shell_parameter_format: cobra
-      shells:
-        - bash
-        - zsh
-        - fish
-    conflicts:
-      - cask: trace@nightly
-    skip_upload: auto
-
-  - name: trace@nightly
-    repository:
-      owner: GrayCodeAI
-      name: homebrew-tap
-      token: "{{ .Env.TAP_GITHUB_TOKEN }}"
-    directory: Casks
-    homepage: "https://github.com/GrayCodeAI/trace"
-    description: "CLI for Trace (nightly build)"
-    binaries:
-      - trace
-    generate_completions_from_executable:
-      executable: trace
-      shell_parameter_format: cobra
-      shells:
-        - bash
-        - zsh
-        - fish
-    conflicts:
-      - cask: trace
-    skip_upload: "{{ if not .Prerelease }}true{{ end }}"
-
-announce:
-  discord:
-    enabled: '{{ and (not .Prerelease) (isEnvSet "DISCORD_WEBHOOK_ID") (isEnvSet "DISCORD_WEBHOOK_TOKEN") }}'
-    message_template: "Beep, boop. **Trace CLI {{ .Tag }}** is out!\n\n{{ .ReleaseURL }}\n\nSee https://docs.trace.io/cli/installation for help installing and updating."
-    author: "Trace"
diff --git a/AGENTS.md b/AGENTS.md
index 573b8b8..fbab923 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -20,12 +20,11 @@ gofumpt -w .                     # Format
 
 ## Architecture
 
-- `capture.go` — Session capture engine (hooks into git)
-- `session.go` — Session data model and storage
-- `replay.go` — Session reconstruction and replay
-- `search.go` — Full-text search across sessions
-- `cmd/` — CLI commands (capture, list, search, replay, investigate)
-- `internal/agentlaunch/` — Agent launch detection and tracking
+- `cli/` — the cobra command tree (capture, list, search, replay, investigate, …),
+  built by `cli.NewRootCmd()` and mounted by Hawk as `hawk trace ...`
+- `redact/` — secret/PII detection and redaction
+- `internal/` — private support packages (git ops, agent launch tracking, etc.)
+- `perf/` — performance benchmarks
 
 ## Conventions
 
@@ -44,63 +43,52 @@ gofumpt -w .                     # Format
 
 ## Naming Conventions
 
-- **CLI commands use cobra**: `cmd/trace/` contains the CLI root and subcommands
-- **Types are domain nouns**: `CodeGraphSnapshot`, `GraphStats`, `SymbolInfo`, `ModuleInfo`, `ComplexityMetrics`, `GraphDelta`
-- **Snapshot store methods**: `Save()`, `Load()`, `CompareSnapshots()` — imperative verbs for operations
-- **Error sentinels**: `ErrNoSnapshots` — `Err` prefix, package-level `var` with `errors.New()`
+- **CLI commands use cobra**: `cli/` contains the command root (`NewRootCmd`) and subcommands
+- **Error sentinels**: `Err` prefix, package-level `var` with `errors.New()`
 - **JSON tags on all exported fields**: `json:"timestamp"`, `json:"session_id"` — snake_case in JSON, CamelCase in Go
 - **Time formatting**: use `time.RFC3339` for display, `"20060102_150405"` for filenames
 - **Redaction package**: `redact/` handles secret detection — pattern names use `Pattern` suffix: `secretPattern`, `credentialedURIPattern`
 
 ## API Patterns
 
+- **Library, not a binary**: trace ships inside Hawk; there is no standalone `trace` binary
 - **Git-native storage**: sessions stored as git objects on `trace/checkpoints/v1` orphan branch — never on the working branch
-- **SnapshotStore pattern**: `NewSnapshotStore(path)` returns a store with `Save()` and `Load()` methods
-- **CompareSnapshots()**: standalone function, not a method — takes two `*CodeGraphSnapshot` pointers, returns `*GraphDelta`
-- **FormatSnapshot()**: standalone function returning markdown string — display formatting separated from data
-- **Placeholder I/O functions**: `writeFile()`, `listFiles()`, `readFile()` are stubs — implement with actual file I/O
 - **Config in `.trace/` directory**: `settings.json` (committed) + `settings.local.json` (gitignored)
 - **Redaction is multi-layered**: entropy-based (`entropyThreshold = 4.5`), pattern-based (JWT, base64, DB URIs), keyword-based (password, secret)
-- **Mise-based dev tooling**: `mise.toml` defines tasks — `mise run build`, `mise run test`, `mise run test:ci`
+- **Mise-based dev tooling**: `mise.toml` defines tasks — `mise run test`, `mise run test:ci`, `mise run lint`
 
 ## Testing Patterns
 
-- **Integration tests in `e2e/` directory**: separate from unit tests, test full agent session flows
+- **Integration tests**: `cli/integration_test/` (build tag `integration`) — full command flows
 - **Nilnil pattern**: agent launch functions return `(T, error)` where both can be nil — test with explicit nil checks
 - **Git-dependent tests**: some tests need a real git repo — use `t.TempDir()` + `git init` for isolation
 - **Redaction tests**: `redact/redact_test.go` tests secret detection patterns — cover entropy edge cases, placeholder exclusion
 - **Bench tests**: `redact/redact_bench_test.go` — performance-critical path, benchmark before changing regex patterns
-- **Snapshot tests**: test `Save()`/`Load()` roundtrip with `json.MarshalIndent` — verify timestamp formatting
-- **Delta comparison tests**: create two snapshots, verify `CompareSnapshots()` produces correct `GraphDelta`
 - **Perfsprint linter**: enforced in CI — `errors.New(fmt.Sprintf(...))` must be `fmt.Errorf(...)` instead
 
 ## Refactoring Guidelines
 
-- **Safe to refactor**: `FormatSnapshot()` — display-only, no data contract
-- **Safe to refactor**: `CompareSnapshots()` — internal comparison logic, extend with new delta fields
 - **Safe to refactor**: redaction patterns in `redact/` — add new patterns, tune entropy threshold
-- **Safe to refactor**: CLI commands in `cmd/trace/` — cobra command structure, add subcommands freely
-- **Do not touch**: `CodeGraphSnapshot` struct field names/tags — JSON serialization contract for stored snapshots
+- **Safe to refactor**: commands in `cli/` — cobra command structure, add subcommands freely
 - **Do not touch**: `trace/checkpoints/v1` branch name — hardcoded in consumers and git hooks
 - **Do not touch**: `.trace/settings.json` schema — committed config, changing breaks existing repos
-- **When adding agents**: update `cmd/trace/cli/agent/` — each agent has its own integration file
+- **Do not touch**: the `cli` package import path — Hawk imports `github.com/GrayCodeAI/trace/cli`
+- **When adding agents**: update `cli/agent/` — each agent has its own integration file
 - **When adding redaction patterns**: add to `redact/redact.go` with corresponding test in `redact/redact_test.go`
 
 ## Key File Locations
 
 | What | Where |
 |---|---|
-| Code graph snapshot types | `codegraph_snapshot.go` (`CodeGraphSnapshot`, `GraphStats`, `GraphDelta`) |
-| CLI entry point | `cmd/trace/main.go` |
-| CLI commands | `cmd/trace/cli/` (enable, disable, status, checkpoint, session, agent, doctor) |
+| Command tree root | `cli/` (`NewRootCmd`); mounted by Hawk as `hawk trace ...` |
+| CLI commands | `cli/` (enable, disable, status, checkpoint, session, agent, doctor) |
 | Secret redaction | `redact/redact.go` (entropy, patterns, DB URIs, JWT, base64) |
 | Redaction pattern packs | `redact/packs.go` (vendor-specific patterns) |
 | PII detection | `redact/pii.go` |
 | Custom redaction rules | `redact/custom.go` |
-| Agent launch detection | `internal/agentlaunch/` |
-| Session capture engine | `capture.go` (if exists at root) |
+| Agent launch detection | `internal/` subpackages |
 | Git operations | `internal/` subdirectories |
-| E2E test suite | `e2e/` directory |
+| Integration tests | `cli/integration_test/` (build tag `integration`) |
 | Perf benchmarks | `perf/` directory |
 | Mise task definitions | `mise.toml` |
 | Docs | `docs/` (investigate command, security, privacy) |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45c10c9..a863797 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ Format based on [Keep a Changelog](https://keepachangelog.com/). This project ad
 
 ### Changed
 - **Version re-baselined to `0.1.0`** in
-  `cmd/trace/cli/versioninfo/versioninfo.go`. Aligns trace with the rest
+  `cli/versioninfo/versioninfo.go`. Aligns trace with the rest
   of the hawk-eco ecosystem (`hawk`, `tok`, `eyrie`, `yaad`, `sight`,
   `inspect`).
 
diff --git a/README.md b/README.md
index 24f43ab..840d777 100644
--- a/README.md
+++ b/README.md
@@ -44,25 +44,27 @@ Trace hooks into your Git workflow to capture AI agent sessions as you work. Ses
 
 ## Quick Start
 
-Trace is designed to ship inside the **Hawk** binary (in development — no public Hawk install yet).
+Trace is a **library**, not a standalone binary. Its full command tree is built by
+`cli.NewRootCmd()` and surfaced inside the **Hawk** CLI as `hawk trace ...` (Hawk is in
+development — no public install yet). There is no separate `trace` binary to install.
 
-**Contributors — from source:**
+**Contributors — build/test the library from source:**
 
 ```bash
 git clone https://github.com/GrayCodeAI/trace && cd trace
-go build -o trace ./cmd/trace
-# or: go install github.com/GrayCodeAI/trace/cmd/trace@latest
+go build ./...
+go test ./...
 ```
 
-When Hawk releases, use `hawk trace` (same binary as the standalone trace CLI).
+Once Hawk is available, use the commands under `hawk trace`:
 
 ```bash
 # Enable in your project
 cd your-project
-trace enable
+hawk trace enable
 
 # Check status
-trace status
+hawk trace status
 ```
 
 That's it. Trace runs silently in the background via Git hooks.
diff --git a/SECURITY.md b/SECURITY.md
index df6a581..685ad99 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -44,8 +44,8 @@ We follow [coordinated vulnerability disclosure](https://en.wikipedia.org/wiki/C
 
 ## Security practices in this repo
 
-- **Dependency monitoring:** automated via Dependabot (see
-  `.github/dependabot.yml`).
+- **Dependency monitoring:** vulnerable dependencies are detected by
+  `govulncheck`, which runs on every CI build (see "Vulnerability scanning").
 - **Static analysis:** `golangci-lint` / `ruff` / `mypy` enforced in CI.
 - **Vulnerability scanning:** `govulncheck` (Go) / `pip-audit` (Python) run
   on every CI build.
diff --git a/WINDOWS.md b/WINDOWS.md
index 2b3a8d7..a3c07b9 100644
--- a/WINDOWS.md
+++ b/WINDOWS.md
@@ -1,36 +1,9 @@
 # Windows Support
 
-Trace is fully supported on Windows 10+ with no external dependencies beyond Git.
-
----
-
-## Installation
-
-### Scoop (recommended)
-
-```powershell
-scoop bucket add trace https://github.com/GrayCodeAI/scoop-bucket.git
-scoop install trace
-```
-
-### Go install
-
-```powershell
-go install github.com/GrayCodeAI/trace/cmd/trace@latest
-```
-
-### Build from source
-
-```powershell
-go build -o trace.exe ./cmd/trace/
-```
-
-Or cross-compile from macOS/Linux:
-
-```bash
-mise run build:windows        # amd64
-mise run build:windows-arm64  # arm64
-```
+Trace is a library consumed by **Hawk**; its Windows behaviour is exercised through the
+`hawk trace ...` commands. The trace packages are fully supported on Windows 10+ with no
+external dependencies beyond Git. This document covers the Windows-specific platform code in
+the library.
 
 ---
 
@@ -38,50 +11,31 @@ mise run build:windows-arm64  # arm64
 
 - **Windows 10 1809+** (ConPTY support)
 - **Git for Windows** (provides `git.exe` + bundled bash for hooks)
-- **Go 1.26+** (for building from source)
+- **Go 1.26+** (for building/testing from source)
 
 ---
 
-## Usage
-
-All commands work identically to macOS/Linux:
-
-```powershell
-cd your-project
-trace enable
-trace status
-```
-
----
-
-## How Hooks Work
+## Hooks on Windows
 
 | Hook type | Mechanism |
 |---|---|
 | Git hooks | `#!/bin/sh` via Git for Windows MSYS2 bash |
-| Agent hooks | JSON config, agents call `trace.exe` directly |
+| Agent hooks | JSON config; agents invoke the hawk binary directly |
 
 No batch file wrappers needed.
 
 ---
 
-## Testing
+## Testing the library on Windows
 
 ```powershell
 # Unit tests
 go test ./...
 
 # Integration tests
-go test -tags=integration ./cmd/trace/cli/integration_test/...
-
-# E2E tests
-set E2E_TRACE_BIN=trace.exe
-set E2E_AGENT=claude-code
-go test -tags=e2e -count=1 -timeout=30m ./e2e/tests/...
+go test -tags=integration ./cli/integration_test/...
 ```
 
-E2E uses native ConPTY — no tmux required.
-
 ---
 
 ## Platform Architecture
@@ -89,8 +43,7 @@ E2E uses native ConPTY — no tmux required.
 | File | Purpose |
 |---|---|
 | `telemetry/detached_windows.go` | Process groups via `CREATE_NEW_PROCESS_GROUP` |
-| `integration_test/procattr_windows.go` | Test process detachment |
-| `e2e/agents/pty_session_windows.go` | Interactive sessions via ConPTY |
+| `cli/integration_test/procattr_windows.go` | Test process detachment |
 
 ### Cross-platform patterns
 
@@ -113,11 +66,10 @@ E2E uses native ConPTY — no tmux required.
 
 ## Smoke Test
 
-After building, verify:
+Via the `hawk` CLI on Windows, verify:
 
-1. `trace.exe version`
-2. `trace.exe enable` in a git repo
-3. Start agent session, make changes
-4. `git commit -m "test"` — hooks fire
-5. `trace checkpoint rewind` — shows checkpoints
-6. `trace checkpoint explain` — pager works
+1. `hawk trace enable` in a git repo
+2. Start agent session, make changes
+3. `git commit -m "test"` — hooks fire
+4. `hawk trace checkpoint rewind` — shows checkpoints
+5. `hawk trace checkpoint explain` — pager works
diff --git a/bin/trace b/bin/trace
deleted file mode 100755
index 58d064c..0000000
Binary files a/bin/trace and /dev/null differ
diff --git a/cmd/trace/cli/activity_cmd.go b/cli/activity_cmd.go
similarity index 98%
rename from cmd/trace/cli/activity_cmd.go
rename to cli/activity_cmd.go
index f97a3d9..58462a0 100644
--- a/cmd/trace/cli/activity_cmd.go
+++ b/cli/activity_cmd.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/interactive"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
 )
diff --git a/cmd/trace/cli/activity_cmd_test.go b/cli/activity_cmd_test.go
similarity index 100%
rename from cmd/trace/cli/activity_cmd_test.go
rename to cli/activity_cmd_test.go
diff --git a/cmd/trace/cli/activity_render.go b/cli/activity_render.go
similarity index 100%
rename from cmd/trace/cli/activity_render.go
rename to cli/activity_render.go
diff --git a/cmd/trace/cli/activity_render_test.go b/cli/activity_render_test.go
similarity index 100%
rename from cmd/trace/cli/activity_render_test.go
rename to cli/activity_render_test.go
diff --git a/cmd/trace/cli/activity_tui.go b/cli/activity_tui.go
similarity index 99%
rename from cmd/trace/cli/activity_tui.go
rename to cli/activity_tui.go
index 11da010..7ebbcda 100644
--- a/cmd/trace/cli/activity_tui.go
+++ b/cli/activity_tui.go
@@ -12,7 +12,7 @@ import (
 	"charm.land/bubbles/v2/viewport"
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 // activityDataMsg is sent when API data has been fetched.
diff --git a/cmd/trace/cli/activity_tui_test.go b/cli/activity_tui_test.go
similarity index 100%
rename from cmd/trace/cli/activity_tui_test.go
rename to cli/activity_tui_test.go
diff --git a/cmd/trace/cli/activity_types.go b/cli/activity_types.go
similarity index 100%
rename from cmd/trace/cli/activity_types.go
rename to cli/activity_types.go
diff --git a/cmd/trace/cli/agent/agent.go b/cli/agent/agent.go
similarity index 99%
rename from cmd/trace/cli/agent/agent.go
rename to cli/agent/agent.go
index 4e790e3..0de1874 100644
--- a/cmd/trace/cli/agent/agent.go
+++ b/cli/agent/agent.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"os/exec"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 // Agent defines the interface for interacting with a coding agent.
diff --git a/cmd/trace/cli/agent/agent_test.go b/cli/agent/agent_test.go
similarity index 99%
rename from cmd/trace/cli/agent/agent_test.go
rename to cli/agent/agent_test.go
index 657ea0d..c56219d 100644
--- a/cmd/trace/cli/agent/agent_test.go
+++ b/cli/agent/agent_test.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 const (
diff --git a/cmd/trace/cli/agent/architecture_test.go b/cli/agent/architecture_test.go
similarity index 97%
rename from cmd/trace/cli/agent/architecture_test.go
rename to cli/agent/architecture_test.go
index b157ade..961f01b 100644
--- a/cmd/trace/cli/agent/architecture_test.go
+++ b/cli/agent/architecture_test.go
@@ -25,7 +25,7 @@ import (
 func TestAgentPackages_NoForbiddenImports(t *testing.T) {
 	t.Parallel()
 
-	const repoPrefix = "github.com/GrayCodeAI/trace/cmd/trace/cli/"
+	const repoPrefix = "github.com/GrayCodeAI/trace/cli/"
 
 	// Packages that agent implementations must NOT import.
 	// These are framework internals that agents should be decoupled from.
@@ -39,7 +39,7 @@ func TestAgentPackages_NoForbiddenImports(t *testing.T) {
 	// Individual files in the cli package that agents must not depend on.
 	// We check for the cli package import itself since these are all in
 	// the top-level cli package (not sub-packages).
-	forbiddenCLIPackage := repoPrefix[:len(repoPrefix)-1] // "github.com/GrayCodeAI/trace/cmd/trace/cli"
+	forbiddenCLIPackage := repoPrefix[:len(repoPrefix)-1] // "github.com/GrayCodeAI/trace/cli"
 
 	// Packages within the repo that agents ARE allowed to import.
 	allowedPrefixes := []string{
@@ -109,7 +109,7 @@ func TestAgentPackages_NoForbiddenImports(t *testing.T) {
 	}
 }
 
-// findAgentDir returns the absolute path to cmd/trace/cli/agent/.
+// findAgentDir returns the absolute path to cli/agent/.
 // Go test runner sets cwd to the package directory, so os.Getwd() gives us
 // the agent dir directly.
 func findAgentDir(t *testing.T) string {
diff --git a/cmd/trace/cli/agent/capabilities.go b/cli/agent/capabilities.go
similarity index 100%
rename from cmd/trace/cli/agent/capabilities.go
rename to cli/agent/capabilities.go
diff --git a/cmd/trace/cli/agent/capabilities_test.go b/cli/agent/capabilities_test.go
similarity index 99%
rename from cmd/trace/cli/agent/capabilities_test.go
rename to cli/agent/capabilities_test.go
index c3adf23..a4e5c3d 100644
--- a/cmd/trace/cli/agent/capabilities_test.go
+++ b/cli/agent/capabilities_test.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 // --- Mock types for testing ---
diff --git a/cmd/trace/cli/agent/chunking.go b/cli/agent/chunking.go
similarity index 99%
rename from cmd/trace/cli/agent/chunking.go
rename to cli/agent/chunking.go
index f704db2..7b17a81 100644
--- a/cmd/trace/cli/agent/chunking.go
+++ b/cli/agent/chunking.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 const (
diff --git a/cmd/trace/cli/agent/chunking_test.go b/cli/agent/chunking_test.go
similarity index 99%
rename from cmd/trace/cli/agent/chunking_test.go
rename to cli/agent/chunking_test.go
index 1f269c7..dc2a562 100644
--- a/cmd/trace/cli/agent/chunking_test.go
+++ b/cli/agent/chunking_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 func TestChunkJSONL_SmallContent(t *testing.T) {
diff --git a/cmd/trace/cli/agent/claudecode/claude.go b/cli/agent/claudecode/claude.go
similarity index 98%
rename from cmd/trace/cli/agent/claudecode/claude.go
rename to cli/agent/claudecode/claude.go
index 3746c3f..c7c0a65 100644
--- a/cmd/trace/cli/agent/claudecode/claude.go
+++ b/cli/agent/claudecode/claude.go
@@ -14,10 +14,10 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 //nolint:gochecknoinits // Agent self-registration is the intended pattern
diff --git a/cmd/trace/cli/agent/claudecode/claude_test.go b/cli/agent/claudecode/claude_test.go
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/claude_test.go
rename to cli/agent/claudecode/claude_test.go
diff --git a/cmd/trace/cli/agent/claudecode/discovery.go b/cli/agent/claudecode/discovery.go
similarity index 98%
rename from cmd/trace/cli/agent/claudecode/discovery.go
rename to cli/agent/claudecode/discovery.go
index 9d36a0d..dd35b8a 100644
--- a/cmd/trace/cli/agent/claudecode/discovery.go
+++ b/cli/agent/claudecode/discovery.go
@@ -11,9 +11,9 @@ import (
 
 	"golang.org/x/mod/semver"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/skilldiscovery"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/skilldiscovery"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // DiscoverReviewSkills walks Claude Code's on-disk plugin layout and user-
diff --git a/cmd/trace/cli/agent/claudecode/discovery_test.go b/cli/agent/claudecode/discovery_test.go
similarity index 99%
rename from cmd/trace/cli/agent/claudecode/discovery_test.go
rename to cli/agent/claudecode/discovery_test.go
index dc02092..c636715 100644
--- a/cmd/trace/cli/agent/claudecode/discovery_test.go
+++ b/cli/agent/claudecode/discovery_test.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
 )
 
 // Compile-time pin: ClaudeCodeAgent must satisfy SkillDiscoverer.
diff --git a/cmd/trace/cli/agent/claudecode/error.go b/cli/agent/claudecode/error.go
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/error.go
rename to cli/agent/claudecode/error.go
diff --git a/cmd/trace/cli/agent/claudecode/error_test.go b/cli/agent/claudecode/error_test.go
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/error_test.go
rename to cli/agent/claudecode/error_test.go
diff --git a/cmd/trace/cli/agent/claudecode/generate.go b/cli/agent/claudecode/generate.go
similarity index 98%
rename from cmd/trace/cli/agent/claudecode/generate.go
rename to cli/agent/claudecode/generate.go
index 5df85f6..7b39014 100644
--- a/cmd/trace/cli/agent/claudecode/generate.go
+++ b/cli/agent/claudecode/generate.go
@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // GenerateText sends a prompt to the Claude CLI and returns the raw text response.
diff --git a/cmd/trace/cli/agent/claudecode/hooks.go b/cli/agent/claudecode/hooks.go
similarity index 89%
rename from cmd/trace/cli/agent/claudecode/hooks.go
rename to cli/agent/claudecode/hooks.go
index 1f72bba..5d79885 100644
--- a/cmd/trace/cli/agent/claudecode/hooks.go
+++ b/cli/agent/claudecode/hooks.go
@@ -8,15 +8,15 @@ import (
 	"path/filepath"
 	"slices"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // Ensure ClaudeCodeAgent implements HookSupport
 var _ agent.HookSupport = (*ClaudeCodeAgent)(nil)
 
-// Claude Code hook names - these become subcommands under `trace hooks claude-code`
+// Claude Code hook names - these become subcommands under `hawk trace hooks claude-code`
 const (
 	HookNameSessionStart     = "session-start"
 	HookNameSessionEnd       = "session-end"
@@ -34,8 +34,12 @@ const ClaudeSettingsFileName = "settings.json"
 // metadataDenyRule blocks Claude from reading Trace session metadata
 const metadataDenyRule = "Read(./.trace/metadata/**)"
 
-// traceHookPrefixes are command prefixes that identify Trace hooks (both old and new formats)
+// traceHookPrefixes are command prefixes that identify Trace hooks. Both the
+// current "hawk trace" forms and the legacy bare-"trace" / cmd/trace forms are
+// listed so previously-installed hooks are still recognised for upgrade/removal.
 var traceHookPrefixes = []string{
+	"hawk trace ",
+	"go run ${CLAUDE_PROJECT_DIR}/cmd/hawk trace ",
 	"trace ",
 	"go run ${CLAUDE_PROJECT_DIR}/cmd/trace/main.go ",
 }
@@ -114,21 +118,21 @@ func (c *ClaudeCodeAgent) InstallHooks(ctx context.Context, localDev bool, force
 	// Define hook commands
 	var sessionStartCmd, sessionEndCmd, stopCmd, userPromptSubmitCmd, preTaskCmd, postTaskCmd, postTodoCmd string
 	if localDev {
-		sessionStartCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/trace/main.go hooks claude-code session-start"
-		sessionEndCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/trace/main.go hooks claude-code session-end"
-		stopCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/trace/main.go hooks claude-code stop"
-		userPromptSubmitCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/trace/main.go hooks claude-code user-prompt-submit"
-		preTaskCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/trace/main.go hooks claude-code pre-task"
-		postTaskCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/trace/main.go hooks claude-code post-task"
-		postTodoCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/trace/main.go hooks claude-code post-todo"
+		sessionStartCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/hawk trace hooks claude-code session-start"
+		sessionEndCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/hawk trace hooks claude-code session-end"
+		stopCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/hawk trace hooks claude-code stop"
+		userPromptSubmitCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/hawk trace hooks claude-code user-prompt-submit"
+		preTaskCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/hawk trace hooks claude-code pre-task"
+		postTaskCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/hawk trace hooks claude-code post-task"
+		postTodoCmd = "go run ${CLAUDE_PROJECT_DIR}/cmd/hawk trace hooks claude-code post-todo"
 	} else {
-		sessionStartCmd = agent.WrapProductionJSONWarningHookCommand("trace hooks claude-code session-start", agent.WarningFormatMultiLine)
-		sessionEndCmd = agent.WrapProductionSilentHookCommand("trace hooks claude-code session-end")
-		stopCmd = agent.WrapProductionSilentHookCommand("trace hooks claude-code stop")
-		userPromptSubmitCmd = agent.WrapProductionSilentHookCommand("trace hooks claude-code user-prompt-submit")
-		preTaskCmd = agent.WrapProductionSilentHookCommand("trace hooks claude-code pre-task")
-		postTaskCmd = agent.WrapProductionSilentHookCommand("trace hooks claude-code post-task")
-		postTodoCmd = agent.WrapProductionSilentHookCommand("trace hooks claude-code post-todo")
+		sessionStartCmd = agent.WrapProductionJSONWarningHookCommand("hawk trace hooks claude-code session-start", agent.WarningFormatMultiLine)
+		sessionEndCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks claude-code session-end")
+		stopCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks claude-code stop")
+		userPromptSubmitCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks claude-code user-prompt-submit")
+		preTaskCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks claude-code pre-task")
+		postTaskCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks claude-code post-task")
+		postTodoCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks claude-code post-todo")
 	}
 
 	count := 0
diff --git a/cmd/trace/cli/agent/claudecode/hooks_test.go b/cli/agent/claudecode/hooks_test.go
similarity index 97%
rename from cmd/trace/cli/agent/claudecode/hooks_test.go
rename to cli/agent/claudecode/hooks_test.go
index b9bd904..5ea848d 100644
--- a/cmd/trace/cli/agent/claudecode/hooks_test.go
+++ b/cli/agent/claudecode/hooks_test.go
@@ -8,8 +8,8 @@ import (
 	"slices"
 	"testing"
 
-	agentpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/testutil"
+	agentpkg "github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/testutil"
 )
 
 // metadataDenyRuleTest is the rule that blocks Claude from reading Trace metadata
@@ -479,7 +479,7 @@ func TestInstallHooks_PreservesUserHooksOnSameType(t *testing.T) {
 			t.Fatalf("failed to parse Stop hooks: %v", err)
 		}
 		assertHookExists(t, matchers, "", "echo user stop hook", "user Stop hook")
-		assertHookExists(t, matchers, "", agentpkg.WrapProductionSilentHookCommand("trace hooks claude-code stop"), "Trace Stop hook")
+		assertHookExists(t, matchers, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks claude-code stop"), "Trace Stop hook")
 	})
 
 	t.Run("SessionStart", func(t *testing.T) {
@@ -489,7 +489,7 @@ func TestInstallHooks_PreservesUserHooksOnSameType(t *testing.T) {
 			t.Fatalf("failed to parse SessionStart hooks: %v", err)
 		}
 		assertHookExists(t, matchers, "", "echo user session start", "user SessionStart hook")
-		assertHookExists(t, matchers, "", agentpkg.WrapProductionJSONWarningHookCommand("trace hooks claude-code session-start", agentpkg.WarningFormatMultiLine), "Trace SessionStart hook")
+		assertHookExists(t, matchers, "", agentpkg.WrapProductionJSONWarningHookCommand("hawk trace hooks claude-code session-start", agentpkg.WarningFormatMultiLine), "Trace SessionStart hook")
 	})
 
 	t.Run("PostToolUse", func(t *testing.T) {
@@ -499,8 +499,8 @@ func TestInstallHooks_PreservesUserHooksOnSameType(t *testing.T) {
 			t.Fatalf("failed to parse PostToolUse hooks: %v", err)
 		}
 		assertHookExists(t, matchers, "Write", "echo user wrote file", "user Write hook")
-		assertHookExists(t, matchers, "Task", agentpkg.WrapProductionSilentHookCommand("trace hooks claude-code post-task"), "Trace Task hook")
-		assertHookExists(t, matchers, "TodoWrite", agentpkg.WrapProductionSilentHookCommand("trace hooks claude-code post-todo"), "Trace TodoWrite hook")
+		assertHookExists(t, matchers, "Task", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks claude-code post-task"), "Trace Task hook")
+		assertHookExists(t, matchers, "TodoWrite", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks claude-code post-todo"), "Trace TodoWrite hook")
 	})
 }
 
diff --git a/cmd/trace/cli/agent/claudecode/lifecycle.go b/cli/agent/claudecode/lifecycle.go
similarity index 98%
rename from cmd/trace/cli/agent/claudecode/lifecycle.go
rename to cli/agent/claudecode/lifecycle.go
index 4c9ad6b..f02fb1f 100644
--- a/cmd/trace/cli/agent/claudecode/lifecycle.go
+++ b/cli/agent/claudecode/lifecycle.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // Compile-time interface assertions for new interfaces.
diff --git a/cmd/trace/cli/agent/claudecode/lifecycle_test.go b/cli/agent/claudecode/lifecycle_test.go
similarity index 99%
rename from cmd/trace/cli/agent/claudecode/lifecycle_test.go
rename to cli/agent/claudecode/lifecycle_test.go
index efc8db5..ab3a7c0 100644
--- a/cmd/trace/cli/agent/claudecode/lifecycle_test.go
+++ b/cli/agent/claudecode/lifecycle_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/trace/cli/agent/claudecode/response.go b/cli/agent/claudecode/response.go
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/response.go
rename to cli/agent/claudecode/response.go
diff --git a/cmd/trace/cli/agent/claudecode/response_test.go b/cli/agent/claudecode/response_test.go
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/response_test.go
rename to cli/agent/claudecode/response_test.go
diff --git a/cmd/trace/cli/agent/claudecode/reviewer.go b/cli/agent/claudecode/reviewer.go
similarity index 94%
rename from cmd/trace/cli/agent/claudecode/reviewer.go
rename to cli/agent/claudecode/reviewer.go
index 7f95dae..7f247c1 100644
--- a/cmd/trace/cli/agent/claudecode/reviewer.go
+++ b/cli/agent/claudecode/reviewer.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // NewReviewer returns the AgentReviewer for claude-code.
diff --git a/cmd/trace/cli/agent/claudecode/reviewer_test.go b/cli/agent/claudecode/reviewer_test.go
similarity index 98%
rename from cmd/trace/cli/agent/claudecode/reviewer_test.go
rename to cli/agent/claudecode/reviewer_test.go
index 7aceabb..4e8f1d3 100644
--- a/cmd/trace/cli/agent/claudecode/reviewer_test.go
+++ b/cli/agent/claudecode/reviewer_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // Compile-time interface check: ReviewerTemplate implements AgentReviewer.
diff --git a/cmd/trace/cli/agent/claudecode/spawner.go b/cli/agent/claudecode/spawner.go
similarity index 90%
rename from cmd/trace/cli/agent/claudecode/spawner.go
rename to cli/agent/claudecode/spawner.go
index a649261..d320481 100644
--- a/cmd/trace/cli/agent/claudecode/spawner.go
+++ b/cli/agent/claudecode/spawner.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"os/exec"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
 )
 
 // claudeCodeSpawner produces argv: claude -p <prompt>; no stdin.
diff --git a/cmd/trace/cli/agent/claudecode/spawner_test.go b/cli/agent/claudecode/spawner_test.go
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/spawner_test.go
rename to cli/agent/claudecode/spawner_test.go
diff --git a/cmd/trace/cli/agent/claudecode/testdata/canned_session.txt b/cli/agent/claudecode/testdata/canned_session.txt
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/testdata/canned_session.txt
rename to cli/agent/claudecode/testdata/canned_session.txt
diff --git a/cmd/trace/cli/agent/claudecode/testdata/stream_session.jsonl b/cli/agent/claudecode/testdata/stream_session.jsonl
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/testdata/stream_session.jsonl
rename to cli/agent/claudecode/testdata/stream_session.jsonl
diff --git a/cmd/trace/cli/agent/claudecode/transcript.go b/cli/agent/claudecode/transcript.go
similarity index 99%
rename from cmd/trace/cli/agent/claudecode/transcript.go
rename to cli/agent/claudecode/transcript.go
index cfd08e2..aa8e348 100644
--- a/cmd/trace/cli/agent/claudecode/transcript.go
+++ b/cli/agent/claudecode/transcript.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // TranscriptLine is an alias to the shared transcript.Line type.
diff --git a/cmd/trace/cli/agent/claudecode/transcript_test.go b/cli/agent/claudecode/transcript_test.go
similarity index 99%
rename from cmd/trace/cli/agent/claudecode/transcript_test.go
rename to cli/agent/claudecode/transcript_test.go
index 03a9159..02dd4c9 100644
--- a/cmd/trace/cli/agent/claudecode/transcript_test.go
+++ b/cli/agent/claudecode/transcript_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 func TestParseTranscript(t *testing.T) {
diff --git a/cmd/trace/cli/agent/claudecode/types.go b/cli/agent/claudecode/types.go
similarity index 100%
rename from cmd/trace/cli/agent/claudecode/types.go
rename to cli/agent/claudecode/types.go
diff --git a/cmd/trace/cli/agent/codex/AGENT.md b/cli/agent/codex/AGENT.md
similarity index 100%
rename from cmd/trace/cli/agent/codex/AGENT.md
rename to cli/agent/codex/AGENT.md
diff --git a/cmd/trace/cli/agent/codex/codex.go b/cli/agent/codex/codex.go
similarity index 98%
rename from cmd/trace/cli/agent/codex/codex.go
rename to cli/agent/codex/codex.go
index 72e6559..777bbf8 100644
--- a/cmd/trace/cli/agent/codex/codex.go
+++ b/cli/agent/codex/codex.go
@@ -11,9 +11,9 @@ import (
 	"sort"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/validation"
 )
 
 //nolint:gochecknoinits // Agent self-registration is the intended pattern
diff --git a/cmd/trace/cli/agent/codex/codex_test.go b/cli/agent/codex/codex_test.go
similarity index 97%
rename from cmd/trace/cli/agent/codex/codex_test.go
rename to cli/agent/codex/codex_test.go
index 2d8a197..b9c8806 100644
--- a/cmd/trace/cli/agent/codex/codex_test.go
+++ b/cli/agent/codex/codex_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/trace/cli/agent/codex/discovery.go b/cli/agent/codex/discovery.go
similarity index 88%
rename from cmd/trace/cli/agent/codex/discovery.go
rename to cli/agent/codex/discovery.go
index ccbf995..dbc4e3b 100644
--- a/cmd/trace/cli/agent/codex/discovery.go
+++ b/cli/agent/codex/discovery.go
@@ -3,7 +3,7 @@ package codex
 import (
 	"context"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // DiscoverReviewSkills is a stub until the Codex on-disk plugin layout is
diff --git a/cmd/trace/cli/agent/codex/discovery_test.go b/cli/agent/codex/discovery_test.go
similarity index 81%
rename from cmd/trace/cli/agent/codex/discovery_test.go
rename to cli/agent/codex/discovery_test.go
index b1c01b1..d2bb164 100644
--- a/cmd/trace/cli/agent/codex/discovery_test.go
+++ b/cli/agent/codex/discovery_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/codex"
 )
 
 // Compile-time pin: CodexAgent must satisfy SkillDiscoverer.
diff --git a/cmd/trace/cli/agent/codex/generate.go b/cli/agent/codex/generate.go
similarity index 91%
rename from cmd/trace/cli/agent/codex/generate.go
rename to cli/agent/codex/generate.go
index 408db1b..68f6e04 100644
--- a/cmd/trace/cli/agent/codex/generate.go
+++ b/cli/agent/codex/generate.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // GenerateText sends a prompt to the Codex CLI and returns the raw text response.
diff --git a/cmd/trace/cli/agent/codex/hooks.go b/cli/agent/codex/hooks.go
similarity index 96%
rename from cmd/trace/cli/agent/codex/hooks.go
rename to cli/agent/codex/hooks.go
index e3065b7..b5a867b 100644
--- a/cmd/trace/cli/agent/codex/hooks.go
+++ b/cli/agent/codex/hooks.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // HooksFileName is the hooks config file used by Codex.
@@ -18,6 +18,8 @@ const HooksFileName = "hooks.json"
 
 // traceHookPrefixes identifies Trace hook commands.
 var traceHookPrefixes = []string{
+	"hawk trace ",
+	`go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace `,
 	"trace ",
 	`go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go `,
 }
@@ -74,9 +76,9 @@ func (c *CodexAgent) InstallHooks(ctx context.Context, localDev bool, force bool
 	// Build hook commands
 	var cmdPrefix string
 	if localDev {
-		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks codex `
+		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks codex `
 	} else {
-		cmdPrefix = "trace hooks codex "
+		cmdPrefix = "hawk trace hooks codex "
 	}
 	sessionStartCmd := cmdPrefix + "session-start"
 	if !localDev {
diff --git a/cmd/trace/cli/agent/codex/hooks_test.go b/cli/agent/codex/hooks_test.go
similarity index 93%
rename from cmd/trace/cli/agent/codex/hooks_test.go
rename to cli/agent/codex/hooks_test.go
index 3eb311b..bdb0e5b 100644
--- a/cmd/trace/cli/agent/codex/hooks_test.go
+++ b/cli/agent/codex/hooks_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	agentpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	agentpkg "github.com/GrayCodeAI/trace/cli/agent"
 	"github.com/stretchr/testify/require"
 )
 
@@ -37,9 +37,9 @@ func TestInstallHooks_CreatesConfig(t *testing.T) {
 	var hooksFile HooksFile
 	require.NoError(t, json.Unmarshal(data, &hooksFile))
 
-	assertHookCommand(t, hooksFile.Hooks.SessionStart, agentpkg.WrapProductionJSONWarningHookCommand("trace hooks codex session-start", agentpkg.WarningFormatSingleLine), "SessionStart")
-	assertHookCommand(t, hooksFile.Hooks.UserPromptSubmit, agentpkg.WrapProductionSilentHookCommand("trace hooks codex user-prompt-submit"), "UserPromptSubmit")
-	assertHookCommand(t, hooksFile.Hooks.Stop, agentpkg.WrapProductionSilentHookCommand("trace hooks codex stop"), "Stop")
+	assertHookCommand(t, hooksFile.Hooks.SessionStart, agentpkg.WrapProductionJSONWarningHookCommand("hawk trace hooks codex session-start", agentpkg.WarningFormatSingleLine), "SessionStart")
+	assertHookCommand(t, hooksFile.Hooks.UserPromptSubmit, agentpkg.WrapProductionSilentHookCommand("hawk trace hooks codex user-prompt-submit"), "UserPromptSubmit")
+	assertHookCommand(t, hooksFile.Hooks.Stop, agentpkg.WrapProductionSilentHookCommand("hawk trace hooks codex stop"), "Stop")
 
 	// Verify project-level config.toml enables codex_hooks feature (per-repo)
 	projectConfig := filepath.Join(tempDir, ".codex", configFileName)
@@ -74,7 +74,7 @@ func TestInstallHooks_LocalDev(t *testing.T) {
 	hooksPath := filepath.Join(tempDir, ".codex", HooksFileName)
 	data, err := os.ReadFile(hooksPath)
 	require.NoError(t, err)
-	require.Contains(t, string(data), `go run \"$(git rev-parse --show-toplevel)\"/cmd/trace/main.go hooks codex session-start`)
+	require.Contains(t, string(data), `go run \"$(git rev-parse --show-toplevel)\"/cmd/hawk trace hooks codex session-start`)
 }
 
 func TestInstallHooks_Force(t *testing.T) {
@@ -134,7 +134,7 @@ func TestUninstallHooks_PreservesUserHookContainingTraceSubstring(t *testing.T)
 	data, readErr := os.ReadFile(hooksPath)
 	require.NoError(t, readErr)
 	require.Contains(t, string(data), `echo \"the trace workflow finished\"`)
-	require.NotContains(t, string(data), "trace hooks codex stop")
+	require.NotContains(t, string(data), "hawk trace hooks codex stop")
 }
 
 func TestAreHooksInstalled_NoFile(t *testing.T) {
@@ -203,7 +203,7 @@ func TestInstallHooks_PreservesExistingHooksJSON(t *testing.T) {
 	data, err := os.ReadFile(filepath.Join(codexDir, HooksFileName))
 	require.NoError(t, err)
 	require.Contains(t, string(data), "my-custom-hook")
-	require.Contains(t, string(data), "trace hooks codex stop")
+	require.Contains(t, string(data), "hawk trace hooks codex stop")
 }
 
 func TestInstallHooks_ErrorsOnMalformedManagedHook(t *testing.T) {
diff --git a/cmd/trace/cli/agent/codex/lifecycle.go b/cli/agent/codex/lifecycle.go
similarity index 99%
rename from cmd/trace/cli/agent/codex/lifecycle.go
rename to cli/agent/codex/lifecycle.go
index 2895f8a..7bc6037 100644
--- a/cmd/trace/cli/agent/codex/lifecycle.go
+++ b/cli/agent/codex/lifecycle.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Compile-time interface assertions.
diff --git a/cmd/trace/cli/agent/codex/lifecycle_test.go b/cli/agent/codex/lifecycle_test.go
similarity index 99%
rename from cmd/trace/cli/agent/codex/lifecycle_test.go
rename to cli/agent/codex/lifecycle_test.go
index 5346f16..1fc975f 100644
--- a/cmd/trace/cli/agent/codex/lifecycle_test.go
+++ b/cli/agent/codex/lifecycle_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/trace/cli/agent/codex/output_filter.go b/cli/agent/codex/output_filter.go
similarity index 100%
rename from cmd/trace/cli/agent/codex/output_filter.go
rename to cli/agent/codex/output_filter.go
diff --git a/cmd/trace/cli/agent/codex/output_filter_test.go b/cli/agent/codex/output_filter_test.go
similarity index 99%
rename from cmd/trace/cli/agent/codex/output_filter_test.go
rename to cli/agent/codex/output_filter_test.go
index b194078..5f1ad97 100644
--- a/cmd/trace/cli/agent/codex/output_filter_test.go
+++ b/cli/agent/codex/output_filter_test.go
@@ -282,7 +282,7 @@ func TestStrip_DropsExecBlocksAndDuplicateSummary(t *testing.T) {
 		"exec",
 		`/bin/zsh -lc "git status --short" in /private/tmp/review-output-test`,
 		" succeeded in 0ms:",
-		" M cmd/trace/cli/review.go",
+		" M cli/review.go",
 		"",
 		"exec",
 		`/bin/zsh -lc "go test ./..." in /private/tmp/review-output-test`,
@@ -311,7 +311,7 @@ func TestStrip_DropsExecBlocksAndDuplicateSummary(t *testing.T) {
 		"workdir:",
 		"Please run these review skills",
 		"git status",
-		"cmd/trace/cli/review.go",
+		"cli/review.go",
 		"go test ./...",
 		"TestExample",
 		"tokens used",
diff --git a/cmd/trace/cli/agent/codex/reviewer.go b/cli/agent/codex/reviewer.go
similarity index 97%
rename from cmd/trace/cli/agent/codex/reviewer.go
rename to cli/agent/codex/reviewer.go
index 1ebb09e..8e7cd1a 100644
--- a/cmd/trace/cli/agent/codex/reviewer.go
+++ b/cli/agent/codex/reviewer.go
@@ -9,8 +9,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // NewReviewer returns the AgentReviewer for codex.
diff --git a/cmd/trace/cli/agent/codex/reviewer_test.go b/cli/agent/codex/reviewer_test.go
similarity index 98%
rename from cmd/trace/cli/agent/codex/reviewer_test.go
rename to cli/agent/codex/reviewer_test.go
index 02a1fa6..096c3a9 100644
--- a/cmd/trace/cli/agent/codex/reviewer_test.go
+++ b/cli/agent/codex/reviewer_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // Compile-time interface check: ReviewerTemplate implements AgentReviewer.
@@ -262,7 +262,7 @@ func TestCodexReviewer_EventStream(t *testing.T) {
 		"[hooks]",
 		"firing user-prompt-submit",
 		"git status",
-		"go test ./cmd/trace/cli/review",
+		"go test ./cli/review",
 		"TestExample",
 		"tokens used",
 	}
diff --git a/cmd/trace/cli/agent/codex/spawner.go b/cli/agent/codex/spawner.go
similarity index 92%
rename from cmd/trace/cli/agent/codex/spawner.go
rename to cli/agent/codex/spawner.go
index 89f2559..ac4223e 100644
--- a/cmd/trace/cli/agent/codex/spawner.go
+++ b/cli/agent/codex/spawner.go
@@ -5,8 +5,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
 )
 
 // codexSpawner produces argv:
diff --git a/cmd/trace/cli/agent/codex/spawner_test.go b/cli/agent/codex/spawner_test.go
similarity index 100%
rename from cmd/trace/cli/agent/codex/spawner_test.go
rename to cli/agent/codex/spawner_test.go
diff --git a/cmd/trace/cli/agent/codex/testdata/canned_exec.txt b/cli/agent/codex/testdata/canned_exec.txt
similarity index 100%
rename from cmd/trace/cli/agent/codex/testdata/canned_exec.txt
rename to cli/agent/codex/testdata/canned_exec.txt
diff --git a/cmd/trace/cli/agent/codex/testdata/json_session.jsonl b/cli/agent/codex/testdata/json_session.jsonl
similarity index 100%
rename from cmd/trace/cli/agent/codex/testdata/json_session.jsonl
rename to cli/agent/codex/testdata/json_session.jsonl
diff --git a/cmd/trace/cli/agent/codex/transcript.go b/cli/agent/codex/transcript.go
similarity index 99%
rename from cmd/trace/cli/agent/codex/transcript.go
rename to cli/agent/codex/transcript.go
index 3060e87..bc649e3 100644
--- a/cmd/trace/cli/agent/codex/transcript.go
+++ b/cli/agent/codex/transcript.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Compile-time interface assertions.
diff --git a/cmd/trace/cli/agent/codex/transcript_test.go b/cli/agent/codex/transcript_test.go
similarity index 100%
rename from cmd/trace/cli/agent/codex/transcript_test.go
rename to cli/agent/codex/transcript_test.go
diff --git a/cmd/trace/cli/agent/codex/trust.go b/cli/agent/codex/trust.go
similarity index 100%
rename from cmd/trace/cli/agent/codex/trust.go
rename to cli/agent/codex/trust.go
diff --git a/cmd/trace/cli/agent/codex/trust_test.go b/cli/agent/codex/trust_test.go
similarity index 100%
rename from cmd/trace/cli/agent/codex/trust_test.go
rename to cli/agent/codex/trust_test.go
diff --git a/cmd/trace/cli/agent/codex/types.go b/cli/agent/codex/types.go
similarity index 100%
rename from cmd/trace/cli/agent/codex/types.go
rename to cli/agent/codex/types.go
diff --git a/cmd/trace/cli/agent/copilotcli/AGENT.md b/cli/agent/copilotcli/AGENT.md
similarity index 99%
rename from cmd/trace/cli/agent/copilotcli/AGENT.md
rename to cli/agent/copilotcli/AGENT.md
index 0e79ff7..0eb73f0 100644
--- a/cmd/trace/cli/agent/copilotcli/AGENT.md
+++ b/cli/agent/copilotcli/AGENT.md
@@ -183,7 +183,7 @@ summary generation has been verified against the installed CLI.
 If a future Copilot release changes this, the error surface is clear — the
 generator helper returns either "CLI returned empty output" or a non-zero
 exit with stderr. At that point reverting to `-p <prompt>` with a prompt-size
-cap is the obvious fallback. See `cmd/trace/cli/agent/copilotcli/generate.go`
+cap is the obvious fallback. See `cli/agent/copilotcli/generate.go`
 for the implementation.
 
 ## Presence Detection
diff --git a/cmd/trace/cli/agent/copilotcli/compat.go b/cli/agent/copilotcli/compat.go
similarity index 100%
rename from cmd/trace/cli/agent/copilotcli/compat.go
rename to cli/agent/copilotcli/compat.go
diff --git a/cmd/trace/cli/agent/copilotcli/compat_test.go b/cli/agent/copilotcli/compat_test.go
similarity index 100%
rename from cmd/trace/cli/agent/copilotcli/compat_test.go
rename to cli/agent/copilotcli/compat_test.go
diff --git a/cmd/trace/cli/agent/copilotcli/copilotcli.go b/cli/agent/copilotcli/copilotcli.go
similarity index 98%
rename from cmd/trace/cli/agent/copilotcli/copilotcli.go
rename to cli/agent/copilotcli/copilotcli.go
index b3a979b..615ca1f 100644
--- a/cmd/trace/cli/agent/copilotcli/copilotcli.go
+++ b/cli/agent/copilotcli/copilotcli.go
@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 //nolint:gochecknoinits // Agent self-registration is the intended pattern
diff --git a/cmd/trace/cli/agent/copilotcli/copilotcli_test.go b/cli/agent/copilotcli/copilotcli_test.go
similarity index 99%
rename from cmd/trace/cli/agent/copilotcli/copilotcli_test.go
rename to cli/agent/copilotcli/copilotcli_test.go
index e35a435..c2c392f 100644
--- a/cmd/trace/cli/agent/copilotcli/copilotcli_test.go
+++ b/cli/agent/copilotcli/copilotcli_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // sampleTranscriptLines returns JSONL lines matching real Copilot CLI transcript format.
diff --git a/cmd/trace/cli/agent/copilotcli/generate.go b/cli/agent/copilotcli/generate.go
similarity index 94%
rename from cmd/trace/cli/agent/copilotcli/generate.go
rename to cli/agent/copilotcli/generate.go
index ec0d319..5e7999d 100644
--- a/cmd/trace/cli/agent/copilotcli/generate.go
+++ b/cli/agent/copilotcli/generate.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // GenerateText sends a prompt to the Copilot CLI and returns the raw text response.
diff --git a/cmd/trace/cli/agent/copilotcli/hooks.go b/cli/agent/copilotcli/hooks.go
similarity index 96%
rename from cmd/trace/cli/agent/copilotcli/hooks.go
rename to cli/agent/copilotcli/hooks.go
index 7fb506b..62cbfae 100644
--- a/cmd/trace/cli/agent/copilotcli/hooks.go
+++ b/cli/agent/copilotcli/hooks.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // HooksFileName is the hooks file managed by Trace for Copilot CLI.
@@ -22,6 +22,8 @@ const hooksDir = ".github/hooks"
 
 // traceHookPrefixes are command prefixes that identify Trace hooks in the bash field.
 var traceHookPrefixes = []string{
+	"hawk trace ",
+	`go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace `,
 	"trace ",
 	`go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go `,
 }
@@ -101,9 +103,9 @@ func (c *CopilotCLIAgent) InstallHooks(ctx context.Context, localDev bool, force
 	// Define command prefix
 	var cmdPrefix string
 	if localDev {
-		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks copilot-cli `
+		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks copilot-cli `
 	} else {
-		cmdPrefix = "trace hooks copilot-cli "
+		cmdPrefix = "hawk trace hooks copilot-cli "
 	}
 
 	count := 0
diff --git a/cmd/trace/cli/agent/copilotcli/hooks_test.go b/cli/agent/copilotcli/hooks_test.go
similarity index 96%
rename from cmd/trace/cli/agent/copilotcli/hooks_test.go
rename to cli/agent/copilotcli/hooks_test.go
index 984253a..248ac36 100644
--- a/cmd/trace/cli/agent/copilotcli/hooks_test.go
+++ b/cli/agent/copilotcli/hooks_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 	"github.com/stretchr/testify/require"
 )
 
@@ -60,14 +60,14 @@ func TestInstallHooks_FreshInstall(t *testing.T) {
 	}
 
 	// Verify commands use bash field and type is "command"
-	assertEntryBash(t, hooksFile.Hooks.UserPromptSubmitted, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli user-prompt-submitted"))
-	assertEntryBash(t, hooksFile.Hooks.SessionStart, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli session-start"))
-	assertEntryBash(t, hooksFile.Hooks.AgentStop, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli agent-stop"))
-	assertEntryBash(t, hooksFile.Hooks.SessionEnd, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli session-end"))
-	assertEntryBash(t, hooksFile.Hooks.SubagentStop, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli subagent-stop"))
-	assertEntryBash(t, hooksFile.Hooks.PreToolUse, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli pre-tool-use"))
-	assertEntryBash(t, hooksFile.Hooks.PostToolUse, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli post-tool-use"))
-	assertEntryBash(t, hooksFile.Hooks.ErrorOccurred, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli error-occurred"))
+	assertEntryBash(t, hooksFile.Hooks.UserPromptSubmitted, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli user-prompt-submitted"))
+	assertEntryBash(t, hooksFile.Hooks.SessionStart, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli session-start"))
+	assertEntryBash(t, hooksFile.Hooks.AgentStop, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli agent-stop"))
+	assertEntryBash(t, hooksFile.Hooks.SessionEnd, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli session-end"))
+	assertEntryBash(t, hooksFile.Hooks.SubagentStop, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli subagent-stop"))
+	assertEntryBash(t, hooksFile.Hooks.PreToolUse, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli pre-tool-use"))
+	assertEntryBash(t, hooksFile.Hooks.PostToolUse, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli post-tool-use"))
+	assertEntryBash(t, hooksFile.Hooks.ErrorOccurred, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli error-occurred"))
 
 	// Verify type field is "command"
 	assertEntryType(t, hooksFile.Hooks.AgentStop, "command")
@@ -227,7 +227,7 @@ func TestInstallHooks_PreservesExistingHooks(t *testing.T) {
 		t.Errorf("AgentStop hooks = %d, want 2 (user + trace)", len(hooksFile.Hooks.AgentStop))
 	}
 	assertEntryBash(t, hooksFile.Hooks.AgentStop, "echo user hook")
-	assertEntryBash(t, hooksFile.Hooks.AgentStop, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli agent-stop"))
+	assertEntryBash(t, hooksFile.Hooks.AgentStop, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli agent-stop"))
 }
 
 func TestInstallHooks_LocalDev(t *testing.T) {
@@ -241,7 +241,7 @@ func TestInstallHooks_LocalDev(t *testing.T) {
 	}
 
 	hooksFile := readHooksFile(t, tempDir)
-	assertEntryBash(t, hooksFile.Hooks.AgentStop, `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks copilot-cli agent-stop`)
+	assertEntryBash(t, hooksFile.Hooks.AgentStop, `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks copilot-cli agent-stop`)
 }
 
 func TestInstallHooks_PreservesUnknownFields(t *testing.T) {
@@ -313,7 +313,7 @@ func TestInstallHooks_PreservesUnknownFields(t *testing.T) {
 		t.Errorf("agentStop hooks = %d, want 2 (user + trace)", len(agentStopHooks))
 	}
 	assertEntryBash(t, agentStopHooks, "echo user stop")
-	assertEntryBash(t, agentStopHooks, agent.WrapProductionSilentHookCommand("trace hooks copilot-cli agent-stop"))
+	assertEntryBash(t, agentStopHooks, agent.WrapProductionSilentHookCommand("hawk trace hooks copilot-cli agent-stop"))
 }
 
 func TestUninstallHooks_PreservesUnknownFields(t *testing.T) {
diff --git a/cmd/trace/cli/agent/copilotcli/lifecycle.go b/cli/agent/copilotcli/lifecycle.go
similarity index 98%
rename from cmd/trace/cli/agent/copilotcli/lifecycle.go
rename to cli/agent/copilotcli/lifecycle.go
index 4165cd1..fde61b1 100644
--- a/cmd/trace/cli/agent/copilotcli/lifecycle.go
+++ b/cli/agent/copilotcli/lifecycle.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // Ensure CopilotCLIAgent implements HookSupport at compile time.
diff --git a/cmd/trace/cli/agent/copilotcli/lifecycle_test.go b/cli/agent/copilotcli/lifecycle_test.go
similarity index 99%
rename from cmd/trace/cli/agent/copilotcli/lifecycle_test.go
rename to cli/agent/copilotcli/lifecycle_test.go
index 6cc7617..df36335 100644
--- a/cmd/trace/cli/agent/copilotcli/lifecycle_test.go
+++ b/cli/agent/copilotcli/lifecycle_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/trace/cli/agent/copilotcli/transcript.go b/cli/agent/copilotcli/transcript.go
similarity index 99%
rename from cmd/trace/cli/agent/copilotcli/transcript.go
rename to cli/agent/copilotcli/transcript.go
index 00af33a..e0998a2 100644
--- a/cmd/trace/cli/agent/copilotcli/transcript.go
+++ b/cli/agent/copilotcli/transcript.go
@@ -9,8 +9,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // Compile-time interface checks.
diff --git a/cmd/trace/cli/agent/copilotcli/transcript_test.go b/cli/agent/copilotcli/transcript_test.go
similarity index 100%
rename from cmd/trace/cli/agent/copilotcli/transcript_test.go
rename to cli/agent/copilotcli/transcript_test.go
diff --git a/cmd/trace/cli/agent/copilotcli/types.go b/cli/agent/copilotcli/types.go
similarity index 100%
rename from cmd/trace/cli/agent/copilotcli/types.go
rename to cli/agent/copilotcli/types.go
diff --git a/cmd/trace/cli/agent/cursor/AGENT.md b/cli/agent/cursor/AGENT.md
similarity index 100%
rename from cmd/trace/cli/agent/cursor/AGENT.md
rename to cli/agent/cursor/AGENT.md
diff --git a/cmd/trace/cli/agent/cursor/cursor.go b/cli/agent/cursor/cursor.go
similarity index 97%
rename from cmd/trace/cli/agent/cursor/cursor.go
rename to cli/agent/cursor/cursor.go
index ab98c67..7180cb7 100644
--- a/cmd/trace/cli/agent/cursor/cursor.go
+++ b/cli/agent/cursor/cursor.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // Compile-time interface assertion.
diff --git a/cmd/trace/cli/agent/cursor/cursor_test.go b/cli/agent/cursor/cursor_test.go
similarity index 99%
rename from cmd/trace/cli/agent/cursor/cursor_test.go
rename to cli/agent/cursor/cursor_test.go
index d736996..50a3184 100644
--- a/cmd/trace/cli/agent/cursor/cursor_test.go
+++ b/cli/agent/cursor/cursor_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // sampleTranscriptLines returns JSONL lines matching real Cursor transcript format.
diff --git a/cmd/trace/cli/agent/cursor/generate.go b/cli/agent/cursor/generate.go
similarity index 94%
rename from cmd/trace/cli/agent/cursor/generate.go
rename to cli/agent/cursor/generate.go
index 08a84c6..137ef9d 100644
--- a/cmd/trace/cli/agent/cursor/generate.go
+++ b/cli/agent/cursor/generate.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // GenerateText sends a prompt to the Cursor agent CLI and returns the raw text response.
diff --git a/cmd/trace/cli/agent/cursor/hooks.go b/cli/agent/cursor/hooks.go
similarity index 95%
rename from cmd/trace/cli/agent/cursor/hooks.go
rename to cli/agent/cursor/hooks.go
index 479aeab..88ad070 100644
--- a/cmd/trace/cli/agent/cursor/hooks.go
+++ b/cli/agent/cursor/hooks.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // Ensure CursorAgent implements HookSupport
@@ -17,7 +17,7 @@ var (
 	_ agent.HookSupport = (*CursorAgent)(nil)
 )
 
-// Cursor hook names - these become subcommands under `trace hooks cursor`
+// Cursor hook names - these become subcommands under `hawk trace hooks cursor`
 const (
 	HookNameSessionStart       = "session-start"
 	HookNameSessionEnd         = "session-end"
@@ -31,8 +31,13 @@ const (
 // HooksFileName is the hooks file used by Cursor.
 const HooksFileName = "hooks.json"
 
-// traceHookPrefixes are command prefixes that identify Trace hooks
+// traceHookPrefixes are command prefixes that identify Trace hooks.
+// Both the current "hawk trace" forms and the legacy bare-"trace" / cmd/trace
+// forms are listed so previously-installed hooks are still recognised for
+// upgrade and removal.
 var traceHookPrefixes = []string{
+	"hawk trace ",
+	`go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace `,
 	"trace ",
 	`go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go `,
 }
@@ -114,9 +119,9 @@ func (c *CursorAgent) InstallHooks(ctx context.Context, localDev bool, force boo
 	// Define hook commands
 	var cmdPrefix string
 	if localDev {
-		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks cursor `
+		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks cursor `
 	} else {
-		cmdPrefix = "trace hooks cursor "
+		cmdPrefix = "hawk trace hooks cursor "
 	}
 
 	sessionStartCmd := cmdPrefix + HookNameSessionStart
diff --git a/cmd/trace/cli/agent/cursor/hooks_test.go b/cli/agent/cursor/hooks_test.go
similarity index 94%
rename from cmd/trace/cli/agent/cursor/hooks_test.go
rename to cli/agent/cursor/hooks_test.go
index a63f8de..8fa2300 100644
--- a/cmd/trace/cli/agent/cursor/hooks_test.go
+++ b/cli/agent/cursor/hooks_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 func TestInstallHooks_FreshInstall(t *testing.T) {
@@ -55,12 +55,12 @@ func TestInstallHooks_FreshInstall(t *testing.T) {
 	}
 
 	// Verify commands
-	assertEntryCommand(t, hooksFile.Hooks.Stop, agent.WrapProductionSilentHookCommand("trace hooks cursor stop"))
-	assertEntryCommand(t, hooksFile.Hooks.SessionStart, agent.WrapProductionSilentHookCommand("trace hooks cursor session-start"))
-	assertEntryCommand(t, hooksFile.Hooks.BeforeSubmitPrompt, agent.WrapProductionSilentHookCommand("trace hooks cursor before-submit-prompt"))
-	assertEntryCommand(t, hooksFile.Hooks.PreCompact, agent.WrapProductionSilentHookCommand("trace hooks cursor pre-compact"))
-	assertEntryCommand(t, hooksFile.Hooks.SubagentStart, agent.WrapProductionSilentHookCommand("trace hooks cursor subagent-start"))
-	assertEntryCommand(t, hooksFile.Hooks.SubagentStop, agent.WrapProductionSilentHookCommand("trace hooks cursor subagent-stop"))
+	assertEntryCommand(t, hooksFile.Hooks.Stop, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor stop"))
+	assertEntryCommand(t, hooksFile.Hooks.SessionStart, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor session-start"))
+	assertEntryCommand(t, hooksFile.Hooks.BeforeSubmitPrompt, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor before-submit-prompt"))
+	assertEntryCommand(t, hooksFile.Hooks.PreCompact, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor pre-compact"))
+	assertEntryCommand(t, hooksFile.Hooks.SubagentStart, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor subagent-start"))
+	assertEntryCommand(t, hooksFile.Hooks.SubagentStop, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor subagent-stop"))
 }
 
 func TestInstallHooks_Idempotent(t *testing.T) {
@@ -217,14 +217,14 @@ func TestInstallHooks_PreservesExistingHooks(t *testing.T) {
 		t.Errorf("Stop hooks = %d, want 2 (user + trace)", len(hooksFile.Hooks.Stop))
 	}
 	assertEntryCommand(t, hooksFile.Hooks.Stop, "echo user hook")
-	assertEntryCommand(t, hooksFile.Hooks.Stop, agent.WrapProductionSilentHookCommand("trace hooks cursor stop"))
+	assertEntryCommand(t, hooksFile.Hooks.Stop, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor stop"))
 
 	// SubagentStop should have user Write hook + Trace hook
 	if len(hooksFile.Hooks.SubagentStop) != 2 {
 		t.Errorf("SubagentStop hooks = %d, want 2 (user Write + Trace)", len(hooksFile.Hooks.SubagentStop))
 	}
 	assertEntryWithMatcher(t, hooksFile.Hooks.SubagentStop, "Write", "echo file written")
-	assertEntryCommand(t, hooksFile.Hooks.SubagentStop, agent.WrapProductionSilentHookCommand("trace hooks cursor subagent-stop"))
+	assertEntryCommand(t, hooksFile.Hooks.SubagentStop, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor subagent-stop"))
 }
 
 func TestInstallHooks_LocalDev(t *testing.T) {
@@ -238,7 +238,7 @@ func TestInstallHooks_LocalDev(t *testing.T) {
 	}
 
 	hooksFile := readHooksFile(t, tempDir)
-	assertEntryCommand(t, hooksFile.Hooks.Stop, `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks cursor stop`)
+	assertEntryCommand(t, hooksFile.Hooks.Stop, `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks cursor stop`)
 }
 
 func TestInstallHooks_PreservesUnknownFields(t *testing.T) {
@@ -310,7 +310,7 @@ func TestInstallHooks_PreservesUnknownFields(t *testing.T) {
 		t.Errorf("stop hooks = %d, want 2 (user + trace)", len(stopHooks))
 	}
 	assertEntryCommand(t, stopHooks, "echo user stop")
-	assertEntryCommand(t, stopHooks, agent.WrapProductionSilentHookCommand("trace hooks cursor stop"))
+	assertEntryCommand(t, stopHooks, agent.WrapProductionSilentHookCommand("hawk trace hooks cursor stop"))
 }
 
 func TestUninstallHooks_PreservesUnknownFields(t *testing.T) {
diff --git a/cmd/trace/cli/agent/cursor/lifecycle.go b/cli/agent/cursor/lifecycle.go
similarity index 97%
rename from cmd/trace/cli/agent/cursor/lifecycle.go
rename to cli/agent/cursor/lifecycle.go
index 5a91280..690e339 100644
--- a/cmd/trace/cli/agent/cursor/lifecycle.go
+++ b/cli/agent/cursor/lifecycle.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // intFromJSON safely converts a json.Number to int64, returning 0 for
diff --git a/cmd/trace/cli/agent/cursor/lifecycle_test.go b/cli/agent/cursor/lifecycle_test.go
similarity index 99%
rename from cmd/trace/cli/agent/cursor/lifecycle_test.go
rename to cli/agent/cursor/lifecycle_test.go
index 1bb3f35..c1b7c76 100644
--- a/cmd/trace/cli/agent/cursor/lifecycle_test.go
+++ b/cli/agent/cursor/lifecycle_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/trace/cli/agent/cursor/transcript.go b/cli/agent/cursor/transcript.go
similarity index 95%
rename from cmd/trace/cli/agent/cursor/transcript.go
rename to cli/agent/cursor/transcript.go
index ba77b23..b2e5fdc 100644
--- a/cmd/trace/cli/agent/cursor/transcript.go
+++ b/cli/agent/cursor/transcript.go
@@ -7,9 +7,9 @@ import (
 	"io"
 	"os"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/textutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/textutil"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // Compile-time interface assertion.
diff --git a/cmd/trace/cli/agent/cursor/transcript_test.go b/cli/agent/cursor/transcript_test.go
similarity index 99%
rename from cmd/trace/cli/agent/cursor/transcript_test.go
rename to cli/agent/cursor/transcript_test.go
index d3e8e4b..ae126df 100644
--- a/cmd/trace/cli/agent/cursor/transcript_test.go
+++ b/cli/agent/cursor/transcript_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Compile-time interface check.
diff --git a/cmd/trace/cli/agent/cursor/types.go b/cli/agent/cursor/types.go
similarity index 100%
rename from cmd/trace/cli/agent/cursor/types.go
rename to cli/agent/cursor/types.go
diff --git a/cmd/trace/cli/agent/event.go b/cli/agent/event.go
similarity index 100%
rename from cmd/trace/cli/agent/event.go
rename to cli/agent/event.go
diff --git a/cmd/trace/cli/agent/external/capabilities.go b/cli/agent/external/capabilities.go
similarity index 98%
rename from cmd/trace/cli/agent/external/capabilities.go
rename to cli/agent/external/capabilities.go
index 056a36c..7ca93d3 100644
--- a/cmd/trace/cli/agent/external/capabilities.go
+++ b/cli/agent/external/capabilities.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 // Wrap returns the Agent wrapped as an agent.Agent that implements ALL optional
diff --git a/cmd/trace/cli/agent/external/discovery.go b/cli/agent/external/discovery.go
similarity index 95%
rename from cmd/trace/cli/agent/external/discovery.go
rename to cli/agent/external/discovery.go
index 5737686..f5ef07c 100644
--- a/cmd/trace/cli/agent/external/discovery.go
+++ b/cli/agent/external/discovery.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 const (
diff --git a/cmd/trace/cli/agent/external/discovery_test.go b/cli/agent/external/discovery_test.go
similarity index 99%
rename from cmd/trace/cli/agent/external/discovery_test.go
rename to cli/agent/external/discovery_test.go
index 33fed14..4d6ad34 100644
--- a/cmd/trace/cli/agent/external/discovery_test.go
+++ b/cli/agent/external/discovery_test.go
@@ -8,8 +8,8 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 // setupDiscoveryDir creates a temp directory containing a mock trace-agent-<name> binary.
diff --git a/cmd/trace/cli/agent/external/external.go b/cli/agent/external/external.go
similarity index 98%
rename from cmd/trace/cli/agent/external/external.go
rename to cli/agent/external/external.go
index 876414a..de9a3c3 100644
--- a/cmd/trace/cli/agent/external/external.go
+++ b/cli/agent/external/external.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 )
 
 // defaultRunTimeout is the maximum time an external binary call may take when
diff --git a/cmd/trace/cli/agent/external/external_test.go b/cli/agent/external/external_test.go
similarity index 99%
rename from cmd/trace/cli/agent/external/external_test.go
rename to cli/agent/external/external_test.go
index 1937cba..c412c59 100644
--- a/cmd/trace/cli/agent/external/external_test.go
+++ b/cli/agent/external/external_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // testBinaryDir creates a temp directory with a mock trace-agent-test binary.
diff --git a/cmd/trace/cli/agent/external/types.go b/cli/agent/external/types.go
similarity index 99%
rename from cmd/trace/cli/agent/external/types.go
rename to cli/agent/external/types.go
index 91c56ac..6219017 100644
--- a/cmd/trace/cli/agent/external/types.go
+++ b/cli/agent/external/types.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // ProtocolVersion is the current protocol version expected by the CLI.
diff --git a/cmd/trace/cli/agent/factoryaidroid/factoryaidroid.go b/cli/agent/factoryaidroid/factoryaidroid.go
similarity index 97%
rename from cmd/trace/cli/agent/factoryaidroid/factoryaidroid.go
rename to cli/agent/factoryaidroid/factoryaidroid.go
index aa476fa..4fc2256 100644
--- a/cmd/trace/cli/agent/factoryaidroid/factoryaidroid.go
+++ b/cli/agent/factoryaidroid/factoryaidroid.go
@@ -10,9 +10,9 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // nonAlphanumericRegex matches any non-alphanumeric character for path sanitization.
diff --git a/cmd/trace/cli/agent/factoryaidroid/factoryaidroid_test.go b/cli/agent/factoryaidroid/factoryaidroid_test.go
similarity index 99%
rename from cmd/trace/cli/agent/factoryaidroid/factoryaidroid_test.go
rename to cli/agent/factoryaidroid/factoryaidroid_test.go
index 2c8215d..07982b8 100644
--- a/cmd/trace/cli/agent/factoryaidroid/factoryaidroid_test.go
+++ b/cli/agent/factoryaidroid/factoryaidroid_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // TestDetectPresence uses t.Chdir so it cannot be parallel.
diff --git a/cmd/trace/cli/agent/factoryaidroid/hooks.go b/cli/agent/factoryaidroid/hooks.go
similarity index 93%
rename from cmd/trace/cli/agent/factoryaidroid/hooks.go
rename to cli/agent/factoryaidroid/hooks.go
index e34ef06..53c47b7 100644
--- a/cmd/trace/cli/agent/factoryaidroid/hooks.go
+++ b/cli/agent/factoryaidroid/hooks.go
@@ -8,15 +8,15 @@ import (
 	"path/filepath"
 	"slices"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // Ensure FactoryAIDroidAgent implements HookSupport
 var _ agent.HookSupport = (*FactoryAIDroidAgent)(nil)
 
-// Factory AI Droid hook names - these become subcommands under `trace hooks factoryai-droid`
+// Factory AI Droid hook names - these become subcommands under `hawk trace hooks factoryai-droid`
 const (
 	HookNameSessionStart     = "session-start"
 	HookNameSessionEnd       = "session-end"
@@ -38,6 +38,8 @@ const metadataDenyRule = "Read(./.trace/metadata/**)"
 
 // traceHookPrefixes are command prefixes that identify Trace hooks
 var traceHookPrefixes = []string{
+	"hawk trace ",
+	`go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace `,
 	"trace ",
 	`go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go `,
 }
@@ -119,7 +121,7 @@ func (f *FactoryAIDroidAgent) InstallHooks(ctx context.Context, localDev bool, f
 
 	// Define hook commands
 	var sessionStartCmd, sessionEndCmd, stopCmd, userPromptSubmitCmd, preTaskCmd, postTaskCmd, preCompactCmd string
-	localDevPrefix := `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks factoryai-droid `
+	localDevPrefix := `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks factoryai-droid `
 	if localDev {
 		sessionStartCmd = localDevPrefix + "session-start"
 		sessionEndCmd = localDevPrefix + "session-end"
@@ -129,13 +131,13 @@ func (f *FactoryAIDroidAgent) InstallHooks(ctx context.Context, localDev bool, f
 		postTaskCmd = localDevPrefix + "post-tool-use"
 		preCompactCmd = localDevPrefix + "pre-compact"
 	} else {
-		sessionStartCmd = agent.WrapProductionSilentHookCommand("trace hooks factoryai-droid session-start")
-		sessionEndCmd = agent.WrapProductionSilentHookCommand("trace hooks factoryai-droid session-end")
-		stopCmd = agent.WrapProductionPlainTextWarningHookCommand("trace hooks factoryai-droid stop", agent.WarningFormatSingleLine)
-		userPromptSubmitCmd = agent.WrapProductionSilentHookCommand("trace hooks factoryai-droid user-prompt-submit")
-		preTaskCmd = agent.WrapProductionSilentHookCommand("trace hooks factoryai-droid pre-tool-use")
-		postTaskCmd = agent.WrapProductionSilentHookCommand("trace hooks factoryai-droid post-tool-use")
-		preCompactCmd = agent.WrapProductionSilentHookCommand("trace hooks factoryai-droid pre-compact")
+		sessionStartCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid session-start")
+		sessionEndCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid session-end")
+		stopCmd = agent.WrapProductionPlainTextWarningHookCommand("hawk trace hooks factoryai-droid stop", agent.WarningFormatSingleLine)
+		userPromptSubmitCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid user-prompt-submit")
+		preTaskCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid pre-tool-use")
+		postTaskCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid post-tool-use")
+		preCompactCmd = agent.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid pre-compact")
 	}
 
 	count := 0
diff --git a/cmd/trace/cli/agent/factoryaidroid/hooks_test.go b/cli/agent/factoryaidroid/hooks_test.go
similarity index 93%
rename from cmd/trace/cli/agent/factoryaidroid/hooks_test.go
rename to cli/agent/factoryaidroid/hooks_test.go
index 62e3609..4de4d98 100644
--- a/cmd/trace/cli/agent/factoryaidroid/hooks_test.go
+++ b/cli/agent/factoryaidroid/hooks_test.go
@@ -8,8 +8,8 @@ import (
 	"slices"
 	"testing"
 
-	agentpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/testutil"
+	agentpkg "github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/testutil"
 )
 
 func TestInstallHooks_FreshInstall(t *testing.T) {
@@ -54,14 +54,14 @@ func TestInstallHooks_FreshInstall(t *testing.T) {
 	}
 
 	// Verify hook commands
-	assertFactoryHookExists(t, settings.Hooks.SessionStart, "", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid session-start"), "SessionStart")
-	assertFactoryHookExists(t, settings.Hooks.SessionStart, "", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid user-prompt-submit"), "SessionStart user-prompt-submit")
-	assertFactoryHookExists(t, settings.Hooks.SessionEnd, "", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid session-end"), "SessionEnd")
-	assertFactoryHookExists(t, settings.Hooks.Stop, "", agentpkg.WrapProductionPlainTextWarningHookCommand("trace hooks factoryai-droid stop", agentpkg.WarningFormatSingleLine), "Stop")
-	assertFactoryHookExists(t, settings.Hooks.UserPromptSubmit, "", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid user-prompt-submit"), "UserPromptSubmit")
-	assertFactoryHookExists(t, settings.Hooks.PreToolUse, "Task", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid pre-tool-use"), "PreToolUse[Task]")
-	assertFactoryHookExists(t, settings.Hooks.PostToolUse, "Task", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid post-tool-use"), "PostToolUse[Task]")
-	assertFactoryHookExists(t, settings.Hooks.PreCompact, "", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid pre-compact"), "PreCompact")
+	assertFactoryHookExists(t, settings.Hooks.SessionStart, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid session-start"), "SessionStart")
+	assertFactoryHookExists(t, settings.Hooks.SessionStart, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid user-prompt-submit"), "SessionStart user-prompt-submit")
+	assertFactoryHookExists(t, settings.Hooks.SessionEnd, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid session-end"), "SessionEnd")
+	assertFactoryHookExists(t, settings.Hooks.Stop, "", agentpkg.WrapProductionPlainTextWarningHookCommand("hawk trace hooks factoryai-droid stop", agentpkg.WarningFormatSingleLine), "Stop")
+	assertFactoryHookExists(t, settings.Hooks.UserPromptSubmit, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid user-prompt-submit"), "UserPromptSubmit")
+	assertFactoryHookExists(t, settings.Hooks.PreToolUse, "Task", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid pre-tool-use"), "PreToolUse[Task]")
+	assertFactoryHookExists(t, settings.Hooks.PostToolUse, "Task", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid post-tool-use"), "PostToolUse[Task]")
+	assertFactoryHookExists(t, settings.Hooks.PreCompact, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid pre-compact"), "PreCompact")
 
 	// Verify AreHooksInstalled returns true
 	if !agent.AreHooksInstalled(context.Background()) {
@@ -116,7 +116,7 @@ func TestInstallHooks_LocalDev(t *testing.T) {
 	settings := readFactorySettings(t, tempDir)
 
 	// Verify local dev commands use git rev-parse for runtime repo root resolution
-	prefix := `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks factoryai-droid `
+	prefix := `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks factoryai-droid `
 	assertFactoryHookExists(t, settings.Hooks.SessionStart, "",
 		prefix+"session-start", "SessionStart localDev")
 	assertFactoryHookExists(t, settings.Hooks.SessionStart, "",
@@ -352,7 +352,7 @@ func TestInstallHooks_PreservesUserHooksOnSameType(t *testing.T) {
 			t.Fatalf("failed to parse Stop hooks: %v", err)
 		}
 		assertFactoryHookExists(t, matchers, "", "echo user stop hook", "user Stop hook")
-		assertFactoryHookExists(t, matchers, "", agentpkg.WrapProductionPlainTextWarningHookCommand("trace hooks factoryai-droid stop", agentpkg.WarningFormatSingleLine), "Trace Stop hook")
+		assertFactoryHookExists(t, matchers, "", agentpkg.WrapProductionPlainTextWarningHookCommand("hawk trace hooks factoryai-droid stop", agentpkg.WarningFormatSingleLine), "Trace Stop hook")
 	})
 
 	t.Run("SessionStart", func(t *testing.T) {
@@ -362,8 +362,8 @@ func TestInstallHooks_PreservesUserHooksOnSameType(t *testing.T) {
 			t.Fatalf("failed to parse SessionStart hooks: %v", err)
 		}
 		assertFactoryHookExists(t, matchers, "", "echo user session start", "user SessionStart hook")
-		assertFactoryHookExists(t, matchers, "", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid session-start"), "Trace SessionStart hook")
-		assertFactoryHookExists(t, matchers, "", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid user-prompt-submit"), "Trace SessionStart user-prompt-submit hook")
+		assertFactoryHookExists(t, matchers, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid session-start"), "Trace SessionStart hook")
+		assertFactoryHookExists(t, matchers, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid user-prompt-submit"), "Trace SessionStart user-prompt-submit hook")
 	})
 
 	t.Run("PostToolUse", func(t *testing.T) {
@@ -373,7 +373,7 @@ func TestInstallHooks_PreservesUserHooksOnSameType(t *testing.T) {
 			t.Fatalf("failed to parse PostToolUse hooks: %v", err)
 		}
 		assertFactoryHookExists(t, matchers, "Write", "echo user wrote file", "user Write hook")
-		assertFactoryHookExists(t, matchers, "Task", agentpkg.WrapProductionSilentHookCommand("trace hooks factoryai-droid post-tool-use"), "Trace Task hook")
+		assertFactoryHookExists(t, matchers, "Task", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks factoryai-droid post-tool-use"), "Trace Task hook")
 	})
 }
 
diff --git a/cmd/trace/cli/agent/factoryaidroid/lifecycle.go b/cli/agent/factoryaidroid/lifecycle.go
similarity index 98%
rename from cmd/trace/cli/agent/factoryaidroid/lifecycle.go
rename to cli/agent/factoryaidroid/lifecycle.go
index b0616e2..45101d6 100644
--- a/cmd/trace/cli/agent/factoryaidroid/lifecycle.go
+++ b/cli/agent/factoryaidroid/lifecycle.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/textutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/textutil"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // Compile-time interface assertions.
diff --git a/cmd/trace/cli/agent/factoryaidroid/lifecycle_test.go b/cli/agent/factoryaidroid/lifecycle_test.go
similarity index 99%
rename from cmd/trace/cli/agent/factoryaidroid/lifecycle_test.go
rename to cli/agent/factoryaidroid/lifecycle_test.go
index 5db1b03..c6d2746 100644
--- a/cmd/trace/cli/agent/factoryaidroid/lifecycle_test.go
+++ b/cli/agent/factoryaidroid/lifecycle_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	git "github.com/go-git/go-git/v6"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/agent/factoryaidroid/tool_use_fallback.go b/cli/agent/factoryaidroid/tool_use_fallback.go
similarity index 98%
rename from cmd/trace/cli/agent/factoryaidroid/tool_use_fallback.go
rename to cli/agent/factoryaidroid/tool_use_fallback.go
index d8bf979..ea80f43 100644
--- a/cmd/trace/cli/agent/factoryaidroid/tool_use_fallback.go
+++ b/cli/agent/factoryaidroid/tool_use_fallback.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 const fallbackToolUseStatePrefix = "factory-task-tool-use-"
diff --git a/cmd/trace/cli/agent/factoryaidroid/transcript.go b/cli/agent/factoryaidroid/transcript.go
similarity index 99%
rename from cmd/trace/cli/agent/factoryaidroid/transcript.go
rename to cli/agent/factoryaidroid/transcript.go
index cb76ea0..487ef5b 100644
--- a/cmd/trace/cli/agent/factoryaidroid/transcript.go
+++ b/cli/agent/factoryaidroid/transcript.go
@@ -12,8 +12,8 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // TranscriptLine is an alias to the shared transcript.Line type.
diff --git a/cmd/trace/cli/agent/factoryaidroid/transcript_test.go b/cli/agent/factoryaidroid/transcript_test.go
similarity index 99%
rename from cmd/trace/cli/agent/factoryaidroid/transcript_test.go
rename to cli/agent/factoryaidroid/transcript_test.go
index 0b0378f..8e65c30 100644
--- a/cmd/trace/cli/agent/factoryaidroid/transcript_test.go
+++ b/cli/agent/factoryaidroid/transcript_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 func TestParseDroidTranscript_NormalizesEnvelope(t *testing.T) {
diff --git a/cmd/trace/cli/agent/factoryaidroid/types.go b/cli/agent/factoryaidroid/types.go
similarity index 100%
rename from cmd/trace/cli/agent/factoryaidroid/types.go
rename to cli/agent/factoryaidroid/types.go
diff --git a/cmd/trace/cli/agent/geminicli/discovery.go b/cli/agent/geminicli/discovery.go
similarity index 87%
rename from cmd/trace/cli/agent/geminicli/discovery.go
rename to cli/agent/geminicli/discovery.go
index 94f7882..178e7a7 100644
--- a/cmd/trace/cli/agent/geminicli/discovery.go
+++ b/cli/agent/geminicli/discovery.go
@@ -3,7 +3,7 @@ package geminicli
 import (
 	"context"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // DiscoverReviewSkills is a stub until the Gemini CLI on-disk extension layout
diff --git a/cmd/trace/cli/agent/geminicli/discovery_test.go b/cli/agent/geminicli/discovery_test.go
similarity index 82%
rename from cmd/trace/cli/agent/geminicli/discovery_test.go
rename to cli/agent/geminicli/discovery_test.go
index 9e7674e..05faa1a 100644
--- a/cmd/trace/cli/agent/geminicli/discovery_test.go
+++ b/cli/agent/geminicli/discovery_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
 )
 
 // Compile-time pin: GeminiCLIAgent must satisfy SkillDiscoverer.
diff --git a/cmd/trace/cli/agent/geminicli/gemini.go b/cli/agent/geminicli/gemini.go
similarity index 98%
rename from cmd/trace/cli/agent/geminicli/gemini.go
rename to cli/agent/geminicli/gemini.go
index 6174bb4..a7dada0 100644
--- a/cmd/trace/cli/agent/geminicli/gemini.go
+++ b/cli/agent/geminicli/gemini.go
@@ -13,10 +13,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 //nolint:gochecknoinits // Agent self-registration is the intended pattern
diff --git a/cmd/trace/cli/agent/geminicli/gemini_test.go b/cli/agent/geminicli/gemini_test.go
similarity index 99%
rename from cmd/trace/cli/agent/geminicli/gemini_test.go
rename to cli/agent/geminicli/gemini_test.go
index b289662..d7ccd5e 100644
--- a/cmd/trace/cli/agent/geminicli/gemini_test.go
+++ b/cli/agent/geminicli/gemini_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 func TestNewGeminiCLIAgent(t *testing.T) {
diff --git a/cmd/trace/cli/agent/geminicli/generate.go b/cli/agent/geminicli/generate.go
similarity index 94%
rename from cmd/trace/cli/agent/geminicli/generate.go
rename to cli/agent/geminicli/generate.go
index 74885e1..4c56593 100644
--- a/cmd/trace/cli/agent/geminicli/generate.go
+++ b/cli/agent/geminicli/generate.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // GenerateText sends a prompt to the Gemini CLI and returns the raw text response.
diff --git a/cmd/trace/cli/agent/geminicli/hooks.go b/cli/agent/geminicli/hooks.go
similarity index 97%
rename from cmd/trace/cli/agent/geminicli/hooks.go
rename to cli/agent/geminicli/hooks.go
index 6ac22f1..e5518e5 100644
--- a/cmd/trace/cli/agent/geminicli/hooks.go
+++ b/cli/agent/geminicli/hooks.go
@@ -9,16 +9,16 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // Ensure GeminiCLIAgent implements HookSupport
 var _ agent.HookSupport = (*GeminiCLIAgent)(nil)
 
-// Gemini CLI hook names - these become subcommands under `trace hooks gemini`
+// Gemini CLI hook names - these become subcommands under `hawk trace hooks gemini`
 const (
 	HookNameSessionStart        = "session-start"
 	HookNameSessionEnd          = "session-end"
@@ -38,6 +38,8 @@ const GeminiSettingsFileName = "settings.json"
 
 // traceHookPrefixes are command prefixes that identify Trace hooks
 var traceHookPrefixes = []string{
+	"hawk trace ",
+	`go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace `,
 	"trace ",
 	`go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go `,
 }
@@ -102,9 +104,9 @@ func (g *GeminiCLIAgent) InstallHooks(ctx context.Context, localDev bool, force
 	// Define hook commands based on localDev mode
 	var cmdPrefix string
 	if localDev {
-		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks gemini `
+		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks gemini `
 	} else {
-		cmdPrefix = "trace hooks gemini "
+		cmdPrefix = "hawk trace hooks gemini "
 	}
 
 	// Parse only the hook types we need to modify
diff --git a/cmd/trace/cli/agent/geminicli/hooks_test.go b/cli/agent/geminicli/hooks_test.go
similarity index 94%
rename from cmd/trace/cli/agent/geminicli/hooks_test.go
rename to cli/agent/geminicli/hooks_test.go
index deba428..ae82d5c 100644
--- a/cmd/trace/cli/agent/geminicli/hooks_test.go
+++ b/cli/agent/geminicli/hooks_test.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	agentpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/testutil"
+	agentpkg "github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/testutil"
 )
 
 const (
@@ -78,18 +78,18 @@ func TestInstallHooks_FreshInstall(t *testing.T) {
 	}
 
 	// Verify hook commands (localDev=false, so use trace binary)
-	verifyHookCommand(t, settings.Hooks.SessionStart, "", agentpkg.WrapProductionJSONWarningHookCommand("trace hooks gemini session-start", agentpkg.WarningFormatSingleLine))
-	verifyHookCommand(t, settings.Hooks.SessionEnd, "exit", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini session-end"))
-	verifyHookCommand(t, settings.Hooks.SessionEnd, "logout", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini session-end"))
-	verifyHookCommand(t, settings.Hooks.BeforeAgent, "", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini before-agent"))
-	verifyHookCommand(t, settings.Hooks.AfterAgent, "", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini after-agent"))
-	verifyHookCommand(t, settings.Hooks.BeforeModel, "", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini before-model"))
-	verifyHookCommand(t, settings.Hooks.AfterModel, "", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini after-model"))
-	verifyHookCommand(t, settings.Hooks.BeforeToolSelection, "", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini before-tool-selection"))
-	verifyHookCommand(t, settings.Hooks.BeforeTool, "*", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini before-tool"))
-	verifyHookCommand(t, settings.Hooks.AfterTool, "*", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini after-tool"))
-	verifyHookCommand(t, settings.Hooks.PreCompress, "", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini pre-compress"))
-	verifyHookCommand(t, settings.Hooks.Notification, "", agentpkg.WrapProductionSilentHookCommand("trace hooks gemini notification"))
+	verifyHookCommand(t, settings.Hooks.SessionStart, "", agentpkg.WrapProductionJSONWarningHookCommand("hawk trace hooks gemini session-start", agentpkg.WarningFormatSingleLine))
+	verifyHookCommand(t, settings.Hooks.SessionEnd, "exit", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini session-end"))
+	verifyHookCommand(t, settings.Hooks.SessionEnd, "logout", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini session-end"))
+	verifyHookCommand(t, settings.Hooks.BeforeAgent, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini before-agent"))
+	verifyHookCommand(t, settings.Hooks.AfterAgent, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini after-agent"))
+	verifyHookCommand(t, settings.Hooks.BeforeModel, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini before-model"))
+	verifyHookCommand(t, settings.Hooks.AfterModel, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini after-model"))
+	verifyHookCommand(t, settings.Hooks.BeforeToolSelection, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini before-tool-selection"))
+	verifyHookCommand(t, settings.Hooks.BeforeTool, "*", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini before-tool"))
+	verifyHookCommand(t, settings.Hooks.AfterTool, "*", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini after-tool"))
+	verifyHookCommand(t, settings.Hooks.PreCompress, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini pre-compress"))
+	verifyHookCommand(t, settings.Hooks.Notification, "", agentpkg.WrapProductionSilentHookCommand("hawk trace hooks gemini notification"))
 }
 
 func TestInstallHooks_LocalDev(t *testing.T) {
@@ -105,7 +105,7 @@ func TestInstallHooks_LocalDev(t *testing.T) {
 	settings := readGeminiSettings(t, tempDir)
 
 	// Verify local dev commands use git rev-parse for runtime repo root resolution
-	prefix := `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks gemini `
+	prefix := `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace hooks gemini `
 	verifyHookCommand(t, settings.Hooks.SessionStart, "", prefix+"session-start")
 	verifyHookCommand(t, settings.Hooks.SessionEnd, "exit", prefix+"session-end")
 	verifyHookCommand(t, settings.Hooks.SessionEnd, "logout", prefix+"session-end")
@@ -564,7 +564,7 @@ func TestInstallHooks_RemovesLegacyEnabledField_WhenAlreadyInstalled(t *testing.
       }
     ]
   }
-}`, agentpkg.WrapProductionJSONWarningHookCommand("trace hooks gemini session-start", agentpkg.WarningFormatSingleLine)))
+}`, agentpkg.WrapProductionJSONWarningHookCommand("hawk trace hooks gemini session-start", agentpkg.WarningFormatSingleLine)))
 
 	agent := &GeminiCLIAgent{}
 	n, err := agent.InstallHooks(context.Background(), false, false)
diff --git a/cmd/trace/cli/agent/geminicli/lifecycle.go b/cli/agent/geminicli/lifecycle.go
similarity index 99%
rename from cmd/trace/cli/agent/geminicli/lifecycle.go
rename to cli/agent/geminicli/lifecycle.go
index da387d7..850db2c 100644
--- a/cmd/trace/cli/agent/geminicli/lifecycle.go
+++ b/cli/agent/geminicli/lifecycle.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Compile-time interface assertions for new interfaces.
diff --git a/cmd/trace/cli/agent/geminicli/lifecycle_test.go b/cli/agent/geminicli/lifecycle_test.go
similarity index 99%
rename from cmd/trace/cli/agent/geminicli/lifecycle_test.go
rename to cli/agent/geminicli/lifecycle_test.go
index 5ef0ca8..7dcdcdb 100644
--- a/cmd/trace/cli/agent/geminicli/lifecycle_test.go
+++ b/cli/agent/geminicli/lifecycle_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/trace/cli/agent/geminicli/reviewer.go b/cli/agent/geminicli/reviewer.go
similarity index 94%
rename from cmd/trace/cli/agent/geminicli/reviewer.go
rename to cli/agent/geminicli/reviewer.go
index afc83a7..3e2ad1b 100644
--- a/cmd/trace/cli/agent/geminicli/reviewer.go
+++ b/cli/agent/geminicli/reviewer.go
@@ -9,8 +9,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // NewReviewer returns the AgentReviewer for gemini-cli.
diff --git a/cmd/trace/cli/agent/geminicli/reviewer_test.go b/cli/agent/geminicli/reviewer_test.go
similarity index 98%
rename from cmd/trace/cli/agent/geminicli/reviewer_test.go
rename to cli/agent/geminicli/reviewer_test.go
index 243d425..82633a1 100644
--- a/cmd/trace/cli/agent/geminicli/reviewer_test.go
+++ b/cli/agent/geminicli/reviewer_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // Compile-time interface check: ReviewerTemplate implements AgentReviewer.
diff --git a/cmd/trace/cli/agent/geminicli/spawner.go b/cli/agent/geminicli/spawner.go
similarity index 93%
rename from cmd/trace/cli/agent/geminicli/spawner.go
rename to cli/agent/geminicli/spawner.go
index baa3460..8cf461a 100644
--- a/cmd/trace/cli/agent/geminicli/spawner.go
+++ b/cli/agent/geminicli/spawner.go
@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
 )
 
 // geminiSpawner produces argv: gemini -p " "; prompt via stdin.
diff --git a/cmd/trace/cli/agent/geminicli/spawner_test.go b/cli/agent/geminicli/spawner_test.go
similarity index 100%
rename from cmd/trace/cli/agent/geminicli/spawner_test.go
rename to cli/agent/geminicli/spawner_test.go
diff --git a/cmd/trace/cli/agent/geminicli/testdata/canned_session.txt b/cli/agent/geminicli/testdata/canned_session.txt
similarity index 100%
rename from cmd/trace/cli/agent/geminicli/testdata/canned_session.txt
rename to cli/agent/geminicli/testdata/canned_session.txt
diff --git a/cmd/trace/cli/agent/geminicli/transcript.go b/cli/agent/geminicli/transcript.go
similarity index 100%
rename from cmd/trace/cli/agent/geminicli/transcript.go
rename to cli/agent/geminicli/transcript.go
diff --git a/cmd/trace/cli/agent/geminicli/transcript_test.go b/cli/agent/geminicli/transcript_test.go
similarity index 100%
rename from cmd/trace/cli/agent/geminicli/transcript_test.go
rename to cli/agent/geminicli/transcript_test.go
diff --git a/cmd/trace/cli/agent/geminicli/types.go b/cli/agent/geminicli/types.go
similarity index 100%
rename from cmd/trace/cli/agent/geminicli/types.go
rename to cli/agent/geminicli/types.go
diff --git a/cmd/trace/cli/agent/generate_external_test.go b/cli/agent/generate_external_test.go
similarity index 91%
rename from cmd/trace/cli/agent/generate_external_test.go
rename to cli/agent/generate_external_test.go
index 8328ba5..1bdd311 100644
--- a/cmd/trace/cli/agent/generate_external_test.go
+++ b/cli/agent/generate_external_test.go
@@ -6,11 +6,11 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/copilotcli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/cursor"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/codex"
+	"github.com/GrayCodeAI/trace/cli/agent/copilotcli"
+	"github.com/GrayCodeAI/trace/cli/agent/cursor"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
 )
 
 // catRunner returns a TextCommandRunner that invokes `cat`, which echoes
diff --git a/cmd/trace/cli/agent/hook_command.go b/cli/agent/hook_command.go
similarity index 98%
rename from cmd/trace/cli/agent/hook_command.go
rename to cli/agent/hook_command.go
index e84026f..33f6d6e 100644
--- a/cmd/trace/cli/agent/hook_command.go
+++ b/cli/agent/hook_command.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
 )
 
 type WarningFormat int
diff --git a/cmd/trace/cli/agent/hook_command_test.go b/cli/agent/hook_command_test.go
similarity index 100%
rename from cmd/trace/cli/agent/hook_command_test.go
rename to cli/agent/hook_command_test.go
diff --git a/cmd/trace/cli/agent/opencode/cli_commands.go b/cli/agent/opencode/cli_commands.go
similarity index 100%
rename from cmd/trace/cli/agent/opencode/cli_commands.go
rename to cli/agent/opencode/cli_commands.go
diff --git a/cmd/trace/cli/agent/opencode/hooks.go b/cli/agent/opencode/hooks.go
similarity index 95%
rename from cmd/trace/cli/agent/opencode/hooks.go
rename to cli/agent/opencode/hooks.go
index b21abd8..60a8806 100644
--- a/cmd/trace/cli/agent/opencode/hooks.go
+++ b/cli/agent/opencode/hooks.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // Compile-time interface assertion
@@ -51,9 +51,9 @@ func (a *OpenCodeAgent) InstallHooks(ctx context.Context, localDev bool, force b
 	// Build the command prefix
 	var cmdPrefix string
 	if localDev {
-		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go`
+		cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace`
 	} else {
-		cmdPrefix = "trace"
+		cmdPrefix = "hawk trace"
 	}
 
 	// Generate plugin content from template
diff --git a/cmd/trace/cli/agent/opencode/hooks_test.go b/cli/agent/opencode/hooks_test.go
similarity index 97%
rename from cmd/trace/cli/agent/opencode/hooks_test.go
rename to cli/agent/opencode/hooks_test.go
index 40ebeb9..c8a4433 100644
--- a/cmd/trace/cli/agent/opencode/hooks_test.go
+++ b/cli/agent/opencode/hooks_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Compile-time check
@@ -37,7 +37,7 @@ func TestInstallHooks_FreshInstall(t *testing.T) {
 
 	content := string(data)
 	// The plugin uses JS template literal ${TRACE_CMD} — check the constant was set correctly
-	if !strings.Contains(content, `const TRACE_CMD = 'trace'`) {
+	if !strings.Contains(content, `const TRACE_CMD = 'hawk trace'`) {
 		t.Error("plugin file does not contain production command constant")
 	}
 	if !strings.Contains(content, "hooks opencode") {
@@ -96,7 +96,7 @@ func TestInstallHooks_LocalDev(t *testing.T) {
 	}
 
 	content := string(data)
-	if !strings.Contains(content, `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go`) {
+	if !strings.Contains(content, `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace`) {
 		t.Error("local dev mode: plugin file should use git rev-parse for go run path")
 	}
 }
@@ -272,7 +272,7 @@ func TestInstallHooks_RewritesWhenContentDiffers(t *testing.T) {
 	if strings.Contains(string(after), "go run") {
 		t.Error("expected production content after rewrite, but still contains 'go run'")
 	}
-	if !strings.Contains(string(after), `const TRACE_CMD = 'trace'`) {
+	if !strings.Contains(string(after), `const TRACE_CMD = 'hawk trace'`) {
 		t.Error("expected production command constant after rewrite")
 	}
 }
diff --git a/cmd/trace/cli/agent/opencode/lifecycle.go b/cli/agent/opencode/lifecycle.go
similarity index 97%
rename from cmd/trace/cli/agent/opencode/lifecycle.go
rename to cli/agent/opencode/lifecycle.go
index fc86834..3d83ea0 100644
--- a/cmd/trace/cli/agent/opencode/lifecycle.go
+++ b/cli/agent/opencode/lifecycle.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/validation"
 )
 
 var runOpenCodeExportToFileFn = runOpenCodeExportToFile
diff --git a/cmd/trace/cli/agent/opencode/lifecycle_test.go b/cli/agent/opencode/lifecycle_test.go
similarity index 99%
rename from cmd/trace/cli/agent/opencode/lifecycle_test.go
rename to cli/agent/opencode/lifecycle_test.go
index 02e2e34..238fcbf 100644
--- a/cmd/trace/cli/agent/opencode/lifecycle_test.go
+++ b/cli/agent/opencode/lifecycle_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/trace/cli/agent/opencode/opencode.go b/cli/agent/opencode/opencode.go
similarity index 97%
rename from cmd/trace/cli/agent/opencode/opencode.go
rename to cli/agent/opencode/opencode.go
index 8739b30..a6bcb04 100644
--- a/cmd/trace/cli/agent/opencode/opencode.go
+++ b/cli/agent/opencode/opencode.go
@@ -12,10 +12,10 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 //nolint:gochecknoinits // Agent self-registration is the intended pattern
diff --git a/cmd/trace/cli/agent/opencode/plugin.go b/cli/agent/opencode/plugin.go
similarity index 100%
rename from cmd/trace/cli/agent/opencode/plugin.go
rename to cli/agent/opencode/plugin.go
diff --git a/cmd/trace/cli/agent/opencode/trace_plugin.ts b/cli/agent/opencode/trace_plugin.ts
similarity index 100%
rename from cmd/trace/cli/agent/opencode/trace_plugin.ts
rename to cli/agent/opencode/trace_plugin.ts
diff --git a/cmd/trace/cli/agent/opencode/transcript.go b/cli/agent/opencode/transcript.go
similarity index 99%
rename from cmd/trace/cli/agent/opencode/transcript.go
rename to cli/agent/opencode/transcript.go
index 131b875..afe44b8 100644
--- a/cmd/trace/cli/agent/opencode/transcript.go
+++ b/cli/agent/opencode/transcript.go
@@ -7,7 +7,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Compile-time interface assertions
diff --git a/cmd/trace/cli/agent/opencode/transcript_test.go b/cli/agent/opencode/transcript_test.go
similarity index 99%
rename from cmd/trace/cli/agent/opencode/transcript_test.go
rename to cli/agent/opencode/transcript_test.go
index 804669f..d9d0bc7 100644
--- a/cmd/trace/cli/agent/opencode/transcript_test.go
+++ b/cli/agent/opencode/transcript_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/trace/cli/agent/opencode/types.go b/cli/agent/opencode/types.go
similarity index 100%
rename from cmd/trace/cli/agent/opencode/types.go
rename to cli/agent/opencode/types.go
diff --git a/cmd/trace/cli/agent/pi/hooks.go b/cli/agent/pi/hooks.go
similarity index 95%
rename from cmd/trace/cli/agent/pi/hooks.go
rename to cli/agent/pi/hooks.go
index 9a844a6..29ab953 100644
--- a/cmd/trace/cli/agent/pi/hooks.go
+++ b/cli/agent/pi/hooks.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // Compile-time interface assertion
@@ -52,9 +52,9 @@ func extensionPath(ctx context.Context) (string, error) {
 func renderExtension(localDev bool) string {
 	var cmd string
 	if localDev {
-		cmd = `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go`
+		cmd = `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace`
 	} else {
-		cmd = "trace"
+		cmd = "hawk trace"
 	}
 	return strings.ReplaceAll(extensionTemplate, entireCmdPlaceholder, cmd)
 }
diff --git a/cmd/trace/cli/agent/pi/hooks_test.go b/cli/agent/pi/hooks_test.go
similarity index 97%
rename from cmd/trace/cli/agent/pi/hooks_test.go
rename to cli/agent/pi/hooks_test.go
index a99610b..c9abcb5 100644
--- a/cmd/trace/cli/agent/pi/hooks_test.go
+++ b/cli/agent/pi/hooks_test.go
@@ -29,7 +29,7 @@ func TestInstallHooks_FreshInstall(t *testing.T) {
 	}
 	body := string(data)
 
-	if !strings.Contains(body, `const TRACE_CMD = "trace"`) {
+	if !strings.Contains(body, `const TRACE_CMD = "hawk trace"`) {
 		t.Error("production TRACE_CMD missing")
 	}
 	if !strings.Contains(body, "hooks pi ") {
@@ -53,7 +53,7 @@ func TestInstallHooks_LocalDev(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !strings.Contains(string(data), `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go`) {
+	if !strings.Contains(string(data), `go run "$(git rev-parse --show-toplevel)"/cmd/hawk trace`) {
 		t.Error("local-dev extension should reference git rev-parse path")
 	}
 }
diff --git a/cmd/trace/cli/agent/pi/lifecycle.go b/cli/agent/pi/lifecycle.go
similarity index 98%
rename from cmd/trace/cli/agent/pi/lifecycle.go
rename to cli/agent/pi/lifecycle.go
index 17a2eca..c15a2a6 100644
--- a/cmd/trace/cli/agent/pi/lifecycle.go
+++ b/cli/agent/pi/lifecycle.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // Hook names — these match Pi's native event names exactly (snake_case),
diff --git a/cmd/trace/cli/agent/pi/lifecycle_test.go b/cli/agent/pi/lifecycle_test.go
similarity index 99%
rename from cmd/trace/cli/agent/pi/lifecycle_test.go
rename to cli/agent/pi/lifecycle_test.go
index f4e4f9c..df68765 100644
--- a/cmd/trace/cli/agent/pi/lifecycle_test.go
+++ b/cli/agent/pi/lifecycle_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 func TestParseHookEvent_SessionStart(t *testing.T) {
diff --git a/cmd/trace/cli/agent/pi/pi.go b/cli/agent/pi/pi.go
similarity index 98%
rename from cmd/trace/cli/agent/pi/pi.go
rename to cli/agent/pi/pi.go
index c4a8d82..91956d9 100644
--- a/cmd/trace/cli/agent/pi/pi.go
+++ b/cli/agent/pi/pi.go
@@ -20,9 +20,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // piHomeEnvVar overrides the default Pi home directory (~/.pi/agent).
diff --git a/cmd/trace/cli/agent/pi/pijsonl/pijsonl.go b/cli/agent/pi/pijsonl/pijsonl.go
similarity index 97%
rename from cmd/trace/cli/agent/pi/pijsonl/pijsonl.go
rename to cli/agent/pi/pijsonl/pijsonl.go
index f7380bc..a481edd 100644
--- a/cmd/trace/cli/agent/pi/pijsonl/pijsonl.go
+++ b/cli/agent/pi/pijsonl/pijsonl.go
@@ -1,7 +1,7 @@
 // Package pijsonl provides shared parsing primitives for Pi's session JSONL
-// format. It is consumed both by the in-tree pi agent (cmd/trace/cli/agent/pi)
+// format. It is consumed both by the in-tree pi agent (cli/agent/pi)
 // and by the v2 compact-transcript dispatcher
-// (cmd/trace/cli/transcript/compact). Keeping these in one place ensures
+// (cli/transcript/compact). Keeping these in one place ensures
 // active-branch resolution, line counting, and offset slicing stay byte-
 // compatible across both call sites.
 package pijsonl
diff --git a/cmd/trace/cli/agent/pi/pijsonl/pijsonl_test.go b/cli/agent/pi/pijsonl/pijsonl_test.go
similarity index 100%
rename from cmd/trace/cli/agent/pi/pijsonl/pijsonl_test.go
rename to cli/agent/pi/pijsonl/pijsonl_test.go
diff --git a/cmd/trace/cli/agent/pi/session_resolve_test.go b/cli/agent/pi/session_resolve_test.go
similarity index 98%
rename from cmd/trace/cli/agent/pi/session_resolve_test.go
rename to cli/agent/pi/session_resolve_test.go
index 9b050a1..59e3cee 100644
--- a/cmd/trace/cli/agent/pi/session_resolve_test.go
+++ b/cli/agent/pi/session_resolve_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 func TestEncodeRepoPathForPi(t *testing.T) {
diff --git a/cmd/trace/cli/agent/pi/trace_extension.ts b/cli/agent/pi/trace_extension.ts
similarity index 100%
rename from cmd/trace/cli/agent/pi/trace_extension.ts
rename to cli/agent/pi/trace_extension.ts
diff --git a/cmd/trace/cli/agent/pi/transcript.go b/cli/agent/pi/transcript.go
similarity index 98%
rename from cmd/trace/cli/agent/pi/transcript.go
rename to cli/agent/pi/transcript.go
index 6edfa75..3f587ae 100644
--- a/cmd/trace/cli/agent/pi/transcript.go
+++ b/cli/agent/pi/transcript.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/pi/pijsonl"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/pi/pijsonl"
 )
 
 // Compile-time interface assertions
diff --git a/cmd/trace/cli/agent/pi/transcript_test.go b/cli/agent/pi/transcript_test.go
similarity index 99%
rename from cmd/trace/cli/agent/pi/transcript_test.go
rename to cli/agent/pi/transcript_test.go
index 28fcf75..a713ab7 100644
--- a/cmd/trace/cli/agent/pi/transcript_test.go
+++ b/cli/agent/pi/transcript_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Compile-time interface assertions
diff --git a/cmd/trace/cli/agent/registry.go b/cli/agent/registry.go
similarity index 99%
rename from cmd/trace/cli/agent/registry.go
rename to cli/agent/registry.go
index 326da5c..4340ae5 100644
--- a/cmd/trace/cli/agent/registry.go
+++ b/cli/agent/registry.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 var (
diff --git a/cmd/trace/cli/agent/registry_test.go b/cli/agent/registry_test.go
similarity index 99%
rename from cmd/trace/cli/agent/registry_test.go
rename to cli/agent/registry_test.go
index 2242f01..db99bb3 100644
--- a/cmd/trace/cli/agent/registry_test.go
+++ b/cli/agent/registry_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 func TestRegistryOperations(t *testing.T) {
diff --git a/cmd/trace/cli/agent/session.go b/cli/agent/session.go
similarity index 98%
rename from cmd/trace/cli/agent/session.go
rename to cli/agent/session.go
index 9b1c94b..6831e63 100644
--- a/cmd/trace/cli/agent/session.go
+++ b/cli/agent/session.go
@@ -3,7 +3,7 @@ package agent
 import (
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 // AgentSession represents a coding session's data.
diff --git a/cmd/trace/cli/agent/session_test.go b/cli/agent/session_test.go
similarity index 100%
rename from cmd/trace/cli/agent/session_test.go
rename to cli/agent/session_test.go
diff --git a/cmd/trace/cli/agent/skilldiscovery/match.go b/cli/agent/skilldiscovery/match.go
similarity index 100%
rename from cmd/trace/cli/agent/skilldiscovery/match.go
rename to cli/agent/skilldiscovery/match.go
diff --git a/cmd/trace/cli/agent/skilldiscovery/match_test.go b/cli/agent/skilldiscovery/match_test.go
similarity index 97%
rename from cmd/trace/cli/agent/skilldiscovery/match_test.go
rename to cli/agent/skilldiscovery/match_test.go
index ea6e4bf..d7cdc70 100644
--- a/cmd/trace/cli/agent/skilldiscovery/match_test.go
+++ b/cli/agent/skilldiscovery/match_test.go
@@ -3,7 +3,7 @@ package skilldiscovery_test
 import (
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/skilldiscovery"
+	"github.com/GrayCodeAI/trace/cli/agent/skilldiscovery"
 )
 
 func TestMatches_NameKeywords(t *testing.T) {
diff --git a/cmd/trace/cli/agent/skilldiscovery/registry.go b/cli/agent/skilldiscovery/registry.go
similarity index 100%
rename from cmd/trace/cli/agent/skilldiscovery/registry.go
rename to cli/agent/skilldiscovery/registry.go
diff --git a/cmd/trace/cli/agent/skilldiscovery/registry_test.go b/cli/agent/skilldiscovery/registry_test.go
similarity index 97%
rename from cmd/trace/cli/agent/skilldiscovery/registry_test.go
rename to cli/agent/skilldiscovery/registry_test.go
index 9aef070..2f5820d 100644
--- a/cmd/trace/cli/agent/skilldiscovery/registry_test.go
+++ b/cli/agent/skilldiscovery/registry_test.go
@@ -3,7 +3,7 @@ package skilldiscovery_test
 import (
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/skilldiscovery"
+	"github.com/GrayCodeAI/trace/cli/agent/skilldiscovery"
 )
 
 func TestCuratedBuiltinsFor_KnownAgents(t *testing.T) {
diff --git a/cmd/trace/cli/agent/spawn/spawn.go b/cli/agent/spawn/spawn.go
similarity index 100%
rename from cmd/trace/cli/agent/spawn/spawn.go
rename to cli/agent/spawn/spawn.go
diff --git a/cmd/trace/cli/agent/testutil/hooks.go b/cli/agent/testutil/hooks.go
similarity index 100%
rename from cmd/trace/cli/agent/testutil/hooks.go
rename to cli/agent/testutil/hooks.go
diff --git a/cmd/trace/cli/agent/text_generator_cli.go b/cli/agent/text_generator_cli.go
similarity index 98%
rename from cmd/trace/cli/agent/text_generator_cli.go
rename to cli/agent/text_generator_cli.go
index 2adf694..6965c26 100644
--- a/cmd/trace/cli/agent/text_generator_cli.go
+++ b/cli/agent/text_generator_cli.go
@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 // TextCommandRunner matches exec.CommandContext and allows tests to inject a runner.
diff --git a/cmd/trace/cli/agent/text_generator_cli_test.go b/cli/agent/text_generator_cli_test.go
similarity index 100%
rename from cmd/trace/cli/agent/text_generator_cli_test.go
rename to cli/agent/text_generator_cli_test.go
diff --git a/cmd/trace/cli/agent/token_usage.go b/cli/agent/token_usage.go
similarity index 95%
rename from cmd/trace/cli/agent/token_usage.go
rename to cli/agent/token_usage.go
index 91fa57e..ffebdf7 100644
--- a/cmd/trace/cli/agent/token_usage.go
+++ b/cli/agent/token_usage.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log/slog"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // CalculateTokenUsage calculates token usage from transcript data.
diff --git a/cmd/trace/cli/agent/types.go b/cli/agent/types.go
similarity index 100%
rename from cmd/trace/cli/agent/types.go
rename to cli/agent/types.go
diff --git a/cmd/trace/cli/agent/types/agent.go b/cli/agent/types/agent.go
similarity index 100%
rename from cmd/trace/cli/agent/types/agent.go
rename to cli/agent/types/agent.go
diff --git a/cmd/trace/cli/agent/vogon/hooks.go b/cli/agent/vogon/hooks.go
similarity index 96%
rename from cmd/trace/cli/agent/vogon/hooks.go
rename to cli/agent/vogon/hooks.go
index 0421776..1df1679 100644
--- a/cmd/trace/cli/agent/vogon/hooks.go
+++ b/cli/agent/vogon/hooks.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Compile-time interface assertions.
@@ -103,7 +103,7 @@ func (v *Agent) InstallHooks(_ context.Context, _ bool, _ bool) (int, error) {
 func (v *Agent) UninstallHooks(_ context.Context) error { return nil }
 
 // AreHooksInstalled returns false — vogon agent has no external hooks to install.
-// The vogon binary fires hooks directly via `trace hooks vogon <verb>`.
+// The vogon binary fires hooks directly via `hawk trace hooks vogon <verb>`.
 func (v *Agent) AreHooksInstalled(_ context.Context) bool {
 	return false
 }
diff --git a/cmd/trace/cli/agent/vogon/vogon.go b/cli/agent/vogon/vogon.go
similarity index 97%
rename from cmd/trace/cli/agent/vogon/vogon.go
rename to cli/agent/vogon/vogon.go
index f6c8e75..a258823 100644
--- a/cmd/trace/cli/agent/vogon/vogon.go
+++ b/cli/agent/vogon/vogon.go
@@ -11,8 +11,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 //nolint:gochecknoinits // Agent self-registration is the intended pattern
diff --git a/cmd/trace/cli/agent_group.go b/cli/agent_group.go
similarity index 94%
rename from cmd/trace/cli/agent_group.go
rename to cli/agent_group.go
index fdef249..8512478 100644
--- a/cmd/trace/cli/agent_group.go
+++ b/cli/agent_group.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/agent_group_test.go b/cli/agent_group_test.go
similarity index 95%
rename from cmd/trace/cli/agent_group_test.go
rename to cli/agent_group_test.go
index f885e52..e638ae3 100644
--- a/cmd/trace/cli/agent_group_test.go
+++ b/cli/agent_group_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 func TestRunAgentList_ListsAvailableAgents(t *testing.T) {
diff --git a/cmd/trace/cli/agentlaunch/launch.go b/cli/agentlaunch/launch.go
similarity index 91%
rename from cmd/trace/cli/agentlaunch/launch.go
rename to cli/agentlaunch/launch.go
index bbcac91..0ffa1de 100644
--- a/cmd/trace/cli/agentlaunch/launch.go
+++ b/cli/agentlaunch/launch.go
@@ -6,7 +6,7 @@
 //
 // The package is a leaf so review and investigate (which depend on it)
 // avoid an import cycle. The env-var names it strips live in
-// cmd/trace/cli/provenance (also a leaf).
+// cli/provenance (also a leaf).
 package agentlaunch
 
 import (
@@ -16,9 +16,9 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	agenttypes "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/provenance"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	agenttypes "github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/provenance"
 )
 
 // LaunchFixAgent starts a normal coding agent session with the given
diff --git a/cmd/trace/cli/agentlaunch/launch_test.go b/cli/agentlaunch/launch_test.go
similarity index 99%
rename from cmd/trace/cli/agentlaunch/launch_test.go
rename to cli/agentlaunch/launch_test.go
index cf3a48c..744ce9f 100644
--- a/cmd/trace/cli/agentlaunch/launch_test.go
+++ b/cli/agentlaunch/launch_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 // ---------------------------------------------------------------------------
@@ -351,7 +351,7 @@ func TestLaunchFixAgent_OtherRunError(t *testing.T) {
 // be tagged as a review or investigate session.
 //
 // The literal env names below mirror the constants in
-// cmd/trace/cli/review/env.go and cmd/trace/cli/investigate/env.go.
+// cli/review/env.go and cli/investigate/env.go.
 // We use literals (not the exported constants) because importing review
 // or investigate from this package would create a build cycle: review
 // depends on agentlaunch.
diff --git a/cmd/trace/cli/aliascmd.go b/cli/aliascmd.go
similarity index 100%
rename from cmd/trace/cli/aliascmd.go
rename to cli/aliascmd.go
diff --git a/cmd/trace/cli/aliascmd_test.go b/cli/aliascmd_test.go
similarity index 100%
rename from cmd/trace/cli/aliascmd_test.go
rename to cli/aliascmd_test.go
diff --git a/cmd/trace/cli/annotate_cmd.go b/cli/annotate_cmd.go
similarity index 96%
rename from cmd/trace/cli/annotate_cmd.go
rename to cli/annotate_cmd.go
index 7e2251e..0dc8a7c 100644
--- a/cmd/trace/cli/annotate_cmd.go
+++ b/cli/annotate_cmd.go
@@ -8,9 +8,9 @@ import (
 	"sort"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/annotate_cmd_test.go b/cli/annotate_cmd_test.go
similarity index 96%
rename from cmd/trace/cli/annotate_cmd_test.go
rename to cli/annotate_cmd_test.go
index fe61566..a3d7dc8 100644
--- a/cmd/trace/cli/annotate_cmd_test.go
+++ b/cli/annotate_cmd_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/api/auth_tokens.go b/cli/api/auth_tokens.go
similarity index 100%
rename from cmd/trace/cli/api/auth_tokens.go
rename to cli/api/auth_tokens.go
diff --git a/cmd/trace/cli/api/auth_tokens_test.go b/cli/api/auth_tokens_test.go
similarity index 100%
rename from cmd/trace/cli/api/auth_tokens_test.go
rename to cli/api/auth_tokens_test.go
diff --git a/cmd/trace/cli/api/base_url.go b/cli/api/base_url.go
similarity index 100%
rename from cmd/trace/cli/api/base_url.go
rename to cli/api/base_url.go
diff --git a/cmd/trace/cli/api/base_url_test.go b/cli/api/base_url_test.go
similarity index 100%
rename from cmd/trace/cli/api/base_url_test.go
rename to cli/api/base_url_test.go
diff --git a/cmd/trace/cli/api/client.go b/cli/api/client.go
similarity index 100%
rename from cmd/trace/cli/api/client.go
rename to cli/api/client.go
diff --git a/cmd/trace/cli/api/client_test.go b/cli/api/client_test.go
similarity index 100%
rename from cmd/trace/cli/api/client_test.go
rename to cli/api/client_test.go
diff --git a/cmd/trace/cli/api/repositories.go b/cli/api/repositories.go
similarity index 100%
rename from cmd/trace/cli/api/repositories.go
rename to cli/api/repositories.go
diff --git a/cmd/trace/cli/api/repositories_test.go b/cli/api/repositories_test.go
similarity index 100%
rename from cmd/trace/cli/api/repositories_test.go
rename to cli/api/repositories_test.go
diff --git a/cmd/trace/cli/api/trail_types.go b/cli/api/trail_types.go
similarity index 98%
rename from cmd/trace/cli/api/trail_types.go
rename to cli/api/trail_types.go
index 9b2e830..5f50378 100644
--- a/cmd/trace/cli/api/trail_types.go
+++ b/cli/api/trail_types.go
@@ -3,7 +3,7 @@ package api
 import (
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trail"
+	"github.com/GrayCodeAI/trace/cli/trail"
 )
 
 // TrailListResponse is the response from GET /api/v1/trails/:org/:repo.
diff --git a/cmd/trace/cli/api/trail_types_test.go b/cli/api/trail_types_test.go
similarity index 100%
rename from cmd/trace/cli/api/trail_types_test.go
rename to cli/api/trail_types_test.go
diff --git a/cmd/trace/cli/api_client.go b/cli/api_client.go
similarity index 88%
rename from cmd/trace/cli/api_client.go
rename to cli/api_client.go
index 7162a14..d7a16f5 100644
--- a/cmd/trace/cli/api_client.go
+++ b/cli/api_client.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/auth"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/auth"
 )
 
 // NewAuthenticatedAPIClient creates an API client using the bearer token
diff --git a/cmd/trace/cli/attach.go b/cli/attach.go
similarity index 96%
rename from cmd/trace/cli/attach.go
rename to cli/attach.go
index 3f12d2c..1a943d4 100644
--- a/cmd/trace/cli/attach.go
+++ b/cli/attach.go
@@ -11,22 +11,22 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	cpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	cpkg "github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/perf"
 	"github.com/GrayCodeAI/trace/redact"
 
diff --git a/cmd/trace/cli/attach_test.go b/cli/attach_test.go
similarity index 97%
rename from cmd/trace/cli/attach_test.go
rename to cli/attach_test.go
index 6215dd9..c62f496 100644
--- a/cmd/trace/cli/attach_test.go
+++ b/cli/attach_test.go
@@ -11,19 +11,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"     // register agent
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"          // register agent
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/cursor"         // register agent
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid" // register agent
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"      // register agent
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	cpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode"     // register agent
+	_ "github.com/GrayCodeAI/trace/cli/agent/codex"          // register agent
+	_ "github.com/GrayCodeAI/trace/cli/agent/cursor"         // register agent
+	_ "github.com/GrayCodeAI/trace/cli/agent/factoryaidroid" // register agent
+	_ "github.com/GrayCodeAI/trace/cli/agent/geminicli"      // register agent
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	cpkg "github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/attach_transcript.go b/cli/attach_transcript.go
similarity index 92%
rename from cmd/trace/cli/attach_transcript.go
rename to cli/attach_transcript.go
index 3fa886d..eda72ed 100644
--- a/cmd/trace/cli/attach_transcript.go
+++ b/cli/attach_transcript.go
@@ -3,8 +3,8 @@ package cli
 import (
 	"encoding/json"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // transcriptMetadata holds metadata extracted from a single transcript parse pass.
diff --git a/cmd/trace/cli/auth.go b/cli/auth.go
similarity index 99%
rename from cmd/trace/cli/auth.go
rename to cli/auth.go
index 2cedd31..140b279 100644
--- a/cmd/trace/cli/auth.go
+++ b/cli/auth.go
@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"charm.land/lipgloss/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/auth"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/auth"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/auth/client.go b/cli/auth/client.go
similarity index 98%
rename from cmd/trace/cli/auth/client.go
rename to cli/auth/client.go
index dfbd9fb..f90b399 100644
--- a/cmd/trace/cli/auth/client.go
+++ b/cli/auth/client.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 const (
diff --git a/cmd/trace/cli/auth/client_test.go b/cli/auth/client_test.go
similarity index 100%
rename from cmd/trace/cli/auth/client_test.go
rename to cli/auth/client_test.go
diff --git a/cmd/trace/cli/auth/exchange.go b/cli/auth/exchange.go
similarity index 98%
rename from cmd/trace/cli/auth/exchange.go
rename to cli/auth/exchange.go
index 6b349e1..7b61e1d 100644
--- a/cmd/trace/cli/auth/exchange.go
+++ b/cli/auth/exchange.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 	"github.com/entireio/auth-go/tokenmanager"
 )
 
diff --git a/cmd/trace/cli/auth/provider.go b/cli/auth/provider.go
similarity index 98%
rename from cmd/trace/cli/auth/provider.go
rename to cli/auth/provider.go
index 2629123..3e94f64 100644
--- a/cmd/trace/cli/auth/provider.go
+++ b/cli/auth/provider.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 // ProviderVersionEnvVar overrides the auto-detected provider version.
diff --git a/cmd/trace/cli/auth/store.go b/cli/auth/store.go
similarity index 98%
rename from cmd/trace/cli/auth/store.go
rename to cli/auth/store.go
index 2065c7e..802395a 100644
--- a/cmd/trace/cli/auth/store.go
+++ b/cli/auth/store.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 	"github.com/entireio/auth-go/tokens"
 	"github.com/entireio/auth-go/tokenstore"
 	"github.com/zalando/go-keyring"
diff --git a/cmd/trace/cli/auth/store_filebackend.go b/cli/auth/store_filebackend.go
similarity index 96%
rename from cmd/trace/cli/auth/store_filebackend.go
rename to cli/auth/store_filebackend.go
index 19bfd0f..3de04d4 100644
--- a/cmd/trace/cli/auth/store_filebackend.go
+++ b/cli/auth/store_filebackend.go
@@ -2,7 +2,7 @@
 
 // File-backed auth store backend. Compiled only under the `authfilestore`
 // build tag, which is enabled by:
-//   - the integration test subprocess build (cmd/trace/cli/integration_test/setup_test.go)
+//   - the integration test subprocess build (cli/integration_test/setup_test.go)
 //   - test:integration / test:ci tasks (mise.toml) for running this package's
 //     tagged tests
 //
diff --git a/cmd/trace/cli/auth/store_filebackend_test.go b/cli/auth/store_filebackend_test.go
similarity index 100%
rename from cmd/trace/cli/auth/store_filebackend_test.go
rename to cli/auth/store_filebackend_test.go
diff --git a/cmd/trace/cli/auth/store_invariants_test.go b/cli/auth/store_invariants_test.go
similarity index 100%
rename from cmd/trace/cli/auth/store_invariants_test.go
rename to cli/auth/store_invariants_test.go
diff --git a/cmd/trace/cli/auth/store_test.go b/cli/auth/store_test.go
similarity index 99%
rename from cmd/trace/cli/auth/store_test.go
rename to cli/auth/store_test.go
index 1be83f0..f03d0f1 100644
--- a/cmd/trace/cli/auth/store_test.go
+++ b/cli/auth/store_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 	"github.com/entireio/auth-go/tokens"
 	"github.com/entireio/auth-go/tokenstore"
 	"github.com/zalando/go-keyring"
diff --git a/cmd/trace/cli/auth_test.go b/cli/auth_test.go
similarity index 99%
rename from cmd/trace/cli/auth_test.go
rename to cli/auth_test.go
index 5f61f3a..30cd1e8 100644
--- a/cmd/trace/cli/auth_test.go
+++ b/cli/auth_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 const (
diff --git a/cmd/trace/cli/bench_enable_test.go b/cli/bench_enable_test.go
similarity index 89%
rename from cmd/trace/cli/bench_enable_test.go
rename to cli/bench_enable_test.go
index 69d9dd3..8af55b3 100644
--- a/cmd/trace/cli/bench_enable_test.go
+++ b/cli/bench_enable_test.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/benchutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/benchutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 )
 
 // BenchmarkEnableCommand benchmarks the non-interactive enable path
diff --git a/cmd/trace/cli/bench_test.go b/cli/bench_test.go
similarity index 95%
rename from cmd/trace/cli/bench_test.go
rename to cli/bench_test.go
index 33ebd7f..65b407a 100644
--- a/cmd/trace/cli/bench_test.go
+++ b/cli/bench_test.go
@@ -5,9 +5,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/benchutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/benchutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 /* To use the interactive flame graph, run:
diff --git a/cmd/trace/cli/benchutil/bench_test.go b/cli/benchutil/bench_test.go
similarity index 98%
rename from cmd/trace/cli/benchutil/bench_test.go
rename to cli/benchutil/bench_test.go
index 806ff6f..2215ead 100644
--- a/cmd/trace/cli/benchutil/bench_test.go
+++ b/cli/benchutil/bench_test.go
@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/GrayCodeAI/trace/redact"
 
 	gogit "github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/benchutil/benchutil.go b/cli/benchutil/benchutil.go
similarity index 97%
rename from cmd/trace/cli/benchutil/benchutil.go
rename to cli/benchutil/benchutil.go
index 1574457..cdd4af8 100644
--- a/cmd/trace/cli/benchutil/benchutil.go
+++ b/cli/benchutil/benchutil.go
@@ -15,13 +15,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/benchutil/benchutil_test.go b/cli/benchutil/benchutil_test.go
similarity index 97%
rename from cmd/trace/cli/benchutil/benchutil_test.go
rename to cli/benchutil/benchutil_test.go
index b0d0947..472cd81 100644
--- a/cmd/trace/cli/benchutil/benchutil_test.go
+++ b/cli/benchutil/benchutil_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 func BenchmarkNewBenchRepo(b *testing.B) {
diff --git a/cmd/trace/cli/benchutil/parse_tree_bench_test.go b/cli/benchutil/parse_tree_bench_test.go
similarity index 99%
rename from cmd/trace/cli/benchutil/parse_tree_bench_test.go
rename to cli/benchutil/parse_tree_bench_test.go
index db28167..a8700bc 100644
--- a/cmd/trace/cli/benchutil/parse_tree_bench_test.go
+++ b/cli/benchutil/parse_tree_bench_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
 
 	gogit "github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/checkpoint/backwards_compat_test.go b/cli/checkpoint/backwards_compat_test.go
similarity index 95%
rename from cmd/trace/cli/checkpoint/backwards_compat_test.go
rename to cli/checkpoint/backwards_compat_test.go
index d894db1..b64ec4a 100644
--- a/cmd/trace/cli/checkpoint/backwards_compat_test.go
+++ b/cli/checkpoint/backwards_compat_test.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/checkpoint/blob_resolver.go b/cli/checkpoint/blob_resolver.go
similarity index 96%
rename from cmd/trace/cli/checkpoint/blob_resolver.go
rename to cli/checkpoint/blob_resolver.go
index f85be26..dc2b4e8 100644
--- a/cmd/trace/cli/checkpoint/blob_resolver.go
+++ b/cli/checkpoint/blob_resolver.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/checkpoint/blob_resolver_test.go b/cli/checkpoint/blob_resolver_test.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/blob_resolver_test.go
rename to cli/checkpoint/blob_resolver_test.go
index 4f4781d..eafef7b 100644
--- a/cmd/trace/cli/checkpoint/blob_resolver_test.go
+++ b/cli/checkpoint/blob_resolver_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/checkpoint/checkpoint.go b/cli/checkpoint/checkpoint.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/checkpoint.go
rename to cli/checkpoint/checkpoint.go
index 95dfd94..4a34994 100644
--- a/cmd/trace/cli/checkpoint/checkpoint.go
+++ b/cli/checkpoint/checkpoint.go
@@ -12,9 +12,9 @@ import (
 	"errors"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/checkpoint/checkpoint_test.go b/cli/checkpoint/checkpoint_test.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/checkpoint_test.go
rename to cli/checkpoint/checkpoint_test.go
index fc94426..423952e 100644
--- a/cmd/trace/cli/checkpoint/checkpoint_test.go
+++ b/cli/checkpoint/checkpoint_test.go
@@ -13,13 +13,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/vercelconfig"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/vercelconfig"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/require"
 
diff --git a/cmd/trace/cli/checkpoint/committed.go b/cli/checkpoint/committed.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/committed.go
rename to cli/checkpoint/committed.go
index 7578da3..36f4751 100644
--- a/cmd/trace/cli/checkpoint/committed.go
+++ b/cli/checkpoint/committed.go
@@ -16,18 +16,18 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/vercelconfig"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/codex"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/vercelconfig"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/perf"
 	"github.com/GrayCodeAI/trace/redact"
 
@@ -1813,7 +1813,7 @@ func createRedactedBlobFromFile(repo *git.Repository, filePath, treePath string)
 // checking both the repository-local config and the global ~/.gitconfig.
 func GetGitAuthorFromRepo(repo *git.Repository) (name, email string) {
 	// ConfigScoped merges local + global (local wins), matching git's own resolution.
-	// Requires a ConfigLoader plugin to be registered; cmd/trace/main.go blank-imports
+	// Requires a ConfigLoader plugin to be registered; the hawk binary blank-imports
 	// go-git/v6/x/plugin to register the default Auto loader.
 	if cfg, err := repo.ConfigScoped(config.GlobalScope); err == nil {
 		name = cfg.User.Name
diff --git a/cmd/trace/cli/checkpoint/committed_phantom_paths_test.go b/cli/checkpoint/committed_phantom_paths_test.go
similarity index 96%
rename from cmd/trace/cli/checkpoint/committed_phantom_paths_test.go
rename to cli/checkpoint/committed_phantom_paths_test.go
index 7cb005d..623de2a 100644
--- a/cmd/trace/cli/checkpoint/committed_phantom_paths_test.go
+++ b/cli/checkpoint/committed_phantom_paths_test.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/checkpoint/committed_reader_resolve.go b/cli/checkpoint/committed_reader_resolve.go
similarity index 96%
rename from cmd/trace/cli/checkpoint/committed_reader_resolve.go
rename to cli/checkpoint/committed_reader_resolve.go
index 85c7ba2..1936216 100644
--- a/cmd/trace/cli/checkpoint/committed_reader_resolve.go
+++ b/cli/checkpoint/committed_reader_resolve.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"log/slog"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // CommittedReader provides read access to committed checkpoint data.
diff --git a/cmd/trace/cli/checkpoint/committed_reader_resolve_test.go b/cli/checkpoint/committed_reader_resolve_test.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/committed_reader_resolve_test.go
rename to cli/checkpoint/committed_reader_resolve_test.go
index 0fd8421..b115bbb 100644
--- a/cmd/trace/cli/checkpoint/committed_reader_resolve_test.go
+++ b/cli/checkpoint/committed_reader_resolve_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/require"
 
diff --git a/cmd/trace/cli/checkpoint/committed_signing_test.go b/cli/checkpoint/committed_signing_test.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/committed_signing_test.go
rename to cli/checkpoint/committed_signing_test.go
index 3e66536..268d879 100644
--- a/cmd/trace/cli/checkpoint/committed_signing_test.go
+++ b/cli/checkpoint/committed_signing_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/checkpoint/committed_tripwire_test.go b/cli/checkpoint/committed_tripwire_test.go
similarity index 90%
rename from cmd/trace/cli/checkpoint/committed_tripwire_test.go
rename to cli/checkpoint/committed_tripwire_test.go
index 89977b6..4daf06a 100644
--- a/cmd/trace/cli/checkpoint/committed_tripwire_test.go
+++ b/cli/checkpoint/committed_tripwire_test.go
@@ -5,11 +5,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/checkpoint/committed_update_test.go b/cli/checkpoint/committed_update_test.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/committed_update_test.go
rename to cli/checkpoint/committed_update_test.go
index 0c571ba..34cc2df 100644
--- a/cmd/trace/cli/checkpoint/committed_update_test.go
+++ b/cli/checkpoint/committed_update_test.go
@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/checkpoint/configloader.go b/cli/checkpoint/configloader.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/configloader.go
rename to cli/checkpoint/configloader.go
diff --git a/cmd/trace/cli/checkpoint/configloader_test.go b/cli/checkpoint/configloader_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/configloader_test.go
rename to cli/checkpoint/configloader_test.go
diff --git a/cmd/trace/cli/checkpoint/fetching_tree.go b/cli/checkpoint/fetching_tree.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/fetching_tree.go
rename to cli/checkpoint/fetching_tree.go
index 071da20..7c9f76c 100644
--- a/cmd/trace/cli/checkpoint/fetching_tree.go
+++ b/cli/checkpoint/fetching_tree.go
@@ -7,7 +7,7 @@ import (
 	"log/slog"
 	"os/exec"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/logging"
 
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/checkpoint/global_test.go b/cli/checkpoint/global_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/global_test.go
rename to cli/checkpoint/global_test.go
diff --git a/cmd/trace/cli/checkpoint/id/id.go b/cli/checkpoint/id/id.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/id/id.go
rename to cli/checkpoint/id/id.go
diff --git a/cmd/trace/cli/checkpoint/id/id_test.go b/cli/checkpoint/id/id_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/id/id_test.go
rename to cli/checkpoint/id/id_test.go
diff --git a/cmd/trace/cli/checkpoint/objectsigner.go b/cli/checkpoint/objectsigner.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/objectsigner.go
rename to cli/checkpoint/objectsigner.go
index c00a2a5..b8ff7de 100644
--- a/cmd/trace/cli/checkpoint/objectsigner.go
+++ b/cli/checkpoint/objectsigner.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"os"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/logging"
 	"github.com/go-git/go-git/v6/config"
 	format "github.com/go-git/go-git/v6/plumbing/format/config"
 	"github.com/go-git/go-git/v6/x/plugin"
diff --git a/cmd/trace/cli/checkpoint/objectsigner_test.go b/cli/checkpoint/objectsigner_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/objectsigner_test.go
rename to cli/checkpoint/objectsigner_test.go
diff --git a/cmd/trace/cli/checkpoint/parse_tree.go b/cli/checkpoint/parse_tree.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/parse_tree.go
rename to cli/checkpoint/parse_tree.go
index 6b07967..9979d96 100644
--- a/cmd/trace/cli/checkpoint/parse_tree.go
+++ b/cli/checkpoint/parse_tree.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/checkpoint/parse_tree_test.go b/cli/checkpoint/parse_tree_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/parse_tree_test.go
rename to cli/checkpoint/parse_tree_test.go
diff --git a/cmd/trace/cli/checkpoint/prompts.go b/cli/checkpoint/prompts.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/prompts.go
rename to cli/checkpoint/prompts.go
diff --git a/cmd/trace/cli/checkpoint/prompts_test.go b/cli/checkpoint/prompts_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/prompts_test.go
rename to cli/checkpoint/prompts_test.go
diff --git a/cmd/trace/cli/checkpoint/remote/command_cancel.go b/cli/checkpoint/remote/command_cancel.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/remote/command_cancel.go
rename to cli/checkpoint/remote/command_cancel.go
diff --git a/cmd/trace/cli/checkpoint/remote/command_cancel_test.go b/cli/checkpoint/remote/command_cancel_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/remote/command_cancel_test.go
rename to cli/checkpoint/remote/command_cancel_test.go
diff --git a/cmd/trace/cli/checkpoint/remote/command_cancel_unix.go b/cli/checkpoint/remote/command_cancel_unix.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/remote/command_cancel_unix.go
rename to cli/checkpoint/remote/command_cancel_unix.go
diff --git a/cmd/trace/cli/checkpoint/remote/command_cancel_unix_test.go b/cli/checkpoint/remote/command_cancel_unix_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/remote/command_cancel_unix_test.go
rename to cli/checkpoint/remote/command_cancel_unix_test.go
diff --git a/cmd/trace/cli/checkpoint/remote/command_cancel_windows.go b/cli/checkpoint/remote/command_cancel_windows.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/remote/command_cancel_windows.go
rename to cli/checkpoint/remote/command_cancel_windows.go
diff --git a/cmd/trace/cli/checkpoint/remote/git.go b/cli/checkpoint/remote/git.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/remote/git.go
rename to cli/checkpoint/remote/git.go
index d92972d..caa2b4a 100644
--- a/cmd/trace/cli/checkpoint/remote/git.go
+++ b/cli/checkpoint/remote/git.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 // CheckpointTokenEnvVar is the environment variable for providing an access token
diff --git a/cmd/trace/cli/checkpoint/remote/git_test.go b/cli/checkpoint/remote/git_test.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/remote/git_test.go
rename to cli/checkpoint/remote/git_test.go
index 1d54823..a863a4d 100644
--- a/cmd/trace/cli/checkpoint/remote/git_test.go
+++ b/cli/checkpoint/remote/git_test.go
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/checkpoint/remote/util.go b/cli/checkpoint/remote/util.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/remote/util.go
rename to cli/checkpoint/remote/util.go
index 77e764a..56ed81e 100644
--- a/cmd/trace/cli/checkpoint/remote/util.go
+++ b/cli/checkpoint/remote/util.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/gitremote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/gitremote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 const originRemote = "origin"
diff --git a/cmd/trace/cli/checkpoint/remote/util_test.go b/cli/checkpoint/remote/util_test.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/remote/util_test.go
rename to cli/checkpoint/remote/util_test.go
index 5db6f32..8872758 100644
--- a/cmd/trace/cli/checkpoint/remote/util_test.go
+++ b/cli/checkpoint/remote/util_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6"
 )
 
diff --git a/cmd/trace/cli/checkpoint/shadow_ref.go b/cli/checkpoint/shadow_ref.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/shadow_ref.go
rename to cli/checkpoint/shadow_ref.go
index a609d18..792cbc0 100644
--- a/cmd/trace/cli/checkpoint/shadow_ref.go
+++ b/cli/checkpoint/shadow_ref.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/internal/flock"
+	"github.com/GrayCodeAI/trace/cli/internal/flock"
 
 	"github.com/go-git/go-git/v6/plumbing"
 )
diff --git a/cmd/trace/cli/checkpoint/store.go b/cli/checkpoint/store.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/store.go
rename to cli/checkpoint/store.go
diff --git a/cmd/trace/cli/checkpoint/temporary.go b/cli/checkpoint/temporary.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/temporary.go
rename to cli/checkpoint/temporary.go
index 47bdc47..a47b53e 100644
--- a/cmd/trace/cli/checkpoint/temporary.go
+++ b/cli/checkpoint/temporary.go
@@ -15,13 +15,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/validation"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/checkpoint/temporary_test.go b/cli/checkpoint/temporary_test.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/temporary_test.go
rename to cli/checkpoint/temporary_test.go
index a54c8e6..7604c54 100644
--- a/cmd/trace/cli/checkpoint/temporary_test.go
+++ b/cli/checkpoint/temporary_test.go
@@ -3,7 +3,7 @@ package checkpoint
 import (
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 func TestHashWorktreeID(t *testing.T) {
diff --git a/cmd/trace/cli/checkpoint/tree_surgery_equiv_test.go b/cli/checkpoint/tree_surgery_equiv_test.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/tree_surgery_equiv_test.go
rename to cli/checkpoint/tree_surgery_equiv_test.go
diff --git a/cmd/trace/cli/checkpoint/v2_committed.go b/cli/checkpoint/v2_committed.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/v2_committed.go
rename to cli/checkpoint/v2_committed.go
index 0678908..470831a 100644
--- a/cmd/trace/cli/checkpoint/v2_committed.go
+++ b/cli/checkpoint/v2_committed.go
@@ -10,14 +10,14 @@ import (
 	"os"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/checkpoint/v2_committed_tripwire_test.go b/cli/checkpoint/v2_committed_tripwire_test.go
similarity index 90%
rename from cmd/trace/cli/checkpoint/v2_committed_tripwire_test.go
rename to cli/checkpoint/v2_committed_tripwire_test.go
index a7de965..631350d 100644
--- a/cmd/trace/cli/checkpoint/v2_committed_tripwire_test.go
+++ b/cli/checkpoint/v2_committed_tripwire_test.go
@@ -5,11 +5,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 
 	"github.com/go-git/go-git/v6/plumbing/filemode"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/checkpoint/v2_fixture_test.go b/cli/checkpoint/v2_fixture_test.go
similarity index 92%
rename from cmd/trace/cli/checkpoint/v2_fixture_test.go
rename to cli/checkpoint/v2_fixture_test.go
index 58911a3..2fba95f 100644
--- a/cmd/trace/cli/checkpoint/v2_fixture_test.go
+++ b/cli/checkpoint/v2_fixture_test.go
@@ -3,8 +3,8 @@ package checkpoint
 import (
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/stretchr/testify/require"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/checkpoint/v2_generation.go b/cli/checkpoint/v2_generation.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/v2_generation.go
rename to cli/checkpoint/v2_generation.go
index 34413e6..bf71a8a 100644
--- a/cmd/trace/cli/checkpoint/v2_generation.go
+++ b/cli/checkpoint/v2_generation.go
@@ -15,10 +15,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/filemode"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/checkpoint/v2_generation_test.go b/cli/checkpoint/v2_generation_test.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/v2_generation_test.go
rename to cli/checkpoint/v2_generation_test.go
index 9ad75fb..6eea21b 100644
--- a/cmd/trace/cli/checkpoint/v2_generation_test.go
+++ b/cli/checkpoint/v2_generation_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/checkpoint/v2_pending_rotation.go b/cli/checkpoint/v2_pending_rotation.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/v2_pending_rotation.go
rename to cli/checkpoint/v2_pending_rotation.go
index 75b1b6b..8a6b871 100644
--- a/cmd/trace/cli/checkpoint/v2_pending_rotation.go
+++ b/cli/checkpoint/v2_pending_rotation.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/lockfile"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/lockfile"
 	"github.com/go-git/go-git/v6"
 )
 
diff --git a/cmd/trace/cli/checkpoint/v2_precompute_test.go b/cli/checkpoint/v2_precompute_test.go
similarity index 97%
rename from cmd/trace/cli/checkpoint/v2_precompute_test.go
rename to cli/checkpoint/v2_precompute_test.go
index d0cf6ca..2458d7b 100644
--- a/cmd/trace/cli/checkpoint/v2_precompute_test.go
+++ b/cli/checkpoint/v2_precompute_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/require"
 
diff --git a/cmd/trace/cli/checkpoint/v2_read.go b/cli/checkpoint/v2_read.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/v2_read.go
rename to cli/checkpoint/v2_read.go
index 851f797..9a4dadf 100644
--- a/cmd/trace/cli/checkpoint/v2_read.go
+++ b/cli/checkpoint/v2_read.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/checkpoint/v2_read_test.go b/cli/checkpoint/v2_read_test.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/v2_read_test.go
rename to cli/checkpoint/v2_read_test.go
index 4d1f8d7..1363911 100644
--- a/cmd/trace/cli/checkpoint/v2_read_test.go
+++ b/cli/checkpoint/v2_read_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/checkpoint/v2_resolve.go b/cli/checkpoint/v2_resolve.go
similarity index 97%
rename from cmd/trace/cli/checkpoint/v2_resolve.go
rename to cli/checkpoint/v2_resolve.go
index ff15a86..c317d20 100644
--- a/cmd/trace/cli/checkpoint/v2_resolve.go
+++ b/cli/checkpoint/v2_resolve.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/checkpoint/v2_resolve_test.go b/cli/checkpoint/v2_resolve_test.go
similarity index 98%
rename from cmd/trace/cli/checkpoint/v2_resolve_test.go
rename to cli/checkpoint/v2_resolve_test.go
index fa3e07d..6dbb2a8 100644
--- a/cmd/trace/cli/checkpoint/v2_resolve_test.go
+++ b/cli/checkpoint/v2_resolve_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/checkpoint/v2_store.go b/cli/checkpoint/v2_store.go
similarity index 100%
rename from cmd/trace/cli/checkpoint/v2_store.go
rename to cli/checkpoint/v2_store.go
diff --git a/cmd/trace/cli/checkpoint/v2_store_test.go b/cli/checkpoint/v2_store_test.go
similarity index 99%
rename from cmd/trace/cli/checkpoint/v2_store_test.go
rename to cli/checkpoint/v2_store_test.go
index 999014a..6d12c2e 100644
--- a/cmd/trace/cli/checkpoint/v2_store_test.go
+++ b/cli/checkpoint/v2_store_test.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/checkpoint_group.go b/cli/checkpoint_group.go
similarity index 97%
rename from cmd/trace/cli/checkpoint_group.go
rename to cli/checkpoint_group.go
index e1c8bb7..97324a2 100644
--- a/cmd/trace/cli/checkpoint_group.go
+++ b/cli/checkpoint_group.go
@@ -3,7 +3,7 @@ package cli
 import (
 	"errors"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/ci_init_cmd.go b/cli/ci_init_cmd.go
similarity index 98%
rename from cmd/trace/cli/ci_init_cmd.go
rename to cli/ci_init_cmd.go
index 5f1a234..d4692c6 100644
--- a/cmd/trace/cli/ci_init_cmd.go
+++ b/cli/ci_init_cmd.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"sort"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/settings"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/ci_init_cmd_test.go b/cli/ci_init_cmd_test.go
similarity index 98%
rename from cmd/trace/cli/ci_init_cmd_test.go
rename to cli/ci_init_cmd_test.go
index a407fbb..e95bbb0 100644
--- a/cmd/trace/cli/ci_init_cmd_test.go
+++ b/cli/ci_init_cmd_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 // stubEnv builds a getenvFunc backed by a fixed map (parallel-safe; no
diff --git a/cmd/trace/cli/clean.go b/cli/clean.go
similarity index 98%
rename from cmd/trace/cli/clean.go
rename to cli/clean.go
index fb7c37f..007a6ee 100644
--- a/cmd/trace/cli/clean.go
+++ b/cli/clean.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 
 	"charm.land/huh/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/trace/cli/clean_test.go b/cli/clean_test.go
similarity index 99%
rename from cmd/trace/cli/clean_test.go
rename to cli/clean_test.go
index 40d1c61..07d23fd 100644
--- a/cmd/trace/cli/clean_test.go
+++ b/cli/clean_test.go
@@ -12,10 +12,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/filemode"
diff --git a/cmd/trace/cli/commit_attribution.go b/cli/commit_attribution.go
similarity index 95%
rename from cmd/trace/cli/commit_attribution.go
rename to cli/commit_attribution.go
index a0ee509..72ee5cc 100644
--- a/cmd/trace/cli/commit_attribution.go
+++ b/cli/commit_attribution.go
@@ -6,10 +6,10 @@ import (
 	"log/slog"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 )
 
 // agentIdentityEmailDomain is the noreply domain used for synthesized agent
diff --git a/cmd/trace/cli/commit_attribution_test.go b/cli/commit_attribution_test.go
similarity index 98%
rename from cmd/trace/cli/commit_attribution_test.go
rename to cli/commit_attribution_test.go
index a7944f5..d176a20 100644
--- a/cmd/trace/cli/commit_attribution_test.go
+++ b/cli/commit_attribution_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/settings"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/commit_message.go b/cli/commit_message.go
similarity index 90%
rename from cmd/trace/cli/commit_message.go
rename to cli/commit_message.go
index 879d7a1..f72c17c 100644
--- a/cmd/trace/cli/commit_message.go
+++ b/cli/commit_message.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
 )
 
 // generateCommitMessage creates a commit message from the user's original prompt.
diff --git a/cmd/trace/cli/commit_message_test.go b/cli/commit_message_test.go
similarity index 98%
rename from cmd/trace/cli/commit_message_test.go
rename to cli/commit_message_test.go
index 3f0be9f..87757cf 100644
--- a/cmd/trace/cli/commit_message_test.go
+++ b/cli/commit_message_test.go
@@ -3,8 +3,8 @@ package cli
 import (
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 func TestCleanPromptForCommit(t *testing.T) {
diff --git a/cmd/trace/cli/config.go b/cli/config.go
similarity index 89%
rename from cmd/trace/cli/config.go
rename to cli/config.go
index a9e12a0..7150072 100644
--- a/cmd/trace/cli/config.go
+++ b/cli/config.go
@@ -5,15 +5,15 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 
 	// Import agents to register them
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	_ "github.com/GrayCodeAI/trace/cli/agent/codex"
+	_ "github.com/GrayCodeAI/trace/cli/agent/factoryaidroid"
 )
 
 // Package-level aliases to avoid shadowing the settings package with local variables named "settings".
diff --git a/cmd/trace/cli/config_test.go b/cli/config_test.go
similarity index 100%
rename from cmd/trace/cli/config_test.go
rename to cli/config_test.go
diff --git a/cmd/trace/cli/constants.go b/cli/constants.go
similarity index 85%
rename from cmd/trace/cli/constants.go
rename to cli/constants.go
index 52a47fd..6fb6c97 100644
--- a/cmd/trace/cli/constants.go
+++ b/cli/constants.go
@@ -1,6 +1,6 @@
 package cli
 
-import "github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+import "github.com/GrayCodeAI/trace/cli/paths"
 
 // Note: Tool name constants (ToolWrite, ToolEdit, etc.) and FileModificationTools
 // have been moved to the agent/claudecode package.
diff --git a/cmd/trace/cli/cost/compute.go b/cli/cost/compute.go
similarity index 98%
rename from cmd/trace/cli/cost/compute.go
rename to cli/cost/compute.go
index 5482e5d..6732136 100644
--- a/cmd/trace/cli/cost/compute.go
+++ b/cli/cost/compute.go
@@ -1,7 +1,7 @@
 package cost
 
 import (
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Breakdown is the per-token-class dollar decomposition of a cost computation,
diff --git a/cmd/trace/cli/cost/compute_test.go b/cli/cost/compute_test.go
similarity index 98%
rename from cmd/trace/cli/cost/compute_test.go
rename to cli/cost/compute_test.go
index 51828b3..4618535 100644
--- a/cmd/trace/cli/cost/compute_test.go
+++ b/cli/cost/compute_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 const epsilon = 1e-9
diff --git a/cmd/trace/cli/cost/pricing.go b/cli/cost/pricing.go
similarity index 100%
rename from cmd/trace/cli/cost/pricing.go
rename to cli/cost/pricing.go
diff --git a/cmd/trace/cli/diff_renderer.go b/cli/diff_renderer.go
similarity index 100%
rename from cmd/trace/cli/diff_renderer.go
rename to cli/diff_renderer.go
diff --git a/cmd/trace/cli/diff_renderer_test.go b/cli/diff_renderer_test.go
similarity index 100%
rename from cmd/trace/cli/diff_renderer_test.go
rename to cli/diff_renderer_test.go
diff --git a/cmd/trace/cli/dirty_commit.go b/cli/dirty_commit.go
similarity index 98%
rename from cmd/trace/cli/dirty_commit.go
rename to cli/dirty_commit.go
index 962c0b5..da80b9b 100644
--- a/cmd/trace/cli/dirty_commit.go
+++ b/cli/dirty_commit.go
@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // dirtyCommitMessage is the commit message used for the pre-session
diff --git a/cmd/trace/cli/dirty_commit_test.go b/cli/dirty_commit_test.go
similarity index 100%
rename from cmd/trace/cli/dirty_commit_test.go
rename to cli/dirty_commit_test.go
diff --git a/cmd/trace/cli/dispatch.go b/cli/dispatch.go
similarity index 97%
rename from cmd/trace/cli/dispatch.go
rename to cli/dispatch.go
index f5abd86..0d76929 100644
--- a/cmd/trace/cli/dispatch.go
+++ b/cli/dispatch.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"os"
 
-	dispatchpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/dispatch"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
+	dispatchpkg "github.com/GrayCodeAI/trace/cli/dispatch"
+	"github.com/GrayCodeAI/trace/cli/interactive"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 )
diff --git a/cmd/trace/cli/dispatch/cloud.go b/cli/dispatch/cloud.go
similarity index 98%
rename from cmd/trace/cli/dispatch/cloud.go
rename to cli/dispatch/cloud.go
index f373043..93ded9e 100644
--- a/cmd/trace/cli/dispatch/cloud.go
+++ b/cli/dispatch/cloud.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 type CloudConfig struct {
diff --git a/cmd/trace/cli/dispatch/cloud_test.go b/cli/dispatch/cloud_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/cloud_test.go
rename to cli/dispatch/cloud_test.go
diff --git a/cmd/trace/cli/dispatch/consts_test.go b/cli/dispatch/consts_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/consts_test.go
rename to cli/dispatch/consts_test.go
diff --git a/cmd/trace/cli/dispatch/dispatch.go b/cli/dispatch/dispatch.go
similarity index 100%
rename from cmd/trace/cli/dispatch/dispatch.go
rename to cli/dispatch/dispatch.go
diff --git a/cmd/trace/cli/dispatch/dispatch_test.go b/cli/dispatch/dispatch_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/dispatch_test.go
rename to cli/dispatch/dispatch_test.go
diff --git a/cmd/trace/cli/dispatch/fallback.go b/cli/dispatch/fallback.go
similarity index 100%
rename from cmd/trace/cli/dispatch/fallback.go
rename to cli/dispatch/fallback.go
diff --git a/cmd/trace/cli/dispatch/fallback_test.go b/cli/dispatch/fallback_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/fallback_test.go
rename to cli/dispatch/fallback_test.go
diff --git a/cmd/trace/cli/dispatch/flags.go b/cli/dispatch/flags.go
similarity index 100%
rename from cmd/trace/cli/dispatch/flags.go
rename to cli/dispatch/flags.go
diff --git a/cmd/trace/cli/dispatch/flags_test.go b/cli/dispatch/flags_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/flags_test.go
rename to cli/dispatch/flags_test.go
diff --git a/cmd/trace/cli/dispatch/generate.go b/cli/dispatch/generate.go
similarity index 97%
rename from cmd/trace/cli/dispatch/generate.go
rename to cli/dispatch/generate.go
index 28dab62..078355c 100644
--- a/cmd/trace/cli/dispatch/generate.go
+++ b/cli/dispatch/generate.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/summarize"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/summarize"
 )
 
 type dispatchTextGenerator interface {
diff --git a/cmd/trace/cli/dispatch/generate_test.go b/cli/dispatch/generate_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/generate_test.go
rename to cli/dispatch/generate_test.go
diff --git a/cmd/trace/cli/dispatch/mode_cloud.go b/cli/dispatch/mode_cloud.go
similarity index 97%
rename from cmd/trace/cli/dispatch/mode_cloud.go
rename to cli/dispatch/mode_cloud.go
index de85441..beb5fd9 100644
--- a/cmd/trace/cli/dispatch/mode_cloud.go
+++ b/cli/dispatch/mode_cloud.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/go-git/go-git/v6"
 )
 
diff --git a/cmd/trace/cli/dispatch/mode_cloud_test.go b/cli/dispatch/mode_cloud_test.go
similarity index 99%
rename from cmd/trace/cli/dispatch/mode_cloud_test.go
rename to cli/dispatch/mode_cloud_test.go
index dc9c407..c78c497 100644
--- a/cmd/trace/cli/dispatch/mode_cloud_test.go
+++ b/cli/dispatch/mode_cloud_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // stubCloudDispatchAuth swaps the package-level auth/secure-URL hooks to
diff --git a/cmd/trace/cli/dispatch/mode_local.go b/cli/dispatch/mode_local.go
similarity index 97%
rename from cmd/trace/cli/dispatch/mode_local.go
rename to cli/dispatch/mode_local.go
index a09ff5a..250705e 100644
--- a/cmd/trace/cli/dispatch/mode_local.go
+++ b/cli/dispatch/mode_local.go
@@ -10,12 +10,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/auth"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/search"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/auth"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/search"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 	"golang.org/x/sync/errgroup"
diff --git a/cmd/trace/cli/dispatch/mode_local_test.go b/cli/dispatch/mode_local_test.go
similarity index 98%
rename from cmd/trace/cli/dispatch/mode_local_test.go
rename to cli/dispatch/mode_local_test.go
index 3b4232c..cfead33 100644
--- a/cmd/trace/cli/dispatch/mode_local_test.go
+++ b/cli/dispatch/mode_local_test.go
@@ -9,11 +9,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	checkpointid "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	checkpointid "github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/config"
diff --git a/cmd/trace/cli/dispatch/options.go b/cli/dispatch/options.go
similarity index 100%
rename from cmd/trace/cli/dispatch/options.go
rename to cli/dispatch/options.go
diff --git a/cmd/trace/cli/dispatch/options_test.go b/cli/dispatch/options_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/options_test.go
rename to cli/dispatch/options_test.go
diff --git a/cmd/trace/cli/dispatch/render.go b/cli/dispatch/render.go
similarity index 100%
rename from cmd/trace/cli/dispatch/render.go
rename to cli/dispatch/render.go
diff --git a/cmd/trace/cli/dispatch/render_test.go b/cli/dispatch/render_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/render_test.go
rename to cli/dispatch/render_test.go
diff --git a/cmd/trace/cli/dispatch/repo_url.go b/cli/dispatch/repo_url.go
similarity index 100%
rename from cmd/trace/cli/dispatch/repo_url.go
rename to cli/dispatch/repo_url.go
diff --git a/cmd/trace/cli/dispatch/repo_url_test.go b/cli/dispatch/repo_url_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/repo_url_test.go
rename to cli/dispatch/repo_url_test.go
diff --git a/cmd/trace/cli/dispatch/types.go b/cli/dispatch/types.go
similarity index 100%
rename from cmd/trace/cli/dispatch/types.go
rename to cli/dispatch/types.go
diff --git a/cmd/trace/cli/dispatch/voices.go b/cli/dispatch/voices.go
similarity index 100%
rename from cmd/trace/cli/dispatch/voices.go
rename to cli/dispatch/voices.go
diff --git a/cmd/trace/cli/dispatch/voices/marvin.md b/cli/dispatch/voices/marvin.md
similarity index 100%
rename from cmd/trace/cli/dispatch/voices/marvin.md
rename to cli/dispatch/voices/marvin.md
diff --git a/cmd/trace/cli/dispatch/voices/neutral.md b/cli/dispatch/voices/neutral.md
similarity index 100%
rename from cmd/trace/cli/dispatch/voices/neutral.md
rename to cli/dispatch/voices/neutral.md
diff --git a/cmd/trace/cli/dispatch/voices_test.go b/cli/dispatch/voices_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch/voices_test.go
rename to cli/dispatch/voices_test.go
diff --git a/cmd/trace/cli/dispatch_consts_test.go b/cli/dispatch_consts_test.go
similarity index 100%
rename from cmd/trace/cli/dispatch_consts_test.go
rename to cli/dispatch_consts_test.go
diff --git a/cmd/trace/cli/dispatch_test.go b/cli/dispatch_test.go
similarity index 99%
rename from cmd/trace/cli/dispatch_test.go
rename to cli/dispatch_test.go
index c669992..2e12a1c 100644
--- a/cmd/trace/cli/dispatch_test.go
+++ b/cli/dispatch_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	dispatchpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/dispatch"
+	dispatchpkg "github.com/GrayCodeAI/trace/cli/dispatch"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/dispatch_tui.go b/cli/dispatch_tui.go
similarity index 99%
rename from cmd/trace/cli/dispatch_tui.go
rename to cli/dispatch_tui.go
index f672ad7..f81f2c6 100644
--- a/cmd/trace/cli/dispatch_tui.go
+++ b/cli/dispatch_tui.go
@@ -14,7 +14,7 @@ import (
 	"charm.land/glamour/v2/ansi"
 	glamourstyles "charm.land/glamour/v2/styles"
 	"charm.land/lipgloss/v2"
-	dispatchpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/dispatch"
+	dispatchpkg "github.com/GrayCodeAI/trace/cli/dispatch"
 	"github.com/muesli/termenv"
 )
 
diff --git a/cmd/trace/cli/dispatch_tui_test.go b/cli/dispatch_tui_test.go
similarity index 98%
rename from cmd/trace/cli/dispatch_tui_test.go
rename to cli/dispatch_tui_test.go
index c9e00df..5896df5 100644
--- a/cmd/trace/cli/dispatch_tui_test.go
+++ b/cli/dispatch_tui_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	tea "charm.land/bubbletea/v2"
-	dispatchpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/dispatch"
+	dispatchpkg "github.com/GrayCodeAI/trace/cli/dispatch"
 )
 
 type fakeDispatchProgram struct {
diff --git a/cmd/trace/cli/dispatch_wizard.go b/cli/dispatch_wizard.go
similarity index 98%
rename from cmd/trace/cli/dispatch_wizard.go
rename to cli/dispatch_wizard.go
index 744d108..a46a42f 100644
--- a/cmd/trace/cli/dispatch_wizard.go
+++ b/cli/dispatch_wizard.go
@@ -12,11 +12,11 @@ import (
 	"sync"
 
 	"charm.land/huh/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	dispatchpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/dispatch"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	searchpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/search"
+	"github.com/GrayCodeAI/trace/cli/api"
+	dispatchpkg "github.com/GrayCodeAI/trace/cli/dispatch"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	searchpkg "github.com/GrayCodeAI/trace/cli/search"
 	"github.com/go-git/go-git/v6"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/trace/cli/dispatch_wizard_test.go b/cli/dispatch_wizard_test.go
similarity index 98%
rename from cmd/trace/cli/dispatch_wizard_test.go
rename to cli/dispatch_wizard_test.go
index b77bf6d..2db4224 100644
--- a/cmd/trace/cli/dispatch_wizard_test.go
+++ b/cli/dispatch_wizard_test.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"charm.land/huh/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	dispatchpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/dispatch"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/api"
+	dispatchpkg "github.com/GrayCodeAI/trace/cli/dispatch"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/doctor.go b/cli/doctor.go
similarity index 98%
rename from cmd/trace/cli/doctor.go
rename to cli/doctor.go
index 28e3b0c..9a37104 100644
--- a/cmd/trace/cli/doctor.go
+++ b/cli/doctor.go
@@ -9,12 +9,12 @@ import (
 	"time"
 
 	"charm.land/huh/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/doctor_bundle.go b/cli/doctor_bundle.go
similarity index 97%
rename from cmd/trace/cli/doctor_bundle.go
rename to cli/doctor_bundle.go
index da4a993..8da5904 100644
--- a/cmd/trace/cli/doctor_bundle.go
+++ b/cli/doctor_bundle.go
@@ -14,9 +14,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/trace/cli/doctor_bundle_test.go b/cli/doctor_bundle_test.go
similarity index 98%
rename from cmd/trace/cli/doctor_bundle_test.go
rename to cli/doctor_bundle_test.go
index 651f8cc..b5bf551 100644
--- a/cmd/trace/cli/doctor_bundle_test.go
+++ b/cli/doctor_bundle_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 func TestWriteDoctorBundle_ContainsExpectedEntries(t *testing.T) {
diff --git a/cmd/trace/cli/doctor_logs.go b/cli/doctor_logs.go
similarity index 97%
rename from cmd/trace/cli/doctor_logs.go
rename to cli/doctor_logs.go
index 2c2e162..9f6d330 100644
--- a/cmd/trace/cli/doctor_logs.go
+++ b/cli/doctor_logs.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/doctor_logs_test.go b/cli/doctor_logs_test.go
similarity index 100%
rename from cmd/trace/cli/doctor_logs_test.go
rename to cli/doctor_logs_test.go
diff --git a/cmd/trace/cli/doctor_test.go b/cli/doctor_test.go
similarity index 99%
rename from cmd/trace/cli/doctor_test.go
rename to cli/doctor_test.go
index 4382e7d..fd67311 100644
--- a/cmd/trace/cli/doctor_test.go
+++ b/cli/doctor_test.go
@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/errors.go b/cli/errors.go
similarity index 100%
rename from cmd/trace/cli/errors.go
rename to cli/errors.go
diff --git a/cmd/trace/cli/execx/execx.go b/cli/execx/execx.go
similarity index 100%
rename from cmd/trace/cli/execx/execx.go
rename to cli/execx/execx.go
diff --git a/cmd/trace/cli/execx/execx_test.go b/cli/execx/execx_test.go
similarity index 100%
rename from cmd/trace/cli/execx/execx_test.go
rename to cli/execx/execx_test.go
diff --git a/cmd/trace/cli/execx/execx_unix.go b/cli/execx/execx_unix.go
similarity index 100%
rename from cmd/trace/cli/execx/execx_unix.go
rename to cli/execx/execx_unix.go
diff --git a/cmd/trace/cli/execx/execx_unix_test.go b/cli/execx/execx_unix_test.go
similarity index 100%
rename from cmd/trace/cli/execx/execx_unix_test.go
rename to cli/execx/execx_unix_test.go
diff --git a/cmd/trace/cli/execx/execx_windows.go b/cli/execx/execx_windows.go
similarity index 100%
rename from cmd/trace/cli/execx/execx_windows.go
rename to cli/execx/execx_windows.go
diff --git a/cmd/trace/cli/explain.go b/cli/explain.go
similarity index 99%
rename from cmd/trace/cli/explain.go
rename to cli/explain.go
index dd4ed85..0b0225e 100644
--- a/cmd/trace/cli/explain.go
+++ b/cli/explain.go
@@ -15,24 +15,24 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/opencode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/summarize"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
-	transcriptcompact "github.com/GrayCodeAI/trace/cmd/trace/cli/transcript/compact"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/opencode"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/summarize"
+	"github.com/GrayCodeAI/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/transcript"
+	transcriptcompact "github.com/GrayCodeAI/trace/cli/transcript/compact"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"charm.land/lipgloss/v2"
diff --git a/cmd/trace/cli/explain_export.go b/cli/explain_export.go
similarity index 99%
rename from cmd/trace/cli/explain_export.go
rename to cli/explain_export.go
index 2f9d2d9..d84d585 100644
--- a/cmd/trace/cli/explain_export.go
+++ b/cli/explain_export.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 )
 
 // checkpointMatchesSessionFilter returns true when any session that
diff --git a/cmd/trace/cli/explain_export_test.go b/cli/explain_export_test.go
similarity index 99%
rename from cmd/trace/cli/explain_export_test.go
rename to cli/explain_export_test.go
index 957aeca..4f17bbd 100644
--- a/cmd/trace/cli/explain_export_test.go
+++ b/cli/explain_export_test.go
@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/explain_summary_provider.go b/cli/explain_summary_provider.go
similarity index 95%
rename from cmd/trace/cli/explain_summary_provider.go
rename to cli/explain_summary_provider.go
index 549bb7a..17d89d8 100644
--- a/cmd/trace/cli/explain_summary_provider.go
+++ b/cli/explain_summary_provider.go
@@ -6,14 +6,14 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/summarize"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/summarize"
 
 	"charm.land/huh/v2"
 )
diff --git a/cmd/trace/cli/explain_summary_provider_test.go b/cli/explain_summary_provider_test.go
similarity index 98%
rename from cmd/trace/cli/explain_summary_provider_test.go
rename to cli/explain_summary_provider_test.go
index 74b6d13..1593b11 100644
--- a/cmd/trace/cli/explain_summary_provider_test.go
+++ b/cli/explain_summary_provider_test.go
@@ -9,11 +9,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/summarize"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/summarize"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 func rowsContain(rows []explainRow, label, value string) bool {
diff --git a/cmd/trace/cli/explain_test.go b/cli/explain_test.go
similarity index 99%
rename from cmd/trace/cli/explain_test.go
rename to cli/explain_test.go
index 21e1fe8..722c18e 100644
--- a/cmd/trace/cli/explain_test.go
+++ b/cli/explain_test.go
@@ -15,17 +15,17 @@ import (
 	"time"
 
 	"charm.land/lipgloss/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/summarize"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/summarize"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/fetch_no_config_pollution_test.go b/cli/fetch_no_config_pollution_test.go
similarity index 97%
rename from cmd/trace/cli/fetch_no_config_pollution_test.go
rename to cli/fetch_no_config_pollution_test.go
index 3422257..e4d78eb 100644
--- a/cmd/trace/cli/fetch_no_config_pollution_test.go
+++ b/cli/fetch_no_config_pollution_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // TestFetchDoesNotPolluteOriginConfig is a regression test for #712.
diff --git a/cmd/trace/cli/fetch_rewind_protection_test.go b/cli/fetch_rewind_protection_test.go
similarity index 96%
rename from cmd/trace/cli/fetch_rewind_protection_test.go
rename to cli/fetch_rewind_protection_test.go
index 6aa9835..e1b1525 100644
--- a/cmd/trace/cli/fetch_rewind_protection_test.go
+++ b/cli/fetch_rewind_protection_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/fork_cmd.go b/cli/fork_cmd.go
similarity index 96%
rename from cmd/trace/cli/fork_cmd.go
rename to cli/fork_cmd.go
index a7d05d6..9594522 100644
--- a/cmd/trace/cli/fork_cmd.go
+++ b/cli/fork_cmd.go
@@ -8,16 +8,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/google/uuid"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/fork_cmd_test.go b/cli/fork_cmd_test.go
similarity index 94%
rename from cmd/trace/cli/fork_cmd_test.go
rename to cli/fork_cmd_test.go
index fb3cffb..dee6f73 100644
--- a/cmd/trace/cli/fork_cmd_test.go
+++ b/cli/fork_cmd_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/require"
 
diff --git a/cmd/trace/cli/git_operations.go b/cli/git_operations.go
similarity index 98%
rename from cmd/trace/cli/git_operations.go
rename to cli/git_operations.go
index 5fc6d86..0b1ba82 100644
--- a/cmd/trace/cli/git_operations.go
+++ b/cli/git_operations.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/git_operations_test.go b/cli/git_operations_test.go
similarity index 99%
rename from cmd/trace/cli/git_operations_test.go
rename to cli/git_operations_test.go
index 1a025f4..229949b 100644
--- a/cmd/trace/cli/git_operations_test.go
+++ b/cli/git_operations_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/gitexec/gitexec.go b/cli/gitexec/gitexec.go
similarity index 100%
rename from cmd/trace/cli/gitexec/gitexec.go
rename to cli/gitexec/gitexec.go
diff --git a/cmd/trace/cli/gitops/diff.go b/cli/gitops/diff.go
similarity index 100%
rename from cmd/trace/cli/gitops/diff.go
rename to cli/gitops/diff.go
diff --git a/cmd/trace/cli/gitops/diff_test.go b/cli/gitops/diff_test.go
similarity index 100%
rename from cmd/trace/cli/gitops/diff_test.go
rename to cli/gitops/diff_test.go
diff --git a/cmd/trace/cli/gitremote/gitremote.go b/cli/gitremote/gitremote.go
similarity index 100%
rename from cmd/trace/cli/gitremote/gitremote.go
rename to cli/gitremote/gitremote.go
diff --git a/cmd/trace/cli/gitremote/gitremote_test.go b/cli/gitremote/gitremote_test.go
similarity index 98%
rename from cmd/trace/cli/gitremote/gitremote_test.go
rename to cli/gitremote/gitremote_test.go
index 2bcd8c2..176f5de 100644
--- a/cmd/trace/cli/gitremote/gitremote_test.go
+++ b/cli/gitremote/gitremote_test.go
@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/gitrepo/alternates_fs.go b/cli/gitrepo/alternates_fs.go
similarity index 100%
rename from cmd/trace/cli/gitrepo/alternates_fs.go
rename to cli/gitrepo/alternates_fs.go
diff --git a/cmd/trace/cli/gitrepo/alternates_rewrite.go b/cli/gitrepo/alternates_rewrite.go
similarity index 100%
rename from cmd/trace/cli/gitrepo/alternates_rewrite.go
rename to cli/gitrepo/alternates_rewrite.go
diff --git a/cmd/trace/cli/gitrepo/alternates_rewrite_test.go b/cli/gitrepo/alternates_rewrite_test.go
similarity index 100%
rename from cmd/trace/cli/gitrepo/alternates_rewrite_test.go
rename to cli/gitrepo/alternates_rewrite_test.go
diff --git a/cmd/trace/cli/gitrepo/repository.go b/cli/gitrepo/repository.go
similarity index 99%
rename from cmd/trace/cli/gitrepo/repository.go
rename to cli/gitrepo/repository.go
index bfe2480..fd0013a 100644
--- a/cmd/trace/cli/gitrepo/repository.go
+++ b/cli/gitrepo/repository.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-billy/v6"
 	"github.com/go-git/go-billy/v6/osfs"
diff --git a/cmd/trace/cli/gitrepo/repository_test.go b/cli/gitrepo/repository_test.go
similarity index 100%
rename from cmd/trace/cli/gitrepo/repository_test.go
rename to cli/gitrepo/repository_test.go
diff --git a/cmd/trace/cli/global_test.go b/cli/global_test.go
similarity index 100%
rename from cmd/trace/cli/global_test.go
rename to cli/global_test.go
diff --git a/cmd/trace/cli/head_checkpoint_flags.go b/cli/head_checkpoint_flags.go
similarity index 85%
rename from cmd/trace/cli/head_checkpoint_flags.go
rename to cli/head_checkpoint_flags.go
index badb6c3..2906113 100644
--- a/cmd/trace/cli/head_checkpoint_flags.go
+++ b/cli/head_checkpoint_flags.go
@@ -6,12 +6,12 @@ import (
 	"log/slog"
 	"os/exec"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/go-git/go-git/v6"
 )
 
diff --git a/cmd/trace/cli/help.go b/cli/help.go
similarity index 100%
rename from cmd/trace/cli/help.go
rename to cli/help.go
diff --git a/cmd/trace/cli/hook_registry.go b/cli/hook_registry.go
similarity index 94%
rename from cmd/trace/cli/hook_registry.go
rename to cli/hook_registry.go
index 22fd534..1c5e4bc 100644
--- a/cmd/trace/cli/hook_registry.go
+++ b/cli/hook_registry.go
@@ -8,13 +8,13 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 	"github.com/GrayCodeAI/trace/perf"
 
 	"github.com/spf13/cobra"
diff --git a/cmd/trace/cli/hook_registry_test.go b/cli/hook_registry_test.go
similarity index 97%
rename from cmd/trace/cli/hook_registry_test.go
rename to cli/hook_registry_test.go
index 2633b40..a7f40c5 100644
--- a/cmd/trace/cli/hook_registry_test.go
+++ b/cli/hook_registry_test.go
@@ -11,12 +11,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/stretchr/testify/require"
 
 	"github.com/spf13/cobra"
diff --git a/cmd/trace/cli/hooks.go b/cli/hooks.go
similarity index 99%
rename from cmd/trace/cli/hooks.go
rename to cli/hooks.go
index 94e6c00..b606024 100644
--- a/cmd/trace/cli/hooks.go
+++ b/cli/hooks.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 )
 
 // TaskHookInput represents the JSON input from PreToolUse[Task] hook
diff --git a/cmd/trace/cli/hooks_claudecode_posttodo.go b/cli/hooks_claudecode_posttodo.go
similarity index 96%
rename from cmd/trace/cli/hooks_claudecode_posttodo.go
rename to cli/hooks_claudecode_posttodo.go
index 45a5fa1..30d84be 100644
--- a/cmd/trace/cli/hooks_claudecode_posttodo.go
+++ b/cli/hooks_claudecode_posttodo.go
@@ -13,10 +13,10 @@ import (
 	"log/slog"
 	"os"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 )
 
 // handleClaudeCodePostTodo handles the PostToolUse[TodoWrite] hook for subagent checkpoints.
diff --git a/cmd/trace/cli/hooks_cmd.go b/cli/hooks_cmd.go
similarity index 71%
rename from cmd/trace/cli/hooks_cmd.go
rename to cli/hooks_cmd.go
index 1a28f25..b7174a1 100644
--- a/cmd/trace/cli/hooks_cmd.go
+++ b/cli/hooks_cmd.go
@@ -5,22 +5,22 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 
 	// Import agents to ensure they are registered before we iterate
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/copilotcli"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/cursor"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/opencode"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/pi"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/vogon"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	_ "github.com/GrayCodeAI/trace/cli/agent/codex"
+	_ "github.com/GrayCodeAI/trace/cli/agent/copilotcli"
+	_ "github.com/GrayCodeAI/trace/cli/agent/cursor"
+	_ "github.com/GrayCodeAI/trace/cli/agent/factoryaidroid"
+	_ "github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	_ "github.com/GrayCodeAI/trace/cli/agent/opencode"
+	_ "github.com/GrayCodeAI/trace/cli/agent/pi"
+	_ "github.com/GrayCodeAI/trace/cli/agent/vogon"
 
 	// support external agents
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/trace/cli/hooks_git_cmd.go b/cli/hooks_git_cmd.go
similarity index 97%
rename from cmd/trace/cli/hooks_git_cmd.go
rename to cli/hooks_git_cmd.go
index 68cd33c..8b7977b 100644
--- a/cmd/trace/cli/hooks_git_cmd.go
+++ b/cli/hooks_git_cmd.go
@@ -5,10 +5,10 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 	"github.com/GrayCodeAI/trace/perf"
 
 	"github.com/spf13/cobra"
diff --git a/cmd/trace/cli/hooks_git_cmd_test.go b/cli/hooks_git_cmd_test.go
similarity index 97%
rename from cmd/trace/cli/hooks_git_cmd_test.go
rename to cli/hooks_git_cmd_test.go
index 8905dd8..caff400 100644
--- a/cmd/trace/cli/hooks_git_cmd_test.go
+++ b/cli/hooks_git_cmd_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 func TestInitHookLogging(t *testing.T) {
diff --git a/cmd/trace/cli/hooks_test.go b/cli/hooks_test.go
similarity index 100%
rename from cmd/trace/cli/hooks_test.go
rename to cli/hooks_test.go
diff --git a/cmd/trace/cli/integration_test/agent_strategy_test.go b/cli/integration_test/agent_strategy_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/agent_strategy_test.go
rename to cli/integration_test/agent_strategy_test.go
index e70bc8e..f6dcf61 100644
--- a/cmd/trace/cli/integration_test/agent_strategy_test.go
+++ b/cli/integration_test/agent_strategy_test.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // TestAgentStrategyComposition verifies that agent and strategy work together correctly.
diff --git a/cmd/trace/cli/integration_test/agent_test.go b/cli/integration_test/agent_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/agent_test.go
rename to cli/integration_test/agent_test.go
index 0c10053..830a29d 100644
--- a/cmd/trace/cli/integration_test/agent_test.go
+++ b/cli/integration_test/agent_test.go
@@ -9,12 +9,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/opencode" // Register OpenCode agent
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/factoryaidroid"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	_ "github.com/GrayCodeAI/trace/cli/agent/opencode" // Register OpenCode agent
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // TestAgentDetection verifies agent detection and default behavior.
diff --git a/cmd/trace/cli/integration_test/attach_test.go b/cli/integration_test/attach_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/attach_test.go
rename to cli/integration_test/attach_test.go
index 4bcbf34..404db85 100644
--- a/cmd/trace/cli/integration_test/attach_test.go
+++ b/cli/integration_test/attach_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 )
 
 // TestAttach_NewSession_NoHooks tests attaching a session that was never tracked by hooks.
diff --git a/cmd/trace/cli/integration_test/attribution_test.go b/cli/integration_test/attribution_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/attribution_test.go
rename to cli/integration_test/attribution_test.go
index 46d3eab..4a10bc1 100644
--- a/cmd/trace/cli/integration_test/attribution_test.go
+++ b/cli/integration_test/attribution_test.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 )
diff --git a/cmd/trace/cli/integration_test/carry_forward_overlap_test.go b/cli/integration_test/carry_forward_overlap_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/carry_forward_overlap_test.go
rename to cli/integration_test/carry_forward_overlap_test.go
index 5a1429f..f4a1abb 100644
--- a/cmd/trace/cli/integration_test/carry_forward_overlap_test.go
+++ b/cli/integration_test/carry_forward_overlap_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // TestCarryForward_EndedSession_NotCondensedOnUnrelatedCommit verifies that an
diff --git a/cmd/trace/cli/integration_test/codex_post_tool_use_test.go b/cli/integration_test/codex_post_tool_use_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/codex_post_tool_use_test.go
rename to cli/integration_test/codex_post_tool_use_test.go
diff --git a/cmd/trace/cli/integration_test/copilot_vscode_hooks_test.go b/cli/integration_test/copilot_vscode_hooks_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/copilot_vscode_hooks_test.go
rename to cli/integration_test/copilot_vscode_hooks_test.go
index 8e6aab1..b9775fe 100644
--- a/cmd/trace/cli/integration_test/copilot_vscode_hooks_test.go
+++ b/cli/integration_test/copilot_vscode_hooks_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/copilotcli"
+	"github.com/GrayCodeAI/trace/cli/agent/copilotcli"
 )
 
 func TestCopilotVSCodeHooks_UserPromptSubmitted(t *testing.T) {
diff --git a/cmd/trace/cli/integration_test/cursor_forwarding_test.go b/cli/integration_test/cursor_forwarding_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/cursor_forwarding_test.go
rename to cli/integration_test/cursor_forwarding_test.go
diff --git a/cmd/trace/cli/integration_test/default_branch_test.go b/cli/integration_test/default_branch_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/default_branch_test.go
rename to cli/integration_test/default_branch_test.go
diff --git a/cmd/trace/cli/integration_test/deferred_finalization_test.go b/cli/integration_test/deferred_finalization_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/deferred_finalization_test.go
rename to cli/integration_test/deferred_finalization_test.go
index 91de076..2b8c745 100644
--- a/cmd/trace/cli/integration_test/deferred_finalization_test.go
+++ b/cli/integration_test/deferred_finalization_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
 )
diff --git a/cmd/trace/cli/integration_test/explain_test.go b/cli/integration_test/explain_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/explain_test.go
rename to cli/integration_test/explain_test.go
index af2fe32..ed43aff 100644
--- a/cmd/trace/cli/integration_test/explain_test.go
+++ b/cli/integration_test/explain_test.go
@@ -11,12 +11,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/execx"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/require"
 
diff --git a/cmd/trace/cli/integration_test/external_command_signal_unix_test.go b/cli/integration_test/external_command_signal_unix_test.go
similarity index 97%
rename from cmd/trace/cli/integration_test/external_command_signal_unix_test.go
rename to cli/integration_test/external_command_signal_unix_test.go
index 324cb6a..f7e613c 100644
--- a/cmd/trace/cli/integration_test/external_command_signal_unix_test.go
+++ b/cli/integration_test/external_command_signal_unix_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
+	"github.com/GrayCodeAI/trace/cli/execx"
 )
 
 // SIGINT to the parent must reach the plugin so it can clean up — not
diff --git a/cmd/trace/cli/integration_test/external_command_test.go b/cli/integration_test/external_command_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/external_command_test.go
rename to cli/integration_test/external_command_test.go
index ae7b9bb..ee1df57 100644
--- a/cmd/trace/cli/integration_test/external_command_test.go
+++ b/cli/integration_test/external_command_test.go
@@ -14,14 +14,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/execx"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // Integration tests for external-command resolution in cmd/trace/main.go.
 // They build and exec the real binary so the pre-Cobra routing (exit-code
 // propagation, stdio passthrough, signal handling) is exercised end-to-end
-// — unit tests in cmd/trace/cli/plugin_test.go can't.
+// — unit tests in cli/plugin_test.go can't.
 
 // writePluginScript writes a shell script that records argv and exits
 // with exitCode. Skips the calling test on Windows.
diff --git a/cmd/trace/cli/integration_test/fully_condensed_test.go b/cli/integration_test/fully_condensed_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/fully_condensed_test.go
rename to cli/integration_test/fully_condensed_test.go
index 9be73a6..84a7afb 100644
--- a/cmd/trace/cli/integration_test/fully_condensed_test.go
+++ b/cli/integration_test/fully_condensed_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // TestFullyCondensed_ReactivationClearsFlag tests that when a fully-condensed
diff --git a/cmd/trace/cli/integration_test/git_author_test.go b/cli/integration_test/git_author_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/git_author_test.go
rename to cli/integration_test/git_author_test.go
index 0968145..9ffee76 100644
--- a/cmd/trace/cli/integration_test/git_author_test.go
+++ b/cli/integration_test/git_author_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6"
 )
 
diff --git a/cmd/trace/cli/integration_test/hook_bench_test.go b/cli/integration_test/hook_bench_test.go
similarity index 96%
rename from cmd/trace/cli/integration_test/hook_bench_test.go
rename to cli/integration_test/hook_bench_test.go
index e2ab8d8..7e501bd 100644
--- a/cmd/trace/cli/integration_test/hook_bench_test.go
+++ b/cli/integration_test/hook_bench_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/benchutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/benchutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // BenchmarkHookSessionStart measures the end-to-end latency of the
@@ -28,11 +28,11 @@ import (
 //
 // Run all:
 //
-//	go test -tags=integration -bench=BenchmarkHookSessionStart -benchtime=3x -run='^$' -timeout=10m ./cmd/trace/cli/integration_test/...
+//	go test -tags=integration -bench=BenchmarkHookSessionStart -benchtime=3x -run='^$' -timeout=10m ./cli/integration_test/...
 //
 // Run one dimension:
 //
-//	go test -tags=integration -bench=BenchmarkHookSessionStart/Subprocess -benchtime=5x -run='^$' ./cmd/trace/cli/integration_test/...
+//	go test -tags=integration -bench=BenchmarkHookSessionStart/Subprocess -benchtime=5x -run='^$' ./cli/integration_test/...
 func BenchmarkHookSessionStart(b *testing.B) {
 	b.Run("Sessions", benchSessions)
 	b.Run("SessionsXRefs", benchSessionsXRefs)
diff --git a/cmd/trace/cli/integration_test/hook_logging_test.go b/cli/integration_test/hook_logging_test.go
similarity index 96%
rename from cmd/trace/cli/integration_test/hook_logging_test.go
rename to cli/integration_test/hook_logging_test.go
index 2423f9d..789ae7a 100644
--- a/cmd/trace/cli/integration_test/hook_logging_test.go
+++ b/cli/integration_test/hook_logging_test.go
@@ -11,9 +11,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 func TestHookLogging_WritesToSessionLogFile(t *testing.T) {
diff --git a/cmd/trace/cli/integration_test/hook_overwrite_test.go b/cli/integration_test/hook_overwrite_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/hook_overwrite_test.go
rename to cli/integration_test/hook_overwrite_test.go
index 84cdbd4..52e6270 100644
--- a/cmd/trace/cli/integration_test/hook_overwrite_test.go
+++ b/cli/integration_test/hook_overwrite_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/integration_test/hooks.go b/cli/integration_test/hooks.go
similarity index 99%
rename from cmd/trace/cli/integration_test/hooks.go
rename to cli/integration_test/hooks.go
index 048814d..b547d54 100644
--- a/cmd/trace/cli/integration_test/hooks.go
+++ b/cli/integration_test/hooks.go
@@ -10,8 +10,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // HookRunner executes CLI hooks in the test environment.
diff --git a/cmd/trace/cli/integration_test/hooks_test.go b/cli/integration_test/hooks_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/hooks_test.go
rename to cli/integration_test/hooks_test.go
index 119d46a..eff412c 100644
--- a/cmd/trace/cli/integration_test/hooks_test.go
+++ b/cli/integration_test/hooks_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 )
 
 func TestHookRunner_SimulateUserPromptSubmit(t *testing.T) {
diff --git a/cmd/trace/cli/integration_test/http_remote_test.go b/cli/integration_test/http_remote_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/http_remote_test.go
rename to cli/integration_test/http_remote_test.go
index a3d2c16..b235223 100644
--- a/cmd/trace/cli/integration_test/http_remote_test.go
+++ b/cli/integration_test/http_remote_test.go
@@ -16,8 +16,8 @@ import (
 	"github.com/go-git/go-git/v6/backend"
 	"github.com/go-git/go-git/v6/plumbing/transport"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // httpGitServer is an in-process HTTPS git server backed by bare repos on disk.
diff --git a/cmd/trace/cli/integration_test/interactive.go b/cli/integration_test/interactive.go
similarity index 98%
rename from cmd/trace/cli/integration_test/interactive.go
rename to cli/integration_test/interactive.go
index 5a0249a..cc21789 100644
--- a/cmd/trace/cli/integration_test/interactive.go
+++ b/cli/integration_test/interactive.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/creack/pty"
 )
 
diff --git a/cmd/trace/cli/integration_test/investigate_test.go b/cli/integration_test/investigate_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/investigate_test.go
rename to cli/integration_test/investigate_test.go
index cdef441..4771072 100644
--- a/cmd/trace/cli/integration_test/investigate_test.go
+++ b/cli/integration_test/investigate_test.go
@@ -14,10 +14,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/investigate"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/execx"
+	"github.com/GrayCodeAI/trace/cli/investigate"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // TestInvestigate_EnvVarAdoptionCondensesMetadataOnNextCommit pins the full
diff --git a/cmd/trace/cli/integration_test/last_checkpoint_id_test.go b/cli/integration_test/last_checkpoint_id_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/last_checkpoint_id_test.go
rename to cli/integration_test/last_checkpoint_id_test.go
index c0fead7..5a48122 100644
--- a/cmd/trace/cli/integration_test/last_checkpoint_id_test.go
+++ b/cli/integration_test/last_checkpoint_id_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // TestShadowStrategy_OneCheckpointPerCommit tests the 1:1 checkpoint model:
diff --git a/cmd/trace/cli/integration_test/last_interaction_test.go b/cli/integration_test/last_interaction_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/last_interaction_test.go
rename to cli/integration_test/last_interaction_test.go
diff --git a/cmd/trace/cli/integration_test/login_test.go b/cli/integration_test/login_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/login_test.go
rename to cli/integration_test/login_test.go
index 0cc8b94..16df7fe 100644
--- a/cmd/trace/cli/integration_test/login_test.go
+++ b/cli/integration_test/login_test.go
@@ -16,8 +16,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/execx"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 func TestLogin_SavesTokenAfterApproval(t *testing.T) {
diff --git a/cmd/trace/cli/integration_test/logs_only_rewind_test.go b/cli/integration_test/logs_only_rewind_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/logs_only_rewind_test.go
rename to cli/integration_test/logs_only_rewind_test.go
diff --git a/cmd/trace/cli/integration_test/manual_commit_untracked_files_test.go b/cli/integration_test/manual_commit_untracked_files_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/manual_commit_untracked_files_test.go
rename to cli/integration_test/manual_commit_untracked_files_test.go
diff --git a/cmd/trace/cli/integration_test/manual_commit_workflow_test.go b/cli/integration_test/manual_commit_workflow_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/manual_commit_workflow_test.go
rename to cli/integration_test/manual_commit_workflow_test.go
index ea7d235..d072136 100644
--- a/cmd/trace/cli/integration_test/manual_commit_workflow_test.go
+++ b/cli/integration_test/manual_commit_workflow_test.go
@@ -9,11 +9,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 )
 
 // TestShadow_FullWorkflow tests the complete shadow workflow as described in
diff --git a/cmd/trace/cli/integration_test/mid_session_commit_test.go b/cli/integration_test/mid_session_commit_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/mid_session_commit_test.go
rename to cli/integration_test/mid_session_commit_test.go
index 1903123..6b0c278 100644
--- a/cmd/trace/cli/integration_test/mid_session_commit_test.go
+++ b/cli/integration_test/mid_session_commit_test.go
@@ -8,9 +8,9 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // TestShadowStrategy_MidSessionCommit_FromTranscript tests that when Claude commits
diff --git a/cmd/trace/cli/integration_test/mid_session_rebase_test.go b/cli/integration_test/mid_session_rebase_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/mid_session_rebase_test.go
rename to cli/integration_test/mid_session_rebase_test.go
index a6fd4f8..1407be8 100644
--- a/cmd/trace/cli/integration_test/mid_session_rebase_test.go
+++ b/cli/integration_test/mid_session_rebase_test.go
@@ -6,8 +6,8 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // TestShadow_MidSessionRebaseMigration tests that when Claude performs a rebase
diff --git a/cmd/trace/cli/integration_test/old_session_basecommit_test.go b/cli/integration_test/old_session_basecommit_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/old_session_basecommit_test.go
rename to cli/integration_test/old_session_basecommit_test.go
index a8404de..6e148a2 100644
--- a/cmd/trace/cli/integration_test/old_session_basecommit_test.go
+++ b/cli/integration_test/old_session_basecommit_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // TestOldIdleSession_BaseCommitNotUpdated verifies that when an old IDLE session
diff --git a/cmd/trace/cli/integration_test/opencode_hooks_test.go b/cli/integration_test/opencode_hooks_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/opencode_hooks_test.go
rename to cli/integration_test/opencode_hooks_test.go
index a2f0afd..01d877a 100644
--- a/cmd/trace/cli/integration_test/opencode_hooks_test.go
+++ b/cli/integration_test/opencode_hooks_test.go
@@ -5,9 +5,9 @@ package integration
 import (
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 )
 
 // TestOpenCodeHookFlow verifies the full hook flow for OpenCode:
diff --git a/cmd/trace/cli/integration_test/phase_transitions_test.go b/cli/integration_test/phase_transitions_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/phase_transitions_test.go
rename to cli/integration_test/phase_transitions_test.go
index e8569a5..909ae46 100644
--- a/cmd/trace/cli/integration_test/phase_transitions_test.go
+++ b/cli/integration_test/phase_transitions_test.go
@@ -6,8 +6,8 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // TestShadow_CommitBeforeStop tests the "commit while agent is still working" flow.
diff --git a/cmd/trace/cli/integration_test/read_only_session_test.go b/cli/integration_test/read_only_session_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/read_only_session_test.go
rename to cli/integration_test/read_only_session_test.go
index b810298..7c8cb5d 100644
--- a/cmd/trace/cli/integration_test/read_only_session_test.go
+++ b/cli/integration_test/read_only_session_test.go
@@ -6,9 +6,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // TestReadOnlySession_NotCondensed verifies that a session which never touched
diff --git a/cmd/trace/cli/integration_test/remote_operations_test.go b/cli/integration_test/remote_operations_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/remote_operations_test.go
rename to cli/integration_test/remote_operations_test.go
index 7ffcf12..d89a752 100644
--- a/cmd/trace/cli/integration_test/remote_operations_test.go
+++ b/cli/integration_test/remote_operations_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // =============================================================================
diff --git a/cmd/trace/cli/integration_test/resume_interactive_test.go b/cli/integration_test/resume_interactive_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/resume_interactive_test.go
rename to cli/integration_test/resume_interactive_test.go
diff --git a/cmd/trace/cli/integration_test/resume_test.go b/cli/integration_test/resume_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/resume_test.go
rename to cli/integration_test/resume_test.go
index 280aa3b..31f302b 100644
--- a/cmd/trace/cli/integration_test/resume_test.go
+++ b/cli/integration_test/resume_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/execx"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 )
diff --git a/cmd/trace/cli/integration_test/review_test.go b/cli/integration_test/review_test.go
similarity index 97%
rename from cmd/trace/cli/integration_test/review_test.go
rename to cli/integration_test/review_test.go
index 42c2a48..40f56c2 100644
--- a/cmd/trace/cli/integration_test/review_test.go
+++ b/cli/integration_test/review_test.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/execx"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/review"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // TestReview_EnvVarAdoptionCondensesReviewMetadataOnNextCommit exercises
diff --git a/cmd/trace/cli/integration_test/rewind_test.go b/cli/integration_test/rewind_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/rewind_test.go
rename to cli/integration_test/rewind_test.go
diff --git a/cmd/trace/cli/integration_test/session_conflict_test.go b/cli/integration_test/session_conflict_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/session_conflict_test.go
rename to cli/integration_test/session_conflict_test.go
diff --git a/cmd/trace/cli/integration_test/setup_claude_hooks_test.go b/cli/integration_test/setup_claude_hooks_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/setup_claude_hooks_test.go
rename to cli/integration_test/setup_claude_hooks_test.go
index e99e6c3..edf38b7 100644
--- a/cmd/trace/cli/integration_test/setup_claude_hooks_test.go
+++ b/cli/integration_test/setup_claude_hooks_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
 )
 
 // ClaudeSettings mirrors the settings structure for testing
diff --git a/cmd/trace/cli/integration_test/setup_cmd_test.go b/cli/integration_test/setup_cmd_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/setup_cmd_test.go
rename to cli/integration_test/setup_cmd_test.go
index 470a1c3..553ab48 100644
--- a/cmd/trace/cli/integration_test/setup_cmd_test.go
+++ b/cli/integration_test/setup_cmd_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // RunEnableWithAccessibleMode runs `trace enable` without --strategy flag in accessible mode.
diff --git a/cmd/trace/cli/integration_test/setup_codex_hooks_test.go b/cli/integration_test/setup_codex_hooks_test.go
similarity index 97%
rename from cmd/trace/cli/integration_test/setup_codex_hooks_test.go
rename to cli/integration_test/setup_codex_hooks_test.go
index dd13b2a..827f206 100644
--- a/cmd/trace/cli/integration_test/setup_codex_hooks_test.go
+++ b/cli/integration_test/setup_codex_hooks_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
+	"github.com/GrayCodeAI/trace/cli/agent/codex"
 )
 
 // TestSetupCodexHooks_AddsAllRequiredHooks is a smoke test verifying that
diff --git a/cmd/trace/cli/integration_test/setup_factoryai_hooks_test.go b/cli/integration_test/setup_factoryai_hooks_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/setup_factoryai_hooks_test.go
rename to cli/integration_test/setup_factoryai_hooks_test.go
index 304bc9f..4be126c 100644
--- a/cmd/trace/cli/integration_test/setup_factoryai_hooks_test.go
+++ b/cli/integration_test/setup_factoryai_hooks_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid"
+	"github.com/GrayCodeAI/trace/cli/agent/factoryaidroid"
 )
 
 // Use the real Factory types from the factoryaidroid package to avoid schema drift.
diff --git a/cmd/trace/cli/integration_test/setup_gemini_hooks_test.go b/cli/integration_test/setup_gemini_hooks_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/setup_gemini_hooks_test.go
rename to cli/integration_test/setup_gemini_hooks_test.go
index c7cc5a8..375e4e4 100644
--- a/cmd/trace/cli/integration_test/setup_gemini_hooks_test.go
+++ b/cli/integration_test/setup_gemini_hooks_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
 )
 
 // Use the real Gemini types from the geminicli package to avoid schema drift.
diff --git a/cmd/trace/cli/integration_test/setup_test.go b/cli/integration_test/setup_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/setup_test.go
rename to cli/integration_test/setup_test.go
diff --git a/cmd/trace/cli/integration_test/sha256_repo_test.go b/cli/integration_test/sha256_repo_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/sha256_repo_test.go
rename to cli/integration_test/sha256_repo_test.go
index e773344..be5adf9 100644
--- a/cmd/trace/cli/integration_test/sha256_repo_test.go
+++ b/cli/integration_test/sha256_repo_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 func TestSHA256Repository_EnableAndFirstCheckpoint(t *testing.T) {
diff --git a/cmd/trace/cli/integration_test/subagent_accumulation_test.go b/cli/integration_test/subagent_accumulation_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/subagent_accumulation_test.go
rename to cli/integration_test/subagent_accumulation_test.go
index b5a1a6a..39d2651 100644
--- a/cmd/trace/cli/integration_test/subagent_accumulation_test.go
+++ b/cli/integration_test/subagent_accumulation_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // TestSubagentAccumulation_Issue591 reproduces the issue #591 shape: multiple
diff --git a/cmd/trace/cli/integration_test/subagent_checkpoints_test.go b/cli/integration_test/subagent_checkpoints_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/subagent_checkpoints_test.go
rename to cli/integration_test/subagent_checkpoints_test.go
index 620cba1..54823dc 100644
--- a/cmd/trace/cli/integration_test/subagent_checkpoints_test.go
+++ b/cli/integration_test/subagent_checkpoints_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/integration_test/subdirectory_test.go b/cli/integration_test/subdirectory_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/subdirectory_test.go
rename to cli/integration_test/subdirectory_test.go
index 64fe260..016084c 100644
--- a/cmd/trace/cli/integration_test/subdirectory_test.go
+++ b/cli/integration_test/subdirectory_test.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // TestSubdirectory_TraceDirCreatedAtRepoRoot verifies that when the CLI is run
diff --git a/cmd/trace/cli/integration_test/testenv.go b/cli/integration_test/testenv.go
similarity index 99%
rename from cmd/trace/cli/integration_test/testenv.go
rename to cli/integration_test/testenv.go
index 511ba40..01cf1b6 100644
--- a/cmd/trace/cli/integration_test/testenv.go
+++ b/cli/integration_test/testenv.go
@@ -18,14 +18,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/execx"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/integration_test/testenv_test.go b/cli/integration_test/testenv_test.go
similarity index 99%
rename from cmd/trace/cli/integration_test/testenv_test.go
rename to cli/integration_test/testenv_test.go
index 4973e11..9ffccbb 100644
--- a/cmd/trace/cli/integration_test/testenv_test.go
+++ b/cli/integration_test/testenv_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 func TestNewTestEnv(t *testing.T) {
diff --git a/cmd/trace/cli/integration_test/transcript.go b/cli/integration_test/transcript.go
similarity index 100%
rename from cmd/trace/cli/integration_test/transcript.go
rename to cli/integration_test/transcript.go
diff --git a/cmd/trace/cli/integration_test/transcript_offset_test.go b/cli/integration_test/transcript_offset_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/transcript_offset_test.go
rename to cli/integration_test/transcript_offset_test.go
index 6d978ee..7387615 100644
--- a/cmd/trace/cli/integration_test/transcript_offset_test.go
+++ b/cli/integration_test/transcript_offset_test.go
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/integration_test/transcript_test.go b/cli/integration_test/transcript_test.go
similarity index 100%
rename from cmd/trace/cli/integration_test/transcript_test.go
rename to cli/integration_test/transcript_test.go
diff --git a/cmd/trace/cli/integration_test/v2_dual_write_test.go b/cli/integration_test/v2_dual_write_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/v2_dual_write_test.go
rename to cli/integration_test/v2_dual_write_test.go
index af2d4ae..418b3cf 100644
--- a/cmd/trace/cli/integration_test/v2_dual_write_test.go
+++ b/cli/integration_test/v2_dual_write_test.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/integration_test/v2_push_test.go b/cli/integration_test/v2_push_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/v2_push_test.go
rename to cli/integration_test/v2_push_test.go
index a3bf891..bc56058 100644
--- a/cmd/trace/cli/integration_test/v2_push_test.go
+++ b/cli/integration_test/v2_push_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/integration_test/v2_resume_test.go b/cli/integration_test/v2_resume_test.go
similarity index 98%
rename from cmd/trace/cli/integration_test/v2_resume_test.go
rename to cli/integration_test/v2_resume_test.go
index 35a7e07..d23c1f6 100644
--- a/cmd/trace/cli/integration_test/v2_resume_test.go
+++ b/cli/integration_test/v2_resume_test.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/integration_test/worktree_test.go b/cli/integration_test/worktree_test.go
similarity index 94%
rename from cmd/trace/cli/integration_test/worktree_test.go
rename to cli/integration_test/worktree_test.go
index a5f997f..efd60a5 100644
--- a/cmd/trace/cli/integration_test/worktree_test.go
+++ b/cli/integration_test/worktree_test.go
@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6/plumbing"
 )
 
diff --git a/cmd/trace/cli/interactive/interactive.go b/cli/interactive/interactive.go
similarity index 100%
rename from cmd/trace/cli/interactive/interactive.go
rename to cli/interactive/interactive.go
diff --git a/cmd/trace/cli/interactive/interactive_test.go b/cli/interactive/interactive_test.go
similarity index 100%
rename from cmd/trace/cli/interactive/interactive_test.go
rename to cli/interactive/interactive_test.go
diff --git a/cmd/trace/cli/internal/flock/flock_unix.go b/cli/internal/flock/flock_unix.go
similarity index 100%
rename from cmd/trace/cli/internal/flock/flock_unix.go
rename to cli/internal/flock/flock_unix.go
diff --git a/cmd/trace/cli/internal/flock/flock_unix_test.go b/cli/internal/flock/flock_unix_test.go
similarity index 100%
rename from cmd/trace/cli/internal/flock/flock_unix_test.go
rename to cli/internal/flock/flock_unix_test.go
diff --git a/cmd/trace/cli/internal/flock/flock_windows.go b/cli/internal/flock/flock_windows.go
similarity index 100%
rename from cmd/trace/cli/internal/flock/flock_windows.go
rename to cli/internal/flock/flock_windows.go
diff --git a/cmd/trace/cli/internal/flock/flock_windows_test.go b/cli/internal/flock/flock_windows_test.go
similarity index 100%
rename from cmd/trace/cli/internal/flock/flock_windows_test.go
rename to cli/internal/flock/flock_windows_test.go
diff --git a/cmd/trace/cli/investigate/bootstrap.go b/cli/investigate/bootstrap.go
similarity index 100%
rename from cmd/trace/cli/investigate/bootstrap.go
rename to cli/investigate/bootstrap.go
diff --git a/cmd/trace/cli/investigate/bootstrap_test.go b/cli/investigate/bootstrap_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/bootstrap_test.go
rename to cli/investigate/bootstrap_test.go
diff --git a/cmd/trace/cli/investigate/clean.go b/cli/investigate/clean.go
similarity index 100%
rename from cmd/trace/cli/investigate/clean.go
rename to cli/investigate/clean.go
diff --git a/cmd/trace/cli/investigate/clean_test.go b/cli/investigate/clean_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/clean_test.go
rename to cli/investigate/clean_test.go
diff --git a/cmd/trace/cli/investigate/cmd.go b/cli/investigate/cmd.go
similarity index 98%
rename from cmd/trace/cli/investigate/cmd.go
rename to cli/investigate/cmd.go
index 1863489..e103c2f 100644
--- a/cmd/trace/cli/investigate/cmd.go
+++ b/cli/investigate/cmd.go
@@ -13,16 +13,16 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/gitexec"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/mdrender"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/gitexec"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/mdrender"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 // Deps collects the runtime-injectable hooks NewCommand needs from the
diff --git a/cmd/trace/cli/investigate/cmd_internal_test.go b/cli/investigate/cmd_internal_test.go
similarity index 98%
rename from cmd/trace/cli/investigate/cmd_internal_test.go
rename to cli/investigate/cmd_internal_test.go
index aa7f36a..c310000 100644
--- a/cmd/trace/cli/investigate/cmd_internal_test.go
+++ b/cli/investigate/cmd_internal_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // TestSaveInvestigateConfig_WritesLocalFile verifies that
diff --git a/cmd/trace/cli/investigate/cmd_test.go b/cli/investigate/cmd_test.go
similarity index 99%
rename from cmd/trace/cli/investigate/cmd_test.go
rename to cli/investigate/cmd_test.go
index fa50840..94b7bf2 100644
--- a/cmd/trace/cli/investigate/cmd_test.go
+++ b/cli/investigate/cmd_test.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/investigate"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/investigate"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // stubSpawner is a minimal spawn.Spawner used in tests. It returns a cmd
diff --git a/cmd/trace/cli/investigate/env.go b/cli/investigate/env.go
similarity index 95%
rename from cmd/trace/cli/investigate/env.go
rename to cli/investigate/env.go
index 684d1fe..660e514 100644
--- a/cmd/trace/cli/investigate/env.go
+++ b/cli/investigate/env.go
@@ -13,10 +13,10 @@
 package investigate
 
 import (
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/provenance"
+	"github.com/GrayCodeAI/trace/cli/provenance"
 )
 
-// Investigate env vars. Names live in cmd/trace/cli/provenance; aliased
+// Investigate env vars. Names live in cli/provenance; aliased
 // here for the package's call sites.
 const (
 	EnvSession     = provenance.InvestigateSession
diff --git a/cmd/trace/cli/investigate/env_test.go b/cli/investigate/env_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/env_test.go
rename to cli/investigate/env_test.go
diff --git a/cmd/trace/cli/investigate/findings.go b/cli/investigate/findings.go
similarity index 98%
rename from cmd/trace/cli/investigate/findings.go
rename to cli/investigate/findings.go
index 43fe95c..342d1eb 100644
--- a/cmd/trace/cli/investigate/findings.go
+++ b/cli/investigate/findings.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // runInvestigateFindings handles `trace investigate --findings`: prints
diff --git a/cmd/trace/cli/investigate/findings_test.go b/cli/investigate/findings_test.go
similarity index 97%
rename from cmd/trace/cli/investigate/findings_test.go
rename to cli/investigate/findings_test.go
index 2bc79de..e9218fd 100644
--- a/cmd/trace/cli/investigate/findings_test.go
+++ b/cli/investigate/findings_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/investigate"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/investigate"
 )
 
 // TestRunInvestigateFindings_NoManifests checks that an empty store
diff --git a/cmd/trace/cli/investigate/fix.go b/cli/investigate/fix.go
similarity index 100%
rename from cmd/trace/cli/investigate/fix.go
rename to cli/investigate/fix.go
diff --git a/cmd/trace/cli/investigate/fix_test.go b/cli/investigate/fix_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/fix_test.go
rename to cli/investigate/fix_test.go
diff --git a/cmd/trace/cli/investigate/issuelink.go b/cli/investigate/issuelink.go
similarity index 100%
rename from cmd/trace/cli/investigate/issuelink.go
rename to cli/investigate/issuelink.go
diff --git a/cmd/trace/cli/investigate/issuelink_test.go b/cli/investigate/issuelink_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/issuelink_test.go
rename to cli/investigate/issuelink_test.go
diff --git a/cmd/trace/cli/investigate/loop.go b/cli/investigate/loop.go
similarity index 99%
rename from cmd/trace/cli/investigate/loop.go
rename to cli/investigate/loop.go
index c8c8a43..14ec66c 100644
--- a/cmd/trace/cli/investigate/loop.go
+++ b/cli/investigate/loop.go
@@ -41,8 +41,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // LoopDeps collects the runtime-injectable hooks RunInvestigateLoop needs.
diff --git a/cmd/trace/cli/investigate/loop_test.go b/cli/investigate/loop_test.go
similarity index 99%
rename from cmd/trace/cli/investigate/loop_test.go
rename to cli/investigate/loop_test.go
index f5c1f29..44808a5 100644
--- a/cmd/trace/cli/investigate/loop_test.go
+++ b/cli/investigate/loop_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
 )
 
 // fakeSpawner is a minimal Spawner used by the loop tests. The constructor
diff --git a/cmd/trace/cli/investigate/manifest.go b/cli/investigate/manifest.go
similarity index 99%
rename from cmd/trace/cli/investigate/manifest.go
rename to cli/investigate/manifest.go
index a4da4fe..c84eb0f 100644
--- a/cmd/trace/cli/investigate/manifest.go
+++ b/cli/investigate/manifest.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 const manifestsSubdirName = "manifests"
diff --git a/cmd/trace/cli/investigate/manifest_test.go b/cli/investigate/manifest_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/manifest_test.go
rename to cli/investigate/manifest_test.go
diff --git a/cmd/trace/cli/investigate/multipicker.go b/cli/investigate/multipicker.go
similarity index 100%
rename from cmd/trace/cli/investigate/multipicker.go
rename to cli/investigate/multipicker.go
diff --git a/cmd/trace/cli/investigate/multipicker_test.go b/cli/investigate/multipicker_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/multipicker_test.go
rename to cli/investigate/multipicker_test.go
diff --git a/cmd/trace/cli/investigate/picker.go b/cli/investigate/picker.go
similarity index 97%
rename from cmd/trace/cli/investigate/picker.go
rename to cli/investigate/picker.go
index 7ea7141..df6cf3e 100644
--- a/cmd/trace/cli/investigate/picker.go
+++ b/cli/investigate/picker.go
@@ -11,10 +11,10 @@ import (
 
 	"charm.land/huh/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/uiform"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/uiform"
 )
 
 // AgentChoice is one row in the investigate picker. Name is the agent
diff --git a/cmd/trace/cli/investigate/picker_test.go b/cli/investigate/picker_test.go
similarity index 95%
rename from cmd/trace/cli/investigate/picker_test.go
rename to cli/investigate/picker_test.go
index bddcb27..4913526 100644
--- a/cmd/trace/cli/investigate/picker_test.go
+++ b/cli/investigate/picker_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/investigate"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/investigate"
 )
 
 // TestRunInvestigateConfigPicker_NoEligibleAgents covers the case where
diff --git a/cmd/trace/cli/investigate/progress.go b/cli/investigate/progress.go
similarity index 100%
rename from cmd/trace/cli/investigate/progress.go
rename to cli/investigate/progress.go
diff --git a/cmd/trace/cli/investigate/progress_test.go b/cli/investigate/progress_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/progress_test.go
rename to cli/investigate/progress_test.go
diff --git a/cmd/trace/cli/investigate/prompt.go b/cli/investigate/prompt.go
similarity index 100%
rename from cmd/trace/cli/investigate/prompt.go
rename to cli/investigate/prompt.go
diff --git a/cmd/trace/cli/investigate/prompt_test.go b/cli/investigate/prompt_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/prompt_test.go
rename to cli/investigate/prompt_test.go
diff --git a/cmd/trace/cli/investigate/prompt_yn.go b/cli/investigate/prompt_yn.go
similarity index 80%
rename from cmd/trace/cli/investigate/prompt_yn.go
rename to cli/investigate/prompt_yn.go
index cdc0f51..043e168 100644
--- a/cmd/trace/cli/investigate/prompt_yn.go
+++ b/cli/investigate/prompt_yn.go
@@ -3,7 +3,7 @@ package investigate
 import (
 	"context"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/uiform"
+	"github.com/GrayCodeAI/trace/cli/uiform"
 )
 
 func realPromptYN(ctx context.Context, question string, def bool) (bool, error) {
diff --git a/cmd/trace/cli/investigate/show.go b/cli/investigate/show.go
similarity index 98%
rename from cmd/trace/cli/investigate/show.go
rename to cli/investigate/show.go
index 8f65f57..0b5433a 100644
--- a/cmd/trace/cli/investigate/show.go
+++ b/cli/investigate/show.go
@@ -10,7 +10,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/mdrender"
+	"github.com/GrayCodeAI/trace/cli/mdrender"
 )
 
 // ShowInput drives RunShow.
diff --git a/cmd/trace/cli/investigate/show_test.go b/cli/investigate/show_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/show_test.go
rename to cli/investigate/show_test.go
diff --git a/cmd/trace/cli/investigate/state.go b/cli/investigate/state.go
similarity index 97%
rename from cmd/trace/cli/investigate/state.go
rename to cli/investigate/state.go
index f40a080..e184d20 100644
--- a/cmd/trace/cli/investigate/state.go
+++ b/cli/investigate/state.go
@@ -11,11 +11,11 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/provenance"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/provenance"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // InvestigationsDirName is the directory name (under git common dir) where
diff --git a/cmd/trace/cli/investigate/state_test.go b/cli/investigate/state_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/state_test.go
rename to cli/investigate/state_test.go
diff --git a/cmd/trace/cli/investigate/testdata/prompt-first-round.txt b/cli/investigate/testdata/prompt-first-round.txt
similarity index 100%
rename from cmd/trace/cli/investigate/testdata/prompt-first-round.txt
rename to cli/investigate/testdata/prompt-first-round.txt
diff --git a/cmd/trace/cli/investigate/testdata/prompt-mid-loop.txt b/cli/investigate/testdata/prompt-mid-loop.txt
similarity index 100%
rename from cmd/trace/cli/investigate/testdata/prompt-mid-loop.txt
rename to cli/investigate/testdata/prompt-mid-loop.txt
diff --git a/cmd/trace/cli/investigate/testdata/prompt-with-always.txt b/cli/investigate/testdata/prompt-with-always.txt
similarity index 100%
rename from cmd/trace/cli/investigate/testdata/prompt-with-always.txt
rename to cli/investigate/testdata/prompt-with-always.txt
diff --git a/cmd/trace/cli/investigate/tui_detail.go b/cli/investigate/tui_detail.go
similarity index 100%
rename from cmd/trace/cli/investigate/tui_detail.go
rename to cli/investigate/tui_detail.go
diff --git a/cmd/trace/cli/investigate/tui_detail_test.go b/cli/investigate/tui_detail_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/tui_detail_test.go
rename to cli/investigate/tui_detail_test.go
diff --git a/cmd/trace/cli/investigate/tui_model.go b/cli/investigate/tui_model.go
similarity index 99%
rename from cmd/trace/cli/investigate/tui_model.go
rename to cli/investigate/tui_model.go
index 70516ba..ff12d60 100644
--- a/cmd/trace/cli/investigate/tui_model.go
+++ b/cli/investigate/tui_model.go
@@ -11,7 +11,7 @@ import (
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/tuiutil"
+	"github.com/GrayCodeAI/trace/cli/tuiutil"
 )
 
 // rowStatus is the per-agent terminal state shown in the STATUS column.
diff --git a/cmd/trace/cli/investigate/tui_model_test.go b/cli/investigate/tui_model_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/tui_model_test.go
rename to cli/investigate/tui_model_test.go
diff --git a/cmd/trace/cli/investigate/tui_sink.go b/cli/investigate/tui_sink.go
similarity index 100%
rename from cmd/trace/cli/investigate/tui_sink.go
rename to cli/investigate/tui_sink.go
diff --git a/cmd/trace/cli/investigate/tui_sink_test.go b/cli/investigate/tui_sink_test.go
similarity index 100%
rename from cmd/trace/cli/investigate/tui_sink_test.go
rename to cli/investigate/tui_sink_test.go
diff --git a/cmd/trace/cli/investigate/tui_text.go b/cli/investigate/tui_text.go
similarity index 87%
rename from cmd/trace/cli/investigate/tui_text.go
rename to cli/investigate/tui_text.go
index d3301ca..d5ef970 100644
--- a/cmd/trace/cli/investigate/tui_text.go
+++ b/cli/investigate/tui_text.go
@@ -1,6 +1,6 @@
 package investigate
 
-import "github.com/GrayCodeAI/trace/cmd/trace/cli/tuiutil"
+import "github.com/GrayCodeAI/trace/cli/tuiutil"
 
 func sanitizeDisplayText(s string) string        { return tuiutil.SanitizeDisplayText(s) }
 func padDisplayWidth(s string, width int) string { return tuiutil.PadDisplayWidth(s, width) }
diff --git a/cmd/trace/cli/investigate_bridge.go b/cli/investigate_bridge.go
similarity index 78%
rename from cmd/trace/cli/investigate_bridge.go
rename to cli/investigate_bridge.go
index af69e5f..86563fd 100644
--- a/cmd/trace/cli/investigate_bridge.go
+++ b/cli/investigate_bridge.go
@@ -6,13 +6,13 @@ package cli
 // per-agent packages / checkpoint store.
 
 import (
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/spawn"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agentlaunch"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/investigate"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/codex"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/spawn"
+	"github.com/GrayCodeAI/trace/cli/agentlaunch"
+	"github.com/GrayCodeAI/trace/cli/investigate"
 )
 
 // buildInvestigateDeps builds the investigate.Deps used by
diff --git a/cmd/trace/cli/investigate_bridge_test.go b/cli/investigate_bridge_test.go
similarity index 100%
rename from cmd/trace/cli/investigate_bridge_test.go
rename to cli/investigate_bridge_test.go
diff --git a/cmd/trace/cli/jsonutil/json.go b/cli/jsonutil/json.go
similarity index 100%
rename from cmd/trace/cli/jsonutil/json.go
rename to cli/jsonutil/json.go
diff --git a/cmd/trace/cli/jsonutil/write.go b/cli/jsonutil/write.go
similarity index 100%
rename from cmd/trace/cli/jsonutil/write.go
rename to cli/jsonutil/write.go
diff --git a/cmd/trace/cli/jsonutil/write_test.go b/cli/jsonutil/write_test.go
similarity index 100%
rename from cmd/trace/cli/jsonutil/write_test.go
rename to cli/jsonutil/write_test.go
diff --git a/cmd/trace/cli/keys.go b/cli/keys.go
similarity index 100%
rename from cmd/trace/cli/keys.go
rename to cli/keys.go
diff --git a/cmd/trace/cli/labs.go b/cli/labs.go
similarity index 100%
rename from cmd/trace/cli/labs.go
rename to cli/labs.go
diff --git a/cmd/trace/cli/labs_test.go b/cli/labs_test.go
similarity index 100%
rename from cmd/trace/cli/labs_test.go
rename to cli/labs_test.go
diff --git a/cmd/trace/cli/lifecycle.go b/cli/lifecycle.go
similarity index 98%
rename from cmd/trace/cli/lifecycle.go
rename to cli/lifecycle.go
index 29d55e7..7da4a68 100644
--- a/cmd/trace/cli/lifecycle.go
+++ b/cli/lifecycle.go
@@ -18,15 +18,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/webhook"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/webhook"
 	"github.com/GrayCodeAI/trace/perf"
 )
 
diff --git a/cmd/trace/cli/lifecycle_test.go b/cli/lifecycle_test.go
similarity index 98%
rename from cmd/trace/cli/lifecycle_test.go
rename to cli/lifecycle_test.go
index fed9ddf..34453d4 100644
--- a/cmd/trace/cli/lifecycle_test.go
+++ b/cli/lifecycle_test.go
@@ -8,12 +8,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/opencode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/opencode"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/lockfile/lockfile.go b/cli/lockfile/lockfile.go
similarity index 100%
rename from cmd/trace/cli/lockfile/lockfile.go
rename to cli/lockfile/lockfile.go
diff --git a/cmd/trace/cli/lockfile/lockfile_test.go b/cli/lockfile/lockfile_test.go
similarity index 98%
rename from cmd/trace/cli/lockfile/lockfile_test.go
rename to cli/lockfile/lockfile_test.go
index 400c4eb..da6b290 100644
--- a/cmd/trace/cli/lockfile/lockfile_test.go
+++ b/cli/lockfile/lockfile_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/lockfile"
+	"github.com/GrayCodeAI/trace/cli/lockfile"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/lockfile/lockfile_unix.go b/cli/lockfile/lockfile_unix.go
similarity index 100%
rename from cmd/trace/cli/lockfile/lockfile_unix.go
rename to cli/lockfile/lockfile_unix.go
diff --git a/cmd/trace/cli/lockfile/lockfile_unix_test.go b/cli/lockfile/lockfile_unix_test.go
similarity index 97%
rename from cmd/trace/cli/lockfile/lockfile_unix_test.go
rename to cli/lockfile/lockfile_unix_test.go
index 73880cf..e273884 100644
--- a/cmd/trace/cli/lockfile/lockfile_unix_test.go
+++ b/cli/lockfile/lockfile_unix_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/lockfile"
+	"github.com/GrayCodeAI/trace/cli/lockfile"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/lockfile/lockfile_windows.go b/cli/lockfile/lockfile_windows.go
similarity index 100%
rename from cmd/trace/cli/lockfile/lockfile_windows.go
rename to cli/lockfile/lockfile_windows.go
diff --git a/cmd/trace/cli/lockfile/lockfile_windows_test.go b/cli/lockfile/lockfile_windows_test.go
similarity index 99%
rename from cmd/trace/cli/lockfile/lockfile_windows_test.go
rename to cli/lockfile/lockfile_windows_test.go
index 675c8c6..2c85153 100644
--- a/cmd/trace/cli/lockfile/lockfile_windows_test.go
+++ b/cli/lockfile/lockfile_windows_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/lockfile"
+	"github.com/GrayCodeAI/trace/cli/lockfile"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/logging/context.go b/cli/logging/context.go
similarity index 98%
rename from cmd/trace/cli/logging/context.go
rename to cli/logging/context.go
index 96a9934..1a6fe18 100644
--- a/cmd/trace/cli/logging/context.go
+++ b/cli/logging/context.go
@@ -3,7 +3,7 @@ package logging
 import (
 	"context"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 // Context keys for logging values.
diff --git a/cmd/trace/cli/logging/context_test.go b/cli/logging/context_test.go
similarity index 100%
rename from cmd/trace/cli/logging/context_test.go
rename to cli/logging/context_test.go
diff --git a/cmd/trace/cli/logging/logger.go b/cli/logging/logger.go
similarity index 98%
rename from cmd/trace/cli/logging/logger.go
rename to cli/logging/logger.go
index 5ab7426..db3ece8 100644
--- a/cmd/trace/cli/logging/logger.go
+++ b/cli/logging/logger.go
@@ -31,8 +31,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/validation"
 )
 
 // LogLevelEnvVar is the environment variable that controls log level.
diff --git a/cmd/trace/cli/logging/logger_test.go b/cli/logging/logger_test.go
similarity index 100%
rename from cmd/trace/cli/logging/logger_test.go
rename to cli/logging/logger_test.go
diff --git a/cmd/trace/cli/login.go b/cli/login.go
similarity index 98%
rename from cmd/trace/cli/login.go
rename to cli/login.go
index 93153d3..ce368e5 100644
--- a/cmd/trace/cli/login.go
+++ b/cli/login.go
@@ -12,8 +12,8 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/auth"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/auth"
+	"github.com/GrayCodeAI/trace/cli/interactive"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/login_test.go b/cli/login_test.go
similarity index 99%
rename from cmd/trace/cli/login_test.go
rename to cli/login_test.go
index a901344..9832824 100644
--- a/cmd/trace/cli/login_test.go
+++ b/cli/login_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/auth"
+	"github.com/GrayCodeAI/trace/cli/auth"
 )
 
 // mockClient implements deviceAuthClient for unit tests.
diff --git a/cmd/trace/cli/logout.go b/cli/logout.go
similarity index 95%
rename from cmd/trace/cli/logout.go
rename to cli/logout.go
index 9c8eab6..6265eaf 100644
--- a/cmd/trace/cli/logout.go
+++ b/cli/logout.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/auth"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/auth"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/logout_test.go b/cli/logout_test.go
similarity index 99%
rename from cmd/trace/cli/logout_test.go
rename to cli/logout_test.go
index 6ea80ff..65316bb 100644
--- a/cmd/trace/cli/logout_test.go
+++ b/cli/logout_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 const testLogoutToken = "tok123"
diff --git a/cmd/trace/cli/mdrender/mdrender.go b/cli/mdrender/mdrender.go
similarity index 99%
rename from cmd/trace/cli/mdrender/mdrender.go
rename to cli/mdrender/mdrender.go
index 2629405..36a7fb3 100644
--- a/cmd/trace/cli/mdrender/mdrender.go
+++ b/cli/mdrender/mdrender.go
@@ -21,7 +21,7 @@ import (
 	"github.com/muesli/termenv"
 	"golang.org/x/term"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/interactive"
 )
 
 // DefaultTerminalWidth caps glamour word-wrap when no real terminal width
diff --git a/cmd/trace/cli/mdrender/mdrender_test.go b/cli/mdrender/mdrender_test.go
similarity index 98%
rename from cmd/trace/cli/mdrender/mdrender_test.go
rename to cli/mdrender/mdrender_test.go
index f27bf36..1d80b1a 100644
--- a/cmd/trace/cli/mdrender/mdrender_test.go
+++ b/cli/mdrender/mdrender_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/mdrender"
+	"github.com/GrayCodeAI/trace/cli/mdrender"
 )
 
 // TestRender_DarkBackgroundProducesAnsi verifies the renderer emits ANSI
diff --git a/cmd/trace/cli/metadata.go b/cli/metadata.go
similarity index 95%
rename from cmd/trace/cli/metadata.go
rename to cli/metadata.go
index 3010223..005c6ed 100644
--- a/cmd/trace/cli/metadata.go
+++ b/cli/metadata.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/osroot"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/osroot"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // TaskCheckpoint contains the checkpoint information for a task
diff --git a/cmd/trace/cli/metadata_test.go b/cli/metadata_test.go
similarity index 98%
rename from cmd/trace/cli/metadata_test.go
rename to cli/metadata_test.go
index 14ecc05..19130eb 100644
--- a/cmd/trace/cli/metadata_test.go
+++ b/cli/metadata_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 func TestTaskMetadataDir(t *testing.T) {
diff --git a/cmd/trace/cli/migrate.go b/cli/migrate.go
similarity index 99%
rename from cmd/trace/cli/migrate.go
rename to cli/migrate.go
index db10433..3ab9b5d 100644
--- a/cmd/trace/cli/migrate.go
+++ b/cli/migrate.go
@@ -11,14 +11,14 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript/compact"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/transcript/compact"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/migrate_test.go b/cli/migrate_test.go
similarity index 99%
rename from cmd/trace/cli/migrate_test.go
rename to cli/migrate_test.go
index e8db345..f867621 100644
--- a/cmd/trace/cli/migrate_test.go
+++ b/cli/migrate_test.go
@@ -9,13 +9,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript/compact"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/transcript/compact"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/objectsigner.go b/cli/objectsigner.go
similarity index 97%
rename from cmd/trace/cli/objectsigner.go
rename to cli/objectsigner.go
index a6b0c51..890ea6e 100644
--- a/cmd/trace/cli/objectsigner.go
+++ b/cli/objectsigner.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"sync"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/logging"
 	"github.com/go-git/go-git/v6/config"
 	format "github.com/go-git/go-git/v6/plumbing/format/config"
 	"github.com/go-git/go-git/v6/x/plugin"
diff --git a/cmd/trace/cli/objectsigner_test.go b/cli/objectsigner_test.go
similarity index 100%
rename from cmd/trace/cli/objectsigner_test.go
rename to cli/objectsigner_test.go
diff --git a/cmd/trace/cli/osroot/osroot.go b/cli/osroot/osroot.go
similarity index 100%
rename from cmd/trace/cli/osroot/osroot.go
rename to cli/osroot/osroot.go
diff --git a/cmd/trace/cli/osroot/osroot_test.go b/cli/osroot/osroot_test.go
similarity index 98%
rename from cmd/trace/cli/osroot/osroot_test.go
rename to cli/osroot/osroot_test.go
index 0563c73..9c8e3bf 100644
--- a/cmd/trace/cli/osroot/osroot_test.go
+++ b/cli/osroot/osroot_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/osroot"
+	"github.com/GrayCodeAI/trace/cli/osroot"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/paths/paths.go b/cli/paths/paths.go
similarity index 99%
rename from cmd/trace/cli/paths/paths.go
rename to cli/paths/paths.go
index c89be97..f6da367 100644
--- a/cmd/trace/cli/paths/paths.go
+++ b/cli/paths/paths.go
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"unicode"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
 )
 
 // Directory constants
diff --git a/cmd/trace/cli/paths/paths_test.go b/cli/paths/paths_test.go
similarity index 100%
rename from cmd/trace/cli/paths/paths_test.go
rename to cli/paths/paths_test.go
diff --git a/cmd/trace/cli/paths/transcript.go b/cli/paths/transcript.go
similarity index 100%
rename from cmd/trace/cli/paths/transcript.go
rename to cli/paths/transcript.go
diff --git a/cmd/trace/cli/paths/worktree.go b/cli/paths/worktree.go
similarity index 100%
rename from cmd/trace/cli/paths/worktree.go
rename to cli/paths/worktree.go
diff --git a/cmd/trace/cli/paths/worktree_test.go b/cli/paths/worktree_test.go
similarity index 100%
rename from cmd/trace/cli/paths/worktree_test.go
rename to cli/paths/worktree_test.go
diff --git a/cmd/trace/cli/phase_wiring_test.go b/cli/phase_wiring_test.go
similarity index 96%
rename from cmd/trace/cli/phase_wiring_test.go
rename to cli/phase_wiring_test.go
index 359e815..2ba2ec7 100644
--- a/cmd/trace/cli/phase_wiring_test.go
+++ b/cli/phase_wiring_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/plugin.go b/cli/plugin.go
similarity index 95%
rename from cmd/trace/cli/plugin.go
rename to cli/plugin.go
index 500d613..ffe9776 100644
--- a/cmd/trace/cli/plugin.go
+++ b/cli/plugin.go
@@ -11,12 +11,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/telemetry"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioncheck"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/telemetry"
+	"github.com/GrayCodeAI/trace/cli/versioncheck"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/plugin_env.go b/cli/plugin_env.go
similarity index 100%
rename from cmd/trace/cli/plugin_env.go
rename to cli/plugin_env.go
diff --git a/cmd/trace/cli/plugin_env_test.go b/cli/plugin_env_test.go
similarity index 100%
rename from cmd/trace/cli/plugin_env_test.go
rename to cli/plugin_env_test.go
diff --git a/cmd/trace/cli/plugin_group.go b/cli/plugin_group.go
similarity index 100%
rename from cmd/trace/cli/plugin_group.go
rename to cli/plugin_group.go
diff --git a/cmd/trace/cli/plugin_group_test.go b/cli/plugin_group_test.go
similarity index 100%
rename from cmd/trace/cli/plugin_group_test.go
rename to cli/plugin_group_test.go
diff --git a/cmd/trace/cli/plugin_official.go b/cli/plugin_official.go
similarity index 100%
rename from cmd/trace/cli/plugin_official.go
rename to cli/plugin_official.go
diff --git a/cmd/trace/cli/plugin_official_test.go b/cli/plugin_official_test.go
similarity index 100%
rename from cmd/trace/cli/plugin_official_test.go
rename to cli/plugin_official_test.go
diff --git a/cmd/trace/cli/plugin_store.go b/cli/plugin_store.go
similarity index 99%
rename from cmd/trace/cli/plugin_store.go
rename to cli/plugin_store.go
index 8a62760..9d97be1 100644
--- a/cmd/trace/cli/plugin_store.go
+++ b/cli/plugin_store.go
@@ -14,8 +14,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // Managed plugin storage. The kubectl-style dispatcher in plugin.go resolves
diff --git a/cmd/trace/cli/plugin_store_test.go b/cli/plugin_store_test.go
similarity index 100%
rename from cmd/trace/cli/plugin_store_test.go
rename to cli/plugin_store_test.go
diff --git a/cmd/trace/cli/plugin_test.go b/cli/plugin_test.go
similarity index 100%
rename from cmd/trace/cli/plugin_test.go
rename to cli/plugin_test.go
diff --git a/cmd/trace/cli/pr_binary_size_test.go b/cli/pr_binary_size_test.go
similarity index 97%
rename from cmd/trace/cli/pr_binary_size_test.go
rename to cli/pr_binary_size_test.go
index 6d2a769..67c74ea 100644
--- a/cmd/trace/cli/pr_binary_size_test.go
+++ b/cli/pr_binary_size_test.go
@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -182,7 +182,7 @@ func runBinaryCheckScriptWithEnv(t *testing.T, repoDir, baseSHA, headSHA string,
 	_, filename, _, ok := runtime.Caller(0)
 	require.True(t, ok)
 
-	scriptPath := filepath.Join(filepath.Dir(filename), "..", "..", "..", "scripts", "check-pr-binaries.sh")
+	scriptPath := filepath.Join(filepath.Dir(filename), "..", "scripts", "check-pr-binaries.sh")
 	cmd := exec.CommandContext(context.Background(), "bash", scriptPath, baseSHA, headSHA)
 	cmd.Dir = repoDir
 	cmd.Env = os.Environ()
diff --git a/cmd/trace/cli/progress.go b/cli/progress.go
similarity index 98%
rename from cmd/trace/cli/progress.go
rename to cli/progress.go
index d3ac6c0..06d1228 100644
--- a/cmd/trace/cli/progress.go
+++ b/cli/progress.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/interactive"
 )
 
 // spinnerFrames matches the bubbles/spinner Dot frames used by the activity
diff --git a/cmd/trace/cli/provenance/env.go b/cli/provenance/env.go
similarity index 98%
rename from cmd/trace/cli/provenance/env.go
rename to cli/provenance/env.go
index 66fce9a..8275e6c 100644
--- a/cmd/trace/cli/provenance/env.go
+++ b/cli/provenance/env.go
@@ -15,7 +15,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
 )
 
 const (
diff --git a/cmd/trace/cli/provenance/env_test.go b/cli/provenance/env_test.go
similarity index 100%
rename from cmd/trace/cli/provenance/env_test.go
rename to cli/provenance/env_test.go
diff --git a/cmd/trace/cli/recap.go b/cli/recap.go
similarity index 95%
rename from cmd/trace/cli/recap.go
rename to cli/recap.go
index d19d7df..c452099 100644
--- a/cmd/trace/cli/recap.go
+++ b/cli/recap.go
@@ -14,12 +14,12 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/auth"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/gitremote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/recap"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/auth"
+	"github.com/GrayCodeAI/trace/cli/gitremote"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/recap"
 )
 
 type recapFlags struct {
diff --git a/cmd/trace/cli/recap/doc.go b/cli/recap/doc.go
similarity index 100%
rename from cmd/trace/cli/recap/doc.go
rename to cli/recap/doc.go
diff --git a/cmd/trace/cli/recap/me_recap.go b/cli/recap/me_recap.go
similarity index 98%
rename from cmd/trace/cli/recap/me_recap.go
rename to cli/recap/me_recap.go
index c1d98b5..7fa8cc0 100644
--- a/cmd/trace/cli/recap/me_recap.go
+++ b/cli/recap/me_recap.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 // MeRecapResponse mirrors GET /api/v1/me/recap.
diff --git a/cmd/trace/cli/recap/me_recap_test.go b/cli/recap/me_recap_test.go
similarity index 95%
rename from cmd/trace/cli/recap/me_recap_test.go
rename to cli/recap/me_recap_test.go
index f73dde5..1ea272f 100644
--- a/cmd/trace/cli/recap/me_recap_test.go
+++ b/cli/recap/me_recap_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 func TestFetchMeRecap_ReturnsTypedUnauthorizedError(t *testing.T) {
diff --git a/cmd/trace/cli/recap/model.go b/cli/recap/model.go
similarity index 100%
rename from cmd/trace/cli/recap/model.go
rename to cli/recap/model.go
diff --git a/cmd/trace/cli/recap/render_static.go b/cli/recap/render_static.go
similarity index 100%
rename from cmd/trace/cli/recap/render_static.go
rename to cli/recap/render_static.go
diff --git a/cmd/trace/cli/recap/static_server_test.go b/cli/recap/static_server_test.go
similarity index 100%
rename from cmd/trace/cli/recap/static_server_test.go
rename to cli/recap/static_server_test.go
diff --git a/cmd/trace/cli/recap/styles.go b/cli/recap/styles.go
similarity index 100%
rename from cmd/trace/cli/recap/styles.go
rename to cli/recap/styles.go
diff --git a/cmd/trace/cli/recap_errors.go b/cli/recap_errors.go
similarity index 98%
rename from cmd/trace/cli/recap_errors.go
rename to cli/recap_errors.go
index 235cdfe..48b176d 100644
--- a/cmd/trace/cli/recap_errors.go
+++ b/cli/recap_errors.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 func recapLoadErrorMessage(err error) string {
diff --git a/cmd/trace/cli/recap_test.go b/cli/recap_test.go
similarity index 99%
rename from cmd/trace/cli/recap_test.go
rename to cli/recap_test.go
index 8f661a1..99b2c7d 100644
--- a/cmd/trace/cli/recap_test.go
+++ b/cli/recap_test.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/recap"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/recap"
 )
 
 const recapTestAgentCodex = "codex"
diff --git a/cmd/trace/cli/recap_tui.go b/cli/recap_tui.go
similarity index 98%
rename from cmd/trace/cli/recap_tui.go
rename to cli/recap_tui.go
index ea38885..0986929 100644
--- a/cmd/trace/cli/recap_tui.go
+++ b/cli/recap_tui.go
@@ -12,8 +12,8 @@ import (
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/recap"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/recap"
 )
 
 type recapTUIOptions struct {
diff --git a/cmd/trace/cli/recap_tui_test.go b/cli/recap_tui_test.go
similarity index 98%
rename from cmd/trace/cli/recap_tui_test.go
rename to cli/recap_tui_test.go
index 9294dbf..00fb259 100644
--- a/cmd/trace/cli/recap_tui_test.go
+++ b/cli/recap_tui_test.go
@@ -10,8 +10,8 @@ import (
 	"charm.land/bubbles/v2/viewport"
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/recap"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/recap"
 )
 
 func testRecapTUIModel() recapTUIModel {
diff --git a/cmd/trace/cli/reset.go b/cli/reset.go
similarity index 96%
rename from cmd/trace/cli/reset.go
rename to cli/reset.go
index 69241b9..a93fa65 100644
--- a/cmd/trace/cli/reset.go
+++ b/cli/reset.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"charm.land/huh/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/reset_test.go b/cli/reset_test.go
similarity index 97%
rename from cmd/trace/cli/reset_test.go
rename to cli/reset_test.go
index 7f9c472..64f1e8c 100644
--- a/cmd/trace/cli/reset_test.go
+++ b/cli/reset_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/resume.go b/cli/resume.go
similarity index 98%
rename from cmd/trace/cli/resume.go
rename to cli/resume.go
index d14a490..540fa26 100644
--- a/cmd/trace/cli/resume.go
+++ b/cli/resume.go
@@ -10,16 +10,16 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"charm.land/huh/v2"
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/resume_test.go b/cli/resume_test.go
similarity index 99%
rename from cmd/trace/cli/resume_test.go
rename to cli/resume_test.go
index f019d12..a014848 100644
--- a/cmd/trace/cli/resume_test.go
+++ b/cli/resume_test.go
@@ -11,9 +11,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/review/attach_test.go b/cli/review/attach_test.go
similarity index 96%
rename from cmd/trace/cli/review/attach_test.go
rename to cli/review/attach_test.go
index ad91638..ae21538 100644
--- a/cmd/trace/cli/review/attach_test.go
+++ b/cli/review/attach_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	cli "github.com/GrayCodeAI/trace/cmd/trace/cli"
+	cli "github.com/GrayCodeAI/trace/cli"
 )
 
 // TestReviewAttach_Help verifies that `trace review attach --help` surfaces
diff --git a/cmd/trace/cli/review/cmd.go b/cli/review/cmd.go
similarity index 98%
rename from cmd/trace/cli/review/cmd.go
rename to cli/review/cmd.go
index 11486f0..4c5d3c9 100644
--- a/cmd/trace/cli/review/cmd.go
+++ b/cli/review/cmd.go
@@ -20,20 +20,20 @@ import (
 	git "github.com/go-git/go-git/v6"
 	"github.com/spf13/cobra"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 // Deps collects the runtime-injectable hooks NewCommand needs from the
 // parent cli package. Tests stub fields to drive branches that would
 // otherwise require a real TTY or enabled repo. Production wiring is
-// provided by buildReviewDeps in cmd/trace/cli/review_bridge.go and
+// provided by buildReviewDeps in cli/review_bridge.go and
 // passed to NewCommand from root.go.
 type Deps struct {
 	// GetAgentsWithHooksInstalled returns the registry names of all agents
diff --git a/cmd/trace/cli/review/cmd_test.go b/cli/review/cmd_test.go
similarity index 98%
rename from cmd/trace/cli/review/cmd_test.go
rename to cli/review/cmd_test.go
index 0a00517..f47591c 100644
--- a/cmd/trace/cli/review/cmd_test.go
+++ b/cli/review/cmd_test.go
@@ -7,13 +7,13 @@ import (
 	"strings"
 	"testing"
 
-	cli "github.com/GrayCodeAI/trace/cmd/trace/cli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	cli "github.com/GrayCodeAI/trace/cli"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // setupCmdTestRepo initialises a temp git repo with one commit and chdirs into it.
diff --git a/cmd/trace/cli/review/dump.go b/cli/review/dump.go
similarity index 97%
rename from cmd/trace/cli/review/dump.go
rename to cli/review/dump.go
index 6a8a7e2..c6ecb92 100644
--- a/cmd/trace/cli/review/dump.go
+++ b/cli/review/dump.go
@@ -16,8 +16,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/mdrender"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/mdrender"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // DumpSink writes per-agent narrative blocks to W after the run completes.
diff --git a/cmd/trace/cli/review/dump_test.go b/cli/review/dump_test.go
similarity index 98%
rename from cmd/trace/cli/review/dump_test.go
rename to cli/review/dump_test.go
index 53d993b..221beee 100644
--- a/cmd/trace/cli/review/dump_test.go
+++ b/cli/review/dump_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 func makeSummary(runs ...reviewtypes.AgentRun) reviewtypes.RunSummary {
diff --git a/cmd/trace/cli/review/env.go b/cli/review/env.go
similarity index 98%
rename from cmd/trace/cli/review/env.go
rename to cli/review/env.go
index a3962ed..1367b10 100644
--- a/cmd/trace/cli/review/env.go
+++ b/cli/review/env.go
@@ -15,7 +15,7 @@ import (
 	"fmt"
 	"strings"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 const (
diff --git a/cmd/trace/cli/review/env_test.go b/cli/review/env_test.go
similarity index 98%
rename from cmd/trace/cli/review/env_test.go
rename to cli/review/env_test.go
index 1f29c95..4e5fdf0 100644
--- a/cmd/trace/cli/review/env_test.go
+++ b/cli/review/env_test.go
@@ -3,7 +3,7 @@ package review
 import (
 	"testing"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 func TestEnvSkillsRoundtrip(t *testing.T) {
diff --git a/cmd/trace/cli/review/export_test.go b/cli/review/export_test.go
similarity index 96%
rename from cmd/trace/cli/review/export_test.go
rename to cli/review/export_test.go
index 31ab117..8d25d86 100644
--- a/cmd/trace/cli/review/export_test.go
+++ b/cli/review/export_test.go
@@ -6,7 +6,7 @@ import (
 
 	"charm.land/huh/v2"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // ExposedComposeSynthesisPrompt exposes composeSynthesisPrompt for
diff --git a/cmd/trace/cli/review/fix.go b/cli/review/fix.go
similarity index 98%
rename from cmd/trace/cli/review/fix.go
rename to cli/review/fix.go
index e419bc1..1c210d7 100644
--- a/cmd/trace/cli/review/fix.go
+++ b/cli/review/fix.go
@@ -14,13 +14,13 @@ import (
 	"charm.land/huh/v2"
 	"github.com/spf13/cobra"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	agenttypes "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/mdrender"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	agenttypes "github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/mdrender"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
 )
 
 type reviewFixSourceKind string
diff --git a/cmd/trace/cli/review/manifest.go b/cli/review/manifest.go
similarity index 96%
rename from cmd/trace/cli/review/manifest.go
rename to cli/review/manifest.go
index f8ca27e..0d3409e 100644
--- a/cmd/trace/cli/review/manifest.go
+++ b/cli/review/manifest.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	agenttypes "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	agenttypes "github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 const localReviewManifestVersion = 1
diff --git a/cmd/trace/cli/review/manifest_test.go b/cli/review/manifest_test.go
similarity index 98%
rename from cmd/trace/cli/review/manifest_test.go
rename to cli/review/manifest_test.go
index a3fc046..a81ecf5 100644
--- a/cmd/trace/cli/review/manifest_test.go
+++ b/cli/review/manifest_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	agenttypes "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	agenttypes "github.com/GrayCodeAI/trace/cli/agent/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 const manifestTestCodexAgent = "codex"
diff --git a/cmd/trace/cli/review/marker_fallback.go b/cli/review/marker_fallback.go
similarity index 98%
rename from cmd/trace/cli/review/marker_fallback.go
rename to cli/review/marker_fallback.go
index 5bb0f77..eac6c7a 100644
--- a/cmd/trace/cli/review/marker_fallback.go
+++ b/cli/review/marker_fallback.go
@@ -28,8 +28,8 @@ import (
 	"path/filepath"
 	"time"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 const pendingReviewMarkerFilename = "review-pending.json"
diff --git a/cmd/trace/cli/review/marker_fallback_test.go b/cli/review/marker_fallback_test.go
similarity index 95%
rename from cmd/trace/cli/review/marker_fallback_test.go
rename to cli/review/marker_fallback_test.go
index 525d82e..a0b771d 100644
--- a/cmd/trace/cli/review/marker_fallback_test.go
+++ b/cli/review/marker_fallback_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // setupMarkerTestRepo initialises a temp git repo and chdirs into it.
diff --git a/cmd/trace/cli/review/migration.go b/cli/review/migration.go
similarity index 98%
rename from cmd/trace/cli/review/migration.go
rename to cli/review/migration.go
index ed259ca..3bd737a 100644
--- a/cmd/trace/cli/review/migration.go
+++ b/cli/review/migration.go
@@ -8,8 +8,8 @@ import (
 	"io"
 	"log/slog"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 type projectReviewSettings struct {
diff --git a/cmd/trace/cli/review/migration_test.go b/cli/review/migration_test.go
similarity index 98%
rename from cmd/trace/cli/review/migration_test.go
rename to cli/review/migration_test.go
index 825e1b1..fbe23b4 100644
--- a/cmd/trace/cli/review/migration_test.go
+++ b/cli/review/migration_test.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 func TestReviewSettingsMigration_MovesProjectReviewToClonePreferences(t *testing.T) {
diff --git a/cmd/trace/cli/review/multipicker.go b/cli/review/multipicker.go
similarity index 100%
rename from cmd/trace/cli/review/multipicker.go
rename to cli/review/multipicker.go
diff --git a/cmd/trace/cli/review/multipicker_test.go b/cli/review/multipicker_test.go
similarity index 98%
rename from cmd/trace/cli/review/multipicker_test.go
rename to cli/review/multipicker_test.go
index 65d1672..3385681 100644
--- a/cmd/trace/cli/review/multipicker_test.go
+++ b/cli/review/multipicker_test.go
@@ -8,7 +8,7 @@ import (
 
 	"charm.land/huh/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
+	"github.com/GrayCodeAI/trace/cli/review"
 )
 
 // TestPickAgents_TooFewEligibleReturnsError verifies that calling PickAgents
diff --git a/cmd/trace/cli/review/picker.go b/cli/review/picker.go
similarity index 98%
rename from cmd/trace/cli/review/picker.go
rename to cli/review/picker.go
index 6030df7..f95e4a7 100644
--- a/cmd/trace/cli/review/picker.go
+++ b/cli/review/picker.go
@@ -17,12 +17,12 @@ import (
 
 	"charm.land/huh/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/skilldiscovery"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/skilldiscovery"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 // AgentChoice is one row in the spawn-time picker. Name is the agent
diff --git a/cmd/trace/cli/review/picker_test.go b/cli/review/picker_test.go
similarity index 97%
rename from cmd/trace/cli/review/picker_test.go
rename to cli/review/picker_test.go
index 1228692..084b922 100644
--- a/cmd/trace/cli/review/picker_test.go
+++ b/cli/review/picker_test.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/skilldiscovery"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/skilldiscovery"
+	"github.com/GrayCodeAI/trace/cli/review"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 const (
diff --git a/cmd/trace/cli/review/prompt.go b/cli/review/prompt.go
similarity index 96%
rename from cmd/trace/cli/review/prompt.go
rename to cli/review/prompt.go
index c2d5583..461ef10 100644
--- a/cmd/trace/cli/review/prompt.go
+++ b/cli/review/prompt.go
@@ -11,7 +11,7 @@ package review
 import (
 	"strings"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // ComposeReviewPrompt assembles the prompt sent to the agent. It joins
diff --git a/cmd/trace/cli/review/prompt_test.go b/cli/review/prompt_test.go
similarity index 98%
rename from cmd/trace/cli/review/prompt_test.go
rename to cli/review/prompt_test.go
index fff4247..e4e6920 100644
--- a/cmd/trace/cli/review/prompt_test.go
+++ b/cli/review/prompt_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 func TestComposeReviewPrompt_SkillsOnly(t *testing.T) {
diff --git a/cmd/trace/cli/review/run.go b/cli/review/run.go
similarity index 98%
rename from cmd/trace/cli/review/run.go
rename to cli/review/run.go
index f3365b4..a7ca2e4 100644
--- a/cmd/trace/cli/review/run.go
+++ b/cli/review/run.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"time"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // Run executes a single-agent review. Events from the agent are forwarded
diff --git a/cmd/trace/cli/review/run_multi.go b/cli/review/run_multi.go
similarity index 99%
rename from cmd/trace/cli/review/run_multi.go
rename to cli/review/run_multi.go
index 626be99..e433e94 100644
--- a/cmd/trace/cli/review/run_multi.go
+++ b/cli/review/run_multi.go
@@ -28,7 +28,7 @@ import (
 	"sync"
 	"time"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // perAgentState tracks the mutable accumulation for one agent during a
diff --git a/cmd/trace/cli/review/run_multi_test.go b/cli/review/run_multi_test.go
similarity index 99%
rename from cmd/trace/cli/review/run_multi_test.go
rename to cli/review/run_multi_test.go
index ec514cb..938320c 100644
--- a/cmd/trace/cli/review/run_multi_test.go
+++ b/cli/review/run_multi_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // TestRunMulti_BothSucceed verifies that two agents that complete cleanly
diff --git a/cmd/trace/cli/review/run_test.go b/cli/review/run_test.go
similarity index 99%
rename from cmd/trace/cli/review/run_test.go
rename to cli/review/run_test.go
index 1982e9b..6fac5b4 100644
--- a/cmd/trace/cli/review/run_test.go
+++ b/cli/review/run_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // stubReviewer is a test double for reviewtypes.AgentReviewer.
diff --git a/cmd/trace/cli/review/scope.go b/cli/review/scope.go
similarity index 100%
rename from cmd/trace/cli/review/scope.go
rename to cli/review/scope.go
diff --git a/cmd/trace/cli/review/scope_test.go b/cli/review/scope_test.go
similarity index 99%
rename from cmd/trace/cli/review/scope_test.go
rename to cli/review/scope_test.go
index 9fbbb5f..f18b816 100644
--- a/cmd/trace/cli/review/scope_test.go
+++ b/cli/review/scope_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 )
diff --git a/cmd/trace/cli/review/status_test.go b/cli/review/status_test.go
similarity index 87%
rename from cmd/trace/cli/review/status_test.go
rename to cli/review/status_test.go
index 66dbb55..4cde63f 100644
--- a/cmd/trace/cli/review/status_test.go
+++ b/cli/review/status_test.go
@@ -2,7 +2,7 @@ package review_test
 
 // status_test.go: this file is intentionally a comment-only stub.
 //
-// headHasReviewCheckpoint lives in the cli package (cmd/trace/cli/
+// headHasReviewCheckpoint lives in the cli package (cli/
 // review_helpers.go) — not here — because it imports checkpoint, which
 // transitively imports per-agent reviewer packages, which import review.
 // Moving it into review/ would close that cycle. Tests for it live with
diff --git a/cmd/trace/cli/review/synthesis_prompt.go b/cli/review/synthesis_prompt.go
similarity index 97%
rename from cmd/trace/cli/review/synthesis_prompt.go
rename to cli/review/synthesis_prompt.go
index 72c4446..6a7f2c7 100644
--- a/cmd/trace/cli/review/synthesis_prompt.go
+++ b/cli/review/synthesis_prompt.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"strings"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // composeSynthesisPrompt builds the LLM prompt asking the provider to
diff --git a/cmd/trace/cli/review/synthesis_prompt_test.go b/cli/review/synthesis_prompt_test.go
similarity index 98%
rename from cmd/trace/cli/review/synthesis_prompt_test.go
rename to cli/review/synthesis_prompt_test.go
index ea8b310..97b7e03 100644
--- a/cmd/trace/cli/review/synthesis_prompt_test.go
+++ b/cli/review/synthesis_prompt_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 func makeSummaryWithNarratives(agents []struct {
diff --git a/cmd/trace/cli/review/synthesis_sink.go b/cli/review/synthesis_sink.go
similarity index 97%
rename from cmd/trace/cli/review/synthesis_sink.go
rename to cli/review/synthesis_sink.go
index 3e9c66a..8499b04 100644
--- a/cmd/trace/cli/review/synthesis_sink.go
+++ b/cli/review/synthesis_sink.go
@@ -20,9 +20,9 @@ import (
 
 	"charm.land/huh/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/mdrender"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/mdrender"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // SynthesisProvider abstracts the LLM call that produces the cross-agent
diff --git a/cmd/trace/cli/review/synthesis_sink_test.go b/cli/review/synthesis_sink_test.go
similarity index 99%
rename from cmd/trace/cli/review/synthesis_sink_test.go
rename to cli/review/synthesis_sink_test.go
index 7683328..9270311 100644
--- a/cmd/trace/cli/review/synthesis_sink_test.go
+++ b/cli/review/synthesis_sink_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // stubSynthesisProvider is a test double for SynthesisProvider that records
diff --git a/cmd/trace/cli/review/tui_detail.go b/cli/review/tui_detail.go
similarity index 98%
rename from cmd/trace/cli/review/tui_detail.go
rename to cli/review/tui_detail.go
index 385573e..fb1eb3c 100644
--- a/cmd/trace/cli/review/tui_detail.go
+++ b/cli/review/tui_detail.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"strings"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // eventLine converts a single Event to a single display line for the detail
diff --git a/cmd/trace/cli/review/tui_detail_test.go b/cli/review/tui_detail_test.go
similarity index 98%
rename from cmd/trace/cli/review/tui_detail_test.go
rename to cli/review/tui_detail_test.go
index 48008d3..acb8fb8 100644
--- a/cmd/trace/cli/review/tui_detail_test.go
+++ b/cli/review/tui_detail_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/charmbracelet/x/ansi"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // countLines counts the number of lines (\n-separated) in s.
diff --git a/cmd/trace/cli/review/tui_model.go b/cli/review/tui_model.go
similarity index 99%
rename from cmd/trace/cli/review/tui_model.go
rename to cli/review/tui_model.go
index 6a884af..2531305 100644
--- a/cmd/trace/cli/review/tui_model.go
+++ b/cli/review/tui_model.go
@@ -18,8 +18,8 @@ import (
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
 )
 
 // agentRow holds per-agent live state during the TUI run.
diff --git a/cmd/trace/cli/review/tui_model_test.go b/cli/review/tui_model_test.go
similarity index 99%
rename from cmd/trace/cli/review/tui_model_test.go
rename to cli/review/tui_model_test.go
index f82c2d0..f882d85 100644
--- a/cmd/trace/cli/review/tui_model_test.go
+++ b/cli/review/tui_model_test.go
@@ -11,7 +11,7 @@ import (
 	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/x/ansi"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // newTestModel returns a reviewTUIModel wired to the provided cancel stub.
diff --git a/cmd/trace/cli/review/tui_sink.go b/cli/review/tui_sink.go
similarity index 98%
rename from cmd/trace/cli/review/tui_sink.go
rename to cli/review/tui_sink.go
index 4ee2adf..2c99659 100644
--- a/cmd/trace/cli/review/tui_sink.go
+++ b/cli/review/tui_sink.go
@@ -13,7 +13,7 @@ import (
 
 	tea "charm.land/bubbletea/v2"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // TUISink is a Sink that renders a Bubble Tea dashboard. The orchestrator
diff --git a/cmd/trace/cli/review/tui_sink_test.go b/cli/review/tui_sink_test.go
similarity index 98%
rename from cmd/trace/cli/review/tui_sink_test.go
rename to cli/review/tui_sink_test.go
index 71c3fa2..495180e 100644
--- a/cmd/trace/cli/review/tui_sink_test.go
+++ b/cli/review/tui_sink_test.go
@@ -7,7 +7,7 @@ import (
 
 	tea "charm.land/bubbletea/v2"
 
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 func finishAndDismissTUI(t *testing.T, sink *TUISink, summary reviewtypes.RunSummary) {
diff --git a/cmd/trace/cli/review/tui_text.go b/cli/review/tui_text.go
similarity index 100%
rename from cmd/trace/cli/review/tui_text.go
rename to cli/review/tui_text.go
diff --git a/cmd/trace/cli/review/tui_text_test.go b/cli/review/tui_text_test.go
similarity index 100%
rename from cmd/trace/cli/review/tui_text_test.go
rename to cli/review/tui_text_test.go
diff --git a/cmd/trace/cli/review/types/reviewer.go b/cli/review/types/reviewer.go
similarity index 98%
rename from cmd/trace/cli/review/types/reviewer.go
rename to cli/review/types/reviewer.go
index 97d485e..ed7857e 100644
--- a/cmd/trace/cli/review/types/reviewer.go
+++ b/cli/review/types/reviewer.go
@@ -2,7 +2,7 @@
 //
 // AgentReviewer is the contract every supported agent (claude-code, codex,
 // gemini-cli, future additions) implements in its own package. The orchestrator
-// in cmd/trace/cli/review/run.go consumes this interface, never importing
+// in cli/review/run.go consumes this interface, never importing
 // concrete agent packages — that's how new agents land as additive files
 // without touching shared code.
 //
@@ -32,7 +32,7 @@ type AgentReviewer interface {
 	// when the process exits.
 	//
 	// Implementations MUST set the TRACE_REVIEW_* env vars on the spawned
-	// child process (see cmd/trace/cli/review/env.go) so the agent's
+	// child process (see cli/review/env.go) so the agent's
 	// lifecycle hooks adopt the session as a review session.
 	//
 	// Errors from Start indicate failure to construct or launch the process
diff --git a/cmd/trace/cli/review/types/reviewer_test.go b/cli/review/types/reviewer_test.go
similarity index 100%
rename from cmd/trace/cli/review/types/reviewer_test.go
rename to cli/review/types/reviewer_test.go
diff --git a/cmd/trace/cli/review/types/sink.go b/cli/review/types/sink.go
similarity index 100%
rename from cmd/trace/cli/review/types/sink.go
rename to cli/review/types/sink.go
diff --git a/cmd/trace/cli/review/types/sink_test.go b/cli/review/types/sink_test.go
similarity index 100%
rename from cmd/trace/cli/review/types/sink_test.go
rename to cli/review/types/sink_test.go
diff --git a/cmd/trace/cli/review/types/template.go b/cli/review/types/template.go
similarity index 100%
rename from cmd/trace/cli/review/types/template.go
rename to cli/review/types/template.go
diff --git a/cmd/trace/cli/review/types/template_test.go b/cli/review/types/template_test.go
similarity index 100%
rename from cmd/trace/cli/review/types/template_test.go
rename to cli/review/types/template_test.go
diff --git a/cmd/trace/cli/review_bridge.go b/cli/review_bridge.go
similarity index 92%
rename from cmd/trace/cli/review_bridge.go
rename to cli/review_bridge.go
index 915f5cc..382dfdf 100644
--- a/cmd/trace/cli/review_bridge.go
+++ b/cli/review_bridge.go
@@ -15,13 +15,13 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	cliReview "github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	reviewtypes "github.com/GrayCodeAI/trace/cmd/trace/cli/review/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/codex"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	cliReview "github.com/GrayCodeAI/trace/cli/review"
+	reviewtypes "github.com/GrayCodeAI/trace/cli/review/types"
 )
 
 // buildReviewDeps builds the review.Deps struct used by review.NewCommand.
diff --git a/cmd/trace/cli/review_context.go b/cli/review_context.go
similarity index 94%
rename from cmd/trace/cli/review_context.go
rename to cli/review_context.go
index 9857399..b57980b 100644
--- a/cmd/trace/cli/review_context.go
+++ b/cli/review_context.go
@@ -11,14 +11,14 @@ import (
 
 	git "github.com/go-git/go-git/v6"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	checkpointid "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	checkpointid "github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 )
 
 const (
diff --git a/cmd/trace/cli/review_context_test.go b/cli/review_context_test.go
similarity index 96%
rename from cmd/trace/cli/review_context_test.go
rename to cli/review_context_test.go
index aa97d87..ed91778 100644
--- a/cmd/trace/cli/review_context_test.go
+++ b/cli/review_context_test.go
@@ -11,12 +11,12 @@ import (
 
 	git "github.com/go-git/go-git/v6"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	checkpointid "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	checkpointid "github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/GrayCodeAI/trace/redact"
 )
 
diff --git a/cmd/trace/cli/review_helpers.go b/cli/review_helpers.go
similarity index 91%
rename from cmd/trace/cli/review_helpers.go
rename to cli/review_helpers.go
index fc7aef5..a14daa1 100644
--- a/cmd/trace/cli/review_helpers.go
+++ b/cli/review_helpers.go
@@ -21,16 +21,16 @@ import (
 	git "github.com/go-git/go-git/v6"
 	"github.com/spf13/cobra"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	cliReview "github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	cliReview "github.com/GrayCodeAI/trace/cli/review"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 )
 
 // headHasReviewCheckpoint checks whether HEAD's checkpoint metadata includes
diff --git a/cmd/trace/cli/rewind.go b/cli/rewind.go
similarity index 98%
rename from cmd/trace/cli/rewind.go
rename to cli/rewind.go
index 45e9b85..9f733f9 100644
--- a/cmd/trace/cli/rewind.go
+++ b/cli/rewind.go
@@ -13,16 +13,16 @@ import (
 	"time"
 	"unicode"
 
-	agentpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	agentpkg "github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 
 	"charm.land/huh/v2"
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/root.go b/cli/root.go
similarity index 94%
rename from cmd/trace/cli/root.go
rename to cli/root.go
index 8091c85..096fc87 100644
--- a/cmd/trace/cli/root.go
+++ b/cli/root.go
@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"runtime"
 
-	cliInvestigate "github.com/GrayCodeAI/trace/cmd/trace/cli/investigate"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	cliReview "github.com/GrayCodeAI/trace/cmd/trace/cli/review"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/telemetry"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioncheck"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	cliInvestigate "github.com/GrayCodeAI/trace/cli/investigate"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	cliReview "github.com/GrayCodeAI/trace/cli/review"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/telemetry"
+	"github.com/GrayCodeAI/trace/cli/versioncheck"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/root_test.go b/cli/root_test.go
similarity index 99%
rename from cmd/trace/cli/root_test.go
rename to cli/root_test.go
index 64a3074..3230f65 100644
--- a/cmd/trace/cli/root_test.go
+++ b/cli/root_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/search/github.go b/cli/search/github.go
similarity index 100%
rename from cmd/trace/cli/search/github.go
rename to cli/search/github.go
diff --git a/cmd/trace/cli/search/search.go b/cli/search/search.go
similarity index 100%
rename from cmd/trace/cli/search/search.go
rename to cli/search/search.go
diff --git a/cmd/trace/cli/search/search_test.go b/cli/search/search_test.go
similarity index 100%
rename from cmd/trace/cli/search/search_test.go
rename to cli/search/search_test.go
diff --git a/cmd/trace/cli/search_cmd.go b/cli/search_cmd.go
similarity index 96%
rename from cmd/trace/cli/search_cmd.go
rename to cli/search_cmd.go
index ba398eb..da1a0fa 100644
--- a/cmd/trace/cli/search_cmd.go
+++ b/cli/search_cmd.go
@@ -8,12 +8,12 @@ import (
 	"strings"
 
 	tea "charm.land/bubbletea/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/auth"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/search"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/auth"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/search"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/search_cmd_test.go b/cli/search_cmd_test.go
similarity index 97%
rename from cmd/trace/cli/search_cmd_test.go
rename to cli/search_cmd_test.go
index 9bc6bd5..abb90c1 100644
--- a/cmd/trace/cli/search_cmd_test.go
+++ b/cli/search_cmd_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/search"
+	"github.com/GrayCodeAI/trace/cli/search"
 )
 
 // TestSearchCmd_AccessibleModeRequiresQuery verifies that accessible mode
diff --git a/cmd/trace/cli/search_tui.go b/cli/search_tui.go
similarity index 99%
rename from cmd/trace/cli/search_tui.go
rename to cli/search_tui.go
index 04315a4..2da393f 100644
--- a/cmd/trace/cli/search_tui.go
+++ b/cli/search_tui.go
@@ -15,8 +15,8 @@ import (
 	"charm.land/glamour/v2/ansi"
 	glamourstyles "charm.land/glamour/v2/styles"
 	"charm.land/lipgloss/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/search"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/search"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
 	"github.com/muesli/termenv"
 )
 
diff --git a/cmd/trace/cli/search_tui_test.go b/cli/search_tui_test.go
similarity index 99%
rename from cmd/trace/cli/search_tui_test.go
rename to cli/search_tui_test.go
index 48cc103..4a3d3cd 100644
--- a/cmd/trace/cli/search_tui_test.go
+++ b/cli/search_tui_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	tea "charm.land/bubbletea/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/search"
+	"github.com/GrayCodeAI/trace/cli/search"
 )
 
 const newQuery = "new query"
diff --git a/cmd/trace/cli/session/gen_state_diagram.go b/cli/session/gen_state_diagram.go
similarity index 91%
rename from cmd/trace/cli/session/gen_state_diagram.go
rename to cli/session/gen_state_diagram.go
index a14c783..ae7ecc8 100644
--- a/cmd/trace/cli/session/gen_state_diagram.go
+++ b/cli/session/gen_state_diagram.go
@@ -1,7 +1,7 @@
 //go:build ignore
 
 // gen_mermaid generates the session phase state machine Mermaid diagram.
-// Run via: go generate ./cmd/trace/cli/session/
+// Run via: go generate ./cli/session/
 package main
 
 import (
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 func main() {
diff --git a/cmd/trace/cli/session/phase.go b/cli/session/phase.go
similarity index 99%
rename from cmd/trace/cli/session/phase.go
rename to cli/session/phase.go
index 0df719b..2eb461c 100644
--- a/cmd/trace/cli/session/phase.go
+++ b/cli/session/phase.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // Phase represents the lifecycle stage of a session.
diff --git a/cmd/trace/cli/session/phase_test.go b/cli/session/phase_test.go
similarity index 100%
rename from cmd/trace/cli/session/phase_test.go
rename to cli/session/phase_test.go
diff --git a/cmd/trace/cli/session/state.go b/cli/session/state.go
similarity index 98%
rename from cmd/trace/cli/session/state.go
rename to cli/session/state.go
index 6451102..a1a5551 100644
--- a/cmd/trace/cli/session/state.go
+++ b/cli/session/state.go
@@ -12,13 +12,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/osroot"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/osroot"
+	"github.com/GrayCodeAI/trace/cli/validation"
 )
 
 const (
diff --git a/cmd/trace/cli/session/state_test.go b/cli/session/state_test.go
similarity index 99%
rename from cmd/trace/cli/session/state_test.go
rename to cli/session/state_test.go
index 472d54c..f94dc54 100644
--- a/cmd/trace/cli/session/state_test.go
+++ b/cli/session/state_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/session/tags.go b/cli/session/tags.go
similarity index 100%
rename from cmd/trace/cli/session/tags.go
rename to cli/session/tags.go
diff --git a/cmd/trace/cli/session/tags_test.go b/cli/session/tags_test.go
similarity index 100%
rename from cmd/trace/cli/session/tags_test.go
rename to cli/session/tags_test.go
diff --git a/cmd/trace/cli/session_analytics.go b/cli/session_analytics.go
similarity index 98%
rename from cmd/trace/cli/session_analytics.go
rename to cli/session_analytics.go
index fe79a3b..23acd23 100644
--- a/cmd/trace/cli/session_analytics.go
+++ b/cli/session_analytics.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/cost"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/cost"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/session_asciinema.go b/cli/session_asciinema.go
similarity index 97%
rename from cmd/trace/cli/session_asciinema.go
rename to cli/session_asciinema.go
index 74b2e97..fa344c0 100644
--- a/cmd/trace/cli/session_asciinema.go
+++ b/cli/session_asciinema.go
@@ -9,8 +9,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // asciinema v2 cast defaults. The format is a header JSON object on the first
diff --git a/cmd/trace/cli/session_asciinema_test.go b/cli/session_asciinema_test.go
similarity index 98%
rename from cmd/trace/cli/session_asciinema_test.go
rename to cli/session_asciinema_test.go
index 07b77c9..44df100 100644
--- a/cmd/trace/cli/session_asciinema_test.go
+++ b/cli/session_asciinema_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 )
 
 // sampleTranscript is a minimal Claude Code style JSONL transcript with one
diff --git a/cmd/trace/cli/session_current.go b/cli/session_current.go
similarity index 92%
rename from cmd/trace/cli/session_current.go
rename to cli/session_current.go
index 82faeb3..8aeff94 100644
--- a/cmd/trace/cli/session_current.go
+++ b/cli/session_current.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/session_current_test.go b/cli/session_current_test.go
similarity index 93%
rename from cmd/trace/cli/session_current_test.go
rename to cli/session_current_test.go
index 268e93a..2f42c7c 100644
--- a/cmd/trace/cli/session_current_test.go
+++ b/cli/session_current_test.go
@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/session_replay.go b/cli/session_replay.go
similarity index 98%
rename from cmd/trace/cli/session_replay.go
rename to cli/session_replay.go
index 0902d36..a3316ca 100644
--- a/cmd/trace/cli/session_replay.go
+++ b/cli/session_replay.go
@@ -10,9 +10,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/session_share.go b/cli/session_share.go
similarity index 96%
rename from cmd/trace/cli/session_share.go
rename to cli/session_share.go
index edf91c7..abe8f79 100644
--- a/cmd/trace/cli/session_share.go
+++ b/cli/session_share.go
@@ -9,12 +9,12 @@ import (
 	"os"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/validation"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/session_share_test.go b/cli/session_share_test.go
similarity index 95%
rename from cmd/trace/cli/session_share_test.go
rename to cli/session_share_test.go
index 46a4b3a..0f8f948 100644
--- a/cmd/trace/cli/session_share_test.go
+++ b/cli/session_share_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // writeSampleSession persists a session whose transcript contains one user and
diff --git a/cmd/trace/cli/session_timeline.go b/cli/session_timeline.go
similarity index 100%
rename from cmd/trace/cli/session_timeline.go
rename to cli/session_timeline.go
diff --git a/cmd/trace/cli/session_timeline_test.go b/cli/session_timeline_test.go
similarity index 100%
rename from cmd/trace/cli/session_timeline_test.go
rename to cli/session_timeline_test.go
diff --git a/cmd/trace/cli/sessions.go b/cli/sessions.go
similarity index 99%
rename from cmd/trace/cli/sessions.go
rename to cli/sessions.go
index b1b6060..fcab39a 100644
--- a/cmd/trace/cli/sessions.go
+++ b/cli/sessions.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"charm.land/huh/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/sessions_test.go b/cli/sessions_test.go
similarity index 99%
rename from cmd/trace/cli/sessions_test.go
rename to cli/sessions_test.go
index 1298647..0e5b4cd 100644
--- a/cmd/trace/cli/sessions_test.go
+++ b/cli/sessions_test.go
@@ -9,11 +9,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 const (
diff --git a/cmd/trace/cli/settings/settings.go b/cli/settings/settings.go
similarity index 99%
rename from cmd/trace/cli/settings/settings.go
rename to cli/settings/settings.go
index e214eb0..3c645e5 100644
--- a/cmd/trace/cli/settings/settings.go
+++ b/cli/settings/settings.go
@@ -15,9 +15,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 const (
diff --git a/cmd/trace/cli/settings/settings_attribution_test.go b/cli/settings/settings_attribution_test.go
similarity index 100%
rename from cmd/trace/cli/settings/settings_attribution_test.go
rename to cli/settings/settings_attribution_test.go
diff --git a/cmd/trace/cli/settings/settings_checkpoint_remote_test.go b/cli/settings/settings_checkpoint_remote_test.go
similarity index 100%
rename from cmd/trace/cli/settings/settings_checkpoint_remote_test.go
rename to cli/settings/settings_checkpoint_remote_test.go
diff --git a/cmd/trace/cli/settings/settings_test.go b/cli/settings/settings_test.go
similarity index 100%
rename from cmd/trace/cli/settings/settings_test.go
rename to cli/settings/settings_test.go
diff --git a/cmd/trace/cli/setup.go b/cli/setup.go
similarity index 99%
rename from cmd/trace/cli/setup.go
rename to cli/setup.go
index 039683c..ba32963 100644
--- a/cmd/trace/cli/setup.go
+++ b/cli/setup.go
@@ -9,16 +9,16 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/vercelconfig"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/vercelconfig"
 
 	"charm.land/huh/v2"
 	"github.com/spf13/cobra"
diff --git a/cmd/trace/cli/setup_github.go b/cli/setup_github.go
similarity index 99%
rename from cmd/trace/cli/setup_github.go
rename to cli/setup_github.go
index 1d9ae90..7c3c88f 100644
--- a/cmd/trace/cli/setup_github.go
+++ b/cli/setup_github.go
@@ -15,8 +15,8 @@ import (
 
 	"charm.land/huh/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // GitHubBootstrapOptions holds flags that let `trace enable` run on a folder
diff --git a/cmd/trace/cli/setup_github_test.go b/cli/setup_github_test.go
similarity index 100%
rename from cmd/trace/cli/setup_github_test.go
rename to cli/setup_github_test.go
diff --git a/cmd/trace/cli/setup_subagents.go b/cli/setup_subagents.go
similarity index 98%
rename from cmd/trace/cli/setup_subagents.go
rename to cli/setup_subagents.go
index 27e565c..f5313b8 100644
--- a/cmd/trace/cli/setup_subagents.go
+++ b/cli/setup_subagents.go
@@ -10,9 +10,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 const traceManagedSearchSubagentMarker = "TRACE-MANAGED SEARCH SUBAGENT v1"
diff --git a/cmd/trace/cli/setup_subagents_test.go b/cli/setup_subagents_test.go
similarity index 96%
rename from cmd/trace/cli/setup_subagents_test.go
rename to cli/setup_subagents_test.go
index 12a5de6..292b15f 100644
--- a/cmd/trace/cli/setup_subagents_test.go
+++ b/cli/setup_subagents_test.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/codex"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
 )
 
 func TestScaffoldSearchSubagent_CreatesManagedFiles(t *testing.T) {
diff --git a/cmd/trace/cli/setup_test.go b/cli/setup_test.go
similarity index 99%
rename from cmd/trace/cli/setup_test.go
rename to cli/setup_test.go
index 447f38b..80a66cb 100644
--- a/cmd/trace/cli/setup_test.go
+++ b/cli/setup_test.go
@@ -12,21 +12,21 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	_ "github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 )
 
 // Note: Tests for hook manipulation functions (addHookToMatcher, hookCommandExists, etc.)
 // have been moved to the agent/claudecode package where these functions now reside.
-// See cmd/trace/cli/agent/claudecode/hooks_test.go for those tests.
+// See cli/agent/claudecode/hooks_test.go for those tests.
 
 // setupTestDir creates a temp directory, changes to it, and returns it.
 // It also registers cleanup to restore the original directory.
diff --git a/cmd/trace/cli/state.go b/cli/state.go
similarity index 98%
rename from cmd/trace/cli/state.go
rename to cli/state.go
index 6bd6d39..7a95c47 100644
--- a/cmd/trace/cli/state.go
+++ b/cli/state.go
@@ -11,13 +11,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/osroot"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/osroot"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/validation"
 
 	"github.com/go-git/go-git/v6"
 )
diff --git a/cmd/trace/cli/state_test.go b/cli/state_test.go
similarity index 99%
rename from cmd/trace/cli/state_test.go
rename to cli/state_test.go
index 32d478b..c20b198 100644
--- a/cmd/trace/cli/state_test.go
+++ b/cli/state_test.go
@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/status.go b/cli/status.go
similarity index 98%
rename from cmd/trace/cli/status.go
rename to cli/status.go
index 615cce2..7f24eb2 100644
--- a/cmd/trace/cli/status.go
+++ b/cli/status.go
@@ -14,12 +14,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/spf13/cobra"
diff --git a/cmd/trace/cli/status_style.go b/cli/status_style.go
similarity index 98%
rename from cmd/trace/cli/status_style.go
rename to cli/status_style.go
index c04426e..9c21195 100644
--- a/cmd/trace/cli/status_style.go
+++ b/cli/status_style.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"charm.land/lipgloss/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/interactive"
 
 	"golang.org/x/term"
 )
diff --git a/cmd/trace/cli/status_style_test.go b/cli/status_style_test.go
similarity index 100%
rename from cmd/trace/cli/status_style_test.go
rename to cli/status_style_test.go
diff --git a/cmd/trace/cli/status_test.go b/cli/status_test.go
similarity index 99%
rename from cmd/trace/cli/status_test.go
rename to cli/status_test.go
index f5a41bd..de24e6f 100644
--- a/cmd/trace/cli/status_test.go
+++ b/cli/status_test.go
@@ -11,10 +11,10 @@ import (
 	"time"
 
 	"charm.land/lipgloss/v2"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/strategy/accumulation_bench_test.go b/cli/strategy/accumulation_bench_test.go
similarity index 97%
rename from cmd/trace/cli/strategy/accumulation_bench_test.go
rename to cli/strategy/accumulation_bench_test.go
index b28892f..5000afc 100644
--- a/cmd/trace/cli/strategy/accumulation_bench_test.go
+++ b/cli/strategy/accumulation_bench_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/strategy/agent_resolution_test.go b/cli/strategy/agent_resolution_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/agent_resolution_test.go
rename to cli/strategy/agent_resolution_test.go
index cc87b99..ca183b2 100644
--- a/cmd/trace/cli/strategy/agent_resolution_test.go
+++ b/cli/strategy/agent_resolution_test.go
@@ -6,11 +6,11 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 
 	// Register agents so agent.ForTranscriptPath can resolve them.
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/cursor"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	_ "github.com/GrayCodeAI/trace/cli/agent/cursor"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/strategy/checkpoint_remote.go b/cli/strategy/checkpoint_remote.go
similarity index 97%
rename from cmd/trace/cli/strategy/checkpoint_remote.go
rename to cli/strategy/checkpoint_remote.go
index 7acc85a..0dc8c62 100644
--- a/cmd/trace/cli/strategy/checkpoint_remote.go
+++ b/cli/strategy/checkpoint_remote.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
 
 	"github.com/go-git/go-git/v6/plumbing"
 )
diff --git a/cmd/trace/cli/strategy/checkpoint_remote_test.go b/cli/strategy/checkpoint_remote_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/checkpoint_remote_test.go
rename to cli/strategy/checkpoint_remote_test.go
index 6934ed1..cabe123 100644
--- a/cmd/trace/cli/strategy/checkpoint_remote_test.go
+++ b/cli/strategy/checkpoint_remote_test.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/strategy/clean_test.go b/cli/strategy/clean_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/clean_test.go
rename to cli/strategy/clean_test.go
index 14d6b6e..c486567 100644
--- a/cmd/trace/cli/strategy/clean_test.go
+++ b/cli/strategy/clean_test.go
@@ -9,11 +9,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/cleanup.go b/cli/strategy/cleanup.go
similarity index 98%
rename from cmd/trace/cli/strategy/cleanup.go
rename to cli/strategy/cleanup.go
index 4bd4fdd..6c43962 100644
--- a/cmd/trace/cli/strategy/cleanup.go
+++ b/cli/strategy/cleanup.go
@@ -10,13 +10,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/commit_hook_perf_test.go b/cli/strategy/commit_hook_perf_test.go
similarity index 96%
rename from cmd/trace/cli/strategy/commit_hook_perf_test.go
rename to cli/strategy/commit_hook_perf_test.go
index 64cee1d..0014ae2 100644
--- a/cmd/trace/cli/strategy/commit_hook_perf_test.go
+++ b/cli/strategy/commit_hook_perf_test.go
@@ -12,12 +12,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
@@ -38,7 +38,7 @@ const hookPerfRepoURL = "https://github.com/GrayCodeAI/trace.git"
 // Prerequisites:
 //   - GitHub access (gh auth login) for cloning the private repo
 //
-// Run: go test -v -run TestCommitHookPerformance -tags hookperf -timeout 15m ./cmd/trace/cli/strategy/
+// Run: go test -v -run TestCommitHookPerformance -tags hookperf -timeout 15m ./cli/strategy/
 func TestCommitHookPerformance(t *testing.T) {
 	// Clone once, reuse across scenarios via cheap local clones.
 	cacheDir := cloneSourceRepo(t)
@@ -347,12 +347,12 @@ func createHookPerfSettings(t *testing.T, dir string) {
 // which need actual files on disk via seedSessionWithShadowBranch).
 var perfFileSets = [][]string{
 	{"main.go", "go.mod"},
-	{"cmd/trace/main.go", "cmd/trace/cli/root.go"},
+	{"cmd/trace/main.go", "cli/root.go"},
 	{"go.sum", "README.md", "Makefile"},
-	{"cmd/trace/cli/strategy/common.go"},
-	{"cmd/trace/cli/session/state.go", "cmd/trace/cli/session/phase.go"},
-	{"cmd/trace/cli/paths/paths.go", "cmd/trace/cli/paths/worktree.go", "go.mod"},
-	{"cmd/trace/cli/agent/claude.go"},
+	{"cli/strategy/common.go"},
+	{"cli/session/state.go", "cli/session/phase.go"},
+	{"cli/paths/paths.go", "cli/paths/worktree.go", "go.mod"},
+	{"cli/agent/claude.go"},
 	{"docs/architecture/README.md", "CLAUDE.md"},
 }
 
@@ -362,15 +362,15 @@ var perfFileSets = [][]string{
 // overlap detection finds a match between staged files and FilesTouched.
 var perfLargeFileSets = func() [][]string {
 	dirs := []string{
-		"cmd/trace/cli/strategy",
-		"cmd/trace/cli/session",
-		"cmd/trace/cli/checkpoint",
-		"cmd/trace/cli/agent/claudecode",
-		"cmd/trace/cli/agent/geminicli",
-		"cmd/trace/cli/paths",
-		"cmd/trace/cli/logging",
-		"cmd/trace/cli/settings",
-		"cmd/trace/cli",
+		"cli/strategy",
+		"cli/session",
+		"cli/checkpoint",
+		"cli/agent/claudecode",
+		"cli/agent/geminicli",
+		"cli/paths",
+		"cli/logging",
+		"cli/settings",
+		"cli",
 		"docs/architecture",
 	}
 	var sets [][]string
diff --git a/cmd/trace/cli/strategy/common.go b/cli/strategy/common.go
similarity index 99%
rename from cmd/trace/cli/strategy/common.go
rename to cli/strategy/common.go
index 03ed582..36b0384 100644
--- a/cmd/trace/cli/strategy/common.go
+++ b/cli/strategy/common.go
@@ -15,15 +15,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/vercelconfig"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/vercelconfig"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/strategy/common_helpers_test.go b/cli/strategy/common_helpers_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/common_helpers_test.go
rename to cli/strategy/common_helpers_test.go
index 8db27a8..71ee0ff 100644
--- a/cmd/trace/cli/strategy/common_helpers_test.go
+++ b/cli/strategy/common_helpers_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
 
 	"github.com/go-git/go-git/v6/plumbing/object"
 )
diff --git a/cmd/trace/cli/strategy/common_test.go b/cli/strategy/common_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/common_test.go
rename to cli/strategy/common_test.go
index 91f6418..68a2339 100644
--- a/cmd/trace/cli/strategy/common_test.go
+++ b/cli/strategy/common_test.go
@@ -9,12 +9,12 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/vercelconfig"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/vercelconfig"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/condense_skip_test.go b/cli/strategy/condense_skip_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/condense_skip_test.go
rename to cli/strategy/condense_skip_test.go
index 70ae4ee..413d331 100644
--- a/cmd/trace/cli/strategy/condense_skip_test.go
+++ b/cli/strategy/condense_skip_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/session"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
@@ -71,7 +71,7 @@ func TestCondenseSession_SkipsEmptySessionEvenWithCommittedFiles(t *testing.T) {
 	// Before the fix, filterFilesTouched's fallback would assign these to the
 	// session, defeating the skip gate.
 	committedFiles := map[string]struct{}{
-		"cmd/trace/cli/strategy/manual_commit_condensation.go": {},
+		"cli/strategy/manual_commit_condensation.go": {},
 	}
 
 	result, err := s.CondenseSession(context.Background(), repo, checkpointID, state, committedFiles)
diff --git a/cmd/trace/cli/strategy/content_overlap.go b/cli/strategy/content_overlap.go
similarity index 99%
rename from cmd/trace/cli/strategy/content_overlap.go
rename to cli/strategy/content_overlap.go
index 89b472b..7ce4cef 100644
--- a/cmd/trace/cli/strategy/content_overlap.go
+++ b/cli/strategy/content_overlap.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/logging"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/format/config"
diff --git a/cmd/trace/cli/strategy/content_overlap_test.go b/cli/strategy/content_overlap_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/content_overlap_test.go
rename to cli/strategy/content_overlap_test.go
index 31ae335..45e227b 100644
--- a/cmd/trace/cli/strategy/content_overlap_test.go
+++ b/cli/strategy/content_overlap_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/filemode"
diff --git a/cmd/trace/cli/strategy/generation_repair.go b/cli/strategy/generation_repair.go
similarity index 97%
rename from cmd/trace/cli/strategy/generation_repair.go
rename to cli/strategy/generation_repair.go
index 61f8216..c6de653 100644
--- a/cmd/trace/cli/strategy/generation_repair.go
+++ b/cli/strategy/generation_repair.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 )
diff --git a/cmd/trace/cli/strategy/generation_repair_test.go b/cli/strategy/generation_repair_test.go
similarity index 97%
rename from cmd/trace/cli/strategy/generation_repair_test.go
rename to cli/strategy/generation_repair_test.go
index 26fbb6f..6b7f860 100644
--- a/cmd/trace/cli/strategy/generation_repair_test.go
+++ b/cli/strategy/generation_repair_test.go
@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/filemode"
diff --git a/cmd/trace/cli/strategy/global_test.go b/cli/strategy/global_test.go
similarity index 100%
rename from cmd/trace/cli/strategy/global_test.go
rename to cli/strategy/global_test.go
diff --git a/cmd/trace/cli/strategy/hard_reset_test.go b/cli/strategy/hard_reset_test.go
similarity index 100%
rename from cmd/trace/cli/strategy/hard_reset_test.go
rename to cli/strategy/hard_reset_test.go
diff --git a/cmd/trace/cli/strategy/hook_managers.go b/cli/strategy/hook_managers.go
similarity index 98%
rename from cmd/trace/cli/strategy/hook_managers.go
rename to cli/strategy/hook_managers.go
index 0b98f44..f3403a2 100644
--- a/cmd/trace/cli/strategy/hook_managers.go
+++ b/cli/strategy/hook_managers.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // hookManager describes an external hook manager detected in a repository.
diff --git a/cmd/trace/cli/strategy/hook_managers_test.go b/cli/strategy/hook_managers_test.go
similarity index 100%
rename from cmd/trace/cli/strategy/hook_managers_test.go
rename to cli/strategy/hook_managers_test.go
diff --git a/cmd/trace/cli/strategy/hooks.go b/cli/strategy/hooks.go
similarity index 96%
rename from cmd/trace/cli/strategy/hooks.go
rename to cli/strategy/hooks.go
index d250c0d..dc686ed 100644
--- a/cmd/trace/cli/strategy/hooks.go
+++ b/cli/strategy/hooks.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 // Hook marker used to identify Trace CLI hooks
@@ -375,13 +375,15 @@ fi
 }
 
 // hookCmdPrefix returns the command prefix for hook scripts and warning messages.
-// Returns "go run ./cmd/trace/main.go" when local_dev is enabled.
+// trace ships inside the hawk binary, so the command surface is "hawk trace ...".
+// Returns "go run ./cmd/hawk trace" when local_dev is enabled (runs hawk from source).
 // When absolutePath is true, resolves the full binary path via os.Executable()
-// and returns an error if resolution fails. This is needed for GUI git clients
-// (Xcode, Tower, etc.) that don't source shell profiles.
+// (the running hawk binary) and appends " trace"; returns an error if resolution
+// fails. This is needed for GUI git clients (Xcode, Tower, etc.) that don't source
+// shell profiles.
 func hookCmdPrefix(localDev, absolutePath bool) (string, error) {
 	if localDev {
-		return "go run ./cmd/trace/main.go", nil
+		return "go run ./cmd/hawk trace", nil
 	}
 	if absolutePath {
 		exe, err := os.Executable()
@@ -392,9 +394,9 @@ func hookCmdPrefix(localDev, absolutePath bool) (string, error) {
 		if err != nil {
 			return "", fmt.Errorf("--absolute-git-hook-path: failed to resolve symlinks for %s: %w", exe, err)
 		}
-		return shellQuote(resolved), nil
+		return shellQuote(resolved) + " trace", nil
 	}
-	return "trace", nil
+	return "hawk trace", nil
 }
 
 // shellQuote wraps a string in single quotes for safe use in #!/bin/sh scripts.
diff --git a/cmd/trace/cli/strategy/hooks_test.go b/cli/strategy/hooks_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/hooks_test.go
rename to cli/strategy/hooks_test.go
index cdc1446..317df19 100644
--- a/cmd/trace/cli/strategy/hooks_test.go
+++ b/cli/strategy/hooks_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // clearGlobalHooksPath overrides any global core.hooksPath setting so that
@@ -608,11 +608,11 @@ func TestInstallGitHook_LocalDevCommandPrefix(t *testing.T) {
 			t.Fatalf("hook %s should exist: %v", hook, err)
 		}
 		content := string(data)
-		if !strings.Contains(content, "go run ./cmd/trace/main.go") {
+		if !strings.Contains(content, "go run ./cmd/hawk trace") {
 			t.Errorf("hook %s should use 'go run' prefix when localDev=true, got:\n%s", hook, content)
 		}
-		if strings.Contains(content, "\ntrace ") {
-			t.Errorf("hook %s should not use bare 'trace' prefix when localDev=true", hook)
+		if strings.Contains(content, "\nhawk trace ") {
+			t.Errorf("hook %s should not use bare 'hawk trace' prefix when localDev=true", hook)
 		}
 	}
 
@@ -634,8 +634,8 @@ func TestInstallGitHook_LocalDevCommandPrefix(t *testing.T) {
 		if strings.Contains(content, "go run") {
 			t.Errorf("hook %s should not use 'go run' prefix when localDev=false, got:\n%s", hook, content)
 		}
-		if !strings.Contains(content, "\ntrace ") {
-			t.Errorf("hook %s should use bare 'trace' prefix when localDev=false", hook)
+		if !strings.Contains(content, "\nhawk trace ") {
+			t.Errorf("hook %s should use bare 'hawk trace' prefix when localDev=false", hook)
 		}
 	}
 }
@@ -672,8 +672,8 @@ func TestInstallGitHook_AbsoluteGitHookPath(t *testing.T) {
 		if !strings.Contains(content, quoted) {
 			t.Errorf("hook %s should contain shell-quoted absolute path %q, got:\n%s", hook, quoted, content)
 		}
-		if strings.Contains(content, "\ntrace ") {
-			t.Errorf("hook %s should not use bare 'trace' prefix when absolutePath=true", hook)
+		if strings.Contains(content, "\nhawk trace ") {
+			t.Errorf("hook %s should not use bare 'hawk trace' prefix when absolutePath=true", hook)
 		}
 	}
 }
diff --git a/cmd/trace/cli/strategy/manual_commit.go b/cli/strategy/manual_commit.go
similarity index 95%
rename from cmd/trace/cli/strategy/manual_commit.go
rename to cli/strategy/manual_commit.go
index 68c609e..60f24dc 100644
--- a/cmd/trace/cli/strategy/manual_commit.go
+++ b/cli/strategy/manual_commit.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // ManualCommitStrategy implements the manual-commit strategy for session management.
diff --git a/cmd/trace/cli/strategy/manual_commit_attribution.go b/cli/strategy/manual_commit_attribution.go
similarity index 99%
rename from cmd/trace/cli/strategy/manual_commit_attribution.go
rename to cli/strategy/manual_commit_attribution.go
index ace7d50..02f994c 100644
--- a/cmd/trace/cli/strategy/manual_commit_attribution.go
+++ b/cli/strategy/manual_commit_attribution.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/gitops"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/gitops"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/go-git/go-git/v6/plumbing/object"
 	"github.com/sergi/go-diff/diffmatchpatch"
 )
diff --git a/cmd/trace/cli/strategy/manual_commit_attribution_test.go b/cli/strategy/manual_commit_attribution_test.go
similarity index 100%
rename from cmd/trace/cli/strategy/manual_commit_attribution_test.go
rename to cli/strategy/manual_commit_attribution_test.go
diff --git a/cmd/trace/cli/strategy/manual_commit_concurrent_test.go b/cli/strategy/manual_commit_concurrent_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/manual_commit_concurrent_test.go
rename to cli/strategy/manual_commit_concurrent_test.go
index 7fd8e36..d146db4 100644
--- a/cmd/trace/cli/strategy/manual_commit_concurrent_test.go
+++ b/cli/strategy/manual_commit_concurrent_test.go
@@ -9,9 +9,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/manual_commit_condensation.go b/cli/strategy/manual_commit_condensation.go
similarity index 98%
rename from cmd/trace/cli/strategy/manual_commit_condensation.go
rename to cli/strategy/manual_commit_condensation.go
index 4aa9264..6c85348 100644
--- a/cmd/trace/cli/strategy/manual_commit_condensation.go
+++ b/cli/strategy/manual_commit_condensation.go
@@ -14,24 +14,24 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/opencode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	cpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/summarize"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/textutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript/compact"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/external"
+	"github.com/GrayCodeAI/trace/cli/agent/factoryaidroid"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/opencode"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	cpkg "github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/summarize"
+	"github.com/GrayCodeAI/trace/cli/textutil"
+	"github.com/GrayCodeAI/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/transcript/compact"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"github.com/GrayCodeAI/trace/perf"
 	"github.com/GrayCodeAI/trace/redact"
 
diff --git a/cmd/trace/cli/strategy/manual_commit_condensation_test.go b/cli/strategy/manual_commit_condensation_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/manual_commit_condensation_test.go
rename to cli/strategy/manual_commit_condensation_test.go
index 24f8be8..851ff24 100644
--- a/cmd/trace/cli/strategy/manual_commit_condensation_test.go
+++ b/cli/strategy/manual_commit_condensation_test.go
@@ -10,18 +10,18 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/require"
 
 	// Register agents so GetByAgentType works in tests.
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/copilotcli"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/cursor"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	_ "github.com/GrayCodeAI/trace/cli/agent/copilotcli"
+	_ "github.com/GrayCodeAI/trace/cli/agent/cursor"
+	_ "github.com/GrayCodeAI/trace/cli/agent/factoryaidroid"
 )
 
 type fakeTranscriptCompactorAgent struct {
diff --git a/cmd/trace/cli/strategy/manual_commit_git.go b/cli/strategy/manual_commit_git.go
similarity index 97%
rename from cmd/trace/cli/strategy/manual_commit_git.go
rename to cli/strategy/manual_commit_git.go
index 93e438c..4759526 100644
--- a/cmd/trace/cli/strategy/manual_commit_git.go
+++ b/cli/strategy/manual_commit_git.go
@@ -8,13 +8,13 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/GrayCodeAI/trace/perf"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/strategy/manual_commit_hooks.go b/cli/strategy/manual_commit_hooks.go
similarity index 99%
rename from cmd/trace/cli/strategy/manual_commit_hooks.go
rename to cli/strategy/manual_commit_hooks.go
index 432b643..38b26db 100644
--- a/cmd/trace/cli/strategy/manual_commit_hooks.go
+++ b/cli/strategy/manual_commit_hooks.go
@@ -14,20 +14,20 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/gitops"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/gitops"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/GrayCodeAI/trace/perf"
 	"github.com/GrayCodeAI/trace/redact"
 
diff --git a/cmd/trace/cli/strategy/manual_commit_logs.go b/cli/strategy/manual_commit_logs.go
similarity index 98%
rename from cmd/trace/cli/strategy/manual_commit_logs.go
rename to cli/strategy/manual_commit_logs.go
index 3223c4a..89da01e 100644
--- a/cmd/trace/cli/strategy/manual_commit_logs.go
+++ b/cli/strategy/manual_commit_logs.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/go-git/go-git/v6/plumbing"
 )
diff --git a/cmd/trace/cli/strategy/manual_commit_migration.go b/cli/strategy/manual_commit_migration.go
similarity index 97%
rename from cmd/trace/cli/strategy/manual_commit_migration.go
rename to cli/strategy/manual_commit_migration.go
index 55353a6..70ea1d2 100644
--- a/cmd/trace/cli/strategy/manual_commit_migration.go
+++ b/cli/strategy/manual_commit_migration.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/manual_commit_migration_test.go b/cli/strategy/manual_commit_migration_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/manual_commit_migration_test.go
rename to cli/strategy/manual_commit_migration_test.go
index c8d9829..3cd3b1a 100644
--- a/cmd/trace/cli/strategy/manual_commit_migration_test.go
+++ b/cli/strategy/manual_commit_migration_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	checkpointID "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	checkpointID "github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/stretchr/testify/assert"
diff --git a/cmd/trace/cli/strategy/manual_commit_push.go b/cli/strategy/manual_commit_push.go
similarity index 94%
rename from cmd/trace/cli/strategy/manual_commit_push.go
rename to cli/strategy/manual_commit_push.go
index b777230..bb9f174 100644
--- a/cmd/trace/cli/strategy/manual_commit_push.go
+++ b/cli/strategy/manual_commit_push.go
@@ -3,8 +3,8 @@ package strategy
 import (
 	"context"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
 	"github.com/GrayCodeAI/trace/perf"
 )
 
diff --git a/cmd/trace/cli/strategy/manual_commit_reset.go b/cli/strategy/manual_commit_reset.go
similarity index 98%
rename from cmd/trace/cli/strategy/manual_commit_reset.go
rename to cli/strategy/manual_commit_reset.go
index b3b0d5e..843baff 100644
--- a/cmd/trace/cli/strategy/manual_commit_reset.go
+++ b/cli/strategy/manual_commit_reset.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6/plumbing"
 )
diff --git a/cmd/trace/cli/strategy/manual_commit_rewind.go b/cli/strategy/manual_commit_rewind.go
similarity index 98%
rename from cmd/trace/cli/strategy/manual_commit_rewind.go
rename to cli/strategy/manual_commit_rewind.go
index 00c4e56..7c25fb3 100644
--- a/cmd/trace/cli/strategy/manual_commit_rewind.go
+++ b/cli/strategy/manual_commit_rewind.go
@@ -12,16 +12,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	cpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/osroot"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	cpkg "github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/osroot"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"charm.land/huh/v2"
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/strategy/manual_commit_session.go b/cli/strategy/manual_commit_session.go
similarity index 96%
rename from cmd/trace/cli/strategy/manual_commit_session.go
rename to cli/strategy/manual_commit_session.go
index 5cf8cc1..2b71bfa 100644
--- a/cmd/trace/cli/strategy/manual_commit_session.go
+++ b/cli/strategy/manual_commit_session.go
@@ -6,13 +6,13 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/manual_commit_staging_test.go b/cli/strategy/manual_commit_staging_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/manual_commit_staging_test.go
rename to cli/strategy/manual_commit_staging_test.go
index 231ce55..c29bcce 100644
--- a/cmd/trace/cli/strategy/manual_commit_staging_test.go
+++ b/cli/strategy/manual_commit_staging_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
 )
diff --git a/cmd/trace/cli/strategy/manual_commit_test.go b/cli/strategy/manual_commit_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/manual_commit_test.go
rename to cli/strategy/manual_commit_test.go
index 0a821e5..e34eadc 100644
--- a/cmd/trace/cli/strategy/manual_commit_test.go
+++ b/cli/strategy/manual_commit_test.go
@@ -11,13 +11,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/manual_commit_types.go b/cli/strategy/manual_commit_types.go
similarity index 91%
rename from cmd/trace/cli/strategy/manual_commit_types.go
rename to cli/strategy/manual_commit_types.go
index f722e58..f387395 100644
--- a/cmd/trace/cli/strategy/manual_commit_types.go
+++ b/cli/strategy/manual_commit_types.go
@@ -3,11 +3,11 @@ package strategy
 import (
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
 )
 
 const (
diff --git a/cmd/trace/cli/strategy/messages.go b/cli/strategy/messages.go
similarity index 99%
rename from cmd/trace/cli/strategy/messages.go
rename to cli/strategy/messages.go
index a17ba4f..ea14160 100644
--- a/cmd/trace/cli/strategy/messages.go
+++ b/cli/strategy/messages.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"unicode/utf8"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/stringutil"
+	"github.com/GrayCodeAI/trace/cli/stringutil"
 )
 
 // MaxDescriptionLength is the maximum length for descriptions in commit messages
diff --git a/cmd/trace/cli/strategy/messages_test.go b/cli/strategy/messages_test.go
similarity index 100%
rename from cmd/trace/cli/strategy/messages_test.go
rename to cli/strategy/messages_test.go
diff --git a/cmd/trace/cli/strategy/metadata_reconcile.go b/cli/strategy/metadata_reconcile.go
similarity index 98%
rename from cmd/trace/cli/strategy/metadata_reconcile.go
rename to cli/strategy/metadata_reconcile.go
index 27358cd..596f835 100644
--- a/cmd/trace/cli/strategy/metadata_reconcile.go
+++ b/cli/strategy/metadata_reconcile.go
@@ -12,10 +12,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	remote "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	remote "github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/metadata_reconcile_test.go b/cli/strategy/metadata_reconcile_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/metadata_reconcile_test.go
rename to cli/strategy/metadata_reconcile_test.go
index 2d15fdb..f9789e1 100644
--- a/cmd/trace/cli/strategy/metadata_reconcile_test.go
+++ b/cli/strategy/metadata_reconcile_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/mid_turn_commit_test.go b/cli/strategy/mid_turn_commit_test.go
similarity index 97%
rename from cmd/trace/cli/strategy/mid_turn_commit_test.go
rename to cli/strategy/mid_turn_commit_test.go
index f4f5572..3276e47 100644
--- a/cmd/trace/cli/strategy/mid_turn_commit_test.go
+++ b/cli/strategy/mid_turn_commit_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode" // Register Claude Code agent for transcript analysis
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode" // Register Claude Code agent for transcript analysis
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/strategy/phase_postcommit_test.go b/cli/strategy/phase_postcommit_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/phase_postcommit_test.go
rename to cli/strategy/phase_postcommit_test.go
index bc844a3..9d0929c 100644
--- a/cmd/trace/cli/strategy/phase_postcommit_test.go
+++ b/cli/strategy/phase_postcommit_test.go
@@ -8,13 +8,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/phase_prepare_commit_msg_test.go b/cli/strategy/phase_prepare_commit_msg_test.go
similarity index 96%
rename from cmd/trace/cli/strategy/phase_prepare_commit_msg_test.go
rename to cli/strategy/phase_prepare_commit_msg_test.go
index 99366bd..ed298e9 100644
--- a/cmd/trace/cli/strategy/phase_prepare_commit_msg_test.go
+++ b/cli/strategy/phase_prepare_commit_msg_test.go
@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/cmd/trace/cli/strategy/phase_wiring_test.go b/cli/strategy/phase_wiring_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/phase_wiring_test.go
rename to cli/strategy/phase_wiring_test.go
index 55adef5..d2a8a24 100644
--- a/cmd/trace/cli/strategy/phase_wiring_test.go
+++ b/cli/strategy/phase_wiring_test.go
@@ -7,12 +7,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/postcommit_bench_test.go b/cli/strategy/postcommit_bench_test.go
similarity index 96%
rename from cmd/trace/cli/strategy/postcommit_bench_test.go
rename to cli/strategy/postcommit_bench_test.go
index 8595bce..7e74ed5 100644
--- a/cmd/trace/cli/strategy/postcommit_bench_test.go
+++ b/cli/strategy/postcommit_bench_test.go
@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing/object"
diff --git a/cmd/trace/cli/strategy/preparecommitmsg_bench_test.go b/cli/strategy/preparecommitmsg_bench_test.go
similarity index 96%
rename from cmd/trace/cli/strategy/preparecommitmsg_bench_test.go
rename to cli/strategy/preparecommitmsg_bench_test.go
index 78378d8..9b2c812 100644
--- a/cmd/trace/cli/strategy/preparecommitmsg_bench_test.go
+++ b/cli/strategy/preparecommitmsg_bench_test.go
@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/benchutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/benchutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 )
 
 // BenchmarkPrepareCommitMsg measures the full PrepareCommitMsg hook execution time
diff --git a/cmd/trace/cli/strategy/push_common.go b/cli/strategy/push_common.go
similarity index 99%
rename from cmd/trace/cli/strategy/push_common.go
rename to cli/strategy/push_common.go
index ced2733..17f8e44 100644
--- a/cmd/trace/cli/strategy/push_common.go
+++ b/cli/strategy/push_common.go
@@ -12,10 +12,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/settings"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/push_common_budget_unix_test.go b/cli/strategy/push_common_budget_unix_test.go
similarity index 97%
rename from cmd/trace/cli/strategy/push_common_budget_unix_test.go
rename to cli/strategy/push_common_budget_unix_test.go
index e1b4059..ec399db 100644
--- a/cmd/trace/cli/strategy/push_common_budget_unix_test.go
+++ b/cli/strategy/push_common_budget_unix_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/strategy/push_common_test.go b/cli/strategy/push_common_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/push_common_test.go
rename to cli/strategy/push_common_test.go
index 098e2ca..0e16a73 100644
--- a/cmd/trace/cli/strategy/push_common_test.go
+++ b/cli/strategy/push_common_test.go
@@ -11,10 +11,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/strategy/push_v2.go b/cli/strategy/push_v2.go
similarity index 98%
rename from cmd/trace/cli/strategy/push_v2.go
rename to cli/strategy/push_v2.go
index b57de3f..962764e 100644
--- a/cmd/trace/cli/strategy/push_v2.go
+++ b/cli/strategy/push_v2.go
@@ -12,11 +12,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/remote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/remote"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/push_v2_test.go b/cli/strategy/push_v2_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/push_v2_test.go
rename to cli/strategy/push_v2_test.go
index 826deda..a001ef5 100644
--- a/cmd/trace/cli/strategy/push_v2_test.go
+++ b/cli/strategy/push_v2_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/testutil"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/testutil"
 	"github.com/GrayCodeAI/trace/redact"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/strategy/readcheckpoint_bench_test.go b/cli/strategy/readcheckpoint_bench_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/readcheckpoint_bench_test.go
rename to cli/strategy/readcheckpoint_bench_test.go
index 653237e..0dbedbe 100644
--- a/cmd/trace/cli/strategy/readcheckpoint_bench_test.go
+++ b/cli/strategy/readcheckpoint_bench_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/benchutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/benchutil"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	gogit "github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/resolve_transcript.go b/cli/strategy/resolve_transcript.go
similarity index 97%
rename from cmd/trace/cli/strategy/resolve_transcript.go
rename to cli/strategy/resolve_transcript.go
index 037b019..925fe66 100644
--- a/cmd/trace/cli/strategy/resolve_transcript.go
+++ b/cli/strategy/resolve_transcript.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // resolveTranscriptPath returns the current path to the session's transcript file.
diff --git a/cmd/trace/cli/strategy/resolve_transcript_test.go b/cli/strategy/resolve_transcript_test.go
similarity index 96%
rename from cmd/trace/cli/strategy/resolve_transcript_test.go
rename to cli/strategy/resolve_transcript_test.go
index d7bb50c..3cbd899 100644
--- a/cmd/trace/cli/strategy/resolve_transcript_test.go
+++ b/cli/strategy/resolve_transcript_test.go
@@ -5,12 +5,12 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/session"
 
 	// Register agents so GetByAgentType works in tests.
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/cursor"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	_ "github.com/GrayCodeAI/trace/cli/agent/cursor"
 )
 
 func TestResolveTranscriptPath_FileExists(t *testing.T) {
diff --git a/cmd/trace/cli/strategy/rewind_test.go b/cli/strategy/rewind_test.go
similarity index 97%
rename from cmd/trace/cli/strategy/rewind_test.go
rename to cli/strategy/rewind_test.go
index db13d25..3af1297 100644
--- a/cmd/trace/cli/strategy/rewind_test.go
+++ b/cli/strategy/rewind_test.go
@@ -10,11 +10,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode" // Register agent for ResolveAgentForRewind tests
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"  // Register agent for ResolveAgentForRewind tests
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	_ "github.com/GrayCodeAI/trace/cli/agent/claudecode" // Register agent for ResolveAgentForRewind tests
+	_ "github.com/GrayCodeAI/trace/cli/agent/geminicli"  // Register agent for ResolveAgentForRewind tests
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/stretchr/testify/require"
 
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/strategy/session.go b/cli/strategy/session.go
similarity index 97%
rename from cmd/trace/cli/strategy/session.go
rename to cli/strategy/session.go
index c81a5ca..fa1c6eb 100644
--- a/cmd/trace/cli/strategy/session.go
+++ b/cli/strategy/session.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6"
 )
diff --git a/cmd/trace/cli/strategy/session_state.go b/cli/strategy/session_state.go
similarity index 97%
rename from cmd/trace/cli/strategy/session_state.go
rename to cli/strategy/session_state.go
index d328120..82d8d35 100644
--- a/cmd/trace/cli/strategy/session_state.go
+++ b/cli/strategy/session_state.go
@@ -13,14 +13,14 @@ import (
 
 	"github.com/petermattis/goid"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/internal/flock"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/validation"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/internal/flock"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/validation"
 )
 
 // Session state management functions shared across all strategies.
diff --git a/cmd/trace/cli/strategy/session_state_test.go b/cli/strategy/session_state_test.go
similarity index 99%
rename from cmd/trace/cli/strategy/session_state_test.go
rename to cli/strategy/session_state_test.go
index c9cb71a..9ea334a 100644
--- a/cmd/trace/cli/strategy/session_state_test.go
+++ b/cli/strategy/session_state_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/session"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/session"
 	"github.com/go-git/go-git/v6"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/strategy/session_test.go b/cli/strategy/session_test.go
similarity index 98%
rename from cmd/trace/cli/strategy/session_test.go
rename to cli/strategy/session_test.go
index 1505f2a..ececcc7 100644
--- a/cmd/trace/cli/strategy/session_test.go
+++ b/cli/strategy/session_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trailers"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/trailers"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/strategy/strategy.go b/cli/strategy/strategy.go
similarity index 98%
rename from cmd/trace/cli/strategy/strategy.go
rename to cli/strategy/strategy.go
index 3eab51e..4d66dc1 100644
--- a/cmd/trace/cli/strategy/strategy.go
+++ b/cli/strategy/strategy.go
@@ -9,10 +9,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/osroot"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint/id"
+	"github.com/GrayCodeAI/trace/cli/osroot"
 )
 
 // ErrNoMetadata is returned when a commit does not have an Trace metadata trailer.
diff --git a/cmd/trace/cli/stringutil/stringutil.go b/cli/stringutil/stringutil.go
similarity index 100%
rename from cmd/trace/cli/stringutil/stringutil.go
rename to cli/stringutil/stringutil.go
diff --git a/cmd/trace/cli/stringutil/stringutil_test.go b/cli/stringutil/stringutil_test.go
similarity index 100%
rename from cmd/trace/cli/stringutil/stringutil_test.go
rename to cli/stringutil/stringutil_test.go
diff --git a/cmd/trace/cli/summarize/claude.go b/cli/summarize/claude.go
similarity index 96%
rename from cmd/trace/cli/summarize/claude.go
rename to cli/summarize/claude.go
index 52a5852..f9c5e98 100644
--- a/cmd/trace/cli/summarize/claude.go
+++ b/cli/summarize/claude.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
 )
 
 // summarizationPromptTemplate is the prompt used to generate summaries via the Claude CLI.
diff --git a/cmd/trace/cli/summarize/claude_test.go b/cli/summarize/claude_test.go
similarity index 98%
rename from cmd/trace/cli/summarize/claude_test.go
rename to cli/summarize/claude_test.go
index d2b853c..d204af4 100644
--- a/cmd/trace/cli/summarize/claude_test.go
+++ b/cli/summarize/claude_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 type stubTextGenerator struct {
diff --git a/cmd/trace/cli/summarize/summarize.go b/cli/summarize/summarize.go
similarity index 97%
rename from cmd/trace/cli/summarize/summarize.go
rename to cli/summarize/summarize.go
index 3dd864f..95f8842 100644
--- a/cmd/trace/cli/summarize/summarize.go
+++ b/cli/summarize/summarize.go
@@ -9,14 +9,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/opencode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript/compact"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/factoryaidroid"
+	"github.com/GrayCodeAI/trace/cli/agent/geminicli"
+	"github.com/GrayCodeAI/trace/cli/agent/opencode"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/transcript/compact"
 	"github.com/GrayCodeAI/trace/redact"
 )
 
diff --git a/cmd/trace/cli/summarize/summarize_test.go b/cli/summarize/summarize_test.go
similarity index 99%
rename from cmd/trace/cli/summarize/summarize_test.go
rename to cli/summarize/summarize_test.go
index dee830a..14eb470 100644
--- a/cmd/trace/cli/summarize/summarize_test.go
+++ b/cli/summarize/summarize_test.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/claudecode"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 	"github.com/GrayCodeAI/trace/redact"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/trace/cli/summarize/text_generator.go b/cli/summarize/text_generator.go
similarity index 89%
rename from cmd/trace/cli/summarize/text_generator.go
rename to cli/summarize/text_generator.go
index c0c2bdf..d97bdc0 100644
--- a/cmd/trace/cli/summarize/text_generator.go
+++ b/cli/summarize/text_generator.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
 )
 
 // TextGeneratorAdapter uses an agent.TextGenerator with Trace's shared
diff --git a/cmd/trace/cli/summarize/text_generator_test.go b/cli/summarize/text_generator_test.go
similarity index 97%
rename from cmd/trace/cli/summarize/text_generator_test.go
rename to cli/summarize/text_generator_test.go
index 2afb436..bb8ae09 100644
--- a/cmd/trace/cli/summarize/text_generator_test.go
+++ b/cli/summarize/text_generator_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent/types"
 )
 
 type mockTextGenerator struct {
diff --git a/cmd/trace/cli/telemetry/detached.go b/cli/telemetry/detached.go
similarity index 100%
rename from cmd/trace/cli/telemetry/detached.go
rename to cli/telemetry/detached.go
diff --git a/cmd/trace/cli/telemetry/detached_other.go b/cli/telemetry/detached_other.go
similarity index 100%
rename from cmd/trace/cli/telemetry/detached_other.go
rename to cli/telemetry/detached_other.go
diff --git a/cmd/trace/cli/telemetry/detached_test.go b/cli/telemetry/detached_test.go
similarity index 100%
rename from cmd/trace/cli/telemetry/detached_test.go
rename to cli/telemetry/detached_test.go
diff --git a/cmd/trace/cli/telemetry/detached_unix.go b/cli/telemetry/detached_unix.go
similarity index 100%
rename from cmd/trace/cli/telemetry/detached_unix.go
rename to cli/telemetry/detached_unix.go
diff --git a/cmd/trace/cli/telemetry/detached_windows.go b/cli/telemetry/detached_windows.go
similarity index 100%
rename from cmd/trace/cli/telemetry/detached_windows.go
rename to cli/telemetry/detached_windows.go
diff --git a/cmd/trace/cli/testutil/testutil.go b/cli/testutil/testutil.go
similarity index 100%
rename from cmd/trace/cli/testutil/testutil.go
rename to cli/testutil/testutil.go
diff --git a/cmd/trace/cli/textutil/ide_tags.go b/cli/textutil/ide_tags.go
similarity index 100%
rename from cmd/trace/cli/textutil/ide_tags.go
rename to cli/textutil/ide_tags.go
diff --git a/cmd/trace/cli/textutil/ide_tags_test.go b/cli/textutil/ide_tags_test.go
similarity index 100%
rename from cmd/trace/cli/textutil/ide_tags_test.go
rename to cli/textutil/ide_tags_test.go
diff --git a/cmd/trace/cli/trace.go b/cli/trace.go
similarity index 100%
rename from cmd/trace/cli/trace.go
rename to cli/trace.go
diff --git a/cmd/trace/cli/trace_cmd.go b/cli/trace_cmd.go
similarity index 93%
rename from cmd/trace/cli/trace_cmd.go
rename to cli/trace_cmd.go
index 28ee24c..3a49852 100644
--- a/cmd/trace/cli/trace_cmd.go
+++ b/cli/trace_cmd.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/paths"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/trace/cli/trace_test.go b/cli/trace_test.go
similarity index 100%
rename from cmd/trace/cli/trace_test.go
rename to cli/trace_test.go
diff --git a/cmd/trace/cli/trail/store.go b/cli/trail/store.go
similarity index 99%
rename from cmd/trace/cli/trail/store.go
rename to cli/trail/store.go
index c4500a8..49a53d3 100644
--- a/cmd/trace/cli/trail/store.go
+++ b/cli/trail/store.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/checkpoint"
+	"github.com/GrayCodeAI/trace/cli/paths"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/trail/store_test.go b/cli/trail/store_test.go
similarity index 100%
rename from cmd/trace/cli/trail/store_test.go
rename to cli/trail/store_test.go
diff --git a/cmd/trace/cli/trail/trail.go b/cli/trail/trail.go
similarity index 100%
rename from cmd/trace/cli/trail/trail.go
rename to cli/trail/trail.go
diff --git a/cmd/trace/cli/trail/trail_test.go b/cli/trail/trail_test.go
similarity index 100%
rename from cmd/trace/cli/trail/trail_test.go
rename to cli/trail/trail_test.go
diff --git a/cmd/trace/cli/trail_cmd.go b/cli/trail_cmd.go
similarity index 99%
rename from cmd/trace/cli/trail_cmd.go
rename to cli/trail_cmd.go
index 35b157f..fbb3237 100644
--- a/cmd/trace/cli/trail_cmd.go
+++ b/cli/trail_cmd.go
@@ -14,10 +14,10 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/gitremote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/strategy"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trail"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/gitremote"
+	"github.com/GrayCodeAI/trace/cli/strategy"
+	"github.com/GrayCodeAI/trace/cli/trail"
 
 	"charm.land/huh/v2"
 	"github.com/go-git/go-git/v6"
diff --git a/cmd/trace/cli/trail_cmd_test.go b/cli/trail_cmd_test.go
similarity index 99%
rename from cmd/trace/cli/trail_cmd_test.go
rename to cli/trail_cmd_test.go
index ae34bac..ffc598c 100644
--- a/cmd/trace/cli/trail_cmd_test.go
+++ b/cli/trail_cmd_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trail"
+	"github.com/GrayCodeAI/trace/cli/trail"
 )
 
 const (
diff --git a/cmd/trace/cli/trail_watch_cmd.go b/cli/trail_watch_cmd.go
similarity index 98%
rename from cmd/trace/cli/trail_watch_cmd.go
rename to cli/trail_watch_cmd.go
index 8ffee2f..5ebff0f 100644
--- a/cmd/trace/cli/trail_watch_cmd.go
+++ b/cli/trail_watch_cmd.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/gitremote"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/trail"
+	"github.com/GrayCodeAI/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/gitremote"
+	"github.com/GrayCodeAI/trace/cli/trail"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/trace/cli/trail_watch_cmd_test.go b/cli/trail_watch_cmd_test.go
similarity index 99%
rename from cmd/trace/cli/trail_watch_cmd_test.go
rename to cli/trail_watch_cmd_test.go
index e61eef7..f7e0e2e 100644
--- a/cmd/trace/cli/trail_watch_cmd_test.go
+++ b/cli/trail_watch_cmd_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/api"
+	"github.com/GrayCodeAI/trace/cli/api"
 )
 
 // fakeSSEServer streams a fixed sequence of frames with optional terminal
diff --git a/cmd/trace/cli/trailers/coauthor_test.go b/cli/trailers/coauthor_test.go
similarity index 100%
rename from cmd/trace/cli/trailers/coauthor_test.go
rename to cli/trailers/coauthor_test.go
diff --git a/cmd/trace/cli/trailers/trailers.go b/cli/trailers/trailers.go
similarity index 99%
rename from cmd/trace/cli/trailers/trailers.go
rename to cli/trailers/trailers.go
index aee5bc9..eb8abd3 100644
--- a/cmd/trace/cli/trailers/trailers.go
+++ b/cli/trailers/trailers.go
@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"strings"
 
-	checkpointID "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
+	checkpointID "github.com/GrayCodeAI/trace/cli/checkpoint/id"
 )
 
 // Trailer key constants used in commit messages.
diff --git a/cmd/trace/cli/trailers/trailers_test.go b/cli/trailers/trailers_test.go
similarity index 99%
rename from cmd/trace/cli/trailers/trailers_test.go
rename to cli/trailers/trailers_test.go
index 2662b1c..3364a04 100644
--- a/cmd/trace/cli/trailers/trailers_test.go
+++ b/cli/trailers/trailers_test.go
@@ -3,7 +3,7 @@ package trailers
 import (
 	"testing"
 
-	checkpointID "github.com/GrayCodeAI/trace/cmd/trace/cli/checkpoint/id"
+	checkpointID "github.com/GrayCodeAI/trace/cli/checkpoint/id"
 )
 
 func TestAppendCheckpointTrailer(t *testing.T) {
diff --git a/cmd/trace/cli/transcript.go b/cli/transcript.go
similarity index 98%
rename from cmd/trace/cli/transcript.go
rename to cli/transcript.go
index 4e28c47..24f4fc7 100644
--- a/cmd/trace/cli/transcript.go
+++ b/cli/transcript.go
@@ -13,9 +13,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	agentpkg "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	agentpkg "github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // compressGzipThreshold is the minimum size in bytes before a transcript
diff --git a/cmd/trace/cli/transcript/bench_test.go b/cli/transcript/bench_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/bench_test.go
rename to cli/transcript/bench_test.go
diff --git a/cmd/trace/cli/transcript/compact/codex.go b/cli/transcript/compact/codex.go
similarity index 99%
rename from cmd/trace/cli/transcript/compact/codex.go
rename to cli/transcript/compact/codex.go
index 68f7a6e..7ddc7ce 100644
--- a/cmd/trace/cli/transcript/compact/codex.go
+++ b/cli/transcript/compact/codex.go
@@ -8,8 +8,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/textutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/textutil"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 const (
diff --git a/cmd/trace/cli/transcript/compact/codex_test.go b/cli/transcript/compact/codex_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/codex_test.go
rename to cli/transcript/compact/codex_test.go
diff --git a/cmd/trace/cli/transcript/compact/compact.go b/cli/transcript/compact/compact.go
similarity index 99%
rename from cmd/trace/cli/transcript/compact/compact.go
rename to cli/transcript/compact/compact.go
index 9bc96ff..5c505f2 100644
--- a/cmd/trace/cli/transcript/compact/compact.go
+++ b/cli/transcript/compact/compact.go
@@ -10,8 +10,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/textutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/textutil"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 	"github.com/GrayCodeAI/trace/redact"
 )
 
diff --git a/cmd/trace/cli/transcript/compact/compact_test.go b/cli/transcript/compact/compact_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/compact_test.go
rename to cli/transcript/compact/compact_test.go
diff --git a/cmd/trace/cli/transcript/compact/copilot.go b/cli/transcript/compact/copilot.go
similarity index 98%
rename from cmd/trace/cli/transcript/compact/copilot.go
rename to cli/transcript/compact/copilot.go
index b7f20e4..e38a014 100644
--- a/cmd/trace/cli/transcript/compact/copilot.go
+++ b/cli/transcript/compact/copilot.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 func isCopilotFormat(content []byte) bool {
diff --git a/cmd/trace/cli/transcript/compact/copilot_test.go b/cli/transcript/compact/copilot_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/copilot_test.go
rename to cli/transcript/compact/copilot_test.go
diff --git a/cmd/trace/cli/transcript/compact/droid.go b/cli/transcript/compact/droid.go
similarity index 98%
rename from cmd/trace/cli/transcript/compact/droid.go
rename to cli/transcript/compact/droid.go
index a0e5d0c..1939bba 100644
--- a/cmd/trace/cli/transcript/compact/droid.go
+++ b/cli/transcript/compact/droid.go
@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // isDroidFormat checks whether JSONL content uses Factory AI Droid's envelope
diff --git a/cmd/trace/cli/transcript/compact/droid_test.go b/cli/transcript/compact/droid_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/droid_test.go
rename to cli/transcript/compact/droid_test.go
diff --git a/cmd/trace/cli/transcript/compact/gemini.go b/cli/transcript/compact/gemini.go
similarity index 98%
rename from cmd/trace/cli/transcript/compact/gemini.go
rename to cli/transcript/compact/gemini.go
index 8ca9846..b6114cf 100644
--- a/cmd/trace/cli/transcript/compact/gemini.go
+++ b/cli/transcript/compact/gemini.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/textutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/textutil"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // --- Gemini CLI format support ---
diff --git a/cmd/trace/cli/transcript/compact/gemini_test.go b/cli/transcript/compact/gemini_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/gemini_test.go
rename to cli/transcript/compact/gemini_test.go
diff --git a/cmd/trace/cli/transcript/compact/opencode.go b/cli/transcript/compact/opencode.go
similarity index 98%
rename from cmd/trace/cli/transcript/compact/opencode.go
rename to cli/transcript/compact/opencode.go
index 8bdf707..a3ad2db 100644
--- a/cmd/trace/cli/transcript/compact/opencode.go
+++ b/cli/transcript/compact/opencode.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/textutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+	"github.com/GrayCodeAI/trace/cli/textutil"
+	"github.com/GrayCodeAI/trace/cli/transcript"
 )
 
 // --- OpenCode format support ---
diff --git a/cmd/trace/cli/transcript/compact/opencode_test.go b/cli/transcript/compact/opencode_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/opencode_test.go
rename to cli/transcript/compact/opencode_test.go
diff --git a/cmd/trace/cli/transcript/compact/parse.go b/cli/transcript/compact/parse.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/parse.go
rename to cli/transcript/compact/parse.go
diff --git a/cmd/trace/cli/transcript/compact/parse_test.go b/cli/transcript/compact/parse_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/parse_test.go
rename to cli/transcript/compact/parse_test.go
diff --git a/cmd/trace/cli/transcript/compact/pi.go b/cli/transcript/compact/pi.go
similarity index 98%
rename from cmd/trace/cli/transcript/compact/pi.go
rename to cli/transcript/compact/pi.go
index a068913..504a4dd 100644
--- a/cmd/trace/cli/transcript/compact/pi.go
+++ b/cli/transcript/compact/pi.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/pi/pijsonl"
+	"github.com/GrayCodeAI/trace/cli/agent/pi/pijsonl"
 )
 
 // --- pi format support ---
@@ -23,7 +23,7 @@ import (
 //
 // Parsing primitives (Entry/Message/ContentItem types, ResolveActiveBranch,
 // SkipLines, NewScanner) are shared with the pi agent package via
-// cmd/trace/cli/agent/pi/pijsonl so a fix applied here also lands there.
+// cli/agent/pi/pijsonl so a fix applied here also lands there.
 
 const (
 	piToolResultStatusOK  = "success"
diff --git a/cmd/trace/cli/transcript/compact/pi_test.go b/cli/transcript/compact/pi_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/compact/pi_test.go
rename to cli/transcript/compact/pi_test.go
diff --git a/cmd/trace/cli/transcript/compact/testdata/claude_expected.jsonl b/cli/transcript/compact/testdata/claude_expected.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/claude_expected.jsonl
rename to cli/transcript/compact/testdata/claude_expected.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/claude_expected2.jsonl b/cli/transcript/compact/testdata/claude_expected2.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/claude_expected2.jsonl
rename to cli/transcript/compact/testdata/claude_expected2.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/claude_full.jsonl b/cli/transcript/compact/testdata/claude_full.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/claude_full.jsonl
rename to cli/transcript/compact/testdata/claude_full.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/claude_full2.jsonl b/cli/transcript/compact/testdata/claude_full2.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/claude_full2.jsonl
rename to cli/transcript/compact/testdata/claude_full2.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/codex_expected.jsonl b/cli/transcript/compact/testdata/codex_expected.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/codex_expected.jsonl
rename to cli/transcript/compact/testdata/codex_expected.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/codex_full.jsonl b/cli/transcript/compact/testdata/codex_full.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/codex_full.jsonl
rename to cli/transcript/compact/testdata/codex_full.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/copilot_expected.jsonl b/cli/transcript/compact/testdata/copilot_expected.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/copilot_expected.jsonl
rename to cli/transcript/compact/testdata/copilot_expected.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/copilot_full.jsonl b/cli/transcript/compact/testdata/copilot_full.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/copilot_full.jsonl
rename to cli/transcript/compact/testdata/copilot_full.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/droid_expected.jsonl b/cli/transcript/compact/testdata/droid_expected.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/droid_expected.jsonl
rename to cli/transcript/compact/testdata/droid_expected.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/droid_full.jsonl b/cli/transcript/compact/testdata/droid_full.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/droid_full.jsonl
rename to cli/transcript/compact/testdata/droid_full.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/gemini_expected.jsonl b/cli/transcript/compact/testdata/gemini_expected.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/gemini_expected.jsonl
rename to cli/transcript/compact/testdata/gemini_expected.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/gemini_full.jsonl b/cli/transcript/compact/testdata/gemini_full.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/gemini_full.jsonl
rename to cli/transcript/compact/testdata/gemini_full.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/opencode_expected.jsonl b/cli/transcript/compact/testdata/opencode_expected.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/opencode_expected.jsonl
rename to cli/transcript/compact/testdata/opencode_expected.jsonl
diff --git a/cmd/trace/cli/transcript/compact/testdata/opencode_full.jsonl b/cli/transcript/compact/testdata/opencode_full.jsonl
similarity index 100%
rename from cmd/trace/cli/transcript/compact/testdata/opencode_full.jsonl
rename to cli/transcript/compact/testdata/opencode_full.jsonl
diff --git a/cmd/trace/cli/transcript/fuzz_test.go b/cli/transcript/fuzz_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/fuzz_test.go
rename to cli/transcript/fuzz_test.go
diff --git a/cmd/trace/cli/transcript/parse.go b/cli/transcript/parse.go
similarity index 99%
rename from cmd/trace/cli/transcript/parse.go
rename to cli/transcript/parse.go
index c977ca4..0d8d102 100644
--- a/cmd/trace/cli/transcript/parse.go
+++ b/cli/transcript/parse.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/textutil"
+	"github.com/GrayCodeAI/trace/cli/textutil"
 )
 
 // ParseFromBytes parses transcript content from a byte slice.
diff --git a/cmd/trace/cli/transcript/parse_test.go b/cli/transcript/parse_test.go
similarity index 100%
rename from cmd/trace/cli/transcript/parse_test.go
rename to cli/transcript/parse_test.go
diff --git a/cmd/trace/cli/transcript/types.go b/cli/transcript/types.go
similarity index 100%
rename from cmd/trace/cli/transcript/types.go
rename to cli/transcript/types.go
diff --git a/cmd/trace/cli/transcript_test.go b/cli/transcript_test.go
similarity index 100%
rename from cmd/trace/cli/transcript_test.go
rename to cli/transcript_test.go
diff --git a/cmd/trace/cli/tuiutil/display.go b/cli/tuiutil/display.go
similarity index 100%
rename from cmd/trace/cli/tuiutil/display.go
rename to cli/tuiutil/display.go
diff --git a/cmd/trace/cli/tuiutil/display_test.go b/cli/tuiutil/display_test.go
similarity index 100%
rename from cmd/trace/cli/tuiutil/display_test.go
rename to cli/tuiutil/display_test.go
diff --git a/cmd/trace/cli/types.go b/cli/types.go
similarity index 76%
rename from cmd/trace/cli/types.go
rename to cli/types.go
index 16f262f..50b96b4 100644
--- a/cmd/trace/cli/types.go
+++ b/cli/types.go
@@ -1,6 +1,6 @@
 package cli
 
-import "github.com/GrayCodeAI/trace/cmd/trace/cli/transcript"
+import "github.com/GrayCodeAI/trace/cli/transcript"
 
 // Type aliases for backward compatibility with existing code in the cli package.
 // These types are now defined in the transcript package.
diff --git a/cmd/trace/cli/uiform/uiform.go b/cli/uiform/uiform.go
similarity index 100%
rename from cmd/trace/cli/uiform/uiform.go
rename to cli/uiform/uiform.go
diff --git a/cmd/trace/cli/uiform/uiform_test.go b/cli/uiform/uiform_test.go
similarity index 100%
rename from cmd/trace/cli/uiform/uiform_test.go
rename to cli/uiform/uiform_test.go
diff --git a/cmd/trace/cli/utils.go b/cli/utils.go
similarity index 98%
rename from cmd/trace/cli/utils.go
rename to cli/utils.go
index f175db1..55a458f 100644
--- a/cmd/trace/cli/utils.go
+++ b/cli/utils.go
@@ -10,8 +10,8 @@ import (
 
 	"charm.land/huh/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/osroot"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/osroot"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 // IsAccessibleMode returns true if accessibility mode should be enabled.
diff --git a/cmd/trace/cli/utils_test.go b/cli/utils_test.go
similarity index 100%
rename from cmd/trace/cli/utils_test.go
rename to cli/utils_test.go
diff --git a/cmd/trace/cli/validation/validators.go b/cli/validation/validators.go
similarity index 100%
rename from cmd/trace/cli/validation/validators.go
rename to cli/validation/validators.go
diff --git a/cmd/trace/cli/validation/validators_test.go b/cli/validation/validators_test.go
similarity index 100%
rename from cmd/trace/cli/validation/validators_test.go
rename to cli/validation/validators_test.go
diff --git a/cmd/trace/cli/vercelconfig/vercelconfig.go b/cli/vercelconfig/vercelconfig.go
similarity index 98%
rename from cmd/trace/cli/vercelconfig/vercelconfig.go
rename to cli/vercelconfig/vercelconfig.go
index 8fdc457..36a5e6c 100644
--- a/cmd/trace/cli/vercelconfig/vercelconfig.go
+++ b/cli/vercelconfig/vercelconfig.go
@@ -9,8 +9,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/jsonutil"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/jsonutil"
+	"github.com/GrayCodeAI/trace/cli/settings"
 
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
diff --git a/cmd/trace/cli/versioncheck/autoupdate.go b/cli/versioncheck/autoupdate.go
similarity index 97%
rename from cmd/trace/cli/versioncheck/autoupdate.go
rename to cli/versioncheck/autoupdate.go
index 84d5b68..20417e0 100644
--- a/cmd/trace/cli/versioncheck/autoupdate.go
+++ b/cli/versioncheck/autoupdate.go
@@ -11,8 +11,8 @@ import (
 
 	"charm.land/huh/v2"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/interactive"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // envKillSwitch disables the interactive update prompt regardless of TTY.
diff --git a/cmd/trace/cli/versioncheck/autoupdate_test.go b/cli/versioncheck/autoupdate_test.go
similarity index 100%
rename from cmd/trace/cli/versioncheck/autoupdate_test.go
rename to cli/versioncheck/autoupdate_test.go
diff --git a/cmd/trace/cli/versioncheck/types.go b/cli/versioncheck/types.go
similarity index 100%
rename from cmd/trace/cli/versioncheck/types.go
rename to cli/versioncheck/types.go
diff --git a/cmd/trace/cli/versioncheck/versioncheck.go b/cli/versioncheck/versioncheck.go
similarity index 99%
rename from cmd/trace/cli/versioncheck/versioncheck.go
rename to cli/versioncheck/versioncheck.go
index cf47142..904bbb0 100644
--- a/cmd/trace/cli/versioncheck/versioncheck.go
+++ b/cli/versioncheck/versioncheck.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/versioninfo"
 	"golang.org/x/mod/semver"
 )
 
diff --git a/cmd/trace/cli/versioncheck/versioncheck_test.go b/cli/versioncheck/versioncheck_test.go
similarity index 100%
rename from cmd/trace/cli/versioncheck/versioncheck_test.go
rename to cli/versioncheck/versioncheck_test.go
diff --git a/cmd/trace/cli/versioninfo/versioninfo.go b/cli/versioninfo/versioninfo.go
similarity index 92%
rename from cmd/trace/cli/versioninfo/versioninfo.go
rename to cli/versioninfo/versioninfo.go
index 1b0d8f1..d27e807 100644
--- a/cmd/trace/cli/versioninfo/versioninfo.go
+++ b/cli/versioninfo/versioninfo.go
@@ -3,8 +3,8 @@
 // The Version and Commit variables are set at build time via ldflags by
 // goreleaser:
 //
-//	-X github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo.Version={{.Version}}
-//	-X github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo.Commit={{.ShortCommit}}
+//	-X github.com/GrayCodeAI/trace/cli/versioninfo.Version={{.Version}}
+//	-X github.com/GrayCodeAI/trace/cli/versioninfo.Commit={{.ShortCommit}}
 //
 // The VERSION file at the repo root is the canonical source of truth used by
 // release tooling (release-please) and CI; goreleaser derives the version
diff --git a/cmd/trace/cli/versioninfo/versioninfo_test.go b/cli/versioninfo/versioninfo_test.go
similarity index 100%
rename from cmd/trace/cli/versioninfo/versioninfo_test.go
rename to cli/versioninfo/versioninfo_test.go
diff --git a/cmd/trace/cli/webhook/webhook.go b/cli/webhook/webhook.go
similarity index 98%
rename from cmd/trace/cli/webhook/webhook.go
rename to cli/webhook/webhook.go
index dc6f6ff..a048b06 100644
--- a/cmd/trace/cli/webhook/webhook.go
+++ b/cli/webhook/webhook.go
@@ -13,8 +13,8 @@ import (
 	"slices"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 // Lifecycle event names. These are the canonical strings used both in the
diff --git a/cmd/trace/cli/webhook/webhook_test.go b/cli/webhook/webhook_test.go
similarity index 99%
rename from cmd/trace/cli/webhook/webhook_test.go
rename to cli/webhook/webhook_test.go
index 11b6d9d..4ef2992 100644
--- a/cmd/trace/cli/webhook/webhook_test.go
+++ b/cli/webhook/webhook_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/settings"
+	"github.com/GrayCodeAI/trace/cli/settings"
 )
 
 func TestNotify_DeliversExpectedPayload(t *testing.T) {
diff --git a/codegraph.go b/codegraph.go
deleted file mode 100644
index 3db4446..0000000
--- a/codegraph.go
+++ /dev/null
@@ -1,293 +0,0 @@
-package trace
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"sync"
-	"time"
-)
-
-// NodeKind represents the type of symbol in the code graph.
-type NodeKind string
-
-const (
-	NodePackage   NodeKind = "package"
-	NodeStruct    NodeKind = "struct"
-	NodeInterface NodeKind = "interface"
-	NodeFunction  NodeKind = "function"
-	NodeMethod    NodeKind = "method"
-	NodeVariable  NodeKind = "variable"
-	NodeConstant  NodeKind = "constant"
-)
-
-// EdgeKind represents the relationship between two nodes.
-type EdgeKind string
-
-const (
-	EdgeCalls      EdgeKind = "calls"
-	EdgeCalledBy   EdgeKind = "called_by"
-	EdgeImplements EdgeKind = "implements"
-	EdgeUses       EdgeKind = "uses"
-	EdgeImports    EdgeKind = "imports"
-	EdgeInherits   EdgeKind = "inherits"
-	EdgeContains   EdgeKind = "contains"
-)
-
-// Node represents a symbol in the code graph.
-type Node struct {
-	ID         string    `json:"id"`
-	Kind       NodeKind  `json:"kind"`
-	Name       string    `json:"name"`
-	Path       string    `json:"path"`
-	Line       int       `json:"line"`
-	EndLine    int       `json:"end_line"`
-	TokenCount int       `json:"token_count"`
-	Language   string    `json:"language"`
-	CreatedAt  time.Time `json:"created_at"`
-	UpdatedAt  time.Time `json:"updated_at"`
-}
-
-// Edge represents a relationship between two nodes.
-type Edge struct {
-	From      string    `json:"from"`
-	To        string    `json:"to"`
-	Kind      EdgeKind  `json:"kind"`
-	Calls     int       `json:"calls"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
-}
-
-// NodeQuery filters nodes for querying.
-type NodeQuery struct {
-	Kind   NodeKind
-	Path   string
-	Limit  int
-	Offset int
-}
-
-// Stats holds aggregate statistics about the graph.
-type Stats struct {
-	Nodes  int
-	Edges  int
-	ByKind map[string]int
-}
-
-// CodeGraphData represents a serializable export of the code graph.
-type CodeGraphData struct {
-	Version    string    `json:"version"`
-	SnapshotAt time.Time `json:"snapshot_at"`
-	Nodes      []Node    `json:"nodes"`
-	Edges      []Edge    `json:"edges"`
-}
-
-// CodeGraph is a directed graph of code symbols and their relationships.
-type CodeGraph struct {
-	mu    sync.RWMutex
-	nodes map[string]*Node
-	edges map[string]*Edge // key: "from->to->kind"
-}
-
-// NewCodeGraph creates an empty code graph.
-func NewCodeGraph() *CodeGraph {
-	return &CodeGraph{
-		nodes: make(map[string]*Node),
-		edges: make(map[string]*Edge),
-	}
-}
-
-// AddNode adds or updates a node in the graph.
-func (cg *CodeGraph) AddNode(node Node) error {
-	if node.ID == "" {
-		return errors.New("node ID cannot be empty")
-	}
-
-	if !isValidNodeKind(node.Kind) {
-		return fmt.Errorf("invalid node kind: %s", node.Kind)
-	}
-
-	cg.mu.Lock()
-	defer cg.mu.Unlock()
-
-	now := time.Now()
-	if node.CreatedAt.IsZero() {
-		node.CreatedAt = now
-	}
-	node.UpdatedAt = now
-
-	cg.nodes[node.ID] = &node
-	return nil
-}
-
-// AddEdge adds or updates an edge in the graph.
-func (cg *CodeGraph) AddEdge(edge Edge) error {
-	cg.mu.Lock()
-	defer cg.mu.Unlock()
-
-	if _, ok := cg.nodes[edge.From]; !ok {
-		return fmt.Errorf("source node %s does not exist", edge.From)
-	}
-	if _, ok := cg.nodes[edge.To]; !ok {
-		return fmt.Errorf("target node %s does not exist", edge.To)
-	}
-
-	key := cg.edgeKey(edge)
-	now := time.Now()
-	if edge.CreatedAt.IsZero() {
-		edge.CreatedAt = now
-	}
-	edge.UpdatedAt = now
-
-	cg.edges[key] = &edge
-	return nil
-}
-
-// GetNode retrieves a node by ID. Returns a copy.
-func (cg *CodeGraph) GetNode(id string) (Node, bool) {
-	cg.mu.RLock()
-	defer cg.mu.RUnlock()
-
-	node, ok := cg.nodes[id]
-	if !ok {
-		return Node{}, false
-	}
-	return *node, true
-}
-
-// GetEdges returns all outgoing edges from a node.
-func (cg *CodeGraph) GetEdges(nodeID string) []Edge {
-	cg.mu.RLock()
-	defer cg.mu.RUnlock()
-
-	var result []Edge
-	for _, edge := range cg.edges {
-		if edge.From == nodeID {
-			result = append(result, *edge)
-		}
-	}
-	return result
-}
-
-// QueryNodes returns nodes matching the query.
-func (cg *CodeGraph) QueryNodes(query NodeQuery) []Node {
-	cg.mu.RLock()
-	defer cg.mu.RUnlock()
-
-	var result []Node
-	for _, node := range cg.nodes {
-		if query.Kind != "" && node.Kind != query.Kind {
-			continue
-		}
-		if query.Path != "" && node.Path != query.Path {
-			continue
-		}
-		result = append(result, *node)
-	}
-
-	// Apply offset
-	if query.Offset > 0 && query.Offset < len(result) {
-		result = result[query.Offset:]
-	} else if query.Offset >= len(result) {
-		return []Node{}
-	}
-
-	// Apply limit
-	if query.Limit > 0 && query.Limit < len(result) {
-		result = result[:query.Limit]
-	}
-
-	return result
-}
-
-// Stats returns aggregate statistics about the graph.
-func (cg *CodeGraph) Stats() Stats {
-	cg.mu.RLock()
-	defer cg.mu.RUnlock()
-
-	byKind := make(map[string]int)
-	for _, node := range cg.nodes {
-		byKind[string(node.Kind)]++
-	}
-
-	return Stats{
-		Nodes:  len(cg.nodes),
-		Edges:  len(cg.edges),
-		ByKind: byKind,
-	}
-}
-
-// Snapshot creates a serializable export of the graph.
-func (cg *CodeGraph) Snapshot() CodeGraphData {
-	cg.mu.RLock()
-	defer cg.mu.RUnlock()
-
-	nodes := make([]Node, 0, len(cg.nodes))
-	for _, node := range cg.nodes {
-		nodes = append(nodes, *node)
-	}
-
-	edges := make([]Edge, 0, len(cg.edges))
-	for _, edge := range cg.edges {
-		edges = append(edges, *edge)
-	}
-
-	return CodeGraphData{
-		Version:    "1.0",
-		SnapshotAt: time.Now(),
-		Nodes:      nodes,
-		Edges:      edges,
-	}
-}
-
-// Persist writes the graph to a file as JSON.
-func (cg *CodeGraph) Persist(path string) error {
-	snapshot := cg.Snapshot()
-
-	data, err := json.MarshalIndent(snapshot, "", "  ")
-	if err != nil {
-		return fmt.Errorf("marshal snapshot: %w", err)
-	}
-
-	if err := os.WriteFile(path, data, 0o600); err != nil {
-		return fmt.Errorf("write file: %w", err)
-	}
-
-	return nil
-}
-
-// LoadSnapshot loads a code graph from a JSON file.
-func LoadSnapshot(path string) (*CodeGraph, error) {
-	data, err := os.ReadFile(path) //nolint:gosec // path comes from validated user input
-	if err != nil {
-		return nil, fmt.Errorf("read file: %w", err)
-	}
-
-	var snapshot CodeGraphData
-	if err := json.Unmarshal(data, &snapshot); err != nil {
-		return nil, fmt.Errorf("unmarshal snapshot: %w", err)
-	}
-
-	cg := NewCodeGraph()
-	for _, node := range snapshot.Nodes {
-		cg.nodes[node.ID] = &node
-	}
-	for i := range snapshot.Edges {
-		key := cg.edgeKey(snapshot.Edges[i])
-		cg.edges[key] = &snapshot.Edges[i]
-	}
-
-	return cg, nil
-}
-
-func (cg *CodeGraph) edgeKey(edge Edge) string {
-	return fmt.Sprintf("%s->%s->%s", edge.From, edge.To, edge.Kind)
-}
-
-func isValidNodeKind(kind NodeKind) bool {
-	switch kind {
-	case NodePackage, NodeStruct, NodeInterface, NodeFunction, NodeMethod, NodeVariable, NodeConstant:
-		return true
-	}
-	return false
-}
diff --git a/codegraph_snapshot.go b/codegraph_snapshot.go
deleted file mode 100644
index 1668a4e..0000000
--- a/codegraph_snapshot.go
+++ /dev/null
@@ -1,241 +0,0 @@
-// Snapshot persistence helpers: Save/Load write CodeGraphSnapshot records as
-// timestamped JSON files under a directory, and listFiles/readFile provide
-// the file I/O primitives used by SnapshotStore.
-package trace
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-// CodeGraphSnapshot captures the state of the code graph at a point in time.
-// This enables:
-// - Tracking how the codebase evolves across sessions
-// - Comparing graph states to detect structural changes
-// - Building a history of code complexity over time
-type CodeGraphSnapshot struct {
-	Timestamp   time.Time         `json:"timestamp"`
-	SessionID   string            `json:"session_id"`
-	ProjectRoot string            `json:"project_root"`
-	GraphStats  GraphStats        `json:"graph_stats"`
-	SymbolCount int               `json:"symbol_count"`
-	EdgeCount   int               `json:"edge_count"`
-	FileCount   int               `json:"file_count"`
-	TopSymbols  []SymbolInfo      `json:"top_symbols"`
-	Modules     []ModuleInfo      `json:"modules"`
-	Complexity  ComplexityMetrics `json:"complexity"`
-	Delta       *GraphDelta       `json:"delta,omitempty"` // changes from previous snapshot
-}
-
-// GraphStats holds statistics about the code graph.
-type GraphStats struct {
-	NodesByKind map[string]int `json:"nodes_by_kind"`
-	EdgesByKind map[string]int `json:"edges_by_kind"`
-	FilesByLang map[string]int `json:"files_by_lang"`
-}
-
-// SymbolInfo represents a symbol in the snapshot.
-type SymbolInfo struct {
-	Name      string `json:"name"`
-	Kind      string `json:"kind"`
-	File      string `json:"file"`
-	Line      int    `json:"line"`
-	CallCount int    `json:"call_count"` // how many times called
-}
-
-// ModuleInfo represents a module/package in the snapshot.
-type ModuleInfo struct {
-	Name      string   `json:"name"`
-	Path      string   `json:"path"`
-	Files     int      `json:"files"`
-	Functions int      `json:"functions"`
-	Types     int      `json:"types"`
-	Imports   []string `json:"imports"`
-}
-
-// ComplexityMetrics holds complexity measurements.
-type ComplexityMetrics struct {
-	AvgCyclomatic  float64 `json:"avg_cyclomatic"`
-	MaxCyclomatic  int     `json:"max_cyclomatic"`
-	AvgLOC         float64 `json:"avg_loc"`
-	MaxLOC         int     `json:"max_loc"`
-	TotalFunctions int     `json:"total_functions"`
-}
-
-// GraphDelta represents changes between two snapshots.
-type GraphDelta struct {
-	FilesAdded      int      `json:"files_added"`
-	FilesRemoved    int      `json:"files_removed"`
-	FilesModified   int      `json:"files_modified"`
-	NodesAdded      int      `json:"nodes_added"`
-	NodesRemoved    int      `json:"nodes_removed"`
-	EdgesAdded      int      `json:"edges_added"`
-	EdgesRemoved    int      `json:"edges_removed"`
-	NewSymbols      []string `json:"new_symbols"`
-	RemovedSymbols  []string `json:"removed_symbols"`
-	ComplexityDelta float64  `json:"complexity_delta"` // change in avg complexity
-}
-
-// ErrNoSnapshots is returned when no snapshots exist in the store.
-var ErrNoSnapshots = errors.New("no snapshots found")
-
-// SnapshotStore manages code graph snapshots.
-type SnapshotStore struct {
-	path string
-}
-
-// NewSnapshotStore creates a new snapshot store.
-func NewSnapshotStore(path string) *SnapshotStore {
-	return &SnapshotStore{path: path}
-}
-
-// Save persists a snapshot to disk.
-func (s *SnapshotStore) Save(snapshot CodeGraphSnapshot) error {
-	data, err := json.MarshalIndent(snapshot, "", "  ")
-	if err != nil {
-		return fmt.Errorf("marshal snapshot: %w", err)
-	}
-
-	// Save to file
-	filename := s.path + "/snapshot_" + snapshot.Timestamp.Format("20060102_150405") + ".json"
-	return writeFile(filename, data)
-}
-
-// Load loads the most recent snapshot.
-func (s *SnapshotStore) Load() (*CodeGraphSnapshot, error) {
-	files, err := listFiles(s.path, "snapshot_*.json")
-	if err != nil {
-		return nil, fmt.Errorf("list snapshots: %w", err)
-	}
-	if len(files) == 0 {
-		return nil, ErrNoSnapshots
-	}
-
-	// Load most recent
-	data, err := readFile(files[len(files)-1])
-	if err != nil {
-		return nil, fmt.Errorf("read snapshot file: %w", err)
-	}
-
-	var snapshot CodeGraphSnapshot
-	if err := json.Unmarshal(data, &snapshot); err != nil {
-		return nil, fmt.Errorf("unmarshal snapshot: %w", err)
-	}
-
-	return &snapshot, nil
-}
-
-// Compare compares two snapshots and returns the delta.
-func CompareSnapshots(old, cur *CodeGraphSnapshot) *GraphDelta {
-	if old == nil || cur == nil {
-		return nil
-	}
-
-	delta := &GraphDelta{
-		FilesAdded:      cur.FileCount - old.FileCount,
-		NodesAdded:      cur.SymbolCount - old.SymbolCount,
-		EdgesAdded:      cur.EdgeCount - old.EdgeCount,
-		ComplexityDelta: cur.Complexity.AvgCyclomatic - old.Complexity.AvgCyclomatic,
-	}
-
-	// Find new and removed symbols
-	oldSymbols := make(map[string]bool)
-	for _, s := range old.TopSymbols {
-		oldSymbols[s.Name] = true
-	}
-
-	for _, s := range cur.TopSymbols {
-		if !oldSymbols[s.Name] {
-			delta.NewSymbols = append(delta.NewSymbols, s.Name)
-		}
-	}
-
-	newSymbols := make(map[string]bool)
-	for _, s := range cur.TopSymbols {
-		newSymbols[s.Name] = true
-	}
-
-	for _, s := range old.TopSymbols {
-		if !newSymbols[s.Name] {
-			delta.RemovedSymbols = append(delta.RemovedSymbols, s.Name)
-		}
-	}
-
-	return delta
-}
-
-// FormatSnapshot formats a snapshot for display.
-func FormatSnapshot(snapshot CodeGraphSnapshot) string {
-	var result string
-
-	result += "## Code Graph Snapshot\n\n"
-	result += fmt.Sprintf("- **Time**: %s\n", snapshot.Timestamp.Format(time.RFC3339))
-	result += fmt.Sprintf("- **Session**: %s\n", snapshot.SessionID)
-	result += fmt.Sprintf("- **Project**: %s\n\n", snapshot.ProjectRoot)
-
-	result += "### Statistics\n\n"
-	result += fmt.Sprintf("- Files: %d\n", snapshot.FileCount)
-	result += fmt.Sprintf("- Symbols: %d\n", snapshot.SymbolCount)
-	result += fmt.Sprintf("- Edges: %d\n\n", snapshot.EdgeCount)
-
-	result += "### Top Symbols\n\n"
-	for _, s := range snapshot.TopSymbols[:min(10, len(snapshot.TopSymbols))] {
-		result += fmt.Sprintf("- %s `%s` in %s:%d (called %d times)\n",
-			s.Kind, s.Name, s.File, s.Line, s.CallCount)
-	}
-
-	result += "\n### Complexity\n\n"
-	result += fmt.Sprintf("- Avg Cyclomatic: %.1f\n", snapshot.Complexity.AvgCyclomatic)
-	result += fmt.Sprintf("- Max Cyclomatic: %d\n", snapshot.Complexity.MaxCyclomatic)
-	result += fmt.Sprintf("- Total Functions: %d\n", snapshot.Complexity.TotalFunctions)
-
-	if snapshot.Delta != nil {
-		result += "\n### Changes Since Last Snapshot\n\n"
-		result += fmt.Sprintf("- Files: +%d -%d modified\n", snapshot.Delta.FilesAdded, snapshot.Delta.FilesRemoved)
-		result += fmt.Sprintf("- Symbols: +%d -%d\n", snapshot.Delta.NodesAdded, snapshot.Delta.NodesRemoved)
-		result += fmt.Sprintf("- Complexity: %+.1f\n", snapshot.Delta.ComplexityDelta)
-	}
-
-	return result
-}
-
-// writeFile writes data to filename with mode 0o644, creating any missing
-// parent directories. The directory is created with mode 0o755.
-func writeFile(filename string, data []byte) error {
-	if err := os.MkdirAll(filepath.Dir(filename), 0o750); err != nil {
-		return fmt.Errorf("create snapshot dir: %w", err)
-	}
-	if err := os.WriteFile(filename, data, 0o600); err != nil {
-		return fmt.Errorf("write snapshot file: %w", err)
-	}
-	return nil
-}
-
-// listFiles returns the sorted list of files in dir that match the given glob
-// pattern (e.g. "snapshot_*.json"). The returned paths are absolute. An empty
-// result and nil error indicate that no files matched.
-func listFiles(dir, pattern string) ([]string, error) {
-	matches, err := filepath.Glob(filepath.Join(dir, pattern))
-	if err != nil {
-		return nil, fmt.Errorf("glob snapshots: %w", err)
-	}
-	// filepath.Glob returns already-sorted results for a single directory, but
-	// sort explicitly to guarantee deterministic "most recent last" semantics
-	// when the filename encodes a timestamp.
-	return matches, nil
-}
-
-// readFile returns the contents of filename. It is a thin wrapper kept for
-// symmetry with writeFile and to allow future changes (e.g. compression) in
-// one place.
-func readFile(filename string) ([]byte, error) {
-	data, err := os.ReadFile(filename) //nolint:gosec // filename comes from glob patterns over user-crafted paths
-	if err != nil {
-		return nil, fmt.Errorf("read snapshot file: %w", err)
-	}
-	return data, nil
-}
diff --git a/codegraph_test.go b/codegraph_test.go
deleted file mode 100644
index 1ad3bd5..0000000
--- a/codegraph_test.go
+++ /dev/null
@@ -1,689 +0,0 @@
-package trace
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestNewCodeGraph(t *testing.T) {
-	t.Run("create empty graph", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NotNil(t, cg)
-
-		stats := cg.Stats()
-		assert.Equal(t, 0, stats.Nodes, "expected 0 nodes")
-		assert.Equal(t, 0, stats.Edges, "expected 0 edges")
-	})
-
-	t.Run("graph is ready for use", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		node := Node{
-			ID:   "file.go:main",
-			Kind: NodeFunction,
-			Name: "main",
-			Path: "file.go",
-		}
-
-		err := cg.AddNode(node)
-		require.NoError(t, err)
-	})
-}
-
-func TestAddNode(t *testing.T) {
-	t.Run("add single node", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		node := Node{
-			ID:         "main.go:main",
-			Kind:       NodeFunction,
-			Name:       "main",
-			Path:       "main.go",
-			Line:       10,
-			EndLine:    25,
-			TokenCount: 50,
-			Language:   "go",
-		}
-
-		err := cg.AddNode(node)
-		require.NoError(t, err)
-
-		stats := cg.Stats()
-		assert.Equal(t, 1, stats.Nodes)
-	})
-
-	t.Run("add multiple node kinds", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		nodes := []Node{
-			{ID: "file.go:pkg", Kind: NodePackage, Name: "main", Path: "file.go"},
-			{ID: "file.go:MyStruct", Kind: NodeStruct, Name: "MyStruct", Path: "file.go", Line: 10},
-			{ID: "file.go:MyInterface", Kind: NodeInterface, Name: "MyInterface", Path: "file.go", Line: 20},
-			{ID: "file.go:MyFunc", Kind: NodeFunction, Name: "MyFunc", Path: "file.go", Line: 30},
-			{ID: "file.go:myMethod", Kind: NodeMethod, Name: "myMethod", Path: "file.go", Line: 40},
-			{ID: "file.go:globalVar", Kind: NodeVariable, Name: "globalVar", Path: "file.go", Line: 50},
-			{ID: "file.go:MyConst", Kind: NodeConstant, Name: "MyConst", Path: "file.go", Line: 60},
-		}
-
-		for _, node := range nodes {
-			err := cg.AddNode(node)
-			require.NoError(t, err, "AddNode failed for %s", node.ID)
-		}
-
-		stats := cg.Stats()
-		assert.Equal(t, 7, stats.Nodes)
-	})
-
-	t.Run("duplicate node ID overwrites", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		node1 := Node{ID: "main.go:main", Kind: NodeFunction, Name: "main", TokenCount: 50}
-		node2 := Node{ID: "main.go:main", Kind: NodeFunction, Name: "main", TokenCount: 100}
-
-		require.NoError(t, cg.AddNode(node1))
-		require.NoError(t, cg.AddNode(node2))
-
-		// Should still be 1 node (overwritten)
-		stats := cg.Stats()
-		assert.Equal(t, 1, stats.Nodes, "expected 1 node (overwritten)")
-
-		// Retrieve and verify it's the updated version
-		retrieved, exists := cg.GetNode("main.go:main")
-		require.True(t, exists, "node should exist")
-		assert.Equal(t, 100, retrieved.TokenCount, "expected token count 100 after overwrite")
-	})
-
-	t.Run("add node with empty ID fails", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		node := Node{ID: "", Kind: NodeFunction, Name: "main"}
-		err := cg.AddNode(node)
-		require.Error(t, err, "expected error for empty node ID")
-	})
-
-	t.Run("add node with invalid kind fails", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		node := Node{ID: "test", Kind: "invalid", Name: "test"}
-		err := cg.AddNode(node)
-		require.Error(t, err, "expected error for invalid node kind")
-	})
-}
-
-func TestAddEdge(t *testing.T) {
-	t.Run("add single edge", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "caller", Kind: NodeFunction, Name: "caller"}))
-		require.NoError(t, cg.AddNode(Node{ID: "callee", Kind: NodeFunction, Name: "callee"}))
-
-		edge := Edge{
-			From: "caller",
-			To:   "callee",
-			Kind: EdgeCalls,
-		}
-
-		err := cg.AddEdge(edge)
-		require.NoError(t, err)
-
-		stats := cg.Stats()
-		assert.Equal(t, 1, stats.Edges)
-	})
-
-	t.Run("add multiple edge kinds", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "main", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "helper", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "MyStruct", Kind: NodeStruct}))
-		require.NoError(t, cg.AddNode(Node{ID: "MyInterface", Kind: NodeInterface}))
-		require.NoError(t, cg.AddNode(Node{ID: "pkg", Kind: NodePackage}))
-
-		edges := []Edge{
-			{From: "main", To: "helper", Kind: EdgeCalls},
-			{From: "MyStruct", To: "MyInterface", Kind: EdgeImplements},
-			{From: "main", To: "MyStruct", Kind: EdgeUses},
-			{From: "main", To: "pkg", Kind: EdgeImports},
-			{From: "helper", To: "main", Kind: EdgeCalledBy},
-		}
-
-		for _, edge := range edges {
-			err := cg.AddEdge(edge)
-			require.NoError(t, err)
-		}
-
-		stats := cg.Stats()
-		assert.Equal(t, 5, stats.Edges)
-	})
-
-	t.Run("duplicate edge overwrites", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "a", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "b", Kind: NodeFunction}))
-
-		edge1 := Edge{From: "a", To: "b", Kind: EdgeCalls, Calls: 5}
-		edge2 := Edge{From: "a", To: "b", Kind: EdgeCalls, Calls: 10}
-
-		require.NoError(t, cg.AddEdge(edge1))
-		require.NoError(t, cg.AddEdge(edge2))
-
-		stats := cg.Stats()
-		assert.Equal(t, 1, stats.Edges, "expected 1 edge (overwritten)")
-	})
-
-	t.Run("edge with non-existent source fails", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "target", Kind: NodeFunction}))
-
-		edge := Edge{From: "nonexistent", To: "target", Kind: EdgeCalls}
-		err := cg.AddEdge(edge)
-		require.Error(t, err, "expected error for non-existent source node")
-	})
-
-	t.Run("edge with non-existent target fails", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "source", Kind: NodeFunction}))
-
-		edge := Edge{From: "source", To: "nonexistent", Kind: EdgeCalls}
-		err := cg.AddEdge(edge)
-		require.Error(t, err, "expected error for non-existent target node")
-	})
-}
-
-func TestGetNode(t *testing.T) {
-	t.Run("retrieve existing node", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		original := Node{
-			ID:         "main.go:main",
-			Kind:       NodeFunction,
-			Name:       "main",
-			Path:       "main.go",
-			Line:       10,
-			TokenCount: 50,
-		}
-		require.NoError(t, cg.AddNode(original))
-
-		retrieved, exists := cg.GetNode("main.go:main")
-		require.True(t, exists, "node should exist")
-
-		assert.Equal(t, original.ID, retrieved.ID)
-		assert.Equal(t, original.Kind, retrieved.Kind)
-		assert.Equal(t, original.Name, retrieved.Name)
-		assert.Equal(t, original.TokenCount, retrieved.TokenCount)
-	})
-
-	t.Run("retrieve non-existent node", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		_, exists := cg.GetNode("nonexistent")
-		assert.False(t, exists, "non-existent node should not be found")
-	})
-
-	t.Run("retrieved node is a copy", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		original := Node{ID: "test", Kind: NodeFunction, Name: "test", TokenCount: 50}
-		require.NoError(t, cg.AddNode(original))
-
-		retrieved, _ := cg.GetNode("test")
-		_ = retrieved.TokenCount
-
-		// Get again and verify it wasn't modified
-		again, _ := cg.GetNode("test")
-		assert.Equal(t, 50, again.TokenCount, "modifying retrieved node should not affect graph")
-	})
-}
-
-func TestGetEdges(t *testing.T) {
-	t.Run("get outgoing edges", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "a", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "b", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "c", Kind: NodeFunction}))
-
-		require.NoError(t, cg.AddEdge(Edge{From: "a", To: "b", Kind: EdgeCalls}))
-		require.NoError(t, cg.AddEdge(Edge{From: "a", To: "c", Kind: EdgeCalls}))
-		require.NoError(t, cg.AddEdge(Edge{From: "b", To: "c", Kind: EdgeCalls}))
-
-		edges := cg.GetEdges("a")
-		assert.Len(t, edges, 2, "expected 2 outgoing edges from 'a'")
-	})
-
-	t.Run("get edges for node with no outgoing edges", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "a", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "b", Kind: NodeFunction}))
-		require.NoError(t, cg.AddEdge(Edge{From: "a", To: "b", Kind: EdgeCalls}))
-
-		edges := cg.GetEdges("b")
-		assert.Empty(t, edges, "expected 0 outgoing edges from 'b'")
-	})
-
-	t.Run("get edges for non-existent node", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		edges := cg.GetEdges("nonexistent")
-		assert.Empty(t, edges, "expected 0 edges for non-existent node")
-	})
-
-	t.Run("edges are copies", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "a", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "b", Kind: NodeFunction}))
-		require.NoError(t, cg.AddEdge(Edge{From: "a", To: "b", Kind: EdgeCalls, Calls: 5}))
-
-		edges := cg.GetEdges("a")
-		require.NotEmpty(t, edges, "expected at least one edge")
-
-		edges[0].Calls = 999
-
-		// Get again and verify it wasn't modified
-		again := cg.GetEdges("a")
-		assert.Equal(t, 5, again[0].Calls, "modifying edge slice should not affect graph")
-	})
-}
-
-func TestQueryNodes(t *testing.T) {
-	t.Run("query by kind", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "f1", Kind: NodeFunction, Name: "func1"}))
-		require.NoError(t, cg.AddNode(Node{ID: "f2", Kind: NodeFunction, Name: "func2"}))
-		require.NoError(t, cg.AddNode(Node{ID: "s1", Kind: NodeStruct, Name: "struct1"}))
-		require.NoError(t, cg.AddNode(Node{ID: "i1", Kind: NodeInterface, Name: "iface1"}))
-
-		functions := cg.QueryNodes(NodeQuery{Kind: NodeFunction})
-		assert.Len(t, functions, 2, "expected 2 functions")
-
-		structs := cg.QueryNodes(NodeQuery{Kind: NodeStruct})
-		assert.Len(t, structs, 1, "expected 1 struct")
-	})
-
-	t.Run("query by path", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "main.go:f1", Kind: NodeFunction, Path: "main.go"}))
-		require.NoError(t, cg.AddNode(Node{ID: "main.go:f2", Kind: NodeFunction, Path: "main.go"}))
-		require.NoError(t, cg.AddNode(Node{ID: "util.go:f1", Kind: NodeFunction, Path: "util.go"}))
-
-		mainNodes := cg.QueryNodes(NodeQuery{Path: "main.go"})
-		assert.Len(t, mainNodes, 2, "expected 2 nodes in main.go")
-	})
-
-	t.Run("query with limit", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		for i := range 10 {
-			require.NoError(t, cg.AddNode(Node{
-				ID:   string(rune('A' + i)),
-				Kind: NodeFunction,
-				Name: string(rune('A' + i)),
-			}))
-		}
-
-		nodes := cg.QueryNodes(NodeQuery{Kind: NodeFunction, Limit: 3})
-		assert.Len(t, nodes, 3, "expected 3 nodes (limited)")
-	})
-
-	t.Run("query with offset", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		for i := range 10 {
-			require.NoError(t, cg.AddNode(Node{
-				ID:   string(rune('A' + i)),
-				Kind: NodeFunction,
-			}))
-		}
-
-		// Get all nodes first
-		all := cg.QueryNodes(NodeQuery{Kind: NodeFunction})
-
-		// Then get with offset
-		offset := cg.QueryNodes(NodeQuery{Kind: NodeFunction, Offset: 5})
-
-		assert.Len(t, offset, len(all)-5, "expected %d nodes (with offset)", len(all)-5)
-	})
-
-	t.Run("query with no matches", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "f1", Kind: NodeFunction, Path: "main.go"}))
-
-		nodes := cg.QueryNodes(NodeQuery{Path: "nonexistent.go"})
-		assert.Empty(t, nodes, "expected 0 nodes")
-	})
-}
-
-func TestGraphStatistics(t *testing.T) {
-	t.Run("empty graph stats", func(t *testing.T) {
-		cg := NewCodeGraph()
-		stats := cg.Stats()
-
-		assert.Equal(t, 0, stats.Nodes)
-		assert.Equal(t, 0, stats.Edges)
-		assert.Empty(t, stats.ByKind, "expected empty ByKind map")
-	})
-
-	t.Run("populated graph stats", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		require.NoError(t, cg.AddNode(Node{ID: "f1", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "f2", Kind: NodeFunction}))
-		require.NoError(t, cg.AddNode(Node{ID: "s1", Kind: NodeStruct}))
-		require.NoError(t, cg.AddNode(Node{ID: "i1", Kind: NodeInterface}))
-
-		require.NoError(t, cg.AddEdge(Edge{From: "f1", To: "f2", Kind: EdgeCalls}))
-		require.NoError(t, cg.AddEdge(Edge{From: "f2", To: "s1", Kind: EdgeUses}))
-
-		stats := cg.Stats()
-
-		assert.Equal(t, 4, stats.Nodes)
-		assert.Equal(t, 2, stats.Edges)
-		assert.Equal(t, 2, stats.ByKind[string(NodeFunction)])
-		assert.Equal(t, 1, stats.ByKind[string(NodeStruct)])
-	})
-}
-
-func TestCodeGraphSnapshot(t *testing.T) {
-	t.Run("persist and load", func(t *testing.T) {
-		tmpDir := t.TempDir()
-		snapshotPath := filepath.Join(tmpDir, "graph.snapshot")
-
-		cg1 := NewCodeGraph()
-
-		now := time.Now().UTC()
-		require.NoError(t, cg1.AddNode(Node{
-			ID:         "main",
-			Kind:       NodeFunction,
-			Name:       "main",
-			Path:       "main.go",
-			Line:       10,
-			EndLine:    50,
-			TokenCount: 100,
-			Language:   "go",
-			CreatedAt:  now,
-			UpdatedAt:  now,
-		}))
-
-		require.NoError(t, cg1.AddNode(Node{
-			ID:         "helper",
-			Kind:       NodeFunction,
-			Name:       "helper",
-			Path:       "helper.go",
-			Line:       20,
-			EndLine:    30,
-			TokenCount: 50,
-			Language:   "go",
-			CreatedAt:  now,
-			UpdatedAt:  now,
-		}))
-
-		require.NoError(t, cg1.AddEdge(Edge{
-			From:      "main",
-			To:        "helper",
-			Kind:      EdgeCalls,
-			Calls:     5,
-			CreatedAt: now,
-			UpdatedAt: now,
-		}))
-
-		// Persist to disk
-		err := cg1.Persist(snapshotPath)
-		require.NoError(t, err)
-
-		// Verify file was created
-		_, err = os.Stat(snapshotPath)
-		require.NoError(t, err, "snapshot file was not created")
-
-		// Load into a new graph
-		cg2, err := LoadSnapshot(snapshotPath)
-		require.NoError(t, err)
-
-		// Verify stats match
-		stats1 := cg1.Stats()
-		stats2 := cg2.Stats()
-
-		assert.Equal(t, stats1.Nodes, stats2.Nodes, "node count mismatch")
-		assert.Equal(t, stats1.Edges, stats2.Edges, "edge count mismatch")
-
-		// Verify node data
-		node1, _ := cg1.GetNode("main")
-		node2, _ := cg2.GetNode("main")
-		assert.Equal(t, node1.Name, node2.Name, "node name mismatch")
-		assert.Equal(t, node1.TokenCount, node2.TokenCount, "token count mismatch")
-
-		// Verify edge data
-		edges1 := cg1.GetEdges("main")
-		edges2 := cg2.GetEdges("main")
-
-		assert.Len(t, edges2, len(edges1), "edge count mismatch")
-		assert.Equal(t, edges1[0].Calls, edges2[0].Calls, "edge calls mismatch")
-	})
-
-	t.Run("load non-existent file", func(t *testing.T) {
-		_, err := LoadSnapshot("/nonexistent/path/graph.snapshot")
-		require.Error(t, err)
-	})
-
-	t.Run("load corrupt file", func(t *testing.T) {
-		tmpDir := t.TempDir()
-		corruptPath := filepath.Join(tmpDir, "corrupt.snapshot")
-
-		err := os.WriteFile(corruptPath, []byte("{invalid json}"), 0o600)
-		require.NoError(t, err)
-
-		_, err = LoadSnapshot(corruptPath)
-		require.Error(t, err)
-	})
-}
-
-func TestCodeGraphSnapshotJSON(t *testing.T) {
-	t.Run("marshal to JSON", func(t *testing.T) {
-		cg := NewCodeGraph()
-
-		now := time.Now().UTC()
-		require.NoError(t, cg.AddNode(Node{
-			ID:        "main",
-			Kind:      NodeFunction,
-			Name:      "main",
-			CreatedAt: now,
-			UpdatedAt: now,
-		}))
-
-		require.NoError(t, cg.AddEdge(Edge{
-			From:      "main",
-			To:        "main", // self-reference for simplicity
-			Kind:      EdgeCalls,
-			CreatedAt: now,
-			UpdatedAt: now,
-		}))
-
-		snapshot := cg.Snapshot()
-
-		data, err := json.Marshal(snapshot)
-		require.NoError(t, err)
-
-		// Verify it's valid JSON
-		var parsed map[string]interface{}
-		err = json.Unmarshal(data, &parsed)
-		require.NoError(t, err, "output is not valid JSON")
-
-		// Check for expected fields
-		assert.Contains(t, parsed, "version")
-		assert.Contains(t, parsed, "snapshot_at")
-		assert.Contains(t, parsed, "nodes")
-		assert.Contains(t, parsed, "edges")
-	})
-
-	t.Run("unmarshal from JSON", func(t *testing.T) {
-		jsonData := []byte(`{
-			"version": "1.0",
-			"snapshot_at": "2026-01-15T10:30:00Z",
-			"nodes": [
-				{
-					"id": "f1",
-					"kind": "function",
-					"name": "func1",
-					"path": "file.go",
-					"line": 10,
-					"end_line": 20,
-					"token_count": 50,
-					"language": "go",
-					"created_at": "2026-01-15T10:00:00Z",
-					"updated_at": "2026-01-15T10:00:00Z"
-				},
-				{
-					"id": "f2",
-					"kind": "function",
-					"name": "func2",
-					"path": "file.go",
-					"line": 25,
-					"end_line": 35,
-					"token_count": 30,
-					"language": "go",
-					"created_at": "2026-01-15T10:00:00Z",
-					"updated_at": "2026-01-15T10:00:00Z"
-				}
-			],
-			"edges": [
-				{
-					"from": "f1",
-					"to": "f2",
-					"kind": "calls",
-					"calls": 3,
-					"created_at": "2026-01-15T10:00:00Z",
-					"updated_at": "2026-01-15T10:00:00Z"
-				}
-			]
-		}`)
-
-		var snapshot CodeGraphData
-		err := json.Unmarshal(jsonData, &snapshot)
-		require.NoError(t, err)
-
-		assert.Equal(t, "1.0", snapshot.Version)
-		assert.Len(t, snapshot.Nodes, 2)
-		assert.Len(t, snapshot.Edges, 1)
-		assert.Equal(t, "func1", snapshot.Nodes[0].Name)
-		assert.Equal(t, 3, snapshot.Edges[0].Calls)
-	})
-}
-
-func TestConcurrentAccess(_ *testing.T) {
-	cg := NewCodeGraph()
-
-	const numGoroutines = 10
-	const operationsPerGoroutine = 100
-
-	done := make(chan bool, numGoroutines)
-
-	// Concurrent node additions
-	for i := range numGoroutines {
-		go func(id int) {
-			defer func() { done <- true }()
-
-			for j := range operationsPerGoroutine {
-				node := Node{
-					ID:   string(rune('A'+id)) + string(rune('0'+j%10)),
-					Kind: NodeFunction,
-					Name: string(rune('A'+id)) + string(rune('0'+j%10)),
-				}
-				_ = cg.AddNode(node) //nolint:errcheck // intentional: testing concurrent safety, not error paths
-			}
-		}(i)
-	}
-
-	// Wait for all node additions
-	for range numGoroutines {
-		<-done
-	}
-
-	// Reset for edge operations
-	done = make(chan bool, numGoroutines)
-
-	// Concurrent reads and queries
-	for range numGoroutines {
-		go func() {
-			defer func() { done <- true }()
-
-			for range operationsPerGoroutine {
-				_ = cg.Stats()
-				_ = cg.QueryNodes(NodeQuery{Kind: NodeFunction})
-				_, _ = cg.GetNode("A0")
-			}
-		}()
-	}
-
-	// Wait for all reads
-	for range numGoroutines {
-		<-done
-	}
-}
-
-func BenchmarkAddNode(b *testing.B) {
-	cg := NewCodeGraph()
-
-	b.ResetTimer()
-	for i := range b.N {
-		node := Node{
-			ID:   string(rune(i % 1000)),
-			Kind: NodeFunction,
-			Name: "benchmark",
-		}
-		_ = cg.AddNode(node) //nolint:errcheck // intentional: benchmark ignores errors
-	}
-}
-
-func BenchmarkAddEdge(b *testing.B) {
-	cg := NewCodeGraph()
-
-	// Pre-populate with nodes
-	for i := range 100 {
-		_ = cg.AddNode(Node{ //nolint:errcheck // intentional: benchmark setup
-			ID:   string(rune(i)),
-			Kind: NodeFunction,
-		})
-	}
-
-	b.ResetTimer()
-	for i := range b.N {
-		edge := Edge{
-			From: string(rune(i % 100)),
-			To:   string(rune((i + 1) % 100)),
-			Kind: EdgeCalls,
-		}
-		_ = cg.AddEdge(edge) //nolint:errcheck // intentional: benchmark ignores errors
-	}
-}
-
-func BenchmarkQueryNodes(b *testing.B) {
-	cg := NewCodeGraph()
-
-	// Pre-populate
-	for i := range 1000 {
-		_ = cg.AddNode(Node{ //nolint:errcheck // intentional: benchmark setup
-			ID:   string(rune(i)),
-			Kind: NodeFunction,
-			Path: string(rune(i % 10)),
-		})
-	}
-
-	b.ResetTimer()
-	for range b.N {
-		_ = cg.QueryNodes(NodeQuery{Kind: NodeFunction})
-	}
-}
diff --git a/docs/architecture.md b/docs/architecture.md
index 2e200bc..ce4fecd 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -24,30 +24,28 @@ trace hooks into your git workflow to capture AI agent sessions as you work. Ses
 ```
 trace/
 ├── api/openapi.yaml              📜 CLI command surface reference
-├── cmd/trace/                    🖥️ CLI entry point
-│   ├── main.go                   ⚡ Root cobra command
-│   └── cli/                      📂 Subcommand implementations
-│       ├── trace_cmd.go          🔧 Core commands (enable, disable, status)
-│       ├── hooks.go              🪝 Git hook management
-│       ├── checkpoint/           💾 Checkpoint storage & retrieval
-│       ├── recap/                📝 Session recap rendering
-│       ├── settings/             ⚙️ Configuration management
-│       └── agent/                🤖 Agent-specific integrations
-├── codegraph_snapshot.go         📊 CodeGraphSnapshot, GraphStats, GraphDelta
-├── strategy/                     📋 Checkpoint strategies
-├── session/                      📂 Session state management
+├── cli/                          📂 cobra command tree (package cli, NewRootCmd)
+│   ├── trace_cmd.go              🔧 Core commands (enable, disable, status)
+│   ├── hooks.go                  🪝 Git hook management
+│   ├── checkpoint/               💾 Checkpoint storage & retrieval
+│   ├── recap/                    📝 Session recap rendering
+│   ├── settings/                 ⚙️ Configuration management
+│   ├── strategy/                 📋 Checkpoint strategies
+│   ├── session/                  📂 Session state management
+│   └── agent/                    🤖 Agent-specific integrations
 ├── redact/
 │   ├── redact.go                 🔒 Secret redaction (entropy + pattern + keyword)
 │   ├── packs.go                  📦 Vendor-specific pattern packs
 │   ├── pii.go                    🔐 PII detection
 │   └── custom.go                 ⚙️ Custom redaction rules
-├── internal/
-│   └── agentlaunch/              🚀 Agent launch detection
-├── e2e/                          🧪 End-to-end test suite
+├── internal/                     🔒 Private support packages (git ops, launch detection)
 ├── perf/                         📈 Performance benchmarks
 └── docs/                         📖 Architecture and usage docs
 ```
 
+> Trace is a **library** consumed by Hawk — there is no standalone binary. The `cli`
+> package's command tree is mounted into Hawk and surfaced as `hawk trace ...`.
+
 ---
 
 ## 📂 Session Model
@@ -65,17 +63,19 @@ Each checkpoint has a stable **12-hex-char ID** linking user commits to metadata
 
 ## 🖥️ CLI Commands
 
+Surfaced under `hawk trace ...`:
+
 | Command | Description |
 |---------|-------------|
-| `trace enable` | 🪝 Install git hooks |
-| `trace disable` | 🧹 Remove hooks |
-| `trace status` | 📊 Show capture status |
-| `trace checkpoint "msg"` | 💾 Create checkpoint |
-| `trace checkpoint rewind <id>` | ⏪ Rewind to checkpoint |
-| `trace session resume <id>` | 🔄 Resume a session |
-| `trace investigate <ref>` | 🔍 Investigate AI activity on a commit |
-| `trace doctor` | 🩺 Run diagnostics |
-| `trace agent <name>` | 🤖 Configure agent integration |
+| `hawk trace enable` | 🪝 Install git hooks |
+| `hawk trace disable` | 🧹 Remove hooks |
+| `hawk trace status` | 📊 Show capture status |
+| `hawk trace checkpoint "msg"` | 💾 Create checkpoint |
+| `hawk trace checkpoint rewind <id>` | ⏪ Rewind to checkpoint |
+| `hawk trace session resume <id>` | 🔄 Resume a session |
+| `hawk trace investigate <ref>` | 🔍 Investigate AI activity on a commit |
+| `hawk trace doctor` | 🩺 Run diagnostics |
+| `hawk trace agent <name>` | 🤖 Configure agent integration |
 
 ---
 
@@ -97,16 +97,3 @@ Multi-layer secret redaction before storing any session data:
 | 🔑 **Pattern** | Regex matching | JWTs, base64, DB URIs, API keys |
 | 📝 **Keyword** | Key name detection | `password=`, `secret=` |
 | 🔐 **PII** | Personal data | Emails, phone numbers, SSNs |
-
----
-
-## 📊 Code Graph Snapshots
-
-`CodeGraphSnapshot` captures project structure at checkpoint time:
-
-| Type | Contains |
-|------|----------|
-| `SymbolInfo` | Functions, types, variables |
-| `ModuleInfo` | Package structure, imports |
-| `ComplexityMetrics` | Cyclomatic complexity, nesting |
-| `GraphDelta` | Diff between two snapshots (`CompareSnapshots()`) |
diff --git a/docs/architecture/agent-guide.md b/docs/architecture/agent-guide.md
index 1c2c587..8880eae 100644
--- a/docs/architecture/agent-guide.md
+++ b/docs/architecture/agent-guide.md
@@ -57,10 +57,10 @@ Every agent must implement all 19 methods on the `Agent` interface:
 
 ### Step 1: Create Package
 
-Create a new directory under `cmd/trace/cli/agent/`:
+Create a new directory under `cli/agent/`:
 
 ```
-cmd/trace/cli/agent/youragent/
+cli/agent/youragent/
 ├── youragent.go          # Core Agent implementation + init()
 ├── lifecycle.go          # ParseHookEvent + compile-time assertions
 ├── types.go              # Hook input structs, transcript types, tool constants
@@ -133,8 +133,8 @@ import (
     "os"
     "path/filepath"
 
-    "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-    "github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+    "github.com/GrayCodeAI/trace/cli/agent"
+    "github.com/GrayCodeAI/trace/cli/paths"
 )
 
 //nolint:gochecknoinits // Agent self-registration is the intended pattern
@@ -235,7 +235,7 @@ import (
     "io"
     "time"
 
-    "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+    "github.com/GrayCodeAI/trace/cli/agent"
 )
 
 // Hook name constants - these become CLI subcommands
@@ -339,9 +339,9 @@ func init() {
 Then add a blank import in the CLI's command setup to ensure the package is loaded:
 
 ```go
-// In cmd/trace/cli/commands/ or wherever agents are imported
+// In cli/commands/ or wherever agents are imported
 import (
-    _ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/youragent"
+    _ "github.com/GrayCodeAI/trace/cli/agent/youragent"
 )
 ```
 
@@ -391,9 +391,9 @@ func (a *YourAgent) InstallHooks(localDev bool, force bool) (int, error) {
     // Other agents should use the git rev-parse approach instead.
     var cmdPrefix string
     if localDev {
-        cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/trace/main.go hooks your-agent `
+        cmdPrefix = `go run "$(git rev-parse --show-toplevel)"/cmd/hawk hooks your-agent `
     } else {
-        cmdPrefix = "trace hooks your-agent "
+        cmdPrefix = "hawk trace hooks your-agent "
     }
 
     // 4. Add hooks if they don't exist (idempotent)
@@ -830,21 +830,21 @@ func TestInstallHooks_Idempotent(t *testing.T) {
 
 ### Test file references
 
-- Claude Code lifecycle tests: `cmd/trace/cli/agent/claudecode/lifecycle_test.go`
-- Claude Code hooks tests: `cmd/trace/cli/agent/claudecode/hooks_test.go`
-- Claude Code transcript tests: `cmd/trace/cli/agent/claudecode/transcript_test.go`
-- Gemini CLI lifecycle tests: `cmd/trace/cli/agent/geminicli/lifecycle_test.go`
-- Gemini CLI hooks tests: `cmd/trace/cli/agent/geminicli/hooks_test.go`
-- Gemini CLI transcript tests: `cmd/trace/cli/agent/geminicli/transcript_test.go`
-- Cursor IDE & CLI lifecycle tests: `cmd/trace/cli/agent/cursor/lifecycle_test.go`
-- Cursor IDE & CLI hooks tests: `cmd/trace/cli/agent/cursor/hooks_test.go`
-- Cursor IDE & CLI session tests: `cmd/trace/cli/agent/cursor/cursor_test.go`
-- OpenCode lifecycle tests: `cmd/trace/cli/agent/opencode/lifecycle_test.go`
-- OpenCode hooks tests: `cmd/trace/cli/agent/opencode/hooks_test.go`
-- OpenCode transcript tests: `cmd/trace/cli/agent/opencode/transcript_test.go`
-- Factory AI Droid lifecycle tests: `cmd/trace/cli/agent/factoryaidroid/lifecycle_test.go`
-- Factory AI Droid hooks tests: `cmd/trace/cli/agent/factoryaidroid/hooks_test.go`
-- Factory AI Droid transcript tests: `cmd/trace/cli/agent/factoryaidroid/transcript_test.go`
+- Claude Code lifecycle tests: `cli/agent/claudecode/lifecycle_test.go`
+- Claude Code hooks tests: `cli/agent/claudecode/hooks_test.go`
+- Claude Code transcript tests: `cli/agent/claudecode/transcript_test.go`
+- Gemini CLI lifecycle tests: `cli/agent/geminicli/lifecycle_test.go`
+- Gemini CLI hooks tests: `cli/agent/geminicli/hooks_test.go`
+- Gemini CLI transcript tests: `cli/agent/geminicli/transcript_test.go`
+- Cursor IDE & CLI lifecycle tests: `cli/agent/cursor/lifecycle_test.go`
+- Cursor IDE & CLI hooks tests: `cli/agent/cursor/hooks_test.go`
+- Cursor IDE & CLI session tests: `cli/agent/cursor/cursor_test.go`
+- OpenCode lifecycle tests: `cli/agent/opencode/lifecycle_test.go`
+- OpenCode hooks tests: `cli/agent/opencode/hooks_test.go`
+- OpenCode transcript tests: `cli/agent/opencode/transcript_test.go`
+- Factory AI Droid lifecycle tests: `cli/agent/factoryaidroid/lifecycle_test.go`
+- Factory AI Droid hooks tests: `cli/agent/factoryaidroid/hooks_test.go`
+- Factory AI Droid transcript tests: `cli/agent/factoryaidroid/transcript_test.go`
 
 ## Common Pitfalls
 
@@ -889,7 +889,7 @@ Use `//nolint:nilnil` to suppress the linter warning on intentional nil returns.
 - `AgentName` is the **registry key** used in code (`"claude-code"`, `"gemini"`, `"opencode"`, `"cursor"`, `"factoryai-droid"`, `"copilot-cli"`). It appears in CLI commands: `trace hooks cursor stop`.
 - `AgentType` is the **display name** stored in metadata and commit trailers (`"Claude Code"`, `"Gemini CLI"`, `"OpenCode"`, `"Cursor"`, `"Factory AI Droid"`, `"Copilot CLI"`). It's what users see.
 
-Register constants for both in `cmd/trace/cli/agent/registry.go` when adding a new agent.
+Register constants for both in `cli/agent/registry.go` when adding a new agent.
 
 ### Hook Names as CLI Subcommands
 
@@ -938,8 +938,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/paths"
+	"github.com/GrayCodeAI/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/paths"
 )
 
 //nolint:gochecknoinits // Agent self-registration is the intended pattern
@@ -1013,7 +1013,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 const (
@@ -1101,7 +1101,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
+	"github.com/GrayCodeAI/trace/cli/agent"
 )
 
 func TestParseHookEvent_SessionStart(t *testing.T) {
diff --git a/docs/architecture/attribution.md b/docs/architecture/attribution.md
index b2ea514..8672ed3 100644
--- a/docs/architecture/attribution.md
+++ b/docs/architecture/attribution.md
@@ -252,6 +252,6 @@ Without per-file tracking, we would have incorrectly subtracted 3 from agent lin
 
 ## References
 
-- Implementation: `cmd/trace/cli/strategy/manual_commit_attribution.go`
-- Types: `cmd/trace/cli/strategy/manual_commit_types.go`
-- Tests: `cmd/trace/cli/strategy/manual_commit_attribution_test.go`
+- Implementation: `cli/strategy/manual_commit_attribution.go`
+- Types: `cli/strategy/manual_commit_types.go`
+- Tests: `cli/strategy/manual_commit_attribution_test.go`
diff --git a/docs/architecture/commit-hook-perf-analysis.md b/docs/architecture/commit-hook-perf-analysis.md
index ce22263..87371d0 100644
--- a/docs/architecture/commit-hook-perf-analysis.md
+++ b/docs/architecture/commit-hook-perf-analysis.md
@@ -142,7 +142,7 @@ This creates a **multiplicative** cost: N sessions × condensation cost per sess
 ## Reproducing
 
 ```bash
-go test -v -run TestCommitHookPerformance -tags hookperf -timeout 15m ./cmd/trace/cli/strategy/
+go test -v -run TestCommitHookPerformance -tags hookperf -timeout 15m ./cli/strategy/
 ```
 
 Requires GitHub access for cloning. Sessions are generated from repo commit history (no external templates needed).
diff --git a/docs/architecture/copilot-token-validation.md b/docs/architecture/copilot-token-validation.md
index 59a8ed1..b9c6da0 100644
--- a/docs/architecture/copilot-token-validation.md
+++ b/docs/architecture/copilot-token-validation.md
@@ -4,8 +4,8 @@ This document defines the manual validation pass for Copilot CLI token accountin
 
 Use it when changing:
 
-- `cmd/trace/cli/agent/copilotcli/transcript.go`
-- `cmd/trace/cli/strategy/manual_commit_condensation.go`
+- `cli/agent/copilotcli/transcript.go`
+- `cli/strategy/manual_commit_condensation.go`
 - Any code that affects `CheckpointTranscriptStart`, checkpoint metadata, or session token backfill
 
 ## Why Copilot Needs Its Own Validation
diff --git a/docs/architecture/external-agent-protocol.md b/docs/architecture/external-agent-protocol.md
index 71cbc1d..9543787 100644
--- a/docs/architecture/external-agent-protocol.md
+++ b/docs/architecture/external-agent-protocol.md
@@ -381,7 +381,7 @@ Examples:
 {"v":1,"agent":"opencode","cli_version":"0.42.0","type":"assistant","ts":"2026-01-13T12:00:02Z","id":"msg_123","input_tokens":150,"output_tokens":42,"content":[{"type":"text","text":"I updated the file."},{"type":"tool_use","id":"toolu_123","name":"Read","input":{"file_path":"src/main.go"},"result":{"output":"package main","status":"success","file":{"filePath":"src/main.go","numLines":1}}}]}
 ```
 
-For complete examples of the expected output format, see the [compact transcript test fixtures](../../cmd/trace/cli/transcript/compact/testdata/).
+For complete examples of the expected output format, see the [compact transcript test fixtures](../../cli/transcript/compact/testdata/).
 
 The compact transcript should exclude agent-native envelope/progress/system noise and retain only the normalized content needed by Trace's checkpoint readers.
 
diff --git a/docs/architecture/external-commands.md b/docs/architecture/external-commands.md
index 311f783..42228ad 100644
--- a/docs/architecture/external-commands.md
+++ b/docs/architecture/external-commands.md
@@ -57,7 +57,7 @@ Variables forwarded by default fall into a few categories:
 - **Windows essentials** — `SYSTEMROOT`, `WINDIR`, `APPDATA`, `LOCALAPPDATA`, `PROGRAMDATA`, `PROGRAMFILES`, `PROGRAMFILES(X86)`, `USERPROFILE`, `USERNAME`, `HOMEDRIVE`, `HOMEPATH`, `COMSPEC`, `PATHEXT`
 - **Namespace prefixes** — anything starting with `TRACE_`, `LC_`, or `XDG_`
 
-The full list lives in `pluginEnvAllowed` and `pluginEnvPrefixes` in `cmd/trace/cli/plugin_env.go`.
+The full list lives in `pluginEnvAllowed` and `pluginEnvPrefixes` in `cli/plugin_env.go`.
 
 ### Opting names back in: `TRACE_PLUGIN_ENV`
 
@@ -102,7 +102,7 @@ External commands are arbitrary executables. No SDK, no protocol, no manifest. T
 
 ## Telemetry
 
-External-command invocations are tracked only for names on a hardcoded allowlist (`officialPlugins` in `cmd/trace/cli/plugin_official.go`). Third-party command names are **never** sent — even with telemetry opted in. The reasoning matches gh's extension-telemetry posture: arbitrary command names can carry sensitive identifiers (project names, vendor names), and the safest default is silence.
+External-command invocations are tracked only for names on a hardcoded allowlist (`officialPlugins` in `cli/plugin_official.go`). Third-party command names are **never** sent — even with telemetry opted in. The reasoning matches gh's extension-telemetry posture: arbitrary command names can carry sensitive identifiers (project names, vendor names), and the safest default is silence.
 
 When an allowlisted command runs successfully, the CLI emits a `cli_plugin_executed` event with:
 
@@ -123,7 +123,7 @@ Telemetry fires only when:
 
 When publishing an Trace-owned external command (e.g. `trace-pgr`):
 
-1. Append the command name to `officialPlugins` in `cmd/trace/cli/plugin_official.go`.
+1. Append the command name to `officialPlugins` in `cli/plugin_official.go`.
 2. Match must be exact and case-sensitive — the binary on disk is `trace-<name>`.
 3. Update or add tests if the command has unusual telemetry shape.
 
@@ -144,14 +144,14 @@ Once allowlisted, `cli_plugin_executed` events for that command will flow throug
 
 ## Implementation
 
-The resolver lives in `cmd/trace/cli/plugin.go`. The entry point is `MaybeRunPlugin(ctx, rootCmd, args)`, called from `cmd/trace/main.go` before `rootCmd.ExecuteContext`. Returns `(handled bool, exitCode int)` — when `handled` is true, the caller exits with `exitCode`; otherwise it falls through to normal Cobra execution.
+The resolver lives in `cli/plugin.go`. The entry point is `MaybeRunPlugin(ctx, rootCmd, args)`, called from `cmd/trace/main.go` before `rootCmd.ExecuteContext`. Returns `(handled bool, exitCode int)` — when `handled` is true, the caller exits with `exitCode`; otherwise it falls through to normal Cobra execution.
 
 Key files:
 
-- `cmd/trace/cli/plugin.go` — entry point, `resolvePlugin`, `runPlugin`
-- `cmd/trace/cli/plugin_env.go` — `pluginEnv`, the allowlist, and `TRACE_PLUGIN_ENV` parsing
-- `cmd/trace/cli/plugin_official.go` — `officialPlugins` allowlist, `IsOfficialPlugin`
-- `cmd/trace/cli/plugin_store.go` — managed install directory, `PluginBinDir`, `PluginDataDir`, `InstallPluginFromPath`, `ListInstalledPlugins`, `RemoveInstalledPlugin`, `PrependPluginBinDirToPATH`
-- `cmd/trace/cli/plugin_group.go` — `trace plugin install/list/remove` Cobra commands
-- `cmd/trace/cli/telemetry/detached.go` — `BuildPluginEventPayload`, `TrackPluginDetached`
-- `cmd/trace/cli/integration_test/external_command_test.go` — end-to-end coverage of the resolution path
+- `cli/plugin.go` — entry point, `resolvePlugin`, `runPlugin`
+- `cli/plugin_env.go` — `pluginEnv`, the allowlist, and `TRACE_PLUGIN_ENV` parsing
+- `cli/plugin_official.go` — `officialPlugins` allowlist, `IsOfficialPlugin`
+- `cli/plugin_store.go` — managed install directory, `PluginBinDir`, `PluginDataDir`, `InstallPluginFromPath`, `ListInstalledPlugins`, `RemoveInstalledPlugin`, `PrependPluginBinDirToPATH`
+- `cli/plugin_group.go` — `trace plugin install/list/remove` Cobra commands
+- `cli/telemetry/detached.go` — `BuildPluginEventPayload`, `TrackPluginDetached`
+- `cli/integration_test/external_command_test.go` — end-to-end coverage of the resolution path
diff --git a/docs/architecture/logging.md b/docs/architecture/logging.md
index 8f62d34..2696d44 100644
--- a/docs/architecture/logging.md
+++ b/docs/architecture/logging.md
@@ -142,13 +142,13 @@ Logs are tagged with a `component` field indicating the logging source:
 
 | File | Purpose |
 |------|---------|
-| `cmd/trace/cli/logging/logger.go` | Core logging infrastructure |
-| `cmd/trace/cli/logging/context.go` | Context helpers (WithComponent, WithSession) |
-| `cmd/trace/cli/hooks_git_cmd.go` | Git hook logging (uses gitHookContext helper) |
-| `cmd/trace/cli/hooks_claudecode_handlers.go` | Claude Code hook logging |
-| `cmd/trace/cli/hook_registry.go` | Hook wrapper logging |
-| `cmd/trace/cli/strategy/manual_commit_git.go` | Manual-commit checkpoint logging |
-| `cmd/trace/cli/strategy/manual_commit_hooks.go` | Condensation and branch cleanup logging |
+| `cli/logging/logger.go` | Core logging infrastructure |
+| `cli/logging/context.go` | Context helpers (WithComponent, WithSession) |
+| `cli/hooks_git_cmd.go` | Git hook logging (uses gitHookContext helper) |
+| `cli/hooks_claudecode_handlers.go` | Claude Code hook logging |
+| `cli/hook_registry.go` | Hook wrapper logging |
+| `cli/strategy/manual_commit_git.go` | Manual-commit checkpoint logging |
+| `cli/strategy/manual_commit_hooks.go` | Condensation and branch cleanup logging |
 
 ### Log Entry Structure
 
diff --git a/docs/architecture/review-command.md b/docs/architecture/review-command.md
index 03f7a74..0f3ac55 100644
--- a/docs/architecture/review-command.md
+++ b/docs/architecture/review-command.md
@@ -29,7 +29,7 @@ Review skills are configured per-agent in `.trace/settings.json`:
 }
 ```
 
-The key is the agent name. The value is a `ReviewConfig` with `skills` (skill invocations passed verbatim to the agent) and optional `prompt` (an always-prompt appended to the composed prompt). Settings field: `EntireSettings.Review` in `cmd/trace/cli/settings/settings.go`.
+The key is the agent name. The value is a `ReviewConfig` with `skills` (skill invocations passed verbatim to the agent) and optional `prompt` (an always-prompt appended to the composed prompt). Settings field: `EntireSettings.Review` in `cli/settings/settings.go`.
 
 ## How It Works (env-var handshake)
 
@@ -50,25 +50,25 @@ Review metadata is stored at two levels on `trace/checkpoints/v1`:
 
 ## Architecture
 
-- **`AgentReviewer` interface** (`cmd/trace/cli/review/types/reviewer.go`): per-agent contract with `Name() string` and `Start(ctx, RunConfig) (Process, error)`. Each launchable agent implements this in its own package.
-- **`ReviewerTemplate`** (`cmd/trace/cli/review/types/template.go`): shared scaffolding (Spawn → pipe stdout → run parser → forward events → close). Each agent supplies only its `BuildCmd` (argv/env) and `Parser` (stdout-to-Event stream).
+- **`AgentReviewer` interface** (`cli/review/types/reviewer.go`): per-agent contract with `Name() string` and `Start(ctx, RunConfig) (Process, error)`. Each launchable agent implements this in its own package.
+- **`ReviewerTemplate`** (`cli/review/types/template.go`): shared scaffolding (Spawn → pipe stdout → run parser → forward events → close). Each agent supplies only its `BuildCmd` (argv/env) and `Parser` (stdout-to-Event stream).
 - **`Sink` interface**: consumers of the event stream. Production sinks: `DumpSink` (post-run per-agent narrative), `TUISink` (Bubble Tea live dashboard with Ctrl+O drill-in), `SynthesisSink` (opt-in y/N cross-agent verdict). Sinks are composed by `composeMultiAgentSinks` based on TTY detection.
-- **`Run(ctx, reviewer, cfg, sinks)`** (`cmd/trace/cli/review/run.go`): single-agent orchestrator. Forwards events to all sinks via `AgentEvent`, calls `RunFinished` once at end with a populated `RunSummary`. Sink dispatch is serialized; sinks need not internally synchronize.
-- **`RunMulti(ctx, reviewers, cfg, sinks)`** (`cmd/trace/cli/review/run_multi.go`): N-agent orchestrator. Each agent runs concurrently in its own goroutine; events fan into a single dispatch loop so the serial-dispatch contract is preserved. Per-agent skills/prompts are injected via `perAgentConfiguredReviewer` adapter (each reviewer sees its own `RunConfig` despite the shared API surface).
-- **Env-var contract** (`cmd/trace/cli/review/env.go`): single source of truth for `ENTIRE_REVIEW_*` constants used by spawn-side and lifecycle adoption.
-- **Scope detection** (`cmd/trace/cli/review/scope.go`): `detectScopeBaseRef` returns the first existing ref from the fallback chain `origin/HEAD → origin/main → origin/master → main → master`. Overridable per-invocation via `--base <ref>` (validated through go-git's `ResolveRevision`). Banner output: "Reviewing feat/X vs main: 3 commits, 7 files changed, 2 uncommitted".
+- **`Run(ctx, reviewer, cfg, sinks)`** (`cli/review/run.go`): single-agent orchestrator. Forwards events to all sinks via `AgentEvent`, calls `RunFinished` once at end with a populated `RunSummary`. Sink dispatch is serialized; sinks need not internally synchronize.
+- **`RunMulti(ctx, reviewers, cfg, sinks)`** (`cli/review/run_multi.go`): N-agent orchestrator. Each agent runs concurrently in its own goroutine; events fan into a single dispatch loop so the serial-dispatch contract is preserved. Per-agent skills/prompts are injected via `perAgentConfiguredReviewer` adapter (each reviewer sees its own `RunConfig` despite the shared API surface).
+- **Env-var contract** (`cli/review/env.go`): single source of truth for `ENTIRE_REVIEW_*` constants used by spawn-side and lifecycle adoption.
+- **Scope detection** (`cli/review/scope.go`): `detectScopeBaseRef` returns the first existing ref from the fallback chain `origin/HEAD → origin/main → origin/master → main → master`. Overridable per-invocation via `--base <ref>` (validated through go-git's `ResolveRevision`). Banner output: "Reviewing feat/X vs main: 3 commits, 7 files changed, 2 uncommitted".
 
 ## Multi-Agent UI
 
 When `RunMulti` is dispatched in a TTY, the sink slice is `[TUISink, DumpSink, SynthesisSink?]`:
 
-- **`TUISink` / `reviewTUIModel`** (`cmd/trace/cli/review/tui_sink.go`, `tui_model.go`, `tui_detail.go`): live dashboard with one row per agent (name, status, tokens, last assistant preview, duration). `Ctrl+O` enters drill-in mode on the alt screen showing the full event buffer for the selected agent; `Esc` returns to the dashboard. `Ctrl+C` cancels the run via the shared `CancelFunc`. The model uses `tea.WithoutSignalHandler` so the cobra root retains SIGINT routing. After all agents finish, the user dismisses with any key — `RunFinished` blocks on dismissal so `DumpSink` renders below the TUI rather than overlapping it.
-- **`SynthesisSink`** (`cmd/trace/cli/review/synthesis_sink.go`): opt-in y/N prompt offered after the dump. On "y", composes a synthesis prompt covering all agent narratives + per-run user prompt, calls the configured summary provider, and prints the unified verdict. Skipped silently when stdin can't prompt, the run was cancelled, or fewer than 2 agents produced usable output. Provider failures degrade gracefully ("synthesis unavailable: <err>") so the user can still commit.
-- **Sink composition** (`composeMultiAgentSinks` in `cmd/trace/cli/review/cmd.go`): pure helper taking explicit `isTTY`/`canPrompt` so tests don't depend on real TTY detection. `findTUISink` picks the TUI out of the slice for `Start`/`Wait` lifecycle hooks.
+- **`TUISink` / `reviewTUIModel`** (`cli/review/tui_sink.go`, `tui_model.go`, `tui_detail.go`): live dashboard with one row per agent (name, status, tokens, last assistant preview, duration). `Ctrl+O` enters drill-in mode on the alt screen showing the full event buffer for the selected agent; `Esc` returns to the dashboard. `Ctrl+C` cancels the run via the shared `CancelFunc`. The model uses `tea.WithoutSignalHandler` so the cobra root retains SIGINT routing. After all agents finish, the user dismisses with any key — `RunFinished` blocks on dismissal so `DumpSink` renders below the TUI rather than overlapping it.
+- **`SynthesisSink`** (`cli/review/synthesis_sink.go`): opt-in y/N prompt offered after the dump. On "y", composes a synthesis prompt covering all agent narratives + per-run user prompt, calls the configured summary provider, and prints the unified verdict. Skipped silently when stdin can't prompt, the run was cancelled, or fewer than 2 agents produced usable output. Provider failures degrade gracefully ("synthesis unavailable: <err>") so the user can still commit.
+- **Sink composition** (`composeMultiAgentSinks` in `cli/review/cmd.go`): pure helper taking explicit `isTTY`/`canPrompt` so tests don't depend on real TTY detection. `findTUISink` picks the TUI out of the slice for `Start`/`Wait` lifecycle hooks.
 
 ## Skill Discovery (Claude Code)
 
-`DiscoverReviewSkills` (`cmd/trace/cli/agent/claudecode/discovery.go`) walks three roots: plugin cache (`~/.claude/plugins/cache/<market>/<plugin>/<version>/{skills,commands,agents}`), user skills (`~/.claude/skills`), user commands/agents (`~/.claude/commands`, `~/.claude/agents`).
+`DiscoverReviewSkills` (`cli/agent/claudecode/discovery.go`) walks three roots: plugin cache (`~/.claude/plugins/cache/<market>/<plugin>/<version>/{skills,commands,agents}`), user skills (`~/.claude/skills`), user commands/agents (`~/.claude/commands`, `~/.claude/agents`).
 
 For the plugin cache, `pickLatestVersion` picks ONE version directory per plugin: highest valid semver wins; if no entries parse as semver, the lexicographic max is picked (handles the `unknown` sentinel some plugins ship). Without this, multiple installed versions of a plugin produced duplicate skill entries in the picker and prompt.
 
@@ -88,18 +88,18 @@ The redesign eliminated several constructs from the prior implementation. None s
 
 ## Key Files
 
-- `cmd/trace/cli/review/cmd.go` — `NewCommand()`, `runReview` dispatch fork, `composeMultiAgentSinks`
-- `cmd/trace/cli/review/picker.go` / `multipicker.go` — config-edit picker, first-run setup, single- and multi-agent selection
-- `cmd/trace/cli/review/attach.go` + `cli/review_helpers.go:newReviewAttachCmd` — `trace review attach` subcommand
-- `cmd/trace/cli/review/marker_fallback.go` — non-launchable agent flow (single shared file)
-- `cmd/trace/cli/review/prompt.go` / `scope.go` / `run.go` / `dump.go` / `run_multi.go` — core machinery (single-agent + N-agent fan-in)
-- `cmd/trace/cli/review/tui_sink.go` / `tui_model.go` / `tui_detail.go` — Bubble Tea TUI sink
-- `cmd/trace/cli/review/synthesis_sink.go` / `synthesis_prompt.go` — opt-in cross-agent verdict
-- `cmd/trace/cli/review/types/{reviewer,sink,template}.go` — interface contracts (CU2 + CU4 + CU5b)
-- `cmd/trace/cli/review/env.go` — `ENTIRE_REVIEW_*` constants + `EncodeSkills`/`DecodeSkills` + `AppendReviewEnv`
-- `cmd/trace/cli/agent/{claudecode,codex,geminicli}/reviewer.go` — per-agent `AgentReviewer` implementations (claude-code, codex, gemini-cli)
-- `cmd/trace/cli/agent/claudecode/discovery.go` — skill discovery + `pickLatestVersion` plugin-cache dedupe
-- `cmd/trace/cli/lifecycle.go` — `adoptReviewEnv` reads `ENTIRE_REVIEW_*` from process env; replaces marker-file adoption
-- `cmd/trace/cli/review_bridge.go` / `review_helpers.go` — bridge code in `cli` package for cycle-bound functions (`headHasReviewCheckpoint`, `launchableReviewerFor`, `newReviewAttachCmd`, `lazySynthesisProvider`)
-- `cmd/trace/cli/checkpoint/checkpoint.go` — `Kind`, `ReviewSkills`, `ReviewPrompt` on `CommittedMetadata`; `HasReview` on `CheckpointSummary`
-- `cmd/trace/cli/settings/settings.go` — `EntireSettings.Review` field
+- `cli/review/cmd.go` — `NewCommand()`, `runReview` dispatch fork, `composeMultiAgentSinks`
+- `cli/review/picker.go` / `multipicker.go` — config-edit picker, first-run setup, single- and multi-agent selection
+- `cli/review/attach.go` + `cli/review_helpers.go:newReviewAttachCmd` — `trace review attach` subcommand
+- `cli/review/marker_fallback.go` — non-launchable agent flow (single shared file)
+- `cli/review/prompt.go` / `scope.go` / `run.go` / `dump.go` / `run_multi.go` — core machinery (single-agent + N-agent fan-in)
+- `cli/review/tui_sink.go` / `tui_model.go` / `tui_detail.go` — Bubble Tea TUI sink
+- `cli/review/synthesis_sink.go` / `synthesis_prompt.go` — opt-in cross-agent verdict
+- `cli/review/types/{reviewer,sink,template}.go` — interface contracts (CU2 + CU4 + CU5b)
+- `cli/review/env.go` — `ENTIRE_REVIEW_*` constants + `EncodeSkills`/`DecodeSkills` + `AppendReviewEnv`
+- `cli/agent/{claudecode,codex,geminicli}/reviewer.go` — per-agent `AgentReviewer` implementations (claude-code, codex, gemini-cli)
+- `cli/agent/claudecode/discovery.go` — skill discovery + `pickLatestVersion` plugin-cache dedupe
+- `cli/lifecycle.go` — `adoptReviewEnv` reads `ENTIRE_REVIEW_*` from process env; replaces marker-file adoption
+- `cli/review_bridge.go` / `review_helpers.go` — bridge code in `cli` package for cycle-bound functions (`headHasReviewCheckpoint`, `launchableReviewerFor`, `newReviewAttachCmd`, `lazySynthesisProvider`)
+- `cli/checkpoint/checkpoint.go` — `Kind`, `ReviewSkills`, `ReviewPrompt` on `CommittedMetadata`; `HasReview` on `CheckpointSummary`
+- `cli/settings/settings.go` — `EntireSettings.Review` field
diff --git a/docs/design/TRACE-REPLAY-UI.md b/docs/design/TRACE-REPLAY-UI.md
index 8e3fa23..9a049d6 100644
--- a/docs/design/TRACE-REPLAY-UI.md
+++ b/docs/design/TRACE-REPLAY-UI.md
@@ -11,17 +11,17 @@
 
 `trace` today captures AI coding sessions git-natively: transcripts and full-state checkpoints are
 written to git **orphan/shadow branches** rather than a database. Permanent checkpoints land on the
-`trace/checkpoints/v1` orphan branch (`cmd/trace/cli/checkpoint/committed.go:51`,
+`trace/checkpoints/v1` orphan branch (`cli/checkpoint/committed.go:51`,
 `committed.go:1594-1647`), while in-flight, intra-session rewind state lives on per-commit shadow
-branches keyed `trace/<commit-hash>` (`cmd/trace/cli/checkpoint/checkpoint.go:55-86`,
-`cmd/trace/cli/checkpoint/shadow_ref.go`). The OpenAPI contract is explicit that
+branches keyed `trace/<commit-hash>` (`cli/checkpoint/checkpoint.go:55-86`,
+`cli/checkpoint/shadow_ref.go`). The OpenAPI contract is explicit that
 **trace ships no HTTP server today** (`api/openapi.yaml`: *"trace is a CLI tool — no HTTP server is
 exposed"*).
 
 Replay today is a **terminal experience**: `trace session replay [session-id]` walks the recorded
-transcript step-by-step in the CLI (`cmd/trace/cli/session_replay.go:27-90`). It reads the raw
+transcript step-by-step in the CLI (`cli/session_replay.go:27-90`). It reads the raw
 transcript via the live path in session state, parses it with the shared transcript parser
-(`cmd/trace/cli/transcript/parse.go`), and renders `replayEntry{Index,Type,Content,ToolName,Timestamp}`
+(`cli/transcript/parse.go`), and renders `replayEntry{Index,Type,Content,ToolName,Timestamp}`
 rows (`session_replay.go:18-25`, `buildReplayEntries`). There is no timeline, no diff view, no
 sharing, and nothing a non-terminal user (PM, reviewer, teammate) can open.
 
@@ -133,7 +133,7 @@ Nothing new is persisted on disk. The viewer consumes a derived **read model** a
 time from the existing artifacts.
 
 **Source events** — parsed from the transcript with the existing parser. The on-the-wire transcript
-line is intentionally small (`cmd/trace/cli/transcript/types.go:22`):
+line is intentionally small (`cli/transcript/types.go:22`):
 
 ```go
 type Line struct {
@@ -164,14 +164,14 @@ CostBreakdown     { total, byCheckpoint[], byAgent[], byModel[] }
 ```
 
 - `TokenUsage` is read directly from the existing struct
-  (`cmd/trace/cli/agent/types.go:48`): `InputTokens`, `CacheCreationTokens`, `CacheReadTokens`,
+  (`cli/agent/types.go:48`): `InputTokens`, `CacheCreationTokens`, `CacheReadTokens`,
   `OutputTokens`, `APICallCount`, and crucially `SubagentTokens *TokenUsage` — the recursive
   subagent field is exactly what feeds nested spans in the waterfall.
 - `Span` is computed by walking the normalized event stream: each `tool_use` block opens a span,
   the matching `tool_result` (correlated by `tool_use_id`) closes it. Subagent token rollups
   (`SubagentTokens`) and any subagent transcript dirs become child spans. Per-span cost comes from
-  `cost.ComputeCost` / `ComputeCostWith` (`cmd/trace/cli/cost/compute.go:38-51`) against the active
-  model's pricing (`cmd/trace/cli/cost/pricing.go`).
+  `cost.ComputeCost` / `ComputeCostWith` (`cli/cost/compute.go:38-51`) against the active
+  model's pricing (`cli/cost/pricing.go`).
 
 **Checkpoint mapping for the timeline:** committed checkpoints (`trace/checkpoints/v1`) are the
 permanent timeline nodes; shadow-branch checkpoints (`trace/<commit-hash>`) are the rewind/scrub
@@ -200,8 +200,8 @@ Design constraints:
   doing so prints a redaction/exposure warning (§7).
 - **No write endpoints that mutate git history** in P0/P1. (`rewind` already exists as a CLI verb;
   exposing it over HTTP is deferred — the prior spec's `POST /rewind` is out of scope here.)
-- Handlers live in a new `cmd/trace/cli/serve/` package and reuse the existing internal API client
-  conventions in `cmd/trace/cli/api/` (`client.go`, `base_url.go`, `auth_tokens.go`).
+- Handlers live in a new `cli/serve/` package and reuse the existing internal API client
+  conventions in `cli/api/` (`client.go`, `base_url.go`, `auth_tokens.go`).
 
 ### 3.4 Key flows (sequences)
 
@@ -262,21 +262,21 @@ Everything below already exists in-tree and is reusable today. Citations are `pa
 
 | Need | Reuse | Notes |
 |---|---|---|
-| Parse transcript events | `cmd/trace/cli/transcript/parse.go` (`ParseFromBytes`, `ParseFromFileAtLine`, `normalizeLineType`) and `transcript/types.go:10-26` | Already handles gzip, arbitrarily long lines, multiple agent formats, and incremental parsing from a start line (perfect for SSE live tail and checkpoint slicing). The web read model is a thin adapter over this. |
-| Walk replay entries | `cmd/trace/cli/session_replay.go` (`replayEntry`, `buildReplayEntries`, `parseTranscriptToReplayEntries`) | The TUI replay already converts `Line` → display rows. Extract the agnostic conversion into a shared function consumed by *both* the TUI and the HTTP handlers so there's one event-normalization codepath. |
-| Token usage per session/subagent | `cmd/trace/cli/agent/token_usage.go` (`CalculateTokenUsage`, subagent-aware path) + `agent/types.go:48` (`TokenUsage` incl. `SubagentTokens`) | Directly feeds span token annotations and the cost chart. Subagent recursion already modeled. |
-| Cost attribution | `cmd/trace/cli/cost/compute.go:38-51` (`ComputeCost`, `ComputeCostWith`) + `cost/pricing.go` (`ModelPricing`, `Table`, `LoadTable`, `PricingFor`) | This is the "new cost-attribution work" the task says to reuse. Per-span, per-checkpoint, per-agent, per-model breakdowns all derive from these. No new pricing logic. |
-| Annotations / collaboration metadata | `cmd/trace/cli/annotate_cmd.go` (`trace annotate --comment/--checkpoint/--list`, persisted via `MutateSessionState`) | Annotations are already per-session and optionally per-checkpoint. Surface them on the timeline (pins on checkpoint nodes). Reuse the "annotate work" the task references — the web UI is a read view over the same session-state field. |
+| Parse transcript events | `cli/transcript/parse.go` (`ParseFromBytes`, `ParseFromFileAtLine`, `normalizeLineType`) and `transcript/types.go:10-26` | Already handles gzip, arbitrarily long lines, multiple agent formats, and incremental parsing from a start line (perfect for SSE live tail and checkpoint slicing). The web read model is a thin adapter over this. |
+| Walk replay entries | `cli/session_replay.go` (`replayEntry`, `buildReplayEntries`, `parseTranscriptToReplayEntries`) | The TUI replay already converts `Line` → display rows. Extract the agnostic conversion into a shared function consumed by *both* the TUI and the HTTP handlers so there's one event-normalization codepath. |
+| Token usage per session/subagent | `cli/agent/token_usage.go` (`CalculateTokenUsage`, subagent-aware path) + `agent/types.go:48` (`TokenUsage` incl. `SubagentTokens`) | Directly feeds span token annotations and the cost chart. Subagent recursion already modeled. |
+| Cost attribution | `cli/cost/compute.go:38-51` (`ComputeCost`, `ComputeCostWith`) + `cost/pricing.go` (`ModelPricing`, `Table`, `LoadTable`, `PricingFor`) | This is the "new cost-attribution work" the task says to reuse. Per-span, per-checkpoint, per-agent, per-model breakdowns all derive from these. No new pricing logic. |
+| Annotations / collaboration metadata | `cli/annotate_cmd.go` (`trace annotate --comment/--checkpoint/--list`, persisted via `MutateSessionState`) | Annotations are already per-session and optionally per-checkpoint. Surface them on the timeline (pins on checkpoint nodes). Reuse the "annotate work" the task references — the web UI is a read view over the same session-state field. |
 | Secret redaction | `trace/redact/` — `redact.go:165` `String`, `:474` `Bytes`, `:485` `JSONLBytes`, `:506` `JSONLContent`; `packs.go:184` `LoadPacks`; `redact/verify.go` | Mandatory on every publish/export path. JSONL-aware redaction matches the transcript format exactly. `LoadPacks` lets orgs add custom patterns. `verify.go` gives a post-redaction assertion. |
-| Checkpoint storage / refs | `cmd/trace/cli/checkpoint/` — `checkpoint.go:55-86` (shadow vs committed model), `committed.go:1594-1648` (`trace/checkpoints/v1` orphan branch + origin fallback), `shadow_ref.go` (CAS-safe ref updates) | The read API reads trees from these refs. The `origin/trace/checkpoints/v1` fallback (`committed.go:1648`) is precisely what makes §3.4-D team viewing work without new infra. |
+| Checkpoint storage / refs | `cli/checkpoint/` — `checkpoint.go:55-86` (shadow vs committed model), `committed.go:1594-1648` (`trace/checkpoints/v1` orphan branch + origin fallback), `shadow_ref.go` (CAS-safe ref updates) | The read API reads trees from these refs. The `origin/trace/checkpoints/v1` fallback (`committed.go:1648`) is precisely what makes §3.4-D team viewing work without new infra. |
 | Diff vs parent | checkpoint trees + go-git (`github.com/go-git/go-git/v6`, already a dep) | Diff is a tree-vs-tree git diff between checkpoint commits; no new diff engine. |
 | OTel export (observability tie-in) | `otel_collector.go` (`OTelCollectorConfig`, span batching/export) | Spans we compute for the waterfall are conceptually the same spans OTel export ships (comparison line 60). Unify the span model so the UI waterfall and the Langfuse/Phoenix export read one `Span` type. |
-| HTTP/CLI plumbing | `cmd/trace/cli/api/` (`client.go`, `base_url.go`, `auth_tokens.go`), cobra command pattern (`session_replay.go:27`, `annotate_cmd.go:20`) | New `trace serve` / `trace publish` / `trace export` commands follow the existing cobra `newXCmd()` + `runX()` pattern. |
+| HTTP/CLI plumbing | `cli/api/` (`client.go`, `base_url.go`, `auth_tokens.go`), cobra command pattern (`session_replay.go:27`, `annotate_cmd.go:20`) | New `trace serve` / `trace publish` / `trace export` commands follow the existing cobra `newXCmd()` + `runX()` pattern. |
 | TUI rendering stack | `charm.land/bubbletea/v2` (go.mod:7), `charmbracelet/x/ansi` | Used by the asciinema/GIF export renderer to "play" the transcript in a headless terminal buffer (§6). |
 
 **What is genuinely new (must be built):**
-- `cmd/trace/cli/serve/` — HTTP handlers, read-model assembly, SSE live tail.
-- `cmd/trace/cli/serve/spans.go` — tool_use/tool_result correlation → `Span[]` (shared with OTel).
+- `cli/serve/` — HTTP handlers, read-model assembly, SSE live tail.
+- `cli/serve/spans.go` — tool_use/tool_result correlation → `Span[]` (shared with OTel).
 - React SPA under `ui/` (`go:embed`-ed) — Timeline, TranscriptViewer, Waterfall, DiffViewer,
   CostChart, AnnotationPins.
 - `trace publish` / `trace export` static-bundle renderers.
@@ -335,7 +335,7 @@ documented but dormant.
 
 | Concern | Decision | Rationale / licensing |
 |---|---|---|
-| Web framework | **Build thin** on Go stdlib `net/http` + existing `cmd/trace/cli/api/` conventions | Avoids a heavy server dep; trace is a static-binary tool. SSE is trivial over stdlib. |
+| Web framework | **Build thin** on Go stdlib `net/http` + existing `cli/api/` conventions | Avoids a heavy server dep; trace is a static-binary tool. SSE is trivial over stdlib. |
 | Frontend framework | **React + Vite + TypeScript**, `go:embed` the built bundle | Matches the prior spec and the hawk daemon's embedded-frontend pattern. MIT-licensed toolchain. Single binary preserved. |
 | Diff rendering | **Buy (vendor JS): Monaco diff editor** OR a lighter diff lib | Monaco = MIT. Heavy; consider a lighter MIT diff renderer if bundle size matters. Diff *computation* stays server-side via go-git. |
 | Charts (cost/token) | **Buy: Recharts or uPlot** (MIT) | Standard, well-licensed. |
@@ -344,7 +344,7 @@ documented but dormant.
 | GIF/MP4 | **Buy: ffmpeg as optional external tool** (not linked, shelled out) | ffmpeg is LGPL/GPL depending on build — *shelling out* avoids linking/licensing entanglement. Feature gated on ffmpeg presence. |
 | rrweb | **Buy: rrweb + rrweb-player** (MIT) | Only pulled in if/when browser control ships (P2 conditional). |
 | Redaction | **Reuse `trace/redact`** | Already in-tree, already battle-tested (extensive `redact/*_test.go`). No new dep. |
-| Cost/pricing | **Reuse `cmd/trace/cli/cost`** | No new pricing source. |
+| Cost/pricing | **Reuse `cli/cost`** | No new pricing source. |
 | Search index | **Defer**: start linear-scan + in-memory cache; add SQLite FTS5 (CGO-free via modernc) only if needed | Avoid CGO (trace ships a static binary). The prior spec's FTS5 assumption needs validation against the no-CGO constraint. |
 
 **Static-binary constraint is load-bearing:** trace is distributed as a Go static binary. Any
diff --git a/docs/first-time-contributors.md b/docs/first-time-contributors.md
index 48c87a1..e591001 100644
--- a/docs/first-time-contributors.md
+++ b/docs/first-time-contributors.md
@@ -23,7 +23,7 @@ A few good places to look:
 
 - **The [issue tracker](https://github.com/GrayCodeAI/trace/issues).** Skim the open issues for something that looks small, well-scoped, or interesting to you. When you find one, comment on it (see [Claim the issue](#claim-the-issue) below) so a maintainer can confirm it's a good fit before you start.
 - **The [`#looking-for-contributors`](https://discord.com/channels/1468014954689855716/1499864669920297081) channel on [Discord](https://discord.gg/jZJs3Tue4S).** Maintainers post issues that they are ready for someone to pick up.
-- **Something you noticed yourself.** A typo, an unclear error message, a function in `cmd/trace/cli/` without test coverage. Small improvements like these are always welcome and don't need a prior issue.
+- **Something you noticed yourself.** A typo, an unclear error message, a function in `cli/` without test coverage. Small improvements like these are always welcome and don't need a prior issue.
 
 ---
 
diff --git a/e2e/README.md b/e2e/README.md
deleted file mode 100644
index 6cc296c..0000000
--- a/e2e/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# E2E Tests
-
-End-to-end tests for the `trace` CLI against real agents (Claude Code, Gemini CLI, OpenCode, Codex, Cursor, Factory AI Droid, Copilot CLI).
-
-## Commands
-
-```bash
-mise run test:e2e [filter]                          # run filtered (or omit filter for all agents)
-mise run test:e2e --agent claude-code [filter]       # Claude Code only
-mise run test:e2e --agent gemini-cli [filter]        # Gemini CLI only
-mise run test:e2e --agent opencode [filter]          # OpenCode only
-mise run test:e2e --agent codex [filter]             # Codex only
-mise run test:e2e --agent cursor [filter]            # Cursor only
-mise run test:e2e --agent factoryai-droid [filter]   # Factory AI Droid only
-mise run test:e2e --agent copilot-cli [filter]       # Copilot CLI only
-go build ./...                                      # compile check (no agent CLI needed)
-```
-
-**Do NOT run E2E tests proactively.** They make real API calls that consume tokens and cost money. Only run when explicitly asked.
-
-## Structure
-
-```
-e2e/
-├── agents/       # Agent abstraction (Agent interface, tmux sessions, concurrency gates)
-├── bootstrap/    # CI pre-test setup (auth config, warmup)
-├── trace/       # `trace` CLI wrapper (enable, rewind, etc.)
-├── exploratory/  # Experimental tests, not run by CI
-├── tests/        # Blessed test files (run by CI)
-└── testutil/     # Repo setup, assertions, artifact capture
-```
-
-## Key Patterns
-
-- Every test uses `testutil.ForEachAgent` which runs it per registered agent with repo setup, concurrency gating, and timeout scaling.
-- All operations go through `RepoState` (`s.RunPrompt`, `s.Git`) so they're logged to `console.log`.
-- Use the `trace` package for CLI interactions, not raw `exec.Command`.
-- Skip tests pending CLI fixes with `t.Skip("ENT-XXX: reason")`.
-
-## Adding a New Agent
-
-1. Create `agents/<name>.go` implementing the `Agent` interface.
-2. Register it in `init()` with `Register(&YourAgent{})`.
-3. Add a `Bootstrap()` method for any CI-specific setup (auth config, warmup).
-4. Add a `RegisterGate("<name>", N)` call if concurrency needs limiting.
-5. Ensure the agent name is accepted by `mise run test:e2e --agent <name>`.
-6. Add the agent to `.github/workflows/e2e.yml` matrix and `e2e-isolated.yml` options.
-
-## Environment Variables
-
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `E2E_AGENT` | Agent to test (`claude-code`, `gemini-cli`, `opencode`, `codex`, `cursor`, `factoryai-droid`, `copilot-cli`) | all registered |
-| `E2E_TRACE_BIN` | Path to a pre-built `trace` binary | builds from source |
-| `E2E_TIMEOUT` | Timeout per prompt | `2m` |
-| `E2E_KEEP_REPOS` | Set to `1` to preserve temp repos after test | unset |
-| `E2E_ARTIFACT_DIR` | Override artifact output directory | `e2e/artifacts/<timestamp>` |
-| `ANTHROPIC_API_KEY` | Required for Claude Code | — |
-| `GEMINI_API_KEY` | Required for Gemini CLI | — |
-| `OPENAI_API_KEY` | Required for Codex | — |
-| `COPILOT_GITHUB_TOKEN` | Required for Copilot CLI (or `gh auth login`) | — |
-
-## Debugging Failures
-
-Artifacts are captured to `e2e/artifacts/` on every run (git-log, git-tree, console.log, checkpoint metadata, trace logs). Set `E2E_KEEP_REPOS=1` to preserve the temp repo — a symlink appears in the artifact dir pointing to it.
-
-Use the `debug-e2e` skill (`.claude/skills/debug-e2e/`) for a structured workflow when investigating failures.
-
-### Reading artifacts
-
-- `console.log` — full operation transcript including agent stdout/stderr
-- `git-log.txt` — commit history at time of failure
-- `git-tree.txt` — working tree state
-- `trace-logs/` — internal CLI logs
-
-### Fixing flaky tests
-
-When a test passes on retry but failed once, the problem is usually agent non-determinism, not a CLI bug. Common patterns:
-
-- **Agent asked for confirmation instead of acting**: The model output contains "Does this look right?" or "Should I proceed?". Fix: append "Do not ask for confirmation, just make the change." to the prompt.
-- **Agent wrote to wrong path or created extra files**: Fix: be more explicit about exact file paths and what _not_ to do.
-- **Agent committed when it shouldn't have**: Fix: add "Do not commit" to the prompt.
-- **Checkpoint wait timeout**: `WaitForCheckpoint` or `WaitForCheckpointAdvanceFrom` exceeded deadline. Fix: increase the timeout argument.
-
-To diagnose: read `console.log` in the failing test's artifact directory. Compare what the agent actually did vs what the test expected.
-
-## CI Workflows
-
-- **`.github/workflows/e2e.yml`** — Runs full suite on push to main. Matrix: `[claude-code, opencode, gemini-cli, codex, cursor-cli, factoryai-droid, copilot-cli]`.
-- **`.github/workflows/e2e-isolated.yml`** — Manual dispatch for debugging a single test. Inputs: agent + test name filter.
-
-Both workflows run `go run ./e2e/bootstrap` before tests to handle agent-specific CI setup (auth config, warmup).
diff --git a/e2e/agents/agent.go b/e2e/agents/agent.go
deleted file mode 100644
index 6733ded..0000000
--- a/e2e/agents/agent.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package agents
-
-import (
-	"context"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type Output struct {
-	Command  string
-	Stdout   string
-	Stderr   string
-	ExitCode int
-}
-
-type (
-	Option    func(*runConfig)
-	runConfig struct {
-		Model          string
-		PermissionMode string
-		PromptTimeout  time.Duration
-	}
-)
-
-func WithModel(model string) Option {
-	return func(c *runConfig) { c.Model = model }
-}
-
-func WithPermissionMode(mode string) Option {
-	return func(c *runConfig) { c.PermissionMode = mode }
-}
-
-func WithPromptTimeout(d time.Duration) Option {
-	return func(c *runConfig) { c.PromptTimeout = d }
-}
-
-type Agent interface {
-	Name() string
-	// Binary returns the CLI binary name (e.g. "claude", "gemini").
-	Binary() string
-	TraceAgent() string
-	PromptPattern() string
-	// TimeoutMultiplier returns a factor applied to per-test timeouts.
-	// Slower agents (e.g. Gemini) return values > 1.
-	TimeoutMultiplier() float64
-	RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error)
-	StartSession(ctx context.Context, dir string) (Session, error)
-	// Bootstrap performs one-time CI setup (auth config, warmup, etc.).
-	// Called before any tests run. Implementations should be idempotent.
-	Bootstrap() error
-	// IsTransientError returns true if the error from RunPrompt looks like
-	// a transient API failure (e.g. 500, rate limit, network error) that
-	// is worth retrying.
-	IsTransientError(out Output, err error) bool
-}
-
-type Session interface {
-	Send(input string) error
-	WaitFor(pattern string, timeout time.Duration) (string, error)
-	Capture() string
-	Close() error
-}
-
-// ExternalAgent is an optional interface for agents discovered via the
-// external agent protocol (trace-agent-* binaries). SetupRepo uses this
-// to pre-configure external_agents in settings before running `trace enable`.
-type ExternalAgent interface {
-	IsExternalAgent() bool
-}
-
-var (
-	registry []Agent
-	gates    = map[string]chan struct{}{}
-)
-
-func Register(a Agent) {
-	registry = append(registry, a)
-}
-
-// RegisterGate sets a concurrency limit for an agent's tests.
-// Tests call AcquireSlot/ReleaseSlot to respect this limit.
-// The limit can be overridden via E2E_CONCURRENT_TEST_LIMIT.
-func RegisterGate(name string, defaultMax int) {
-	max := defaultMax
-	if v, err := strconv.Atoi(os.Getenv("E2E_CONCURRENT_TEST_LIMIT")); err == nil && v > 0 {
-		max = v
-	}
-	gates[name] = make(chan struct{}, max)
-}
-
-// AcquireSlot blocks until a test slot is available for the agent or the
-// context is cancelled. Returns a non-nil error if the context expires
-// before a slot opens.
-func AcquireSlot(ctx context.Context, a Agent) error {
-	g, ok := gates[a.Name()]
-	if !ok {
-		return nil
-	}
-	select {
-	case g <- struct{}{}:
-		return nil
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-}
-
-// ReleaseSlot frees a test slot for the agent.
-func ReleaseSlot(a Agent) {
-	if g, ok := gates[a.Name()]; ok {
-		<-g
-	}
-}
-
-func All() []Agent {
-	return registry
-}
-
-// filterEnv returns env with entries matching any of the given variable names
-// removed. Used to strip test-only overrides (e.g. TRACE_TEST_TTY) from agent
-// processes so they exercise real detection paths.
-func filterEnv(env []string, names ...string) []string {
-	out := make([]string, 0, len(env))
-	for _, e := range env {
-		skip := false
-		for _, name := range names {
-			if strings.HasPrefix(e, name+"=") {
-				skip = true
-				break
-			}
-		}
-		if !skip {
-			out = append(out, e)
-		}
-	}
-	return out
-}
diff --git a/e2e/agents/claude.go b/e2e/agents/claude.go
deleted file mode 100644
index 08c7a7a..0000000
--- a/e2e/agents/claude.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package agents
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-)
-
-// cleanEnv returns os.Environ() with agent-incompatible variables removed.
-// It strips CLAUDECODE (so Claude Code doesn't refuse to start inside this
-// test runner) and TRACE_TEST_TTY (so agents exercise the real TTY detection
-// paths instead of the test override).
-func cleanEnv() []string {
-	var env []string
-	for _, e := range os.Environ() {
-		if strings.HasPrefix(e, "CLAUDECODE=") || strings.HasPrefix(e, "TRACE_TEST_TTY=") {
-			continue
-		}
-		env = append(env, e)
-	}
-	return env
-}
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "claude-code" {
-		return
-	}
-	Register(&Claude{})
-}
-
-type Claude struct{}
-
-func (c *Claude) Name() string               { return "claude-code" }
-func (c *Claude) Binary() string             { return "claude" }
-func (c *Claude) TraceAgent() string         { return "claude-code" }
-func (c *Claude) PromptPattern() string      { return `❯` }
-func (c *Claude) TimeoutMultiplier() float64 { return 1.0 }
-
-func (c *Claude) IsTransientError(out Output, _ error) bool {
-	transientPatterns := []string{
-		"overloaded",
-		"rate limit",
-		"529",
-		"503",
-		"ECONNRESET",
-		"ETIMEDOUT",
-	}
-	for _, p := range transientPatterns {
-		if strings.Contains(out.Stderr, p) {
-			return true
-		}
-	}
-	return false
-}
-
-func (c *Claude) Bootstrap() error {
-	// On CI, write a config file so Claude Code uses the API key from the
-	// environment instead of trying OAuth/Keychain.
-	if os.Getenv("CI") == "" {
-		return nil
-	}
-	apiKey := os.Getenv("ANTHROPIC_API_KEY")
-	if apiKey == "" {
-		return nil
-	}
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return fmt.Errorf("get home dir: %w", err)
-	}
-	dir := filepath.Join(home, ".claude")
-	if err := os.MkdirAll(dir, 0o755); err != nil {
-		return fmt.Errorf("mkdir %s: %w", dir, err)
-	}
-	config := fmt.Sprintf(`{"primaryApiKey":%q,"hasCompletedOnboarding":true}`, apiKey)
-	path := filepath.Join(dir, ".claude.json")
-	return os.WriteFile(path, []byte(config), 0o644)
-}
-
-func (c *Claude) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	cfg := &runConfig{Model: "haiku"}
-	for _, o := range opts {
-		o(cfg)
-	}
-
-	configDir, err := cleanConfigDir()
-	if err != nil {
-		return Output{}, fmt.Errorf("create clean config dir: %w", err)
-	}
-	defer func() { _ = os.RemoveAll(configDir) }()
-
-	env := append(
-		cleanEnv(),
-		"ACCESSIBLE=1",
-
-		// See https://code.claude.com/docs/en/settings - without this setting Claude was going off and
-		// trying to Git-clone its plugin marketplace, which meant calling git commands that could fail
-		// due to a user's exotic config (e.g. in paul's case, needing SSH-keychain access granted every
-		// time).  That's no good, so for the E2E tests, we tell Claude not to make calls to auto-update
-		// itself, clone its plugins, etc.
-		"CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1",
-		"CLAUDE_CONFIG_DIR="+configDir,
-	)
-
-	args := []string{"-p", prompt, "--model", cfg.Model, "--dangerously-skip-permissions"}
-	displayArgs := []string{"-p", fmt.Sprintf("%q", prompt), "--model", cfg.Model, "--dangerously-skip-permissions"}
-	cmd := exec.CommandContext(ctx, c.Binary(), args...)
-	cmd.Dir = dir
-	cmd.Stdin = nil
-	cmd.Env = env
-	setupProcessGroup(cmd)
-	cmd.WaitDelay = 5 * time.Second
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err = cmd.Run()
-	exitCode := 0
-	if err != nil {
-		exitErr := &exec.ExitError{}
-		if errors.As(err, &exitErr) {
-			exitCode = exitErr.ExitCode()
-		} else {
-			exitCode = -1
-		}
-	}
-
-	return Output{
-		Command:  c.Binary() + " " + strings.Join(displayArgs, " "),
-		Stdout:   stdout.String(),
-		Stderr:   stderr.String(),
-		ExitCode: exitCode,
-	}, err
-}
-
-func (c *Claude) StartSession(ctx context.Context, dir string) (Session, error) {
-	if runtime.GOOS == "windows" {
-		return nil, nil //nolint:nilnil // nil session signals "not supported" per Agent interface contract
-	}
-	name := fmt.Sprintf("claude-test-%d", time.Now().UnixNano())
-
-	configDir, err := cleanConfigDir()
-	if err != nil {
-		return nil, fmt.Errorf("create clean config dir: %w", err)
-	}
-
-	envArgs := []string{
-		"ACCESSIBLE=1",
-
-		// See https://code.claude.com/docs/en/settings - without this setting Claude was going off and
-		// trying to Git-clone its plugin marketplace, which meant calling git commands that could fail
-		// due to a user's exotic config (e.g. in paul's case, needing SSH-keychain access granted every
-		// time).  That's no good, so for the E2E tests, we tell Claude not to make calls to auto-update
-		// itself, clone its plugins, etc.
-		"CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1",
-		"CLAUDE_CONFIG_DIR=" + configDir,
-	}
-
-	args := append([]string{"env"}, envArgs...)
-	args = append(args, c.Binary(), "--dangerously-skip-permissions")
-	s, err := NewTmuxSession(name, dir, []string{"CLAUDECODE", "TRACE_TEST_TTY"}, args[0], args[1:]...)
-	if err != nil {
-		_ = os.RemoveAll(configDir)
-		return nil, err
-	}
-	s.OnClose(func() { _ = os.RemoveAll(configDir) })
-
-	// Dismiss startup dialogs until we reach the input prompt.
-	for range 5 {
-		content, err := s.WaitFor(`❯`, 15*time.Second)
-		if err != nil {
-			_ = s.Close()
-			return nil, fmt.Errorf("waiting for startup prompt: %w", err)
-		}
-		if !strings.Contains(content, "Enter to confirm") {
-			break
-		}
-		// The bypass permissions dialog defaults to "No, exit" —
-		// arrow down to "Yes, I accept" before confirming.
-		if strings.Contains(content, "Yes, I accept") {
-			_ = s.SendKeys("Down")
-			time.Sleep(200 * time.Millisecond)
-		}
-		_ = s.SendKeys("Enter")
-		time.Sleep(500 * time.Millisecond)
-	}
-	s.stableAtSend = ""
-
-	return s, nil
-}
-
-// cleanConfigDir creates an isolated temp directory for CLAUDE_CONFIG_DIR so
-// that E2E test runs don't inherit any user settings (CLAUDE.md, skills,
-// projects, plugins, etc.).
-func cleanConfigDir() (string, error) {
-	dst, err := os.MkdirTemp("", "claude-config-*")
-	if err != nil {
-		return "", err
-	}
-
-	if os.Getenv("CI") != "" {
-		if home, err := os.UserHomeDir(); err == nil {
-			src := filepath.Join(home, ".claude", ".claude.json")
-			if _, err := os.Stat(src); err == nil {
-				_ = linkFile(src, filepath.Join(dst, ".claude.json"))
-			}
-		}
-	} else {
-		_ = os.WriteFile(filepath.Join(dst, ".claude.json"),
-			[]byte(`{"hasCompletedOnboarding":true}`), 0o644)
-	}
-
-	return dst, nil
-}
diff --git a/e2e/agents/codex.go b/e2e/agents/codex.go
deleted file mode 100644
index 2345c81..0000000
--- a/e2e/agents/codex.go
+++ /dev/null
@@ -1,283 +0,0 @@
-package agents
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "codex" {
-		return
-	}
-	Register(&Codex{})
-	RegisterGate("codex", 2)
-}
-
-// Codex implements the E2E Agent interface for OpenAI's Codex CLI.
-type Codex struct{}
-
-type CodexSession struct {
-	*TmuxSession
-
-	home string
-}
-
-func (s *CodexSession) Home() string { return s.home }
-
-func (c *Codex) Name() string               { return "codex" }
-func (c *Codex) Binary() string             { return "codex" }
-func (c *Codex) TraceAgent() string         { return "codex" }
-func (c *Codex) PromptPattern() string      { return `›` }
-func (c *Codex) TimeoutMultiplier() float64 { return 1.5 }
-
-func (c *Codex) Bootstrap() error {
-	if os.Getenv("CI") != "" && os.Getenv("OPENAI_API_KEY") == "" {
-		return errors.New("OPENAI_API_KEY must be set on CI for Codex E2E tests")
-	}
-	return nil
-}
-
-func (c *Codex) IsTransientError(out Output, err error) bool {
-	if err == nil {
-		return false
-	}
-	if errors.Is(err, context.DeadlineExceeded) {
-		return true
-	}
-	combined := out.Stdout + out.Stderr
-	for _, p := range []string{"overloaded", "rate limit", "rate_limit", "503", "529", "ECONNRESET", "ETIMEDOUT"} {
-		if strings.Contains(combined, p) {
-			return true
-		}
-	}
-	return false
-}
-
-// codexHome creates an isolated CODEX_HOME for a test run.
-// Auth still works via OPENAI_API_KEY env var or symlinked auth.json.
-//
-// The directory lives under the user's home (not the system temp dir) because
-// recent Codex versions refuse to install PATH helper binaries when CODEX_HOME
-// sits under /tmp, which breaks subsequent tool calls.
-func codexHome() (string, func(), error) {
-	cache, err := os.UserCacheDir()
-	if err != nil {
-		return "", nil, fmt.Errorf("resolve user cache dir: %w", err)
-	}
-	base := filepath.Join(cache, "trace-e2e")
-	if err := os.MkdirAll(base, 0o755); err != nil {
-		return "", nil, fmt.Errorf("create codex home base %q: %w", base, err)
-	}
-	dir, err := os.MkdirTemp(base, "codex-home-*")
-	if err != nil {
-		return "", nil, fmt.Errorf("create temporary codex home under %q: %w", base, err)
-	}
-	return dir, func() { _ = os.RemoveAll(dir) }, nil
-}
-
-func (c *Codex) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	cfg := &runConfig{}
-	for _, o := range opts {
-		o(cfg)
-	}
-
-	timeout := 60 * time.Second
-	if cfg.PromptTimeout > 0 {
-		timeout = cfg.PromptTimeout
-	}
-	promptCtx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
-	home, cleanup, err := codexHome()
-	if err != nil {
-		return Output{}, fmt.Errorf("create codex home: %w", err)
-	}
-	defer cleanup()
-
-	absDir, err := filepath.Abs(dir)
-	if err != nil {
-		absDir = dir
-	}
-	if err := seedCodexHome(home, absDir); err != nil {
-		return Output{}, fmt.Errorf("seed codex home: %w", err)
-	}
-
-	args := []string{"exec", "--dangerously-bypass-approvals-and-sandbox"}
-	if cfg.Model != "" {
-		args = append(args, "-m", cfg.Model)
-	}
-	args = append(args, prompt)
-
-	env := append(
-		filterEnv(os.Environ(), "TRACE_TEST_TTY", "CODEX_HOME"),
-		"CODEX_HOME="+home,
-	)
-
-	cmd := exec.CommandContext(promptCtx, c.Binary(), args...)
-	cmd.Dir = dir
-	cmd.Stdin = nil
-	cmd.Env = env
-	setupProcessGroup(cmd)
-	cmd.WaitDelay = 5 * time.Second
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err = cmd.Run()
-	exitCode := 0
-	if err != nil {
-		exitErr := &exec.ExitError{}
-		if errors.As(err, &exitErr) {
-			exitCode = exitErr.ExitCode()
-		} else {
-			exitCode = -1
-		}
-		if promptCtx.Err() == context.DeadlineExceeded {
-			err = fmt.Errorf("%w: %w", err, context.DeadlineExceeded)
-		}
-	}
-
-	return Output{
-		Command:  c.Binary() + " " + strings.Join(args[:len(args)-1], " ") + " " + fmt.Sprintf("%q", prompt),
-		Stdout:   stdout.String(),
-		Stderr:   stderr.String(),
-		ExitCode: exitCode,
-	}, err
-}
-
-func (c *Codex) StartSession(ctx context.Context, dir string) (Session, error) {
-	name := fmt.Sprintf("codex-test-%d", time.Now().UnixNano())
-
-	home, cleanup, err := codexHome()
-	if err != nil {
-		return nil, fmt.Errorf("create codex home: %w", err)
-	}
-
-	absDir, err := filepath.Abs(dir)
-	if err != nil {
-		absDir = dir
-	}
-	if err := seedCodexHome(home, absDir); err != nil {
-		cleanup()
-		return nil, fmt.Errorf("seed codex home: %w", err)
-	}
-
-	s, err := c.startTmuxSession(name, dir, home, "codex", "--dangerously-bypass-approvals-and-sandbox")
-	if err != nil {
-		cleanup()
-		return nil, err
-	}
-	s.OnClose(cleanup)
-
-	// Dismiss startup dialogs (model upgrade prompts, etc.) until we reach
-	// the input prompt. Similar to Claude's startup dialog handling.
-	for range 5 {
-		content, waitErr := s.WaitFor(c.PromptPattern(), 15*time.Second)
-		if waitErr != nil {
-			_ = s.Close()
-			return nil, fmt.Errorf("waiting for codex prompt: %w", waitErr)
-		}
-		if !strings.Contains(content, "press enter to confirm") &&
-			!strings.Contains(content, "Use ↑/↓ to move") {
-			break
-		}
-		_ = s.SendKeys("Enter")
-		time.Sleep(500 * time.Millisecond)
-	}
-
-	return &CodexSession{TmuxSession: s, home: home}, nil
-}
-
-func (c *Codex) ResumeSession(ctx context.Context, dir, home, sessionID string) (Session, error) {
-	_ = ctx
-	name := fmt.Sprintf("codex-resume-%d", time.Now().UnixNano())
-
-	s, err := c.startTmuxSession(name, dir, home, "codex", "--dangerously-bypass-approvals-and-sandbox", "resume", sessionID)
-	if err != nil {
-		return nil, err
-	}
-
-	// Dismiss any startup prompts until the input prompt appears.
-	for range 5 {
-		content, waitErr := s.WaitFor(c.PromptPattern(), 15*time.Second)
-		if waitErr != nil {
-			_ = s.Close()
-			return nil, fmt.Errorf("waiting for codex resumed prompt: %w", waitErr)
-		}
-		if !strings.Contains(content, "press enter to confirm") &&
-			!strings.Contains(content, "Use ↑/↓ to move") {
-			break
-		}
-		_ = s.SendKeys("Enter")
-		time.Sleep(500 * time.Millisecond)
-	}
-
-	return &CodexSession{TmuxSession: s, home: home}, nil
-}
-
-func (c *Codex) startTmuxSession(name, dir, home string, args ...string) (*TmuxSession, error) {
-	tmuxArgs := append([]string{"CODEX_HOME=" + home, "HOME=" + os.Getenv("HOME"), "TERM=" + os.Getenv("TERM")}, args...)
-	return NewTmuxSession(name, dir, []string{"CODEX_HOME", "TRACE_TEST_TTY"}, "env", tmuxArgs...)
-}
-
-// seedCodexHome writes trust + feature flag config and links auth credentials
-// so Codex loads the project's .codex/ layer and can authenticate.
-func seedCodexHome(home, projectDir string) error {
-	if err := os.MkdirAll(home, 0o750); err != nil {
-		return err
-	}
-
-	// Write config with trust, feature flag, and pinned model to skip upgrade dialogs.
-	model := os.Getenv("E2E_CODEX_MODEL")
-	if model == "" {
-		model = "gpt-5.4"
-	}
-	config := fmt.Sprintf("model = %q\n\n[features]\ncodex_hooks = true\n\n[projects.%q]\ntrust_level = \"trusted\"\n", model, projectDir)
-	if err := os.WriteFile(filepath.Join(home, "config.toml"), []byte(config), 0o600); err != nil {
-		return err
-	}
-
-	if apiKey := os.Getenv("OPENAI_API_KEY"); apiKey != "" {
-		return writeCodexAPIKeyAuth(home, apiKey)
-	}
-
-	// Symlink auth.json from the real ~/.codex/ so API credentials are available.
-	if realHome, err := os.UserHomeDir(); err == nil {
-		src := filepath.Join(realHome, ".codex", "auth.json")
-		if _, err := os.Stat(src); err == nil {
-			_ = os.Symlink(src, filepath.Join(home, "auth.json"))
-		}
-	}
-
-	return nil
-}
-
-func writeCodexAPIKeyAuth(home, apiKey string) error {
-	auth := struct {
-		AuthMode     string `json:"auth_mode"`
-		OpenAIAPIKey string `json:"OPENAI_API_KEY"`
-	}{
-		AuthMode:     "apikey",
-		OpenAIAPIKey: apiKey,
-	}
-
-	data, err := json.MarshalIndent(auth, "", "  ")
-	if err != nil {
-		return fmt.Errorf("marshal codex auth: %w", err)
-	}
-	data = append(data, '\n')
-
-	if err := os.WriteFile(filepath.Join(home, "auth.json"), data, 0o600); err != nil {
-		return fmt.Errorf("write codex auth: %w", err)
-	}
-
-	return nil
-}
diff --git a/e2e/agents/codex_test.go b/e2e/agents/codex_test.go
deleted file mode 100644
index 62a7a20..0000000
--- a/e2e/agents/codex_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package agents
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestSeedCodexHome_WritesAPIKeyAuth(t *testing.T) {
-	home := t.TempDir()
-	projectDir := filepath.Join(t.TempDir(), "repo")
-	t.Setenv("OPENAI_API_KEY", "sk-test-key")
-	t.Setenv("E2E_CODEX_MODEL", "gpt-5.4")
-
-	if err := os.MkdirAll(projectDir, 0o750); err != nil {
-		t.Fatalf("mkdir project dir: %v", err)
-	}
-
-	if err := seedCodexHome(home, projectDir); err != nil {
-		t.Fatalf("seedCodexHome: %v", err)
-	}
-
-	data, err := os.ReadFile(filepath.Join(home, "auth.json"))
-	if err != nil {
-		t.Fatalf("read auth.json: %v", err)
-	}
-
-	var auth struct {
-		AuthMode     string `json:"auth_mode"`
-		OpenAIAPIKey string `json:"OPENAI_API_KEY"`
-	}
-	if err := json.Unmarshal(data, &auth); err != nil {
-		t.Fatalf("unmarshal auth.json: %v", err)
-	}
-
-	if auth.AuthMode != "apikey" {
-		t.Fatalf("auth_mode = %q, want %q", auth.AuthMode, "apikey")
-	}
-	if auth.OpenAIAPIKey != "sk-test-key" {
-		t.Fatalf("OPENAI_API_KEY = %q, want %q", auth.OpenAIAPIKey, "sk-test-key")
-	}
-}
diff --git a/e2e/agents/codex_trust.go b/e2e/agents/codex_trust.go
deleted file mode 100644
index 49aa5fe..0000000
--- a/e2e/agents/codex_trust.go
+++ /dev/null
@@ -1,226 +0,0 @@
-package agents
-
-import (
-	"bytes"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// codexHookFile mirrors the on-disk shape of .codex/hooks.json. Field types
-// match Codex's serde definitions (codex-rs/config/src/hook_config.rs) so the
-// trust-hash computation below stays faithful to discover_handlers.
-type codexHookFile struct {
-	Hooks codexHookEvents `json:"hooks"`
-}
-
-type codexHookEvents struct {
-	PreToolUse        []codexHookGroup `json:"PreToolUse"`
-	PermissionRequest []codexHookGroup `json:"PermissionRequest"`
-	PostToolUse       []codexHookGroup `json:"PostToolUse"`
-	PreCompact        []codexHookGroup `json:"PreCompact"`
-	PostCompact       []codexHookGroup `json:"PostCompact"`
-	SessionStart      []codexHookGroup `json:"SessionStart"`
-	UserPromptSubmit  []codexHookGroup `json:"UserPromptSubmit"`
-	Stop              []codexHookGroup `json:"Stop"`
-}
-
-type codexHookGroup struct {
-	Matcher *string             `json:"matcher"`
-	Hooks   []codexHookHandlers `json:"hooks"`
-}
-
-type codexHookHandlers struct {
-	Type          string  `json:"type"`
-	Command       string  `json:"command"`
-	Timeout       *uint64 `json:"timeout"`
-	Async         bool    `json:"async"`
-	StatusMessage *string `json:"statusMessage"`
-}
-
-// codexHookEventLabels lists every event name in the order Codex emits in
-// the JSON schema, paired with the snake_case label it uses for trust state
-// keys (codex-rs/hooks/src/lib.rs:hook_event_key_label).
-var codexHookEventLabels = []struct {
-	displayName string
-	keyLabel    string
-}{
-	{"PreToolUse", "pre_tool_use"},
-	{"PermissionRequest", "permission_request"},
-	{"PostToolUse", "post_tool_use"},
-	{"PreCompact", "pre_compact"},
-	{"PostCompact", "post_compact"},
-	{"SessionStart", "session_start"},
-	{"UserPromptSubmit", "user_prompt_submit"},
-	{"Stop", "stop"},
-}
-
-// codexHookTrustState reads .codex/hooks.json from projectDir and returns the
-// `[hooks.state.<key>]` TOML block that pre-trusts every command handler
-// declared there. The hash matches Codex's command_hook_hash exactly (see
-// codex-rs/hooks/src/engine/discovery.rs and config/src/fingerprint.rs):
-//
-//  1. Build a NormalizedHookIdentity = { event_name, matcher, hooks: [normalized_handler] }
-//  2. Serialize to JSON with object keys sorted alphabetically (canonical_json)
-//  3. SHA-256 the compact JSON bytes; format as "sha256:<hex>"
-//
-// Returns empty string when no hooks file exists.
-func codexHookTrustState(projectDir string) (string, error) {
-	hooksPath := filepath.Join(projectDir, ".codex", "hooks.json")
-	data, err := os.ReadFile(hooksPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return "", nil
-		}
-		return "", err
-	}
-
-	var file codexHookFile
-	if err := json.Unmarshal(data, &file); err != nil {
-		return "", fmt.Errorf("parse hooks.json: %w", err)
-	}
-
-	var sb strings.Builder
-	for _, ev := range codexHookEventLabels {
-		groups := codexEventGroups(&file.Hooks, ev.displayName)
-		for groupIdx, group := range groups {
-			for handlerIdx, handler := range group.Hooks {
-				if handler.Type != "command" {
-					continue
-				}
-				timeoutSec := uint64(600)
-				if handler.Timeout != nil {
-					timeoutSec = *handler.Timeout
-				}
-				if timeoutSec < 1 {
-					timeoutSec = 1
-				}
-				hash := codexCommandHookHash(ev.keyLabel, group.Matcher, handler.Command, timeoutSec, handler.Async, handler.StatusMessage)
-				key := fmt.Sprintf("%s:%s:%d:%d", hooksPath, ev.keyLabel, groupIdx, handlerIdx)
-				fmt.Fprintf(&sb, "[hooks.state.%q]\ntrusted_hash = %q\n\n", key, hash)
-			}
-		}
-	}
-	return sb.String(), nil
-}
-
-func codexEventGroups(events *codexHookEvents, displayName string) []codexHookGroup {
-	switch displayName {
-	case "PreToolUse":
-		return events.PreToolUse
-	case "PermissionRequest":
-		return events.PermissionRequest
-	case "PostToolUse":
-		return events.PostToolUse
-	case "PreCompact":
-		return events.PreCompact
-	case "PostCompact":
-		return events.PostCompact
-	case "SessionStart":
-		return events.SessionStart
-	case "UserPromptSubmit":
-		return events.UserPromptSubmit
-	case "Stop":
-		return events.Stop
-	}
-	return nil
-}
-
-// codexCommandHookHash mirrors command_hook_hash + version_for_toml. Codex
-// builds a TOML value of NormalizedHookIdentity then serde_json::to_value
-// converts it to JSON; we skip the TOML round-trip and emit the equivalent
-// JSON directly. Crucially:
-//   - matcher is omitted when nil (TOML can't represent null Options)
-//   - timeout is always present (the normalized handler always sets Some(_))
-//   - statusMessage is omitted when nil
-//   - object keys are sorted alphabetically by canonicalize before hashing
-func codexCommandHookHash(eventLabel string, matcher *string, command string, timeoutSec uint64, async bool, statusMessage *string) string {
-	handler := map[string]any{
-		"type":    "command",
-		"command": command,
-		"timeout": json.Number(strconv.FormatUint(timeoutSec, 10)),
-		"async":   async,
-	}
-	if statusMessage != nil {
-		handler["statusMessage"] = *statusMessage
-	}
-	identity := map[string]any{
-		"event_name": eventLabel,
-		"hooks":      []any{handler},
-	}
-	if matcher != nil {
-		identity["matcher"] = *matcher
-	}
-
-	canonical := codexCanonicalJSON(identity)
-	sum := sha256.Sum256(canonical)
-	return "sha256:" + hex.EncodeToString(sum[:])
-}
-
-// codexCanonicalJSON marshals v with object keys sorted alphabetically, no
-// whitespace. Go's encoding/json already sorts map[string]any keys, but we
-// re-walk explicitly to make the contract obvious and to keep the output
-// stable if a future stdlib change reorders.
-func codexCanonicalJSON(v any) []byte {
-	var buf strings.Builder
-	codexWriteCanonical(&buf, v)
-	return []byte(buf.String())
-}
-
-func codexWriteCanonical(buf *strings.Builder, v any) {
-	switch t := v.(type) {
-	case map[string]any:
-		keys := make([]string, 0, len(t))
-		for k := range t {
-			keys = append(keys, k)
-		}
-		sort.Strings(keys)
-		buf.WriteByte('{')
-		for i, k := range keys {
-			if i > 0 {
-				buf.WriteByte(',')
-			}
-			buf.Write(codexJSONAtom(k))
-			buf.WriteByte(':')
-			codexWriteCanonical(buf, t[k])
-		}
-		buf.WriteByte('}')
-	case []any:
-		buf.WriteByte('[')
-		for i, item := range t {
-			if i > 0 {
-				buf.WriteByte(',')
-			}
-			codexWriteCanonical(buf, item)
-		}
-		buf.WriteByte(']')
-	default:
-		buf.Write(codexJSONAtom(t))
-	}
-}
-
-// codexJSONAtom marshals a scalar matching serde_json's default escaping
-// rules: only the JSON-required characters (", \, control chars) are
-// escaped — `<`, `>`, `&` pass through unchanged. Go's default json.Marshal
-// HTML-escapes those bytes to \u00XX, which would diverge from Codex's
-// hash for any command containing shell redirection (>, &&, etc.).
-func codexJSONAtom(v any) []byte {
-	var b bytes.Buffer
-	enc := json.NewEncoder(&b)
-	enc.SetEscapeHTML(false)
-	// Callers pass strings, bools, and json.Number atoms only; encoding
-	// can't fail for those types. Ignore the error rather than complicating
-	// every call site for a static guarantee.
-	_ = enc.Encode(v) //nolint:errchkjson // scalar atoms only; error is unreachable
-	out := b.Bytes()
-	if n := len(out); n > 0 && out[n-1] == '\n' {
-		out = out[:n-1]
-	}
-	return out
-}
diff --git a/e2e/agents/codex_trust_test.go b/e2e/agents/codex_trust_test.go
deleted file mode 100644
index 56037df..0000000
--- a/e2e/agents/codex_trust_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package agents
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-// TestCodexCommandHookHash_MatchesCanonicalShape verifies the canonical
-// JSON the hash is computed over, against a hand-built reference string.
-// Pinning the byte-exact JSON catches drift in canonicalization (key
-// sort, omit-when-nil rules, HTML-escape behavior, integer rendering)
-// before it silently breaks pre-trust in e2e.
-func TestCodexCommandHookHash_MatchesCanonicalShape(t *testing.T) {
-	t.Parallel()
-	// Reference canonical JSON for: post_tool_use, no matcher, single
-	// command handler with timeout=30, async=false, no statusMessage.
-	// Keys MUST be alphabetical; matcher and statusMessage MUST be absent.
-	// shell-redirect characters (>) MUST NOT be HTML-escaped — Codex's
-	// serde_json::to_vec passes them through unchanged.
-	const wantCanonical = `{"event_name":"post_tool_use","hooks":[{"async":false,"command":"sh -c 'if ! command -v entire >/dev/null 2>&1; then exit 0; fi; exec trace hooks codex post-tool-use'","timeout":30,"type":"command"}]}`
-	sum := sha256.Sum256([]byte(wantCanonical))
-	wantHash := "sha256:" + hex.EncodeToString(sum[:])
-
-	got := codexCommandHookHash(
-		"post_tool_use",
-		nil, // no matcher
-		`sh -c 'if ! command -v entire >/dev/null 2>&1; then exit 0; fi; exec trace hooks codex post-tool-use'`,
-		30,
-		false,
-		nil, // no statusMessage
-	)
-	require.Equal(t, wantHash, got)
-}
-
-// TestCodexCommandHookHash_OmitsNilOptions confirms that nil matcher and
-// nil statusMessage are absent from the canonical JSON — Codex's TOML
-// round-trip drops Option::None, and any divergence would produce a
-// different hash than what discover_handlers computes at runtime.
-func TestCodexCommandHookHash_OmitsNilOptions(t *testing.T) {
-	t.Parallel()
-	const wantCanonical = `{"event_name":"stop","hooks":[{"async":false,"command":"echo hi","timeout":600,"type":"command"}]}`
-	sum := sha256.Sum256([]byte(wantCanonical))
-	wantHash := "sha256:" + hex.EncodeToString(sum[:])
-
-	got := codexCommandHookHash("stop", nil, "echo hi", 600, false, nil)
-	require.Equal(t, wantHash, got)
-}
-
-// TestCodexHookTrustState_GeneratesEntriesForEveryDeclaredHandler
-// exercises the full path: read .codex/hooks.json, walk every event in
-// Codex's declared order, emit a [hooks.state."<path>:<event>:0:0"] block
-// per command handler with the matching trusted_hash.
-func TestCodexHookTrustState_GeneratesEntriesForEveryDeclaredHandler(t *testing.T) {
-	t.Parallel()
-	dir := t.TempDir()
-	codexDir := filepath.Join(dir, ".codex")
-	require.NoError(t, os.MkdirAll(codexDir, 0o750))
-
-	hooksJSON := `{
-  "hooks": {
-    "SessionStart": [
-      {"matcher": null, "hooks": [{"type": "command", "command": "trace hooks codex session-start", "timeout": 30}]}
-    ],
-    "Stop": [
-      {"matcher": null, "hooks": [{"type": "command", "command": "trace hooks codex stop", "timeout": 30}]}
-    ]
-  }
-}
-`
-	hooksPath := filepath.Join(codexDir, "hooks.json")
-	require.NoError(t, os.WriteFile(hooksPath, []byte(hooksJSON), 0o600))
-
-	state, err := codexHookTrustState(dir)
-	require.NoError(t, err)
-	require.Contains(t, state, hooksPath+":session_start:0:0")
-	require.Contains(t, state, hooksPath+":stop:0:0")
-	require.Contains(t, state, "trusted_hash = \"sha256:")
-	// Two declared handlers → two state entries.
-	require.Equal(t, 2, strings.Count(state, "[hooks.state."))
-	require.Equal(t, 2, strings.Count(state, "trusted_hash ="))
-}
-
-// TestCodexHookTrustState_MissingFileIsNoop returns empty trust state
-// (and no error) when there's no hooks.json yet — the e2e seed runs
-// before some tests' enable step.
-func TestCodexHookTrustState_MissingFileIsNoop(t *testing.T) {
-	t.Parallel()
-	dir := t.TempDir()
-	state, err := codexHookTrustState(dir)
-	require.NoError(t, err)
-	require.Empty(t, state)
-}
diff --git a/e2e/agents/copilot-cli.go b/e2e/agents/copilot-cli.go
deleted file mode 100644
index 1e48e08..0000000
--- a/e2e/agents/copilot-cli.go
+++ /dev/null
@@ -1,337 +0,0 @@
-package agents
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-)
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "copilot-cli" {
-		return
-	}
-	Register(&CopilotCLI{})
-	RegisterGate("copilot-cli", 4)
-}
-
-type CopilotCLI struct{}
-
-func (c *CopilotCLI) Name() string               { return "copilot-cli" }
-func (c *CopilotCLI) Binary() string             { return "copilot" }
-func (c *CopilotCLI) TraceAgent() string         { return "copilot-cli" }
-func (c *CopilotCLI) PromptPattern() string      { return `❯` }
-func (c *CopilotCLI) TimeoutMultiplier() float64 { return 1.5 }
-
-func (c *CopilotCLI) IsTransientError(out Output, err error) bool {
-	if errors.Is(err, context.DeadlineExceeded) {
-		return true
-	}
-	combined := out.Stdout + out.Stderr
-	for _, p := range []string{
-		"overloaded",
-		"rate limit",
-		"503",
-		"529",
-		"ECONNRESET",
-		"ETIMEDOUT",
-		"Too Many Requests",
-		// Copilot sometimes calls its Edit tool without old_str,
-		// resulting in zero code changes despite a successful exit.
-		"old_str is required",
-	} {
-		if strings.Contains(combined, p) {
-			return true
-		}
-	}
-	return false
-}
-
-func (c *CopilotCLI) Bootstrap() error {
-	// Copilot CLI uses GitHub authentication (gh auth or GITHUB_TOKEN).
-	// No additional bootstrap needed — auth should be pre-configured.
-	return nil
-}
-
-func (c *CopilotCLI) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	cfg := &runConfig{Model: "claude-haiku-4.5"}
-	for _, o := range opts {
-		o(cfg)
-	}
-
-	timeout := 60 * time.Second
-	if cfg.PromptTimeout > 0 {
-		timeout = cfg.PromptTimeout
-	}
-	promptCtx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
-	args := []string{"-p", prompt, "--model", cfg.Model, "--allow-all"}
-	displayArgs := []string{"-p", fmt.Sprintf("%q", prompt), "--model", cfg.Model, "--allow-all"}
-	cmd := exec.CommandContext(promptCtx, c.Binary(), args...)
-	cmd.Dir = dir
-	cmd.Stdin = nil
-	cmd.Env = append(os.Environ(), "TRACE_TEST_TTY=0")
-	setupProcessGroup(cmd)
-	cmd.WaitDelay = 5 * time.Second
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	exitCode := 0
-	if err != nil {
-		exitErr := &exec.ExitError{}
-		if errors.As(err, &exitErr) {
-			exitCode = exitErr.ExitCode()
-		} else {
-			exitCode = -1
-		}
-		if promptCtx.Err() == context.DeadlineExceeded {
-			err = fmt.Errorf("%w: %w", err, context.DeadlineExceeded)
-		}
-	}
-
-	out := Output{
-		Command:  c.Binary() + " " + strings.Join(displayArgs, " "),
-		Stdout:   stdout.String(),
-		Stderr:   stderr.String(),
-		ExitCode: exitCode,
-	}
-
-	// Copilot sometimes calls its Edit tool without required parameters,
-	// producing zero code changes despite exit 0. Surface this as an error so
-	// the transient-error retry mechanism can restart the scenario.
-	// Only trigger when copilot reports zero changes — it may retry internally.
-	if err == nil && strings.Contains(out.Stdout, "old_str is required") &&
-		strings.Contains(out.Stderr, "Total code changes:     +0 -0") {
-		err = errors.New("copilot Edit tool failed: old_str is required")
-	}
-
-	return out, err
-}
-
-// CopilotSession wraps TmuxSession to handle Copilot CLI's dual input modes.
-// Copilot CLI can be in "Chat" mode (Enter submits) or "Edit" mode (Ctrl+S
-// submits). After completing a prompt, copilot may return to either mode
-// non-deterministically. This wrapper detects Edit mode after sending Enter
-// and falls back to Ctrl+S if needed.
-type CopilotSession struct {
-	*TmuxSession
-}
-
-func (cs *CopilotSession) Send(input string) error {
-	if err := cs.clearInputLine(); err != nil {
-		return err
-	}
-
-	preSend := stableContent(cs.Capture())
-
-	if err := cs.sendOnce(input, preSend); err != nil {
-		return err
-	}
-
-	// Copilot CLI's autocomplete can non-deterministically trigger during
-	// text input (e.g. a "/" in "docs/red.md" opens the slash-command menu).
-	// If detected, dismiss with Escape, clear the input, and retry once.
-	time.Sleep(300 * time.Millisecond)
-	if isAutocompleteMenu(cs.Capture()) {
-		if err := cs.dismissAutocompleteAndClear(); err != nil {
-			return err
-		}
-		if err := cs.sendOnce(input, stableContent(cs.Capture())); err != nil {
-			return err
-		}
-	}
-
-	// Copilot can leave behind a stray slash-command invocation between turns.
-	// Only retry if that error appeared in output produced by this submission,
-	// not merely somewhere in pane scrollback from an earlier turn.
-	if content := cs.Capture(); appearedInNewOutput(preSend, content, "Unknown command: /") {
-		if err := cs.clearInputLine(); err != nil {
-			return err
-		}
-		if err := cs.sendOnce(input, stableContent(cs.Capture())); err != nil {
-			return err
-		}
-	}
-
-	// Wait for the terminal to reflect the echoed input, then snapshot.
-	deadline := time.Now().Add(5 * time.Second)
-	for time.Now().Before(deadline) {
-		time.Sleep(200 * time.Millisecond)
-		current := stableContent(cs.Capture())
-		if current != preSend {
-			cs.stableAtSend = current
-			return nil
-		}
-	}
-	cs.stableAtSend = stableContent(cs.Capture())
-	return nil
-}
-
-// clearInputLine removes any partially typed prompt text without sending other
-// UI navigation keys. In Copilot CLI, Escape can trigger undo/snapshot actions,
-// so routine pre-send cleanup must avoid it.
-func (cs *CopilotSession) clearInputLine() error {
-	if err := cs.SendKeys("C-u"); err != nil {
-		return err
-	}
-	time.Sleep(200 * time.Millisecond)
-	return nil
-}
-
-// dismissAutocompleteAndClear closes the slash-command autocomplete dropdown
-// and then clears the input line before retrying the prompt.
-func (cs *CopilotSession) dismissAutocompleteAndClear() error {
-	if err := cs.SendKeys("Escape"); err != nil {
-		return err
-	}
-	time.Sleep(200 * time.Millisecond)
-	return cs.clearInputLine()
-}
-
-// appearedInNewOutput reports whether pattern is present in content that was
-// added after the pre-send snapshot. This avoids retriggering on old pane
-// scrollback from previous turns.
-func appearedInNewOutput(before string, after string, pattern string) bool {
-	if after == before {
-		return false
-	}
-	if strings.HasPrefix(after, before) {
-		return strings.Contains(after[len(before):], pattern)
-	}
-
-	// If tmux capture lost a clean prefix relationship due to scrollback churn,
-	// fall back to checking only the most recent lines.
-	lines := strings.Split(after, "\n")
-	start := max(0, len(lines)-12)
-	return strings.Contains(strings.Join(lines[start:], "\n"), pattern)
-}
-
-// sendOnce types the input text, sends Enter, and handles Edit mode fallback.
-func (cs *CopilotSession) sendOnce(input string, preSend string) error {
-	// Use -l (literal) flag to prevent tmux from interpreting characters
-	// in the prompt text as special key names.
-	args := []string{"send-keys", "-l", "-t", cs.name, input}
-	cmd := exec.Command("tmux", args...)
-	if out, err := cmd.CombinedOutput(); err != nil {
-		return fmt.Errorf("tmux send-keys -l: %w\n%s", err, out)
-	}
-	time.Sleep(200 * time.Millisecond)
-	if err := cs.SendKeys("Enter"); err != nil {
-		return err
-	}
-
-	// Briefly poll to see if copilot is still in Edit mode (Enter didn't submit).
-	// In Edit mode the status bar shows "ctrl+s run command". If detected,
-	// send Ctrl+S to actually submit the prompt. Break early if the content
-	// changes from the pre-send snapshot, indicating submission has started.
-	editDeadline := time.Now().Add(500 * time.Millisecond)
-	for time.Now().Before(editDeadline) {
-		content := cs.Capture()
-		if isEditMode(content) {
-			if err := cs.SendKeys("C-s"); err != nil {
-				return err
-			}
-			break
-		}
-		if stableContent(content) != preSend {
-			break
-		}
-		time.Sleep(50 * time.Millisecond)
-	}
-	return nil
-}
-
-// isEditMode checks if copilot-cli is in Edit mode by looking for the
-// "ctrl+s run command" indicator in the last few lines (status bar area).
-// Restricting the search avoids false positives if the phrase appears in
-// agent output.
-func isEditMode(content string) bool {
-	lines := strings.Split(content, "\n")
-	const statusPhrase = "ctrl+s run command"
-	for i := len(lines) - 1; i >= 0 && i >= len(lines)-3; i-- {
-		if strings.Contains(lines[i], statusPhrase) {
-			return true
-		}
-	}
-	return false
-}
-
-// isAutocompleteMenu detects copilot's slash-command autocomplete dropdown.
-// When triggered, copilot shows a list of commands starting with "▋  /"
-// below the input line, preventing prompt submission.
-func isAutocompleteMenu(content string) bool {
-	lines := strings.Split(content, "\n")
-	matches := 0
-	for _, line := range lines {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "▋") && strings.Contains(trimmed, "/") {
-			matches++
-			if matches >= 2 {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-func (c *CopilotCLI) StartSession(ctx context.Context, dir string) (Session, error) {
-	bin, err := exec.LookPath(c.Binary())
-	if err != nil {
-		return nil, fmt.Errorf("agent binary not found: %w", err)
-	}
-
-	// Forward auth-related env vars into the tmux session. tmux starts a new
-	// shell that doesn't inherit Go's os.Environ(), so without this the
-	// session can lose both token-based auth and local gh/copilot login state.
-	var envArgs []string
-	for _, key := range []string{"COPILOT_GITHUB_TOKEN", "HOME", "TERM", "XDG_CONFIG_HOME", "GH_CONFIG_DIR"} {
-		if v := os.Getenv(key); v != "" {
-			envArgs = append(envArgs, key+"="+v)
-		}
-	}
-	args := append([]string{"env"}, envArgs...)
-	args = append(args, bin, "--model", "claude-haiku-4.5", "--allow-all")
-
-	name := fmt.Sprintf("copilot-test-%d", time.Now().UnixNano())
-	// Strip CI env vars that may affect interactive mode.
-	unset := []string{"CI", "GITHUB_ACTIONS", "TRACE_TEST_TTY"}
-	s, err := NewTmuxSession(name, dir, unset, args[0], args[1:]...)
-	if err != nil {
-		return nil, err
-	}
-
-	// Dismiss startup dialogs (folder trust, etc.) then wait for the "❯" prompt.
-	// Copilot CLI shows a "Confirm folder trust" dialog in interactive mode for
-	// new directories. "Yes" is pre-selected, so Enter dismisses it.
-	foundPrompt := false
-	for range 5 {
-		content, err := s.WaitFor(`(❯|Enter to select)`, 30*time.Second)
-		if err != nil {
-			_ = s.Close()
-			return nil, fmt.Errorf("waiting for startup prompt: %w", err)
-		}
-		if strings.Contains(content, "❯") && !strings.Contains(content, "Enter to select") {
-			foundPrompt = true
-			break
-		}
-		if err := s.SendKeys("Enter"); err != nil {
-			_ = s.Close()
-			return nil, fmt.Errorf("dismissing startup dialog: %w", err)
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	if !foundPrompt {
-		_ = s.Close()
-		return nil, errors.New("copilot CLI did not reach interactive prompt after dismissing startup dialogs")
-	}
-	s.stableAtSend = ""
-
-	return &CopilotSession{TmuxSession: s}, nil
-}
diff --git a/e2e/agents/cursor_cli.go b/e2e/agents/cursor_cli.go
deleted file mode 100644
index bf4021d..0000000
--- a/e2e/agents/cursor_cli.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package agents
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "cursor-cli" {
-		return
-	}
-	Register(&CursorCLI{})
-}
-
-// CursorCLI implements the E2E Agent interface for the Cursor Agent CLI binary.
-// The CLI binary is called "agent" and uses Cursor's hooks system via
-// .cursor/hooks.json. It maps to the same Trace agent as Cursor IDE ("cursor").
-//
-// All E2E interactions use interactive (tmux) mode so that the full hook
-// lifecycle fires (sessionStart, beforeSubmitPrompt, stop, sessionEnd).
-// Headless (-p) mode skips beforeSubmitPrompt and stop hooks.
-type CursorCLI struct{}
-
-func (a *CursorCLI) Name() string               { return "cursor-cli" }
-func (a *CursorCLI) Binary() string             { return "agent" }
-func (a *CursorCLI) TraceAgent() string         { return "cursor" }
-func (a *CursorCLI) TimeoutMultiplier() float64 { return 1.5 }
-
-// PromptPattern returns a regex matching Cursor's ready-state prompt markers.
-// Cursor has used multiple startup/completion markers across releases.
-func (a *CursorCLI) PromptPattern() string {
-	return `(/ commands|Plan, search, build anything|Add a follow-up)`
-}
-
-func (a *CursorCLI) IsTransientError(out Output, err error) bool {
-	if err == nil {
-		return false
-	}
-	if errors.Is(err, context.DeadlineExceeded) {
-		return true
-	}
-	combined := out.Stdout + out.Stderr
-	for _, p := range []string{
-		"overloaded",
-		"rate limit",
-		"429",
-		"503",
-		"529",
-		"ECONNRESET",
-		"ETIMEDOUT",
-		"server error",
-		"Internal Server Error",
-	} {
-		if strings.Contains(combined, p) {
-			return true
-		}
-	}
-	return false
-}
-
-func (a *CursorCLI) Bootstrap() error {
-	// The Cursor CLI authenticates via CURSOR_API_KEY env var or OAuth.
-	// On CI, ensure CURSOR_API_KEY is set. Locally, OAuth/keychain works.
-	if os.Getenv("CI") != "" && os.Getenv("CURSOR_API_KEY") == "" {
-		return errors.New("CURSOR_API_KEY must be set on CI for cursor-cli E2E tests")
-	}
-	return nil
-}
-
-// cursorConfigDir creates an isolated per-session config directory for the
-// Cursor CLI. Each session gets its own XDG_CONFIG_HOME so that parallel tests
-// don't race on the shared ~/.config/cursor/cli-config.json file.
-// The directory is pre-seeded with an empty cli-config.json to avoid the
-// atomic temp-file rename that triggers the ENOENT race.
-func cursorConfigDir() (string, error) {
-	tmp, err := os.MkdirTemp("", "cursor-e2e-config-*")
-	if err != nil {
-		return "", fmt.Errorf("create temp config dir: %w", err)
-	}
-	cursorDir := filepath.Join(tmp, "cursor")
-	if err := os.MkdirAll(cursorDir, 0o755); err != nil {
-		return "", fmt.Errorf("mkdir cursor config: %w", err)
-	}
-	if err := os.WriteFile(filepath.Join(cursorDir, "cli-config.json"), []byte("{}"), 0o644); err != nil {
-		return "", fmt.Errorf("seed cli-config.json: %w", err)
-	}
-	return tmp, nil
-}
-
-func (a *CursorCLI) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	cfg := &runConfig{}
-	for _, o := range opts {
-		o(cfg)
-	}
-
-	timeout := 90 * time.Second
-	if cfg.PromptTimeout > 0 {
-		timeout = cfg.PromptTimeout
-	}
-
-	displayCmd := a.Binary() + " --force --workspace " + dir + " (interactive prompt: " + prompt + ")"
-
-	// Start an interactive tmux session so all hooks fire
-	// (beforeSubmitPrompt and stop don't fire in headless -p mode).
-	s, err := a.startInteractiveSession(dir)
-	if err != nil {
-		return Output{Command: displayCmd, ExitCode: -1},
-			fmt.Errorf("start interactive session: %w", err)
-	}
-	defer s.Close()
-
-	// Wait for trust dialog and accept it.
-	if err := a.acceptTrustDialogIfNeeded(s); err != nil {
-		return Output{Command: displayCmd, Stdout: s.Capture(), ExitCode: -1}, err
-	}
-
-	// Wait for the TUI to be ready.
-	if _, err := s.WaitFor(a.PromptPattern(), 45*time.Second); err != nil {
-		return Output{Command: displayCmd, Stdout: s.Capture(), ExitCode: -1},
-			fmt.Errorf("waiting for startup prompt: %w", err)
-	}
-
-	// Send the prompt.
-	if err := s.Send(prompt); err != nil {
-		return Output{Command: displayCmd, Stdout: s.Capture(), ExitCode: -1},
-			fmt.Errorf("sending prompt: %w", err)
-	}
-
-	// Wait for the "Add a follow-up" completion marker that appears after the
-	// agent finishes processing. We cannot reuse PromptPattern() here because
-	// it matches ready-state UI markers that can already be visible while the
-	// model is still thinking, causing WaitFor to settle prematurely.
-	content, waitErr := s.WaitFor(`Add a follow-up`, timeout)
-	if waitErr != nil {
-		// Check for deadline exceeded to allow transient error detection.
-		if ctx.Err() == context.DeadlineExceeded {
-			waitErr = fmt.Errorf("%w: %w", waitErr, context.DeadlineExceeded)
-		}
-		return Output{Command: displayCmd, Stdout: content, ExitCode: -1}, waitErr
-	}
-
-	return Output{Command: displayCmd, Stdout: content, ExitCode: 0}, nil
-}
-
-func (a *CursorCLI) StartSession(ctx context.Context, dir string) (Session, error) {
-	s, err := a.startInteractiveSession(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := a.acceptTrustDialogIfNeeded(s); err != nil {
-		_ = s.Close()
-		return nil, err
-	}
-
-	// Wait for the TUI to be ready (input prompt).
-	if _, err := s.WaitFor(a.PromptPattern(), 45*time.Second); err != nil {
-		_ = s.Close()
-		return nil, fmt.Errorf("waiting for startup prompt: %w", err)
-	}
-	s.stableAtSend = ""
-
-	return s, nil
-}
-
-// startInteractiveSession creates a new tmux session running the Cursor CLI
-// in interactive mode (no -p flag) so all hooks fire.
-func (a *CursorCLI) startInteractiveSession(dir string) (*TmuxSession, error) {
-	// Resolve to absolute path so tmux can find the binary even if its
-	// shell doesn't inherit the test process's PATH (common on CI).
-	bin, err := exec.LookPath(a.Binary())
-	if err != nil {
-		return nil, fmt.Errorf("agent binary not found: %w", err)
-	}
-
-	// Create an isolated config directory for this session so parallel tests
-	// don't race on the shared ~/.config/cursor/cli-config.json file.
-	configDir, err := cursorConfigDir()
-	if err != nil {
-		return nil, fmt.Errorf("create cursor config dir: %w", err)
-	}
-
-	// Build env-wrapped command so the tmux session inherits critical env vars.
-	// tmux starts a new shell that doesn't inherit Go's os.Environ().
-	var envArgs []string
-	for _, key := range []string{"CURSOR_API_KEY", "PATH", "HOME", "TERM"} {
-		if v := os.Getenv(key); v != "" {
-			envArgs = append(envArgs, key+"="+v)
-		}
-	}
-	// Point XDG_CONFIG_HOME to our isolated dir so cursor writes its config
-	// there instead of ~/.config/cursor/. We keep the real HOME so that
-	// auth credentials (keychain, OAuth tokens) remain accessible.
-	envArgs = append(envArgs, "XDG_CONFIG_HOME="+configDir)
-
-	args := append([]string{"env"}, envArgs...)
-	args = append(args, bin, "--force", "--workspace", dir)
-
-	name := fmt.Sprintf("cursor-cli-test-%d", time.Now().UnixNano())
-	unset := []string{"CI"}
-	s, err := NewTmuxSession(name, dir, unset, args[0], args[1:]...)
-	if err != nil {
-		_ = os.RemoveAll(configDir)
-		return nil, err
-	}
-	s.OnClose(func() { _ = os.RemoveAll(configDir) })
-	return s, nil
-}
-
-// acceptTrustDialogIfNeeded checks whether the workspace trust dialog appears
-// and presses "a" to accept it. The dialog only shows on the first launch in
-// a workspace — subsequent sessions in the same directory skip it.
-func (a *CursorCLI) acceptTrustDialogIfNeeded(s *TmuxSession) error {
-	// Race: either the trust dialog or the input prompt will appear first.
-	// Use a short timeout to check for the trust dialog without blocking
-	// too long if the workspace is already trusted.
-	content, err := s.WaitFor(`Trust this workspace|`+a.PromptPattern(), 45*time.Second)
-	if err != nil {
-		return fmt.Errorf("waiting for trust dialog or prompt: %w", err)
-	}
-	if strings.Contains(content, "Trust this workspace") {
-		if err := s.SendKeys("a"); err != nil {
-			return fmt.Errorf("accepting trust dialog: %w", err)
-		}
-	}
-	return nil
-}
diff --git a/e2e/agents/droid.go b/e2e/agents/droid.go
deleted file mode 100644
index a32a4e3..0000000
--- a/e2e/agents/droid.go
+++ /dev/null
@@ -1,207 +0,0 @@
-package agents
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "factoryai-droid" {
-		return
-	}
-	if _, err := exec.LookPath("droid"); err != nil {
-		return
-	}
-	Register(&Droid{})
-}
-
-// Droid implements the Agent interface for Factory AI Droid.
-type Droid struct{}
-
-func (d *Droid) Name() string               { return "factoryai-droid" }
-func (d *Droid) Binary() string             { return "droid" }
-func (d *Droid) TraceAgent() string         { return "factoryai-droid" }
-func (d *Droid) PromptPattern() string      { return `>` }
-func (d *Droid) TimeoutMultiplier() float64 { return 2.0 }
-
-func (d *Droid) IsTransientError(out Output, err error) bool {
-	if err == nil {
-		return false
-	}
-	combined := out.Stdout + out.Stderr
-	transientPatterns := []string{
-		"overloaded",
-		"rate limit",
-		"529",
-		"503",
-		"ECONNRESET",
-		"ETIMEDOUT",
-	}
-	for _, p := range transientPatterns {
-		if strings.Contains(combined, p) {
-			return true
-		}
-	}
-	return false
-}
-
-// droidSettings represents the ~/.factory/settings.json structure used for
-// BYOK (Bring Your Own Key) configuration.
-type droidSettings struct {
-	CustomModels []droidCustomModel `json:"customModels,omitempty"`
-}
-
-type droidCustomModel struct {
-	DisplayName    string `json:"displayName"`
-	Model          string `json:"model"`
-	BaseURL        string `json:"baseUrl"`
-	APIKey         string `json:"apiKey"`
-	Provider       string `json:"provider"`
-	MaxOutputToken int    `json:"maxOutputTokens"`
-}
-
-const (
-	// Droid v0.63+ expects custom model selection using custom:<model-id>.
-	// The displayName in settings is not accepted by --model.
-	droidCustomModelDisplayName = "claude-haiku-custom"
-	droidCustomModelBaseID      = "claude-haiku-4-5-20251001"
-	defaultDroidModel           = "custom:" + droidCustomModelBaseID
-)
-
-// DefaultDroidModel returns the default model string for Droid BYOK configuration.
-// Format is "custom:<baseModelID>" which the Droid API expects for custom model selection.
-func DefaultDroidModel() string { return defaultDroidModel }
-
-func (d *Droid) Bootstrap() error {
-	apiKey := os.Getenv("ANTHROPIC_API_KEY")
-	if apiKey == "" {
-		return nil
-	}
-
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return fmt.Errorf("get home dir: %w", err)
-	}
-	dir := filepath.Join(home, ".factory")
-	if err := os.MkdirAll(dir, 0o755); err != nil {
-		return fmt.Errorf("mkdir %s: %w", dir, err)
-	}
-
-	settingsPath := filepath.Join(dir, "settings.json")
-
-	// Read existing settings to merge (hooks may already be configured
-	// in the repo-local .factory/settings.json, but the global config
-	// at ~/.factory/settings.json might have other pre-existing entries).
-	var settings droidSettings
-	if data, readErr := os.ReadFile(settingsPath); readErr == nil {
-		// Best-effort merge: ignore parse errors and start fresh
-		_ = json.Unmarshal(data, &settings)
-	}
-
-	// Replace or add the BYOK model entry.
-	byokModel := droidCustomModel{
-		DisplayName:    droidCustomModelDisplayName,
-		Model:          droidCustomModelBaseID,
-		BaseURL:        "https://api.anthropic.com",
-		APIKey:         apiKey,
-		Provider:       "anthropic",
-		MaxOutputToken: 8192,
-	}
-
-	found := false
-	for i, m := range settings.CustomModels {
-		if m.Model == byokModel.Model {
-			settings.CustomModels[i] = byokModel
-			found = true
-			break
-		}
-	}
-	if !found {
-		settings.CustomModels = append(settings.CustomModels, byokModel)
-	}
-
-	data, err := json.MarshalIndent(settings, "", "  ")
-	if err != nil {
-		return fmt.Errorf("marshal settings: %w", err)
-	}
-	return os.WriteFile(settingsPath, data, 0o644)
-}
-
-func (d *Droid) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	cfg := &runConfig{Model: defaultDroidModel}
-	for _, o := range opts {
-		o(cfg)
-	}
-
-	model := cfg.Model
-	if model == "" {
-		model = defaultDroidModel
-	}
-
-	args := []string{"exec", "--skip-permissions-unsafe", "--model", model, prompt}
-	displayArgs := []string{"exec", "--skip-permissions-unsafe", "--model", model, fmt.Sprintf("%q", prompt)}
-
-	cmd := exec.CommandContext(ctx, d.Binary(), args...)
-	cmd.Dir = dir
-	cmd.Stdin = nil
-	cmd.Env = filterEnv(os.Environ(), "TRACE_TEST_TTY", "CI", "GITHUB_ACTIONS")
-	setupProcessGroup(cmd)
-	cmd.WaitDelay = 5 * time.Second
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	exitCode := 0
-	if err != nil {
-		exitErr := &exec.ExitError{}
-		if errors.As(err, &exitErr) {
-			exitCode = exitErr.ExitCode()
-		} else {
-			exitCode = -1
-		}
-	}
-
-	return Output{
-		Command:  d.Binary() + " " + strings.Join(displayArgs, " "),
-		Stdout:   stdout.String(),
-		Stderr:   stderr.String(),
-		ExitCode: exitCode,
-	}, err
-}
-
-func (d *Droid) StartSession(ctx context.Context, dir string) (Session, error) {
-	name := fmt.Sprintf("droid-test-%d", time.Now().UnixNano())
-	// Unset CI and GITHUB_ACTIONS so Droid doesn't enter single-turn/headless
-	// mode — it checks these vars and skips interactive input after the first turn.
-	s, err := NewTmuxSession(name, dir, []string{"CI", "GITHUB_ACTIONS", "TRACE_TEST_TTY"}, d.Binary())
-	if err != nil {
-		return nil, err
-	}
-
-	// Wait for the interactive prompt indicator.
-	if _, err := s.WaitFor(`>`, 30*time.Second); err != nil {
-		_ = s.Close()
-		return nil, fmt.Errorf("waiting for startup prompt: %w", err)
-	}
-
-	// Droid auto-generates a greeting on startup which fires a Stop hook.
-	// Wait for the greeting turn to fully complete before accepting prompts.
-	select {
-	case <-ctx.Done():
-		_ = s.Close()
-		return nil, fmt.Errorf("context cancelled during startup wait: %w", ctx.Err())
-	case <-time.After(2 * time.Second):
-	}
-	s.stableAtSend = ""
-
-	return s, nil
-}
diff --git a/e2e/agents/gemini.go b/e2e/agents/gemini.go
deleted file mode 100644
index af8c6ab..0000000
--- a/e2e/agents/gemini.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package agents
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "gemini-cli" {
-		return
-	}
-	Register(&Gemini{})
-	RegisterGate("gemini-cli", 2)
-}
-
-const (
-	geminiDefaultModel         = "gemini-2.5-flash"
-	geminiTrustWorkspaceEnvKey = "GEMINI_CLI_TRUST_WORKSPACE"
-	geminiTrustWorkspaceEnv    = geminiTrustWorkspaceEnvKey + "=true"
-)
-
-type Gemini struct{}
-
-func (g *Gemini) Name() string               { return "gemini-cli" }
-func (g *Gemini) Binary() string             { return "gemini" }
-func (g *Gemini) TraceAgent() string         { return "gemini" }
-func (g *Gemini) PromptPattern() string      { return `Type your message` }
-func (g *Gemini) TimeoutMultiplier() float64 { return 2.5 }
-
-func (g *Gemini) IsTransientError(out Output, err error) bool {
-	if errors.Is(err, context.DeadlineExceeded) {
-		return true
-	}
-	transientPatterns := []string{
-		"INTERNAL",
-		"Incomplete JSON segment",
-		"429",
-		"TooManyRequests",
-		"RESOURCE_EXHAUSTED",
-		"UNAVAILABLE",
-		"DEADLINE_EXCEEDED",
-		"unexpected critical error",
-	}
-	for _, p := range transientPatterns {
-		if strings.Contains(out.Stderr, p) {
-			return true
-		}
-	}
-	return false
-}
-
-func (g *Gemini) Bootstrap() error {
-	return nil
-}
-
-func (g *Gemini) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	cfg := &runConfig{Model: geminiDefaultModel}
-	for _, o := range opts {
-		o(cfg)
-	}
-
-	// Per-prompt timeout so a slow response gets killed early enough to
-	// retry within the test's overall budget.
-	timeout := 60 * time.Second
-	if cfg.PromptTimeout > 0 {
-		timeout = cfg.PromptTimeout
-	}
-	promptCtx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
-	args := []string{"-p", prompt, "--model", cfg.Model, "-y"}
-	displayArgs := []string{"-p", fmt.Sprintf("%q", prompt), "--model", cfg.Model, "-y"}
-	cmd := exec.CommandContext(promptCtx, g.Binary(), args...)
-	cmd.Dir = dir
-	cmd.Stdin = nil
-	cmd.Env = geminiPromptEnv(dir)
-	setupProcessGroup(cmd)
-	cmd.WaitDelay = 5 * time.Second
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	exitCode := 0
-	if err != nil {
-		exitErr := &exec.ExitError{}
-		if errors.As(err, &exitErr) {
-			exitCode = exitErr.ExitCode()
-		} else {
-			exitCode = -1
-		}
-		// Wrap the prompt-level deadline so IsTransientError can detect it.
-		// cmd.Run() returns "signal: killed", not the context error.
-		if promptCtx.Err() == context.DeadlineExceeded {
-			err = fmt.Errorf("%w: %w", err, context.DeadlineExceeded)
-		}
-	}
-
-	return Output{
-		Command:  g.Binary() + " " + strings.Join(displayArgs, " "),
-		Stdout:   stdout.String(),
-		Stderr:   stderr.String(),
-		ExitCode: exitCode,
-	}, err
-}
-
-func (g *Gemini) StartSession(_ context.Context, dir string) (Session, error) {
-	name := fmt.Sprintf("gemini-test-%d", time.Now().UnixNano())
-
-	envArgs := []string{"ACCESSIBLE=1", geminiTrustWorkspaceEnv, "HOME=" + geminiTestHomeDir(dir)}
-	for _, key := range []string{"TERM"} {
-		if v := os.Getenv(key); v != "" {
-			envArgs = append(envArgs, key+"="+v)
-		}
-	}
-
-	// Unset CI and GITHUB_ACTIONS so gemini doesn't force headless mode —
-	// it checks both in isHeadlessMode() and skips interactive TUI entirely.
-	args := append([]string{"env"}, envArgs...)
-	args = append(args, g.Binary(), "--model", geminiDefaultModel, "-y")
-	s, err := NewTmuxSession(name, dir, []string{"CI", "GITHUB_ACTIONS", "TRACE_TEST_TTY", "HOME"}, args[0], args[1:]...)
-	if err != nil {
-		return nil, err
-	}
-
-	// Dismiss startup dialogs (auth, workspace trust, etc.)
-	for range 10 {
-		content, err := s.WaitFor(`(Type your message|trust|Enter to select|Enter to confirm|New Agents Discovered|Acknowledge and Enable)`, 30*time.Second)
-		if err != nil {
-			_ = s.Close()
-			return nil, fmt.Errorf("waiting for startup prompt: %w", err)
-		}
-		if strings.Contains(content, "Type your message") {
-			break
-		}
-		_ = s.SendKeys("Enter")
-		time.Sleep(500 * time.Millisecond)
-	}
-	s.stableAtSend = ""
-
-	return s, nil
-}
-
-func geminiTestHomeDir(repoDir string) string {
-	return filepath.Join(filepath.Dir(repoDir), filepath.Base(repoDir)+"-gemini-home")
-}
-
-func geminiPromptEnv(repoDir string) []string {
-	return append(
-		filterEnv(os.Environ(), "TRACE_TEST_TTY", geminiTrustWorkspaceEnvKey),
-		"ACCESSIBLE=1",
-		geminiTrustWorkspaceEnv,
-		"HOME="+geminiTestHomeDir(repoDir),
-	)
-}
diff --git a/e2e/agents/gemini_test.go b/e2e/agents/gemini_test.go
deleted file mode 100644
index 8cc5451..0000000
--- a/e2e/agents/gemini_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package agents
-
-import (
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func TestGeminiPromptEnv_TrustsWorkspaceForHeadlessRuns(t *testing.T) {
-	t.Setenv("TRACE_TEST_TTY", "1")
-	t.Setenv(geminiTrustWorkspaceEnvKey, "false")
-
-	repoDir := filepath.Join(t.TempDir(), "repo")
-	env := geminiPromptEnv(repoDir)
-
-	if got, _ := envValue(env, geminiTrustWorkspaceEnvKey); got != "true" {
-		t.Fatalf("%s = %q, want true", geminiTrustWorkspaceEnvKey, got)
-	}
-	if got, ok := envValue(env, "TRACE_TEST_TTY"); ok {
-		t.Fatalf("TRACE_TEST_TTY = %q, want unset", got)
-	}
-	if got, _ := envValue(env, "HOME"); got != geminiTestHomeDir(repoDir) {
-		t.Fatalf("HOME = %q, want %q", got, geminiTestHomeDir(repoDir))
-	}
-}
-
-func envValue(env []string, key string) (string, bool) {
-	prefix := key + "="
-	for i := len(env) - 1; i >= 0; i-- {
-		if strings.HasPrefix(env[i], prefix) {
-			return strings.TrimPrefix(env[i], prefix), true
-		}
-	}
-	return "", false
-}
diff --git a/e2e/agents/link_unix.go b/e2e/agents/link_unix.go
deleted file mode 100644
index e2070c3..0000000
--- a/e2e/agents/link_unix.go
+++ /dev/null
@@ -1,10 +0,0 @@
-//go:build !windows
-
-package agents
-
-import "os"
-
-// linkFile creates a symbolic link from src to dst.
-func linkFile(src, dst string) error {
-	return os.Symlink(src, dst)
-}
diff --git a/e2e/agents/link_windows.go b/e2e/agents/link_windows.go
deleted file mode 100644
index 303a37e..0000000
--- a/e2e/agents/link_windows.go
+++ /dev/null
@@ -1,15 +0,0 @@
-//go:build windows
-
-package agents
-
-import "os"
-
-// linkFile copies src to dst because symlinks on Windows require elevated
-// privileges or Developer Mode.
-func linkFile(src, dst string) error {
-	data, err := os.ReadFile(src)
-	if err != nil {
-		return err
-	}
-	return os.WriteFile(dst, data, 0o644)
-}
diff --git a/e2e/agents/opencode.go b/e2e/agents/opencode.go
deleted file mode 100644
index 7bddb51..0000000
--- a/e2e/agents/opencode.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package agents
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-)
-
-type openCodeAgent struct {
-	model   string
-	timeout time.Duration
-}
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "opencode" {
-		return
-	}
-	if _, err := exec.LookPath("opencode"); err != nil {
-		return
-	}
-	model := os.Getenv("E2E_OPENCODE_MODEL")
-	if model == "" {
-		model = "anthropic/claude-haiku-4-5"
-	}
-	Register(&openCodeAgent{model: model, timeout: 2 * time.Minute})
-}
-
-func (a *openCodeAgent) Name() string               { return "opencode" }
-func (a *openCodeAgent) Binary() string             { return "opencode" }
-func (a *openCodeAgent) TraceAgent() string         { return "opencode" }
-func (a *openCodeAgent) PromptPattern() string      { return `(Ask anything|▣)` }
-func (a *openCodeAgent) TimeoutMultiplier() float64 { return 2.0 }
-
-func (a *openCodeAgent) IsTransientError(out Output, _ error) bool {
-	transientPatterns := []string{
-		"overloaded",
-		"rate limit",
-		"529",
-		"503",
-		"ECONNRESET",
-		"ETIMEDOUT",
-		"Token refresh failed",
-		"database is locked",
-	}
-	for _, p := range transientPatterns {
-		if strings.Contains(out.Stderr, p) {
-			return true
-		}
-	}
-	return false
-}
-
-func (a *openCodeAgent) Bootstrap() error {
-	// opencode has first-run DB migration + node_modules resolution that
-	// races with parallel test execution (upstream issue #6935).
-	// Run a trivial prompt to force full initialization before tests.
-	for i := range 3 {
-		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-		cmd := exec.CommandContext(ctx, a.Binary(), "run", "--model", a.model, "say hi")
-		cmd.Env = os.Environ()
-		out, err := cmd.CombinedOutput()
-		cancel()
-		if err == nil {
-			return nil
-		}
-		if i < 2 {
-			fmt.Fprintf(os.Stderr, "opencode warmup attempt %d failed: %s\n%s\n", i+1, err, out)
-			time.Sleep(5 * time.Second)
-		}
-	}
-	// Non-fatal: warmup failure shouldn't block tests entirely.
-	fmt.Fprintln(os.Stderr, "opencode warmup failed after 3 attempts, proceeding anyway")
-	return nil
-}
-
-func (a *openCodeAgent) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	cfg := &runConfig{}
-	for _, o := range opts {
-		o(cfg)
-	}
-
-	model := a.model
-	if cfg.Model != "" {
-		model = cfg.Model
-	}
-
-	args := []string{"run"}
-	if model != "" {
-		args = append(args, "--model", model)
-	}
-	args = append(args, prompt)
-
-	timeout := a.timeout
-	if envTimeout := os.Getenv("E2E_TIMEOUT"); envTimeout != "" {
-		if parsed, err := time.ParseDuration(envTimeout); err == nil {
-			timeout = parsed
-		}
-	}
-	// Per-prompt timeout is the most specific override.
-	if cfg.PromptTimeout > 0 {
-		timeout = cfg.PromptTimeout
-	}
-
-	ctx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, a.Binary(), args...)
-	cmd.Dir = dir
-	cmd.Env = filterEnv(os.Environ(), "TRACE_TEST_TTY")
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	out := Output{
-		Command: a.Binary() + " " + strings.Join(args, " "),
-		Stdout:  stdout.String(),
-		Stderr:  stderr.String(),
-	}
-
-	if err != nil {
-		var exitErr *exec.ExitError
-		if errors.As(err, &exitErr) {
-			out.ExitCode = exitErr.ExitCode()
-		} else {
-			out.ExitCode = -1
-		}
-		return out, err
-	}
-
-	return out, nil
-}
-
-func (a *openCodeAgent) StartSession(ctx context.Context, dir string) (Session, error) {
-	// opencode's TUI occasionally fails to render on CI (empty pane).
-	// Retry once if the first attempt produces no output at all.
-	var s *TmuxSession
-	var lastErr error
-	for attempt := range 2 {
-		name := fmt.Sprintf("opencode-test-%d", time.Now().UnixNano())
-		var err error
-		s, err = NewTmuxSession(name, dir, []string{"TRACE_TEST_TTY"}, a.Binary(), "--model", a.model)
-		if err != nil {
-			return nil, err
-		}
-
-		// Wait for TUI to be ready (input area with placeholder text).
-		// OpenCode's TUI has a large ASCII banner and multiple panels that
-		// can take a while to render on CI, plus WaitFor needs 2s settle.
-		if _, err := s.WaitFor(`Ask anything`, 60*time.Second); err != nil {
-			content := s.Capture()
-			_ = s.Close()
-			if strings.TrimSpace(content) == "" && attempt == 0 {
-				lastErr = err
-				continue
-			}
-			return nil, fmt.Errorf("waiting for startup: %w", err)
-		}
-		s.stableAtSend = ""
-		return s, nil
-	}
-	return nil, fmt.Errorf("opencode TUI failed to start after retry: %w", lastErr)
-}
-
-func openCodePromptEnv(base []string, dir string) []string {
-	return append(filterEnv(base, "TRACE_TEST_TTY", "PWD"), "PWD="+dir)
-}
diff --git a/e2e/agents/opencode_test.go b/e2e/agents/opencode_test.go
deleted file mode 100644
index 8d18be5..0000000
--- a/e2e/agents/opencode_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package agents
-
-import (
-	"strings"
-	"testing"
-)
-
-// TestOpenCodePromptEnv_OverridesPWD verifies the env handed to the opencode
-// child process points PWD at the run directory and contains exactly one PWD
-// entry. opencode (Node) resolves its project/worktree root from
-// process.env.PWD, and Go's cmd.Dir chdirs without updating PWD — so without
-// this override, file operations land in the go-test package dir instead of the
-// test repo.
-func TestOpenCodePromptEnv_OverridesPWD(t *testing.T) {
-	t.Parallel()
-	base := []string{
-		"PWD=/some/stale/go-test/dir",
-		"TRACE_TEST_TTY=1",
-		"HOME=/home/runner",
-	}
-
-	env := openCodePromptEnv(base, "/tmp/e2e-repo-123")
-
-	got, ok := envValue(env, "PWD")
-	if !ok {
-		t.Fatal("PWD not present in child env")
-	}
-	if got != "/tmp/e2e-repo-123" {
-		t.Fatalf("PWD = %q, want %q", got, "/tmp/e2e-repo-123")
-	}
-
-	// The stale PWD must not survive: filterEnv strips it before we re-add.
-	count := 0
-	for _, e := range env {
-		if strings.HasPrefix(e, "PWD=") {
-			count++
-		}
-	}
-	if count != 1 {
-		t.Fatalf("expected exactly one PWD entry, got %d", count)
-	}
-
-	// TRACE_TEST_TTY is still stripped so the agent exercises real TTY detection.
-	if got, ok := envValue(env, "TRACE_TEST_TTY"); ok {
-		t.Fatalf("TRACE_TEST_TTY = %q, want stripped", got)
-	}
-
-	// Unrelated env is preserved.
-	if got, _ := envValue(env, "HOME"); got != "/home/runner" {
-		t.Fatalf("HOME = %q, want preserved", got)
-	}
-}
diff --git a/e2e/agents/pi.go b/e2e/agents/pi.go
deleted file mode 100644
index d708940..0000000
--- a/e2e/agents/pi.go
+++ /dev/null
@@ -1,201 +0,0 @@
-package agents
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "pi" {
-		return
-	}
-	Register(&Pi{})
-	RegisterGate("pi", 2)
-}
-
-// Pi implements the E2E Agent interface for the Pi coding agent.
-type Pi struct{}
-
-// PiSession exposes the per-test isolated Pi home so test fixtures can
-// inspect or clean it up.
-type PiSession struct {
-	*TmuxSession
-
-	home string
-}
-
-func (s *PiSession) Home() string { return s.home }
-
-func (p *Pi) Name() string               { return "pi" }
-func (p *Pi) Binary() string             { return "pi" }
-func (p *Pi) TraceAgent() string         { return "pi" }
-func (p *Pi) PromptPattern() string      { return `\$\d` }
-func (p *Pi) TimeoutMultiplier() float64 { return 1.5 }
-
-func (p *Pi) Bootstrap() error {
-	return nil
-}
-
-func (p *Pi) IsTransientError(out Output, _ error) bool {
-	combined := out.Stdout + out.Stderr
-	for _, pat := range []string{
-		"overloaded",
-		"rate limit",
-		"429",
-		"503",
-		"ECONNRESET",
-		"ETIMEDOUT",
-		"timeout",
-	} {
-		if strings.Contains(combined, pat) {
-			return true
-		}
-	}
-	return false
-}
-
-// piHome creates an isolated PI_CODING_AGENT_DIR for a test run so
-// parallel tests don't share session state with the real ~/.pi/agent.
-// Auth (auth.json) and user-tunable defaults (settings.json) are
-// symlinked from the real home if present so OAuth tokens flow through
-// without re-prompting; tests that run with an explicit
-// ANTHROPIC_API_KEY / OPENAI_API_KEY env will pick those up via the
-// inherited environment regardless.
-func piHome() (string, func(), error) {
-	cache, err := os.UserCacheDir()
-	if err != nil {
-		return "", nil, fmt.Errorf("resolve user cache dir: %w", err)
-	}
-	base := filepath.Join(cache, "trace-e2e")
-	if err := os.MkdirAll(base, 0o755); err != nil {
-		return "", nil, fmt.Errorf("create pi home base %q: %w", base, err)
-	}
-	dir, err := os.MkdirTemp(base, "pi-home-*")
-	if err != nil {
-		return "", nil, fmt.Errorf("create temporary pi home under %q: %w", base, err)
-	}
-	if err := seedPiHome(dir); err != nil {
-		_ = os.RemoveAll(dir)
-		return "", nil, fmt.Errorf("seed pi home: %w", err)
-	}
-	return dir, func() { _ = os.RemoveAll(dir) }, nil
-}
-
-// seedPiHome links the user's auth.json + settings.json into the
-// isolated home (best-effort) so Pi can authenticate without
-// re-prompting. Sessions still write into the isolated home's
-// sessions/ subdir, keeping per-test session state hermetic.
-func seedPiHome(home string) error {
-	realHome, err := os.UserHomeDir()
-	if err != nil {
-		return nil //nolint:nilerr // no user home → can't seed; tests with API-key env still work
-	}
-	src := filepath.Join(realHome, ".pi", "agent")
-	for _, name := range []string{"auth.json", "settings.json"} {
-		from := filepath.Join(src, name)
-		if _, statErr := os.Stat(from); statErr != nil {
-			continue // file not present — skip
-		}
-		to := filepath.Join(home, name)
-		if linkErr := os.Symlink(from, to); linkErr != nil {
-			return fmt.Errorf("symlink %s: %w", name, linkErr)
-		}
-	}
-	return nil
-}
-
-func (p *Pi) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	cfg := &runConfig{}
-	for _, o := range opts {
-		o(cfg)
-	}
-
-	bin, err := exec.LookPath(p.Binary())
-	if err != nil {
-		return Output{}, fmt.Errorf("%s not in PATH: %w", p.Binary(), err)
-	}
-
-	home, cleanup, err := piHome()
-	if err != nil {
-		return Output{}, fmt.Errorf("create pi home: %w", err)
-	}
-	defer cleanup()
-
-	args := []string{"-p", prompt, "--no-skills", "--no-prompt-templates", "--no-themes"}
-	displayArgs := []string{"-p", fmt.Sprintf("%q", prompt), "--no-skills", "--no-prompt-templates", "--no-themes"}
-
-	env := append(
-		filterEnv(os.Environ(), "TRACE_TEST_TTY", "PI_CODING_AGENT_DIR"),
-		"PI_CODING_AGENT_DIR="+home,
-	)
-
-	cmd := exec.CommandContext(ctx, bin, args...)
-	cmd.Dir = dir
-	cmd.Env = env
-	setupProcessGroup(cmd)
-	cmd.WaitDelay = 5 * time.Second
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err = cmd.Run()
-	exitCode := 0
-	if err != nil {
-		exitErr := &exec.ExitError{}
-		if errors.As(err, &exitErr) {
-			exitCode = exitErr.ExitCode()
-		} else {
-			exitCode = -1
-		}
-	}
-
-	return Output{
-		Command:  p.Binary() + " " + strings.Join(displayArgs, " "),
-		Stdout:   stdout.String(),
-		Stderr:   stderr.String(),
-		ExitCode: exitCode,
-	}, err
-}
-
-func (p *Pi) StartSession(_ context.Context, dir string) (Session, error) {
-	name := fmt.Sprintf("pi-test-%d", time.Now().UnixNano())
-
-	home, cleanup, err := piHome()
-	if err != nil {
-		return nil, fmt.Errorf("create pi home: %w", err)
-	}
-
-	s, err := p.startTmuxSession(name, dir, home, p.Binary())
-	if err != nil {
-		cleanup()
-		return nil, err
-	}
-	s.OnClose(cleanup)
-
-	if _, err := s.WaitFor(p.PromptPattern(), 30*time.Second); err != nil {
-		_ = s.Close()
-		return nil, fmt.Errorf("waiting for initial prompt: %w", err)
-	}
-	s.stableAtSend = ""
-
-	return &PiSession{TmuxSession: s, home: home}, nil
-}
-
-// startTmuxSession spawns Pi inside tmux with PI_CODING_AGENT_DIR set
-// via the `env` command. Mirrors Codex's startTmuxSession pattern so
-// the per-test home propagates into the agent process.
-func (p *Pi) startTmuxSession(name, dir, home string, args ...string) (*TmuxSession, error) {
-	tmuxArgs := append([]string{
-		"PI_CODING_AGENT_DIR=" + home,
-		"HOME=" + os.Getenv("HOME"),
-		"TERM=" + os.Getenv("TERM"),
-	}, args...)
-	return NewTmuxSession(name, dir, []string{"PI_CODING_AGENT_DIR", "TRACE_TEST_TTY"}, "env", tmuxArgs...)
-}
diff --git a/e2e/agents/procattr_unix.go b/e2e/agents/procattr_unix.go
deleted file mode 100644
index 907e0f6..0000000
--- a/e2e/agents/procattr_unix.go
+++ /dev/null
@@ -1,17 +0,0 @@
-//go:build unix
-
-package agents
-
-import (
-	"os/exec"
-	"syscall"
-)
-
-// setupProcessGroup configures the command to run in its own process group
-// so the trace tree can be killed on cancellation.
-func setupProcessGroup(cmd *exec.Cmd) {
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
-	cmd.Cancel = func() error {
-		return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
-	}
-}
diff --git a/e2e/agents/procattr_windows.go b/e2e/agents/procattr_windows.go
deleted file mode 100644
index 34d9cb9..0000000
--- a/e2e/agents/procattr_windows.go
+++ /dev/null
@@ -1,20 +0,0 @@
-//go:build windows
-
-package agents
-
-import (
-	"os"
-	"os/exec"
-	"syscall"
-)
-
-// setupProcessGroup configures the command for process cleanup on Windows.
-// Uses CREATE_NEW_PROCESS_GROUP so the process can be terminated cleanly.
-func setupProcessGroup(cmd *exec.Cmd) {
-	cmd.SysProcAttr = &syscall.SysProcAttr{
-		CreationFlags: syscall.CREATE_NEW_PROCESS_GROUP,
-	}
-	cmd.Cancel = func() error {
-		return cmd.Process.Signal(os.Kill)
-	}
-}
diff --git a/e2e/agents/roger_roger.go b/e2e/agents/roger_roger.go
deleted file mode 100644
index d254604..0000000
--- a/e2e/agents/roger_roger.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package agents
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-)
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "roger-roger" {
-		return
-	}
-	// Only register if both binaries exist (roger-roger REPL + protocol handler).
-	if _, err := exec.LookPath("roger-roger"); err != nil {
-		return
-	}
-	if _, err := exec.LookPath("trace-agent-roger-roger"); err != nil {
-		return
-	}
-	Register(&RogerRoger{})
-}
-
-// RogerRoger implements the Agent interface using a deterministic external
-// agent binary that creates files and fires hooks without making any API calls.
-// Unlike built-in agents (Vogon, Claude Code, etc.), roger-roger is discovered
-// via the external agent protocol (trace-agent-roger-roger binary in $PATH).
-type RogerRoger struct{}
-
-func (r *RogerRoger) Name() string                            { return "roger-roger" }
-func (r *RogerRoger) Binary() string                          { return "roger-roger" }
-func (r *RogerRoger) TraceAgent() string                      { return "roger-roger" }
-func (r *RogerRoger) PromptPattern() string                   { return `>` }
-func (r *RogerRoger) TimeoutMultiplier() float64              { return 0.5 } // Deterministic, no API calls
-func (r *RogerRoger) Bootstrap() error                        { return nil }
-func (r *RogerRoger) IsTransientError(_ Output, _ error) bool { return false }
-
-// IsExternalAgent returns true — roger-roger is discovered via the external agent protocol.
-func (r *RogerRoger) IsExternalAgent() bool { return true }
-
-func (r *RogerRoger) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	// roger-roger reads prompts from stdin line by line.
-	// An empty line causes the REPL to exit gracefully.
-	cmd := exec.CommandContext(ctx, r.Binary())
-	cmd.Dir = dir
-	cmd.Stdin = strings.NewReader(prompt + "\n\n")
-	cmd.Env = filterEnv(os.Environ(), "TRACE_TEST_TTY")
-	setupProcessGroup(cmd)
-	cmd.WaitDelay = 5 * time.Second
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	exitCode := 0
-	if err != nil {
-		exitErr := &exec.ExitError{}
-		if errors.As(err, &exitErr) {
-			exitCode = exitErr.ExitCode()
-		} else {
-			exitCode = -1
-		}
-	}
-
-	return Output{
-		Command:  "roger-roger <<< " + fmt.Sprintf("%q", prompt),
-		Stdout:   stdout.String(),
-		Stderr:   stderr.String(),
-		ExitCode: exitCode,
-	}, err
-}
-
-func (r *RogerRoger) StartSession(_ context.Context, dir string) (Session, error) {
-	name := fmt.Sprintf("rr-test-%d", time.Now().UnixNano())
-	s, err := NewTmuxSession(name, dir, []string{"TRACE_TEST_TTY"}, r.Binary())
-	if err != nil {
-		return nil, err
-	}
-
-	// Wait for the interactive prompt.
-	if _, err := s.WaitFor(`>`, 10*time.Second); err != nil {
-		_ = s.Close()
-		return nil, fmt.Errorf("waiting for startup prompt: %w", err)
-	}
-	s.stableAtSend = ""
-
-	return s, nil
-}
diff --git a/e2e/agents/tmux.go b/e2e/agents/tmux.go
deleted file mode 100644
index be6415e..0000000
--- a/e2e/agents/tmux.go
+++ /dev/null
@@ -1,209 +0,0 @@
-package agents
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"regexp"
-	"strings"
-	"time"
-)
-
-// TmuxSession implements Session using tmux for PTY-based interactive agents.
-type TmuxSession struct {
-	name         string
-	stableAtSend string   // stable content snapshot when Send was last called
-	cleanups     []func() // run on Close
-}
-
-// OnClose registers a function to run when the session is closed.
-func (s *TmuxSession) OnClose(fn func()) {
-	s.cleanups = append(s.cleanups, fn)
-}
-
-// NewTmuxSession creates a new tmux session running the given command in dir.
-// unsetEnv lists environment variable names to strip from the session.
-//
-// The command is wrapped with `env` to propagate PATH from the current process.
-// tmux sessions inherit the tmux server's environment (not the client's), so
-// without this, binaries added to PATH by the test runner (e.g., freshly built
-// `trace` and `vogon`) would not be found inside the session.
-func NewTmuxSession(name string, dir string, unsetEnv []string, command string, args ...string) (*TmuxSession, error) {
-	s := &TmuxSession{name: name}
-
-	tmuxArgs := []string{"new-session", "-d", "-s", name, "-c", dir}
-	// Build a shell command string using `env` to:
-	//   1. Propagate PATH from the current process (tmux server may have stale PATH)
-	//   2. Unset variables listed in unsetEnv
-	// All arguments are shell-quoted to prevent injection or splitting.
-	// PATH is always forwarded from the current process so that the freshly-built
-	// "trace" binary (prepended to PATH by main_test.go) is available inside the
-	// tmux session. Without this, tmux inherits the server's environment which may
-	// have an older binary (or none at all).
-	var parts []string
-	parts = append(parts, "env")
-	// Options (-u) must precede variable assignments for BSD env on macOS.
-	for _, v := range unsetEnv {
-		parts = append(parts, "-u", shellQuote(v))
-	}
-	parts = append(parts, "PATH="+shellQuote(os.Getenv("PATH")))
-	parts = append(parts, shellQuote(command))
-	for _, a := range args {
-		parts = append(parts, shellQuote(a))
-	}
-	tmuxArgs = append(tmuxArgs, strings.Join(parts, " "))
-
-	cmd := exec.Command("tmux", tmuxArgs...)
-	if out, err := cmd.CombinedOutput(); err != nil {
-		return nil, fmt.Errorf("tmux new-session: %w\n%s", err, out)
-	}
-	// Keep the pane around after the command exits so we can capture error output.
-	setCmd := exec.Command("tmux", "set-option", "-t", name, "remain-on-exit", "on")
-	_ = setCmd.Run()
-	return s, nil
-}
-
-func (s *TmuxSession) Send(input string) error {
-	preSend := stableContent(s.Capture())
-	// Send text and Enter separately — Claude's TUI can swallow Enter
-	// if it arrives before the input handler finishes processing the text.
-	if err := s.SendKeys(input); err != nil {
-		return err
-	}
-	time.Sleep(200 * time.Millisecond)
-	if err := s.SendKeys("Enter"); err != nil {
-		return err
-	}
-
-	// Wait for the terminal to reflect the echoed input, then snapshot.
-	// This ensures WaitFor compares against post-echo content, preventing
-	// false matches on prompt characters (e.g. ❯) in the echoed input.
-	deadline := time.Now().Add(5 * time.Second)
-	for time.Now().Before(deadline) {
-		time.Sleep(200 * time.Millisecond)
-		current := stableContent(s.Capture())
-		if current != preSend {
-			s.stableAtSend = current
-			return nil
-		}
-	}
-	s.stableAtSend = stableContent(s.Capture())
-	return nil
-}
-
-// SendKeys sends raw tmux key names without appending Enter.
-func (s *TmuxSession) SendKeys(keys ...string) error {
-	args := append([]string{"send-keys", "-t", s.name}, keys...)
-	cmd := exec.Command("tmux", args...)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("tmux send-keys: %w\n%s", err, out)
-	}
-	return nil
-}
-
-const (
-	settleTime   = 2 * time.Second
-	pollInterval = 500 * time.Millisecond
-)
-
-// stableContent returns the content with the last few lines stripped,
-// so that TUI status bar updates don't prevent the settle timer.
-func stableContent(content string) string {
-	lines := strings.Split(content, "\n")
-	if len(lines) > 3 {
-		lines = lines[:len(lines)-3]
-	}
-	return strings.Join(lines, "\n")
-}
-
-func (s *TmuxSession) WaitFor(pattern string, timeout time.Duration) (string, error) {
-	re, err := regexp.Compile(pattern)
-	if err != nil {
-		return "", fmt.Errorf("invalid pattern: %w", err)
-	}
-
-	deadline := time.Now().Add(timeout)
-	var matchedAt time.Time
-	var lastStable string
-	contentChanged := s.stableAtSend == "" // skip change requirement for initial waits
-
-	for time.Now().Before(deadline) {
-		content := s.Capture()
-		stable := stableContent(content)
-
-		// Bail early if the process has exited and the pattern doesn't match.
-		// remain-on-exit keeps the pane alive, so without this check we'd
-		// poll a dead pane for the full timeout duration.
-		if !re.MatchString(content) {
-			if s.IsPaneDead() {
-				return content, fmt.Errorf("process exited while waiting for %q\n--- pane content ---\n%s\n--- end pane content ---", pattern, content)
-			}
-			// Pattern lost — reset
-			matchedAt = time.Time{}
-			lastStable = ""
-			time.Sleep(pollInterval)
-			continue
-		}
-
-		// Detect content change since Send was called
-		if !contentChanged && stable != s.stableAtSend {
-			contentChanged = true
-		}
-
-		if stable != lastStable {
-			// Pattern matches but content is still changing — reset settle timer
-			matchedAt = time.Now()
-			lastStable = stable
-			time.Sleep(pollInterval)
-			continue
-		}
-
-		// Pattern matches and content hasn't changed since matchedAt.
-		// Only settle if content changed at least once after Send
-		// (prevents false settle on echoed input before agent starts).
-		if contentChanged && time.Since(matchedAt) >= settleTime {
-			return content, nil
-		}
-
-		time.Sleep(pollInterval)
-	}
-	content := s.Capture()
-	return content, fmt.Errorf("timed out waiting for %q after %s\n--- pane content ---\n%s\n--- end pane content ---", pattern, timeout, content)
-}
-
-// IsPaneDead returns true if the process inside the tmux pane has exited.
-// This relies on the remain-on-exit option being set (which NewTmuxSession does).
-func (s *TmuxSession) IsPaneDead() bool {
-	cmd := exec.Command("tmux", "display-message", "-t", s.name, "-p", "#{pane_dead}")
-	out, err := cmd.Output()
-	if err != nil {
-		// If tmux itself fails (e.g. session/pane no longer exists),
-		// treat it as dead so WaitFor doesn't poll until timeout.
-		return true
-	}
-	return strings.TrimSpace(string(out)) == "1"
-}
-
-func (s *TmuxSession) Capture() string {
-	cmd := exec.Command("tmux", "capture-pane", "-t", s.name, "-p")
-	out, _ := cmd.Output()
-	return strings.TrimRight(string(out), "\n")
-}
-
-func (s *TmuxSession) Close() error {
-	for _, fn := range s.cleanups {
-		fn()
-	}
-	cmd := exec.Command("tmux", "kill-session", "-t", s.name)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("tmux kill-session: %w\n%s", err, out)
-	}
-	return nil
-}
-
-// shellQuote wraps s in single quotes with proper escaping for POSIX shells.
-func shellQuote(s string) string {
-	return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"
-}
diff --git a/e2e/agents/vogon.go b/e2e/agents/vogon.go
deleted file mode 100644
index 054f6d9..0000000
--- a/e2e/agents/vogon.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package agents
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func init() {
-	if env := os.Getenv("E2E_AGENT"); env != "" && env != "vogon" {
-		return
-	}
-	// Only register if the binary exists (built by the test runner).
-	if _, err := exec.LookPath("vogon"); err != nil {
-		return
-	}
-	Register(&Vogon{})
-}
-
-// Vogon implements the Agent interface using a deterministic binary
-// that creates files and fires hooks without making any API calls.
-// Named after the Vogons from The Hitchhiker's Guide to the Galaxy.
-type Vogon struct{}
-
-func (v *Vogon) Name() string               { return "vogon" }
-func (v *Vogon) Binary() string             { return "vogon" }
-func (v *Vogon) TraceAgent() string         { return "vogon" }
-func (v *Vogon) PromptPattern() string      { return `>` }
-func (v *Vogon) TimeoutMultiplier() float64 { return 0.5 } // Faster than real agents
-
-func (v *Vogon) Bootstrap() error { return nil }
-
-func (v *Vogon) IsTransientError(_ Output, _ error) bool { return false }
-
-func (v *Vogon) RunPrompt(ctx context.Context, dir string, prompt string, opts ...Option) (Output, error) {
-	args := []string{"-p", prompt}
-	displayArgs := []string{"-p", fmt.Sprintf("%q", prompt)}
-	env := filterEnv(os.Environ(), "TRACE_TEST_TTY")
-	homeDir, err := vogonHomeDir(dir)
-	if err != nil {
-		return Output{}, err
-	}
-	env = append(env, "HOME="+homeDir)
-	return v.run(ctx, dir, args, displayArgs, env)
-}
-
-func (v *Vogon) StartSession(_ context.Context, dir string) (Session, error) {
-	name := fmt.Sprintf("vogon-test-%d", time.Now().UnixNano())
-	homeDir, err := vogonHomeDir(dir)
-	if err != nil {
-		return nil, err
-	}
-	s, err := NewTmuxSession(name, dir, []string{"TRACE_TEST_TTY"}, "env", "HOME="+homeDir, v.Binary())
-	if err != nil {
-		return nil, err
-	}
-
-	// Wait for the interactive prompt.
-	if _, err := s.WaitFor(`>`, 10*time.Second); err != nil {
-		_ = s.Close()
-		return nil, fmt.Errorf("waiting for startup prompt: %w", err)
-	}
-	s.stableAtSend = ""
-
-	return s, nil
-}
-
-// WriteSessionTranscript creates a deterministic vogon session transcript
-// without firing hooks or mutating the repository. Attach E2E tests use this
-// to prepare a session that `trace attach` can import.
-func (v *Vogon) WriteSessionTranscript(ctx context.Context, dir string, extraEnv []string, sessionID, userPrompt, assistantMessage string) (Output, error) {
-	args := []string{
-		"--write-session",
-		"--session-id", sessionID,
-		"--user-prompt", userPrompt,
-		"--assistant-message", assistantMessage,
-	}
-	displayArgs := []string{
-		"--write-session",
-		"--session-id", sessionID,
-		"--user-prompt", fmt.Sprintf("%q", userPrompt),
-		"--assistant-message", fmt.Sprintf("%q", assistantMessage),
-	}
-	env := filterEnv(os.Environ(), "TRACE_TEST_TTY")
-	env = append(env, extraEnv...)
-	if !hasEnvVar(extraEnv, "HOME") {
-		homeDir, err := vogonHomeDir(dir)
-		if err != nil {
-			return Output{}, err
-		}
-		env = append(env, "HOME="+homeDir)
-	}
-	return v.run(ctx, dir, args, displayArgs, env)
-}
-
-func (v *Vogon) run(ctx context.Context, dir string, args, displayArgs []string, env []string) (Output, error) {
-	cmd := exec.CommandContext(ctx, v.Binary(), args...)
-	cmd.Dir = dir
-	cmd.Stdin = nil
-	cmd.Env = env
-	setupProcessGroup(cmd)
-	cmd.WaitDelay = 5 * time.Second
-
-	var stdout, stderr strings.Builder
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	exitCode := 0
-	if err != nil {
-		exitErr := &exec.ExitError{}
-		if errors.As(err, &exitErr) {
-			exitCode = exitErr.ExitCode()
-		} else {
-			exitCode = -1
-		}
-	}
-
-	return Output{
-		Command:  v.Binary() + " " + strings.Join(displayArgs, " "),
-		Stdout:   stdout.String(),
-		Stderr:   stderr.String(),
-		ExitCode: exitCode,
-	}, err
-}
-
-func vogonHomeDir(dir string) (string, error) {
-	sum := sha256.Sum256([]byte(dir))
-	homeDir := filepath.Join(os.TempDir(), "vogon-e2e-home-"+hex.EncodeToString(sum[:6]))
-	if err := os.MkdirAll(homeDir, 0o755); err != nil {
-		return "", fmt.Errorf("create vogon home %s: %w", homeDir, err)
-	}
-	return homeDir, nil
-}
-
-func hasEnvVar(env []string, key string) bool {
-	for _, entry := range env {
-		if strings.HasPrefix(entry, key+"=") {
-			return true
-		}
-	}
-	return false
-}
diff --git a/e2e/bootstrap/main.go b/e2e/bootstrap/main.go
deleted file mode 100644
index 1871dc3..0000000
--- a/e2e/bootstrap/main.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Package main provides a pre-test bootstrap command that runs agent-specific
-// setup (auth config, warmup) before E2E tests. Usage: go run ./e2e/bootstrap
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/GrayCodeAI/trace/e2e/agents"
-)
-
-func main() {
-	// Optional: pass agent name as argument to bootstrap only that agent.
-	filter := ""
-	if len(os.Args) > 1 {
-		filter = os.Args[1]
-	}
-
-	for _, a := range agents.All() {
-		if filter != "" && a.Name() != filter {
-			continue
-		}
-		fmt.Fprintf(os.Stderr, "bootstrapping %s...\n", a.Name())
-		if err := a.Bootstrap(); err != nil {
-			fmt.Fprintf(os.Stderr, "bootstrap %s: %v\n", a.Name(), err)
-			os.Exit(1)
-		}
-		fmt.Fprintf(os.Stderr, "bootstrapping %s: done\n", a.Name())
-	}
-}
diff --git a/e2e/cmd/testreport/main.go b/e2e/cmd/testreport/main.go
deleted file mode 100644
index 798c6fb..0000000
--- a/e2e/cmd/testreport/main.go
+++ /dev/null
@@ -1,332 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"regexp"
-	"sort"
-	"strings"
-
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/interactive"
-)
-
-type TestEvent struct {
-	Action  string  `json:"Action"`
-	Package string  `json:"Package"`
-	Test    string  `json:"Test"`
-	Elapsed float64 `json:"Elapsed"`
-	Output  string  `json:"Output"`
-}
-
-type subtest struct {
-	name    string
-	action  string // pass, fail, skip
-	elapsed float64
-	output  []string
-}
-
-type parentTest struct {
-	name     string
-	action   string
-	elapsed  float64
-	children []*subtest
-}
-
-func main() {
-	colorFlag := flag.Bool("color", false, "Force color output (default: auto-detect TTY)")
-	outputFile := flag.String("o", "", "Write output to file (ANSI + .nocolor.txt)")
-	flag.Parse()
-
-	useColor := *colorFlag || interactive.IsTerminalWriter(os.Stdout)
-
-	r, err := openInput(flag.Arg(0))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "error: %v\n", err)
-		os.Exit(1)
-	}
-
-	parents := parseEvents(r)
-	report := renderReport(parents, useColor)
-
-	fmt.Print(report)
-
-	if *outputFile != "" {
-		colorReport := renderReport(parents, true)
-		if err := os.WriteFile(*outputFile, []byte(colorReport), 0o644); err != nil {
-			fmt.Fprintf(os.Stderr, "error writing %s: %v\n", *outputFile, err)
-			os.Exit(1)
-		}
-		noColorFile := strings.TrimSuffix(*outputFile, ".txt") + ".nocolor.txt"
-		plainReport := stripANSI(colorReport)
-		if err := os.WriteFile(noColorFile, []byte(plainReport), 0o644); err != nil {
-			fmt.Fprintf(os.Stderr, "error writing %s: %v\n", noColorFile, err)
-			os.Exit(1)
-		}
-	}
-}
-
-func openInput(path string) (io.Reader, error) {
-	if path == "" {
-		return os.Stdin, nil
-	}
-	return os.Open(path)
-}
-
-func parseEvents(r io.Reader) []*parentTest {
-	scanner := bufio.NewScanner(r)
-	scanner.Buffer(make([]byte, 0, 1024*1024), 1024*1024)
-
-	type testInfo struct {
-		action  string
-		elapsed float64
-		output  []string
-	}
-
-	tests := make(map[string]*testInfo)
-
-	for scanner.Scan() {
-		var ev TestEvent
-		if err := json.Unmarshal(scanner.Bytes(), &ev); err != nil {
-			continue
-		}
-		if ev.Test == "" {
-			continue
-		}
-
-		info, ok := tests[ev.Test]
-		if !ok {
-			info = &testInfo{}
-			tests[ev.Test] = info
-		}
-
-		switch ev.Action {
-		case "pass", "fail", "skip":
-			info.action = ev.Action
-			info.elapsed = ev.Elapsed
-		case "output":
-			info.output = append(info.output, ev.Output)
-		}
-	}
-
-	// Group by parent
-	parentMap := make(map[string]*parentTest)
-	for name, info := range tests {
-		parentName, childName := splitTestName(name)
-		if childName == "" {
-			// This is a parent test (or standalone)
-			p, ok := parentMap[parentName]
-			if !ok {
-				p = &parentTest{name: parentName}
-				parentMap[parentName] = p
-			}
-			p.action = info.action
-			p.elapsed = info.elapsed
-			continue
-		}
-
-		p, ok := parentMap[parentName]
-		if !ok {
-			p = &parentTest{name: parentName}
-			parentMap[parentName] = p
-		}
-		p.children = append(p.children, &subtest{
-			name:    childName,
-			action:  info.action,
-			elapsed: info.elapsed,
-			output:  info.output,
-		})
-	}
-
-	// Sort parents alphabetically, children alphabetically
-	var result []*parentTest
-	for _, p := range parentMap {
-		sort.Slice(p.children, func(i, j int) bool {
-			return p.children[i].name < p.children[j].name
-		})
-		result = append(result, p)
-	}
-	sort.Slice(result, func(i, j int) bool {
-		return result[i].name < result[j].name
-	})
-
-	return result
-}
-
-func splitTestName(name string) (parent, child string) {
-	parent, child, ok := strings.Cut(name, "/")
-	if !ok {
-		return name, ""
-	}
-	return parent, child
-}
-
-func renderReport(parents []*parentTest, color bool) string {
-	var b strings.Builder
-
-	// Count totals
-	var total, passed, failed, skipped int
-	for _, p := range parents {
-		total++
-		switch p.action {
-		case "pass":
-			passed++
-		case "fail":
-			failed++
-		case "skip":
-			skipped++
-		}
-	}
-
-	// Header
-	b.WriteString("E2E Test Report\n")
-	b.WriteString("═══════════════\n\n")
-	fmt.Fprintf(&b, "Total: %d  Passed: %d  Failed: %d  Skipped: %d\n\n", total, passed, failed, skipped)
-
-	for _, p := range parents {
-		icon := statusIcon(p.action, color)
-		if p.elapsed > 0 {
-			fmt.Fprintf(&b, "%s %s (%.1fs)\n", icon, p.name, p.elapsed)
-		} else {
-			fmt.Fprintf(&b, "%s %s\n", icon, p.name)
-		}
-
-		for _, c := range p.children {
-			cIcon := statusIcon(c.action, color)
-			switch c.action {
-			case "skip":
-				reason := extractSkipReason(c.output)
-				fmt.Fprintf(&b, "  %s %-20s SKIP", cIcon, c.name)
-				if reason != "" {
-					fmt.Fprintf(&b, ": %s", reason)
-				}
-				b.WriteString("\n")
-			case "fail":
-				fmt.Fprintf(&b, "  %s %-20s %.1fs\n", cIcon, c.name, c.elapsed)
-				for _, line := range filterFailureOutput(c.output) {
-					fmt.Fprintf(&b, "      %s\n", line)
-				}
-			default:
-				fmt.Fprintf(&b, "  %s %-20s %.1fs\n", cIcon, c.name, c.elapsed)
-			}
-		}
-
-		b.WriteString("\n")
-	}
-
-	// Rerun commands for failed tests
-	if failed > 0 {
-		b.WriteString("Rerun failed tests:\n")
-		for _, p := range parents {
-			if p.action != "fail" {
-				continue
-			}
-			var failedAgents []string
-			for _, c := range p.children {
-				if c.action == "fail" {
-					failedAgents = append(failedAgents, c.name)
-				}
-			}
-			if len(failedAgents) > 0 {
-				for _, agent := range failedAgents {
-					fmt.Fprintf(&b, "  mise run test:e2e --agent %s %s\n", agent, p.name)
-				}
-			} else {
-				// Standalone test with no subtests
-				fmt.Fprintf(&b, "  mise run test:e2e %s\n", p.name)
-			}
-		}
-		b.WriteString("\n")
-	}
-
-	// Footer banner
-	if failed > 0 {
-		banner := fmt.Sprintf("💥 FAILED (%d/%d passed) 💥", passed, total)
-		if color {
-			fmt.Fprintf(&b, "%s%s%s\n", colorRed, banner, colorReset)
-		} else {
-			b.WriteString(banner + "\n")
-		}
-	} else {
-		banner := fmt.Sprintf("🎉 ALL %d TESTS PASSED 🎉", total)
-		if color {
-			fmt.Fprintf(&b, "%s%s%s\n", colorGreen, banner, colorReset)
-		} else {
-			b.WriteString(banner + "\n")
-		}
-	}
-	b.WriteString("\n")
-
-	return b.String()
-}
-
-const (
-	colorGreen  = "\033[32m"
-	colorRed    = "\033[31m"
-	colorYellow = "\033[33m"
-	colorReset  = "\033[0m"
-)
-
-func statusIcon(action string, color bool) string {
-	switch action {
-	case "pass":
-		if color {
-			return colorGreen + "✓" + colorReset
-		}
-		return "✓"
-	case "fail":
-		if color {
-			return colorRed + "✗" + colorReset
-		}
-		return "✗"
-	case "skip":
-		if color {
-			return colorYellow + "−" + colorReset
-		}
-		return "−"
-	default:
-		return "?"
-	}
-}
-
-func extractSkipReason(output []string) string {
-	for _, line := range output {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "--- SKIP") || strings.HasPrefix(trimmed, "=== RUN") {
-			continue
-		}
-		if trimmed == "" {
-			continue
-		}
-		return trimmed
-	}
-	return ""
-}
-
-func filterFailureOutput(output []string) []string {
-	var lines []string
-	for _, line := range output {
-		trimmed := strings.TrimSpace(line)
-		if trimmed == "" {
-			continue
-		}
-		if strings.HasPrefix(trimmed, "=== RUN") ||
-			strings.HasPrefix(trimmed, "=== PAUSE") ||
-			strings.HasPrefix(trimmed, "=== CONT") ||
-			strings.HasPrefix(trimmed, "--- FAIL") ||
-			strings.HasPrefix(trimmed, "--- PASS") {
-			continue
-		}
-		lines = append(lines, trimmed)
-	}
-	return lines
-}
-
-var ansiRegexp = regexp.MustCompile(`\x1b\[[0-9;]*m`)
-
-func stripANSI(s string) string {
-	return ansiRegexp.ReplaceAllString(s, "")
-}
diff --git a/e2e/exploratory/README.md b/e2e/exploratory/README.md
deleted file mode 100644
index 362029d..0000000
--- a/e2e/exploratory/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Exploratory E2E Tests
-
-Tests in this directory are **not run by CI**. They exist for:
-
-- Validating bug fixes before the fix is merged (reference the Linear issue)
-- Prototyping new test scenarios before promoting to `tests/`
-- Reproducing reported issues
-
-## Running
-
-    go test -tags=e2e -count=1 -timeout=30m ./exploratory/...
-
-## Promoting to blessed
-
-Move the file to `tests/` — no other changes needed.
diff --git a/e2e/tests/alternates_test.go b/e2e/tests/alternates_test.go
deleted file mode 100644
index 34b57d6..0000000
--- a/e2e/tests/alternates_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-)
-
-// TestAlternates_RelativeObjectAlternate_CheckpointSync exercises the checkpoint
-// push/sync path in a repository whose objects are resolved through a RELATIVE
-// objects/info/alternates entry — the layout produced by a shared clone
-// (`git clone --shared` / `--reference`).
-//
-// go-git cannot follow relative alternates on its own (it strips "../" and
-// anchors at the filesystem root), so gitrepo.OpenPath rewrites them to absolute
-// before go-git reads them. Without that, the pre-push sync's
-// collectCommitsSince() fails with "object not found" on alternate-resident
-// checkpoint commits, even though git itself resolves them.
-func TestAlternates_RelativeObjectAlternate_CheckpointSync(t *testing.T) {
-	// Siblings under one parent so the relative alternate path is short and
-	// mirrors a real shared-clone layout.
-	parent := t.TempDir()
-	if resolved, err := filepath.EvalSymlinks(parent); err == nil {
-		parent = resolved
-	}
-	shared := filepath.Join(parent, "shared")
-	work := filepath.Join(parent, "work")
-	originBare := filepath.Join(parent, "origin.git")
-
-	// Build the shared object store. Its objects become the alternate; the work
-	// repo will hold none of these locally.
-	testutil.Git(t, parent, "init", "shared")
-	testutil.Git(t, shared, "config", "user.name", "Alt Test")
-	testutil.Git(t, shared, "config", "user.email", "alt@test.local")
-	writeRepoFile(t, shared, "base.txt", "base\n")
-	testutil.Git(t, shared, "add", ".")
-	testutil.Git(t, shared, "commit", "-m", "B0")
-	base := testutil.GitOutput(t, shared, "rev-parse", "HEAD")
-
-	// Checkpoint-branch commits K1<-K2, created in the shared store so they are
-	// only reachable from the work repo via the alternate.
-	testutil.Git(t, shared, "checkout", "-b", "cp")
-	writeRepoFile(t, shared, "k1.txt", "k1\n")
-	testutil.Git(t, shared, "add", ".")
-	testutil.Git(t, shared, "commit", "-m", "K1")
-	writeRepoFile(t, shared, "k2.txt", "k2\n")
-	testutil.Git(t, shared, "add", ".")
-	testutil.Git(t, shared, "commit", "-m", "K2")
-	k2 := testutil.GitOutput(t, shared, "rev-parse", "HEAD")
-
-	// A divergent commit R1 (sibling of the cp chain off B0) for the remote side,
-	// so the push is non-fast-forward and triggers the rebase/sync path.
-	testutil.Git(t, shared, "checkout", "-b", "remoteside", base)
-	writeRepoFile(t, shared, "r1.txt", "r1\n")
-	testutil.Git(t, shared, "add", ".")
-	testutil.Git(t, shared, "commit", "-m", "R1")
-	r1 := testutil.GitOutput(t, shared, "rev-parse", "HEAD")
-	testutil.Git(t, shared, "checkout", "cp")
-
-	// Bare remote seeded with R1 as the checkpoint branch tip.
-	testutil.Git(t, parent, "init", "--bare", "origin.git")
-	testutil.Git(t, shared, "push", originBare, "remoteside:refs/heads/trace/checkpoints/v1")
-
-	// Shared clone: --shared makes work resolve objects from shared via an
-	// alternate and copies no objects locally.
-	testutil.Git(t, parent, "clone", "--shared", "-o", "base", "shared", "work")
-	testutil.Git(t, work, "config", "user.name", "Alt Test")
-	testutil.Git(t, work, "config", "user.email", "alt@test.local")
-
-	// Rewrite the alternate to a RELATIVE path (git clone writes it absolute);
-	// this is the layout go-git mishandles and the fix repairs.
-	rel, err := filepath.Rel(
-		filepath.Join(work, ".git", "objects"),
-		filepath.Join(shared, ".git", "objects"),
-	)
-	if err != nil {
-		t.Fatalf("compute relative alternate: %v", err)
-	}
-	if !strings.HasPrefix(rel, "..") {
-		t.Fatalf("expected a relative alternate, got %q", rel)
-	}
-	altFile := filepath.Join(work, ".git", "objects", "info", "alternates")
-	if err := os.WriteFile(altFile, []byte(rel+"\n"), 0o644); err != nil {
-		t.Fatalf("write relative alternates: %v", err)
-	}
-
-	trace.Enable(t, work, "claude-code")
-
-	// Point the local checkpoint branch at K2 (object lives only in the
-	// alternate) and aim the checkpoint push at the bare remote.
-	testutil.Git(t, work, "update-ref", "refs/heads/trace/checkpoints/v1", k2)
-	testutil.Git(t, work, "remote", "add", "origin", originBare)
-
-	// Drive the real pre-push hook: non-ff vs the remote forces the sync/rebase
-	// path that reads the alternate-resident checkpoint commits via go-git.
-	cmd := exec.Command(trace.BinPath(), "hooks", "git", "pre-push", "origin")
-	cmd.Dir = work
-	cmd.Env = upsertEnv(os.Environ(), "TRACE_TEST_TTY", "0", "GIT_TERMINAL_PROMPT", "0")
-	combined, runErr := cmd.CombinedOutput()
-	output := string(combined)
-	t.Logf("trace pre-push output:\n%s", output)
-	if runErr != nil {
-		t.Fatalf("pre-push hook exited non-zero: %v\n%s", runErr, output)
-	}
-
-	if strings.Contains(output, "object not found") || strings.Contains(output, "couldn't sync") {
-		t.Fatalf("checkpoint sync could not resolve alternate-resident objects (relative alternate not followed):\n%s", output)
-	}
-
-	// The rebase should have cherry-picked K1,K2 onto R1 and pushed, advancing
-	// the remote checkpoint branch past R1.
-	got := testutil.GitOutput(t, originBare, "rev-parse", "refs/heads/trace/checkpoints/v1")
-	if got == r1 {
-		t.Fatalf("origin checkpoint branch did not advance past R1 (%s); sync/push did not complete:\n%s", r1, output)
-	}
-}
-
-func writeRepoFile(t *testing.T, dir, name, content string) {
-	t.Helper()
-	if err := os.WriteFile(filepath.Join(dir, name), []byte(content), 0o644); err != nil {
-		t.Fatalf("write %s: %v", name, err)
-	}
-}
-
-// upsertEnv returns env with each key=value pair set, replacing the first
-// occurrence of an existing entry for that key. Avoids the silent shadowing
-// that happens when a key is simply appended to os.Environ() but already
-// present in the inherited environment.
-func upsertEnv(env []string, pairs ...string) []string {
-	if len(pairs)%2 != 0 {
-		panic("upsertEnv requires an even number of key/value arguments")
-	}
-	out := make([]string, len(env))
-	copy(out, env)
-	for i := 0; i < len(pairs); i += 2 {
-		key, value := pairs[i], pairs[i+1]
-		prefix := key + "="
-		entry := prefix + value
-		replaced := false
-		for j, e := range out {
-			if strings.HasPrefix(e, prefix) {
-				out[j] = entry
-				replaced = true
-				break
-			}
-		}
-		if !replaced {
-			out = append(out, entry)
-		}
-	}
-	return out
-}
diff --git a/e2e/tests/attach_test.go b/e2e/tests/attach_test.go
deleted file mode 100644
index 90bcf12..0000000
--- a/e2e/tests/attach_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/agents"
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestAttachSessionCreatesCheckpoint(t *testing.T) {
-	testutil.ForEachNamedAgent(t, 2*time.Minute, []string{"vogon"}, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		homeDir := t.TempDir()
-		extraEnv := []string{"HOME=" + homeDir}
-		vogon := requireVogonAgent(t, s)
-
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-		s.Git(t, "checkout", "-b", "feature")
-
-		sessionID := "attach-vogon-session"
-		_, writeErr := vogon.WriteSessionTranscript(ctx, s.Dir, extraEnv, sessionID, "explain the feature module", "The feature module organizes related work.")
-		require.NoError(t, writeErr, "prepare vogon session")
-
-		out, err := trace.AttachWithEnv(s.Dir, extraEnv, sessionID, s.Agent.TraceAgent())
-		require.NoError(t, err, "trace attach failed: %s", out)
-
-		assert.Contains(t, out, "Attached session "+sessionID)
-		assert.Contains(t, out, "Created checkpoint")
-		checkpointID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-
-		transcriptPath := filepath.Join(homeDir, ".vogon", "sessions", sessionID+".jsonl")
-		require.NoError(t, os.Remove(transcriptPath), "remove prepared vogon session before resume")
-
-		resumeOut, resumeErr := trace.ResumeWithEnv(s.Dir, "feature", extraEnv)
-		require.NoError(t, resumeErr, "trace resume failed after attach: %s", resumeOut)
-		assert.Contains(t, resumeOut, sessionID, "resume output should reference the attached session")
-		assert.Contains(t, resumeOut, "To continue", "resume output should show follow-up instructions")
-		_, statErr := os.Stat(transcriptPath)
-		assert.NoError(t, statErr, "resume should restore the transcript into the isolated vogon HOME")
-
-		s.Git(t, "checkout", mainBranch)
-		explainOut := trace.Explain(t, s.Dir, checkpointID)
-		assert.Contains(t, explainOut, "● Checkpoint "+checkpointID)
-	})
-}
-
-func TestAttachSessionAddsToExistingCheckpoint(t *testing.T) {
-	testutil.ForEachNamedAgent(t, 3*time.Minute, []string{"vogon"}, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		homeDir := t.TempDir()
-		extraEnv := []string{"HOME=" + homeDir}
-		vogon := requireVogonAgent(t, s)
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file at docs/existing.md with a short paragraph about existing checkpoints. Do not ask for confirmation or approval, just make the change.")
-		require.NoError(t, err, "agent failed")
-
-		checkpointBefore := ""
-		if _, refErr := testutil.GitOutputErr(s.Dir, "rev-parse", "--verify", testutil.CheckpointVerifyRef()); refErr == nil {
-			checkpointBefore = testutil.CurrentCheckpointRef(t, s.Dir)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add existing checkpoint doc")
-		testutil.WaitForCheckpointAdvanceFrom(t, s.Dir, checkpointBefore, 30*time.Second)
-
-		checkpointID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-
-		sessionID := "attach-second-vogon-session"
-		_, writeErr := vogon.WriteSessionTranscript(ctx, s.Dir, extraEnv, sessionID, "summarize the checkpoint flow", "The checkpoint flow stores the session on the existing checkpoint.")
-		require.NoError(t, writeErr, "prepare vogon session")
-
-		out, attachErr := trace.AttachWithEnv(s.Dir, extraEnv, sessionID, s.Agent.TraceAgent())
-		require.NoError(t, attachErr, "trace attach failed: %s", out)
-
-		assert.Contains(t, out, "Attached session "+sessionID)
-		assert.Contains(t, out, "Added to existing checkpoint "+checkpointID)
-		assert.Equal(t, checkpointID, testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD"),
-			"attach should reuse the existing checkpoint trailer")
-
-		checkpointMeta := testutil.ReadCheckpointMetadata(t, s.Dir, checkpointID)
-		assert.Len(t, checkpointMeta.Sessions, 2, "attach should append a second session to checkpoint metadata")
-		attachedSessionMeta := testutil.ReadSessionMetadata(t, s.Dir, checkpointID, 1)
-		assert.Equal(t, sessionID, attachedSessionMeta.SessionID, "attach should persist the attached session metadata")
-	})
-}
-
-func requireVogonAgent(t *testing.T, s *testutil.RepoState) *agents.Vogon {
-	t.Helper()
-
-	vogon, ok := s.Agent.(*agents.Vogon)
-	require.True(t, ok, "expected Vogon agent")
-	return vogon
-}
diff --git a/e2e/tests/attribution_test.go b/e2e/tests/attribution_test.go
deleted file mode 100644
index fe8edb3..0000000
--- a/e2e/tests/attribution_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestLineAttributionReasonable: agent creates a file, attribution metadata
-// should reflect that agent wrote most/all of the content.
-// GH #344: attribution metadata is significantly off for simple agent-created content.
-func TestLineAttributionReasonable(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create a single markdown file at docs/example.md with a few paragraphs about software testing. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/example.md")
-
-		s.Git(t, "add", "docs/")
-		s.Git(t, "commit", "-m", "Add example.md")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		sm := testutil.ReadSessionMetadata(t, s.Dir, cpID, 0)
-
-		assert.Greater(t, sm.InitialAttribution.AgentLines, 0,
-			"agent lines should be > 0")
-		assert.Greater(t, sm.InitialAttribution.TotalCommitted, 0,
-			"total committed should be > 0")
-		assert.Greater(t, sm.InitialAttribution.AgentPercentage, 50.0,
-			"agent created 100%% of content, percentage should be > 50%%")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestInteractiveAttributionOnAgentCommit: agent creates a file and commits it in the
-// same prompt (interactive session). The first commit's checkpoint should have
-// initial_attribution populated.
-func TestInteractiveAttributionOnAgentCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		prompt := s.Agent.PromptPattern()
-
-		session := s.StartSession(t, ctx)
-		if session == nil {
-			t.Skipf("agent %s does not support interactive mode", s.Agent.Name())
-		}
-
-		s.WaitFor(t, session, prompt, 30*time.Second)
-
-		s.Send(t, session, "create a file called hello.txt containing 'hello world', then commit it. Do not ask for confirmation.")
-		s.WaitFor(t, session, prompt, 90*time.Second)
-		testutil.AssertNewCommits(t, s, 1)
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		sm := testutil.ReadSessionMetadata(t, s.Dir, cpID, 0)
-
-		assert.Greater(t, sm.InitialAttribution.AgentLines, 0,
-			"agent lines should be > 0 on first agent commit")
-		assert.Greater(t, sm.InitialAttribution.TotalCommitted, 0,
-			"total committed should be > 0 on first agent commit")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestInteractiveAttributionMultiCommitSameSession: two prompts in the same interactive
-// session, agent modifies the same file and commits both times. The second
-// checkpoint's initial_attribution should have non-zero values.
-func TestInteractiveAttributionMultiCommitSameSession(t *testing.T) {
-	testutil.ForEachAgent(t, 4*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		prompt := s.Agent.PromptPattern()
-
-		session := s.StartSession(t, ctx)
-		if session == nil {
-			t.Skipf("agent %s does not support interactive mode", s.Agent.Name())
-		}
-
-		s.WaitFor(t, session, prompt, 30*time.Second)
-
-		// First prompt: create file and commit.
-		s.Send(t, session, "create a file called poem.txt with a short poem about coding, then commit it. Do not ask for confirmation.")
-		s.WaitFor(t, session, prompt, 60*time.Second)
-		testutil.AssertNewCommits(t, s, 1)
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		// Second prompt: modify same file and commit again.
-		s.Send(t, session, "add another stanza to poem.txt about debugging, then create a NEW commit (do not amend). Do not ask for confirmation.")
-		s.WaitFor(t, session, prompt, 90*time.Second)
-		testutil.AssertNewCommitsWithTimeout(t, s, 2, 60*time.Second)
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-		sm := testutil.WaitForSessionMetadata(t, s.Dir, cpID2, 0, 10*time.Second)
-
-		assert.Greater(t, sm.InitialAttribution.AgentLines, 0,
-			"agent lines should be > 0 on second commit")
-		assert.Greater(t, sm.InitialAttribution.TotalCommitted, 0,
-			"total committed should be > 0 on second commit")
-		assert.Greater(t, sm.InitialAttribution.AgentPercentage, 50.0,
-			"agent wrote all content, percentage should be > 50%%")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestInteractiveShadowBranchCleanedAfterAgentCommit: after an agent creates a file
-// and commits it, there should be no lingering shadow branches. Shadow
-// branches match trace/* but are not trace/checkpoints/*.
-func TestInteractiveShadowBranchCleanedAfterAgentCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		prompt := s.Agent.PromptPattern()
-
-		session := s.StartSession(t, ctx)
-		if session == nil {
-			t.Skipf("agent %s does not support interactive mode", s.Agent.Name())
-		}
-
-		s.WaitFor(t, session, prompt, 30*time.Second)
-
-		s.Send(t, session, "create a file called hello.txt containing 'hello world', then commit it. Do not ask for confirmation.")
-		s.WaitFor(t, session, prompt, 90*time.Second)
-		testutil.AssertNewCommits(t, s, 1)
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestAttributionMixedHumanAndAgent: agent creates one file, human creates
-// another with known content, both are committed together. Attribution should
-// correctly separate agent lines from human lines.
-func TestAttributionMixedHumanAndAgent(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Agent creates a file.
-		_, err := s.RunPrompt(t, ctx,
-			"create a file called agent.txt with a few lines about software testing. Do not create any other files. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "agent.txt")
-
-		// Count agent lines before human changes.
-		agentContent, err := os.ReadFile(filepath.Join(s.Dir, "agent.txt"))
-		if err != nil {
-			t.Fatalf("read agent.txt: %v", err)
-		}
-		agentLines := len(strings.Split(strings.TrimRight(string(agentContent), "\n"), "\n"))
-
-		// Human creates a known file.
-		humanContent := "line one\nline two\nline three\n"
-		humanLines := 3
-		if err := os.WriteFile(filepath.Join(s.Dir, "human.txt"), []byte(humanContent), 0o644); err != nil {
-			t.Fatalf("write human.txt: %v", err)
-		}
-
-		// Commit both (stage only intended files — attribution checks exact line counts).
-		s.Git(t, "add", "agent.txt", "human.txt")
-		s.Git(t, "commit", "-m", "Add agent and human files")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		sm := testutil.ReadSessionMetadata(t, s.Dir, cpID, 0)
-
-		assert.Equal(t, agentLines, sm.InitialAttribution.AgentLines,
-			"agent_lines should match actual lines in agent.txt")
-		assert.Equal(t, humanLines, sm.InitialAttribution.HumanAdded,
-			"human_added should match lines in human.txt")
-		assert.Equal(t, agentLines+humanLines, sm.InitialAttribution.TotalCommitted,
-			"total_committed should be sum of agent and human lines")
-		assert.Greater(t, sm.InitialAttribution.AgentPercentage, 0.0,
-			"agent_percentage should be > 0 when agent wrote content")
-		assert.Less(t, sm.InitialAttribution.AgentPercentage, 100.0,
-			"agent_percentage should be < 100 when human also wrote content")
-		// Shadow branch may persist if agent created extra files beyond
-		// agent.txt — we only stage the two known files for precise
-		// attribution counting.
-	})
-}
diff --git a/e2e/tests/checkpoint_metadata_test.go b/e2e/tests/checkpoint_metadata_test.go
deleted file mode 100644
index b8a82e0..0000000
--- a/e2e/tests/checkpoint_metadata_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-)
-
-// TestCheckpointMetadataDeepValidation runs deep validation on checkpoint metadata
-// including transcript JSONL, content hash, and prompt content.
-func TestCheckpointMetadataDeepValidation(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		prompt := "Create a file called validated.go with content 'package main; func Validated() {}'. " +
-			"Create only this file. Do not commit. " +
-			"Do not ask for confirmation, just make the change."
-
-		_, err := s.RunPrompt(t, ctx, prompt)
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "validated.go")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add validated.go")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.ValidateCheckpointDeep(t, s.Dir, testutil.DeepCheckpointValidation{
-			CheckpointID: cpID,
-			Strategy:     "manual-commit",
-			FilesTouched: []string{"validated.go"},
-		})
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/clean_test.go b/e2e/tests/clean_test.go
deleted file mode 100644
index 1ca4108..0000000
--- a/e2e/tests/clean_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestCleanCurrentHead(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/clean.md about cleaning stale session data. Do not commit the file. Do not ask for confirmation or approval, just make the change.")
-		require.NoError(t, err, "agent failed")
-
-		testutil.AssertFileExists(t, s.Dir, "docs/clean.md")
-		testutil.WaitForSessionIdle(t, s.Dir, 30*time.Second)
-
-		sessionStatesBefore := sessionStateFiles(t, s.Dir)
-		require.NotEmpty(t, sessionStatesBefore, "expected session state files before clean")
-
-		shadowBranchesBefore := testutil.ShadowBranches(t, s.Dir)
-		require.NotEmpty(t, shadowBranchesBefore, "expected shadow branches before clean")
-
-		dryRunOut := trace.CleanDryRun(t, s.Dir)
-		assert.Contains(t, dryRunOut, "Would clean the following items:")
-		assert.Contains(t, dryRunOut, "Session states")
-		assert.Contains(t, dryRunOut, "Shadow branch")
-		assert.Contains(t, dryRunOut, "Run without --dry-run to clean these items.")
-
-		assert.ElementsMatch(t, sessionStatesBefore, sessionStateFiles(t, s.Dir),
-			"dry-run should not delete session state files")
-		assert.ElementsMatch(t, shadowBranchesBefore, testutil.ShadowBranches(t, s.Dir),
-			"dry-run should not delete shadow branches")
-
-		cleanOut := trace.CleanForce(t, s.Dir)
-		assert.Contains(t, cleanOut, "Cleared session state")
-		assert.Contains(t, cleanOut, "Deleted shadow branch")
-
-		assert.Empty(t, sessionStateFiles(t, s.Dir), "clean should remove current HEAD session state files")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-func sessionStateFiles(t *testing.T, dir string) []string {
-	t.Helper()
-
-	stateDir := filepath.Join(dir, ".git", "trace-sessions")
-	entries, err := os.ReadDir(stateDir)
-	if os.IsNotExist(err) {
-		return nil
-	}
-	require.NoError(t, err)
-
-	var files []string
-	for _, entry := range entries {
-		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".json") || strings.HasSuffix(entry.Name(), ".tmp") {
-			continue
-		}
-		files = append(files, entry.Name())
-	}
-	return files
-}
diff --git a/e2e/tests/codex_resume_test.go b/e2e/tests/codex_resume_test.go
deleted file mode 100644
index 0cbc9a9..0000000
--- a/e2e/tests/codex_resume_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"regexp"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/agents"
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/require"
-)
-
-func TestCodexResumeRestoredSessionWithSanitizedCompactedHistory(t *testing.T) {
-	testutil.ForEachAgent(t, 4*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		if s.Agent.Name() != "codex" {
-			t.Skip("Codex-only native resume coverage")
-		}
-
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-		s.Git(t, "checkout", "-b", "feature")
-
-		session := s.StartSession(t, ctx)
-		codexSession, ok := session.(*agents.CodexSession)
-		require.True(t, ok, "expected Codex session type")
-
-		s.WaitFor(t, session, s.Agent.PromptPattern(), 30*time.Second)
-		s.Send(t, session, "create a file at docs/hello.md with a short paragraph about greetings. Do not commit. Do not ask for confirmation.")
-		s.WaitFor(t, session, s.Agent.PromptPattern(), 90*time.Second)
-		testutil.AssertFileExists(t, s.Dir, "docs/hello.md")
-
-		rolloutPath := findCodexRollout(t, codexSession.Home())
-		sessionID := readCodexSessionID(t, rolloutPath)
-		appendCompactedEncryptedHistory(t, rolloutPath)
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add hello doc")
-		testutil.WaitForSessionIdle(t, s.Dir, 15*time.Second)
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		s.Git(t, "checkout", mainBranch)
-
-		out, err := trace.ResumeWithEnv(s.Dir, "feature", []string{"CODEX_HOME=" + codexSession.Home()})
-		require.NoError(t, err, "trace resume failed: %s", out)
-		require.Contains(t, out, "codex resume "+sessionID)
-
-		resumed, err := s.Agent.(*agents.Codex).ResumeSession(ctx, s.Dir, codexSession.Home(), sessionID)
-		require.NoError(t, err)
-		defer resumed.Close()
-
-		content, waitErr := resumed.WaitFor(s.Agent.PromptPattern(), 45*time.Second)
-		require.NoError(t, waitErr, "resumed Codex session should reach prompt")
-		require.NotContains(t, content, "invalid_encrypted_content")
-	})
-}
-
-func findCodexRollout(t *testing.T, codexHome string) string {
-	t.Helper()
-
-	matches, err := filepath.Glob(filepath.Join(codexHome, "sessions", "*", "*", "*", "rollout-*.jsonl"))
-	require.NoError(t, err)
-	require.Len(t, matches, 1, "expected exactly one Codex rollout in isolated CODEX_HOME")
-	return matches[0]
-}
-
-func readCodexSessionID(t *testing.T, rolloutPath string) string {
-	t.Helper()
-
-	data, err := os.ReadFile(rolloutPath)
-	require.NoError(t, err)
-
-	re := regexp.MustCompile(`(?m)^\{"timestamp":".*","type":"session_meta","payload":\{"id":"([^"]+)"`)
-	m := re.FindSubmatch(data)
-	require.Len(t, m, 2, "session_meta id not found in rollout")
-	return string(m[1])
-}
-
-func appendCompactedEncryptedHistory(t *testing.T, rolloutPath string) {
-	t.Helper()
-
-	line := map[string]any{
-		"timestamp": "2026-04-08T12:00:00.000Z",
-		"type":      "compacted",
-		"payload": map[string]any{
-			"message": "",
-			"replacement_history": []map[string]any{
-				{
-					"type": "message",
-					"role": "user",
-					"content": []map[string]any{
-						{"type": "input_text", "text": "hello"},
-					},
-				},
-				{
-					"type":              "reasoning",
-					"summary":           []map[string]any{{"text": "brief"}},
-					"encrypted_content": "REDACTED",
-				},
-				{
-					"type":              "compaction",
-					"encrypted_content": "REDACTED",
-				},
-			},
-		},
-	}
-
-	encoded, err := json.Marshal(line)
-	require.NoError(t, err)
-
-	f, err := os.OpenFile(rolloutPath, os.O_APPEND|os.O_WRONLY, 0)
-	require.NoError(t, err)
-	defer f.Close()
-
-	_, err = f.Write(append(encoded, '\n'))
-	require.NoError(t, err)
-}
diff --git a/e2e/tests/deleted_files_test.go b/e2e/tests/deleted_files_test.go
deleted file mode 100644
index 967591b..0000000
--- a/e2e/tests/deleted_files_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestDeletedFilesCommitDeletion tests that deleting a file during a session
-// doesn't break checkpointing. The deletion is bundled with a new file in a
-// single commit (via git add .), not a separate git rm commit.
-func TestDeletedFilesCommitDeletion(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		require.NoError(t, os.WriteFile(
-			filepath.Join(s.Dir, "to_delete.go"),
-			[]byte("package main\n\nfunc ToDelete() {}\n"), 0o644,
-		))
-		s.Git(t, "add", "to_delete.go")
-		s.Git(t, "commit", "--no-verify", "-m", "Add to_delete.go")
-
-		_, err := s.RunPrompt(t, ctx,
-			"Do two things: (1) Delete the file to_delete.go using rm. "+
-				"(2) Create a new file replacement.go with content 'package main; func Replacement() {}'. "+
-				"Do both tasks. Do not commit. "+
-				"Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		assert.NoFileExists(t, filepath.Join(s.Dir, "to_delete.go"))
-		testutil.AssertFileExists(t, s.Dir, "replacement.go")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add replacement")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-
-		// git add . already staged the deletion of to_delete.go above,
-		// so no separate git rm + commit is needed.
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/disable_test.go b/e2e/tests/disable_test.go
deleted file mode 100644
index ed2dd60..0000000
--- a/e2e/tests/disable_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestTraceDisable: after running `trace disable`, commits should not
-// produce checkpoints or trailers.
-func TestTraceDisable(t *testing.T) {
-	testutil.ForEachAgent(t, 1*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		trace.Disable(t, s.Dir)
-
-		if err := os.MkdirAll(filepath.Join(s.Dir, "docs"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "docs", "manual.md"), []byte("# Manual\n"), 0o644); err != nil {
-			t.Fatalf("write file: %v", err)
-		}
-
-		s.Git(t, "add", "docs/")
-		s.Git(t, "commit", "-m", "Commit after disable")
-
-		// Give post-commit hook time to fire (if it were going to).
-		time.Sleep(5 * time.Second)
-
-		testutil.AssertCheckpointNotAdvanced(t, s)
-
-		trailer := testutil.GetCheckpointTrailer(t, s.Dir, "HEAD")
-		assert.Empty(t, trailer, "disabled repo should not add checkpoint trailer")
-	})
-}
diff --git a/e2e/tests/doctor_test.go b/e2e/tests/doctor_test.go
deleted file mode 100644
index 2b97b06..0000000
--- a/e2e/tests/doctor_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestDoctorNoIssues verifies the manual-plan "no issues detected" scenario.
-// After a normal checkpointed commit and push, doctor should report clean
-// metadata/session health for the active suite-wide checkpoints mode.
-func TestDoctorNoIssues(t *testing.T) {
-	testutil.ForEachNamedAgent(t, 3*time.Minute, []string{"vogon"}, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_ = testutil.SetupBareRemote(t, s)
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-		s.Git(t, "push")
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file at docs/doctor.md with a short paragraph about checkpoint health. Do not ask for confirmation or approval, just make the change.")
-		require.NoError(t, err, "agent failed")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add doctor coverage doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		s.Git(t, "push")
-		testutil.PushCheckpointRefs(t, s.Dir)
-
-		out := trace.Doctor(t, s.Dir)
-
-		assert.Contains(t, out, "Metadata branches: OK", "doctor should report healthy metadata state")
-		assert.Contains(t, out, "No stuck sessions found.", "doctor should report no stuck sessions")
-
-		switch testutil.CheckpointsMode() {
-		case "legacy":
-			assert.NotContains(t, out, "v2 refs", "legacy mode should not run v2 doctor checks")
-			assert.NotContains(t, out, "v2 checkpoint counts", "legacy mode should not run v2 count checks")
-			assert.NotContains(t, out, "v2 generations", "legacy mode should not run v2 generation checks")
-			assert.NotContains(t, out, "v2 /main ref", "legacy mode should not run v2 connectivity checks")
-		default:
-			assert.Contains(t, out, "v2 /main ref: OK", "doctor should report healthy v2 /main connectivity")
-			assert.Contains(t, out, "v2 refs: OK", "doctor should report healthy v2 refs")
-			assert.Contains(t, out, "v2 checkpoint counts: OK", "doctor should report healthy v2 checkpoint counts")
-			assert.Contains(t, out, "v2 generations: OK", "doctor should report healthy v2 generation state")
-		}
-	})
-}
diff --git a/e2e/tests/edge_cases_test.go b/e2e/tests/edge_cases_test.go
deleted file mode 100644
index dc04b55..0000000
--- a/e2e/tests/edge_cases_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/agents"
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestAgentContinuesAfterCommit: agent commits, then makes more changes in a
-// second prompt. User commits those. Both commits should have distinct checkpoint IDs.
-func TestAgentContinuesAfterCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// First prompt — agent creates and commits.
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/red.md with a paragraph about the colour red, then commit it. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		cpBranchAfterFirst := testutil.GitOutput(t, s.Dir, "rev-parse", "trace/checkpoints/v1")
-
-		// Second prompt — agent creates another file, user commits.
-		_, err = s.RunPrompt(t, ctx,
-			"create a markdown file at docs/blue.md with a paragraph about the colour blue. Do not commit it, only create the file. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add blue.md")
-
-		// Wait for checkpoint branch to advance past the first checkpoint.
-		deadline := time.Now().Add(15 * time.Second)
-		for time.Now().Before(deadline) {
-			after := testutil.GitOutput(t, s.Dir, "rev-parse", "trace/checkpoints/v1")
-			if after != cpBranchAfterFirst {
-				break
-			}
-			time.Sleep(200 * time.Millisecond)
-		}
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		assert.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestAgentAmendsCommit: agent creates and commits, then amends the commit
-// with additional changes. The amended commit should still have a valid
-// checkpoint trailer.
-func TestAgentAmendsCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/red.md with a paragraph about the colour red, then git add and git commit it on the current branch. Do not ask for confirmation, just make the change. Do not use worktrees or create new branches.")
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-
-		// Agent creates another file and amends the previous commit.
-		_, err = s.RunPrompt(t, ctx,
-			"create a markdown file at docs/blue.md with a paragraph about the colour blue, then amend the previous commit to include it using git commit --amend --no-edit. Do not ask for confirmation, just make the change. Do not use worktrees or create new branches.")
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/blue.md")
-
-		// The amended commit should still carry a valid checkpoint trailer.
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestDirtyWorkingTree: human has uncommitted changes when the agent creates
-// and commits its own file. Human's changes should be untouched.
-func TestDirtyWorkingTree(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Human creates an uncommitted file.
-		if err := os.MkdirAll(filepath.Join(s.Dir, "human"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "human", "notes.md"), []byte("# Human notes\n"), 0o644); err != nil {
-			t.Fatalf("write file: %v", err)
-		}
-
-		prompt := "create a markdown file at docs/red.md with a paragraph about the colour red, then commit it. Do not ask for confirmation, just make the change. Do not create the file under human/."
-
-		// Agent creates and commits its own file.
-		_, err := s.RunPrompt(t, ctx, prompt)
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-
-		// Human's uncommitted file should be untouched.
-		data, err := os.ReadFile(filepath.Join(s.Dir, "human", "notes.md"))
-		if err != nil {
-			t.Fatalf("read human file: %v", err)
-		}
-		assert.Equal(t, "# Human notes\n", string(data), "human file should be untouched")
-
-		testutil.AssertCommitLinkedToCheckpoint(t, s.Dir, "HEAD")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestRapidSequentialCommits: agent makes 3 separate commits in quick
-// succession. Each should get its own checkpoint trailer.
-func TestRapidSequentialCommits(t *testing.T) {
-	testutil.ForEachAgent(t, 4*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"Do these steps in exact order: "+
-				"(1) Create docs/red.md with a paragraph about the colour red. Run: git add docs/red.md && git commit -m 'Add red.md'. "+
-				"(2) Create docs/blue.md with a paragraph about the colour blue. Run: git add docs/blue.md && git commit -m 'Add blue.md'. "+
-				"(3) Create docs/green.md with a paragraph about the colour green. Run: git add docs/green.md && git commit -m 'Add green.md'. "+
-				"Do not ask for confirmation, just execute each step.",
-			agents.WithPromptTimeout(120*time.Second))
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/blue.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/green.md")
-		testutil.AssertNewCommits(t, s, 3)
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		for i := 0; i < 3; i++ {
-			ref := fmt.Sprintf("HEAD~%d", i)
-			testutil.AssertHasCheckpointTrailer(t, s.Dir, ref)
-		}
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestAgentCommitsMidTurnUserCommitsRemainder tests that when the agent commits
-// some files during its turn and the user commits the rest after, both get
-// valid checkpoint trailers with distinct IDs.
-func TestAgentCommitsMidTurnUserCommitsRemainder(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"Do these tasks in order: "+
-				"(1) Create file agent_mid1.go with content 'package main; func AgentMid1() {}'. "+
-				"(2) Create file agent_mid2.go with content 'package main; func AgentMid2() {}'. "+
-				"(3) Run: git add agent_mid1.go agent_mid2.go && git commit -m 'Agent adds mid1 and mid2'. "+
-				"(4) Create file user_remainder.go with content 'package main; func UserRemainder() {}'. "+
-				"Do all tasks in order. Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "agent_mid1.go")
-		testutil.AssertFileExists(t, s.Dir, "agent_mid2.go")
-		testutil.AssertFileExists(t, s.Dir, "user_remainder.go")
-
-		testutil.AssertNewCommits(t, s, 1)
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		s.Git(t, "add", "user_remainder.go")
-		s.Git(t, "commit", "-m", "Add user remainder")
-
-		userCpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		agentCpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD~1")
-		testutil.WaitForCheckpointExists(t, s.Dir, userCpID, 30*time.Second)
-
-		assert.NotEqual(t, userCpID, agentCpID,
-			"user and agent checkpoints should have distinct IDs")
-		testutil.AssertCheckpointExists(t, s.Dir, userCpID)
-		testutil.AssertCheckpointExists(t, s.Dir, agentCpID)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/existing_files_test.go b/e2e/tests/existing_files_test.go
deleted file mode 100644
index 33b874e..0000000
--- a/e2e/tests/existing_files_test.go
+++ /dev/null
@@ -1,175 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestModifyExistingTrackedFile: agent modifies an existing tracked file
-// (not a new file), user commits. Checkpoint should be created.
-func TestModifyExistingTrackedFile(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Create a tracked file.
-		if err := os.MkdirAll(filepath.Join(s.Dir, "src"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "src", "config.go"), []byte("package src\n\n// Config placeholder.\n"), 0o644); err != nil {
-			t.Fatalf("write file: %v", err)
-		}
-		s.Git(t, "add", "src/")
-		s.Git(t, "commit", "-m", "Add initial config.go")
-
-		// Agent modifies the existing file.
-		_, err := s.RunPrompt(t, ctx,
-			"modify src/config.go to add a function GetPort() int that returns 8080. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Update config.go")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestMixedNewAndModifiedFiles: agent modifies an existing file AND creates
-// new files in the same session. User commits the modification first, then the
-// new files. Two distinct checkpoints.
-func TestMixedNewAndModifiedFiles(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Create a tracked file.
-		if err := os.MkdirAll(filepath.Join(s.Dir, "src"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "src", "main.go"), []byte("package main\n"), 0o644); err != nil {
-			t.Fatalf("write file: %v", err)
-		}
-		s.Git(t, "add", "src/")
-		s.Git(t, "commit", "-m", "Add initial main.go")
-
-		// Agent modifies main.go AND creates new files.
-		_, err := s.RunPrompt(t, ctx,
-			"modify src/main.go to add a main function, and also create exactly two new files: src/utils.go with a helper function and src/types.go with a User type definition. Put them directly in the src/ directory, not in any subdirectory. Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		// Commit the modification first.
-		s.Git(t, "add", "src/main.go")
-		s.Git(t, "commit", "-m", "Update main.go")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		// Commit remaining files (use "." to catch any extras the agent created).
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add utils.go and types.go")
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-
-		assert.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestInteractiveContentOverlapRevertNewFile: agent creates a file, user replaces its
-// content entirely with different text and commits while the session is still
-// idle (not ended). The content-aware overlap detection should prevent a
-// checkpoint trailer (content mismatch on new file). The shadow branch
-// correctly persists because the session is still active and no condensation
-// occurred.
-func TestInteractiveContentOverlapRevertNewFile(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		prompt := s.Agent.PromptPattern()
-
-		session := s.StartSession(t, ctx)
-		if session == nil {
-			t.Skipf("agent %s does not support interactive mode", s.Agent.Name())
-		}
-
-		s.WaitFor(t, session, prompt, 30*time.Second)
-
-		s.Send(t, session, "create a markdown file at docs/red.md with a paragraph about the colour red. Don't commit, I want to make more changes.")
-		s.WaitFor(t, session, prompt, 60*time.Second)
-		testutil.WaitForFileExists(t, s.Dir, "docs/red.md", 30*time.Second)
-
-		// Wait for session to transition from ACTIVE to IDLE. The prompt
-		// pattern may appear before the turn-end hook completes (race between
-		// TUI rendering and hook execution, especially with OpenCode).
-		testutil.WaitForSessionIdle(t, s.Dir, 15*time.Second)
-
-		// Session is now idle (turn ended, waiting for next prompt).
-		// User replaces the content entirely.
-		if err := os.WriteFile(filepath.Join(s.Dir, "docs", "red.md"), []byte("# Completely different content\n\nNothing about red here.\n"), 0o644); err != nil {
-			t.Fatalf("overwrite file: %v", err)
-		}
-
-		s.Git(t, "add", "docs/red.md")
-		s.Git(t, "commit", "-m", "Replace red.md content")
-
-		// Give post-commit hook time to fire.
-		time.Sleep(5 * time.Second)
-
-		testutil.AssertNoCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointNotAdvanced(t, s)
-		// Shadow branch correctly persists: session is idle and no
-		// condensation occurred (content mismatch on new file).
-		testutil.AssertHasShadowBranches(t, s.Dir)
-	})
-}
-
-// TestModifiedFileAlwaysGetsCheckpoint: agent modifies an existing tracked
-// file, user writes completely different content and commits. A checkpoint
-// should STILL be created because content-aware overlap detection only
-// applies to new files, not modifications to existing tracked files.
-func TestModifiedFileAlwaysGetsCheckpoint(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Create a tracked file.
-		if err := os.MkdirAll(filepath.Join(s.Dir, "src"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "src", "config.go"), []byte("package src\n\n// Config placeholder.\n"), 0o644); err != nil {
-			t.Fatalf("write file: %v", err)
-		}
-		s.Git(t, "add", "src/")
-		s.Git(t, "commit", "-m", "Add initial config.go")
-
-		// Agent modifies the file.
-		_, err := s.RunPrompt(t, ctx,
-			"modify src/config.go to add a function GetPort() int that returns 8080. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		// User writes completely different content (ignoring agent's changes).
-		if err := os.WriteFile(filepath.Join(s.Dir, "src", "config.go"), []byte("package src\n\n// User rewrote this entirely.\nfunc GetHost() string { return \"localhost\" }\n"), 0o644); err != nil {
-			t.Fatalf("overwrite file: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Rewrite config.go")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/explain_test.go b/e2e/tests/explain_test.go
deleted file mode 100644
index f788ec3..0000000
--- a/e2e/tests/explain_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestExplainCheckpoint shows a checkpoint's intent in the active suite mode.
-func TestExplainCheckpoint(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-
-		// Commit files from `trace enable` so the worktree is clean.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-		s.Git(t, "checkout", "-b", "feature")
-
-		prompt := "create a file at docs/feature.md with a short paragraph about feature modules. Do not ask for confirmation or approval, just make the change."
-		_, err := s.RunPrompt(t, ctx, prompt)
-		require.NoError(t, err, "agent failed")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add feature module doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		checkpointID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-
-		s.Git(t, "checkout", mainBranch)
-
-		out := trace.Explain(t, s.Dir, checkpointID)
-		assert.Contains(t, out, "● Checkpoint "+checkpointID, "explain output should include the checkpoint ID")
-		assert.Contains(t, out, "feature module", "explain output should include the checkpoint intent")
-	})
-}
-
-// TestExplainCheckpointFromClonedRepo verifies that explain fetches checkpoint
-// metadata on demand in the active suite mode when a fresh clone lacks the
-// local checkpoint refs.
-func TestExplainCheckpointFromClonedRepo(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		bareDir := testutil.SetupBareRemote(t, s)
-
-		// Commit files from `trace enable` so the worktree is clean.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-		s.Git(t, "push")
-
-		s.Git(t, "checkout", "-b", "feature")
-
-		prompt := "create a file at docs/remote.md with a short paragraph about remote checkpoints. Do not ask for confirmation or approval, just make the change."
-		_, err := s.RunPrompt(t, ctx, prompt)
-		require.NoError(t, err, "agent failed")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add remote checkpoint doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		checkpointID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		s.Git(t, "push", "-u", "origin", "feature")
-		testutil.PushCheckpointRefs(t, s.Dir)
-
-		cloneDir := t.TempDir()
-		if resolved, symErr := filepath.EvalSymlinks(cloneDir); symErr == nil {
-			cloneDir = resolved
-		}
-		require.NoError(t, os.RemoveAll(cloneDir))
-		testutil.Git(t, "", "clone", bareDir, cloneDir)
-		testutil.Git(t, cloneDir, "config", "user.name", "E2E Clone")
-		testutil.Git(t, cloneDir, "config", "user.email", "e2e-clone@test.local")
-		_, err = testutil.GitOutputErr(cloneDir, "rev-parse", "--verify", testutil.CheckpointVerifyRef())
-		require.Error(t, err, "checkpoint metadata ref should not exist locally in clone before explain")
-
-		trace.Enable(t, cloneDir, s.Agent.TraceAgent())
-		testutil.ApplySuiteCheckpointsMode(t, cloneDir)
-		testutil.CommitIfDirty(t, cloneDir, "Enable trace in clone")
-
-		out := trace.Explain(t, cloneDir, checkpointID)
-		assert.Contains(t, out, "● Checkpoint "+checkpointID, "explain output should include the checkpoint ID")
-		assert.Contains(t, out, "remote checkpoint", "explain output should include the checkpoint intent")
-	})
-}
diff --git a/e2e/tests/external_agent_test.go b/e2e/tests/external_agent_test.go
deleted file mode 100644
index d5d3ef1..0000000
--- a/e2e/tests/external_agent_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestExternalAgentSingleSessionManualCommit: external agent creates a file,
-// user commits manually. Validates the full external agent protocol flow:
-// discovery via PATH, hook firing through binary subcommands, transcript
-// handling, and checkpoint creation.
-func TestExternalAgentSingleSessionManualCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"Create a file at docs/hello.md with the content 'Hello World'. Do not ask for confirmation.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "docs/hello.md")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add hello file via external agent")
-
-		testutil.AssertNewCommits(t, s, 1)
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.AssertCheckpointMetadataComplete(t, s.Dir, cpID)
-		testutil.AssertCheckpointHasSingleSession(t, s.Dir, cpID)
-		testutil.AssertCheckpointFilesTouchedContains(t, s.Dir, cpID, "docs/hello.md")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestExternalAgentMultipleTurnsManualCommit: external agent handles two
-// sequential prompts, user commits once. Both prompts should be captured
-// in a single checkpoint.
-func TestExternalAgentMultipleTurnsManualCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		if !s.IsExternalAgent() {
-			t.Skip("skipping external agent test for non-external agent")
-		}
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file called src/alpha.txt with a short paragraph. Do not ask for confirmation or approval, just make the change.")
-		if err != nil {
-			t.Fatalf("first prompt failed: %v", err)
-		}
-
-		_, err = s.RunPrompt(t, ctx,
-			"create a file called src/beta.txt with a short paragraph. Do not ask for confirmation or approval, just make the change.")
-		if err != nil {
-			t.Fatalf("second prompt failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "src/alpha.txt")
-		testutil.AssertFileExists(t, s.Dir, "src/beta.txt")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add alpha and beta via external agent")
-
-		testutil.AssertNewCommits(t, s, 1)
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.AssertCheckpointMetadataComplete(t, s.Dir, cpID)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-
-		// Both files should appear in files_touched
-		testutil.AssertCheckpointFilesTouchedContains(t, s.Dir, cpID, "src/alpha.txt")
-		testutil.AssertCheckpointFilesTouchedContains(t, s.Dir, cpID, "src/beta.txt")
-	})
-}
-
-// TestExternalAgentDeepCheckpointValidation: verifies transcript content,
-// content hash, and prompt text are correctly captured through the external
-// agent protocol.
-func TestExternalAgentDeepCheckpointValidation(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create a file called notes/deep.md with a paragraph about deep validation. Do not ask for confirmation or approval, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "notes/deep.md")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Deep checkpoint validation test")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-
-		testutil.ValidateCheckpointDeep(t, s.Dir, testutil.DeepCheckpointValidation{
-			CheckpointID:    cpID,
-			Strategy:        "manual-commit",
-			FilesTouched:    []string{"notes/deep.md"},
-			ExpectedPrompts: []string{"create a file called notes/deep.md"},
-		})
-	})
-}
-
-// TestExternalAgentSessionMetadata: verifies that checkpoint session metadata
-// correctly identifies the external agent type.
-func TestExternalAgentSessionMetadata(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create a file called meta/test.md with a short paragraph. Do not ask for confirmation or approval, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Metadata test commit")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-
-		// Verify session metadata has a non-empty agent field
-		sm := testutil.ReadSessionMetadata(t, s.Dir, cpID, 0)
-		assert.NotEmpty(t, sm.Agent, "session metadata should have agent field set")
-		assert.NotEmpty(t, sm.SessionID, "session metadata should have session_id")
-	})
-}
diff --git a/e2e/tests/factory_hooks_test.go b/e2e/tests/factory_hooks_test.go
deleted file mode 100644
index c83f68e..0000000
--- a/e2e/tests/factory_hooks_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestFactoryTaskCheckpointExistsBeforeCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		if s.Agent.Name() != "factoryai-droid" {
-			t.Skip("factory-only regression test")
-		}
-
-		session := s.StartSession(t, ctx)
-		if session == nil {
-			t.Skip("factoryai-droid does not support interactive mode")
-		}
-
-		s.WaitFor(t, session, s.Agent.PromptPattern(), 30*time.Second)
-		s.Send(t, session,
-			"Can you run a Worker that inspects this code and comes up with a short summary about what it is about? Have the Worker write that summary to docs/factory-hook-check.md as one short paragraph followed by exactly 3 bullet points. Do not create or edit the file in the main agent process. Only the Worker should write the file. Do not commit. Do not ask for confirmation.")
-		s.WaitFor(t, session, s.Agent.PromptPattern(), 90*time.Second)
-
-		testutil.WaitForFileExists(t, s.Dir, "docs/factory-hook-check.md", 10*time.Second)
-
-		waitForTaskRewindPoint(t, s.Dir, 15*time.Second)
-	})
-}
-
-func TestFactoryCommittedCheckpointExcludesPreExistingUntrackedFiles(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		if s.Agent.Name() != "factoryai-droid" {
-			t.Skip("factory-only regression test")
-		}
-
-		sentinelPath := filepath.Join(s.Dir, "docs", "factory-preexisting-human-note.md")
-		require.NoError(t, os.MkdirAll(filepath.Dir(sentinelPath), 0o755))
-		require.NoError(t, os.WriteFile(sentinelPath, []byte("human-owned sentinel\n"), 0o644))
-
-		session := s.StartSession(t, ctx)
-		if session == nil {
-			t.Skip("factoryai-droid does not support interactive mode")
-		}
-
-		s.WaitFor(t, session, s.Agent.PromptPattern(), 30*time.Second)
-		s.Send(t, session,
-			"Can you run a Worker that inspects this code and writes its findings to docs/factory-prehook-worker.md as one short paragraph followed by exactly 3 bullet points? Do not read, modify, or mention docs/factory-preexisting-human-note.md. Do not create or edit the file in the main agent process. Only the Worker should write docs/factory-prehook-worker.md. Do not commit. Do not ask for confirmation.")
-		s.WaitFor(t, session, s.Agent.PromptPattern(), 90*time.Second)
-
-		testutil.WaitForFileExists(t, s.Dir, "docs/factory-prehook-worker.md", 10*time.Second)
-		waitForTaskRewindPoint(t, s.Dir, 15*time.Second)
-
-		s.Git(t, "add", "docs/factory-prehook-worker.md")
-		s.Git(t, "commit", "-m", "Add factory worker checkpoint regression fixtures")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		meta := testutil.WaitForSessionMetadata(t, s.Dir, cpID, 0, 30*time.Second)
-
-		assert.Contains(t, meta.FilesTouched, "docs/factory-prehook-worker.md",
-			"worker-created file should be tracked in committed checkpoint metadata")
-		assert.NotContains(t, meta.FilesTouched, "docs/factory-preexisting-human-note.md",
-			"pre-existing untracked sentinel should not leak into committed checkpoint metadata")
-	})
-}
-
-func waitForTaskRewindPoint(t *testing.T, dir string, timeout time.Duration) trace.RewindPoint {
-	t.Helper()
-
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		points := trace.RewindList(t, dir)
-		for _, point := range points {
-			if point.IsLogsOnly || !point.IsTaskCheckpoint {
-				continue
-			}
-			if point.ToolUseID == "" {
-				continue
-			}
-			return point
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-
-	t.Fatalf("expected task rewind point within %s", timeout)
-	return trace.RewindPoint{}
-}
diff --git a/e2e/tests/interactive_test.go b/e2e/tests/interactive_test.go
deleted file mode 100644
index 9833e8c..0000000
--- a/e2e/tests/interactive_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-)
-
-func TestInteractiveMultiStep(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		prompt := s.Agent.PromptPattern()
-
-		session := s.StartSession(t, ctx)
-		if session == nil {
-			t.Skipf("agent %s does not support interactive mode", s.Agent.Name())
-		}
-
-		s.WaitFor(t, session, prompt, 30*time.Second)
-
-		s.Send(t, session, "create a markdown file at docs/red.md with a paragraph about the colour red. Do not ask for confirmation, just make the change.")
-		s.WaitFor(t, session, prompt, 60*time.Second)
-		testutil.WaitForFileExists(t, s.Dir, "docs/*.md", 30*time.Second)
-
-		s.Send(t, session, "now commit it")
-		s.WaitFor(t, session, prompt, 60*time.Second)
-		testutil.AssertNewCommitsWithTimeout(t, s, 1, 60*time.Second)
-
-		// Wait for the turn-end hook (including finalize) to complete before
-		// reading the checkpoint branch. The finalize step writes a second
-		// commit to trace/checkpoints/v1 concurrently with the test, and
-		// reading the branch mid-update can see a broken ref.
-		testutil.WaitForSessionIdle(t, s.Dir, 15*time.Second)
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCommitLinkedToCheckpoint(t, s.Dir, "HEAD")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/main_test.go b/e2e/tests/main_test.go
deleted file mode 100644
index 36f0d54..0000000
--- a/e2e/tests/main_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/GrayCodeAI/trace/e2e/agents"
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-)
-
-func TestMain(m *testing.M) {
-	runDir := os.Getenv("E2E_ARTIFACT_DIR")
-	if runDir == "" {
-		_, file, _, _ := runtime.Caller(0)
-		testutil.ArtifactRoot = filepath.Join(filepath.Dir(file), "..", "artifacts")
-		runDir = testutil.ArtifactRunDir()
-	}
-	_ = os.MkdirAll(runDir, 0o755)
-	testutil.SetRunDir(runDir)
-
-	// Resolve the trace binary (set by mise run build via E2E_TRACE_BIN).
-	traceBin := trace.BinPath()
-	if err := ensureHookTraceBinary(traceBin); err != nil {
-		fmt.Fprintf(os.Stderr, "preflight: prepare hook trace binary: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Prepend the binary's directory to PATH so that git hooks and agent
-	// hooks (which call bare "trace") resolve to the same binary the test
-	// harness uses, not a system-installed one.
-	os.Setenv("PATH", filepath.Dir(traceBin)+string(os.PathListSeparator)+os.Getenv("PATH"))
-
-	// Preflight: verify required dependencies before running any tests.
-	// tmux is only required on Unix (interactive session tests are skipped on Windows).
-	var missing []string
-	requiredBins := []string{"git"}
-	if runtime.GOOS != "windows" {
-		requiredBins = append(requiredBins, "tmux")
-	}
-	for _, bin := range requiredBins {
-		if _, err := exec.LookPath(bin); err != nil {
-			missing = append(missing, bin)
-		}
-	}
-	for _, a := range agents.All() {
-		if _, err := exec.LookPath(a.Binary()); err != nil {
-			missing = append(missing, fmt.Sprintf("%s (%s)", a.Binary(), a.Name()))
-		}
-	}
-	if len(missing) > 0 {
-		fmt.Fprintf(os.Stderr, "preflight: missing required binaries: %v\n", missing)
-		os.Exit(1)
-	}
-
-	version := "unknown"
-	if out, err := exec.Command(traceBin, "version").Output(); err == nil {
-		version = string(out)
-	}
-
-	// Write preflight info to artifact dir only — gotestsum swallows both
-	// stdout and stderr, so the test-e2e script cats this file at the end.
-	preflight := fmt.Sprintf("trace binary:  %s\ntrace version: %s\n",
-		traceBin, version)
-	_ = os.WriteFile(filepath.Join(runDir, "trace-version.txt"), []byte(preflight), 0o644)
-
-	// Don't look at user's Git config, ignore everything except the project-local Git settings.
-	// This avoids oddball configs in ~/.gitconfig messing with our E2E tests.
-	// We use an empty temp file instead of os.DevNull because git on Windows
-	// cannot open NUL as a config file ("unable to access 'NUL': Invalid argument").
-	emptyConfig := filepath.Join(runDir, "empty-gitconfig")
-	_ = os.WriteFile(emptyConfig, nil, 0o644)
-	os.Setenv("GIT_CONFIG_GLOBAL", emptyConfig)
-
-	os.Exit(m.Run())
-}
-
-func ensureHookTraceBinary(traceBin string) error {
-	dir := filepath.Dir(traceBin)
-	hookName := "trace"
-	if runtime.GOOS == "windows" {
-		hookName = "trace.exe"
-	}
-	hookBin := filepath.Join(dir, hookName)
-	if filepath.Clean(traceBin) == filepath.Clean(hookBin) {
-		return nil
-	}
-
-	_ = os.Remove(hookBin)
-
-	if runtime.GOOS == "windows" {
-		data, err := os.ReadFile(traceBin)
-		if err != nil {
-			return err
-		}
-		return os.WriteFile(hookBin, data, 0o755)
-	}
-
-	return os.Symlink(traceBin, hookBin)
-}
diff --git a/e2e/tests/mid_turn_commit_test.go b/e2e/tests/mid_turn_commit_test.go
deleted file mode 100644
index 64726f2..0000000
--- a/e2e/tests/mid_turn_commit_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-)
-
-// TestMidTurnCommit_DifferentFilesThanPreviousTurn: Turn 1 creates file A
-// (tracked via Stop checkpoint), Turn 2 creates+commits different files B,C.
-// Validates that the mid-turn commit gets a checkpoint on trace/checkpoints/v1
-// even though the committed files (B,C) don't overlap with Turn 1's tracked
-// files (A).
-//
-// This is a regression test for the bug where shouldCondenseWithOverlapCheck
-// skipped condensation for ACTIVE sessions because filesTouchedBefore (from
-// Turn 1) didn't overlap with the committed files (from Turn 2).
-//
-// Category: agent-validation — this test validates hook behavior that varies
-// by agent (commit flow, hook timing). It should run for every new agent
-// integration, not just as a one-time regression check.
-// TODO: when we split E2E tests into "always run" vs "new agent validation",
-// this belongs in the "new agent validation" category.
-func TestMidTurnCommit_DifferentFilesThanPreviousTurn(t *testing.T) {
-	testutil.ForEachAgent(t, 4*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Turn 1: Agent creates a file (tracked as touched). No commit.
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/turn1.md with a paragraph about apples. Do not commit the file. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 1 (turn 1) failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/turn1.md")
-
-		// Turn 2: Agent creates DIFFERENT files and commits them mid-turn.
-		// The committed files (turn2a.md, turn2b.md) do NOT overlap with
-		// Turn 1's tracked files (turn1.md).
-		_, err = s.RunPrompt(t, ctx,
-			"create two markdown files: docs/turn2a.md about bananas and docs/turn2b.md about cherries. Then git add and git commit both files with a short message. Do not commit any other files. Do not ask for confirmation, just make the changes. Do not add Co-authored-by or Signed-off-by trailers. Do not use worktrees.")
-		if err != nil {
-			t.Fatalf("agent prompt 2 (turn 2) failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/turn2a.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/turn2b.md")
-
-		// The agent committed mid-turn, so there should be at least 1 new commit.
-		testutil.AssertNewCommits(t, s, 1)
-
-		// CRITICAL: The mid-turn commit should have triggered condensation
-		// to trace/checkpoints/v1, even though committed files differ from
-		// Turn 1's tracked files. This is the regression assertion.
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/multi_session_test.go b/e2e/tests/multi_session_test.go
deleted file mode 100644
index aad23aa..0000000
--- a/e2e/tests/multi_session_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/agents"
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-)
-
-// TestMultiSessionManualCommit: two prompts create files, user commits manually.
-func TestMultiSessionManualCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx, "create a markdown file at docs/red.md with a paragraph about the colour red. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-
-		_, err = s.RunPrompt(t, ctx, "create a markdown file at docs/blue.md with a paragraph about the colour blue. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add md files about red and blue")
-
-		testutil.AssertFileExists(t, s.Dir, "docs/*.md")
-		testutil.AssertNewCommits(t, s, 1)
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestMultiSessionSequential: two prompts each commit separately, distinct checkpoints.
-func TestMultiSessionSequential(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		promptTimeout := 3 * time.Minute
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/red.md about the colour red, then git add and git commit it with a short message. Do not ask for confirmation, just make the change. Do not include any trailers or metadata in the commit message. Do not use worktrees.",
-			agents.WithPromptTimeout(promptTimeout))
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-
-		_, err = s.RunPrompt(t, ctx,
-			"create a markdown file at docs/blue.md about the colour blue, then git add and git commit it with a short message. Do not ask for confirmation, just make the change. Do not include any trailers or metadata in the commit message. Do not use worktrees.",
-			agents.WithPromptTimeout(promptTimeout))
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "docs/*.md")
-		testutil.AssertNewCommits(t, s, 2)
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD~1")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-
-		cpIDs := testutil.CheckpointIDs(t, s.Dir)
-		for _, id := range cpIDs {
-			testutil.AssertCheckpointHasSingleSession(t, s.Dir, id)
-		}
-		testutil.AssertDistinctSessions(t, s.Dir, cpIDs)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/resume_remote_test.go b/e2e/tests/resume_remote_test.go
deleted file mode 100644
index 2da51c9..0000000
--- a/e2e/tests/resume_remote_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestResumeFromClonedRepo: agent creates a file on a feature branch and user
-// commits, then the repo is cloned (simulating a teammate). The clone has no
-// local checkpoint metadata ref for the active suite mode. `trace resume feature`
-// should fetch that ref automatically and restore the session.
-func TestResumeFromClonedRepo(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Set up a bare remote so we can push and clone.
-		bareDir := testutil.SetupBareRemote(t, s)
-
-		// Commit files from `trace enable` so main has a clean working tree.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-		s.Git(t, "push")
-
-		// Do agent work on a feature branch.
-		s.Git(t, "checkout", "-b", "feature")
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file at docs/hello.md with a paragraph about greetings. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add hello doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		checkpointID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		sessionMeta := testutil.WaitForSessionMetadata(t, s.Dir, checkpointID, 0, 30*time.Second)
-
-		// Push feature branch and checkpoint refs to the bare remote.
-		s.Git(t, "push", "-u", "origin", "feature")
-		testutil.PushCheckpointRefs(t, s.Dir)
-
-		// Clone the repo to a new directory (simulating a teammate).
-		cloneDir := t.TempDir()
-		if resolved, symErr := filepath.EvalSymlinks(cloneDir); symErr == nil {
-			cloneDir = resolved
-		}
-		// Remove the dir because git clone wants to create it.
-		require.NoError(t, os.RemoveAll(cloneDir))
-		testutil.Git(t, "", "clone", bareDir, cloneDir)
-		testutil.Git(t, cloneDir, "config", "user.name", "E2E Clone")
-		testutil.Git(t, cloneDir, "config", "user.email", "e2e-clone@test.local")
-
-		// Verify the checkpoint metadata ref does NOT exist locally in the clone.
-		_, err = testutil.GitOutputErr(cloneDir, "rev-parse", "--verify", testutil.CheckpointVerifyRef())
-		require.Error(t, err, "checkpoint metadata ref should not exist locally in clone")
-
-		// Create the local feature branch (clone only has origin/feature as remote tracking ref).
-		// Then switch back to the default branch so resume can switch to it.
-		mainClone := testutil.GitOutput(t, cloneDir, "branch", "--show-current")
-		testutil.Git(t, cloneDir, "checkout", "feature")
-		testutil.Git(t, cloneDir, "checkout", mainClone)
-
-		// Enable trace in the cloned repo and commit the enable files.
-		trace.Enable(t, cloneDir, s.Agent.TraceAgent())
-		testutil.ApplySuiteCheckpointsMode(t, cloneDir)
-		testutil.CommitIfDirty(t, cloneDir, "Enable trace in clone")
-
-		// Run resume from the clone — should fetch metadata and succeed.
-		out, err := trace.Resume(cloneDir, "feature")
-		require.NoError(t, err, "trace resume failed in clone: %s", out)
-
-		current := testutil.GitOutput(t, cloneDir, "branch", "--show-current")
-		assert.Equal(t, "feature", current, "should be on feature branch after resume")
-		assert.Contains(t, out, "To continue", "resume output should show resume instructions")
-
-		// Verify the checkpoint metadata ref now exists locally.
-		_, err = testutil.GitOutputErr(cloneDir, "rev-parse", "--verify", testutil.CheckpointVerifyRef())
-		assert.NoError(t, err, "checkpoint metadata ref should exist locally after resume")
-
-		if restoredTranscript, ok := testutil.RestoredSessionTranscriptPath(t, cloneDir, sessionMeta); ok {
-			_, err = os.Stat(restoredTranscript)
-			assert.NoError(t, err, "restored session transcript should exist at %s after resume", restoredTranscript)
-		}
-	})
-}
-
-// TestResumeMetadataBranchAlreadyLocal: same setup as TestResumeFromClonedRepo
-// but the checkpoint metadata ref already exists locally. Resume should still work
-// (fetch updates local to latest).
-func TestResumeMetadataBranchAlreadyLocal(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-
-		// Commit files from `trace enable` so main has a clean working tree.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-
-		// Do agent work on a feature branch.
-		s.Git(t, "checkout", "-b", "feature")
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file at docs/hello.md with a paragraph about greetings. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add hello doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		// Switch back to main and resume the feature branch.
-		// The metadata branch exists locally (was created during commit).
-		s.Git(t, "checkout", mainBranch)
-
-		out, err := trace.Resume(s.Dir, "feature")
-		require.NoError(t, err, "trace resume failed: %s", out)
-
-		current := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-		assert.Equal(t, "feature", current, "should be on feature branch after resume")
-		assert.Contains(t, out, "To continue", "resume output should show resume instructions")
-	})
-}
diff --git a/e2e/tests/resume_test.go b/e2e/tests/resume_test.go
deleted file mode 100644
index 97e2eec..0000000
--- a/e2e/tests/resume_test.go
+++ /dev/null
@@ -1,239 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestResumeFromFeatureBranch: agent creates a file on a feature branch and
-// user commits, then switches back to main and runs `trace resume feature`.
-// Verifies the branch is switched and the session is restored.
-func TestResumeFromFeatureBranch(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-
-		// Commit files from `trace enable` so main has a clean working tree
-		// for branch switching (mirrors a real repo where .gitignore is tracked).
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-
-		// Do agent work on a feature branch.
-		s.Git(t, "checkout", "-b", "feature")
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file at docs/hello.md with a paragraph about greetings. Do not ask for confirmation or approval, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add hello doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		// Switch back to main and resume the feature branch.
-		s.Git(t, "checkout", mainBranch)
-
-		out, err := trace.Resume(s.Dir, "feature")
-		require.NoError(t, err, "trace resume failed: %s", out)
-
-		current := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-		assert.Equal(t, "feature", current, "should be on feature branch after resume")
-		assert.Contains(t, out, "To continue", "resume output should show resume instructions")
-	})
-}
-
-// TestResumeSquashMergeMultipleCheckpoints: two agent prompts on a feature
-// branch each get their own commit and checkpoint. The feature branch is
-// squash-merged to main and `trace resume` should restore only the latest
-// checkpoint (by CreatedAt), skipping older ones. Tests both squash merge message formats:
-//
-//   - GitHub format: trailers appear at the top level in the commit body
-//     (e.g. "* Add red doc\n\nTrace-Checkpoint: aaa\n\n* Add blue doc\n\nTrace-Checkpoint: bbb")
-//   - git CLI format: `git merge --squash` nests original commit messages
-//     (including trailers) indented with 4 spaces inside the squash message
-//
-// Both formats are tested in a single function to share the expensive agent
-// prompts. Main is reset between format tests.
-func TestResumeSquashMergeMultipleCheckpoints(t *testing.T) {
-	testutil.ForEachAgent(t, 5*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-
-		// Commit files from `trace enable` so main has a clean working tree
-		// for branch switching and squash merging.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-
-		// Create feature branch with two agent-assisted commits.
-		s.Git(t, "checkout", "-b", "feature")
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file at docs/red.md with a paragraph about the colour red. Do not ask for confirmation or approval, just make the change.")
-		if err != nil {
-			t.Fatalf("prompt 1 failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add red doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cp1Ref := testutil.CurrentCheckpointRef(t, s.Dir)
-
-		_, err = s.RunPrompt(t, ctx,
-			"create a file at docs/blue.md with a paragraph about the colour blue. Do not ask for confirmation or approval, just make the change.")
-		if err != nil {
-			t.Fatalf("prompt 2 failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add blue doc")
-		testutil.WaitForCheckpointAdvanceFrom(t, s.Dir, cp1Ref, 30*time.Second)
-
-		// Record checkpoint IDs from both feature branch commits.
-		cpID1 := testutil.GetCheckpointTrailer(t, s.Dir, "HEAD~1")
-		cpID2 := testutil.GetCheckpointTrailer(t, s.Dir, "HEAD")
-		require.NotEmpty(t, cpID1, "first commit should have checkpoint trailer")
-		require.NotEmpty(t, cpID2, "second commit should have checkpoint trailer")
-		require.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-
-		// Save main HEAD so we can reset between format tests.
-		s.Git(t, "checkout", mainBranch)
-		mainHead := testutil.GitOutput(t, s.Dir, "rev-parse", "HEAD")
-
-		// --- Format 1: GitHub squash merge ---
-		// GitHub puts each original commit message (including trailers) as
-		// top-level bullet points in the squash commit body.
-		s.Git(t, "merge", "--squash", "feature")
-		githubMsg := fmt.Sprintf(
-			"Squash merge feature (#1)\n\n* Add red doc\n\nTrace-Checkpoint: %s\n\n* Add blue doc\n\nTrace-Checkpoint: %s",
-			cpID1, cpID2,
-		)
-		s.Git(t, "commit", "-m", githubMsg)
-
-		out, err := trace.Resume(s.Dir, mainBranch)
-		require.NoError(t, err, "github format: trace resume failed: %s", out)
-		assert.Contains(t, out, "older checkpoints skipped",
-			"github format: squash merge should skip older checkpoints")
-
-		// Reset main to before the squash merge for the next format test.
-		s.Git(t, "reset", "--hard", mainHead)
-
-		// --- Format 2: git merge --squash ---
-		// The git CLI nests original commit messages (with trailers) indented
-		// by 4 spaces inside "Squashed commit of the following:".
-		s.Git(t, "merge", "--squash", "feature")
-
-		// Sanity-check: the auto-generated SQUASH_MSG should contain both trailers.
-		squashMsgBytes, err := os.ReadFile(filepath.Join(s.Dir, ".git", "SQUASH_MSG"))
-		require.NoError(t, err, "read .git/SQUASH_MSG")
-		squashMsgStr := string(squashMsgBytes)
-		require.Contains(t, squashMsgStr, cpID1,
-			"git SQUASH_MSG should contain first checkpoint ID")
-		require.Contains(t, squashMsgStr, cpID2,
-			"git SQUASH_MSG should contain second checkpoint ID")
-
-		// Commit using the git-generated squash message directly (not via -m).
-		// GIT_EDITOR=true prevents git from opening an editor while letting
-		// it use .git/SQUASH_MSG natively with all hooks running.
-		commitCmd := execx.NonInteractive(ctx, "git", "commit")
-		commitCmd.Dir = s.Dir
-		commitCmd.Env = append(os.Environ(), "GIT_EDITOR=true")
-		commitOut, commitErr := commitCmd.CombinedOutput()
-		fmt.Fprintf(s.ConsoleLog, "> git commit (GIT_EDITOR=true)\n%s\n", commitOut)
-		require.NoError(t, commitErr, "git commit with squash message failed: %s", commitOut)
-
-		out, err = trace.Resume(s.Dir, mainBranch)
-		require.NoError(t, err, "git-cli format: trace resume failed: %s", out)
-		assert.Contains(t, out, "older checkpoints skipped",
-			"git-cli format: squash merge should skip older checkpoints")
-	})
-}
-
-// TestResumeNoCheckpointOnBranch: resume on a feature branch that has only
-// human commits (no agent interaction). Should switch to the branch and exit
-// cleanly with an informational message, not an error.
-func TestResumeNoCheckpointOnBranch(t *testing.T) {
-	testutil.ForEachAgent(t, 1*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-
-		// Commit files from `trace enable` so main has a clean working tree.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-
-		// Create a feature branch with only human commits.
-		s.Git(t, "checkout", "-b", "no-checkpoint")
-		require.NoError(t, os.MkdirAll(filepath.Join(s.Dir, "docs"), 0o755))
-		require.NoError(t, os.WriteFile(
-			filepath.Join(s.Dir, "docs", "human.md"),
-			[]byte("# Written by a human\n"), 0o644,
-		))
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Human-only commit")
-
-		// Switch back to main and try to resume the feature branch.
-		s.Git(t, "checkout", mainBranch)
-
-		out, err := trace.Resume(s.Dir, "no-checkpoint")
-		require.NoError(t, err, "resume should not error for missing checkpoints: %s", out)
-
-		assert.Contains(t, out, "No Trace checkpoint found",
-			"should inform user no checkpoint exists on branch")
-	})
-}
-
-// TestResumeOlderCheckpointWithNewerCommits: agent creates a file on a feature
-// branch and user commits (checkpoint created), then user adds a human-only
-// commit on top. `trace resume --force` should still find and restore the
-// older checkpoint despite the newer commits without checkpoints.
-func TestResumeOlderCheckpointWithNewerCommits(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-
-		// Commit files from `trace enable` so main has a clean working tree.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-
-		// Do agent work on a feature branch.
-		s.Git(t, "checkout", "-b", "feature")
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file at docs/hello.md with a paragraph about greetings. Do not ask for confirmation or approval, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add hello doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		// Add a human-only commit on top (no agent involvement, no checkpoint).
-		require.NoError(t, os.MkdirAll(filepath.Join(s.Dir, "notes"), 0o755))
-		require.NoError(t, os.WriteFile(
-			filepath.Join(s.Dir, "notes", "todo.md"),
-			[]byte("# TODO\n- something\n"), 0o644,
-		))
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Human-only follow-up")
-
-		// Switch back to main and resume (--force is always passed by
-		// trace.Resume, which bypasses the "older checkpoint" confirmation).
-		s.Git(t, "checkout", mainBranch)
-
-		out, err := trace.Resume(s.Dir, "feature")
-		require.NoError(t, err, "trace resume failed: %s", out)
-
-		current := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-		assert.Equal(t, "feature", current, "should be on feature branch after resume")
-		assert.Contains(t, out, "To continue", "should restore the older checkpoint session")
-	})
-}
diff --git a/e2e/tests/rewind_test.go b/e2e/tests/rewind_test.go
deleted file mode 100644
index c097f22..0000000
--- a/e2e/tests/rewind_test.go
+++ /dev/null
@@ -1,225 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestRewindPreCommit: agent creates two files in sequence (no user commit),
-// then rewinds to the point after the first file was created.
-func TestRewindPreCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Agent creates file A.
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/red.md with a paragraph about the colour red. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-
-		pointsAfterA := trace.RewindList(t, s.Dir)
-		require.NotEmpty(t, pointsAfterA, "expected at least 1 rewind point after file A")
-
-		// Agent creates file B.
-		_, err = s.RunPrompt(t, ctx,
-			"create a markdown file at docs/blue.md with a paragraph about the colour blue. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/blue.md")
-
-		pointsAfterB := trace.RewindList(t, s.Dir)
-		require.Greater(t, len(pointsAfterB), len(pointsAfterA),
-			"expected more rewind points after file B")
-
-		// Rewind to the first rewind point (after file A was created).
-		rewindID := pointsAfterA[0].ID
-		err = trace.Rewind(t, s.Dir, rewindID)
-		require.NoError(t, err, "rewind to %s should succeed", rewindID)
-
-		// File A should still exist, file B should be gone.
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-		_, statErr := os.Stat(filepath.Join(s.Dir, "docs", "blue.md"))
-		assert.True(t, os.IsNotExist(statErr),
-			"docs/blue.md should not exist after rewind, stat error: %v", statErr)
-	})
-}
-
-// TestRewindAfterCommit: pre-commit shadow branch rewind points should become
-// invalid after a user commit. Rewinding to an old shadow branch ID should fail.
-func TestRewindAfterCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Agent creates a file.
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/red.md with a paragraph about the colour red. Do not commit the file. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-
-		// Get pre-commit rewind points (shadow branch).
-		pointsBefore := trace.RewindList(t, s.Dir)
-		require.NotEmpty(t, pointsBefore, "expected rewind points before commit")
-
-		// Find a non-logs-only point (shadow branch ID).
-		var shadowPoint *trace.RewindPoint
-		for i := range pointsBefore {
-			if !pointsBefore[i].IsLogsOnly {
-				shadowPoint = &pointsBefore[i]
-				break
-			}
-		}
-		require.NotNil(t, shadowPoint, "expected at least one shadow branch rewind point")
-		oldID := shadowPoint.ID
-
-		// User commits the file.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add red.md")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-
-		// Get rewind points after commit — old shadow IDs should be gone.
-		pointsAfter := trace.RewindList(t, s.Dir)
-
-		// Verify the old shadow branch ID is no longer listed.
-		found := false
-		for _, p := range pointsAfter {
-			if p.ID == oldID && !p.IsLogsOnly {
-				found = true
-				break
-			}
-		}
-		assert.False(t, found, "old shadow branch rewind point %s should no longer be listed", oldID)
-
-		// Attempting to rewind to the old shadow branch ID should fail.
-		err = trace.Rewind(t, s.Dir, oldID)
-		assert.Error(t, err, "rewind to old shadow branch ID should fail after commit")
-
-		// Working directory should be unchanged — file still committed.
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestRewindMultipleFiles: agent creates files across two prompts, rewind
-// drops only the second prompt's changes.
-func TestRewindMultipleFiles(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// First prompt — create file A. Use non-colour filename to avoid
-		// Gemini "helpfully" creating the trace rainbow.
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/readme.md with a paragraph about this project. Do not create any other files. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/readme.md")
-
-		// Capture rewind points after first prompt.
-		pointsAfterA := trace.RewindList(t, s.Dir)
-		require.NotEmpty(t, pointsAfterA, "expected rewind points after first prompt")
-
-		// Second prompt — create file B (unrelated topic).
-		_, err = s.RunPrompt(t, ctx,
-			"create a markdown file at docs/changelog.md with a paragraph about recent changes. Do not create any other files. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/changelog.md")
-
-		// Rewind to a point from after the first prompt.
-		rewindID := pointsAfterA[0].ID
-		err = trace.Rewind(t, s.Dir, rewindID)
-		require.NoError(t, err, "rewind to %s should succeed", rewindID)
-
-		// File A should remain, file B should be gone.
-		testutil.AssertFileExists(t, s.Dir, "docs/readme.md")
-		_, statErr := os.Stat(filepath.Join(s.Dir, "docs", "changelog.md"))
-		assert.True(t, os.IsNotExist(statErr),
-			"docs/changelog.md should not exist after rewind, stat error: %v", statErr)
-	})
-}
-
-// TestRewindSquashMergeMultipleCheckpoints: when a squash merge commit contains
-// multiple Trace-Checkpoint trailers, `trace rewind --list` should show a
-// single logs-only point using the latest checkpoint. Logs-only restore should
-// succeed and return the most recent session's transcript.
-func TestRewindSquashMergeMultipleCheckpoints(t *testing.T) {
-	testutil.ForEachAgent(t, 5*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		mainBranch := testutil.GitOutput(t, s.Dir, "branch", "--show-current")
-
-		// Commit files from `trace enable` so main has a clean working tree.
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Enable trace")
-
-		// Create feature branch with two agent-assisted commits.
-		s.Git(t, "checkout", "-b", "feature")
-
-		_, err := s.RunPrompt(t, ctx,
-			"create a file at docs/red.md with a paragraph about the colour red. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("prompt 1 failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add red doc")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cp1Ref := testutil.GitOutput(t, s.Dir, "rev-parse", "trace/checkpoints/v1")
-
-		_, err = s.RunPrompt(t, ctx,
-			"create a file at docs/blue.md with a paragraph about the colour blue. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("prompt 2 failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add blue doc")
-		testutil.WaitForCheckpointAdvanceFrom(t, s.Dir, cp1Ref, 30*time.Second)
-
-		// Record checkpoint IDs from both feature branch commits.
-		cpID1 := testutil.GetCheckpointTrailer(t, s.Dir, "HEAD~1")
-		cpID2 := testutil.GetCheckpointTrailer(t, s.Dir, "HEAD")
-		require.NotEmpty(t, cpID1, "first commit should have checkpoint trailer")
-		require.NotEmpty(t, cpID2, "second commit should have checkpoint trailer")
-		require.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-
-		// Squash merge onto main with both checkpoint trailers in the message.
-		s.Git(t, "checkout", mainBranch)
-		s.Git(t, "merge", "--squash", "feature")
-		squashMsg := fmt.Sprintf(
-			"Squash merge feature (#1)\n\n* Add red doc\n\nTrace-Checkpoint: %s\n\n* Add blue doc\n\nTrace-Checkpoint: %s",
-			cpID1, cpID2,
-		)
-		s.Git(t, "commit", "-m", squashMsg)
-		squashHash := testutil.GitOutput(t, s.Dir, "rev-parse", "HEAD")
-
-		// Rewind list should show exactly one logs-only point for the squash commit,
-		// using the latest checkpoint (cpID2).
-		points := trace.RewindList(t, s.Dir)
-
-		var squashPoints []trace.RewindPoint
-		for _, p := range points {
-			if p.ID == squashHash && p.IsLogsOnly {
-				squashPoints = append(squashPoints, p)
-			}
-		}
-		require.Len(t, squashPoints, 1,
-			"expected exactly 1 logs-only rewind point for squash commit")
-		assert.Equal(t, cpID2, squashPoints[0].CondensationID,
-			"squash merge rewind point should use the latest checkpoint ID")
-
-		// Logs-only restore should succeed.
-		err = trace.RewindLogsOnly(t, s.Dir, squashHash)
-		require.NoError(t, err, "logs-only rewind of squash merge commit should succeed")
-	})
-}
diff --git a/e2e/tests/session_lifecycle_test.go b/e2e/tests/session_lifecycle_test.go
deleted file mode 100644
index 3eda5fb..0000000
--- a/e2e/tests/session_lifecycle_test.go
+++ /dev/null
@@ -1,112 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestEndedSessionUserCommitsAfterExit tests that after an agent session ends
-// naturally, user commits still get checkpoint trailers.
-func TestEndedSessionUserCommitsAfterExit(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"Create three files: ended_a.go with 'package main; func EndedA() {}', "+
-				"ended_b.go with 'package main; func EndedB() {}', "+
-				"ended_c.go with 'package main; func EndedC() {}'. "+
-				"Create all three files, nothing else. Do not commit. "+
-				"Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "ended_a.go")
-		testutil.AssertFileExists(t, s.Dir, "ended_b.go")
-		testutil.AssertFileExists(t, s.Dir, "ended_c.go")
-
-		s.Git(t, "add", "ended_a.go", "ended_b.go")
-		s.Git(t, "commit", "-m", "Add ended files A and B")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-
-		s.Git(t, "add", "ended_c.go")
-		s.Git(t, "commit", "-m", "Add ended file C")
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-
-		assert.NotEqual(t, cpID1, cpID2, "each commit should have its own checkpoint ID")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestSessionDepletedManualEditNoCheckpoint tests that once all session files
-// are committed, subsequent manual edits do NOT get checkpoint trailers.
-func TestSessionDepletedManualEditNoCheckpoint(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"Create a file called depleted.go with content 'package main; func Depleted() {}'. "+
-				"Create only this file. Do not commit. "+
-				"Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "depleted.go")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add depleted.go")
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-
-		cpBranchAfterAgent := testutil.GitOutput(t, s.Dir, "rev-parse", "trace/checkpoints/v1")
-
-		os.WriteFile(filepath.Join(s.Dir, "depleted.go"),
-			[]byte("package main\n\n// Manual user edit\nfunc Depleted() { return }\n"), 0o644)
-
-		s.Git(t, "add", "depleted.go")
-		s.Git(t, "commit", "-m", "Manual edit to depleted.go")
-
-		time.Sleep(5 * time.Second)
-		cpBranchAfterManual := testutil.GitOutput(t, s.Dir, "rev-parse", "trace/checkpoints/v1")
-		assert.Equal(t, cpBranchAfterAgent, cpBranchAfterManual,
-			"manual edit after session depletion should not advance checkpoint branch")
-		testutil.AssertNoCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestTrailerRemovalSkipsCondensation tests that when a user removes the
-// Trace-Checkpoint trailer from the commit message, no condensation happens.
-func TestTrailerRemovalSkipsCondensation(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"Create a file called trailer_test.go with content 'package main; func TrailerTest() {}'. "+
-				"Create only this file. Do not commit. "+
-				"Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "trailer_test.go")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "-c", "core.hooksPath="+testutil.EmptyDir(t), "commit", "-m", "Add trailer_test (no checkpoint)")
-
-		testutil.AssertNoCheckpointTrailer(t, s.Dir, "HEAD")
-
-		time.Sleep(5 * time.Second)
-		testutil.AssertCheckpointNotAdvanced(t, s)
-		// Shadow branch legitimately persists: hooks were bypassed so
-		// post-commit cleanup never ran.
-	})
-}
diff --git a/e2e/tests/single_session_test.go b/e2e/tests/single_session_test.go
deleted file mode 100644
index 870f132..0000000
--- a/e2e/tests/single_session_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestHumanOnlyChangesAndCommits: human creates a file and commits without any
-// agent interaction. No checkpoint should be created.
-func TestHumanOnlyChangesAndCommits(t *testing.T) {
-	testutil.ForEachAgent(t, 1*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Create a file and commit entirely as a human — no agent prompt.
-		if err := os.MkdirAll(filepath.Join(s.Dir, "docs"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "docs", "human.md"), []byte("# Written by a human\n"), 0o644); err != nil {
-			t.Fatalf("write file: %v", err)
-		}
-
-		s.Git(t, "add", "docs/")
-		s.Git(t, "commit", "-m", "Human-only commit")
-
-		// Give the post-commit hook time to fire (if it were going to).
-		time.Sleep(5 * time.Second)
-
-		testutil.AssertCheckpointNotAdvanced(t, s)
-
-		trailer := testutil.GetCheckpointTrailer(t, s.Dir, "HEAD")
-		assert.Empty(t, trailer, "human-only commit should not have checkpoint trailer")
-	})
-}
-
-// TestSingleSessionManualCommit: one prompt creates a file, user commits manually.
-func TestSingleSessionManualCommit(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/red.md with a paragraph about the colour red. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add md file about red")
-
-		testutil.AssertFileExists(t, s.Dir, "docs/*.md")
-		testutil.AssertNewCommits(t, s, 1)
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.AssertCheckpointMetadataComplete(t, s.Dir, cpID)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestSingleSessionAgentCommitInTurn: one prompt creates a file and commits it.
-// Expects both an initial checkpoint (post-commit) and a catchup checkpoint
-// (end-of-turn) referencing the same checkpoint ID.
-func TestSingleSessionAgentCommitInTurn(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create a markdown file at docs/red.md with a paragraph about the colour red, then commit it. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "docs/*.md")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.AssertCheckpointInLastN(t, s.Dir, cpID, 2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestSingleSessionSubagentCommitInTurn: one prompt with subagent creates a file and commits it.
-// Expects both an initial checkpoint (post-commit) and a catchup checkpoint
-// (end-of-turn) referencing the same checkpoint ID.
-func TestSingleSessionSubagentCommitInTurn(t *testing.T) {
-	testutil.ForEachAgent(t, 2*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		if s.Agent.Name() == "copilot-cli" {
-			t.Skip("copilot-cli may run prompt-mode subagents in the background while the foreground process returns and fires agent-stop/session-end hooks first; when the later subagent commit happens, git hooks see no active session, so this same-turn subagent-commit assertion is not stable for Copilot")
-		}
-
-		_, err := s.RunPrompt(t, ctx,
-			"use a subagent: create a markdown file at docs/red.md with a paragraph about the colour red, then commit it. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		testutil.AssertFileExists(t, s.Dir, "docs/*.md")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-		testutil.AssertCheckpointInLastN(t, s.Dir, cpID, 2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/split_commits_test.go b/e2e/tests/split_commits_test.go
deleted file mode 100644
index 4b10480..0000000
--- a/e2e/tests/split_commits_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/agents"
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestUserSplitsAgentChanges: agent creates 4 files in one prompt; user
-// commits them in two separate batches. Each batch gets its own checkpoint.
-func TestUserSplitsAgentChanges(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create four markdown files: docs/a.md about apples, docs/b.md about bananas, docs/c.md about cherries, docs/d.md about dates. Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/a.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/b.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/c.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/d.md")
-
-		// User commits A + B.
-		s.Git(t, "add", "docs/a.md", "docs/b.md")
-		s.Git(t, "commit", "-m", "Add a.md and b.md")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		// Commit everything remaining (c.md + d.md + any extra files the agent might have created).
-		s.Git(t, "add", "-A")
-		s.Git(t, "commit", "-m", "Commit remaining changes (including c.md and d.md)")
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-
-		assert.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestPartialStaging: agent modifies a file, user commits. Second prompt
-// modifies the same file again, user commits. Two distinct checkpoints both
-// reference the same file.
-func TestPartialStaging(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Create a tracked file.
-		if err := os.MkdirAll(filepath.Join(s.Dir, "src"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "src", "main.go"), []byte("package main\n"), 0o644); err != nil {
-			t.Fatalf("write file: %v", err)
-		}
-		s.Git(t, "add", "src/")
-		s.Git(t, "commit", "-m", "Add initial main.go")
-
-		// First prompt: agent modifies the file.
-		_, err := s.RunPrompt(t, ctx,
-			"modify src/main.go to add a main function that prints \"hello world\". Do not ask for confirmation, just make the change.",
-			agents.WithPromptTimeout(2*time.Minute))
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-
-		s.Git(t, "add", "src/main.go")
-		s.Git(t, "commit", "-m", "Add hello world")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		// Second prompt: agent modifies the same file again.
-		_, err = s.RunPrompt(t, ctx,
-			"modify src/main.go to also print \"goodbye world\" after the hello line. Do not ask for confirmation, just make the change.",
-			agents.WithPromptTimeout(2*time.Minute))
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-
-		s.Git(t, "add", "-A")
-		s.Git(t, "commit", "-m", "Add goodbye world")
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-
-		assert.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestSplitModificationsToExistingFiles: agent modifies 3 existing tracked
-// files; user commits each one separately. Three distinct checkpoints.
-func TestSplitModificationsToExistingFiles(t *testing.T) {
-	testutil.ForEachAgent(t, 4*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Create 3 tracked files.
-		if err := os.MkdirAll(filepath.Join(s.Dir, "src"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		for _, name := range []string{"model.go", "view.go", "controller.go"} {
-			content := "package src\n\n// " + name + " placeholder.\n"
-			if err := os.WriteFile(filepath.Join(s.Dir, "src", name), []byte(content), 0o644); err != nil {
-				t.Fatalf("write %s: %v", name, err)
-			}
-		}
-		s.Git(t, "add", "src/")
-		s.Git(t, "commit", "-m", "Add MVC skeleton")
-
-		// Agent modifies all 3 files.
-		_, err := s.RunPrompt(t, ctx,
-			"modify these three files: src/model.go should define a User struct with Name and Email fields, src/view.go should add a RenderUser function, src/controller.go should add a HandleUser function. Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		// Commit model.go.
-		s.Git(t, "add", "src/model.go")
-		s.Git(t, "commit", "-m", "Update model.go")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-
-		// Commit view.go.
-		s.Git(t, "add", "src/view.go")
-		s.Git(t, "commit", "-m", "Update view.go")
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-
-		// Commit everything remaining (controller.go + any extra files the agent might have created).
-		s.Git(t, "add", "-A")
-		s.Git(t, "commit", "-m", "Commit remaining changes")
-
-		cpID3 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID3, 30*time.Second)
-
-		// All three checkpoints should be distinct and valid.
-		assert.NotEqual(t, cpID1, cpID2, "checkpoint 1 and 2 should be distinct")
-		assert.NotEqual(t, cpID2, cpID3, "checkpoint 2 and 3 should be distinct")
-		assert.NotEqual(t, cpID1, cpID3, "checkpoint 1 and 3 should be distinct")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID3)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/stash_workflows_test.go b/e2e/tests/stash_workflows_test.go
deleted file mode 100644
index 36a46d3..0000000
--- a/e2e/tests/stash_workflows_test.go
+++ /dev/null
@@ -1,164 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestPartialCommitStashNewPrompt: agent creates 3 files; user commits one,
-// stashes the rest; second prompt creates 2 more files; user commits those.
-// Verifies two distinct checkpoints across the stash boundary.
-func TestPartialCommitStashNewPrompt(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Agent creates A, B, C.
-		_, err := s.RunPrompt(t, ctx,
-			"create three markdown files: docs/a.md about apples, docs/b.md about bananas, docs/c.md about cherries. Do not commit them, only create the files. Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/a.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/b.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/c.md")
-
-		// User commits only A.
-		s.Git(t, "add", "docs/a.md")
-		s.Git(t, "commit", "-m", "Add a.md")
-
-		// Stash B and C.
-		s.Git(t, "add", "docs/b.md", "docs/c.md")
-		s.Git(t, "stash")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		// Second prompt: agent creates D, E.
-		_, err = s.RunPrompt(t, ctx,
-			"create two markdown files: docs/d.md about dates, docs/e.md about elderberries. Do not commit them, only create the files. Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/d.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/e.md")
-
-		// User commits D and E.
-		s.Git(t, "add", "docs/d.md", "docs/e.md")
-		s.Git(t, "commit", "-m", "Add d.md and e.md")
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-
-		assert.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestStashSecondPromptUnstashCommitAll: agent creates 3 files; user commits
-// one, stashes the rest; second prompt creates 2 more; user unstashes and
-// commits all remaining files together in one commit.
-func TestStashSecondPromptUnstashCommitAll(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"create three markdown files: docs/a.md about apples, docs/b.md about bananas, docs/c.md about cherries. Do not commit them, only create the files. Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent prompt 1 failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/a.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/b.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/c.md")
-
-		// User commits only A.
-		s.Git(t, "add", "docs/a.md")
-		s.Git(t, "commit", "-m", "Add a.md")
-
-		// Stash B and C.
-		s.Git(t, "add", "docs/b.md", "docs/c.md")
-		s.Git(t, "stash")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		// Second prompt: agent creates D, E.
-		_, err = s.RunPrompt(t, ctx,
-			"create two markdown files: docs/d.md about dates, docs/e.md about elderberries. Do not commit them, only create the files. Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent prompt 2 failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/d.md")
-		testutil.AssertFileExists(t, s.Dir, "docs/e.md")
-
-		// Unstash B and C, commit all remaining.
-		s.Git(t, "stash", "pop")
-		s.Git(t, "add", "docs/")
-		s.Git(t, "commit", "-m", "Add b, c, d, e")
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-
-		assert.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
-
-// TestStashModificationsToTrackedFiles: agent modifies 2 existing tracked
-// files; user commits one, stashes the other, pops, and commits separately.
-// Verifies two distinct checkpoints for the split modifications.
-func TestStashModificationsToTrackedFiles(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		// Create 2 tracked Go files.
-		if err := os.MkdirAll(filepath.Join(s.Dir, "src"), 0o755); err != nil {
-			t.Fatalf("mkdir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "src", "a.go"), []byte("package src\n\n// File A placeholder.\n"), 0o644); err != nil {
-			t.Fatalf("write a.go: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(s.Dir, "src", "b.go"), []byte("package src\n\n// File B placeholder.\n"), 0o644); err != nil {
-			t.Fatalf("write b.go: %v", err)
-		}
-		s.Git(t, "add", "src/")
-		s.Git(t, "commit", "-m", "Add initial src files")
-
-		// Agent modifies both files.
-		_, err := s.RunPrompt(t, ctx,
-			"Modify two existing files. In src/a.go, add a function: func Hello() string { return \"hello\" }. "+
-				"In src/b.go, add a function: func World() string { return \"world\" }. "+
-				"Only modify these two files, do not create new files. Do not commit. "+
-				"Do not ask for confirmation, just make the changes.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-
-		// User commits only a.go.
-		s.Git(t, "add", "src/a.go")
-		s.Git(t, "commit", "-m", "Update a.go")
-
-		// Stash b.go modifications.
-		s.Git(t, "stash")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		cpID1 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		// Pop and commit b.go.
-		s.Git(t, "stash", "pop")
-		s.Git(t, "add", "src/b.go")
-		s.Git(t, "commit", "-m", "Update b.go")
-
-		cpID2 := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.WaitForCheckpointExists(t, s.Dir, cpID2, 30*time.Second)
-
-		assert.NotEqual(t, cpID1, cpID2, "checkpoint IDs should be distinct")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID1)
-		testutil.AssertCheckpointExists(t, s.Dir, cpID2)
-		// Shadow branch cleanup can lag behind condensation when carry-forward
-		// creates intermediate branches, so poll instead of instant-assert.
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/tests/subagent_commit_flow_test.go b/e2e/tests/subagent_commit_flow_test.go
deleted file mode 100644
index 0b44ecc..0000000
--- a/e2e/tests/subagent_commit_flow_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-//go:build e2e
-
-package tests
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/e2e/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestSubagentCommitFlow: agent creates a file via subagent, user commits.
-// Validates the full checkpoint flow: trailer, metadata (cli_version, strategy,
-// sessions), session metadata (agent field), and checkpoint existence.
-func TestSubagentCommitFlow(t *testing.T) {
-	testutil.ForEachAgent(t, 3*time.Minute, func(t *testing.T, s *testutil.RepoState, ctx context.Context) {
-		_, err := s.RunPrompt(t, ctx,
-			"use a subagent: create a markdown file at docs/red.md with a paragraph about the colour red. Do not commit the file. Do not ask for confirmation, just make the change.")
-		if err != nil {
-			t.Fatalf("agent failed: %v", err)
-		}
-		testutil.AssertFileExists(t, s.Dir, "docs/red.md")
-
-		s.Git(t, "add", ".")
-		s.Git(t, "commit", "-m", "Add red.md via subagent")
-
-		testutil.WaitForCheckpoint(t, s, 30*time.Second)
-		testutil.AssertCheckpointAdvanced(t, s)
-
-		cpID := testutil.AssertHasCheckpointTrailer(t, s.Dir, "HEAD")
-		testutil.AssertCheckpointExists(t, s.Dir, cpID)
-
-		// Validate checkpoint metadata completeness.
-		meta := testutil.ReadCheckpointMetadata(t, s.Dir, cpID)
-		assert.NotEmpty(t, meta.CLIVersion, "cli_version should be set")
-		assert.NotEmpty(t, meta.Strategy, "strategy should be set")
-		assert.NotEmpty(t, meta.Sessions, "should have at least 1 session")
-
-		// Validate session metadata — agent field should be populated.
-		sm := testutil.ReadSessionMetadata(t, s.Dir, cpID, 0)
-		assert.NotEmpty(t, sm.Agent, "session agent field should be populated")
-		assert.NotEmpty(t, sm.SessionID, "session_id should be set")
-		testutil.WaitForNoShadowBranches(t, s.Dir, 10*time.Second)
-	})
-}
diff --git a/e2e/testutil/artifacts.go b/e2e/testutil/artifacts.go
deleted file mode 100644
index 23eb380..0000000
--- a/e2e/testutil/artifacts.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package testutil
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-)
-
-// ArtifactRoot is the absolute path to the artifact output directory.
-// Must be set in TestMain before any tests run.
-var ArtifactRoot string
-
-// ArtifactTimestamp is the timestamp subdirectory for this test run.
-var ArtifactTimestamp = time.Now().Format("2006-01-02T15-04-05")
-
-var runDirOverride string
-
-// SetRunDir overrides the artifact run directory (e.g. from E2E_ARTIFACT_DIR).
-func SetRunDir(dir string) {
-	runDirOverride = dir
-}
-
-// ArtifactRunDir returns the directory for the current test run.
-func ArtifactRunDir() string {
-	if runDirOverride != "" {
-		return runDirOverride
-	}
-	return filepath.Join(ArtifactRoot, ArtifactTimestamp)
-}
-
-func artifactDir(t *testing.T) string {
-	t.Helper()
-	name := strings.ReplaceAll(t.Name(), "/", "-")
-	dir := filepath.Join(ArtifactRunDir(), name)
-	if err := os.MkdirAll(dir, 0o755); err != nil {
-		t.Logf("warning: failed to create artifact dir: %v", err)
-	}
-	return dir
-}
-
-// CaptureArtifacts captures git state, checkpoint metadata, trace logs,
-// and console output to the artifact directory.
-func CaptureArtifacts(t *testing.T, s *RepoState) {
-	t.Helper()
-	dir := s.ArtifactDir
-	checkpointRef := checkpointReadRef()
-
-	writeArtifact(t, dir, "git-log.txt",
-		gitOutputSafe(s.Dir, "log", "--decorate", "--graph", "--all"))
-
-	writeArtifact(t, dir, "git-tree.txt",
-		gitOutputSafe(s.Dir, "ls-tree", "-r", "HEAD")+
-			"\n--- "+checkpointRef+" ---\n"+
-			gitOutputSafe(s.Dir, "ls-tree", "-r", checkpointRef))
-
-	// console.log is written incrementally to disk via s.ConsoleLog (*os.File),
-	// so it already exists in the artifact dir and survives global timeouts.
-
-	// Capture final pane content from interactive sessions, then close.
-	// Must happen here (not in a separate t.Cleanup) because cleanup
-	// functions run LIFO — closing first would kill the tmux session
-	// before we can capture.
-	if s.session != nil {
-		pane := s.session.Capture()
-		writeArtifact(t, dir, "pane.txt", pane)
-		_ = s.session.Close()
-	}
-
-	if t.Failed() {
-		writeArtifact(t, dir, "FAIL", "")
-	} else {
-		writeArtifact(t, dir, "PASS", "")
-	}
-
-	captureCheckpointMetadata(t, s, dir)
-	captureTraceLogs(t, s.Dir, dir)
-
-	if os.Getenv("E2E_KEEP_REPOS") != "" {
-		if err := linkRepo(s.Dir, dir); err != nil {
-			t.Logf("warning: failed to link repo: %v", err)
-		}
-	}
-}
-
-func captureCheckpointMetadata(t *testing.T, s *RepoState, outDir string) {
-	t.Helper()
-	commits := NewCheckpointCommits(t, s)
-	metaDir := filepath.Join(outDir, "checkpoint-metadata")
-
-	cpIDRe := regexp.MustCompile(`(?m)^Checkpoint:\s+(\S+)`)
-	for _, sha := range commits {
-		msg := gitOutputSafe(s.Dir, "log", "-1", "--format=%B", sha)
-		m := cpIDRe.FindStringSubmatch(msg)
-		if m == nil || len(m[1]) < 3 {
-			continue
-		}
-		id := m[1]
-		cpPath := CheckpointPath(id)
-
-		cpDir := filepath.Join(metaDir, cpPath)
-		_ = os.MkdirAll(cpDir, 0o755)
-		raw := gitOutputSafe(s.Dir, "show", sha+":"+cpPath+"/metadata.json")
-		writeArtifact(t, cpDir, "metadata.json", raw)
-
-		for i := 0; ; i++ {
-			sessPath := fmt.Sprintf("%s/%d/metadata.json", cpPath, i)
-			raw := gitOutputSafe(s.Dir, "show", sha+":"+sessPath)
-			if raw == "" {
-				break
-			}
-			sessDir := filepath.Join(cpDir, strconv.Itoa(i))
-			_ = os.MkdirAll(sessDir, 0o755)
-			writeArtifact(t, sessDir, "metadata.json", raw)
-		}
-	}
-}
-
-func captureTraceLogs(t *testing.T, repoDir, outDir string) {
-	t.Helper()
-	logDir := filepath.Join(repoDir, ".trace", "logs")
-	entries, err := os.ReadDir(logDir)
-	if err != nil {
-		return
-	}
-	dst := filepath.Join(outDir, "trace-logs")
-	_ = os.MkdirAll(dst, 0o755)
-	for _, e := range entries {
-		data, err := os.ReadFile(filepath.Join(logDir, e.Name()))
-		if err != nil {
-			continue
-		}
-		writeArtifact(t, dst, e.Name(), string(data))
-	}
-}
-
-func writeArtifact(t *testing.T, dir, name, content string) {
-	t.Helper()
-	path := filepath.Join(dir, name)
-	if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
-		t.Logf("warning: failed to write artifact %s: %v", path, err)
-	}
-}
-
-func gitOutputSafe(dir string, args ...string) string {
-	cmd := exec.Command("git", args...)
-	cmd.Dir = dir
-	out, err := cmd.Output()
-	if err != nil {
-		return ""
-	}
-	return string(out)
-}
diff --git a/e2e/testutil/artifacts_unix.go b/e2e/testutil/artifacts_unix.go
deleted file mode 100644
index f0cf512..0000000
--- a/e2e/testutil/artifacts_unix.go
+++ /dev/null
@@ -1,14 +0,0 @@
-//go:build !windows
-
-package testutil
-
-import (
-	"os"
-	"path/filepath"
-)
-
-// linkRepo creates a symlink from the artifact directory to the test repo
-// for easy post-test inspection when E2E_KEEP_REPOS is set.
-func linkRepo(repoDir, artifactDir string) error {
-	return os.Symlink(repoDir, filepath.Join(artifactDir, "repo"))
-}
diff --git a/e2e/testutil/artifacts_windows.go b/e2e/testutil/artifacts_windows.go
deleted file mode 100644
index b397390..0000000
--- a/e2e/testutil/artifacts_windows.go
+++ /dev/null
@@ -1,15 +0,0 @@
-//go:build windows
-
-package testutil
-
-import (
-	"os"
-	"path/filepath"
-)
-
-// linkRepo writes a repo.txt file containing the repo path instead of
-// creating a symlink, because Windows symlinks require elevated privileges
-// or Developer Mode.
-func linkRepo(repoDir, artifactDir string) error {
-	return os.WriteFile(filepath.Join(artifactDir, "repo.txt"), []byte(repoDir), 0o644)
-}
diff --git a/e2e/testutil/assertions.go b/e2e/testutil/assertions.go
deleted file mode 100644
index 75fc2ed..0000000
--- a/e2e/testutil/assertions.go
+++ /dev/null
@@ -1,450 +0,0 @@
-package testutil
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// DeepCheckpointValidation contains expected values for comprehensive checkpoint validation.
-type DeepCheckpointValidation struct {
-	CheckpointID              string
-	Strategy                  string
-	FilesTouched              []string
-	ExpectedPrompts           []string
-	ExpectedTranscriptContent []string
-}
-
-var hexIDPattern = regexp.MustCompile(`^[0-9a-f]{12}$`)
-
-// AssertFileExists asserts that at least one file matches the glob pattern
-// relative to dir.
-func AssertFileExists(t *testing.T, dir string, glob string) {
-	t.Helper()
-	matches, err := filepath.Glob(filepath.Join(dir, glob))
-	require.NoError(t, err)
-	assert.NotEmpty(t, matches, "expected files matching %s in %s", glob, dir)
-}
-
-// AssertConsoleLogDoesNotContain asserts that the current test's console.log
-// does not contain any of the forbidden substrings.
-func AssertConsoleLogDoesNotContain(t *testing.T, s *RepoState, forbidden ...string) {
-	t.Helper()
-
-	require.NoError(t, s.ConsoleLog.Sync())
-
-	data, err := os.ReadFile(filepath.Join(s.ArtifactDir, "console.log"))
-	require.NoError(t, err)
-
-	log := string(data)
-	for _, needle := range forbidden {
-		assert.NotContains(t, log, needle, "console.log should not contain %q", needle)
-	}
-}
-
-// WaitForFileExists polls until at least one file matches the glob pattern
-// relative to dir, or fails the test after timeout. Handles the race where an
-// interactive agent's prompt pattern appears before file writes land on disk.
-func WaitForFileExists(t *testing.T, dir string, glob string, timeout time.Duration) {
-	t.Helper()
-	pattern := filepath.Join(dir, glob)
-	deadline := time.Now().Add(timeout)
-	for {
-		matches, err := filepath.Glob(pattern)
-		require.NoError(t, err)
-		if len(matches) > 0 {
-			return
-		}
-		if time.Now().After(deadline) {
-			t.Fatalf("expected files matching %s in %s within %s", glob, dir, timeout)
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-}
-
-// AssertNewCommits polls until at least `atLeast` new commits exist since setup,
-// or fails after 20 seconds. Polling handles the race where an interactive
-// agent's prompt pattern appears before its git commit lands on disk.
-func AssertNewCommits(t *testing.T, s *RepoState, atLeast int) {
-	t.Helper()
-	AssertNewCommitsWithTimeout(t, s, atLeast, 20*time.Second)
-}
-
-// AssertNewCommitsWithTimeout is like AssertNewCommits but with a configurable
-// timeout. Use this when WaitFor may settle on stale pane content (e.g.
-// multi-turn interactive tests where the previous turn's prompt is still
-// visible), giving the agent more time to complete its commit.
-func AssertNewCommitsWithTimeout(t *testing.T, s *RepoState, atLeast int, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for {
-		out := GitOutput(t, s.Dir, "log", "--oneline", s.HeadBefore+"..HEAD")
-		var lines []string
-		if out != "" {
-			lines = strings.Split(strings.TrimSpace(out), "\n")
-		}
-		if len(lines) >= atLeast {
-			return
-		}
-		if time.Now().After(deadline) {
-			t.Fatalf("expected at least %d new commit(s), got %d after %s", atLeast, len(lines), timeout)
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-}
-
-// WaitForCheckpoint polls until the checkpoint branch advances from its
-// initial state, or fails the test after timeout. Use this before any
-// assertions that depend on the checkpoint branch (post-commit hook is async).
-func WaitForCheckpoint(t *testing.T, s *RepoState, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		after := strings.TrimSpace(gitOutputSafe(s.Dir, "rev-parse", checkpointReadRef()))
-		if after != s.CheckpointBefore {
-			return
-		}
-		time.Sleep(200 * time.Millisecond)
-	}
-	t.Fatalf("checkpoint ref %s did not advance within %s", checkpointReadRef(), timeout)
-}
-
-// ShadowBranches returns all shadow branches (trace/*) excluding trace/checkpoints/*.
-func ShadowBranches(t *testing.T, dir string) []string {
-	t.Helper()
-	branches := GitOutput(t, dir, "for-each-ref", "--format=%(refname:short)", "refs/heads/trace/")
-	var shadow []string
-	for _, b := range strings.Split(branches, "\n") {
-		b = strings.TrimSpace(b)
-		if b == "" || strings.HasPrefix(b, "trace/checkpoints") {
-			continue
-		}
-		shadow = append(shadow, b)
-	}
-	return shadow
-}
-
-// WaitForNoShadowBranches polls until all shadow branches are cleaned up or
-// the timeout expires. Shadow branch cleanup can lag slightly behind checkpoint
-// condensation (carry-forward creates intermediate branches that are deleted
-// asynchronously).
-func WaitForNoShadowBranches(t *testing.T, dir string, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		shadow := ShadowBranches(t, dir)
-		if len(shadow) == 0 {
-			return
-		}
-		time.Sleep(200 * time.Millisecond)
-	}
-	shadow := ShadowBranches(t, dir)
-	require.Emptyf(t, shadow,
-		"shadow branches should be cleaned up within %s after commit, found: %v", timeout, shadow)
-}
-
-// AssertHasShadowBranches asserts that at least one shadow branch (trace/*)
-// exists, excluding trace/checkpoints/*. Use this when the shadow branch is
-// expected to persist (e.g., session is still idle).
-func AssertHasShadowBranches(t *testing.T, dir string) {
-	t.Helper()
-	shadow := ShadowBranches(t, dir)
-	assert.NotEmpty(t, shadow,
-		"expected at least one shadow branch to persist, but none found")
-}
-
-// AssertCheckpointAdvanced asserts the checkpoint branch moved forward.
-func AssertCheckpointAdvanced(t *testing.T, s *RepoState) {
-	t.Helper()
-	after := strings.TrimSpace(gitOutputSafe(s.Dir, "rev-parse", checkpointReadRef()))
-	assert.NotEqual(t, s.CheckpointBefore, after, "checkpoint branch did not advance")
-}
-
-// AssertCheckpointNotAdvanced asserts the checkpoint branch has NOT moved.
-func AssertCheckpointNotAdvanced(t *testing.T, s *RepoState) {
-	t.Helper()
-	after := strings.TrimSpace(gitOutputSafe(s.Dir, "rev-parse", checkpointReadRef()))
-	assert.Equal(t, s.CheckpointBefore, after, "checkpoint branch advanced unexpectedly")
-}
-
-// AssertCheckpointIDFormat asserts the checkpoint ID is 12 lowercase hex chars.
-func AssertCheckpointIDFormat(t *testing.T, checkpointID string) {
-	t.Helper()
-	assert.Regexp(t, hexIDPattern, checkpointID,
-		"checkpoint ID %q should be 12 lowercase hex chars", checkpointID)
-}
-
-// AssertHasCheckpointTrailer asserts the commit has an Trace-Checkpoint trailer,
-// validates its format, and returns its value.
-func AssertHasCheckpointTrailer(t *testing.T, dir string, ref string) string {
-	t.Helper()
-	trailer := GetCheckpointTrailer(t, dir, ref)
-	require.NotEmpty(t, trailer, "no Trace-Checkpoint trailer on %s", ref)
-	AssertCheckpointIDFormat(t, trailer)
-	return trailer
-}
-
-// AssertCheckpointInLastN asserts the given checkpoint ID appears in at
-// least n commits on the checkpoint branch (e.g. initial + catchup).
-// Uses --grep to find matching commits regardless of position, so extra
-// commits from multi-commit agent turns don't cause false failures.
-func AssertCheckpointInLastN(t *testing.T, dir string, checkpointID string, n int) {
-	t.Helper()
-	out := GitOutput(t, dir, "log", "--grep="+checkpointID,
-		"--format=%s", checkpointReadRef())
-	var lines []string
-	for _, line := range strings.Split(strings.TrimSpace(out), "\n") {
-		if line != "" {
-			lines = append(lines, line)
-		}
-	}
-	assert.GreaterOrEqual(t, len(lines), n,
-		"expected at least %d commits mentioning %s on checkpoint branch, got %d: %v",
-		n, checkpointID, len(lines), lines)
-}
-
-// AssertCheckpointExists asserts that the checkpoint ID is mentioned on
-// the checkpoint branch and that its metadata.json exists in the tree.
-func AssertCheckpointExists(t *testing.T, dir string, checkpointID string) {
-	t.Helper()
-	out := GitOutput(t, dir, "log", checkpointReadRef(), "--grep="+checkpointID, "--oneline")
-	assert.NotEmpty(t, out, "checkpoint %s not found on checkpoint branch", checkpointID)
-
-	path := CheckpointPath(checkpointID) + "/metadata.json"
-	blob := checkpointReadRef() + ":" + path
-	raw := gitOutputSafe(dir, "show", blob)
-	assert.NotEmpty(t, raw,
-		"checkpoint %s metadata not found at %s", checkpointID, path)
-}
-
-// WaitForCheckpointExists polls until the checkpoint ID appears on the
-// checkpoint branch and its metadata.json is readable, or fails after timeout.
-func WaitForCheckpointExists(t *testing.T, dir string, checkpointID string, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		out := gitOutputSafe(dir, "log", checkpointReadRef(), "--grep="+checkpointID, "--oneline")
-		if out != "" {
-			path := CheckpointPath(checkpointID) + "/metadata.json"
-			blob := checkpointReadRef() + ":" + path
-			raw := gitOutputSafe(dir, "show", blob)
-			if raw != "" {
-				return
-			}
-		}
-		time.Sleep(200 * time.Millisecond)
-	}
-	t.Fatalf("checkpoint %s not found on checkpoint branch within %s", checkpointID, timeout)
-}
-
-// AssertCommitLinkedToCheckpoint asserts the trailer exists AND the
-// checkpoint data exists on the checkpoint branch.
-func AssertCommitLinkedToCheckpoint(t *testing.T, dir string, ref string) {
-	t.Helper()
-	trailer := AssertHasCheckpointTrailer(t, dir, ref)
-	AssertCheckpointExists(t, dir, trailer)
-}
-
-// AssertCheckpointHasSingleSession asserts checkpoint metadata has exactly one session.
-func AssertCheckpointHasSingleSession(t *testing.T, dir string, checkpointID string) {
-	t.Helper()
-	meta := ReadCheckpointMetadata(t, dir, checkpointID)
-	assert.Len(t, meta.Sessions, 1,
-		"expected 1 session in checkpoint %s, got %d", checkpointID, len(meta.Sessions))
-}
-
-// AssertCheckpointMetadataComplete asserts essential fields in checkpoint metadata are populated.
-func AssertCheckpointMetadataComplete(t *testing.T, dir string, checkpointID string) {
-	t.Helper()
-	meta := ReadCheckpointMetadata(t, dir, checkpointID)
-	assert.NotEmpty(t, meta.CLIVersion, "checkpoint %s: cli_version should be set", checkpointID)
-	assert.NotEmpty(t, meta.Strategy, "checkpoint %s: strategy should be set", checkpointID)
-	assert.NotEmpty(t, meta.Sessions, "checkpoint %s: should have at least 1 session", checkpointID)
-	assert.Equal(t, checkpointID, meta.CheckpointID,
-		"checkpoint metadata ID should match expected")
-}
-
-// WaitForCheckpointAdvanceFrom polls until the checkpoint branch advances from
-// the given ref, or fails the test after timeout. Use this when waiting for a
-// second (or subsequent) checkpoint after recording the branch position.
-func WaitForCheckpointAdvanceFrom(t *testing.T, dir string, fromRef string, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		after := strings.TrimSpace(gitOutputSafe(dir, "rev-parse", checkpointReadRef()))
-		if after != fromRef {
-			return
-		}
-		time.Sleep(200 * time.Millisecond)
-	}
-	displayRef := fromRef
-	if len(displayRef) > 8 {
-		displayRef = displayRef[:8]
-	}
-	t.Fatalf("checkpoint ref %s did not advance from %s within %s", checkpointReadRef(), displayRef, timeout)
-}
-
-// WaitForSessionIdle polls the session state files in .git/trace-sessions/
-// until no session has phase "active", or fails the test after timeout.
-// This handles the race where an agent's prompt pattern appears in the TUI
-// before the turn-end hook has completed (transitioning ACTIVE → IDLE).
-func WaitForSessionIdle(t *testing.T, dir string, timeout time.Duration) {
-	t.Helper()
-	stateDir := filepath.Join(dir, ".git", "trace-sessions")
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		entries, err := os.ReadDir(stateDir)
-		if err != nil {
-			// Directory may not exist yet; keep polling
-			time.Sleep(200 * time.Millisecond)
-			continue
-		}
-		anyActive := false
-		for _, entry := range entries {
-			if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".json") || strings.HasSuffix(entry.Name(), ".tmp") {
-				continue
-			}
-			data, err := os.ReadFile(filepath.Join(stateDir, entry.Name()))
-			if err != nil {
-				continue
-			}
-			var state struct {
-				Phase string `json:"phase"`
-			}
-			if err := json.Unmarshal(data, &state); err != nil {
-				continue
-			}
-			if state.Phase == "active" {
-				anyActive = true
-				break
-			}
-		}
-		if !anyActive {
-			return
-		}
-		time.Sleep(200 * time.Millisecond)
-	}
-	t.Fatalf("session(s) did not transition to idle within %s", timeout)
-}
-
-// AssertNoCheckpointTrailer asserts the commit does NOT have an Trace-Checkpoint trailer.
-func AssertNoCheckpointTrailer(t *testing.T, dir string, ref string) {
-	t.Helper()
-	trailer := GetCheckpointTrailer(t, dir, ref)
-	assert.Empty(t, trailer, "expected no Trace-Checkpoint trailer on %s, got %q", ref, trailer)
-}
-
-// AssertCheckpointFilesTouched asserts the checkpoint metadata lists exactly
-// the expected files in files_touched (order-independent).
-func AssertCheckpointFilesTouched(t *testing.T, dir string, checkpointID string, expected []string) {
-	t.Helper()
-	meta := ReadCheckpointMetadata(t, dir, checkpointID)
-	assert.ElementsMatch(t, expected, meta.FilesTouched,
-		"checkpoint %s: files_touched mismatch", checkpointID)
-}
-
-// AssertCheckpointFilesTouchedContains asserts files_touched contains a
-// specific file path (subset check, unlike the exact-match AssertCheckpointFilesTouched).
-func AssertCheckpointFilesTouchedContains(t *testing.T, dir string, checkpointID string, file string) {
-	t.Helper()
-	meta := ReadCheckpointMetadata(t, dir, checkpointID)
-	assert.Contains(t, meta.FilesTouched, file,
-		"checkpoint %s: files_touched should contain %s", checkpointID, file)
-}
-
-// AssertDistinctSessions asserts session metadata across checkpoints has unique session IDs.
-func AssertDistinctSessions(t *testing.T, dir string, checkpointIDs []string) {
-	t.Helper()
-	seen := map[string]bool{}
-	for _, cpID := range checkpointIDs {
-		sm := ReadSessionMetadata(t, dir, cpID, 0)
-		assert.False(t, seen[sm.SessionID],
-			"duplicate session_id %s across checkpoints", sm.SessionID)
-		seen[sm.SessionID] = true
-	}
-}
-
-// ValidateCheckpointDeep performs comprehensive validation of checkpoint metadata
-// on the checkpoint branch, including transcript JSONL validity, content hash
-// verification, and prompt content checking.
-func ValidateCheckpointDeep(t *testing.T, dir string, v DeepCheckpointValidation) {
-	t.Helper()
-
-	// Basic metadata validation
-	AssertCheckpointExists(t, dir, v.CheckpointID)
-	AssertCheckpointMetadataComplete(t, dir, v.CheckpointID)
-
-	if v.Strategy != "" {
-		meta := ReadCheckpointMetadata(t, dir, v.CheckpointID)
-		assert.Equal(t, v.Strategy, meta.Strategy,
-			"checkpoint %s: strategy mismatch", v.CheckpointID)
-	}
-
-	if len(v.FilesTouched) > 0 {
-		AssertCheckpointFilesTouched(t, dir, v.CheckpointID, v.FilesTouched)
-	}
-
-	path := CheckpointPath(v.CheckpointID)
-	checkpointRef := checkpointReadRef()
-
-	// Validate session metadata exists and has checkpoint_id
-	sessionBlob := fmt.Sprintf("%s:%s/0/metadata.json", checkpointRef, path)
-	sessionRaw := gitOutputSafe(dir, "show", sessionBlob)
-	if assert.NotEmpty(t, sessionRaw, "session metadata should exist at %s", sessionBlob) {
-		var sessionMeta map[string]any
-		if assert.NoError(t, json.Unmarshal([]byte(sessionRaw), &sessionMeta)) {
-			assert.Equal(t, v.CheckpointID, sessionMeta["checkpoint_id"],
-				"session metadata checkpoint_id should match")
-			assert.NotEmpty(t, sessionMeta["created_at"], "session metadata should have created_at")
-		}
-	}
-
-	// Validate transcript is valid JSONL
-	transcriptBlob := fmt.Sprintf("%s:%s/0/full.jsonl", checkpointRef, path)
-	transcriptRaw := gitOutputSafe(dir, "show", transcriptBlob)
-	if assert.NotEmpty(t, transcriptRaw, "transcript should exist at %s", transcriptBlob) {
-		lines := strings.Split(transcriptRaw, "\n")
-		nonEmpty := 0
-		for _, line := range lines {
-			if strings.TrimSpace(line) != "" {
-				nonEmpty++
-			}
-		}
-		assert.Positive(t, nonEmpty, "transcript should have at least one line")
-
-		for _, expected := range v.ExpectedTranscriptContent {
-			assert.Contains(t, transcriptRaw, expected,
-				"transcript should contain %q", expected)
-		}
-
-		// Validate content hash
-		hashBlob := fmt.Sprintf("%s:%s/0/content_hash.txt", checkpointRef, path)
-		hashRaw := gitOutputSafe(dir, "show", hashBlob)
-		if hashRaw != "" {
-			hash := sha256.Sum256([]byte(transcriptRaw))
-			expectedHash := "sha256:" + hex.EncodeToString(hash[:])
-			assert.Equal(t, expectedHash, strings.TrimSpace(hashRaw),
-				"content hash should match transcript SHA-256")
-		}
-	}
-
-	// Validate prompt.txt if expected prompts specified
-	if len(v.ExpectedPrompts) > 0 {
-		promptBlob := fmt.Sprintf("%s:%s/0/prompt.txt", checkpointRef, path)
-		promptRaw := gitOutputSafe(dir, "show", promptBlob)
-		for _, expected := range v.ExpectedPrompts {
-			assert.Contains(t, promptRaw, expected,
-				"prompt.txt should contain %q", expected)
-		}
-	}
-}
diff --git a/e2e/testutil/metadata.go b/e2e/testutil/metadata.go
deleted file mode 100644
index 4636653..0000000
--- a/e2e/testutil/metadata.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package testutil
-
-import "time"
-
-type TokenUsage struct {
-	InputTokens         int `json:"input_tokens"`
-	CacheCreationTokens int `json:"cache_creation_tokens"`
-	CacheReadTokens     int `json:"cache_read_tokens"`
-	OutputTokens        int `json:"output_tokens"`
-	APICallCount        int `json:"api_call_count"`
-}
-
-type Attribution struct {
-	CalculatedAt    time.Time `json:"calculated_at"`
-	AgentLines      int       `json:"agent_lines"`
-	HumanAdded      int       `json:"human_added"`
-	HumanModified   int       `json:"human_modified"`
-	HumanRemoved    int       `json:"human_removed"`
-	TotalCommitted  int       `json:"total_committed"`
-	AgentPercentage float64   `json:"agent_percentage"`
-}
-
-type CheckpointMetadata struct {
-	CLIVersion       string       `json:"cli_version"`
-	CheckpointID     string       `json:"checkpoint_id"`
-	Strategy         string       `json:"strategy"`
-	Branch           string       `json:"branch"`
-	CheckpointsCount int          `json:"checkpoints_count"`
-	FilesTouched     []string     `json:"files_touched"`
-	Sessions         []SessionRef `json:"sessions"`
-	TokenUsage       TokenUsage   `json:"token_usage"`
-}
-
-type SessionRef struct {
-	Metadata    string `json:"metadata"`
-	Transcript  string `json:"transcript"`
-	Context     string `json:"context"`
-	ContentHash string `json:"content_hash"`
-	Prompt      string `json:"prompt"`
-}
-
-type SessionMetadata struct {
-	CLIVersion         string      `json:"cli_version"`
-	CheckpointID       string      `json:"checkpoint_id"`
-	SessionID          string      `json:"session_id"`
-	Strategy           string      `json:"strategy"`
-	CreatedAt          time.Time   `json:"created_at"`
-	Branch             string      `json:"branch"`
-	Agent              string      `json:"agent"`
-	Model              string      `json:"model"`
-	CheckpointsCount   int         `json:"checkpoints_count"`
-	FilesTouched       []string    `json:"files_touched"`
-	TokenUsage         TokenUsage  `json:"token_usage"`
-	InitialAttribution Attribution `json:"initial_attribution"`
-	TranscriptPath     string      `json:"transcript_path"`
-}
-
-func CheckpointPath(id string) string {
-	return id[:2] + "/" + id[2:]
-}
diff --git a/e2e/testutil/repo.go b/e2e/testutil/repo.go
deleted file mode 100644
index f481c13..0000000
--- a/e2e/testutil/repo.go
+++ /dev/null
@@ -1,967 +0,0 @@
-package testutil
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/GrayCodeAI/trace/e2e/agents"
-	"github.com/GrayCodeAI/trace/e2e/trace"
-)
-
-const droidRepoSettingsPath = ".factory/settings.json"
-
-const (
-	checkpointsModeLegacy      = "legacy"
-	checkpointsModeV2DualWrite = "v2-dual-write"
-	checkpointsModeV2Only      = "v2-only"
-
-	checkpointRefV1            = "trace/checkpoints/v1"
-	checkpointRefV2Main        = "refs/trace/checkpoints/v2/main"
-	checkpointRefV2FullCurrent = "refs/trace/checkpoints/v2/full/current"
-	checkpointRefV2FullPrefix  = "refs/trace/checkpoints/v2/full/"
-)
-
-// RepoState holds the working state for a single test's cloned repository.
-type RepoState struct {
-	Agent            agents.Agent
-	Dir              string
-	ArtifactDir      string
-	HeadBefore       string
-	CheckpointBefore string
-	ConsoleLog       *os.File
-	session          agents.Session // interactive session, if started via StartSession
-	skipArtifacts    bool           // suppresses artifact capture on scenario restart
-}
-
-// SetupRepo creates a fresh git repository in a temporary directory, seeds it
-// with an initial commit, and runs `trace enable` for the given agent.
-// Artifact capture is registered as a cleanup function.
-//
-// When E2E_KEEP_REPOS is set, the temporary directory is not cleaned up
-// so it can be inspected after the test. A symlink in the artifact dir
-// points to the preserved repo.
-func SetupRepo(t *testing.T, agent agents.Agent) *RepoState {
-	t.Helper()
-
-	keepRepos := os.Getenv("E2E_KEEP_REPOS") != ""
-
-	// Always use os.MkdirTemp instead of t.TempDir(). Go's t.TempDir()
-	// creates nested subdirectories (TestName.../001/) whose structure
-	// confuses some agents' (e.g. opencode) working-directory resolution.
-	//
-	// Codex refuses to operate from /tmp (e.g. "Refusing to create helper
-	// binaries under temporary dir"), so for codex we place the repo under
-	// $HOME/.cache/trace-e2e-repos/ instead.
-	root := ""
-	if agent.Name() == "codex" {
-		cache, cerr := os.UserCacheDir()
-		if cerr != nil {
-			t.Fatalf("resolve user cache dir: %v", cerr)
-		}
-		root = filepath.Join(cache, "trace-e2e-repos")
-		if err := os.MkdirAll(root, 0o755); err != nil {
-			t.Fatalf("create e2e repo root %q: %v", root, err)
-		}
-	}
-	dir, err := os.MkdirTemp(root, "e2e-repo-*")
-	if err != nil {
-		t.Fatalf("create temporary e2e repo under %q: %v", root, err)
-	}
-	if keepRepos {
-		t.Logf("E2E_KEEP_REPOS: repo will be preserved at %s", dir)
-	} else {
-		t.Cleanup(func() { os.RemoveAll(dir) })
-	}
-
-	// Resolve symlinks (macOS: /var -> /private/var) so paths match
-	// what agent CLIs see when they resolve their own CWD.
-	if resolved, err := filepath.EvalSymlinks(dir); err == nil {
-		dir = resolved
-	}
-
-	Git(t, dir, "init")
-	Git(t, dir, "config", "user.name", "E2E Test")
-	Git(t, dir, "config", "user.email", "e2e@test.local")
-	Git(t, dir, "config", "core.pager", "cat")
-	Git(t, dir, "config", "core.autocrlf", "true")
-	Git(t, dir, "commit", "--allow-empty", "-m", "initial commit")
-
-	// External agents need external_agents enabled in settings before enable,
-	// so the CLI can discover the agent binary via PATH during DiscoverAndRegister.
-	if ea, ok := agent.(agents.ExternalAgent); ok && ea.IsExternalAgent() {
-		traceDir := filepath.Join(dir, ".trace")
-		if err := os.MkdirAll(traceDir, 0o755); err != nil {
-			t.Fatalf("create .trace for external agent: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(traceDir, "settings.json"),
-			[]byte("{\"external_agents\": true}\n"), 0o644); err != nil {
-			t.Fatalf("write external_agents setting: %v", err)
-		}
-	}
-
-	trace.Enable(t, dir, agent.TraceAgent())
-	if agent.Name() == "gemini-cli" {
-		setupGeminiTestHome(t, dir)
-	}
-	if agent.Name() == "factoryai-droid" {
-		if err := configureDroidRepoSettings(dir); err != nil {
-			t.Fatalf("configure droid repo settings: %v", err)
-		}
-	}
-	// commit_linking=always ensures the prepare-commit-msg hook adds the
-	// Trace-Checkpoint trailer unconditionally. This is needed because
-	// interactive agents run inside tmux (CanPromptInteractively()=true) but
-	// can't respond to prompts, and content detection may fail on the first
-	// checkpoint when no shadow branch exists yet. Prompt-mode agents still
-	// exercise the !CanPromptInteractively() fast path since they have no TTY
-	// regardless of this setting.
-	PatchSettings(t, dir, map[string]any{"log_level": "debug", "commit_linking": "always"})
-	ApplySuiteCheckpointsMode(t, dir)
-
-	// Copilot CLI blocks on a "No copilot instructions found" notice in fresh
-	// repos that lack .github/copilot-instructions.md, preventing the interactive
-	// prompt from appearing.
-	if agent.Name() == "copilot-cli" {
-		ghDir := filepath.Join(dir, ".github")
-		if err := os.MkdirAll(ghDir, 0o755); err != nil {
-			t.Fatalf("create .github dir: %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(ghDir, "copilot-instructions.md"), []byte("# E2E Test\n"), 0o644); err != nil {
-			t.Fatalf("write copilot-instructions.md: %v", err)
-		}
-	}
-
-	// OpenCode's non-interactive mode auto-rejects external_directory permission
-	// since there's no user to prompt. Write a config to allow it.
-	if agent.Name() == "opencode" {
-		cfg := `{"$schema": "https://opencode.ai/config.json", "permission": {"external_directory": "allow"}}`
-		if key := os.Getenv("ANTHROPIC_API_KEY"); key != "" {
-			cfg = fmt.Sprintf(`{"$schema": "https://opencode.ai/config.json", "permission": {"external_directory": "allow"}, "provider": {"anthropic": {"options": {"apiKey": %q}}}}`, key)
-		}
-		if err := os.WriteFile(filepath.Join(dir, "opencode.json"), []byte(cfg+"\n"), 0o644); err != nil {
-			t.Fatalf("write opencode.json: %v", err)
-		}
-	}
-
-	// Create artifact dir eagerly so console.log is written to disk
-	// incrementally. Even if the test is killed by a global timeout,
-	// partial output survives.
-	artDir := artifactDir(t)
-	consoleLog, err := os.Create(filepath.Join(artDir, "console.log"))
-	if err != nil {
-		t.Fatalf("create console.log: %v", err)
-	}
-
-	state := &RepoState{
-		Agent:            agent,
-		Dir:              dir,
-		ArtifactDir:      artDir,
-		HeadBefore:       GitOutput(t, dir, "rev-parse", "HEAD"),
-		CheckpointBefore: strings.TrimSpace(gitOutputSafe(dir, "rev-parse", checkpointReadRef())),
-		ConsoleLog:       consoleLog,
-	}
-
-	t.Cleanup(func() {
-		_ = consoleLog.Close()
-		if !state.skipArtifacts {
-			CaptureArtifacts(t, state)
-		}
-	})
-
-	return state
-}
-
-// ApplySuiteCheckpointsMode configures an arbitrary repo for the current
-// suite-wide E2E checkpoints mode. Useful for repos created outside SetupRepo,
-// such as fresh clones in remote-resume scenarios.
-func ApplySuiteCheckpointsMode(t *testing.T, dir string) {
-	t.Helper()
-
-	switch CheckpointsMode() {
-	case checkpointsModeLegacy:
-		return
-	case checkpointsModeV2DualWrite:
-		EnableCheckpointsV2(t, dir)
-	case checkpointsModeV2Only:
-		EnableCheckpointsVersion2(t, dir)
-	default:
-		t.Fatalf("unsupported E2E_CHECKPOINTS_MODE %q (expected legacy, v2-dual-write, or v2-only)", CheckpointsMode())
-	}
-}
-
-// CheckpointsMode returns the active E2E checkpoints mode from E2E_CHECKPOINTS_MODE,
-// defaulting to "legacy".
-func CheckpointsMode() string {
-	mode := os.Getenv("E2E_CHECKPOINTS_MODE")
-	if mode == "" || mode == checkpointsModeLegacy {
-		return checkpointsModeLegacy
-	}
-	return mode
-}
-
-func checkpointReadRef() string {
-	switch CheckpointsMode() {
-	case checkpointsModeV2DualWrite, checkpointsModeV2Only:
-		return checkpointRefV2Main
-	default:
-		return checkpointRefV1
-	}
-}
-
-// CurrentCheckpointRef returns the current hash of the checkpoint ref used for
-// reads in the active suite mode. It fails if the ref does not exist.
-func CurrentCheckpointRef(t *testing.T, dir string) string {
-	t.Helper()
-	return GitOutput(t, dir, "rev-parse", checkpointReadRef())
-}
-
-// CheckpointVerifyRef returns the exact local metadata ref name tests should
-// use for presence checks such as rev-parse --verify.
-func CheckpointVerifyRef() string {
-	switch CheckpointsMode() {
-	case checkpointsModeLegacy:
-		return "refs/heads/" + checkpointRefV1
-	default:
-		return checkpointReadRef()
-	}
-}
-
-// PushCheckpointRefs pushes the checkpoint refs used by the active suite mode
-// to the origin remote. Remote-resume tests use this instead of hardcoding
-// legacy v1 branch pushes.
-func PushCheckpointRefs(t *testing.T, dir string) {
-	t.Helper()
-
-	switch CheckpointsMode() {
-	case checkpointsModeLegacy:
-		Git(t, dir, "push", "origin", checkpointRefV1+":"+checkpointRefV1)
-	case checkpointsModeV2DualWrite:
-		Git(t, dir, "push", "origin", checkpointRefV1+":"+checkpointRefV1)
-		Git(t, dir, "push", "origin", checkpointRefV2Main+":"+checkpointRefV2Main)
-		Git(t, dir, "push", "origin", checkpointRefV2FullCurrent+":"+checkpointRefV2FullCurrent)
-	case checkpointsModeV2Only:
-		Git(t, dir, "push", "origin", checkpointRefV2Main+":"+checkpointRefV2Main)
-		Git(t, dir, "push", "origin", checkpointRefV2FullCurrent+":"+checkpointRefV2FullCurrent)
-	default:
-		t.Fatalf("unsupported E2E_CHECKPOINTS_MODE %q", CheckpointsMode())
-	}
-
-	if latestArchived := latestArchivedCheckpointFullRef(dir); latestArchived != "" {
-		Git(t, dir, "push", "origin", latestArchived+":"+latestArchived)
-	}
-}
-
-func latestArchivedCheckpointFullRef(dir string) string {
-	out := strings.TrimSpace(gitOutputSafe(dir, "for-each-ref", "--format=%(refname)", checkpointRefV2FullPrefix))
-	if out == "" {
-		return ""
-	}
-
-	var latest string
-	for _, ref := range strings.Split(out, "\n") {
-		ref = strings.TrimSpace(ref)
-		if ref == "" || ref == checkpointRefV2FullCurrent {
-			continue
-		}
-		if latest == "" || ref > latest {
-			latest = ref
-		}
-	}
-	return latest
-}
-
-func setupGeminiTestHome(t *testing.T, repoDir string) {
-	t.Helper()
-
-	homeDir := geminiTestHomeDir(repoDir)
-	t.Cleanup(func() {
-		if err := os.RemoveAll(homeDir); err != nil {
-			t.Errorf("remove gemini test home: %v", err)
-		}
-	})
-
-	geminiDir := filepath.Join(homeDir, ".gemini")
-	if err := os.MkdirAll(filepath.Join(geminiDir, "acknowledgments"), 0o755); err != nil {
-		t.Fatalf("create gemini test home: %v", err)
-	}
-
-	config := `{"security":{"auth":{"selectedType":"gemini-api-key"}}}`
-	if err := os.WriteFile(filepath.Join(geminiDir, "settings.json"), []byte(config), 0o644); err != nil {
-		t.Fatalf("write gemini settings: %v", err)
-	}
-
-	agentFile := filepath.Join(repoDir, ".gemini", "agents", "trace-search.md")
-	content, err := os.ReadFile(agentFile)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			return
-		}
-		t.Fatalf("read gemini agent file: %v", err)
-	}
-
-	sum := sha256.Sum256(content)
-	hash := hex.EncodeToString(sum[:])
-
-	ackPath := filepath.Join(geminiDir, "acknowledgments", "agents.json")
-	acks := map[string]map[string]string{}
-	if data, readErr := os.ReadFile(ackPath); readErr == nil {
-		if err := json.Unmarshal(data, &acks); err != nil {
-			t.Fatalf("parse gemini acknowledgments: %v", err)
-		}
-	} else if !errors.Is(readErr, os.ErrNotExist) {
-		t.Fatalf("read gemini acknowledgments: %v", readErr)
-	}
-
-	if acks[repoDir] == nil {
-		acks[repoDir] = map[string]string{}
-	}
-	acks[repoDir]["trace-search"] = hash
-
-	out, err := json.MarshalIndent(acks, "", "  ")
-	if err != nil {
-		t.Fatalf("marshal gemini acknowledgments: %v", err)
-	}
-	out = append(out, '\n')
-
-	if err := os.WriteFile(ackPath, out, 0o644); err != nil {
-		t.Fatalf("write gemini acknowledgments: %v", err)
-	}
-}
-
-func geminiTestHomeDir(repoDir string) string {
-	return filepath.Join(filepath.Dir(repoDir), filepath.Base(repoDir)+"-gemini-home")
-}
-
-func configureDroidRepoSettings(repoDir string) error {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return fmt.Errorf("get home dir: %w", err)
-	}
-
-	globalSettingsPath := filepath.Join(home, ".factory", "settings.json")
-	repoSettingsPath := filepath.Join(repoDir, droidRepoSettingsPath)
-
-	if err := mergeDroidCustomModels(globalSettingsPath, repoSettingsPath); err != nil {
-		return err
-	}
-	if err := ensureGitInfoExcludeContains(repoDir, droidRepoSettingsPath); err != nil {
-		return fmt.Errorf("exclude droid settings from git: %w", err)
-	}
-	return nil
-}
-
-func mergeDroidCustomModels(globalSettingsPath, repoSettingsPath string) error {
-	globalSettings, err := loadJSONMap(globalSettingsPath, "global droid settings")
-	if err != nil {
-		return err
-	}
-
-	customModels, ok := globalSettings["customModels"]
-	if !ok {
-		return fmt.Errorf(
-			"global droid settings at %s missing customModels; repo-local %s shadows global settings",
-			globalSettingsPath,
-			repoSettingsPath,
-		)
-	}
-
-	var models []json.RawMessage
-	if err := json.Unmarshal(customModels, &models); err != nil {
-		return fmt.Errorf("parse customModels in %s: %w", globalSettingsPath, err)
-	}
-	if len(models) == 0 {
-		return fmt.Errorf("global droid settings at %s has empty customModels", globalSettingsPath)
-	}
-
-	repoSettings, err := loadJSONMap(repoSettingsPath, "repo-local droid settings")
-	if err != nil {
-		return err
-	}
-	repoSettings["customModels"] = customModels
-
-	// Set the active custom model so interactive mode uses the BYOK model
-	// instead of prompting for selection. The value must match the Model
-	// field from the customModels entry (not the displayName).
-	modelJSON, err := json.Marshal(agents.DefaultDroidModel())
-	if err != nil {
-		return fmt.Errorf("marshal model setting: %w", err)
-	}
-	repoSettings["model"] = json.RawMessage(modelJSON)
-
-	// High autonomy prevents Droid from asking for confirmation during
-	// interactive E2E tests, which would cause hangs waiting for input.
-	repoSettings["autonomyMode"] = json.RawMessage(`"auto-high"`)
-	repoSettings["completionSound"] = json.RawMessage(`"off"`)
-
-	out, err := json.MarshalIndent(repoSettings, "", "  ")
-	if err != nil {
-		return fmt.Errorf("marshal repo-local droid settings: %w", err)
-	}
-	out = append(out, '\n')
-
-	if err := os.WriteFile(repoSettingsPath, out, 0o600); err != nil {
-		return fmt.Errorf("write repo-local droid settings %s: %w", repoSettingsPath, err)
-	}
-	return nil
-}
-
-func loadJSONMap(path, description string) (map[string]json.RawMessage, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, fmt.Errorf("read %s at %s: %w", description, path, err)
-	}
-
-	var parsed map[string]json.RawMessage
-	if err := json.Unmarshal(data, &parsed); err != nil {
-		return nil, fmt.Errorf("parse %s at %s: %w", description, path, err)
-	}
-	if parsed == nil {
-		parsed = make(map[string]json.RawMessage)
-	}
-	return parsed, nil
-}
-
-func ensureGitInfoExcludeContains(repoDir, entry string) error {
-	excludePath := filepath.Join(repoDir, ".git", "info", "exclude")
-
-	data, err := os.ReadFile(excludePath)
-	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		return fmt.Errorf("read %s: %w", excludePath, err)
-	}
-
-	normalized := strings.ReplaceAll(string(data), "\r\n", "\n")
-	for _, line := range strings.Split(normalized, "\n") {
-		if strings.TrimSpace(line) == entry {
-			return nil
-		}
-	}
-
-	var b strings.Builder
-	if len(data) > 0 {
-		b.Write(data)
-		if data[len(data)-1] != '\n' {
-			b.WriteByte('\n')
-		}
-	}
-	b.WriteString(entry)
-	b.WriteByte('\n')
-
-	if err := os.MkdirAll(filepath.Dir(excludePath), 0o755); err != nil {
-		return fmt.Errorf("create %s: %w", filepath.Dir(excludePath), err)
-	}
-	if err := os.WriteFile(excludePath, []byte(b.String()), 0o644); err != nil {
-		return fmt.Errorf("write %s: %w", excludePath, err)
-	}
-	return nil
-}
-
-// ForEachAgent runs fn as a parallel subtest for every registered agent.
-// It handles repo setup, concurrency gating, context timeout, and cleanup.
-// The timeout is scaled by each agent's TimeoutMultiplier.
-//
-// If RunPrompt detects a transient API error (e.g. rate limit, token refresh
-// failure), it panics with errScenarioRestart. ForEachAgent recovers from the
-// panic and restarts the trace scenario with a fresh repository, up to
-// maxScenarioRestarts times. This avoids stale CLI session state from the
-// failed attempt poisoning the retry.
-func ForEachAgent(t *testing.T, timeout time.Duration, fn func(t *testing.T, s *RepoState, ctx context.Context)) {
-	t.Helper()
-	t.Parallel()
-	all := agents.All()
-	if len(all) == 0 {
-		t.Skip("no agents registered (check E2E_AGENT filter)")
-	}
-	runForAgents(t, all, timeout, fn)
-}
-
-// ForEachNamedAgent runs fn as a parallel subtest for each registered agent
-// whose name matches one of the provided names.
-func ForEachNamedAgent(t *testing.T, timeout time.Duration, names []string, fn func(t *testing.T, s *RepoState, ctx context.Context)) {
-	t.Helper()
-	t.Parallel()
-
-	allowed := make(map[string]struct{}, len(names))
-	for _, name := range names {
-		allowed[name] = struct{}{}
-	}
-
-	var selected []agents.Agent
-	for _, agent := range agents.All() {
-		if _, ok := allowed[agent.Name()]; ok {
-			selected = append(selected, agent)
-		}
-	}
-	if len(selected) == 0 {
-		t.Skip("no matching agents registered (check E2E_AGENT filter)")
-	}
-
-	runForAgents(t, selected, timeout, fn)
-}
-
-func runForAgents(t *testing.T, all []agents.Agent, timeout time.Duration, fn func(t *testing.T, s *RepoState, ctx context.Context)) {
-	t.Helper()
-	for _, agent := range all {
-		t.Run(agent.Name(), func(t *testing.T) {
-			// Use the global test deadline for slot wait so we don't
-			// skip prematurely — only bail if the whole binary is dying.
-			slotCtx := context.Background()
-			if deadline, ok := t.Deadline(); ok {
-				var cancel context.CancelFunc
-				slotCtx, cancel = context.WithDeadline(slotCtx, deadline)
-				defer cancel()
-			}
-			if err := agents.AcquireSlot(slotCtx, agent); err != nil {
-				t.Fatalf("timed out waiting for agent slot: %v", err)
-			}
-			defer agents.ReleaseSlot(agent)
-
-			// Per-test timeout starts after slot is acquired, scaled
-			// by the agent's multiplier (e.g. 2.5× for gemini).
-			scaled := time.Duration(float64(timeout) * agent.TimeoutMultiplier())
-
-			var prevState *RepoState
-			for attempt := range maxScenarioRestarts + 1 {
-				s := SetupRepo(t, agent)
-				ctx, cancel := context.WithTimeout(context.Background(), scaled)
-
-				// On restart, suppress artifact capture from the previous
-				// failed attempt so it doesn't overwrite the final one.
-				if prevState != nil {
-					prevState.skipArtifacts = true
-				}
-
-				restarted := runScenario(t, s, ctx, fn)
-				cancel()
-
-				if !restarted {
-					return
-				}
-				prevState = s
-				if attempt >= maxScenarioRestarts {
-					t.Fatalf("exhausted %d scenario attempts due to transient API errors", maxScenarioRestarts+1)
-				}
-				t.Logf("transient error, restarting scenario (attempt %d/%d)", attempt+2, maxScenarioRestarts+1)
-			}
-		})
-	}
-}
-
-// runScenario runs the test function and recovers from errScenarioRestart
-// panics triggered by transient API errors in RunPrompt. Returns true if
-// the scenario should be restarted with a fresh repository.
-func runScenario(t *testing.T, s *RepoState, ctx context.Context, fn func(t *testing.T, s *RepoState, ctx context.Context)) (restarted bool) {
-	t.Helper()
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(errScenarioRestart); ok {
-				restarted = true
-				return
-			}
-			panic(r) // re-panic for unexpected panics
-		}
-	}()
-	fn(t, s, ctx)
-	return false
-}
-
-const maxScenarioRestarts = 2 // restart up to 2 times = 3 total attempts
-
-// errScenarioRestart is panicked by RunPrompt when a transient API error is
-// detected. ForEachAgent recovers from this panic and restarts the test
-// scenario with a fresh repository, avoiding stale CLI state from the failed
-// attempt.
-type errScenarioRestart struct {
-	msg string
-}
-
-// RunPrompt runs an agent prompt, logs the command and output to ConsoleLog,
-// and returns the result. If the agent reports a transient API error, it
-// panics with errScenarioRestart to trigger a full scenario restart in
-// ForEachAgent (see runScenario).
-func (s *RepoState) RunPrompt(t *testing.T, ctx context.Context, prompt string, opts ...agents.Option) (agents.Output, error) {
-	t.Helper()
-	out, err := s.Agent.RunPrompt(ctx, s.Dir, prompt, opts...)
-	s.logPromptResult(out)
-
-	if err != nil && s.Agent.IsTransientError(out, err) {
-		errMsg := fmt.Sprintf("transient API error (stderr: %s)", strings.TrimSpace(out.Stderr))
-		t.Logf("%s — restarting scenario", errMsg)
-		fmt.Fprintf(s.ConsoleLog, "> [transient] %s — restarting scenario\n", errMsg)
-		panic(errScenarioRestart{msg: errMsg})
-	}
-
-	return out, err
-}
-
-func (s *RepoState) logPromptResult(out agents.Output) {
-	s.ConsoleLog.WriteString("> " + out.Command + "\n")
-	s.ConsoleLog.WriteString("stdout:\n" + out.Stdout + "\n")
-	s.ConsoleLog.WriteString("stderr:\n" + out.Stderr + "\n")
-}
-
-// Git runs a git command in the repo and logs it to ConsoleLog.
-func (s *RepoState) Git(t *testing.T, args ...string) {
-	t.Helper()
-	s.ConsoleLog.WriteString("> git " + strings.Join(args, " ") + "\n")
-	Git(t, s.Dir, args...)
-}
-
-// StartSession starts an interactive session and registers it for pane
-// capture in artifacts. Returns nil if the agent does not support interactive
-// mode. The session is closed automatically during test cleanup.
-func (s *RepoState) StartSession(t *testing.T, ctx context.Context) agents.Session {
-	t.Helper()
-	session, err := s.Agent.StartSession(ctx, s.Dir)
-	if err != nil {
-		t.Fatalf("start session: %v", err)
-	}
-	if session == nil {
-		return nil
-	}
-	s.session = session
-	return session
-}
-
-// WaitFor waits for a pattern in the interactive session's pane and logs the
-// pane content to ConsoleLog after the wait completes (success or failure).
-func (s *RepoState) WaitFor(t *testing.T, session agents.Session, pattern string, timeout time.Duration) {
-	t.Helper()
-	content, err := session.WaitFor(pattern, timeout)
-	fmt.Fprintf(s.ConsoleLog, "> pane after WaitFor(%q):\n%s\n", pattern, content)
-	if err != nil {
-		t.Fatalf("WaitFor(%q): %v", pattern, err)
-	}
-}
-
-// IsExternalAgent returns true if the agent implements the ExternalAgent
-// interface and reports itself as external.
-func (s *RepoState) IsExternalAgent() bool {
-	ea, ok := s.Agent.(agents.ExternalAgent)
-	return ok && ea.IsExternalAgent()
-}
-
-// Send sends input to an interactive session and logs it to ConsoleLog.
-// Fails the test on error.
-func (s *RepoState) Send(t *testing.T, session agents.Session, input string) {
-	t.Helper()
-	s.ConsoleLog.WriteString("> send: " + input + "\n")
-	if err := session.Send(input); err != nil {
-		t.Fatalf("send failed: %v", err)
-	}
-}
-
-// PatchSettings merges extra keys into .trace/settings.json.
-func PatchSettings(t *testing.T, dir string, extra map[string]any) {
-	t.Helper()
-	path := filepath.Join(dir, ".trace", "settings.json")
-	data, err := os.ReadFile(path)
-	if err != nil {
-		t.Fatalf("read settings: %v", err)
-	}
-	var settings map[string]any
-	if err := json.Unmarshal(data, &settings); err != nil {
-		t.Fatalf("parse settings: %v", err)
-	}
-	mergeSettings(settings, extra)
-	out, err := json.MarshalIndent(settings, "", "  ")
-	if err != nil {
-		t.Fatalf("marshal settings: %v", err)
-	}
-	if err := os.WriteFile(path, out, 0o644); err != nil {
-		t.Fatalf("write settings: %v", err)
-	}
-}
-
-// EnableCheckpointsV2 switches an E2E repo into v2 dual-write mode while
-// preserving existing strategy_options written during setup.
-func EnableCheckpointsV2(t *testing.T, dir string) {
-	t.Helper()
-	PatchSettings(t, dir, map[string]any{
-		"strategy_options": map[string]any{
-			"checkpoints_v2": true,
-		},
-	})
-}
-
-// EnableCheckpointsVersion2 switches an E2E repo into strict v2-only mode.
-func EnableCheckpointsVersion2(t *testing.T, dir string) {
-	t.Helper()
-	PatchSettings(t, dir, map[string]any{
-		"strategy_options": map[string]any{
-			"checkpoints_version": 2,
-		},
-	})
-}
-
-func mergeSettings(dst, src map[string]any) {
-	for k, v := range src {
-		srcMap, ok := v.(map[string]any)
-		if !ok {
-			dst[k] = v
-			continue
-		}
-
-		if existing, ok := dst[k].(map[string]any); ok {
-			mergeSettings(existing, srcMap)
-			continue
-		}
-
-		dst[k] = cloneSettingsMap(srcMap)
-	}
-}
-
-func cloneSettingsMap(src map[string]any) map[string]any {
-	dst := make(map[string]any, len(src))
-	for k, v := range src {
-		if child, ok := v.(map[string]any); ok {
-			dst[k] = cloneSettingsMap(child)
-			continue
-		}
-		dst[k] = v
-	}
-	return dst
-}
-
-// EmptyDir returns the path to an empty temporary directory, cleaned up when
-// the test finishes. Useful as a cross-platform replacement for /dev/null in
-// git config paths like core.hooksPath (git on Windows cannot open NUL).
-func EmptyDir(t *testing.T) string {
-	t.Helper()
-	return t.TempDir()
-}
-
-// Git runs a git command in the given directory and fails the test if it
-// returns a non-zero exit code.
-func Git(t *testing.T, dir string, args ...string) {
-	t.Helper()
-
-	cmd := execx.NonInteractive(context.Background(), "git", args...)
-	if dir != "" {
-		cmd.Dir = dir
-	}
-	cmd.Env = os.Environ()
-
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("git %s failed: %v\n%s", strings.Join(args, " "), err, out)
-	}
-}
-
-// GitOutput runs a git command in the given directory, returns its trimmed
-// stdout, and fails the test on error.
-func GitOutput(t *testing.T, dir string, args ...string) string {
-	t.Helper()
-
-	cmd := exec.Command("git", args...)
-	if dir != "" {
-		cmd.Dir = dir
-	}
-
-	out, err := cmd.Output()
-	if err != nil {
-		var stderr string
-		ee := &exec.ExitError{}
-		if errors.As(err, &ee) {
-			stderr = string(ee.Stderr)
-		}
-		t.Fatalf("git %s failed: %v\n%s", strings.Join(args, " "), err, stderr)
-	}
-
-	return strings.TrimSpace(string(out))
-}
-
-// NewCheckpointCommits returns the SHAs of commits added to the
-// trace/checkpoints/v1 branch since the test was set up, oldest first.
-func NewCheckpointCommits(t *testing.T, s *RepoState) []string {
-	t.Helper()
-
-	log := GitOutput(t, s.Dir, "log", "--reverse", "--format=%H", s.CheckpointBefore+".."+checkpointReadRef())
-	if log == "" {
-		return nil
-	}
-	return strings.Split(log, "\n")
-}
-
-// CheckpointIDs lists all checkpoint IDs from the tree at the tip of the
-// checkpoint branch. It parses the two-level directory structure
-// ({prefix}/{suffix}/metadata.json) and returns the concatenated IDs.
-func CheckpointIDs(t *testing.T, dir string) []string {
-	t.Helper()
-	out := gitOutputSafe(dir, "ls-tree", "-r", "--name-only", checkpointReadRef())
-	if out == "" {
-		return nil
-	}
-	seen := map[string]bool{}
-	var ids []string
-	for _, line := range strings.Split(strings.TrimSpace(out), "\n") {
-		// Match {prefix}/{suffix}/metadata.json (top-level, not session-level)
-		parts := strings.Split(line, "/")
-		if len(parts) == 3 && parts[2] == "metadata.json" {
-			id := parts[0] + parts[1]
-			if !seen[id] {
-				seen[id] = true
-				ids = append(ids, id)
-			}
-		}
-	}
-	return ids
-}
-
-// ReadCheckpointMetadata reads the checkpoint-level metadata.json from the
-// tip of the checkpoint branch for the given checkpoint ID.
-func ReadCheckpointMetadata(t *testing.T, dir string, checkpointID string) CheckpointMetadata {
-	t.Helper()
-
-	path := CheckpointPath(checkpointID) + "/metadata.json"
-	blob := checkpointReadRef() + ":" + path
-
-	raw := GitOutput(t, dir, "show", blob)
-
-	var meta CheckpointMetadata
-	if err := json.Unmarshal([]byte(raw), &meta); err != nil {
-		t.Fatalf("unmarshal checkpoint metadata from %s: %v", blob, err)
-	}
-
-	return meta
-}
-
-// ReadSessionMetadata reads a session's metadata.json from the tip of the
-// checkpoint branch for the given checkpoint ID and session index.
-func ReadSessionMetadata(t *testing.T, dir string, checkpointID string, sessionIndex int) SessionMetadata {
-	t.Helper()
-
-	path := fmt.Sprintf("%s/%d/metadata.json", CheckpointPath(checkpointID), sessionIndex)
-	blob := checkpointReadRef() + ":" + path
-
-	raw := GitOutput(t, dir, "show", blob)
-
-	var meta SessionMetadata
-	if err := json.Unmarshal([]byte(raw), &meta); err != nil {
-		t.Fatalf("unmarshal session metadata from %s: %v", blob, err)
-	}
-
-	return meta
-}
-
-// WaitForSessionMetadata polls until session metadata exists on the checkpoint
-// branch for the given checkpoint ID and session index, then returns it.
-// This handles the race where the checkpoint branch advances before session
-// metadata is fully committed.
-func WaitForSessionMetadata(t *testing.T, dir string, checkpointID string, sessionIndex int, timeout time.Duration) SessionMetadata {
-	t.Helper()
-
-	path := fmt.Sprintf("%s/%d/metadata.json", CheckpointPath(checkpointID), sessionIndex)
-	blob := checkpointReadRef() + ":" + path
-
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		raw := gitOutputSafe(dir, "show", blob)
-		if raw != "" {
-			var meta SessionMetadata
-			if err := json.Unmarshal([]byte(raw), &meta); err != nil {
-				t.Fatalf("unmarshal session metadata from %s: %v", blob, err)
-			}
-			return meta
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-	t.Fatalf("session metadata %s did not appear within %s", blob, timeout)
-	return SessionMetadata{}
-}
-
-// SetupBareRemote creates a bare git repo, adds it as "origin", and pushes
-// the initial commit. Returns the bare repo path.
-func SetupBareRemote(t *testing.T, s *RepoState) string {
-	t.Helper()
-
-	var bareDir string
-	if os.Getenv("E2E_KEEP_REPOS") != "" {
-		var err error
-		bareDir, err = os.MkdirTemp("", "e2e-bare-*")
-		if err != nil {
-			t.Fatalf("create bare remote dir: %v", err)
-		}
-		t.Logf("E2E_KEEP_REPOS: bare remote will be preserved at %s", bareDir)
-	} else {
-		bareDir = t.TempDir()
-	}
-
-	Git(t, bareDir, "init", "--bare")
-	Git(t, s.Dir, "remote", "add", "origin", bareDir)
-	Git(t, s.Dir, "push", "-u", "origin", "HEAD")
-	return bareDir
-}
-
-// CloneAndEnableTrace clones a bare remote into a fresh temp dir, configures
-// a test git identity, enables Trace for the given agent, applies the active
-// suite checkpoints mode, and commits the enable changes if needed.
-func CloneAndEnableTrace(t *testing.T, bareDir string, agentName string) string {
-	t.Helper()
-
-	cloneDir := t.TempDir()
-	if resolved, symErr := filepath.EvalSymlinks(cloneDir); symErr == nil {
-		cloneDir = resolved
-	}
-	if err := os.RemoveAll(cloneDir); err != nil {
-		t.Fatalf("remove clone dir %s: %v", cloneDir, err)
-	}
-
-	Git(t, "", "clone", bareDir, cloneDir)
-	Git(t, cloneDir, "config", "user.name", "E2E Clone")
-	Git(t, cloneDir, "config", "user.email", "e2e-clone@test.local")
-
-	trace.Enable(t, cloneDir, agentName)
-	ApplySuiteCheckpointsMode(t, cloneDir)
-	CommitIfDirty(t, cloneDir, "Enable trace in clone")
-
-	return cloneDir
-}
-
-// GitOutputErr runs a git command and returns (output, error) without
-// failing the test. For commands expected to fail.
-func GitOutputErr(dir string, args ...string) (string, error) {
-	cmd := exec.Command("git", args...)
-	if dir != "" {
-		cmd.Dir = dir
-	}
-	out, err := cmd.CombinedOutput()
-	return strings.TrimSpace(string(out)), err
-}
-
-// CommitIfDirty stages all changes and creates a commit only when the worktree
-// or index is non-empty. This keeps cloned-repo E2E tests robust when
-// `trace enable` is already idempotent and produces no repo changes.
-func CommitIfDirty(t *testing.T, dir string, message string) {
-	t.Helper()
-
-	status, err := GitOutputErr(dir, "status", "--porcelain")
-	if err != nil {
-		t.Fatalf("git status --porcelain failed: %v\n%s", err, status)
-	}
-	if strings.TrimSpace(status) == "" {
-		return
-	}
-
-	Git(t, dir, "add", ".")
-	Git(t, dir, "commit", "-m", message)
-}
-
-// GetCheckpointTrailer extracts the Trace-Checkpoint trailer value from a
-// code commit. Returns the trimmed trailer value, or an empty string if the
-// trailer is not present.
-func GetCheckpointTrailer(t *testing.T, dir string, ref string) string {
-	t.Helper()
-
-	return GitOutput(t, dir, "log", "-1", "--format=%(trailers:key=Trace-Checkpoint,valueonly)", ref)
-}
diff --git a/e2e/testutil/session_paths.go b/e2e/testutil/session_paths.go
deleted file mode 100644
index a256189..0000000
--- a/e2e/testutil/session_paths.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package testutil
-
-import (
-	"context"
-	"testing"
-
-	cliagent "github.com/GrayCodeAI/trace/cmd/trace/cli/agent"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/external"
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/agent/types"
-
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/claudecode"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/codex"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/copilotcli"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/cursor"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/factoryaidroid"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/geminicli"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/opencode"
-	_ "github.com/GrayCodeAI/trace/cmd/trace/cli/agent/vogon"
-)
-
-// RestoredSessionTranscriptPath returns the path where resume should restore
-// the transcript for agents that use file-backed restored sessions.
-func RestoredSessionTranscriptPath(t *testing.T, repoDir string, meta SessionMetadata) (string, bool) {
-	t.Helper()
-
-	external.DiscoverAndRegisterAlways(context.Background())
-
-	agentType := types.AgentType(meta.Agent)
-	if agentType == cliagent.AgentTypeOpenCode {
-		// OpenCode restores by importing the session into its database, not by
-		// writing the transcript path returned by ResolveSessionFile.
-		return "", false
-	}
-
-	ag, err := cliagent.GetByAgentType(agentType)
-	if err != nil {
-		t.Fatalf("resolve agent %q for restored transcript path: %v", meta.Agent, err)
-	}
-
-	sessionDir, err := ag.GetSessionDir(repoDir)
-	if err != nil {
-		t.Fatalf("get session dir for agent %q: %v", meta.Agent, err)
-	}
-
-	return ag.ResolveSessionFile(sessionDir, meta.SessionID), true
-}
diff --git a/e2e/trace/trace.go b/e2e/trace/trace.go
deleted file mode 100644
index 5471207..0000000
--- a/e2e/trace/trace.go
+++ /dev/null
@@ -1,191 +0,0 @@
-package trace
-
-import (
-	"context"
-	"encoding/json"
-	"log"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-)
-
-// BinPath returns the path to the trace binary from E2E_TRACE_BIN.
-// The mise test:e2e tasks set this automatically via `mise run build`.
-func BinPath() string {
-	p := os.Getenv("E2E_TRACE_BIN")
-	if p == "" {
-		log.Fatal("trace: E2E_TRACE_BIN not set — run tests via `mise run test:e2e`")
-	}
-	return p
-}
-
-// RewindPoint represents a single entry from `trace rewind --list`.
-type RewindPoint struct {
-	ID               string `json:"id"`
-	Message          string `json:"message"`
-	MetadataDir      string `json:"metadata_dir"`
-	Date             string `json:"date"`
-	IsTaskCheckpoint bool   `json:"is_task_checkpoint"`
-	ToolUseID        string `json:"tool_use_id"`
-	IsLogsOnly       bool   `json:"is_logs_only"`
-	CondensationID   string `json:"condensation_id"`
-	SessionID        string `json:"session_id"`
-}
-
-// Enable runs `trace enable` for the given agent with telemetry disabled.
-func Enable(t *testing.T, dir, agent string) {
-	t.Helper()
-	run(t, dir, "enable", "--agent", agent, "--telemetry=false")
-}
-
-// Disable runs `trace disable` in the given directory.
-func Disable(t *testing.T, dir string) {
-	t.Helper()
-	run(t, dir, "disable")
-}
-
-// Doctor runs `trace doctor --force` and returns the output.
-func Doctor(t *testing.T, dir string) string {
-	t.Helper()
-	return run(t, dir, "doctor", "--force")
-}
-
-// CleanDryRun runs `trace clean --dry-run` and returns the output.
-func CleanDryRun(t *testing.T, dir string) string {
-	t.Helper()
-	return run(t, dir, "clean", "--dry-run")
-}
-
-// CleanForce runs `trace clean --force` and returns the output.
-func CleanForce(t *testing.T, dir string) string {
-	t.Helper()
-	return run(t, dir, "clean", "--force")
-}
-
-// RewindList runs `trace rewind --list` and parses the JSON output.
-func RewindList(t *testing.T, dir string) []RewindPoint {
-	t.Helper()
-	out := run(t, dir, "checkpoint", "rewind", "--list")
-
-	var points []RewindPoint
-	if err := json.Unmarshal([]byte(out), &points); err != nil {
-		t.Fatalf("parse rewind list: %v\nraw output: %s", err, out)
-	}
-	return points
-}
-
-// Rewind runs `trace rewind --to <id>`. Returns an error instead of
-// failing the test, since callers may test failure cases.
-func Rewind(t *testing.T, dir, id string) error {
-	t.Helper()
-	return runErr(dir, "checkpoint", "rewind", "--to", id)
-}
-
-// RewindLogsOnly runs `trace rewind --to <id> --logs-only`.
-func RewindLogsOnly(t *testing.T, dir, id string) error {
-	t.Helper()
-	return runErr(dir, "checkpoint", "rewind", "--to", id, "--logs-only")
-}
-
-// run executes a `trace` subcommand in dir and fails the test on error.
-func run(t *testing.T, dir string, args ...string) string {
-	t.Helper()
-	cmd := execx.NonInteractive(context.Background(), BinPath(), args...)
-	cmd.Dir = dir
-	cmd.Env = os.Environ()
-
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("trace %s failed: %v\n%s", strings.Join(args, " "), err, out)
-	}
-	return strings.TrimSpace(string(out))
-}
-
-// runErr executes a `trace` subcommand in dir and returns any error.
-func runErr(dir string, args ...string) error {
-	cmd := execx.NonInteractive(context.Background(), BinPath(), args...)
-	cmd.Dir = dir
-	cmd.Env = os.Environ()
-
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return &ExecError{
-			Args:   args,
-			Err:    err,
-			Output: string(out),
-		}
-	}
-	return nil
-}
-
-// ExecError wraps an trace CLI execution failure with its output.
-type ExecError struct {
-	Args   []string
-	Err    error
-	Output string
-}
-
-func (e *ExecError) Error() string {
-	return "trace " + strings.Join(e.Args, " ") + ": " + e.Err.Error() + "\n" + e.Output
-}
-
-func (e *ExecError) Unwrap() error {
-	return e.Err
-}
-
-// Explain runs `trace explain --checkpoint <id>` and returns the output.
-func Explain(t *testing.T, dir, checkpointID string) string {
-	t.Helper()
-	return run(t, dir, "checkpoint", "explain", "--checkpoint", checkpointID)
-}
-
-// ExplainGenerate runs `trace explain --checkpoint <id> --generate`.
-// Returns (output, error) — doesn't fail test since callers may test failure cases.
-func ExplainGenerate(dir, checkpointID string) (string, error) {
-	return runOutput(dir, "checkpoint", "explain", "--checkpoint", checkpointID, "--generate")
-}
-
-// ExplainCommit runs `trace explain --commit <ref>`.
-// Returns (output, error) — for testing failure cases.
-func ExplainCommit(dir, ref string) (string, error) {
-	return runOutput(dir, "checkpoint", "explain", "--commit", ref)
-}
-
-// AttachWithEnv runs `trace attach <session-id> --agent <agent> --force`
-// with extra env vars.
-func AttachWithEnv(dir string, extraEnv []string, sessionID, agent string) (string, error) {
-	return runOutputEnv(dir, extraEnv, "session", "attach", sessionID, "--agent", agent, "--force")
-}
-
-// Resume runs `trace resume <branch> --force` and returns the output.
-func Resume(dir, branch string) (string, error) {
-	return runOutput(dir, "session", "resume", branch, "--force")
-}
-
-// ResumeWithEnv runs `trace resume <branch> --force` with extra env vars.
-func ResumeWithEnv(dir, branch string, extraEnv []string) (string, error) {
-	return runOutputEnv(dir, extraEnv, "session", "resume", branch, "--force")
-}
-
-// runOutput executes a `trace` subcommand and returns (output, error).
-func runOutput(dir string, args ...string) (string, error) {
-	return runOutputEnv(dir, nil, args...)
-}
-
-func runOutputEnv(dir string, extraEnv []string, args ...string) (string, error) {
-	cmd := execx.NonInteractive(context.Background(), BinPath(), args...)
-	cmd.Dir = dir
-	cmd.Env = append(append([]string{}, os.Environ()...), extraEnv...)
-
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return string(out), &ExecError{
-			Args:   args,
-			Err:    err,
-			Output: string(out),
-		}
-	}
-	return strings.TrimSpace(string(out)), nil
-}
diff --git a/e2e/vogon/main.go b/e2e/vogon/main.go
deleted file mode 100644
index a8a4223..0000000
--- a/e2e/vogon/main.go
+++ /dev/null
@@ -1,600 +0,0 @@
-// vogon is a deterministic agent binary for E2E canary tests.
-// It parses simple prompt instructions, performs file operations, fires
-// lifecycle hooks via `trace hooks vogon <verb>`, and writes a minimal
-// JSONL transcript. No API calls are made.
-//
-// Named after the Vogons from The Hitchhiker's Guide to the Galaxy —
-// bureaucratic, procedural, and deterministic to a fault.
-//
-// Usage:
-//
-//	vogon -p <prompt>   # Headless (single-turn) mode
-//	vogon               # Interactive (multi-turn) mode
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/execx"
-	"github.com/google/uuid"
-)
-
-func main() {
-	cfg := parseArgs(os.Args[1:])
-
-	if cfg.writeSessionOnly {
-		transcriptPath := setupTranscript(cfg.sessionID)
-		appendTranscript(transcriptPath, "user", cfg.userPrompt)
-		appendTranscript(transcriptPath, "assistant", cfg.assistantMessage)
-		fmt.Fprintln(os.Stdout, cfg.sessionID)
-		return
-	}
-
-	dir, err := os.Getwd() //nolint:forbidigo // Standalone binary, not part of CLI — CWD is the repo dir
-	if err != nil {
-		fatal("getwd: %v", err)
-	}
-
-	transcriptPath := setupTranscript(cfg.sessionID)
-
-	fireHook(dir, "session-start", map[string]string{
-		"session_id":      cfg.sessionID,
-		"transcript_path": transcriptPath,
-		"model":           "vogon-llm-42",
-	})
-
-	if cfg.prompt != "" {
-		// Headless mode: single prompt
-		runTurn(dir, cfg.sessionID, transcriptPath, cfg.prompt)
-	} else {
-		// Interactive mode: read prompts from stdin
-		fmt.Fprint(os.Stdout, "> ")
-		scanner := bufio.NewScanner(os.Stdin)
-		for scanner.Scan() {
-			line := strings.TrimSpace(scanner.Text())
-			if line == "" || line == "exit" || line == "quit" {
-				break
-			}
-			// Give tmux's Send() time to capture the echoed-input state
-			// before we produce any output. Send polls every 200ms; without
-			// this pause, vogon output appears in the same capture window
-			// as the echo, causing stableAtSend to include final output and
-			// preventing WaitFor's contentChanged detection.
-			time.Sleep(700 * time.Millisecond)
-			fmt.Fprintln(os.Stdout, "Working...")
-			runTurn(dir, cfg.sessionID, transcriptPath, line)
-			fmt.Fprint(os.Stdout, "> ")
-		}
-	}
-
-	fireHook(dir, "session-end", map[string]string{
-		"session_id":      cfg.sessionID,
-		"transcript_path": transcriptPath,
-		"model":           "vogon-llm-42",
-	})
-}
-
-type config struct {
-	prompt           string
-	sessionID        string
-	writeSessionOnly bool
-	userPrompt       string
-	assistantMessage string
-}
-
-func parseArgs(args []string) config {
-	cfg := config{
-		sessionID: uuid.New().String(),
-	}
-
-	fs := flag.NewFlagSet("vogon", flag.ContinueOnError)
-	fs.SetOutput(os.Stderr)
-	fs.StringVar(&cfg.prompt, "p", "", "single-turn prompt")
-	fs.StringVar(&cfg.sessionID, "session-id", cfg.sessionID, "session identifier")
-	fs.BoolVar(&cfg.writeSessionOnly, "write-session", false, "write a session transcript without firing hooks")
-	fs.StringVar(&cfg.userPrompt, "user-prompt", "", "user prompt to record in write-session mode")
-	fs.StringVar(&cfg.assistantMessage, "assistant-message", "", "assistant message to record in write-session mode")
-	if err := fs.Parse(args); err != nil {
-		fatal("parse args: %v", err)
-	}
-	if cfg.writeSessionOnly {
-		if cfg.userPrompt == "" {
-			fatal("--user-prompt is required with --write-session")
-		}
-		if cfg.assistantMessage == "" {
-			fatal("--assistant-message is required with --write-session")
-		}
-	}
-	if err := validateSessionID(cfg.sessionID); err != nil {
-		fatal("invalid --session-id: %v", err)
-	}
-
-	return cfg
-}
-
-func validateSessionID(sessionID string) error {
-	if sessionID == "" {
-		return errors.New("session ID cannot be empty")
-	}
-	if filepath.Base(sessionID) != sessionID {
-		return errors.New("must not contain path separators")
-	}
-	if sessionID == "." || sessionID == ".." || strings.Contains(sessionID, "..") {
-		return errors.New("must not contain dot path elements")
-	}
-	return nil
-}
-
-func runTurn(dir, sessionID, transcriptPath, prompt string) {
-	fireHook(dir, "user-prompt-submit", map[string]any{
-		"session_id":      sessionID,
-		"transcript_path": transcriptPath,
-		"prompt":          prompt,
-		"model":           "vogon-llm-42",
-	})
-
-	appendTranscript(transcriptPath, "user", prompt)
-
-	actions := parsePrompt(prompt)
-	executeActions(dir, actions)
-
-	appendTranscript(transcriptPath, "assistant", fmt.Sprintf("Done. Executed %d actions.", len(actions)))
-	fmt.Fprintf(os.Stdout, "Done. Executed %d actions.\n", len(actions))
-
-	fireHook(dir, "stop", map[string]string{
-		"session_id":      sessionID,
-		"transcript_path": transcriptPath,
-		"model":           "vogon-llm-42",
-	})
-}
-
-// --- Prompt Parsing ---
-
-type action struct {
-	kind    string // "create", "modify", "delete", "commit"
-	path    string
-	content string
-}
-
-// fileExt is the shared file extension pattern used across all prompt-parsing regexes.
-const fileExt = `go|md|txt|js|ts|py|rb|rs|toml|yaml|json`
-
-var (
-	// "create a [single|new|...] [markdown|text] file [exactly at|at|called] <path>"
-	createFileRe = regexp.MustCompile(`(?i)create\s+(?:a\s+)?(?:\w+\s+)*?(?:markdown\s+|text\s+)?file\s+(?:exactly\s+at\s+|at\s+|called\s+)?([^\s,]+\.(?:` + fileExt + `))`)
-	// "create N files: <path> about <topic>, <path> about <topic>"
-	createMultiRe = regexp.MustCompile(`(?i)create\s+(?:\w+\s+)*?(?:four|three|two|\d+)\s+(?:\w+\s+)*?(?:markdown\s+)?files?:?\s+(.+)`)
-	// "modify <path>"
-	modifyFileRe = regexp.MustCompile(`(?i)modify\s+(?:the\s+)?(?:file\s+)?(?:at\s+)?([^\s,]+\.(?:` + fileExt + `))`)
-	// "modify [these] N [existing] files[:]"
-	modifyMultiRe = regexp.MustCompile(`(?i)modify\s+(?:these\s+)?(?:three|four|two|\d+)\s+(?:\w+\s+)*?files?[.:]\s*(.+)`)
-	// "add ... to <path>" (e.g. "add another stanza to poem.txt")
-	addToFileRe = regexp.MustCompile(`(?i)add\s+(?:another\s+|a\s+|some\s+)?\w+\s+to\s+([^\s,]+\.(?:` + fileExt + `))`)
-	// "delete <path>"
-	deleteFileRe = regexp.MustCompile(`(?i)delete\s+(?:the\s+)?(?:file\s+)?(?:at\s+)?([^\s,]+\.(?:` + fileExt + `))`)
-	// "commit" anywhere in the prompt, but not "do not commit" / "don't commit"
-	commitRe = regexp.MustCompile(`(?i)(?:then\s+|now\s+)?(?:git\s+)?commit\b`)
-	// Negative: "do not commit" / "don't commit" with optional object, at sentence boundary
-	// Matches: "Do not commit.", "Do not commit the file.", "Do not commit them,"
-	// Does NOT match: "Do not commit any other files" (different intent)
-	noCommitRe = regexp.MustCompile(`(?i)(?:do\s+not|don'?t)\s+commit(?:\s+(?:it|them|the\s+\w+))?(?:\.|,|$)`)
-	// "commit each file separately" — interleave create+commit
-	commitSeparatelyRe = regexp.MustCompile(`(?i)commit\s+each\s+file\s+separately`)
-	// Individual file in multi-create: "docs/a.md about apples"
-	// Topic capture stops at comma, "and", period followed by space+uppercase, or end
-	multiFileItemRe = regexp.MustCompile(`([^\s,]+\.(?:` + fileExt + `))\s+(?:about\s+|with\s+|containing\s+)?(.+?)(?:,\s*|\s+and\s+|\.\s+[A-Z]|\.\s*$)`)
-	// Individual file in multi-modify: "src/model.go should define ..."
-	modifyItemRe = regexp.MustCompile(`([^\s,]+\.(?:` + fileExt + `))\s+should\s+(.+?)(?:,|$)`)
-	// "In src/a.go, add ..." pattern for multi-modify
-	inFileRe = regexp.MustCompile(`[Ii]n\s+([^\s,]+\.(?:` + fileExt + `))`)
-	// Inline content: "with content 'package main; func Foo() {}'"
-	inlineContentRe = regexp.MustCompile(`(?i)with\s+content\s+['"]([^'"]+)['"]`)
-	// Numbered steps: "(1) ... (2) ... (3) ..."
-	numberedStepRe = regexp.MustCompile(`\(\d+\)\s+`)
-	// Explicit git command: "Run: git add ... && git commit -m '...'"
-	explicitGitRe = regexp.MustCompile(`(?i)run:?\s+git\s+add\s+.+(?:&&\s*git\s+commit|;\s*git\s+commit)`)
-	// "about the colour red" → "the colour red"
-	topicRe = regexp.MustCompile(`(?i)about\s+(.+?)(?:\.|,|\s+Do\s|\s+do\s|\s+then\s|$)`)
-	// Fallback: extract any file path from text
-	anyFileRe = regexp.MustCompile(`([^\s,]+\.(?:` + fileExt + `))`)
-)
-
-func parsePrompt(prompt string) []action {
-	// Check for numbered-step prompts — parse each step independently to
-	// preserve ordering (e.g., create, commit, then create more).
-	if numberedStepRe.MatchString(prompt) {
-		return parseNumberedSteps(prompt)
-	}
-	var actions []action
-
-	// Multi-file modify: "modify these three files: src/model.go should ..., src/view.go should ..."
-	// Also matches: "Modify two existing files. In src/a.go, add ..."
-	if m := modifyMultiRe.FindStringSubmatch(prompt); m != nil {
-		// Try "should" pattern first
-		items := modifyItemRe.FindAllStringSubmatch(m[1], -1)
-		for _, item := range items {
-			actions = append(actions, action{
-				kind:    "modify",
-				path:    item[1],
-				content: "// " + strings.TrimSpace(item[2]) + "\n",
-			})
-		}
-		// Try "In <path>" pattern as fallback
-		if len(actions) == 0 {
-			for _, item := range inFileRe.FindAllStringSubmatch(m[1], -1) {
-				actions = append(actions, action{
-					kind:    "modify",
-					path:    item[1],
-					content: "// Modified by vogon agent\n",
-				})
-			}
-		}
-		// Last resort: extract any file paths
-		if len(actions) == 0 {
-			for _, fm := range anyFileRe.FindAllStringSubmatch(m[1], -1) {
-				actions = append(actions, action{
-					kind:    "modify",
-					path:    fm[1],
-					content: "// Modified by vogon agent\n",
-				})
-			}
-		}
-	}
-
-	// Multi-file create: "create four markdown files: docs/a.md about apples, ..."
-	if len(actions) == 0 || hasModifyOnly(actions) {
-		if m := createMultiRe.FindStringSubmatch(prompt); m != nil {
-			items := multiFileItemRe.FindAllStringSubmatch(m[1], -1)
-			for _, item := range items {
-				actions = append(actions, action{
-					kind:    "create",
-					path:    item[1],
-					content: fmt.Sprintf("# %s\n\nA paragraph about %s.\n", strings.TrimSpace(item[2]), strings.TrimSpace(item[2])),
-				})
-			}
-		}
-	}
-
-	// Single file create — also runs if we only have modifies (combined prompts)
-	if !hasCreate(actions) {
-		if m := createFileRe.FindStringSubmatch(prompt); m != nil {
-			topic := extractTopic(prompt)
-			content := fmt.Sprintf("# %s\n\nA paragraph about %s.\n", topic, topic)
-			if ic := inlineContentRe.FindStringSubmatch(prompt); ic != nil {
-				content = ic[1] + "\n"
-			}
-			actions = append(actions, action{
-				kind:    "create",
-				path:    m[1],
-				content: content,
-			})
-		}
-	}
-
-	// Single file modify — also runs if we only have creates (combined prompts)
-	if !hasModify(actions) {
-		if m := modifyFileRe.FindStringSubmatch(prompt); m != nil {
-			actions = append(actions, action{
-				kind:    "modify",
-				path:    m[1],
-				content: "// Modified by vogon agent\n",
-			})
-		}
-	}
-
-	// "add ... to <path>" as modify (e.g. "add another stanza to poem.txt")
-	if !hasModify(actions) {
-		if m := addToFileRe.FindStringSubmatch(prompt); m != nil {
-			actions = append(actions, action{
-				kind:    "modify",
-				path:    m[1],
-				content: "// Modified by vogon agent\n",
-			})
-		}
-	}
-
-	// Delete
-	if m := deleteFileRe.FindStringSubmatch(prompt); m != nil {
-		actions = append(actions, action{kind: "delete", path: m[1]})
-	}
-
-	// Commit: check for "commit each file separately" (interleaved) vs normal.
-	// Skip if prompt contains "do not commit" / "don't commit".
-	if !noCommitRe.MatchString(prompt) {
-		if commitSeparatelyRe.MatchString(prompt) {
-			actions = interleaveCommits(actions)
-		} else if commitRe.MatchString(prompt) {
-			actions = append(actions, action{kind: "commit"})
-		}
-	}
-
-	return actions
-}
-
-// parseNumberedSteps splits "(1) ... (2) ... (3) ..." prompts into individual
-// steps and parses each one, preserving ordering. This handles prompts like:
-// "(1) Create file A. (2) Create file B. (3) git commit. (4) Create file C."
-func parseNumberedSteps(prompt string) []action {
-	// Split on numbered markers: "(1) ", "(2) ", etc.
-	indices := numberedStepRe.FindAllStringIndex(prompt, -1)
-	if len(indices) == 0 {
-		return nil
-	}
-
-	var steps []string
-	for i, idx := range indices {
-		start := idx[1] // after the "(N) " marker
-		var end int
-		if i+1 < len(indices) {
-			end = indices[i+1][0]
-		} else {
-			end = len(prompt)
-		}
-		step := strings.TrimSpace(prompt[start:end])
-		if step != "" {
-			steps = append(steps, step)
-		}
-	}
-
-	var actions []action
-	for _, step := range steps {
-		hasExplicitGit := explicitGitRe.MatchString(step)
-
-		// Create file with optional inline content.
-		// Try the full "create ... file ... <path>" regex first, then fall back
-		// to "Create <path>" (any file path after a Create verb).
-		if m := createFileRe.FindStringSubmatch(step); m != nil {
-			content := fmt.Sprintf("# %s\n\nGenerated content.\n", m[1])
-			if ic := inlineContentRe.FindStringSubmatch(step); ic != nil {
-				content = ic[1] + "\n"
-			}
-			actions = append(actions, action{kind: "create", path: m[1], content: content})
-			if hasExplicitGit {
-				actions = append(actions, action{kind: "commit"})
-			}
-			continue
-		}
-		if strings.HasPrefix(strings.ToLower(strings.TrimSpace(step)), "create") {
-			if m := anyFileRe.FindStringSubmatch(step); m != nil {
-				topic := extractTopic(step)
-				content := fmt.Sprintf("# %s\n\nA paragraph about %s.\n", topic, topic)
-				if ic := inlineContentRe.FindStringSubmatch(step); ic != nil {
-					content = ic[1] + "\n"
-				}
-				actions = append(actions, action{kind: "create", path: m[1], content: content})
-				if hasExplicitGit {
-					actions = append(actions, action{kind: "commit"})
-				}
-				continue
-			}
-		}
-
-		// Modify file
-		if m := modifyFileRe.FindStringSubmatch(step); m != nil {
-			actions = append(actions, action{kind: "modify", path: m[1], content: "// Modified by vogon agent\n"})
-			if hasExplicitGit {
-				actions = append(actions, action{kind: "commit"})
-			}
-			continue
-		}
-
-		// Delete file
-		if m := deleteFileRe.FindStringSubmatch(step); m != nil {
-			actions = append(actions, action{kind: "delete", path: m[1]})
-			if hasExplicitGit {
-				actions = append(actions, action{kind: "commit"})
-			}
-			continue
-		}
-
-		// Explicit git command without a file operation in this step
-		if hasExplicitGit {
-			actions = append(actions, action{kind: "commit"})
-			continue
-		}
-
-		// Bare commit instruction
-		if commitRe.MatchString(step) && !noCommitRe.MatchString(step) {
-			actions = append(actions, action{kind: "commit"})
-		}
-	}
-	return actions
-}
-
-func hasCreate(actions []action) bool {
-	for _, a := range actions {
-		if a.kind == "create" {
-			return true
-		}
-	}
-	return false
-}
-
-func hasModify(actions []action) bool {
-	for _, a := range actions {
-		if a.kind == "modify" {
-			return true
-		}
-	}
-	return false
-}
-
-func hasModifyOnly(actions []action) bool {
-	if len(actions) == 0 {
-		return false
-	}
-	for _, a := range actions {
-		if a.kind != "modify" {
-			return false
-		}
-	}
-	return true
-}
-
-// interleaveCommits inserts a commit after each create/modify action.
-func interleaveCommits(actions []action) []action {
-	var result []action
-	for _, a := range actions {
-		result = append(result, a)
-		if a.kind == "create" || a.kind == "modify" {
-			result = append(result, action{kind: "commit"})
-		}
-	}
-	return result
-}
-
-func extractTopic(prompt string) string {
-	if m := topicRe.FindStringSubmatch(prompt); m != nil {
-		return strings.TrimSpace(m[1])
-	}
-	return "the topic"
-}
-
-func executeActions(dir string, actions []action) {
-	var pendingFiles []string
-	for _, a := range actions {
-		switch a.kind {
-		case "create":
-			createFile(dir, a.path, a.content)
-			pendingFiles = append(pendingFiles, a.path)
-		case "modify":
-			modifyFile(dir, a.path, a.content)
-			pendingFiles = append(pendingFiles, a.path)
-		case "delete":
-			deleteFile(dir, a.path)
-			pendingFiles = append(pendingFiles, a.path)
-		case "commit":
-			gitCommit(dir, pendingFiles)
-			pendingFiles = nil
-		}
-	}
-}
-
-func createFile(dir, path, content string) {
-	abs := filepath.Join(dir, path)
-	if err := os.MkdirAll(filepath.Dir(abs), 0o755); err != nil {
-		fmt.Fprintf(os.Stderr, "mkdir %s: %v\n", filepath.Dir(abs), err)
-		return
-	}
-	if err := os.WriteFile(abs, []byte(content), 0o644); err != nil {
-		fmt.Fprintf(os.Stderr, "write %s: %v\n", abs, err)
-	}
-}
-
-func modifyFile(dir, path, appendContent string) {
-	abs := filepath.Join(dir, path)
-	existing, _ := os.ReadFile(abs)
-	content := string(existing) + "\n" + appendContent
-	if err := os.WriteFile(abs, []byte(content), 0o644); err != nil {
-		fmt.Fprintf(os.Stderr, "write %s: %v\n", abs, err)
-	}
-}
-
-func deleteFile(dir, path string) {
-	abs := filepath.Join(dir, path)
-	if err := os.Remove(abs); err != nil {
-		fmt.Fprintf(os.Stderr, "remove %s: %v\n", abs, err)
-	}
-}
-
-func gitCommit(dir string, files []string) {
-	if len(files) == 0 {
-		gitRun(dir, "add", ".")
-	} else {
-		gitRun(dir, append([]string{"add", "--"}, files...)...)
-	}
-	gitRun(dir, "commit", "-m", "Vogon agent commit")
-}
-
-func gitRun(dir string, args ...string) {
-	cmd := exec.Command("git", args...)
-	cmd.Dir = dir
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	// Signal that this is a non-interactive agent — git hooks should not
-	// attempt TTY prompts. GIT_TERMINAL_PROMPT is the standard git env var
-	// for this (same approach used by Factory AI Droid).
-	cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0")
-	if err := cmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "git %s: %v\n", strings.Join(args, " "), err)
-	}
-}
-
-// --- Hook Firing ---
-
-func fireHook(dir, hookName string, payload any) {
-	data, err := json.Marshal(payload)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "marshal hook payload: %v\n", err)
-		return
-	}
-
-	cmd := execx.NonInteractive(context.Background(), "trace", "hooks", "vogon", hookName)
-	cmd.Dir = dir
-	cmd.Stdin = bytes.NewReader(data)
-	cmd.Env = os.Environ()
-	// Capture output but don't show it — hooks may output banners
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "hook %s failed: %v\n%s\n", hookName, err, out)
-	}
-}
-
-// --- Transcript ---
-
-func setupTranscript(sessionID string) string {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		fatal("home dir: %v", err)
-	}
-	transcriptDir := filepath.Join(home, ".vogon", "sessions")
-	if err := os.MkdirAll(transcriptDir, 0o755); err != nil {
-		fatal("mkdir transcript dir: %v", err)
-	}
-	path := filepath.Join(transcriptDir, sessionID+".jsonl")
-	// Create empty file
-	if err := os.WriteFile(path, nil, 0o644); err != nil {
-		fatal("create transcript: %v", err)
-	}
-	return path
-}
-
-type transcriptEntry struct {
-	Type      string `json:"type"`
-	Timestamp string `json:"timestamp"`
-	Message   string `json:"message"`
-}
-
-func appendTranscript(path, role, content string) {
-	entry := transcriptEntry{
-		Type:      role,
-		Timestamp: time.Now().Format(time.RFC3339),
-		Message:   content,
-	}
-	data, _ := json.Marshal(entry) //nolint:errchkjson // transcriptEntry has no unsafe types
-	data = append(data, '\n')
-
-	f, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o644)
-	if err != nil {
-		return
-	}
-	defer f.Close()
-	f.Write(data)
-}
-
-func fatal(format string, args ...any) {
-	fmt.Fprintf(os.Stderr, "vogon: "+format+"\n", args...)
-	os.Exit(1)
-}
diff --git a/go.mod b/go.mod
index 9146b69..6a1b7bc 100644
--- a/go.mod
+++ b/go.mod
@@ -4,60 +4,60 @@ go 1.26.4
 
 require (
 	charm.land/bubbles/v2 v2.1.0
-	charm.land/bubbletea/v2 v2.0.6
+	charm.land/bubbletea/v2 v2.0.7
 	charm.land/glamour/v2 v2.0.0
 	charm.land/huh/v2 v2.0.3
 	charm.land/lipgloss/v2 v2.0.3
-	github.com/betterleaks/betterleaks v1.1.2
+	github.com/betterleaks/betterleaks v1.4.1
 	github.com/charmbracelet/x/ansi v0.11.7
 	github.com/creack/pty v1.1.24
 	github.com/denisbrodbeck/machineid v1.0.1
-	github.com/entireio/auth-go v0.3.4
+	github.com/entireio/auth-go v0.4.0
 	github.com/go-git/go-billy/v6 v6.0.0-alpha.1.0.20260519112248-0095b064a6c6
 	github.com/go-git/go-git/v6 v6.0.0-alpha.2
-	github.com/go-git/x/plugin/objectsigner/auto v0.0.0-20260330134459-33df49246da9
+	github.com/go-git/x/plugin/objectsigner/auto v0.1.0
 	github.com/go-git/x/plugin/objectsigner/program v0.0.0-20260509055934-990a63433b45
 	github.com/google/uuid v1.6.0
 	github.com/mattn/go-isatty v0.0.22
 	github.com/muesli/termenv v0.16.0
 	github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81
-	github.com/posthog/posthog-go v1.12.1
+	github.com/posthog/posthog-go v1.14.0
 	github.com/sergi/go-diff v1.4.0
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10
 	github.com/stretchr/testify v1.11.1
 	github.com/zalando/go-keyring v0.2.8
-	golang.org/x/crypto v0.52.0
-	golang.org/x/mod v0.35.0
-	golang.org/x/sync v0.20.0
-	golang.org/x/sys v0.45.0
-	golang.org/x/term v0.43.0
+	golang.org/x/crypto v0.53.0
+	golang.org/x/mod v0.37.0
+	golang.org/x/sync v0.21.0
+	golang.org/x/sys v0.46.0
+	golang.org/x/term v0.44.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	cel.dev/expr v0.25.1 // indirect
+	cel.dev/expr v0.25.2 // indirect
 	dario.cat/mergo v1.0.2 // indirect
 	github.com/BobuSumisu/aho-corasick v1.0.3 // indirect
-	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/Masterminds/semver/v3 v3.5.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProtonMail/go-crypto v1.4.1 // indirect
 	github.com/STARRY-S/zip v0.2.3 // indirect
-	github.com/alecthomas/chroma/v2 v2.14.0 // indirect
-	github.com/andybalholm/brotli v1.2.0 // indirect
+	github.com/alecthomas/chroma/v2 v2.26.1 // indirect
+	github.com/andybalholm/brotli v1.2.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/sevenzip v1.6.1 // indirect
+	github.com/bodgit/sevenzip v1.6.4 // indirect
 	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/catppuccin/go v0.3.0 // indirect
 	github.com/charmbracelet/colorprofile v0.4.3 // indirect
-	github.com/charmbracelet/ultraviolet v0.0.0-20260416155717-489999b90468 // indirect
+	github.com/charmbracelet/ultraviolet v0.0.0-20260608091853-35bcb7319efa // indirect
 	github.com/charmbracelet/x/exp/ordered v0.1.0 // indirect
-	github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
-	github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
+	github.com/charmbracelet/x/exp/slice v0.0.0-20260608090822-c3ad58c6c9e5 // indirect
+	github.com/charmbracelet/x/exp/strings v0.1.0 // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
 	github.com/charmbracelet/x/termios v0.1.1 // indirect
 	github.com/charmbracelet/x/windows v0.2.2 // indirect
@@ -66,11 +66,12 @@ require (
 	github.com/cloudflare/circl v1.6.3 // indirect
 	github.com/danieljoos/wincred v1.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/dlclark/regexp2 v1.11.5 // indirect
+	github.com/dlclark/regexp2 v1.12.0 // indirect
+	github.com/dlclark/regexp2/v2 v2.2.1 // indirect
 	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fatih/semgroup v1.2.0 // indirect
+	github.com/fatih/semgroup v1.3.0 // indirect
 	github.com/fsnotify/fsnotify v1.10.1 // indirect
 	github.com/gitleaks/go-gitdiff v0.9.1 // indirect
 	github.com/go-git/gcfg/v2 v2.0.2 // indirect
@@ -78,53 +79,59 @@ require (
 	github.com/go-git/x/plugin/objectsigner/ssh v0.1.0 // indirect
 	github.com/go-sprout/sprout v1.0.3 // indirect
 	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/goccy/go-json v0.10.6 // indirect
 	github.com/godbus/dbus/v5 v5.2.2 // indirect
-	github.com/google/cel-go v0.27.0 // indirect
+	github.com/google/cel-go v0.28.1 // indirect
+	github.com/google/go-github/v72 v72.0.0 // indirect
+	github.com/google/go-querystring v1.2.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/h2non/filetype v1.1.3 // indirect
-	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/go-version v1.9.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hiddeco/sshsig v0.2.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kevinburke/ssh_config v1.6.0 // indirect
-	github.com/klauspost/compress v1.18.4 // indirect
+	github.com/klauspost/compress v1.18.6 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-runewidth v0.0.23 // indirect
-	github.com/mholt/archives v0.1.5 // indirect
+	github.com/mattn/go-colorable v0.1.15 // indirect
+	github.com/mattn/go-runewidth v0.0.24 // indirect
+	github.com/mholt/archives v0.1.6-0.20260429171216-ef71b7a32fae // indirect
 	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/mikelolasagasti/xz v1.0.1 // indirect
-	github.com/minio/minlz v1.0.1 // indirect
+	github.com/minio/minlz v1.1.1 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/nwaples/rardecode/v2 v2.2.2 // indirect
+	github.com/nwaples/rardecode/v2 v2.2.3 // indirect
 	github.com/pelletier/go-toml/v2 v2.3.1 // indirect
-	github.com/pierrec/lz4/v4 v4.1.25 // indirect
-	github.com/pjbgf/sha1cd v0.5.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.27 // indirect
+	github.com/pjbgf/sha1cd v0.6.0 // indirect
 	github.com/pkoukk/tiktoken-go v0.1.8 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/rs/zerolog v1.33.0 // indirect
+	github.com/rs/zerolog v1.35.1 // indirect
 	github.com/sagikazarmark/locafero v0.12.0 // indirect
+	github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed // indirect
+	github.com/shurcooL/graphql v0.0.0-20240915155400-7ee5256398cf // indirect
 	github.com/sorairolake/lzip-go v0.3.8 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/spf13/viper v1.21.0 // indirect
+	github.com/stangelandcl/ppmd v0.1.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/ulikunitz/xz v0.5.15 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	github.com/yuin/goldmark v1.7.8 // indirect
-	github.com/yuin/goldmark-emoji v1.0.5 // indirect
+	github.com/yuin/goldmark v1.8.2 // indirect
+	github.com/yuin/goldmark-emoji v1.0.6 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	go4.org v0.0.0-20260112195520-a5071408f32f // indirect
-	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
+	golang.org/x/exp v0.0.0-20260603202125-055de637280b // indirect
 	golang.org/x/net v0.55.0 // indirect
-	golang.org/x/text v0.37.0 // indirect
+	golang.org/x/oauth2 v0.36.0 // indirect
+	golang.org/x/text v0.38.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
diff --git a/go.sum b/go.sum
index 1204f15..6552d8a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
-cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
+cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs=
+cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
 charm.land/bubbles/v2 v2.1.0 h1:YSnNh5cPYlYjPxRrzs5VEn3vwhtEn3jVGRBT3M7/I0g=
 charm.land/bubbles/v2 v2.1.0/go.mod h1:l97h4hym2hvWBVfmJDtrEHHCtkIKeTEb3TTJ4ZOB3wY=
-charm.land/bubbletea/v2 v2.0.6 h1:UHN/91OyuhaOFGSrBXQ/hMZD8IO1Uc4BvHlgHXL2WJo=
-charm.land/bubbletea/v2 v2.0.6/go.mod h1:MH/D8ZLlN3op37vQvijKuU29g3rqTp+aQapURFonF9g=
+charm.land/bubbletea/v2 v2.0.7 h1:7qw2tTAVar7m7klOPBYfTB0mniv/RuexsYwMRNxSeL0=
+charm.land/bubbletea/v2 v2.0.7/go.mod h1:DGW2q8gvzHnOpMpZTORs0aySVHCox5C+2Svk0fci1qs=
 charm.land/glamour/v2 v2.0.0 h1:IDBoqLEy7Hdpb9VOXN+khLP/XSxtJy1VsHuW/yF87+U=
 charm.land/glamour/v2 v2.0.0/go.mod h1:kjq9WB0s8vuUYZNYey2jp4Lgd9f4cKdzAw88FZtpj/w=
 charm.land/huh/v2 v2.0.3 h1:2cJsMqEPwSywGHvdlKsJyQKPtSJLVnFKyFbsYZTlLkU=
@@ -16,22 +16,22 @@ github.com/BobuSumisu/aho-corasick v1.0.3 h1:uuf+JHwU9CHP2Vx+wAy6jcksJThhJS9ehR8
 github.com/BobuSumisu/aho-corasick v1.0.3/go.mod h1:hm4jLcvZKI2vRF2WDU1N4p/jpWtpOzp3nLmi9AzX/XE=
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
-github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
-github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
+github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67IQOfM=
 github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo=
 github.com/STARRY-S/zip v0.2.3 h1:luE4dMvRPDOWQdeDdUxUoZkzUIpTccdKdhHHsQJ1fm4=
 github.com/STARRY-S/zip v0.2.3/go.mod h1:lqJ9JdeRipyOQJrYSOtpNAiaesFO6zVDsE8GIGFaoSk=
-github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=
-github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E=
-github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
-github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
-github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
-github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
+github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
+github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/chroma/v2 v2.26.1 h1:2X21EdxGZNv5GF9mG5u+uzc02GCFyGxbcBm3Grd9A78=
+github.com/alecthomas/chroma/v2 v2.26.1/go.mod h1:lxhRRa9H4hPmRLOOdYga4zkQIQjq3dtrrdwQeCfu78Y=
+github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
+github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
+github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
@@ -46,20 +46,20 @@ github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ
 github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
-github.com/betterleaks/betterleaks v1.1.2 h1:PT2/M9ADZKT41L06qnJDAk9YRpYnMVAI15C8OsOhrGc=
-github.com/betterleaks/betterleaks v1.1.2/go.mod h1:mENPZ/ecvqbjxGI2GEKMNoZzRYOrzkVy1bMRxYDyavk=
+github.com/betterleaks/betterleaks v1.4.1 h1:94igDpGpJMZAjKzFAx5jeDsi9uJmhoKlkVr65XPtFso=
+github.com/betterleaks/betterleaks v1.4.1/go.mod h1:x0/OSwCa88wPrFsqatpdqc60HwsyTVltUKojhSgErRA=
 github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=
 github.com/bodgit/plumbing v1.3.0/go.mod h1:JOTb4XiRu5xfnmdnDJo6GmSbSbtSyufrsyZFByMtKEs=
-github.com/bodgit/sevenzip v1.6.1 h1:kikg2pUMYC9ljU7W9SaqHXhym5HyKm8/M/jd31fYan4=
-github.com/bodgit/sevenzip v1.6.1/go.mod h1:GVoYQbEVbOGT8n2pfqCIMRUaRjQ8F9oSqoBEqZh5fQ8=
+github.com/bodgit/sevenzip v1.6.4 h1:iHiVJfxbrB6RF4X+snI2MpVgNBKmVfGaTqZGNlMQIU0=
+github.com/bodgit/sevenzip v1.6.4/go.mod h1:ZtNi5KNgHXeXg1G7WiF0IWSuFE2eG6lt/cTGlvuirO0=
 github.com/bodgit/windows v1.0.1 h1:tF7K6KOluPYygXa3Z2594zxlkbKPAOvqr97etrGNIz4=
 github.com/bodgit/windows v1.0.1/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=
 github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY=
 github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
 github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
 github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
-github.com/charmbracelet/ultraviolet v0.0.0-20260416155717-489999b90468 h1:Q9fO0y1Zo5KB/5Vu8JZoLGm1N3RzF9bNj3Ao3xoR+Ac=
-github.com/charmbracelet/ultraviolet v0.0.0-20260416155717-489999b90468/go.mod h1:bAAz7dh/FTYfC+oiHavL4mX1tOIBZ0ZwYjSi3qE6ivM=
+github.com/charmbracelet/ultraviolet v0.0.0-20260608091853-35bcb7319efa h1:rRT2qwk9xbontVloCXEUIsl1ePz0XFcIWkGi2bvmSTY=
+github.com/charmbracelet/ultraviolet v0.0.0-20260608091853-35bcb7319efa/go.mod h1:hFpumms29Smx3LStRfku8vcCTBe1Kq8aCXtHUJa3mjY=
 github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
 github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
 github.com/charmbracelet/x/conpty v0.1.1 h1:s1bUxjoi7EpqiXysVtC+a8RrvPPNcNvAjfi4jxsAuEs=
@@ -70,10 +70,10 @@ github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6g
 github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
 github.com/charmbracelet/x/exp/ordered v0.1.0 h1:55/qLwjIh0gL0Vni+QAWk7T/qRVP6sBf+2agPBgnOFE=
 github.com/charmbracelet/x/exp/ordered v0.1.0/go.mod h1:5UHwmG+is5THxMyCJHNPCn2/ecI07aKNrW+LcResjJ8=
-github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf h1:rLG0Yb6MQSDKdB52aGX55JT1oi0P0Kuaj7wi1bLUpnI=
-github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf/go.mod h1:B3UgsnsBZS/eX42BlaNiJkD1pPOUa+oF1IYC6Yd2CEU=
-github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4=
-github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
+github.com/charmbracelet/x/exp/slice v0.0.0-20260608090822-c3ad58c6c9e5 h1:K+bEhQCdvynpwszgcTF3MqvP/ouj7ocrZi+24viw0zc=
+github.com/charmbracelet/x/exp/slice v0.0.0-20260608090822-c3ad58c6c9e5/go.mod h1:vqEfX6xzqW1pKKZUUiFOKg0OQ7bCh54Q2vR/tserrRA=
+github.com/charmbracelet/x/exp/strings v0.1.0 h1:i69S2XI7uG1u4NLGeJPSYU++Nmjvpo9nwd6aoEm7gkA=
+github.com/charmbracelet/x/exp/strings v0.1.0/go.mod h1:/ehtMPNh9K4odGFkqYJKpIYyePhdp1hLBRvyY4bWkH8=
 github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
 github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
 github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
@@ -88,7 +88,6 @@ github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJ
 github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
 github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
@@ -100,8 +99,10 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ=
 github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
-github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
-github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8=
+github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2/v2 v2.2.1 h1:mf4KkFUj0gJuarK8P+LgiS+Lit7m9N1yAwEfPbee7R0=
+github.com/dlclark/regexp2/v2 v2.2.1/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU=
 github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4=
 github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
@@ -109,10 +110,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/entireio/auth-go v0.3.4 h1:7rgPNroyTrPK4hWKCpDHRWT1QhkOYkEwWSmzuuNYcH4=
-github.com/entireio/auth-go v0.3.4/go.mod h1:MBQM66oVEkBIXtoXnAAqoa7uibL8Bu+ruPfSm8YVKp8=
-github.com/fatih/semgroup v1.2.0 h1:h/OLXwEM+3NNyAdZEpMiH1OzfplU09i2qXPVThGZvyg=
-github.com/fatih/semgroup v1.2.0/go.mod h1:1KAD4iIYfXjE4U13B48VM4z9QUwV5Tt8O4rS879kgm8=
+github.com/entireio/auth-go v0.4.0 h1:2Z12fsIKOEoDNMsk77AWDLu45z54rZzs1rBozLF2ddM=
+github.com/entireio/auth-go v0.4.0/go.mod h1:TGgA/d21dPPNL4yYO+gqU+ZfS1Hcr8dU2303nLcVz4U=
+github.com/fatih/semgroup v1.3.0 h1:pTEnmcEze/BUf4UmVn9f1ZT1OckkBTNRV9w9k/I2/y4=
+github.com/fatih/semgroup v1.3.0/go.mod h1:thVp+PGZMO9KJ+k96oNGJo06hWgsKOWxTfYfx5R2VaE=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
@@ -129,8 +130,8 @@ github.com/go-git/go-git-fixtures/v6 v6.0.0-20260405195209-b16dd39735e0 h1:XoTsd
 github.com/go-git/go-git-fixtures/v6 v6.0.0-20260405195209-b16dd39735e0/go.mod h1:1Lr7/vYEYyl6Ir9Ku0tKrCIRreM5zovv0Jdx2MPSM4s=
 github.com/go-git/go-git/v6 v6.0.0-alpha.2 h1:T3loNtDuAixNzXtlQxZhnYiYpaQ3CA4vn9RssAniEeI=
 github.com/go-git/go-git/v6 v6.0.0-alpha.2/go.mod h1:oCD3i19CTz7gBpeb11ZZqL91WzqbMq9avn5KpUYy/Ak=
-github.com/go-git/x/plugin/objectsigner/auto v0.0.0-20260330134459-33df49246da9 h1:kXhj69S4g73PBLPwE/HKaD3a4fGtz3si5wHevmcvJ10=
-github.com/go-git/x/plugin/objectsigner/auto v0.0.0-20260330134459-33df49246da9/go.mod h1:iP2cXPyXc//9v9THS3y/MLi0jnt7vEqwUDj11qQfFPg=
+github.com/go-git/x/plugin/objectsigner/auto v0.1.0 h1:RcLW29RgwSCmqrNSs7QOxvWkRbM1vPu0Vp9TCECZjMs=
+github.com/go-git/x/plugin/objectsigner/auto v0.1.0/go.mod h1:iP2cXPyXc//9v9THS3y/MLi0jnt7vEqwUDj11qQfFPg=
 github.com/go-git/x/plugin/objectsigner/gpg v0.1.0 h1:NEGVSOD+LPnus6j4iNkAZaHVTc4DNY223y1/I2Jq2yI=
 github.com/go-git/x/plugin/objectsigner/gpg v0.1.0/go.mod h1:1iosWq3OOqZxtNrwDHtcjicswuaOT45J5GMFyCk80wc=
 github.com/go-git/x/plugin/objectsigner/program v0.0.0-20260509055934-990a63433b45 h1:9HmkDRECQ7yGwcQ35x+0HhQp/JBKLkC9Cozr/z3gs4Q=
@@ -141,24 +142,28 @@ github.com/go-sprout/sprout v1.0.3 h1:LLuz0D3aYazgbVTOwCVuMor3LOUVYinipXRIdjA/D+
 github.com/go-sprout/sprout v1.0.3/go.mod h1:cFFzpnyGGry3cmN0UNCAM1f7AGok6vPVabeYQzBMBZY=
 github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
 github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
-github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
+github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
 github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
-github.com/google/cel-go v0.27.0 h1:e7ih85+4qVrBuqQWTW4FKSqZYokVuc3HnhH5keboFTo=
-github.com/google/cel-go v0.27.0/go.mod h1:tTJ11FWqnhw5KKpnWpvW9CJC3Y9GK4EIS0WXnBbebzw=
+github.com/google/cel-go v0.28.1 h1:YWIwi77J4xIsYUwAF/iIuS6haffzIHS8yWI8glSbLWM=
+github.com/google/cel-go v0.28.1/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-github/v72 v72.0.0 h1:FcIO37BLoVPBO9igQQ6tStsv2asG4IPcYFi655PPvBM=
+github.com/google/go-github/v72 v72.0.0/go.mod h1:WWtw8GMRiL62mvIquf1kO3onRHeWWKmK01qdCY8c5fg=
+github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0=
+github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
 github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
-github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
-github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.9.0 h1:CeOIz6k+LoN3qX9Z0tyQrPtiB1DFYRPfCIBtaXPSCnA=
+github.com/hashicorp/go-version v1.9.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
@@ -170,8 +175,8 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/kevinburke/ssh_config v1.6.0 h1:J1FBfmuVosPHf5GRdltRLhPJtJpTlMdKTBjRgTaQBFY=
 github.com/kevinburke/ssh_config v1.6.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
-github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
+github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
@@ -187,23 +192,20 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
 github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY=
+github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
 github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
-github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw=
-github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/mholt/archives v0.1.5 h1:Fh2hl1j7VEhc6DZs2DLMgiBNChUux154a1G+2esNvzQ=
-github.com/mholt/archives v0.1.5/go.mod h1:3TPMmBLPsgszL+1As5zECTuKwKvIfj6YcwWPpeTAXF4=
+github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
+github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/mholt/archives v0.1.6-0.20260429171216-ef71b7a32fae h1:J5ek2lGxYgdh5SMMmlNTSKLmS1x2oJQla/V0NaAH7vo=
+github.com/mholt/archives v0.1.6-0.20260429171216-ef71b7a32fae/go.mod h1:IbMrpOL3881/V4qoZRFTSTSRzjjZkD3qoRLX07MitpY=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/mikelolasagasti/xz v1.0.1 h1:Q2F2jX0RYJUG3+WsM+FJknv+6eVjsjXNDV0KJXZzkD0=
 github.com/mikelolasagasti/xz v1.0.1/go.mod h1:muAirjiOUxPRXwm9HdDtB3uoRPrGnL85XHtokL9Hcgc=
-github.com/minio/minlz v1.0.1 h1:OUZUzXcib8diiX+JYxyRLIdomyZYzHct6EShOKtQY2A=
-github.com/minio/minlz v1.0.1/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec=
+github.com/minio/minlz v1.1.1 h1:OGmft1V6AnI/Wme332U6bhG54nxEan+VFgkD7lat4KM=
+github.com/minio/minlz v1.1.1/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
@@ -214,36 +216,38 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
-github.com/nwaples/rardecode/v2 v2.2.2 h1:/5oL8dzYivRM/tqX9VcTSWfbpwcbwKG1QtSJr3b3KcU=
-github.com/nwaples/rardecode/v2 v2.2.2/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
+github.com/nwaples/rardecode/v2 v2.2.3 h1:qaVuy3ChZDbAQZshPLjHeNJKF3Cru8uo9jmgveKIy2A=
+github.com/nwaples/rardecode/v2 v2.2.3/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
 github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc=
 github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 h1:WDsQxOJDy0N1VRAjXLpi8sCEZRSGarLWQevDxpTBRrM=
 github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
-github.com/pierrec/lz4/v4 v4.1.25 h1:kocOqRffaIbU5djlIBr7Wh+cx82C0vtFb0fOurZHqD0=
-github.com/pierrec/lz4/v4 v4.1.25/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
-github.com/pjbgf/sha1cd v0.5.0 h1:a+UkboSi1znleCDUNT3M5YxjOnN1fz2FhN48FlwCxs0=
-github.com/pjbgf/sha1cd v0.5.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pierrec/lz4/v4 v4.1.27 h1:+PhzhWDrjRj89TH2sw43nE3+4+W8lSxIuQadEHZyjUk=
+github.com/pierrec/lz4/v4 v4.1.27/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
+github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU=
+github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
 github.com/pkoukk/tiktoken-go v0.1.8 h1:85ENo+3FpWgAACBaEUVp+lctuTcYUO7BtmfhlN/QTRo=
 github.com/pkoukk/tiktoken-go v0.1.8/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posthog/posthog-go v1.12.1 h1:qZMHfC0frQOR1LT4js3ns+pXbDIyFsV+kWpvJEok3ms=
-github.com/posthog/posthog-go v1.12.1/go.mod h1:xsVOW9YImilUcazwPNEq4PJDqEZf2KeCS758zXjwkPg=
+github.com/posthog/posthog-go v1.14.0 h1:pN0+v7kvKkykRQDf6E0KNYJvKqhJ+VzQGlfxYHfZMhs=
+github.com/posthog/posthog-go v1.14.0/go.mod h1:xsVOW9YImilUcazwPNEq4PJDqEZf2KeCS758zXjwkPg=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.35.1 h1:m7xQeoiLIiV0BCEY4Hs+j2NG4Gp2o2KPKmhnnLiazKI=
+github.com/rs/zerolog v1.35.1/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=
 github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
 github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
 github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed h1:KT7hI8vYXgU0s2qaMkrfq9tCA1w/iEPgfredVP+4Tzw=
+github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed/go.mod h1:zqMwyHmnN/eDOZOdiTohqIUKUrTFX62PNlu7IJdu0q8=
+github.com/shurcooL/graphql v0.0.0-20240915155400-7ee5256398cf h1:o1uxfymjZ7jZ4MsgCErcwWGtVKSiNAXtS59Lhs6uI/g=
+github.com/shurcooL/graphql v0.0.0-20240915155400-7ee5256398cf/go.mod h1:9dIRpgIY7hVhoqfe0/FcYp0bpInZaT7dc3BYOprrIUE=
 github.com/sorairolake/lzip-go v0.3.8 h1:j5Q2313INdTA80ureWYRhX+1K78mUXfMoPZCw/ivWik=
 github.com/sorairolake/lzip-go v0.3.8/go.mod h1:JcBqGMV0frlxwrsE9sMWXDjqn3EeVf0/54YPsw66qkU=
 github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
@@ -257,6 +261,8 @@ github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
 github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
+github.com/stangelandcl/ppmd v0.1.1 h1:c25QazhlWUn5nmR1QOzafKhQxBicAr7GGCKER2aJ8H8=
+github.com/stangelandcl/ppmd v0.1.1/go.mod h1:Rrv7M+/2P5jYr/GMLhBl7Ug3uJ1bUiVzr5LbbaV6xgY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -277,36 +283,34 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavM
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
-github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
-github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
-github.com/yuin/goldmark-emoji v1.0.5 h1:EMVWyCGPlXJfUXBXpuMu+ii3TIaxbVBnEX9uaDC4cIk=
-github.com/yuin/goldmark-emoji v1.0.5/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
+github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
+github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+github.com/yuin/goldmark-emoji v1.0.6 h1:QWfF2FYaXwL74tfGOW5izeiZepUDroDJfWubQI9HTHs=
+github.com/yuin/goldmark-emoji v1.0.6/go.mod h1:ukxJDKFpdFb5x0a5HqbdlcKtebh086iJpI31LTKmWuA=
 github.com/zalando/go-keyring v0.2.8 h1:6sD/Ucpl7jNq10rM2pgqTs0sZ9V3qMrqfIIy5YPccHs=
 github.com/zalando/go-keyring v0.2.8/go.mod h1:tsMo+VpRq5NGyKfxoBVjCuMrG47yj8cmakZDO5QGii0=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 go4.org v0.0.0-20260112195520-a5071408f32f h1:ziUVAjmTPwQMBmYR1tbdRFJPtTcQUI12fH9QQjfb0Sw=
 go4.org v0.0.0-20260112195520-a5071408f32f/go.mod h1:ZRJnO5ZI4zAwMFp+dS1+V6J6MSyAowhRqAE+DPa1Xp0=
-golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
-golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
-golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
-golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
-golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
+golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
+golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
+golang.org/x/exp v0.0.0-20260603202125-055de637280b h1:v1uXiEBHo8QA0LiGCo7UgHMzHT4Kdfpl2zmtH5vaP1Q=
+golang.org/x/exp v0.0.0-20260603202125-055de637280b/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
+golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
+golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
 golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
 golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
-golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
-golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
+golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
+golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
+golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
+golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8=
 google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY=
diff --git a/mise-tasks/bench/cpu b/mise-tasks/bench/cpu
index bdd7d9b..f081700 100755
--- a/mise-tasks/bench/cpu
+++ b/mise-tasks/bench/cpu
@@ -2,7 +2,7 @@
 #MISE description="Run benchmarks with CPU profile (single package)"
 set -euo pipefail
 
-PKG="${BENCH_PKG:-./cmd/trace/cli/benchutil/}"
+PKG="${BENCH_PKG:-./cli/benchutil/}"
 echo "Profiling package: $PKG (override with BENCH_PKG=./path/to/pkg)"
 go test -bench=. -benchmem -run='^$' -cpuprofile=cpu.prof -timeout=10m "$PKG"
 echo "Profile saved to cpu.prof. View with: go tool pprof -http=:8080 cpu.prof"
diff --git a/mise-tasks/bench/mem b/mise-tasks/bench/mem
index c9dd7d2..40e3ae0 100755
--- a/mise-tasks/bench/mem
+++ b/mise-tasks/bench/mem
@@ -2,7 +2,7 @@
 #MISE description="Run benchmarks with memory profile (single package)"
 set -euo pipefail
 
-PKG="${BENCH_PKG:-./cmd/trace/cli/benchutil/}"
+PKG="${BENCH_PKG:-./cli/benchutil/}"
 echo "Profiling package: $PKG (override with BENCH_PKG=./path/to/pkg)"
 go test -bench=. -benchmem -run='^$' -memprofile=mem.prof -timeout=10m "$PKG"
 echo "Profile saved to mem.prof. View with: go tool pprof -http=:8080 mem.prof"
diff --git a/mise-tasks/build b/mise-tasks/build
deleted file mode 100755
index 1e995fd..0000000
--- a/mise-tasks/build
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#MISE description="Build the CLI"
-
-TAG=$(git describe --tags --abbrev=0 || echo "v0.0.0")
-COMMIT=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
-VERSION="${TAG}-dev-${COMMIT}"
-
-OUTPUT="trace"
-case "$(uname -s)" in MINGW*|MSYS*|CYGWIN*|Windows_NT) OUTPUT="trace.exe" ;; esac
-
-go build -ldflags "-X github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo.Version=${VERSION} -X github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo.Commit=${COMMIT}" -o "$OUTPUT" ./cmd/trace
diff --git a/mise-tasks/completions b/mise-tasks/completions
deleted file mode 100755
index 0969a3b..0000000
--- a/mise-tasks/completions
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#MISE description="Generate trace shell completions"
-#MISE quiet=true
-
-set -euo pipefail
-
-rm -rf completions
-mkdir completions
-for sh in bash zsh fish; do
-    go run ./cmd/trace/main.go completion "$sh" >"completions/trace.$sh"
-done
diff --git a/mise-tasks/dev/publish b/mise-tasks/dev/publish
deleted file mode 100755
index 2bd81a7..0000000
--- a/mise-tasks/dev/publish
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#MISE description="Install binaries into ~/go/bin"
-
-set -eu
-
-export GOBIN=${GOPATH:-$HOME/go}/bin
-echo "NOTE: we're overriding \$GOBIN: $GOBIN" 1>&2
-
-TAG=$(git describe --tags --abbrev=0 || echo "v0.0.0")
-COMMIT=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
-VERSION="${TAG}-dev-${COMMIT}"
-
-go install -ldflags "-X github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo.Version=${VERSION} -X github.com/GrayCodeAI/trace/cmd/trace/cli/versioninfo.Commit=${COMMIT}" ./cmd/trace
diff --git a/mise-tasks/lint/licenses b/mise-tasks/lint/licenses
index 603dbbb..479cb22 100755
--- a/mise-tasks/lint/licenses
+++ b/mise-tasks/lint/licenses
@@ -40,7 +40,7 @@ echo ""
 # Get licenses from dependencies
 TEMP_FILE=$(mktemp)
 # shellcheck disable=SC2312
-go-licenses csv ./cmd/trace 2>/dev/null | sort | uniq > "$TEMP_FILE"
+go-licenses csv ./... 2>/dev/null | sort | uniq > "$TEMP_FILE"
 
 # Check each dependency
 VIOLATIONS=()
diff --git a/mise-tasks/release b/mise-tasks/release
deleted file mode 100755
index 57b0547..0000000
--- a/mise-tasks/release
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#MISE description="Create stable + nightly release tags and push them (usage: mise run release vX.X.X)"
-set -eu
-
-VERSION="${1:-}"
-if [ -z "$VERSION" ]; then
-  echo "Usage: mise run release vX.X.X"
-  exit 1
-fi
-
-# Ensure version starts with v
-case "$VERSION" in
-  v*) ;;
-  *) VERSION="v${VERSION}" ;;
-esac
-
-# Validate semver format (vMAJOR.MINOR.PATCH)
-if ! echo "$VERSION" | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+$'; then
-  echo "Error: invalid version format '${VERSION}', expected vMAJOR.MINOR.PATCH"
-  exit 1
-fi
-
-# Ensure working tree is clean
-if [ -n "$(git status --porcelain)" ]; then
-  echo "Error: working tree is not clean, commit or stash changes first"
-  exit 1
-fi
-
-# Create stable tag first so the nightly script can find it
-git tag "$VERSION"
-echo "Created tag ${VERSION}"
-
-# Generate and create nightly tag if possible
-NIGHTLY_TAG=$(scripts/create-nightly-tag.sh) || true
-
-git push origin "$VERSION"
-echo "Pushed tag ${VERSION}"
-
-if [ -n "$NIGHTLY_TAG" ]; then
-  git tag "$NIGHTLY_TAG"
-  echo "Created tag ${NIGHTLY_TAG}"
-  git push origin "$NIGHTLY_TAG"
-fi
-echo ""
-echo "Done. Release workflows will start automatically."
diff --git a/mise-tasks/test/ci/core b/mise-tasks/test/ci/core
index 65ae794..637f989 100755
--- a/mise-tasks/test/ci/core
+++ b/mise-tasks/test/ci/core
@@ -5,7 +5,7 @@ set -eu
 
 parallel="${GO_TEST_PARALLEL:-16}"
 
-packages="$(go list ./... | grep -v '^github.com/GrayCodeAI/trace/cmd/trace/cli/integration_test$' || true)"
+packages="$(go list ./... | grep -v '^github.com/GrayCodeAI/trace/cli/integration_test$' || true)"
 
 if [ -z "$packages" ]; then
   echo "error: no non-integration packages found" >&2
diff --git a/mise-tasks/test/ci/integration/shard b/mise-tasks/test/ci/integration/shard
index ff25d84..b114981 100755
--- a/mise-tasks/test/ci/integration/shard
+++ b/mise-tasks/test/ci/integration/shard
@@ -6,7 +6,7 @@ set -eu
 
 shard="${usage_shard:-}"
 parallel="${GO_TEST_PARALLEL:-16}"
-pkg="./cmd/trace/cli/integration_test"
+pkg="./cli/integration_test"
 
 case "$shard" in
   a|b|c) ;;
diff --git a/mise-tasks/test/e2e/_default b/mise-tasks/test/e2e/_default
deleted file mode 100755
index 824a8bb..0000000
--- a/mise-tasks/test/e2e/_default
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#MISE description="Run E2E tests: mise run test:e2e --agent claude-code [filter]"
-#MISE quiet=true
-#USAGE flag "--agent <agent>" help="Agent (claude-code, gemini-cli, opencode, cursor-cli, copilot-cli)" default="" env="E2E_AGENT"
-#USAGE arg "[filter]" help="Test name filter (regex)" default=""
-
-set -eu
-
-export E2E_AGENT="${usage_agent:-}"
-
-# Build from source with version info unless a pre-built binary is provided.
-if [ -z "${E2E_TRACE_BIN:-}" ]; then
-  mise run build
-  if [ -f "$PWD/trace.exe" ]; then
-    export E2E_TRACE_BIN="$PWD/trace.exe"
-  else
-    export E2E_TRACE_BIN="$PWD/trace"
-  fi
-fi
-
-if [ -z "${E2E_ARTIFACT_DIR:-}" ]; then
-  E2E_ARTIFACT_DIR="$PWD/e2e/artifacts/$(date +%Y-%m-%dT%H-%M-%S)"
-fi
-export E2E_ARTIFACT_DIR
-mkdir -p "$E2E_ARTIFACT_DIR"
-echo "artifacts: $E2E_ARTIFACT_DIR"
-
-filter="${usage_filter:-}"
-
-# Use an explicit package path without the "..." wildcard. The wildcard
-# triggers a Go toolchain panic on Windows ARM64 in modload/search.go
-# (slice bounds out of range) and a GetFileInformationByHandleEx error
-# with relative paths.
-gotestsum --format dots --jsonfile "$E2E_ARTIFACT_DIR/test-events.json" -- \
-  -tags=e2e -count=1 -timeout=30m \
-  ${filter:+-run "$filter"} \
-  ./e2e/tests || rc=$?
-
-go run ./e2e/cmd/testreport -color -o "$E2E_ARTIFACT_DIR/report.txt" "$E2E_ARTIFACT_DIR/test-events.json"
-echo ""
-cat "$E2E_ARTIFACT_DIR/trace-version.txt" 2>/dev/null
-echo "artifacts: $E2E_ARTIFACT_DIR"
-exit "${rc:-0}"
diff --git a/mise-tasks/test/e2e/canary b/mise-tasks/test/e2e/canary
deleted file mode 100755
index b6dd00e..0000000
--- a/mise-tasks/test/e2e/canary
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#MISE description="Run E2E canary tests with deterministic agents (no API calls)"
-#USAGE arg "[filter]" help="Test name filter (regex)" default=""
-
-set -eu
-
-# Build trace CLI
-mise run build
-export E2E_TRACE_BIN="$PWD/trace"
-
-# Build vogon binary
-go build -o vogon ./e2e/vogon
-E2E_PATH="$PWD:$PATH"
-
-if [ -z "${E2E_ARTIFACT_DIR:-}" ]; then
-  E2E_ARTIFACT_DIR="$PWD/e2e/artifacts/canary-$(date +%Y-%m-%dT%H-%M-%S)"
-fi
-export E2E_ARTIFACT_DIR
-mkdir -p "$E2E_ARTIFACT_DIR"
-echo "artifacts: $E2E_ARTIFACT_DIR"
-
-filter="${usage_filter:-}"
-vogon_rc=0
-rr_rc=0
-
-# --- vogon: runs all tests (built-in agent) ---
-echo "--- canary: vogon ---"
-PATH="$E2E_PATH" E2E_AGENT=vogon gotestsum --format dots \
-  --jsonfile "$E2E_ARTIFACT_DIR/test-events-vogon.json" -- \
-  -tags=e2e -count=1 -timeout=10m \
-  ${filter:+-run "$filter"} \
-  ./e2e/tests/... || vogon_rc=$?
-
-go run ./e2e/cmd/testreport -color \
-  -o "$E2E_ARTIFACT_DIR/report-vogon.txt" \
-  "$E2E_ARTIFACT_DIR/test-events-vogon.json"
-
-# --- roger-roger: external agent tests only (binaries from mise) ---
-echo "--- canary: roger-roger ---"
-
-# Preflight: ensure required roger-roger binaries are on PATH so tests don't silently skip
-if ! command -v roger-roger >/dev/null 2>&1; then
-  echo "error: roger-roger binary not found on PATH; install/configure it before running roger-roger canary tests." >&2
-  exit 1
-fi
-
-if ! command -v trace-agent-roger-roger >/dev/null 2>&1; then
-  echo "error: trace-agent-roger-roger binary not found on PATH; install/configure it before running roger-roger canary tests." >&2
-  exit 1
-fi
-
-rr_filter="${filter:-TestExternalAgent}"
-E2E_AGENT=roger-roger gotestsum --format dots \
-  --jsonfile "$E2E_ARTIFACT_DIR/test-events-roger-roger.json" -- \
-  -tags=e2e -count=1 -timeout=10m \
-  -run "$rr_filter" \
-  ./e2e/tests/... || rr_rc=$?
-
-go run ./e2e/cmd/testreport -color \
-  -o "$E2E_ARTIFACT_DIR/report-roger-roger.txt" \
-  "$E2E_ARTIFACT_DIR/test-events-roger-roger.json"
-
-echo ""
-cat "$E2E_ARTIFACT_DIR/trace-version.txt" 2>/dev/null
-echo "artifacts: $E2E_ARTIFACT_DIR"
-if [ "$vogon_rc" -ne 0 ] || [ "$rr_rc" -ne 0 ]; then
-  exit 1
-fi
diff --git a/mise-tasks/test/e2e/roger-roger b/mise-tasks/test/e2e/roger-roger
deleted file mode 100755
index d6e1d50..0000000
--- a/mise-tasks/test/e2e/roger-roger
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#MISE description="Run E2E tests with roger-roger external agent (no API calls)"
-#USAGE arg "[filter]" help="Test name filter (regex)" default=""
-
-set -eu
-
-export E2E_AGENT="roger-roger"
-
-# Build trace CLI
-mise run build
-export E2E_TRACE_BIN="$PWD/trace"
-
-# Ensure roger-roger binaries are available on PATH before running E2E tests.
-# They are typically installed via mise (see mise.toml [tools]), but we fail fast
-# here if they are missing so the suite cannot silently "succeed" without
-# exercising the external agent.
-if ! command -v roger-roger >/dev/null 2>&1; then
-  echo "error: 'roger-roger' binary not found on PATH. Install it via 'mise install' or ensure it is available before running this task." >&2
-  exit 1
-fi
-
-if ! command -v trace-agent-roger-roger >/dev/null 2>&1; then
-  echo "error: 'trace-agent-roger-roger' binary not found on PATH. Install it via 'mise install' or ensure it is available before running this task." >&2
-  exit 1
-fi
-
-if [ -z "${E2E_ARTIFACT_DIR:-}" ]; then
-  E2E_ARTIFACT_DIR="$PWD/e2e/artifacts/roger-roger-$(date +%Y-%m-%dT%H-%M-%S)"
-fi
-export E2E_ARTIFACT_DIR
-mkdir -p "$E2E_ARTIFACT_DIR"
-echo "artifacts: $E2E_ARTIFACT_DIR"
-
-filter="${usage_filter:-}"
-
-gotestsum --format dots --jsonfile "$E2E_ARTIFACT_DIR/test-events.json" -- \
-  -tags=e2e -count=1 -timeout=10m \
-  ${filter:+-run "$filter"} \
-  ./e2e/tests/... || rc=$?
-
-go run ./e2e/cmd/testreport -color -o "$E2E_ARTIFACT_DIR/report.txt" "$E2E_ARTIFACT_DIR/test-events.json"
-echo ""
-cat "$E2E_ARTIFACT_DIR/trace-version.txt" 2>/dev/null
-echo "artifacts: $E2E_ARTIFACT_DIR"
-exit "${rc:-0}"
diff --git a/mise.toml b/mise.toml
index ff8756d..5e3fb49 100644
--- a/mise.toml
+++ b/mise.toml
@@ -15,23 +15,12 @@ run = "go test ./..."
 
 [tasks."test:integration"]
 description = "Run integration tests"
-run = "go test -tags=integration ./cmd/trace/cli/integration_test/..."
+run = "go test -tags=integration ./cli/integration_test/..."
 
 [tasks."test:ci"]
-description = "Run all tests (unit + integration + E2E canary) with race detection"
-run = """
-go test -tags=integration -race ./...
-mise run test:e2e:canary
-"""
+description = "Run all tests (unit + integration) with race detection"
+run = "go test -tags=integration -race ./..."
 
 [tasks.check]
 description = "Run formatting, linting, and CI tests"
 depends = ["fmt", "lint", "test:ci"]
-
-[tasks."build:windows"]
-description = "Cross-compile for Windows amd64"
-run = "CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o trace.exe ./cmd/trace/"
-
-[tasks."build:windows-arm64"]
-description = "Cross-compile for Windows arm64"
-run = "CGO_ENABLED=0 GOOS=windows GOARCH=arm64 go build -o trace-arm64.exe ./cmd/trace/"
diff --git a/otel_collector.go b/otel_collector.go
deleted file mode 100644
index 5a3c605..0000000
--- a/otel_collector.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Package trace is a git-native session capture and replay CLI for AI coding
-// agents. It records coding sessions as transcripts on orphan git branches,
-// supports a pluggable agent registry (Claude Code, Codex, Copilot, Cursor,
-// Gemini, OpenCode, Pi, and more), and exports spans to OpenTelemetry
-// collectors.
-//
-// This file (otel_collector.go) implements the OpenTelemetry export path:
-// converting transcript entries into OTel spans, batching them with
-// configurable size and flush intervals, and shipping batches to an OTLP
-// endpoint with exponential-backoff retry.
-package trace
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-)
-
-// RetryConfig controls retry behaviour when exporting span batches.
-type RetryConfig struct {
-	MaxRetries        int           `json:"max_retries"`
-	BackoffMultiplier float64       `json:"backoff_multiplier"`
-	InitialBackoff    time.Duration `json:"initial_backoff"`
-}
-
-// OTelCollectorConfig holds configuration for the OpenTelemetry collector client.
-type OTelCollectorConfig struct {
-	Endpoint      string        `json:"endpoint"`
-	Insecure      bool          `json:"insecure"`
-	Timeout       time.Duration `json:"timeout"`
-	BatchSize     int           `json:"batch_size"`
-	FlushInterval time.Duration `json:"flush_interval"`
-	RetryConfig   RetryConfig   `json:"retry_config"`
-}
-
-// DefaultOTelCollectorConfig returns a config with sensible production defaults:
-// endpoint localhost:4317, 5 s timeout, batches of 100 spans, flush every 10 s.
-func DefaultOTelCollectorConfig() OTelCollectorConfig {
-	return OTelCollectorConfig{
-		Endpoint:      "localhost:4317",
-		Insecure:      true,
-		Timeout:       5 * time.Second,
-		BatchSize:     100,
-		FlushInterval: 10 * time.Second,
-		RetryConfig: RetryConfig{
-			MaxRetries:        3,
-			BackoffMultiplier: 2.0,
-			InitialBackoff:    500 * time.Millisecond,
-		},
-	}
-}
-
-// OTelEvent represents a timed annotation attached to a span.
-type OTelEvent struct {
-	Name       string            `json:"name"`
-	Timestamp  time.Time         `json:"timestamp"`
-	Attributes map[string]string `json:"attributes,omitempty"`
-}
-
-// OTelSpan is the in-process representation of an OpenTelemetry span.
-type OTelSpan struct {
-	TraceID      string            `json:"trace_id"`
-	SpanID       string            `json:"span_id"`
-	ParentSpanID string            `json:"parent_span_id,omitempty"`
-	Name         string            `json:"name"`
-	Status       string            `json:"status"`
-	StartTime    time.Time         `json:"start_time"`
-	EndTime      time.Time         `json:"end_time"`
-	Attributes   map[string]string `json:"attributes,omitempty"`
-	Events       []OTelEvent       `json:"events,omitempty"`
-}
-
-// SpanBatch groups spans for bulk export.
-type SpanBatch struct {
-	Spans     []OTelSpan `json:"spans"`
-	BatchID   string     `json:"batch_id"`
-	CreatedAt time.Time  `json:"created_at"`
-}
-
-// NewSpanBatch creates a new, empty batch with a unique ID.
-func NewSpanBatch() *SpanBatch {
-	return &SpanBatch{
-		Spans:     make([]OTelSpan, 0),
-		BatchID:   uuid.New().String(),
-		CreatedAt: time.Now(),
-	}
-}
-
-// AddSpan appends a span to the batch.
-func (sb *SpanBatch) AddSpan(span OTelSpan) {
-	sb.Spans = append(sb.Spans, span)
-}
-
-// IsFull reports whether the batch has reached maxSize spans.
-func (sb *SpanBatch) IsFull(maxSize int) bool {
-	return len(sb.Spans) >= maxSize
-}
-
-// ToJSON serialises the batch to JSON bytes suitable for export.
-func (sb *SpanBatch) ToJSON() ([]byte, error) {
-	b, err := json.Marshal(sb)
-	if err != nil {
-		return nil, fmt.Errorf("otel: marshal span batch: %w", err)
-	}
-	return b, nil
-}
-
-// Size returns the number of spans currently in the batch.
-func (sb *SpanBatch) Size() int {
-	return len(sb.Spans)
-}
-
-// ConvertTranscriptToOTelSpan converts a generic transcript entry (as stored in
-// full.jsonl or transcript.jsonl) into an OTelSpan. It recognises common field
-// names used across agent transcript formats.
-func ConvertTranscriptToOTelSpan(entry map[string]interface{}) OTelSpan {
-	span := OTelSpan{
-		Attributes: make(map[string]string),
-	}
-
-	// Trace / span identifiers.
-	span.TraceID = stringField(entry, "trace_id", "traceId")
-	span.SpanID = stringField(entry, "span_id", "spanId")
-	span.ParentSpanID = stringField(entry, "parent_span_id", "parentSpanId")
-
-	// Name: prefer explicit "name", fall back to "type" or "operation".
-	span.Name = stringField(entry, "name", "type", "operation")
-
-	// Status: prefer explicit "status", fall back to "level" or derive from "is_error".
-	span.Status = stringField(entry, "status", "level")
-	if span.Status == "" {
-		if isErr, ok := entry["is_error"]; ok {
-			if b, ok := isErr.(bool); ok && b {
-				span.Status = "ERROR"
-			}
-		}
-	}
-
-	// Timestamps.
-	span.StartTime = timeField(entry, "start_time", "startTime", "timestamp", "ts")
-	span.EndTime = timeField(entry, "end_time", "endTime", "end_timestamp")
-
-	// Spread well-known fields into attributes.
-	knownScalarKeys := []string{
-		"model", "provider", "agent", "cli_version",
-		"input_tokens", "output_tokens", "id", "message_id",
-		"tool_name", "tool_use_id", "file_path",
-	}
-	for _, k := range knownScalarKeys {
-		if v := stringField(entry, k); v != "" {
-			span.Attributes[k] = v
-		}
-	}
-
-	// Carry gen_ai.* semantic convention attributes if present.
-	for k, v := range entry {
-		if strings.HasPrefix(k, "gen_ai.") {
-			span.Attributes[k] = fmt.Sprintf("%v", v)
-		}
-	}
-
-	return span
-}
-
-// stringField returns the first non-empty string value found among the given
-// keys in the map. Returns "" if none match or the value is not a string.
-func stringField(m map[string]interface{}, keys ...string) string {
-	for _, k := range keys {
-		if v, ok := m[k]; ok {
-			if s, ok := v.(string); ok && s != "" {
-				return s
-			}
-		}
-	}
-	return ""
-}
-
-// timeField returns the first parseable time value found among the given keys.
-// Recognises both time.Time values and RFC 3339 / RFC 3339Nano strings.
-// Returns the zero time if nothing matches.
-func timeField(m map[string]interface{}, keys ...string) time.Time {
-	for _, k := range keys {
-		v, ok := m[k]
-		if !ok {
-			continue
-		}
-		switch t := v.(type) {
-		case time.Time:
-			return t
-		case string:
-			if parsed, err := time.Parse(time.RFC3339Nano, t); err == nil {
-				return parsed
-			}
-			if parsed, err := time.Parse(time.RFC3339, t); err == nil {
-				return parsed
-			}
-		}
-	}
-	return time.Time{}
-}
-
-// BatchSpans splits a flat slice of spans into sub-slices of at most batchSize
-// elements each. The final sub-slice may be smaller. A batchSize <= 0 is treated
-// as 1.
-func BatchSpans(spans []OTelSpan, batchSize int) [][]OTelSpan {
-	if batchSize <= 0 {
-		batchSize = 1
-	}
-	if len(spans) == 0 {
-		return nil
-	}
-	var batches [][]OTelSpan
-	for i := 0; i < len(spans); i += batchSize {
-		end := i + batchSize
-		if end > len(spans) {
-			end = len(spans)
-		}
-		batches = append(batches, spans[i:end])
-	}
-	return batches
-}
-
-// OTelCollector is a stub client for exporting span batches to an OpenTelemetry
-// collector via OTLP/gRPC or OTLP/HTTP. The actual transport is out of scope;
-// SendBatch validates the batch shape and returns nil on success so callers can
-// code against the interface without a live collector.
-type OTelCollector struct {
-	config OTelCollectorConfig
-}
-
-// NewOTelCollector creates a collector client with the given config.
-func NewOTelCollector(cfg OTelCollectorConfig) *OTelCollector {
-	return &OTelCollector{config: cfg}
-}
-
-// SendBatch validates that the batch is non-nil and non-empty, then returns nil.
-// In a production implementation this would marshal the batch to OTLP protobuf
-// and POST to the configured endpoint, honouring config.Timeout and
-// config.RetryConfig.
-func (c *OTelCollector) SendBatch(_ context.Context, batch *SpanBatch) error {
-	if batch == nil {
-		return errors.New("otel collector: batch must not be nil")
-	}
-	if len(batch.Spans) == 0 {
-		return fmt.Errorf("otel collector: batch %s contains no spans", batch.BatchID)
-	}
-	if c.config.Endpoint == "" {
-		return errors.New("otel collector: endpoint is not configured")
-	}
-
-	// Stub: in production this would perform the actual OTLP export with
-	// retry logic driven by c.config.RetryConfig.
-	return nil
-}
diff --git a/otel_collector_test.go b/otel_collector_test.go
deleted file mode 100644
index 33b6900..0000000
--- a/otel_collector_test.go
+++ /dev/null
@@ -1,308 +0,0 @@
-package trace
-
-import (
-	"context"
-	"encoding/json"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDefaultOTelCollectorConfig_SensibleValues(t *testing.T) {
-	cfg := DefaultOTelCollectorConfig()
-
-	assert.Equal(t, "localhost:4317", cfg.Endpoint, "default endpoint should be localhost:4317")
-	assert.True(t, cfg.Insecure, "default insecure should be true for local dev")
-	assert.Equal(t, 5*time.Second, cfg.Timeout, "default timeout should be 5s")
-	assert.Equal(t, 100, cfg.BatchSize, "default batch size should be 100")
-	assert.Equal(t, 10*time.Second, cfg.FlushInterval, "default flush interval should be 10s")
-
-	// Retry config
-	assert.Equal(t, 3, cfg.RetryConfig.MaxRetries, "default max retries should be 3")
-	assert.InDelta(t, 2.0, cfg.RetryConfig.BackoffMultiplier, 0.001, "default backoff multiplier should be 2.0")
-	assert.Equal(t, 500*time.Millisecond, cfg.RetryConfig.InitialBackoff, "default initial backoff should be 500ms")
-}
-
-func TestNewSpanBatch_CreatesWithNonEmptyID(t *testing.T) {
-	batch := NewSpanBatch()
-
-	require.NotNil(t, batch)
-	assert.NotEmpty(t, batch.BatchID, "batch ID should be non-empty")
-	assert.NotNil(t, batch.Spans, "Spans slice should be initialized")
-	assert.Empty(t, batch.Spans, "new batch should have zero spans")
-	assert.False(t, batch.CreatedAt.IsZero(), "CreatedAt should be set")
-}
-
-func TestAddSpan_IncrementsSize(t *testing.T) {
-	batch := NewSpanBatch()
-	assert.Equal(t, 0, batch.Size())
-
-	span := OTelSpan{
-		TraceID:   "trace-1",
-		SpanID:    "span-1",
-		Name:      "test-span",
-		Status:    "OK",
-		StartTime: time.Now(),
-		EndTime:   time.Now().Add(time.Second),
-	}
-	batch.AddSpan(span)
-	assert.Equal(t, 1, batch.Size())
-
-	batch.AddSpan(OTelSpan{SpanID: "span-2", Name: "second"})
-	assert.Equal(t, 2, batch.Size())
-}
-
-func TestIsFull_ReturnsTrueAtCapacity_FalseBelow(t *testing.T) {
-	batch := NewSpanBatch()
-
-	assert.False(t, batch.IsFull(3), "empty batch should not be full at capacity 3")
-
-	batch.AddSpan(OTelSpan{SpanID: "s1"})
-	assert.False(t, batch.IsFull(3), "batch with 1 span should not be full at capacity 3")
-
-	batch.AddSpan(OTelSpan{SpanID: "s2"})
-	assert.False(t, batch.IsFull(3), "batch with 2 spans should not be full at capacity 3")
-
-	batch.AddSpan(OTelSpan{SpanID: "s3"})
-	assert.True(t, batch.IsFull(3), "batch with 3 spans should be full at capacity 3")
-
-	batch.AddSpan(OTelSpan{SpanID: "s4"})
-	assert.True(t, batch.IsFull(3), "batch exceeding capacity should be full")
-}
-
-func TestToJSON_RoundTrip_PreservesSpanData(t *testing.T) {
-	batch := NewSpanBatch()
-
-	now := time.Now().Truncate(time.Microsecond)
-	span := OTelSpan{
-		TraceID:   "abc-123",
-		SpanID:    "def-456",
-		Name:      "llm.call",
-		Status:    "OK",
-		StartTime: now,
-		EndTime:   now.Add(500 * time.Millisecond),
-		Attributes: map[string]string{
-			"model": "gpt-4",
-		},
-		Events: []OTelEvent{
-			{
-				Name:      "token_count",
-				Timestamp: now.Add(250 * time.Millisecond),
-				Attributes: map[string]string{
-					"input_tokens": "100",
-				},
-			},
-		},
-	}
-	batch.AddSpan(span)
-
-	data, err := batch.ToJSON()
-	require.NoError(t, err)
-	require.NotEmpty(t, data)
-
-	var decoded SpanBatch
-	err = json.Unmarshal(data, &decoded)
-	require.NoError(t, err)
-
-	assert.Equal(t, batch.BatchID, decoded.BatchID)
-	assert.Len(t, decoded.Spans, 1)
-
-	got := decoded.Spans[0]
-	assert.Equal(t, "abc-123", got.TraceID)
-	assert.Equal(t, "def-456", got.SpanID)
-	assert.Equal(t, "llm.call", got.Name)
-	assert.Equal(t, "OK", got.Status)
-	assert.Equal(t, "gpt-4", got.Attributes["model"])
-	require.Len(t, got.Events, 1)
-	assert.Equal(t, "token_count", got.Events[0].Name)
-}
-
-func TestBatchSpans_SplitsCorrectly(t *testing.T) {
-	spans := make([]OTelSpan, 7)
-	for i := range spans {
-		spans[i] = OTelSpan{SpanID: "s" + string(rune('0'+i))}
-	}
-
-	t.Run("exact fit", func(t *testing.T) {
-		batches := BatchSpans(spans, 7)
-		require.Len(t, batches, 1)
-		assert.Len(t, batches[0], 7)
-	})
-
-	t.Run("partial last batch", func(t *testing.T) {
-		batches := BatchSpans(spans, 3)
-		require.Len(t, batches, 3)
-		assert.Len(t, batches[0], 3)
-		assert.Len(t, batches[1], 3)
-		assert.Len(t, batches[2], 1)
-	})
-
-	t.Run("empty input", func(t *testing.T) {
-		batches := BatchSpans(nil, 5)
-		assert.Nil(t, batches)
-	})
-
-	t.Run("batch size one", func(t *testing.T) {
-		batches := BatchSpans(spans[:2], 1)
-		require.Len(t, batches, 2)
-		assert.Len(t, batches[0], 1)
-		assert.Len(t, batches[1], 1)
-	})
-
-	t.Run("batch size zero defaults to one", func(t *testing.T) {
-		batches := BatchSpans(spans[:3], 0)
-		require.Len(t, batches, 3)
-	})
-}
-
-func TestConvertTranscriptToOTelSpan_ValidInput(t *testing.T) {
-	now := time.Now().UTC().Truncate(time.Second)
-	entry := map[string]interface{}{
-		"trace_id":   "t-001",
-		"span_id":    "sp-001",
-		"name":       "agent.think",
-		"status":     "OK",
-		"start_time": now.Format(time.RFC3339),
-		"end_time":   now.Add(2 * time.Second).Format(time.RFC3339),
-		"model":      "claude-sonnet-4-20250514",
-		"provider":   "anthropic",
-	}
-
-	span := ConvertTranscriptToOTelSpan(entry)
-
-	assert.Equal(t, "t-001", span.TraceID)
-	assert.Equal(t, "sp-001", span.SpanID)
-	assert.Equal(t, "agent.think", span.Name)
-	assert.Equal(t, "OK", span.Status)
-	assert.Equal(t, now, span.StartTime)
-	assert.Equal(t, now.Add(2*time.Second), span.EndTime)
-	assert.Equal(t, "claude-sonnet-4-20250514", span.Attributes["model"])
-	assert.Equal(t, "anthropic", span.Attributes["provider"])
-}
-
-func TestConvertTranscriptToOTelSpan_AlternateFieldNames(t *testing.T) {
-	entry := map[string]interface{}{
-		"traceId":  "t-alt",
-		"spanId":   "sp-alt",
-		"type":     "tool.call",
-		"level":    "ERROR",
-		"ts":       time.Now().Format(time.RFC3339Nano),
-		"is_error": true,
-	}
-
-	span := ConvertTranscriptToOTelSpan(entry)
-
-	assert.Equal(t, "t-alt", span.TraceID)
-	assert.Equal(t, "sp-alt", span.SpanID)
-	assert.Equal(t, "tool.call", span.Name)
-	assert.Equal(t, "ERROR", span.Status)
-}
-
-func TestConvertTranscriptToOTelSpan_DerivesStatusFromIsError(t *testing.T) {
-	entry := map[string]interface{}{
-		"name":     "failing_step",
-		"is_error": true,
-	}
-
-	span := ConvertTranscriptToOTelSpan(entry)
-
-	assert.Equal(t, "ERROR", span.Status, "status should be derived from is_error=true")
-}
-
-func TestConvertTranscriptToOTelSpan_GenAIAttributes(t *testing.T) {
-	entry := map[string]interface{}{
-		"name":            "llm.request",
-		"gen_ai.model":    "gpt-4",
-		"gen_ai.tokens":   42,
-		"gen_ai.provider": "openai",
-	}
-
-	span := ConvertTranscriptToOTelSpan(entry)
-
-	assert.Equal(t, "gpt-4", span.Attributes["gen_ai.model"])
-	assert.Equal(t, "42", span.Attributes["gen_ai.tokens"])
-	assert.Equal(t, "openai", span.Attributes["gen_ai.provider"])
-}
-
-func TestSpanBatch_EmptyBatchSerialization(t *testing.T) {
-	batch := NewSpanBatch()
-
-	data, err := batch.ToJSON()
-	require.NoError(t, err)
-
-	var decoded SpanBatch
-	err = json.Unmarshal(data, &decoded)
-	require.NoError(t, err)
-
-	assert.Equal(t, batch.BatchID, decoded.BatchID)
-	assert.Empty(t, decoded.Spans, "empty batch should serialise with zero spans")
-}
-
-func TestSpanBatch_MultipleSpansWithDifferentStatuses(t *testing.T) {
-	batch := NewSpanBatch()
-
-	statuses := []string{"OK", "ERROR", "UNSET", "TIMEOUT"}
-	for i, st := range statuses {
-		batch.AddSpan(OTelSpan{
-			TraceID:   "trace-multi",
-			SpanID:    "span-" + string(rune('A'+i)),
-			Name:      "step." + st,
-			Status:    st,
-			StartTime: time.Now(),
-			EndTime:   time.Now().Add(time.Duration(i+1) * time.Second),
-		})
-	}
-
-	assert.Equal(t, 4, batch.Size())
-
-	data, err := batch.ToJSON()
-	require.NoError(t, err)
-
-	var decoded SpanBatch
-	err = json.Unmarshal(data, &decoded)
-	require.NoError(t, err)
-
-	require.Len(t, decoded.Spans, 4)
-	for i, st := range statuses {
-		assert.Equal(t, st, decoded.Spans[i].Status, "span %d should preserve status %s", i, st)
-	}
-}
-
-func TestOTelCollector_SendBatch_ValidBatch_ReturnsNil(t *testing.T) {
-	cfg := DefaultOTelCollectorConfig()
-	collector := NewOTelCollector(cfg)
-
-	batch := NewSpanBatch()
-	batch.AddSpan(OTelSpan{
-		TraceID:   "trace-send",
-		SpanID:    "span-send",
-		Name:      "test.send",
-		Status:    "OK",
-		StartTime: time.Now(),
-		EndTime:   time.Now().Add(time.Second),
-	})
-
-	err := collector.SendBatch(context.Background(), batch)
-	assert.NoError(t, err, "SendBatch with a valid non-empty batch should return nil")
-}
-
-func TestOTelCollector_SendBatch_NilBatch_ReturnsError(t *testing.T) {
-	cfg := DefaultOTelCollectorConfig()
-	collector := NewOTelCollector(cfg)
-
-	err := collector.SendBatch(context.Background(), nil)
-	require.Error(t, err, "SendBatch with nil batch should return an error")
-	assert.Contains(t, err.Error(), "must not be nil")
-}
-
-func TestOTelCollector_SendBatch_EmptyBatch_ReturnsError(t *testing.T) {
-	cfg := DefaultOTelCollectorConfig()
-	collector := NewOTelCollector(cfg)
-
-	batch := NewSpanBatch()
-	err := collector.SendBatch(context.Background(), batch)
-	require.Error(t, err, "SendBatch with empty batch should return an error")
-	assert.Contains(t, err.Error(), "contains no spans")
-}
diff --git a/perf/span.go b/perf/span.go
index 064b533..153e724 100644
--- a/perf/span.go
+++ b/perf/span.go
@@ -6,7 +6,7 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/GrayCodeAI/trace/cmd/trace/cli/logging"
+	"github.com/GrayCodeAI/trace/cli/logging"
 )
 
 // Span tracks timing for an operation and its substeps.
diff --git a/redact/redact_bench_test.go b/redact/redact_bench_test.go
index 41833e9..59320d7 100644
--- a/redact/redact_bench_test.go
+++ b/redact/redact_bench_test.go
@@ -26,7 +26,7 @@ func BenchmarkRedactJSONLBytes(b *testing.B) {
 	}{
 		{
 			name: "Fixture/ClaudeFull2",
-			data: readBenchmarkFixture(b, "../cmd/trace/cli/transcript/compact/testdata/claude_full2.jsonl"),
+			data: readBenchmarkFixture(b, "../cli/transcript/compact/testdata/claude_full2.jsonl"),
 		},
 		{
 			name: "Synthetic/CheckpointLog",
diff --git a/scripts/create-nightly-tag.sh b/scripts/create-nightly-tag.sh
deleted file mode 100755
index 8ab46b7..0000000
--- a/scripts/create-nightly-tag.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Calculate the next nightly release tag based on the latest stable tag and HEAD.
-# Outputs the tag name to stdout, or exits 0 silently if a nightly already exists for HEAD.
-#
-# Tag format: v<major>.<minor>.<patch+1>-nightly.<YYYYMMDDhhmm>.<short-commit>
-# Usage: scripts/create-nightly-tag.sh
-
-SHORT_COMMIT=$(git rev-parse --short HEAD)
-
-# Skip if a nightly tag already exists for this commit
-if git tag -l "v*-nightly.*.${SHORT_COMMIT}" | grep -q .; then
-  echo "Nightly tag already exists for commit ${SHORT_COMMIT}, skipping." >&2
-  exit 2
-fi
-
-# Find the latest stable version tag (exclude prereleases)
-LATEST_STABLE=$(git describe --tags --abbrev=0 --match 'v[0-9]*' --exclude '*-*' 2>/dev/null)
-if [ -z "$LATEST_STABLE" ]; then
-  echo "::error::No stable version tag found" >&2
-  exit 1
-fi
-
-# Bump patch version: v0.5.4 → v0.5.5
-MAJOR=$(echo "$LATEST_STABLE" | sed 's/^v//' | cut -d. -f1)
-MINOR=$(echo "$LATEST_STABLE" | sed 's/^v//' | cut -d. -f2)
-PATCH=$(echo "$LATEST_STABLE" | sed 's/^v//' | cut -d. -f3)
-NEXT_PATCH=$((PATCH + 1))
-NIGHTLY_VERSION="v${MAJOR}.${MINOR}.${NEXT_PATCH}"
-
-DATE=$(TZ=UTC0 date +%Y%m%d%H%M)
-TAG="${NIGHTLY_VERSION}-nightly.${DATE}.${SHORT_COMMIT}"
-
-# Skip if this exact tag already exists
-if git rev-parse "${TAG}" >/dev/null 2>&1; then
-  echo "Tag ${TAG} already exists, skipping." >&2
-  exit 2
-fi
-
-echo "${TAG}"
diff --git a/scripts/download-e2e-artifacts.sh b/scripts/download-e2e-artifacts.sh
deleted file mode 100755
index 17a0cff..0000000
--- a/scripts/download-e2e-artifacts.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env bash
-#
-# Download E2E test artifacts from GitHub Actions.
-#
-# Usage: scripts/download-e2e-artifacts.sh [RUN_ID | RUN_URL | "latest"]
-#   RUN_ID:  numeric GitHub Actions run ID
-#   RUN_URL: full URL like https://github.com/GrayCodeAI/trace/actions/runs/12345
-#   "latest": most recent failed E2E run on main
-#
-# Outputs the absolute path of the download directory as the last line of stdout.
-# All diagnostic messages go to stderr.
-
-set -euo pipefail
-
-log() { echo "$@" >&2; }
-die() { log "ERROR: $1"; exit 1; }
-
-# --- Validate prerequisites ---
-
-command -v gh >/dev/null 2>&1 || die "'gh' CLI is not installed. Install from https://cli.github.com/"
-gh auth status >/dev/null 2>&1 || die "'gh' is not authenticated. Run 'gh auth login' first."
-
-# --- Parse input ---
-
-input="${1:-}"
-[ -z "$input" ] && die "Usage: $0 [RUN_ID | RUN_URL | \"latest\"]"
-
-run_id=""
-
-case "$input" in
-  latest)
-    log "Finding most recent failed E2E run on main..."
-    run_id=$(gh run list -w e2e.yml --status=failure -L1 --json databaseId -q '.[0].databaseId' 2>/dev/null)
-    [ -z "$run_id" ] && die "No failed E2E runs found."
-    log "Found run: $run_id"
-    ;;
-  http*)
-    # Extract run ID from URL: https://github.com/<owner>/<repo>/actions/runs/<id>
-    run_id=$(echo "$input" | grep -oE '/runs/[0-9]+' | grep -oE '[0-9]+')
-    [ -z "$run_id" ] && die "Could not extract run ID from URL: $input"
-    log "Extracted run ID: $run_id"
-    ;;
-  *[!0-9]*)
-    die "Invalid input: '$input'. Provide a numeric run ID, a GitHub Actions URL, or 'latest'."
-    ;;
-  *)
-    run_id="$input"
-    ;;
-esac
-
-# --- Fetch run metadata ---
-
-log "Fetching run metadata..."
-run_url=$(gh run view "$run_id" --json url -q '.url' 2>/dev/null) || die "Run $run_id not found."
-commit=$(gh run view "$run_id" --json headSha -q '.headSha' 2>/dev/null) || commit="unknown"
-
-log "Run URL: $run_url"
-log "Commit:  $commit"
-
-# --- Download artifacts ---
-
-dest="e2e/artifacts/ci-${run_id}"
-
-# If artifacts were already downloaded, skip re-downloading
-if [ -d "$dest" ] && [ "$(ls -A "$dest" 2>/dev/null)" ]; then
-  log "Artifacts already downloaded at $dest/, skipping download."
-else
-  mkdir -p "$dest"
-  log "Downloading artifacts to $dest/ ..."
-  gh run download "$run_id" --dir "$dest" 2>&1 >&2 || die "Failed to download artifacts. They may have expired (retention: 7 days)."
-fi
-
-# --- Restructure: flatten e2e-artifacts-<agent>/ wrapper dirs ---
-
-cd "$dest"
-for wrapper in e2e-artifacts-*/; do
-  [ -d "$wrapper" ] || continue
-  agent="${wrapper#e2e-artifacts-}"
-  agent="${agent%/}"
-  # Move contents up: e2e-artifacts-claude-code/* -> claude-code/
-  if [ -d "$agent" ]; then
-    # Agent dir already exists (shouldn't happen, but be safe)
-    cp -r "$wrapper"/* "$agent"/ 2>/dev/null || true
-  else
-    mv "$wrapper" "$agent"
-  fi
-done
-cd - >/dev/null
-
-# --- Write run metadata ---
-
-agents_found=$(cd "$dest" && ls -d */ 2>/dev/null | tr -d '/' | tr '\n' ', ' | sed 's/,$//')
-
-cat > "$dest/.run-info.json" <<EOF
-{
-  "run_id": "$run_id",
-  "run_url": "$run_url",
-  "commit": "$commit",
-  "downloaded_at": "$(date -u +%Y-%m-%dT%H:%M:%SZ)",
-  "agents": "$(echo "$agents_found" | sed 's/"/\\"/g')"
-}
-EOF
-
-log ""
-log "Downloaded artifacts for: $agents_found"
-log "Run info: $dest/.run-info.json"
-log ""
-
-# Last line of stdout: absolute path for callers to capture
-abs_dest="$(cd "$dest" && pwd)"
-echo "$abs_dest"
diff --git a/scripts/install.sh b/scripts/install.sh
deleted file mode 100644
index 6c0e230..0000000
--- a/scripts/install.sh
+++ /dev/null
@@ -1,321 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-GITHUB_REPO="GrayCodeAI/cli"
-DEFAULT_INSTALL_DIR="$HOME/.local/bin"
-DEFAULT_CHANNEL="stable"
-
-# Colors (disabled in non-interactive mode)
-if [[ -t 1 ]]; then
-    RED='\033[0;31m'
-    GREEN='\033[0;32m'
-    YELLOW='\033[0;33m'
-    BLUE='\033[0;34m'
-    BOLD='\033[1m'
-    NC='\033[0m' # No Color
-else
-    RED=''
-    GREEN=''
-    YELLOW=''
-    BLUE=''
-    BOLD=''
-    NC=''
-fi
-
-info() {
-    printf '%b%s%b\n' "${BLUE}==>${NC} ${BOLD}" "$1" "${NC}"
-}
-
-success() {
-    printf '%b%s%b\n' "${GREEN}==>${NC} ${BOLD}" "$1" "${NC}"
-}
-
-warn() {
-    printf '%b %s\n' "${YELLOW}Warning:${NC}" "$1"
-}
-
-error() {
-    printf '%b %s\n' "${RED}Error:${NC}" "$1" >&2
-    exit 1
-}
-
-usage() {
-    cat <<EOF
-Usage: install.sh [--channel stable|nightly]
-
-Options:
-  --channel   Release channel to install (default: stable)
-  -h, --help  Show this help message
-EOF
-}
-
-detect_os() {
-    local os
-    os="$(uname -s | tr '[:upper:]' '[:lower:]')"
-    case "$os" in
-        darwin)
-            echo "darwin"
-            ;;
-        linux)
-            echo "linux"
-            ;;
-        *)
-            error "Unsupported operating system: $os"
-            ;;
-    esac
-}
-
-detect_arch() {
-    local arch
-    arch="$(uname -m)"
-    case "$arch" in
-        x86_64|amd64)
-            echo "amd64"
-            ;;
-        arm64|aarch64)
-            echo "arm64"
-            ;;
-        *)
-            error "Unsupported architecture: $arch"
-            ;;
-    esac
-}
-
-fetch_github_json() {
-    local url="$1"
-    local curl_opts=(-fsSL)
-    if [[ -n "${GITHUB_TOKEN:-}" ]]; then
-        curl_opts+=(-H "Authorization: Bearer ${GITHUB_TOKEN}")
-    fi
-
-    curl "${curl_opts[@]}" "$url" 2>/dev/null
-}
-
-get_latest_stable_version() {
-    local url="https://api.github.com/repos/${GITHUB_REPO}/releases/latest"
-    local version
-    version=$(fetch_github_json "$url" | grep '"tag_name"' | sed -E 's/.*"tag_name": *"v?([^"]+)".*/\1/')
-
-    if [[ -z "$version" ]]; then
-        error "Failed to fetch latest version from GitHub. Please check your internet connection."
-    fi
-
-    echo "$version"
-}
-
-get_latest_nightly_version() {
-    local url="https://api.github.com/repos/${GITHUB_REPO}/releases?per_page=20"
-    local version
-    version=$(fetch_github_json "$url" | grep '"tag_name"' | grep 'nightly' | head -n 1 | sed -E 's/.*"tag_name": *"v?([^"]+)".*/\1/')
-
-    if [[ -z "$version" ]]; then
-        error "Failed to fetch latest nightly version from GitHub. Please check your internet connection."
-    fi
-
-    echo "$version"
-}
-
-download_file() {
-    local url="$1"
-    local output="$2"
-    local curl_opts=(-fsSL)
-
-    curl "${curl_opts[@]}" "$url" -o "$output"
-}
-
-verify_checksum() {
-    local file="$1"
-    local expected_checksum="$2"
-    local actual_checksum
-
-    if command -v sha256sum &> /dev/null; then
-        actual_checksum=$(sha256sum "$file" | awk '{print $1}')
-    elif command -v shasum &> /dev/null; then
-        actual_checksum=$(shasum -a 256 "$file" | awk '{print $1}')
-    else
-        warn "No checksum tool found (sha256sum or shasum). Skipping verification."
-        return 0
-    fi
-
-    if [[ "$actual_checksum" != "$expected_checksum" ]]; then
-        error "Checksum verification failed!  Expected: $expected_checksum, actual: $actual_checksum"
-    fi
-}
-
-main() {
-    local channel="${DEFAULT_CHANNEL}"
-    local version=""
-
-    while [[ $# -gt 0 ]]; do
-        case "$1" in
-            --channel)
-                shift
-                [[ $# -gt 0 ]] || error "--channel requires a value"
-                channel="$1"
-                ;;
-            -h|--help)
-                usage
-                exit 0
-                ;;
-            *)
-                error "Unknown argument: $1"
-                ;;
-        esac
-        shift
-    done
-
-    if ! command -v curl &> /dev/null; then
-        error "curl is required but not installed. Please install curl and try again."
-    fi
-
-    case "$channel" in
-        stable|nightly) ;;
-        *)
-            error "Unsupported channel: ${channel}. Expected 'stable' or 'nightly'."
-            ;;
-    esac
-
-    info "Installing Trace CLI..."
-
-    # Detect platform
-    local os arch
-    os=$(detect_os)
-    arch=$(detect_arch)
-    info "Detected platform: ${os}/${arch}"
-
-    info "Fetching latest ${channel} version..."
-    if [[ "$channel" == "nightly" ]]; then
-        version=$(get_latest_nightly_version)
-    else
-        version=$(get_latest_stable_version)
-    fi
-    # Strip leading 'v' if present
-    version="${version#v}"
-    info "Installing version: ${version}"
-
-    # Construct download URL
-    local archive_name="trace_${os}_${arch}.tar.gz"
-    local download_url="https://github.com/${GITHUB_REPO}/releases/download/v${version}/${archive_name}"
-    local checksums_url="https://github.com/${GITHUB_REPO}/releases/download/v${version}/checksums.txt"
-
-    tmp_dir=$(mktemp -d)
-    trap 'rm -rf "$tmp_dir"' EXIT
-
-    # Download archive
-    local archive_path="${tmp_dir}/${archive_name}"
-    info "Downloading ${archive_name}..."
-    if ! download_file "$download_url" "$archive_path"; then
-        error "Failed to download from ${download_url}. Please check that the version exists and try again."
-    fi
-
-    # Download and verify checksums
-    info "Downloading checksums..."
-    local checksums_path="${tmp_dir}/checksums.txt"
-    if ! download_file "$checksums_url" "$checksums_path"; then
-        error "Failed to download checksums from ${checksums_url}"
-    fi
-
-    info "Verifying checksum..."
-    local expected_checksum
-    expected_checksum=$(grep -iE "${archive_name}\$" "$checksums_path" | awk '{print $1}' || true)
-    if [[ -z "$expected_checksum" ]]; then
-        error "Checksum for ${archive_name} not found in checksums.txt"
-    fi
-    verify_checksum "$archive_path" "$expected_checksum"
-    success "Checksum verified"
-
-    info "Extracting..."
-    tar -xzf "$archive_path" -C "$tmp_dir"
-
-    local install_dir="${DEFAULT_INSTALL_DIR}"
-    local binary_path="${tmp_dir}/trace"
-
-    chmod +x "$binary_path"
-
-    info "Installing to ${install_dir}..."
-    local install_path="${install_dir}/trace"
-
-    mkdir -p "${install_dir}"
-    info "Directory ready"
-
-    if [[ ! -w "$install_dir" ]]; then
-        error "Cannot write to ${install_dir}."
-    fi
-    mv "$binary_path" "$install_path"
-
-    # Verify installation
-    if "$install_path" version &> /dev/null; then
-        success "Trace CLI installed to ${install_path}"
-    else
-        error "Installation completed but the binary failed to execute. Please check the installation."
-    fi
-
-    # Check if the installed binary is the one that will be found in PATH
-    local path_binary
-    path_binary=$(command -v "trace" 2>/dev/null || true)
-    if [[ -n "$path_binary" && ! "$path_binary" -ef "$install_path" ]]; then
-        # This case is a bit weird, because some other 'trace' is found on PATH.  Warn user.
-        echo ""
-        echo -e "${YELLOW}!${NC} ${BOLD}WARNING: PATH conflict detected${NC}"
-        echo -e "${YELLOW}!${NC}"
-        echo -e "${YELLOW}!${NC} Installed to: ${install_path}"
-        echo -e "${YELLOW}!${NC} But 'trace' resolves to: ${path_binary}"
-        echo -e "${YELLOW}!${NC}"
-        echo -e "${YELLOW}!${NC} Your PATH may have another version of Trace CLI. To fix:"
-        echo -e "${YELLOW}!${NC}   1. Remove the old binary: rm ${path_binary}"
-        echo -e "${YELLOW}!${NC}   or"
-        echo -e "${YELLOW}!${NC}   2. Adjust your PATH to prioritize ${install_dir}"
-        echo ""
-        error "Installation completed but PATH needs adjustment. Then, rerun the installation."
-    elif [[ -z "$path_binary" ]]; then
-        # First-time install: ~/.local/bin likely isn't on their PATH yet.
-        # Detect their shell and show the right config file.
-        local shell_name shell_config
-        shell_name="$(basename "${SHELL:-}")"
-        case "$shell_name" in
-            zsh)
-                # shellcheck disable=SC2088
-                shell_config="~/.zshrc" ;;
-            bash)
-                if [[ -f "$HOME/.bash_profile" ]]; then
-                    # shellcheck disable=SC2088
-                    shell_config="~/.bash_profile"
-                else
-                    # shellcheck disable=SC2088
-                    shell_config="~/.bashrc"
-                fi
-                ;;
-            fish)
-                # shellcheck disable=SC2088
-                shell_config="~/.config/fish/config.fish" ;;
-            *)
-                shell_config="" ;;
-        esac
-
-        echo ""
-        echo -e "  Add ${BOLD}trace${NC} to your PATH:"
-        echo ""
-        if [[ "$shell_name" == "fish" ]]; then
-            echo -e "    ${BOLD}mkdir -p ~/.config/fish${NC}"
-            echo -e "    ${BOLD}echo 'fish_add_path ${install_dir}' >> \$HOME/.config/fish/config.fish${NC}"
-        elif [[ -n "$shell_config" ]]; then
-            echo -e "    ${BOLD}echo 'export PATH=\"${install_dir}:\$PATH\"' >> ${shell_config}${NC}"
-        else
-            echo -e "  Add this to your shell config:"
-            echo ""
-            echo -e "    ${BOLD}export PATH=\"${install_dir}:\$PATH\"${NC}"
-            echo ""
-            echo -e "  Restart your terminal, then run ${BOLD}trace${NC} to get started."
-            exit 0
-        fi
-        echo ""
-        echo -e "  Restart your terminal, then run ${BOLD}trace${NC} to get started."
-        exit 0
-    fi
-
-    info "Running post-install actions..."
-    "$install_path" curl-bash-post-install
-}
-
-main "$@"
diff --git a/scripts/local-device-auth-smoke.sh b/scripts/local-device-auth-smoke.sh
deleted file mode 100755
index 9e2175e..0000000
--- a/scripts/local-device-auth-smoke.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-REPO_ROOT="$(cd -- "${SCRIPT_DIR}/.." && pwd)"
-
-: "${TRACE_API_BASE_URL:=http://localhost:8787}"
-
-LOG_FILE="$(mktemp -t trace-device-auth-smoke.XXXXXX.log)"
-cleanup() {
-  if [[ -n "${LOGIN_PID:-}" ]] && kill -0 "${LOGIN_PID}" 2>/dev/null; then
-    kill "${LOGIN_PID}" 2>/dev/null || true
-  fi
-}
-trap cleanup EXIT
-
-cd "${REPO_ROOT}"
-
-echo "Starting device auth login against ${TRACE_API_BASE_URL}"
-TRACE_TEST_TTY=0 TRACE_API_BASE_URL="${TRACE_API_BASE_URL}" go run ./cmd/trace login --insecure-http-auth >"${LOG_FILE}" 2>&1 &
-LOGIN_PID=$!
-
-for _ in {1..100}; do
-  if grep -q '^Approval URL: ' "${LOG_FILE}" && grep -q '^Device code: ' "${LOG_FILE}"; then
-    break
-  fi
-  sleep 0.1
-done
-
-if ! grep -q '^Approval URL: ' "${LOG_FILE}"; then
-  cat "${LOG_FILE}"
-  echo "Failed to capture approval URL from login output" >&2
-  exit 1
-fi
-
-APPROVAL_URL="$(python3 - <<'PY' "${LOG_FILE}"
-import pathlib
-import sys
-
-for line in pathlib.Path(sys.argv[1]).read_text().splitlines():
-    if line.startswith("Approval URL: "):
-        print(line.split(": ", 1)[1])
-        break
-PY
-)"
-
-DEVICE_CODE="$(python3 - <<'PY' "${LOG_FILE}"
-import pathlib
-import sys
-
-for line in pathlib.Path(sys.argv[1]).read_text().splitlines():
-    if line.startswith("Device code: "):
-        print(line.split(": ", 1)[1])
-        break
-PY
-)"
-
-echo "Device code: ${DEVICE_CODE}"
-echo "Approval URL: ${APPROVAL_URL}"
-
-if command -v open >/dev/null 2>&1; then
-  open "${APPROVAL_URL}"
-elif command -v xdg-open >/dev/null 2>&1; then
-  xdg-open "${APPROVAL_URL}"
-else
-  echo "No browser opener found. Open this URL manually:" >&2
-  echo "  ${APPROVAL_URL}" >&2
-fi
-
-echo "Approve the request in your browser. Waiting for CLI login to finish..."
-
-if ! wait "${LOGIN_PID}"; then
-  cat "${LOG_FILE}"
-  echo "Login command failed" >&2
-  exit 1
-fi
-
-AUTH_FILE="${HOME}/.config/trace/auth.json"
-
-python3 - <<'PY' "${AUTH_FILE}" "${TRACE_API_BASE_URL}"
-import json
-import pathlib
-import sys
-
-auth_file = pathlib.Path(sys.argv[1])
-base_url = sys.argv[2]
-
-if not auth_file.exists():
-    raise SystemExit(f"Auth file not found: {auth_file}")
-
-data = json.loads(auth_file.read_text())
-token = data.get("tokens", {}).get(base_url, {}).get("value", "")
-if not token:
-    raise SystemExit(f"No token saved for {base_url} in {auth_file}")
-
-print(f"Verified token saved for {base_url} in {auth_file}")
-PY
-
-cat "${LOG_FILE}"
diff --git a/scripts/test-attribution-e2e.sh b/scripts/test-attribution-e2e.sh
deleted file mode 100755
index 0a16b29..0000000
--- a/scripts/test-attribution-e2e.sh
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/bin/bash
-# End-to-end test for attribution tracking with real Claude calls
-# Usage: ./scripts/test-attribution-e2e.sh [--keep]
-#   --keep: Don't delete the test repo after running (for inspection)
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Store the CLI directory and build the binary fresh
-CLI_DIR="$(cd "$(dirname "$0")/.." && pwd)"
-echo -e "${BLUE}Building trace CLI from: $CLI_DIR${NC}"
-
-# Build binary to a temp directory and add it to PATH
-# This ensures BOTH our direct calls AND Claude's hook calls use the new binary
-TRACE_BIN_DIR=$(mktemp -d)
-TRACE_BIN="$TRACE_BIN_DIR/trace"
-if ! go build -o "$TRACE_BIN" "$CLI_DIR/cmd/trace"; then
-    echo -e "${RED}Failed to build trace CLI${NC}"
-    exit 1
-fi
-chmod +x "$TRACE_BIN"
-echo -e "${GREEN}Built: $TRACE_BIN${NC}"
-
-# Add the binary directory to PATH so Claude's hooks find it
-export PATH="$TRACE_BIN_DIR:$PATH"
-echo -e "${GREEN}Added to PATH: $TRACE_BIN_DIR${NC}"
-
-# Verify the right binary is being used
-echo -e "${BLUE}Verifying trace location:${NC} $(which trace)"
-
-KEEP_REPO=false
-if [[ "$1" == "--keep" ]]; then
-    KEEP_REPO=true
-fi
-
-# Create temp directory for test repo
-TEST_DIR=$(mktemp -d)
-echo -e "${BLUE}=== Creating test repo in: $TEST_DIR ===${NC}"
-
-cleanup() {
-    # Always clean up the temp binary directory
-    rm -rf "$TRACE_BIN_DIR"
-
-    if [[ "$KEEP_REPO" == "true" ]]; then
-        echo -e "${YELLOW}Keeping test repo at: $TEST_DIR${NC}"
-    else
-        echo -e "${BLUE}Cleaning up test repo...${NC}"
-        rm -rf "$TEST_DIR"
-    fi
-}
-trap cleanup EXIT
-
-cd "$TEST_DIR"
-
-# Initialize git repo
-echo -e "${BLUE}=== Step 1: Initialize git repo ===${NC}"
-git init
-git config user.email "test@example.com"
-git config user.name "Test User"
-
-# Create initial file and commit
-echo -e "${BLUE}=== Step 2: Create initial commit ===${NC}"
-cat > main.py << 'EOF'
-#!/usr/bin/env python3
-"""Main entry point."""
-
-def main():
-    print("Hello, World!")
-
-if __name__ == "__main__":
-    main()
-EOF
-git add main.py
-git commit -m "Initial commit"
-
-# Enable trace
-echo -e "${BLUE}=== Step 3: Enable trace ===${NC}"
-trace enable --strategy manual-commit
-
-# Commit the setup files to establish a clean baseline
-echo -e "${BLUE}=== Step 3b: Commit setup files (clean baseline) ===${NC}"
-git add .claude/ .trace/
-git commit -m "Setup trace tracking"
-echo -e "${GREEN}Baseline established - .claude/ and .trace/ are now committed${NC}"
-
-# Run first Claude prompt - have agent add a function
-echo -e "${BLUE}=== Step 4: Run first Claude prompt (agent adds random number function) ===${NC}"
-echo "Adding random number function via Claude..."
-claude --model haiku -p "Add a function called get_random_number() to main.py that returns a random integer between 1 and 100. Import random at the top. Don't modify anything else." --allowedTools Edit Read
-
-# Show what changed
-echo -e "${GREEN}Files after first prompt:${NC}"
-cat main.py
-echo ""
-
-# Show git status after first prompt
-echo -e "${BLUE}=== Step 5: Git status after first prompt ===${NC}"
-git status --short
-
-# User manually adds a new file (simulating user edits between prompts)
-echo -e "${BLUE}=== Step 6: User adds a new file (utils.py) ===${NC}"
-cat > utils.py << 'EOF'
-"""Utility functions."""
-
-def format_number(n):
-    """Format a number with commas."""
-    return f"{n:,}"
-EOF
-echo -e "${GREEN}User created utils.py:${NC}"
-cat utils.py
-echo ""
-
-# Run second Claude prompt - have agent modify the user's file
-echo -e "${BLUE}=== Step 7: Run second Claude prompt (agent updates user's file) ===${NC}"
-echo "Having Claude update the user-created utils.py..."
-claude --model haiku -p "Add a function called format_percentage(value) to utils.py that formats a decimal as a percentage string (e.g., 0.5 -> '50%'). Put it after the existing function." --allowedTools Edit Read
-
-# Show what changed
-echo -e "${GREEN}utils.py after second prompt:${NC}"
-cat utils.py
-echo ""
-
-# Show git status after second prompt
-echo -e "${BLUE}Git status after second prompt:${NC}"
-git status --short
-echo ""
-
-# User makes another edit to main.py (editing agent-touched file)
-echo -e "${BLUE}=== Step 8: User edits main.py (agent-touched file) ===${NC}"
-cat >> main.py << 'EOF'
-
-# User added this comment
-USER_VERSION = "1.0.0"
-EOF
-echo -e "${GREEN}main.py after user edit:${NC}"
-cat main.py
-echo ""
-
-# Check rewind points
-echo -e "${BLUE}=== Step 9: Check rewind points ===${NC}"
-trace rewind --list || true
-
-# Show session state (includes PromptAttributions for debugging)
-echo ""
-echo -e "${BLUE}Session state files:${NC}"
-GIT_DIR=$(git rev-parse --git-dir)
-if [[ -d "$GIT_DIR/trace-sessions" ]]; then
-    for f in "$GIT_DIR/trace-sessions"/*.json; do
-        if [[ -f "$f" ]]; then
-            echo -e "${GREEN}$f:${NC}"
-            jq . "$f" 2>/dev/null || cat "$f"
-        fi
-    done
-else
-    echo "(no session state directory)"
-fi
-echo ""
-
-# Show git status before commit
-echo ""
-echo -e "${BLUE}Git status before commit:${NC}"
-git status --short
-echo ""
-
-# Now commit and check attribution
-echo -e "${BLUE}=== Step 10: Stage and commit ===${NC}"
-git add -A
-git commit -m "Add random number and utility functions"
-
-# Show the commit with trailers
-echo -e "${GREEN}Commit details:${NC}"
-git log -1 --format=full
-
-# Check for Trace-Checkpoint trailer
-echo ""
-echo -e "${BLUE}=== Step 11: Check attribution in commit ===${NC}"
-CHECKPOINT_ID=$(git log -1 --format=%B | grep "Trace-Checkpoint:" | cut -d: -f2 | tr -d ' ')
-if [[ -n "$CHECKPOINT_ID" ]]; then
-    echo -e "${GREEN}Found Trace-Checkpoint: $CHECKPOINT_ID${NC}"
-
-    # Extract the sharded path: first 2 chars / remaining chars
-    SHARD_PREFIX="${CHECKPOINT_ID:0:2}"
-    SHARD_SUFFIX="${CHECKPOINT_ID:2}"
-    METADATA_PATH="${SHARD_PREFIX}/${SHARD_SUFFIX}/metadata.json"
-
-    echo ""
-    echo -e "${BLUE}=== Step 12: Inspect metadata on trace/checkpoints/v1 branch ===${NC}"
-    echo "Looking for metadata at: $METADATA_PATH"
-
-    # Read metadata.json from trace/checkpoints/v1 branch
-    if git show "trace/checkpoints/v1:${METADATA_PATH}" > /dev/null 2>&1; then
-        echo -e "${GREEN}Found metadata.json:${NC}"
-        git show "trace/checkpoints/v1:${METADATA_PATH}" | jq .
-
-        # Extract and display attribution specifically
-        echo ""
-        echo -e "${BLUE}=== Step 13: Attribution Analysis ===${NC}"
-        ATTRIBUTION=$(git show "trace/checkpoints/v1:${METADATA_PATH}" | jq -r '.initial_attribution // empty')
-        if [[ -n "$ATTRIBUTION" && "$ATTRIBUTION" != "null" ]]; then
-            echo -e "${GREEN}Attribution data:${NC}"
-            echo "$ATTRIBUTION" | jq .
-
-            # Extract key values
-            AGENT_LINES=$(echo "$ATTRIBUTION" | jq -r '.agent_lines')
-            HUMAN_ADDED=$(echo "$ATTRIBUTION" | jq -r '.human_added')
-            HUMAN_MODIFIED=$(echo "$ATTRIBUTION" | jq -r '.human_modified')
-            HUMAN_REMOVED=$(echo "$ATTRIBUTION" | jq -r '.human_removed')
-            TOTAL=$(echo "$ATTRIBUTION" | jq -r '.total_committed')
-            PERCENTAGE=$(echo "$ATTRIBUTION" | jq -r '.agent_percentage')
-
-            echo ""
-            echo -e "${GREEN}Summary:${NC}"
-            echo "  Agent lines:     $AGENT_LINES"
-            echo "  Human added:     $HUMAN_ADDED"
-            echo "  Human modified:  $HUMAN_MODIFIED"
-            echo "  Human removed:   $HUMAN_REMOVED"
-            echo "  Total committed: $TOTAL"
-            echo "  Agent %:         $PERCENTAGE"
-        else
-            echo -e "${YELLOW}No initial_attribution in metadata${NC}"
-            echo ""
-            echo -e "${BLUE}Checking debug logs for attribution issues:${NC}"
-            if [[ -d ".trace/logs" ]]; then
-                grep -i "attribution" .trace/logs/*.log 2>/dev/null | tail -30 || echo "(no attribution logs found)"
-            else
-                echo "(no .trace/logs directory)"
-            fi
-        fi
-
-        # Also show files_touched
-        echo ""
-        echo -e "${BLUE}Files touched (agent-modified):${NC}"
-        git show "trace/checkpoints/v1:${METADATA_PATH}" | jq -r '.files_touched[]?' 2>/dev/null || echo "(none)"
-
-        # Show prompt attributions from session state if available
-        echo ""
-        echo -e "${BLUE}=== Step 14: Check prompt attributions ===${NC}"
-        # List all files in the checkpoint directory
-        echo "Files in checkpoint directory:"
-        git ls-tree -r --name-only "trace/checkpoints/v1" | grep "^${SHARD_PREFIX}/${SHARD_SUFFIX}/" | head -20
-
-    else
-        echo -e "${RED}Could not find metadata at $METADATA_PATH${NC}"
-        echo "Checking what's on trace/checkpoints/v1 branch:"
-        git ls-tree -r --name-only "trace/checkpoints/v1" 2>/dev/null | head -20 || echo "(branch may not exist)"
-    fi
-else
-    echo -e "${YELLOW}No Trace-Checkpoint trailer found (user may have removed it)${NC}"
-fi
-
-# Show rewind points summary
-echo ""
-echo -e "${BLUE}=== Step 15: Rewind points summary ===${NC}"
-trace rewind --list | jq -r '.[] | "  \(.id[0:8])... - \(.message[0:60])"' 2>/dev/null || echo "  (no rewind points)"
-
-# Final summary
-echo ""
-echo -e "${GREEN}=== Test Complete ===${NC}"
-echo "Test repo location: $TEST_DIR"
-echo ""
-echo "What was tested:"
-echo "  1. Agent added get_random_number() to main.py"
-echo "  2. User created utils.py (non-agent file)"
-echo "  3. Agent modified utils.py (now agent-touched)"
-echo "  4. User edited main.py (agent-touched file)"
-echo "  5. Commit with attribution tracking"
-echo "  6. Metadata inspection on trace/checkpoints/v1 branch"
-echo ""
-echo "Expected attribution behavior:"
-echo "  - main.py: agent added lines, user added 2 lines after"
-echo "  - utils.py: user created (6 lines), agent added format_percentage()"
-echo "  - Agent % should reflect agent lines vs total new lines"
-echo ""
-if [[ "$KEEP_REPO" == "true" ]]; then
-    echo -e "${YELLOW}Repo kept for inspection. To clean up: rm -rf $TEST_DIR${NC}"
-    echo ""
-    echo "Useful inspection commands:"
-    echo "  cd $TEST_DIR"
-    echo "  git log trace/checkpoints/v1 --oneline"
-    echo "  git show trace/checkpoints/v1:<checkpoint-path>/metadata.json | jq ."
-fi
diff --git a/scripts/test-codex-agent-integration.sh b/scripts/test-codex-agent-integration.sh
deleted file mode 100755
index 8e8cc46..0000000
--- a/scripts/test-codex-agent-integration.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-AGENT_NAME="Codex"
-AGENT_SLUG="codex"
-AGENT_BIN="codex"
-PROBE_DIR=".trace/tmp/probe-${AGENT_SLUG}-$(date +%s)"
-
-# --- Colors ---
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m'
-
-pass() { echo -e "${GREEN}PASS${NC} $1"; }
-warn() { echo -e "${YELLOW}WARN${NC} $1"; }
-fail() { echo -e "${RED}FAIL${NC} $1"; }
-
-# --- Phase 1: Static Checks ---
-echo "=== Static Checks ==="
-
-if command -v "$AGENT_BIN" &>/dev/null; then
-    pass "Binary present: $(command -v "$AGENT_BIN")"
-else
-    fail "Binary not found: $AGENT_BIN"
-    exit 1
-fi
-
-VERSION=$("$AGENT_BIN" --version 2>&1 || true)
-if [ -n "$VERSION" ]; then
-    pass "Version: $VERSION"
-else
-    warn "Version info not available"
-fi
-
-HELP=$("$AGENT_BIN" --help 2>&1 || true)
-if [ -n "$HELP" ]; then
-    pass "Help output available"
-else
-    warn "No help output"
-fi
-
-if echo "$HELP" | grep -qi "hook\|lifecycle\|callback\|event"; then
-    pass "Hook keywords found in help"
-else
-    warn "No hook keywords in help (hooks are via hooks.json, not CLI flags)"
-fi
-
-if echo "$HELP" | grep -qi "session\|resume\|continue\|history\|transcript"; then
-    pass "Session keywords found in help"
-else
-    warn "No session keywords in help"
-fi
-
-CODEX_HOME="${CODEX_HOME:-$HOME/.codex}"
-if [ -d "$CODEX_HOME" ]; then
-    pass "Config directory: $CODEX_HOME"
-else
-    warn "Config directory not found: $CODEX_HOME"
-fi
-
-# --- Phase 2: Hook Wiring ---
-echo ""
-echo "=== Hook Wiring ==="
-
-mkdir -p "$PROBE_DIR/captures"
-
-# Create project-level hooks.json that captures all hook payloads
-HOOKS_DIR=".codex"
-HOOKS_FILE="$HOOKS_DIR/hooks.json"
-BACKUP_FILE=""
-
-if [ -f "$HOOKS_FILE" ]; then
-    BACKUP_FILE="$PROBE_DIR/hooks.json.backup"
-    cp "$HOOKS_FILE" "$BACKUP_FILE"
-    echo "Backed up existing $HOOKS_FILE to $BACKUP_FILE"
-fi
-
-mkdir -p "$HOOKS_DIR"
-
-CAPTURE_SCRIPT="$PROBE_DIR/capture-hook.sh"
-cat > "$CAPTURE_SCRIPT" <<'SCRIPT'
-#!/usr/bin/env bash
-EVENT_NAME="${1:-unknown}"
-PROBE_DIR="${2:-.trace/tmp/probe}"
-TIMESTAMP=$(date +%s%N)
-OUTFILE="$PROBE_DIR/captures/${EVENT_NAME}-${TIMESTAMP}.json"
-cat /dev/stdin > "$OUTFILE"
-echo "{}" # Empty valid JSON output
-SCRIPT
-chmod +x "$CAPTURE_SCRIPT"
-
-ABS_CAPTURE=$(cd "$(dirname "$CAPTURE_SCRIPT")" && pwd)/$(basename "$CAPTURE_SCRIPT")
-ABS_PROBE=$(cd "$PROBE_DIR" && pwd)
-
-cat > "$HOOKS_FILE" <<EOF
-{
-  "hooks": {
-    "SessionStart": [
-      {
-        "matcher": null,
-        "hooks": [
-          {
-            "type": "command",
-            "command": "$ABS_CAPTURE SessionStart $ABS_PROBE",
-            "timeout": 30
-          }
-        ]
-      }
-    ],
-    "UserPromptSubmit": [
-      {
-        "matcher": null,
-        "hooks": [
-          {
-            "type": "command",
-            "command": "$ABS_CAPTURE UserPromptSubmit $ABS_PROBE",
-            "timeout": 30
-          }
-        ]
-      }
-    ],
-    "Stop": [
-      {
-        "matcher": null,
-        "hooks": [
-          {
-            "type": "command",
-            "command": "$ABS_CAPTURE Stop $ABS_PROBE",
-            "timeout": 30
-          }
-        ]
-      }
-    ],
-    "PreToolUse": [
-      {
-        "matcher": null,
-        "hooks": [
-          {
-            "type": "command",
-            "command": "$ABS_CAPTURE PreToolUse $ABS_PROBE",
-            "timeout": 30
-          }
-        ]
-      }
-    ]
-  }
-}
-EOF
-
-echo "Created $HOOKS_FILE with capture hooks"
-
-# --- Phase 3: Run ---
-echo ""
-if [ "${1:-}" = "--run-cmd" ]; then
-    shift
-    echo "=== Automated Run ==="
-    echo "Running: $*"
-    eval "$@" || true
-    sleep 2
-elif [ "${1:-}" = "--manual-live" ]; then
-    echo "=== Manual Live Mode ==="
-    echo "Hooks are installed. Run codex manually in this directory."
-    echo "Try a prompt like: 'Create a file called hello.txt with the text Hello World'"
-    echo ""
-    echo "Press Enter when done..."
-    read -r
-else
-    echo "Usage: $0 [--run-cmd '<cmd>' | --manual-live]"
-    echo "  --run-cmd '<cmd>'  Run agent command automatically"
-    echo "  --manual-live      Interactive: run agent yourself, press Enter when done"
-fi
-
-# --- Phase 4: Capture Collection ---
-echo ""
-echo "=== Captured Payloads ==="
-
-CAPTURES=$(find "$PROBE_DIR/captures" -name "*.json" 2>/dev/null | sort || true)
-if [ -z "$CAPTURES" ]; then
-    warn "No payloads captured"
-else
-    for f in $CAPTURES; do
-        EVENT=$(basename "$f" | sed 's/-[0-9]*\.json//')
-        echo ""
-        echo "--- $EVENT ---"
-        echo "File: $f"
-        if command -v jq &>/dev/null; then
-            jq . "$f" 2>/dev/null || cat "$f"
-        else
-            cat "$f"
-        fi
-    done
-fi
-
-# --- Phase 5: Cleanup ---
-echo ""
-echo "=== Cleanup ==="
-
-if [ "${1:-}" != "--keep-config" ]; then
-    if [ -n "$BACKUP_FILE" ] && [ -f "$BACKUP_FILE" ]; then
-        cp "$BACKUP_FILE" "$HOOKS_FILE"
-        echo "Restored $HOOKS_FILE from backup"
-    else
-        rm -f "$HOOKS_FILE"
-        rmdir "$HOOKS_DIR" 2>/dev/null || true
-        echo "Removed $HOOKS_FILE"
-    fi
-fi
-
-# --- Phase 6: Verdict ---
-echo ""
-echo "=== Verdict ==="
-
-CAPTURED_EVENTS=$(find "$PROBE_DIR/captures" -name "*.json" 2>/dev/null | sed 's|.*/||; s/-[0-9]*\.json//' | sort -u || true)
-
-for event in SessionStart UserPromptSubmit Stop PreToolUse; do
-    if echo "$CAPTURED_EVENTS" | grep -q "^${event}$"; then
-        pass "$event: captured"
-    else
-        warn "$event: not captured (may need manual testing)"
-    fi
-done
-
-echo ""
-echo "Overall: COMPATIBLE"
-echo "Codex supports SessionStart, UserPromptSubmit, Stop hooks (merged)."
-echo "PreToolUse merged for shell/Bash only. PostToolUse in review."
-echo "No SessionEnd hook — handled by framework gracefully."
diff --git a/scripts/test-copilot-cli-agent-integration.sh b/scripts/test-copilot-cli-agent-integration.sh
deleted file mode 100755
index 9730180..0000000
--- a/scripts/test-copilot-cli-agent-integration.sh
+++ /dev/null
@@ -1,336 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Copilot CLI Agent Integration Probe Script
-# Tests hook mechanism and captures payloads for the Trace CLI integration.
-
-AGENT_NAME="Copilot CLI"
-AGENT_SLUG="copilot-cli"
-AGENT_BIN="copilot"
-PROBE_DIR=".trace/tmp/probe-${AGENT_SLUG}-$(date +%s)"
-HOOK_FILE=".github/hooks/trace-probe.json"
-KEEP_CONFIG=false
-MANUAL_LIVE=false
-RUN_CMD=""
-
-usage() {
-    cat <<EOF
-Usage: $0 [OPTIONS]
-
-Probe Copilot CLI hook mechanism and capture payloads.
-
-Options:
-    --run-cmd '<cmd>'   Automated: launch agent with given command, collect captures
-    --manual-live       Interactive: user runs agent manually, presses Enter when done
-    --keep-config       Don't remove probe hook config after completion
-    --help              Show this help message
-EOF
-}
-
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --run-cmd)
-            RUN_CMD="$2"
-            shift 2
-            ;;
-        --manual-live)
-            MANUAL_LIVE=true
-            shift
-            ;;
-        --keep-config)
-            KEEP_CONFIG=true
-            shift
-            ;;
-        --help)
-            usage
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $1"
-            usage
-            exit 1
-            ;;
-    esac
-done
-
-if [[ -z "$RUN_CMD" ]] && [[ "$MANUAL_LIVE" != "true" ]]; then
-    echo "Error: Specify --run-cmd '<cmd>' or --manual-live"
-    usage
-    exit 1
-fi
-
-# Colors
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[0;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-pass() { echo -e "${GREEN}PASS${NC} $1"; }
-warn() { echo -e "${YELLOW}WARN${NC} $1"; }
-fail() { echo -e "${RED}FAIL${NC} $1"; }
-info() { echo -e "${BLUE}INFO${NC} $1"; }
-
-echo "============================================"
-echo "  ${AGENT_NAME} Integration Probe"
-echo "============================================"
-echo ""
-
-# --- Phase 1: Static Checks ---
-echo "--- Static Checks ---"
-
-# Binary present
-if command -v "$AGENT_BIN" &>/dev/null; then
-    AGENT_PATH=$(command -v "$AGENT_BIN")
-    pass "Binary present: $AGENT_PATH"
-else
-    fail "Binary not found: $AGENT_BIN (blocker)"
-    exit 1
-fi
-
-# Version info
-VERSION=$("$AGENT_BIN" --version 2>/dev/null || echo "unknown")
-if [[ "$VERSION" != "unknown" ]]; then
-    pass "Version: $VERSION"
-else
-    warn "Could not determine version"
-fi
-
-# Help output
-if "$AGENT_BIN" --help &>/dev/null; then
-    pass "Help available"
-else
-    warn "Help not available"
-fi
-
-# Hook keywords in help
-HELP_OUTPUT=$("$AGENT_BIN" --help 2>&1 || true)
-HOOK_KEYWORDS=0
-for kw in hook lifecycle callback event trigger plugin extension; do
-    if echo "$HELP_OUTPUT" | grep -qi "$kw"; then
-        HOOK_KEYWORDS=$((HOOK_KEYWORDS + 1))
-    fi
-done
-if [[ $HOOK_KEYWORDS -gt 0 ]]; then
-    pass "Hook keywords found in help ($HOOK_KEYWORDS matches)"
-else
-    warn "No hook keywords found in help"
-fi
-
-# Session keywords
-SESSION_KEYWORDS=0
-for kw in session resume continue history transcript context; do
-    if echo "$HELP_OUTPUT" | grep -qi "$kw"; then
-        SESSION_KEYWORDS=$((SESSION_KEYWORDS + 1))
-    fi
-done
-if [[ $SESSION_KEYWORDS -gt 0 ]]; then
-    pass "Session keywords found in help ($SESSION_KEYWORDS matches)"
-else
-    warn "No session keywords found in help"
-fi
-
-# Config directory
-if [[ -d "$HOME/.copilot" ]]; then
-    pass "Config directory: ~/.copilot/"
-else
-    warn "Config directory ~/.copilot/ not found"
-fi
-
-echo ""
-
-# --- Phase 2: Hook Wiring ---
-echo "--- Hook Wiring ---"
-
-# Create capture directory
-mkdir -p "$PROBE_DIR/captures"
-info "Capture directory: $PROBE_DIR/captures/"
-
-# Determine absolute path for captures
-CAPTURE_DIR="$(cd "$PROBE_DIR/captures" && pwd)"
-
-# Create hook config that dumps stdin JSON to capture files
-mkdir -p .github/hooks
-
-# Build the hook config
-# Each hook captures its stdin payload to a timestamped file
-cat > "$HOOK_FILE" <<HOOKEOF
-{
-  "version": 1,
-  "hooks": {
-    "sessionStart": [
-      {
-        "type": "command",
-        "bash": "cat > '${CAPTURE_DIR}/sessionStart-\$(date +%s)-\$\$-\$RANDOM.json'",
-        "comment": "Trace CLI integration probe"
-      }
-    ],
-    "sessionEnd": [
-      {
-        "type": "command",
-        "bash": "cat > '${CAPTURE_DIR}/sessionEnd-\$(date +%s)-\$\$-\$RANDOM.json'",
-        "comment": "Trace CLI integration probe"
-      }
-    ],
-    "userPromptSubmitted": [
-      {
-        "type": "command",
-        "bash": "cat > '${CAPTURE_DIR}/userPromptSubmitted-\$(date +%s)-\$\$-\$RANDOM.json'",
-        "comment": "Trace CLI integration probe"
-      }
-    ],
-    "agentStop": [
-      {
-        "type": "command",
-        "bash": "cat > '${CAPTURE_DIR}/agentStop-\$(date +%s)-\$\$-\$RANDOM.json'",
-        "comment": "Trace CLI integration probe"
-      }
-    ],
-    "subagentStop": [
-      {
-        "type": "command",
-        "bash": "cat > '${CAPTURE_DIR}/subagentStop-\$(date +%s)-\$\$-\$RANDOM.json'",
-        "comment": "Trace CLI integration probe"
-      }
-    ],
-    "preToolUse": [
-      {
-        "type": "command",
-        "bash": "cat > '${CAPTURE_DIR}/preToolUse-\$(date +%s)-\$\$-\$RANDOM.json'",
-        "comment": "Trace CLI integration probe"
-      }
-    ],
-    "postToolUse": [
-      {
-        "type": "command",
-        "bash": "cat > '${CAPTURE_DIR}/postToolUse-\$(date +%s)-\$\$-\$RANDOM.json'",
-        "comment": "Trace CLI integration probe"
-      }
-    ],
-    "errorOccurred": [
-      {
-        "type": "command",
-        "bash": "cat > '${CAPTURE_DIR}/errorOccurred-\$(date +%s)-\$\$-\$RANDOM.json'",
-        "comment": "Trace CLI integration probe"
-      }
-    ]
-  }
-}
-HOOKEOF
-
-pass "Hook config written to $HOOK_FILE"
-echo ""
-
-# --- Phase 3: Run ---
-echo "--- Execution ---"
-
-if [[ "$MANUAL_LIVE" == "true" ]]; then
-    echo ""
-    echo "Manual live mode. Instructions:"
-    echo "  1. Open another terminal in this directory"
-    echo "  2. Run: copilot"
-    echo "  3. Send a prompt (e.g., 'create a file called hello.txt with hello world')"
-    echo "  4. Wait for the agent to complete"
-    echo "  5. Exit the agent (Ctrl+C or Ctrl+D)"
-    echo "  6. Come back here and press Enter"
-    echo ""
-    read -rp "Press Enter when the agent session is complete... "
-elif [[ -n "$RUN_CMD" ]]; then
-    info "Running: $RUN_CMD"
-    eval "$RUN_CMD" || true
-    info "Command completed"
-fi
-
-echo ""
-
-# --- Phase 4: Capture Collection ---
-echo "--- Captured Payloads ---"
-
-CAPTURE_COUNT=0
-for f in "$CAPTURE_DIR"/*.json; do
-    [[ -e "$f" ]] || continue
-    CAPTURE_COUNT=$((CAPTURE_COUNT + 1))
-    BASENAME=$(basename "$f")
-    EVENT_NAME="${BASENAME%%-*}"
-    echo ""
-    info "Event: $EVENT_NAME"
-    info "File: $f"
-    if command -v jq &>/dev/null; then
-        jq . "$f" 2>/dev/null || cat "$f"
-    else
-        cat "$f"
-    fi
-done
-
-if [[ $CAPTURE_COUNT -eq 0 ]]; then
-    warn "No payloads captured. Make sure the agent was run from this directory."
-fi
-
-echo ""
-echo "Total captures: $CAPTURE_COUNT"
-echo ""
-
-# --- Phase 5: Cleanup ---
-echo "--- Cleanup ---"
-
-if [[ "$KEEP_CONFIG" == "true" ]]; then
-    info "Keeping hook config at $HOOK_FILE (--keep-config)"
-else
-    rm -f "$HOOK_FILE"
-    # Remove .github/hooks/ if empty
-    rmdir .github/hooks 2>/dev/null || true
-    rmdir .github 2>/dev/null || true
-    pass "Removed probe hook config"
-fi
-
-echo ""
-
-# --- Phase 6: Verdict ---
-echo "--- Lifecycle Event Verdict ---"
-
-check_event() {
-    local event_name="$1"
-    local trace_event="$2"
-    local found=false
-    for f in "$CAPTURE_DIR"/${event_name}-*.json; do
-        [[ -e "$f" ]] && found=true && break
-    done
-    if $found; then
-        pass "$event_name → $trace_event"
-    else
-        warn "$event_name → $trace_event (not captured)"
-    fi
-}
-
-check_event "sessionStart" "SessionStart"
-check_event "userPromptSubmitted" "TurnStart"
-check_event "agentStop" "TurnEnd"
-check_event "sessionEnd" "SessionEnd"
-check_event "subagentStop" "SubagentEnd"
-check_event "preToolUse" "(pass-through)"
-check_event "postToolUse" "(pass-through)"
-check_event "errorOccurred" "(pass-through)"
-
-echo ""
-
-# Overall verdict
-REQUIRED_EVENTS=("sessionStart" "userPromptSubmitted" "agentStop" "sessionEnd")
-REQUIRED_FOUND=0
-for evt in "${REQUIRED_EVENTS[@]}"; do
-    for f in "$CAPTURE_DIR"/${evt}-*.json; do
-        [[ -e "$f" ]] && REQUIRED_FOUND=$((REQUIRED_FOUND + 1)) && break
-    done
-done
-
-echo "--- Overall Verdict ---"
-if [[ $REQUIRED_FOUND -eq ${#REQUIRED_EVENTS[@]} ]]; then
-    echo -e "${GREEN}COMPATIBLE${NC} — All 4 required lifecycle events captured"
-elif [[ $REQUIRED_FOUND -ge 2 ]]; then
-    echo -e "${YELLOW}PARTIAL${NC} — $REQUIRED_FOUND of ${#REQUIRED_EVENTS[@]} required events captured"
-else
-    echo -e "${RED}INCOMPATIBLE${NC} — Only $REQUIRED_FOUND of ${#REQUIRED_EVENTS[@]} required events captured"
-fi
-
-echo ""
-echo "Probe artifacts: $PROBE_DIR/"
-echo "Done."
diff --git a/scripts/test-copilot-token-metadata.sh b/scripts/test-copilot-token-metadata.sh
deleted file mode 100755
index 515cb53..0000000
--- a/scripts/test-copilot-token-metadata.sh
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-KEEP_TEMP=false
-
-usage() {
-    cat <<'EOF'
-Usage: scripts/test-copilot-token-metadata.sh [--keep-temp]
-
-Creates a disposable repo, drives a mock two-turn Copilot session through the real
-Trace hooks, and prints the resulting raw checkpoint metadata plus session state.
-
-Options:
-  --keep-temp   Keep the temp repo and mock Copilot session files for inspection
-  --help        Show this help text
-EOF
-}
-
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        --keep-temp)
-            KEEP_TEMP=true
-            shift
-            ;;
-        --help|-h)
-            usage
-            exit 0
-            ;;
-        *)
-            printf 'Unknown option: %s\n' "$1" >&2
-            usage >&2
-            exit 1
-            ;;
-    esac
-done
-
-if ! command -v jq >/dev/null 2>&1; then
-    printf 'jq is required\n' >&2
-    exit 1
-fi
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-TMP_DIR="$(mktemp -d "${TMPDIR:-/tmp}/trace-copilot-token-metadata.XXXXXX")"
-REPO_DIR="$TMP_DIR/repo"
-BIN_DIR="$TMP_DIR/bin"
-SESSION_ROOT="$TMP_DIR/copilot-sessions"
-SESSION_ID="mock-copilot-token-session"
-TRANSCRIPT_DIR="$SESSION_ROOT/$SESSION_ID"
-TRANSCRIPT="$TRANSCRIPT_DIR/events.jsonl"
-
-cleanup() {
-    if [[ "$KEEP_TEMP" == "true" ]]; then
-        printf 'Kept temp directory: %s\n' "$TMP_DIR"
-        return
-    fi
-    rm -rf "$TMP_DIR"
-}
-trap cleanup EXIT
-
-mkdir -p "$REPO_DIR" "$BIN_DIR" "$TRANSCRIPT_DIR"
-
-(cd "$ROOT_DIR" && GOCACHE="$TMP_DIR/go-build" go build -o "$BIN_DIR/trace" ./cmd/trace)
-
-export PATH="$BIN_DIR:$PATH"
-export COPILOT_PROJECT_DIR="$ROOT_DIR"
-export TRACE_TEST_COPILOT_SESSION_DIR="$SESSION_ROOT"
-export TRACE_TEST_TTY=1
-
-run_hook() {
-    local hook_name="$1"
-    local payload="$2"
-
-    printf '%s' "$payload" | trace hooks copilot-cli "$hook_name" >/dev/null
-}
-
-write_turn1_transcript() {
-    cat > "$TRANSCRIPT" <<EOF
-{"type":"session.start","data":{"sessionId":"$SESSION_ID"},"id":"1","timestamp":"2026-03-17T00:00:00Z","parentId":""}
-{"type":"session.model_change","data":{"newModel":"claude-sonnet-4.6"},"id":"2","timestamp":"2026-03-17T00:00:01Z","parentId":"1"}
-{"type":"user.message","data":{"content":"Create alpha.txt with alpha"},"id":"3","timestamp":"2026-03-17T00:00:02Z","parentId":""}
-{"type":"assistant.message","data":{"content":"Created alpha.txt","outputTokens":10},"id":"4","timestamp":"2026-03-17T00:00:03Z","parentId":"3"}
-{"type":"tool.execution_complete","data":{"toolCallId":"tool-1","model":"claude-sonnet-4.6","toolTelemetry":{"properties":{"filePaths":"[\\"alpha.txt\\"]"},"metrics":{"linesAdded":1,"linesRemoved":0}}},"id":"5","timestamp":"2026-03-17T00:00:04Z","parentId":"4"}
-EOF
-}
-
-write_turn2_transcript() {
-    cat > "$TRANSCRIPT" <<EOF
-{"type":"session.start","data":{"sessionId":"$SESSION_ID"},"id":"1","timestamp":"2026-03-17T00:00:00Z","parentId":""}
-{"type":"session.model_change","data":{"newModel":"claude-sonnet-4.6"},"id":"2","timestamp":"2026-03-17T00:00:01Z","parentId":"1"}
-{"type":"user.message","data":{"content":"Create alpha.txt with alpha"},"id":"3","timestamp":"2026-03-17T00:00:02Z","parentId":""}
-{"type":"assistant.message","data":{"content":"Created alpha.txt","outputTokens":10},"id":"4","timestamp":"2026-03-17T00:00:03Z","parentId":"3"}
-{"type":"tool.execution_complete","data":{"toolCallId":"tool-1","model":"claude-sonnet-4.6","toolTelemetry":{"properties":{"filePaths":"[\\"alpha.txt\\"]"},"metrics":{"linesAdded":1,"linesRemoved":0}}},"id":"5","timestamp":"2026-03-17T00:00:04Z","parentId":"4"}
-{"type":"user.message","data":{"content":"Create beta.txt with beta"},"id":"6","timestamp":"2026-03-17T00:00:05Z","parentId":""}
-{"type":"assistant.message","data":{"content":"Created beta.txt","outputTokens":25},"id":"7","timestamp":"2026-03-17T00:00:06Z","parentId":"6"}
-{"type":"tool.execution_complete","data":{"toolCallId":"tool-2","model":"claude-sonnet-4.6","toolTelemetry":{"properties":{"filePaths":"[\\"beta.txt\\"]"},"metrics":{"linesAdded":1,"linesRemoved":0}}},"id":"8","timestamp":"2026-03-17T00:00:07Z","parentId":"7"}
-{"type":"session.shutdown","data":{"modelMetrics":{"claude-sonnet-4.6":{"requests":{"count":2},"usage":{"inputTokens":500,"outputTokens":35,"cacheReadTokens":20,"cacheWriteTokens":10}}}},"id":"9","timestamp":"2026-03-17T00:00:08Z","parentId":""}
-EOF
-}
-
-checkpoint_metadata_json() {
-    local checkpoint_id="$1"
-    git show "trace/checkpoints/v1:${checkpoint_id:0:2}/${checkpoint_id:2}/0/metadata.json"
-}
-
-printf 'Working directory: %s\n' "$TMP_DIR"
-
-cd "$REPO_DIR"
-git init >/dev/null
-git config user.name "Trace Test"
-git config user.email "trace@graycode.ai"
-git config commit.gpgsign false
-printf '.trace/\n' > .gitignore
-printf 'start\n' > README.md
-git add .gitignore README.md
-git commit -m "init" >/dev/null
-git checkout -b feature/copilot-token-metadata >/dev/null
-
-trace enable --agent copilot-cli >/dev/null
-
-run_hook session-start "{\"timestamp\":1771480081383,\"cwd\":\"$REPO_DIR\",\"sessionId\":\"$SESSION_ID\",\"source\":\"new\",\"initialPrompt\":\"Create alpha.txt with alpha\"}"
-
-write_turn1_transcript
-run_hook user-prompt-submitted "{\"timestamp\":1771480081360,\"cwd\":\"$REPO_DIR\",\"sessionId\":\"$SESSION_ID\",\"prompt\":\"Create alpha.txt with alpha\"}"
-printf 'alpha\n' > alpha.txt
-run_hook agent-stop "{\"timestamp\":1771480085412,\"cwd\":\"$REPO_DIR\",\"sessionId\":\"$SESSION_ID\",\"transcriptPath\":\"$TRANSCRIPT\",\"stopReason\":\"end_turn\"}"
-git add alpha.txt
-git commit -m "Add alpha" >/dev/null
-CP1="$(git log -1 --format=%B | sed -n 's/^Trace-Checkpoint: //p' | tail -n1)"
-
-write_turn2_transcript
-run_hook user-prompt-submitted "{\"timestamp\":1771481081360,\"cwd\":\"$REPO_DIR\",\"sessionId\":\"$SESSION_ID\",\"prompt\":\"Create beta.txt with beta\"}"
-printf 'beta\n' > beta.txt
-run_hook agent-stop "{\"timestamp\":1771481085412,\"cwd\":\"$REPO_DIR\",\"sessionId\":\"$SESSION_ID\",\"transcriptPath\":\"$TRANSCRIPT\",\"stopReason\":\"end_turn\"}"
-git add beta.txt
-git commit -m "Add beta" >/dev/null
-CP2="$(git log -1 --format=%B | sed -n 's/^Trace-Checkpoint: //p' | tail -n1)"
-run_hook session-end "{\"timestamp\":1771481085425,\"cwd\":\"$REPO_DIR\",\"sessionId\":\"$SESSION_ID\",\"reason\":\"complete\"}"
-
-STATE_FILE="$REPO_DIR/.git/trace-sessions/$SESSION_ID.json"
-CP1_METADATA="$(checkpoint_metadata_json "$CP1")"
-CP2_METADATA="$(checkpoint_metadata_json "$CP2")"
-
-printf '\nCheckpoint 1: %s\n' "$CP1"
-printf '%s\n' "$CP1_METADATA" | jq .
-
-printf '\nCheckpoint 2: %s\n' "$CP2"
-printf '%s\n' "$CP2_METADATA" | jq .
-
-printf '\nSession state: %s\n' "$STATE_FILE"
-jq . "$STATE_FILE"
-
-jq -e '
-  .token_usage.input_tokens == 0 and
-  .token_usage.output_tokens == 10 and
-  .token_usage.cache_read_tokens == 0 and
-  .token_usage.cache_creation_tokens == 0 and
-  .token_usage.api_call_count == 1
-' <<<"$CP1_METADATA" >/dev/null
-
-jq -e '
-  .token_usage.input_tokens == 0 and
-  .token_usage.output_tokens == 25 and
-  .token_usage.cache_read_tokens == 0 and
-  .token_usage.cache_creation_tokens == 0 and
-  .token_usage.api_call_count == 1
-' <<<"$CP2_METADATA" >/dev/null
-
-jq -e '
-  .token_usage.input_tokens == 500 and
-  .token_usage.output_tokens == 35 and
-  .token_usage.cache_read_tokens == 20 and
-  .token_usage.cache_creation_tokens == 10 and
-  .token_usage.api_call_count == 2
-' "$STATE_FILE" >/dev/null
-
-printf '\nAssertions passed.\n'
-printf 'Checkpoint metadata stayed scoped while session state backfilled the full Copilot aggregate.\n'
diff --git a/scripts/trace-dev b/scripts/trace-dev
deleted file mode 100644
index ed2df46..0000000
--- a/scripts/trace-dev
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Entire CLI local-development hook launcher.
-#
-# In local-dev mode, Entire hooks invoke the CLI straight from source via
-# "go run", which recompiles on demand. When the tree does not compile (for
-# example while an agent is resolving a merge conflict) "go run" fails and the
-# hook would silently do nothing. This launcher first checks that the tree
-# builds; if it does it runs the freshly compiled CLI, otherwise it falls back
-# to an "entire" binary on PATH. If neither is available it exits 0 so it never
-# blocks the surrounding git or agent operation.
-#
-# Usage: scripts/entire-dev <entire args...>
-#
-# All local-dev hooks delegate here so the build-probe-and-fallback logic lives
-# in one place rather than being duplicated across generated hook commands.
-
-set -eu
-
-# Informational messages go to stderr so they never pollute hook stdout (some
-# hooks emit JSON there).
-log() {
-	printf '[entire-dev] %s\n' "$1" >&2
-}
-
-# Resolve the repository root from this script's own location so it works
-# regardless of the caller's working directory. Parameter expansion avoids
-# depending on external tools like dirname, which may not be on PATH when this
-# runs from a minimal hook environment.
-case "$0" in
-	*/*) script_dir=${0%/*} ;;
-	*) script_dir=. ;;
-esac
-root=$(CDPATH= cd -- "$script_dir/.." && pwd)
-main="$root/cmd/entire/main.go"
-
-# Run freshly compiled code when the tree builds. The build probe populates the
-# build cache, so the subsequent "go run" does not recompile from scratch.
-if command -v go >/dev/null 2>&1 && go build -o /dev/null "$main" >/dev/null 2>&1; then
-	exec go run "$main" "$@"
-fi
-
-# The tree does not build (or Go is unavailable): fall back to the installed
-# binary so hooks keep working while the source is broken.
-if command -v entire >/dev/null 2>&1; then
-	log "project isn't compiling; falling back to the entire binary on PATH"
-	exec entire "$@"
-fi
-
-# Nothing to run: do not block the surrounding operation.
-log "project isn't compiling and no entire binary on PATH; skipping hook"
-exit 0