codiedev 0.9.80 → 0.10.0-beta.10

package/dist/utils.js

@@ -64,12 +64,14 @@ exports.cursorInstalled = cursorInstalled;
 exports.copilotInstalled = copilotInstalled;
 exports.openCodeInstalled = openCodeInstalled;
 exports.installOpenCodeCapturePlugin = installOpenCodeCapturePlugin;
+exports.ensureOpenCodePluginCurrent = ensureOpenCodePluginCurrent;
 exports.piInstalled = piInstalled;
 exports.piExtensionSource = piExtensionSource;
 exports.installPiExtension = installPiExtension;
 exports.ensurePiExtensionInstalled = ensurePiExtensionInstalled;
 exports.vscodeCopilotInstalled = vscodeCopilotInstalled;
 exports.upsertCodiedevHook = upsertCodiedevHook;
+exports.removeCodiedevHook = removeCodiedevHook;
 exports.installHook = installHook;
 exports.ensureDiscoveryHookInstalled = ensureDiscoveryHookInstalled;
 exports.ensureBackupHookInstalled = ensureBackupHookInstalled;
@@ -167,18 +169,12 @@ function readConfig() {
 function writeConfig(config) {
     writeConfigAtPath(config, CONFIG_DIR, exports.CONFIG_PATH);
 }
-/** Exported for permission-focused tests; normal callers use writeConfig. */
 function writeConfigAtPath(config, configDir, configPath) {
     if (!fs.existsSync(configDir)) {
         fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
     }
-    // Temp file + rename: hooks read this file concurrently, and a torn read
-    // looks like "not connected". The temp file is created 0600.
     (0, cliSession_1.writeConfigAtomic)(configPath, config);
 }
-// Parse a remote URL out of git-config INI text WITHOUT invoking git. Prefers
-// the "origin" remote; falls back to the first remote found. Returns null if
-// there are no remote sections.
 function parseGitRemoteFromConfig(configText) {
     const remotes = {};
     let current = null;
@@ -190,8 +186,6 @@ function parseGitRemoteFromConfig(configText) {
             continue;
         }
         if (line.startsWith("[")) {
-            // Any other section header ends the current remote context, so a
-            // `url =` under e.g. [core] or [some-section] is never mistaken for one.
             current = null;
             continue;
         }
@@ -207,13 +201,8 @@ function parseGitRemoteFromConfig(configText) {
     const first = Object.values(remotes)[0];
     return first ?? null;
 }
-// Locate the git directory for `startDir`, walking up parent directories.
-// Handles a `.git` directory (normal repo), a `.git` FILE containing
-// `gitdir: <path>` (submodules, some devcontainer/worktree layouts), and stops
-// at the filesystem root. Returns the resolved git dir path, or null.
 function resolveGitDir(startDir) {
     let dir = path.resolve(startDir);
-    // eslint-disable-next-line no-constant-condition
     while (true) {
         const dotGit = path.join(dir, ".git");
         try {
@@ -229,7 +218,6 @@ function resolveGitDir(startDir) {
             }
         }
         catch {
-            // No .git here — keep walking up.
         }
         const parent = path.dirname(dir);
         if (parent === dir)
@@ -237,9 +225,6 @@ function resolveGitDir(startDir) {
         dir = parent;
     }
 }
-// Ordered list of config files that may hold the remotes for a git dir. Linked
-// worktrees keep their remotes in the COMMON (main) git dir, pointed at by a
-// `commondir` file, so we check that first, then the git dir's own config.
 function gitConfigCandidates(gitDir) {
     const candidates = [];
     try {
@@ -251,15 +236,10 @@ function gitConfigCandidates(gitDir) {
         }
     }
     catch {
-        // ignore — fall through to the plain config below
     }
     candidates.push(path.join(gitDir, "config"));
     return candidates;
 }
-// Resolve a repo's remote URL by reading .git/config directly — no `git`
-// binary required. This is the primary path so lean container images (Alpine
-// devcontainers without git) still capture sessions instead of silently
-// dropping them.
 function readGitRemoteFromConfig(startDir) {
     const gitDir = resolveGitDir(startDir);
     if (!gitDir)
@@ -271,20 +251,14 @@ function readGitRemoteFromConfig(startDir) {
                 return url;
         }
         catch {
-            // try the next candidate
         }
     }
     return null;
 }
 function getGitRemoteUrl(cwd) {
-    // Primary: read .git/config directly. Works even when the `git` binary is
-    // absent (lean Alpine/devcontainer images), which previously made the
-    // SessionEnd hook silently drop every session.
     const fromConfig = readGitRemoteFromConfig(cwd);
     if (fromConfig)
         return fromConfig;
-    // Fallback: ask git itself, for setups the direct read doesn't cover
-    // (insteadOf rewrites, includeIf'd remotes, unusual gitdir indirection).
     try {
         const url = (0, child_process_1.execSync)("git remote get-url origin", {
             cwd,
@@ -298,13 +272,6 @@ function getGitRemoteUrl(cwd) {
         return null;
     }
 }
-// Resolve the remote that tags the session's repo. The workspace root is the
-// primary source, but when the session was launched at a multi-repo WORKSPACE
-// root — a parent folder holding several cloned repos with `.devcontainer/` at
-// the top, which is not itself a git repo — the root has no remote, and tagging
-// used to silently produce repo-UNMATCHED sessions. Fall back to the worktrees
-// the session actually wrote to (resolveCaptureDirs order: most-recent first),
-// so the session tags the repo the work happened in.
 function resolveCaptureRemoteUrl(workspaceRoot, captureDirs, getRemote = getGitRemoteUrl) {
     const fromRoot = getRemote(workspaceRoot);
     if (fromRoot)
@@ -317,19 +284,14 @@ function resolveCaptureRemoteUrl(workspaceRoot, captureDirs, getRemote = getGitR
     return null;
 }
 function normalizeRepoUrl(url) {
-    // Normalize SSH (git@github.com:org/repo.git) and HTTPS (https://github.com/org/repo.git)
-    // to a comparable form: github.com/org/repo
     let normalized = url.trim();
-    // Strip trailing .git
     if (normalized.endsWith(".git")) {
         normalized = normalized.slice(0, -4);
     }
-    // Handle SSH format: git@github.com:org/repo → github.com/org/repo
     const sshMatch = normalized.match(/^git@([^:]+):(.+)$/);
     if (sshMatch) {
         return `${sshMatch[1]}/${sshMatch[2]}`;
     }
-    // Handle HTTPS format: https://github.com/org/repo → github.com/org/repo
     const httpsMatch = normalized.match(/^https?:\/\/(.+)$/);
     if (httpsMatch) {
         return httpsMatch[1];
@@ -341,11 +303,6 @@ function matchRepo(remoteUrl, repos) {
     for (const repo of repos) {
         const normalizedUrl = normalizeRepoUrl(repo.url);
         const normalizedName = repo.fullName.toLowerCase();
-        // Match the REMOTE against this repo: exact normalized URL, or the remote
-        // ending with this repo's full path (`owner/.../name`). Both are anchored to
-        // `normalizedRemote` — never compare a repo to ITSELF (the old third clause
-        // `normalizedUrl.endsWith('/'+name)` was remote-independent and returned the
-        // first repo for every session, collapsing all repos for multi-repo orgs).
         if (normalizedRemote === normalizedUrl ||
             normalizedRemote.endsWith(`/${normalizedName}`)) {
             return repo;
@@ -353,38 +310,11 @@ function matchRepo(remoteUrl, repos) {
     }
     return null;
 }
-// Resolve the directory to capture git branch/headSha from.
-//
-// The session→merge join keys must describe the work that becomes the PR. But
-// agents do that work in a `git worktree` (.claude/worktrees/<name> or a
-// sibling dir) on a feature branch, while the session's LAUNCH dir
-// (workspaceRoot) stays on main/detached — a feature branch checked out in a
-// worktree cannot also be checked out in the launch dir. Capturing from the
-// launch dir therefore recorded main/null, matching no PR (velocity starved).
-//
-// Fix: scan the transcript for the cwd the agent actually worked in — the
-// most-recent one that is a SEPARATE worktree (its resolved gitdir differs from
-// the launch root's; a worktree's gitdir is .git/worktrees/<name>, while the
-// root and its subdirs share .git). Fall back to the launch root when no
-// separate worktree was used (work done directly in the repo).
 function resolveCaptureDir(transcriptContent, workspaceRoot) {
     return resolveCaptureDirs(transcriptContent, workspaceRoot)[0] ?? workspaceRoot;
 }
-// Plural: EVERY separate worktree the session touched, most-recent first. One
-// session can produce multiple PRs (work across several worktrees, each on its
-// own feature branch); capturing every worktree's branch+sha lets all of those
-// PRs attribute. Falls back to [workspaceRoot] when no separate worktree was
-// used (work done directly in the repo).
 function resolveCaptureDirs(transcriptContent, workspaceRoot) {
     const rootGitDir = resolveGitDir(workspaceRoot);
-    // Collect the folders the session WROTE to (not merely referenced), in order:
-    //   - the session cwd
-    //   - `git -C <path>` of MUTATING git commands (commit/push/add/...) — NOT
-    //     read-only ones (log/status/diff), which would falsely credit a worktree
-    //     the session only inspected
-    //   - the dir of files edited via Edit/Write/NotebookEdit — NOT Read/Grep/Glob
-    // Reading/inspecting another worktree must not attribute its PRs to this
-    // session (that also corrupts the even cost-split).
     const candidates = [];
     const add = (p) => {
         if (!p)
@@ -399,7 +329,6 @@ function resolveCaptureDirs(transcriptContent, workspaceRoot) {
             entry = JSON.parse(line);
         }
         catch {
-            // partial/non-JSON line — best-effort: only mutating git -C, never files.
             for (const d of mutatingGitCDirs(line))
                 add(d);
             continue;
@@ -422,10 +351,6 @@ function resolveCaptureDirs(transcriptContent, workspaceRoot) {
             }
         }
     }
-    // Walk most-recent first; one entry per distinct worktree gitdir (a worktree's
-    // gitdir is .git/worktrees/<name>; the root and its subdirs share .git, so
-    // they're excluded as not-separate). Normalize each to its canonical worktree
-    // root so a file path / subdir resolves to the worktree dir itself.
     const out = [];
     const seenGitDirs = new Set();
     for (let i = candidates.length - 1; i >= 0; i--) {
@@ -439,10 +364,6 @@ function resolveCaptureDirs(transcriptContent, workspaceRoot) {
     }
     return out.length > 0 ? out : [workspaceRoot];
 }
-// Extract the `-C <path>` targets of MUTATING git commands in a shell string.
-// Splits on command separators and only takes a sub-command's -C path when that
-// sub-command runs a state-changing git verb — so `git -C x log` is ignored but
-// `git -C x commit`/`push`/`add` count.
 const MUTATING_GIT = /\b(?:commit|push|add|checkout|switch|merge|rebase|reset|restore|rm|mv|stash|apply|cherry-pick|am|tag|worktree)\b/;
 function mutatingGitCDirs(command) {
     const out = [];
@@ -456,8 +377,6 @@ function mutatingGitCDirs(command) {
     }
     return out;
 }
-// A linked worktree's gitdir (`.git/worktrees/<name>`) holds a `gitdir` file
-// pointing at the worktree's own `.git` file; its parent is the worktree root.
 function worktreeRootFromGitDir(gitDir) {
     try {
         const p = fs.readFileSync(path.join(gitDir, "gitdir"), "utf8").trim();
@@ -467,10 +386,6 @@ function worktreeRootFromGitDir(gitDir) {
         return null;
     }
 }
-// Turn the worktrees a session touched into the upload join keys: dedup'd
-// branch + headSha arrays (so one session → many PRs all attribute), plus the
-// primary single values (first entry) for back-compat with servers that read
-// only branch/headSha. getBranch/getSha are injectable for testing.
 function collectCaptureKeys(dirs, getBranch = getGitBranch, getSha = getGitHeadSha) {
     const branches = [];
     const headShas = [];
@@ -503,19 +418,12 @@ function collectCaptureGitRefs(dirs, getRemote = getGitRemoteUrl, getBranch = ge
     }
     return out;
 }
-// Exact PR/MR URLs are the strongest provenance the transcript can provide.
-// Both `gh pr create` and `glab mr create` print one, and the OpenCode capture
-// is normalized through the same parser as Claude Code. A direct URL survives
-// branch deletion, squash/rebase, cherry-picks, and SessionEnd happening after
-// the PR was opened.
 function parsePullRequestUrls(transcriptContent) {
     const out = [];
     const createToolIds = new Set();
     const isCreateCommand = (command) => {
         if (typeof command !== "string")
             return false;
-        // A combined `gh pr view || gh pr create` result is ambiguous: when the PR
-        // already exists, the VIEW half prints its URL and CREATE never runs.
         if (/\b(?:gh\s+pr\s+(?:view|list|status)|glab\s+mr\s+(?:view|list))\b/i.test(command)) {
             return false;
         }
@@ -539,7 +447,6 @@ function parsePullRequestUrls(transcriptContent) {
                     out.push(canonical);
             }
             catch {
-                // Malformed tool output is ignored; capture remains best-effort.
             }
         }
     };
@@ -577,7 +484,6 @@ function parsePullRequestUrls(transcriptContent) {
                     }
                 }
             }
-            // Codex function calls carry arguments as serialized JSON.
             if (entry?.type === "response_item"
                 && entry?.payload?.type === "function_call"
                 && typeof entry.payload.call_id === "string") {
@@ -586,7 +492,7 @@ function parsePullRequestUrls(transcriptContent) {
                     try {
                         args = JSON.parse(args);
                     }
-                    catch { /* leave as string */ }
+                    catch { }
                 }
                 if (isCreateCommand(args?.cmd ?? args?.command ?? args)) {
                     createToolIds.add(entry.payload.call_id);
@@ -594,13 +500,8 @@ function parsePullRequestUrls(transcriptContent) {
             }
         }
         catch {
-            // Never regex the raw line: prompts and assistant prose can contain a PR
-            // URL, but only actual tool output is provenance.
         }
     }
-    // Second pass: a URL is proof only when it came from the result of the
-    // specific gh/glab CREATE call above. `gh pr view/list` also prints URLs and
-    // must never claim somebody else's already-existing PR for this session.
     for (const entry of entries) {
         const content = entry?.message?.content;
         if (Array.isArray(content)) {
@@ -622,17 +523,11 @@ function parsePullRequestUrls(transcriptContent) {
     }
     return out;
 }
-// Pull the commit SHAs the agent actually authored/pushed straight out of the
-// transcript's git command OUTPUT — independent of end-of-session filesystem
-// state. Catches: commit output "[branch 4c4e790]", push ranges
-// "abc1234..def5678", and bare 40-hex (rev-parse). This is the signal that
-// rescues attribution when the worktree's HEAD is stale or the worktree is gone
-// at SessionEnd (pruned worktree, submodule pointer bump).
 function extractShaTokens(transcriptContent) {
     const out = new Set();
-    const commitRe = /\[[^\]\n]*?\b([0-9a-f]{7,40})\]/g; // [branch <sha>]
-    const rangeRe = /\b([0-9a-f]{7,40})\.\.([0-9a-f]{7,40})\b/g; // <sha>..<sha>
-    const fullRe = /\b([0-9a-f]{40})\b/g; // bare full sha (rev-parse)
+    const commitRe = /\[[^\]\n]*?\b([0-9a-f]{7,40})\]/g;
+    const rangeRe = /\b([0-9a-f]{7,40})\.\.([0-9a-f]{7,40})\b/g;
+    const fullRe = /\b([0-9a-f]{40})\b/g;
     let m;
     while ((m = commitRe.exec(transcriptContent)))
         out.add(m[1].toLowerCase());
@@ -644,17 +539,6 @@ function extractShaTokens(transcriptContent) {
         out.add(m[1].toLowerCase());
     return [...out];
 }
-// Pull the branch NAMES the agent actually committed/pushed to, straight out of
-// the transcript's git OUTPUT — the branch companion to extractShaTokens. This
-// is the rescue for the dominant capture miss: the agent works in a
-// `.claude/worktrees/<name>` worktree on branch `worktree-<name>`, commits/pushes
-// /PRs, then the worktree is REMOVED before SessionEnd. resolveCaptureDirs then
-// can't resolve the (deleted) worktree's git dir and falls back to the parent
-// dir, capturing the PARENT's branch — so the PR's sourceBranch matches no
-// captured session. The branch name survives in the commit line `[branch sha]`
-// and the push ref `<local> -> <remote>`, both of which prove authorship (a
-// read-only `git log` emits neither), so this stays mutation-scoped like the
-// SHA parse. Pure string parse — no filesystem, no server change.
 function parseAuthoredBranches(transcriptContent) {
     const out = [];
     const add = (b) => {
@@ -667,25 +551,12 @@ function parseAuthoredBranches(transcriptContent) {
         while ((m = re.exec(text)))
             add(m[1]);
     };
-    // From git OUTPUT (proof the work shipped on that branch):
-    //   commit: `[<branch> [(root-commit) ]<sha>]`. `[^\]\s]+` rejects "detached
-    //     HEAD" (the space breaks the token before the sha can match).
-    //   push:   `<sha>..<sha>  <local> -> <remote>` (updated) / `[new branch]
-    //     <local> -> <remote>` (created). Anchor on the push-ref shape so prose
-    //     arrows ("a -> b") don't match; capture the remote (= the PR
-    //     sourceBranch). `[^\s"]+` stops at the JSON string boundary.
     const commitRe = /\[([^\]\s]+)(?:\s+\(root-commit\))?\s+[0-9a-f]{7,40}\]/g;
     const pushRe = /(?:[0-9a-f]{7,40}\.\.[0-9a-f]{7,40}|\[new branch\])\s+\S+\s+->\s+([^\s"]+)/g;
-    // From CREATE commands (rescues work committed/pushed entirely OUTSIDE the
-    // session): only `checkout -b`/`switch -c` (branch CREATION — not plain
-    // checkout/switch navigation), and only from real Bash tool_use inputs, never
-    // prose/output, so a suggested command in assistant text can't false-match.
     const createRe = /\bgit\s+(?:checkout\s+-b|switch\s+-c)\s+([^\s"'&;|]+)/g;
     for (const line of transcriptContent.split("\n")) {
         if (!line.trim())
             continue;
-        // commit/push output: scan the raw serialized line (output lives in string
-        // fields); robust to non-JSON / partial lines.
         scan(line, commitRe);
         scan(line, pushRe);
         let entry;
@@ -706,11 +577,6 @@ function parseAuthoredBranches(transcriptContent) {
     }
     return out;
 }
-// Resolve the extracted tokens to FULL 40-char SHAs via the repo's shared object
-// store (a worktree's commits live in the main repo's .git/objects, so they
-// resolve even after the worktree dir is removed). Full SHAs pass through; short
-// ones are resolved; unresolvable ones are dropped (a short sha can't exact-
-// match the worker's full commitShas). Keeps the server-side match exact.
 function parseAuthoredShas(transcriptContent, repoRoot, resolveFullBatch = (shas) => defaultResolveFullShaBatch(shas, repoRoot)) {
     const out = new Set();
     const shorts = new Set();
@@ -729,14 +595,6 @@ function parseAuthoredShas(transcriptContent, repoRoot, resolveFullBatch = (shas
     }
     return [...out];
 }
-// Resolve many short SHAs to full in ONE git spawn via `git cat-file
-// --batch-check` (reads requests on stdin, emits one result line per request,
-// in order). The previous one-`git rev-parse`-per-sha approach cost N spawns;
-// on Windows (~50-150ms/spawn) a long session's transcript made the detached
-// capture child run for tens of seconds (measured 28s for 40 shas on a real
-// windows-latest runner) — fragile if the child is torn down before it
-// finishes. This is ~constant-time regardless of sha count. Missing objects
-// yield a "<req> missing" line and are skipped. Never throws.
 function defaultResolveFullShaBatch(shas, repoRoot) {
     const out = new Map();
     if (shas.length === 0)
@@ -749,8 +607,6 @@ function defaultResolveFullShaBatch(shas, repoRoot) {
             stdio: ["pipe", "pipe", "pipe"],
         }).toString();
         const lines = res.split("\n");
-        // One output line per input line, in order: "<full-sha> commit <size>" when
-        // resolved; "<request> missing" / "<request> ambiguous" otherwise.
         shas.forEach((sha, i) => {
             const parts = (lines[i] ?? "").trim().split(/\s+/);
             if (parts.length >= 2 && parts[1] === "commit" && /^[0-9a-f]{40}$/.test(parts[0])) {
@@ -759,14 +615,9 @@ function defaultResolveFullShaBatch(shas, repoRoot) {
         });
     }
     catch {
-        // best-effort — a git failure just means no shas resolve
     }
     return out;
 }
-// Current branch via direct .git/HEAD read (no git binary required, same
-// robustness as getGitRemoteUrl). Returns null on detached HEAD or when
-// unresolvable. This is the session→merge join key: a captured session's
-// branch is matched against a merged MR/PR's source_branch.
 function getGitBranch(cwd) {
     const gitDir = resolveGitDir(cwd);
     if (gitDir) {
@@ -775,10 +626,8 @@ function getGitBranch(cwd) {
             const m = head.match(/^ref:\s*refs\/heads\/(.+)$/);
             if (m)
                 return m[1].trim();
-            // raw sha => detached HEAD, no branch
         }
         catch {
-            // fall through to git
         }
     }
     try {
@@ -794,8 +643,6 @@ function getGitBranch(cwd) {
         return null;
     }
 }
-// Current commit SHA (HEAD), direct-read first then git fallback. Exact join
-// key — survives branch renames that branch-matching would miss.
 function getGitHeadSha(cwd) {
     const gitDir = resolveGitDir(cwd);
     if (gitDir) {
@@ -814,7 +661,6 @@ function getGitHeadSha(cwd) {
                             return sha.toLowerCase();
                     }
                     catch {
-                        /* try packed-refs */
                     }
                     try {
                         const packed = fs.readFileSync(path.join(baseDir, "packed-refs"), "utf8");
@@ -828,13 +674,11 @@ function getGitHeadSha(cwd) {
                         }
                     }
                     catch {
-                        /* ignore */
                     }
                 }
             }
         }
         catch {
-            // fall through to git
         }
     }
     try {
@@ -861,11 +705,11 @@ function buildCapturePayload(input) {
         companyId: input.companyId,
         branch: input.branch ?? "",
         headSha: input.headSha ?? "",
-        // Arrays omitted when empty so older servers (which ignore unknown keys)
-        // see no change; newer servers index the session under every key.
         branches: input.branches && input.branches.length ? input.branches : undefined,
         headShas: input.headShas && input.headShas.length ? input.headShas : undefined,
-        gitRefs: input.gitRefs && input.gitRefs.length ? input.gitRefs.map(ref => ({ ...ref, repoUrl: stripRepoUrlCredentials(ref.repoUrl) })) : undefined,
+        gitRefs: input.gitRefs && input.gitRefs.length
+            ? input.gitRefs.map((ref) => ({ ...ref, repoUrl: stripRepoUrlCredentials(ref.repoUrl) }))
+            : undefined,
         pullRequestUrls: input.pullRequestUrls && input.pullRequestUrls.length
             ? input.pullRequestUrls
             : undefined,
@@ -874,8 +718,6 @@ function buildCapturePayload(input) {
         toolCallCount: input.toolCallCount,
         capturedAt: input.capturedAt,
         source: input.source,
-        // New capture signals (cost / velocity / steering). Optional — omitted
-        // (undefined) keys drop out of the JSON body, so older servers ignore them.
         inputTokens: input.inputTokens,
         outputTokens: input.outputTokens,
         cacheTokens: input.cacheTokens,
@@ -887,7 +729,6 @@ function buildCapturePayload(input) {
         sessionStartedAt: input.sessionStartedAt ?? undefined,
         interruptCount: input.interruptCount,
         rejectionCount: input.rejectionCount,
-        // final is only emitted when explicitly set (not for Codex).
         final: input.final,
         costUsd: input.costUsd,
     };
@@ -913,9 +754,6 @@ const CURSOR_HOOKS_PATH = path.join(CURSOR_DIR, "hooks.json");
 const CURSOR_MCP_PATH = path.join(CURSOR_DIR, "mcp.json");
 const CURSOR_RULES_DIR = path.join(CURSOR_DIR, "rules");
 const CURSOR_RULES_PATH = path.join(CURSOR_RULES_DIR, "codiedev.mdc");
-// VS Code Copilot Chat: detected by the github.copilot* extension dir, then
-// MCP wired via VS Code's user-scope mcp.json (top-level key is "servers",
-// not "mcpServers" like Claude/Cursor).
 const VSCODE_EXTENSIONS_DIR = path.join(os.homedir(), ".vscode", "extensions");
 const VSCODE_USER_DIR = (() => {
     const home = os.homedir();
@@ -929,40 +767,17 @@ const VSCODE_USER_DIR = (() => {
     return path.join(home, ".config", "Code", "User");
 })();
 const VSCODE_USER_MCP_PATH = path.join(VSCODE_USER_DIR, "mcp.json");
-// GUI-launched agents (Cursor.app, future JetBrains plugins) don't source the
-// user's shell rc, so nvm-managed `npx` and `node` aren't on PATH. Resolve the
-// absolute path to the current node binary and our hook.js at install time and
-// write that into hook configs so execution doesn't depend on the spawned
-// shell's PATH. Falls back to `npx` if we can't resolve dist/hook.js.
 function shellQuote(s) {
     return `'${s.replace(/'/g, `'\\''`)}'`;
 }
-// Pull the `<node>` prefix out of a codiedev hook command we previously wrote.
-// Commands take the form `'<node>' '<hookScript>' <subcommand>` (each path
-// single-quoted by shellQuote). Returns undefined for the legacy
-// `npx codiedev-hook <subcommand>` form (no explicit node path) or if the
-// command doesn't start with a quoted token. Exported for unit testing.
 function extractHookNodePath(cmd) {
     if (!cmd)
         return undefined;
-    // Match the first single-quoted token, honoring shellQuote's `'\''` escape.
     const m = cmd.match(/^'((?:[^']|'\\'')*)'/);
     if (!m)
         return undefined;
     return m[1].replace(/'\\''/g, "'");
 }
-// `process.execPath` is the *resolved* path to the running node binary, so under
-// Homebrew it's the version-specific Cellar path (e.g.
-// /opt/homebrew/Cellar/node/26.4.0/bin/node). Baking that into the hook means a
-// later `brew upgrade node` moves the Cellar dir and the hook path 404s. Prefer
-// a stable alias for the *same* binary:
-//   1. A node path from a hook we previously wrote that still resolves — usually
-//      a symlink the user deliberately pinned (e.g. /opt/homebrew/bin/node). A
-//      re-`connect`/self-heal then honors it instead of clobbering it.
-//   2. Otherwise, `node` as found on PATH when it points at the binary we're
-//      running (the Homebrew symlink, an nvm `current` alias, etc.).
-//   3. Last resort: the resolved `process.execPath`. Always valid right now, and
-//      still an absolute path a GUI-launched agent can execute without PATH.
 function realpathOrSelf(p) {
     try {
         return fs.realpathSync(p);
@@ -971,13 +786,7 @@ function realpathOrSelf(p) {
         return p;
     }
 }
-// A stable `node` alias on PATH (Homebrew symlink, nvm `current`, …) that points
-// at the very binary we're running, or undefined if none. `installHook` writes
-// five hooks per run, so memoize: `command -v node` is a synchronous subprocess
-// spawn and its result can't change within a process. `null` = "looked, none".
 let cachedStableNodeOnPath;
-// Test-only: the memo lives for the process lifetime, so suites that stage
-// their own PATH/symlink fixtures must clear it between tests.
 function resetStableNodeCacheForTests() {
     cachedStableNodeOnPath = undefined;
 }
@@ -998,30 +807,21 @@ function stableNodeOnPath() {
         }
     }
     catch {
-        // No node on PATH (e.g. GUI-launched agent) — fall through.
     }
     cachedStableNodeOnPath = null;
     return undefined;
 }
 function resolveHookNodePath(preferredNodePath) {
     const execReal = realpathOrSelf(process.execPath);
-    // 1. Honor a still-working node path from the existing hook — but only when
-    //    it's a *different* string than the resolved realpath. If the existing
-    //    path already IS `process.execPath` it's the version-specific realpath we
-    //    want to upgrade away from (that's the Homebrew bug), so fall through to
-    //    hunt for a stable alias in step 2.
     if (preferredNodePath &&
         preferredNodePath !== process.execPath &&
         fs.existsSync(preferredNodePath) &&
         realpathOrSelf(preferredNodePath) === execReal) {
         return preferredNodePath;
     }
-    // 2. Prefer a stable `node` on PATH over the version-specific realpath.
     const onPath = stableNodeOnPath();
     if (onPath)
         return onPath;
-    // 3. Last resort: the resolved absolute path. Always valid right now, and
-    //    still an absolute path a GUI-launched agent can execute without PATH.
     return process.execPath;
 }
 function resolveHookInvocation(subcommand, preferredNodePath) {
@@ -1033,11 +833,7 @@ function resolveHookInvocation(subcommand, preferredNodePath) {
             const hookScript = path.join(distDir, "hook.js");
             if (fs.existsSync(hookScript)) {
                 const nodePath = resolveHookNodePath(preferredNodePath);
-                // Bake the stable launcher, not this install's path, so later
-                // upgrades (including pnpm's hashed dirs) never strand the hook.
                 const launcher = (0, launcher_1.ensureLauncher)(hookScript);
-                // No launcher and no stable install to point at (e.g. an npx cache under a bogus "~"):
-                // the npx fallback below beats baking a path that won't exist tomorrow.
                 if (launcher || (0, launcher_1.stableHookScript)(hookScript)) {
                     return { command: nodePath, args: [launcher ?? hookScript, subcommand] };
                 }
@@ -1045,7 +841,6 @@ function resolveHookInvocation(subcommand, preferredNodePath) {
         }
     }
     catch {
-        // Fall through to npx fallback.
     }
     return {
         command: process.platform === "win32" ? "npx.cmd" : "npx",
@@ -1057,8 +852,6 @@ function resolveHookCommand(subcommand, preferredNodePath) {
     const argsBeforeSubcommand = invocation.args.slice(0, -1).map(shellQuote);
     return [shellQuote(invocation.command), ...argsBeforeSubcommand, subcommand].join(" ");
 }
-// `isCodiedevHookCommand` is defined in `./detection` so it's testable
-// without mocking fs/path. Re-imported below; do not re-define here.
 function claudeBinOnPath() {
     try {
         (0, child_process_1.execSync)("command -v claude", { stdio: ["pipe", "pipe", "pipe"] });
@@ -1080,11 +873,6 @@ function codexInstalled() {
 function cursorInstalled() {
     return fs.existsSync(CURSOR_DIR);
 }
-/**
- * GitHub Copilot: `$COPILOT_HOME` / ~/.copilot (either surface has run once),
- * the `copilot` CLI on PATH, or VS Code's Copilot Chat extension. VS Code's
- * agent and the CLI read the same user hooks, so one install covers both.
- */
 function copilotInstalled() {
     if (fs.existsSync((0, copilotHooks_1.copilotHome)()))
         return true;
@@ -1109,13 +897,11 @@ function openCodeInstalled() {
         return false;
     }
 }
-/** Install a dormant global OpenCode adapter. Installing it unconditionally
- * keeps `codiedev connect` as the only setup step even when Codie/OpenCode is
- * installed later. OpenCode loads this file from its documented plugin dir. */
 function installOpenCodeCapturePlugin() {
     const start = resolveHookInvocation("session-start-opencode");
     const capture = resolveHookInvocation("capture-opencode");
     const finish = resolveHookInvocation("capture-opencode-final");
+    const backup = resolveHookInvocation("backup");
     const prompt = resolveHookInvocation("discover-codie");
     const source = `// Managed by codiedev connect. Safe to remove and reinstall.\n` +
         `import { spawn, spawnSync } from "node:child_process";\n` +
@@ -1124,12 +910,14 @@ function installOpenCodeCapturePlugin() {
         `import path from "node:path";\n\n` +
         `const START = ${JSON.stringify(start)};\n` +
         `const FINISH = ${JSON.stringify(finish)};\n` +
+        `const BACKUP = ${JSON.stringify(backup)};\n` +
         `const PROMPT = ${JSON.stringify(prompt)};\n` +
         `// How this Codie process was started (run / serve / tui). OpenCode records\n` +
         `// nothing about it, so the plugin reads its own argv; see launchContext.ts.\n` +
         `const LAUNCH = (() => { const sub = process.argv.slice(2).find((a) => ["run", "serve", "acp", "web", "attach"].includes(a)); return sub ? "codie:" + sub : "codie:tui"; })();\n` +
         `const fingerprints = new Map();\n\n` +
         `const transcriptPaths = new Map();\n\n` +
+        `const sessionDirectories = new Map();\n\n` +
         `function sessionId(event) {\n` +
         `  return event?.properties?.sessionID ?? event?.properties?.sessionId ?? event?.properties?.info?.id ?? null;\n` +
         `}\n\n` +
@@ -1151,9 +939,22 @@ function installOpenCodeCapturePlugin() {
         `  } catch { return null; }\n` +
         `}\n\n` +
         `export const CodiedevCapture = async ({ client, directory, worktree }) => {\n` +
+        `  const resolveCwd = async (id, hint) => {\n` +
+        `    if (typeof hint === "string" && hint && hint !== "/") { sessionDirectories.set(id, hint); return hint; }\n` +
+        `    const remembered = sessionDirectories.get(id);\n` +
+        `    if (remembered) return remembered;\n` +
+        `    try {\n` +
+        `      const response = await client.session.get({ path: { id } });\n` +
+        `      const session = response?.data ?? response;\n` +
+        `      if (typeof session?.directory === "string" && session.directory) { sessionDirectories.set(id, session.directory); return session.directory; }\n` +
+        `    } catch {}\n` +
+        `    const fallback = worktree || directory || process.cwd();\n` +
+        `    sessionDirectories.set(id, fallback);\n` +
+        `    return fallback;\n` +
+        `  };\n` +
         `  const finalizeAll = () => {\n` +
         `    for (const [id, transcriptPath] of transcriptPaths) {\n` +
-        `      const cwd = worktree || directory || process.cwd();\n` +
+        `      const cwd = sessionDirectories.get(id) || worktree || directory || process.cwd();\n` +
         `      dispatchSync(FINISH, { session_id: id, transcript_path: transcriptPath, cwd, workspace_roots: [cwd], launch: LAUNCH });\n` +
         `    }\n` +
         `  };\n` +
@@ -1161,7 +962,7 @@ function installOpenCodeCapturePlugin() {
         `  return ({\n` +
         `  "chat.message": async (input, output) => {\n` +
         `    const id = input?.sessionID ?? input?.sessionId ?? "unknown";\n` +
-        `    const cwd = worktree || directory || process.cwd();\n` +
+        `    const cwd = await resolveCwd(id);\n` +
         `    const prompt = Array.isArray(output?.parts) ? output.parts.filter((part) => part?.type === "text").map((part) => part.text || "").join("\\n") : "";\n` +
         `    const decision = invokeSync(PROMPT, { session_id: id, cwd, prompt });\n` +
         `    const context = decision?.hookSpecificOutput?.additionalContext;\n` +
@@ -1174,7 +975,7 @@ function installOpenCodeCapturePlugin() {
         `  event: async ({ event }) => {\n` +
         `    const id = sessionId(event);\n` +
         `    if (!id) return;\n` +
-        `    const cwd = worktree || directory || process.cwd();\n` +
+        `    const cwd = await resolveCwd(id, event?.properties?.info?.directory);\n` +
         `    if (event.type === "session.created") {\n` +
         `      dispatch(START, { session_id: id, cwd, workspace_roots: [cwd], launch: LAUNCH });\n` +
         `      return;\n` +
@@ -1183,6 +984,7 @@ function installOpenCodeCapturePlugin() {
         `      const transcriptPath = transcriptPaths.get(id);\n` +
         `      if (transcriptPath) dispatch(FINISH, { session_id: id, transcript_path: transcriptPath, cwd, workspace_roots: [cwd], launch: LAUNCH });\n` +
         `      transcriptPaths.delete(id);\n` +
+        `      sessionDirectories.delete(id);\n` +
         `      fingerprints.delete(id);\n` +
         `      return;\n` +
         `    }\n` +
@@ -1206,6 +1008,7 @@ function installOpenCodeCapturePlugin() {
         `      transcriptPaths.set(id, transcriptPath);\n` +
         `      fingerprints.set(id, fingerprint);\n` +
         `      dispatch(CAPTURE, { session_id: id, transcript_path: transcriptPath, cwd, workspace_roots: [cwd], launch: LAUNCH });\n` +
+        `      dispatch(BACKUP, { session_id: id, cwd, workspace_roots: [cwd], launch: LAUNCH });\n` +
         `    } catch {}\n` +
         `  },\n` +
         `  });\n` +
@@ -1214,6 +1017,16 @@ function installOpenCodeCapturePlugin() {
     fs.writeFileSync(OPENCODE_PLUGIN_PATH, source, { encoding: "utf8", mode: 0o600 });
     fs.chmodSync(OPENCODE_PLUGIN_PATH, 0o600);
 }
+function ensureOpenCodePluginCurrent() {
+    try {
+        if (!fs.existsSync(OPENCODE_PLUGIN_PATH))
+            return;
+        if (!fs.readFileSync(OPENCODE_PLUGIN_PATH, "utf8").includes("SECURITY_PRE"))
+            return;
+        installOpenCodeCapturePlugin();
+    }
+    catch { }
+}
 function piInstalled() {
     if (fs.existsSync((0, harnessDirs_1.piAgentDir)()))
         return true;
@@ -1225,29 +1038,17 @@ function piInstalled() {
         return false;
     }
 }
-/** Subcommands the pi extension calls, in the order inspectPiExtension checks. */
 exports.PI_EXTENSION_SUBCOMMANDS = [
     "session-start-pi", "backup-pi", "capture-pi-final", "discover-pi",
-    "security-pre-pi", "security-post-pi", "security-failure-pi",
 ];
-/**
- * pi has no hook config: it auto-loads TypeScript extensions from
- * <agentDir>/extensions/. This one forwards pi's events to the same hook
- * subcommands as every other harness. pi already writes the session JSONL, so
- * capture just hands its path over (no transcript dump like OpenCode's).
- */
-function piExtensionSource(agentSecurityEnabled) {
-    const [start, backup, finish, prompt, securityPre, securityPost, securityFailure] = exports.PI_EXTENSION_SUBCOMMANDS.map((subcommand) => resolveHookInvocation(subcommand));
+function piExtensionSource() {
+    const [start, backup, finish, prompt] = exports.PI_EXTENSION_SUBCOMMANDS.map((subcommand) => resolveHookInvocation(subcommand));
     return `// Managed by codiedev connect. Safe to remove; \`codiedev connect\` reinstalls it.\n` +
         `import { spawn, spawnSync } from "node:child_process";\n\n` +
         `const START = ${JSON.stringify(start)};\n` +
         `const FINISH = ${JSON.stringify(finish)};\n` +
         `const BACKUP = ${JSON.stringify(backup)};\n` +
         `const PROMPT = ${JSON.stringify(prompt)};\n` +
-        `const SECURITY_PRE = ${JSON.stringify(securityPre)};\n` +
-        `const SECURITY_POST = ${JSON.stringify(securityPost)};\n` +
-        `const SECURITY_FAILURE = ${JSON.stringify(securityFailure)};\n` +
-        `const AGENT_SECURITY_ENABLED = ${JSON.stringify(agentSecurityEnabled)};\n` +
         `const CONTEXT_TYPE = ${JSON.stringify(piHooks_1.PI_CONTEXT_CUSTOM_TYPE)};\n` +
         `const piLaunchFromArgv = ${piHooks_1.piLaunchFromArgv.toString()};\n` +
         `const LAUNCH = piLaunchFromArgv(process.argv.slice(2));\n\n` +
@@ -1268,14 +1069,6 @@ function piExtensionSource(agentSecurityEnabled) {
         `    return JSON.parse(result.stdout || "{}");\n` +
         `  } catch { return null; }\n` +
         `}\n\n` +
-        `function blockReason(decision) {\n` +
-        `  const denied = decision?.decision === "block" || decision?.hookSpecificOutput?.permissionDecision === "deny";\n` +
-        `  return denied ? (decision?.reason || decision?.hookSpecificOutput?.permissionDecisionReason || "Codie security policy blocked this action") : null;\n` +
-        `}\n\n` +
-        `function warn(ctx, reason) {\n` +
-        `  if (ctx?.hasUI) { try { ctx.ui.notify("Codie Security: " + reason, "error"); return; } catch {} }\n` +
-        `  process.stderr.write("\\nCodie Security blocked this action:\\n" + reason + "\\n");\n` +
-        `}\n\n` +
         `export default function codiedev(pi) {\n` +
         `  let session = null;\n` +
         `  let pendingContext = null;\n` +
@@ -1317,8 +1110,6 @@ function piExtensionSource(agentSecurityEnabled) {
         `    if (event?.source === "extension") return { action: "continue" };\n` +
         `    const s = current(ctx);\n` +
         `    const decision = invokeSync(PROMPT, { session_id: s.id, cwd: s.cwd, prompt: event?.text ?? "" });\n` +
-        `    const reason = blockReason(decision);\n` +
-        `    if (reason) { warn(ctx, reason); return { action: "handled" }; }\n` +
         `    pendingContext = decision?.hookSpecificOutput?.additionalContext || null;\n` +
         `    return { action: "continue" };\n` +
         `  });\n\n` +
@@ -1328,17 +1119,6 @@ function piExtensionSource(agentSecurityEnabled) {
         `    pendingContext = null;\n` +
         `    return { message: { customType: CONTEXT_TYPE, content, display: false } };\n` +
         `  });\n\n` +
-        `  pi.on("tool_call", async (event, ctx) => {\n` +
-        `    if (!AGENT_SECURITY_ENABLED) return;\n` +
-        `    const s = current(ctx);\n` +
-        `    const reason = blockReason(invokeSync(SECURITY_PRE, { sessionId: s.id, cwd: s.cwd, toolName: event.toolName, toolUseId: event.toolCallId, toolInput: event.input }));\n` +
-        `    if (reason) { warn(ctx, reason); return { block: true, reason }; }\n` +
-        `  });\n\n` +
-        `  pi.on("tool_result", async (event, ctx) => {\n` +
-        `    if (!AGENT_SECURITY_ENABLED) return;\n` +
-        `    const s = current(ctx);\n` +
-        `    dispatch(event.isError ? SECURITY_FAILURE : SECURITY_POST, { sessionId: s.id, cwd: s.cwd, toolName: event.toolName, toolUseId: event.toolCallId, toolInput: event.input, toolResponse: { content: event.content, isError: event.isError } });\n` +
-        `  });\n\n` +
         `  pi.on("agent_end", async (_event, ctx) => {\n` +
         `    const s = current(ctx);\n` +
         `    if (!s.id || !s.file) return;\n` +
@@ -1355,31 +1135,22 @@ function piExtensionSource(agentSecurityEnabled) {
         `  });\n` +
         `}\n`;
 }
-/** Install the pi extension. Unconditional like OpenCode's: pi installed
- * later still gets captured without re-running `codiedev connect`. This
- * release line has no Agent Security hooks, so security stays off. */
-function installPiExtension(agentSecurityEnabled = false) {
+function installPiExtension() {
     const target = (0, piHooks_1.piExtensionPath)();
     fs.mkdirSync(path.dirname(target), { recursive: true, mode: 0o700 });
     const tmp = `${target}.${process.pid}.tmp`;
-    fs.writeFileSync(tmp, piExtensionSource(agentSecurityEnabled), { encoding: "utf8", mode: 0o600 });
+    fs.writeFileSync(tmp, piExtensionSource(), { encoding: "utf8", mode: 0o600 });
     fs.renameSync(tmp, target);
 }
-/** Self-heal after an upgrade or drift, like Copilot's hook file. */
-function ensurePiExtensionInstalled(agentSecurityEnabled = false) {
+function ensurePiExtensionInstalled() {
     try {
         const file = (0, piHooks_1.piExtensionPath)();
-        if (fs.existsSync(file) && fs.readFileSync(file, "utf8") === piExtensionSource(agentSecurityEnabled))
+        if (fs.existsSync(file) && fs.readFileSync(file, "utf8") === piExtensionSource())
             return;
-        installPiExtension(agentSecurityEnabled);
+        installPiExtension();
     }
-    catch { /* best-effort */ }
+    catch { }
 }
-/**
- * VS Code with the GitHub Copilot Chat extension installed. The extension
- * directory pattern is `~/.vscode/extensions/github.copilot-chat-*`. We treat
- * the presence of any `github.copilot*` directory as the Copilot fingerprint.
- */
 function vscodeCopilotInstalled() {
     if (!fs.existsSync(VSCODE_EXTENSIONS_DIR))
         return false;
@@ -1392,19 +1163,10 @@ function vscodeCopilotInstalled() {
         return false;
     }
 }
-// Idempotently put a single codiedev hook (matcher ".*" by default, running our hook.js
-// with `subcommand`) into the given hook event, stripping any prior codiedev
-// entries first so connect re-runs / upgrades refresh the resolved binary path.
-// Mutates `hooks` in place. Exported for unit testing.
 function upsertCodiedevHook(hooks, eventName, subcommand, matcher = ".*") {
     if (!hooks[eventName])
         hooks[eventName] = [];
     const existing = hooks[eventName];
-    // Before stripping the old codiedev entry, remember the node path it used so a
-    // re-run/upgrade can honor a stable symlink the user pinned instead of
-    // overwriting it with the version-specific `process.execPath` (see
-    // resolveHookNodePath). Done in an explicit scan rather than as a side effect
-    // of the filter predicate below, which stays a pure predicate.
     let preservedNodePath;
     for (const hook of existing) {
         const inner = hook.hooks;
@@ -1429,6 +1191,35 @@ function upsertCodiedevHook(hooks, eventName, subcommand, matcher = ".*") {
     });
     hooks[eventName] = filtered;
 }
+function removeCodiedevHook(hooks, eventName) {
+    const entries = hooks[eventName];
+    if (!Array.isArray(entries))
+        return false;
+    let changed = false;
+    const filtered = entries.flatMap((entry) => {
+        const record = entry;
+        const inner = record.hooks;
+        if (!Array.isArray(inner))
+            return [record];
+        const remaining = inner.filter((hook) => {
+            const remove = (0, detection_1.isCodiedevHookCommand)(hook.command);
+            if (remove)
+                changed = true;
+            return !remove;
+        });
+        if (remaining.length === 0)
+            return [];
+        return [{ ...record, hooks: remaining }];
+    });
+    if (!changed)
+        return false;
+    if (filtered.length === 0)
+        delete hooks[eventName];
+    else
+        hooks[eventName] = filtered;
+    return true;
+}
+const RETIRED_SECURITY_TOOL_EVENTS = ["PreToolUse", "PostToolUse", "PostToolUseFailure"];
 function installHook() {
     let settings = {};
     try {
@@ -1438,36 +1229,27 @@ function installHook() {
         }
     }
     catch {
-        // Start with empty settings if file doesn't exist or is invalid
     }
     if (!settings.hooks) {
         settings.hooks = {};
     }
     const hooks = settings.hooks;
-    // SessionEnd → capture (upload the finished session for the team library).
     upsertCodiedevHook(hooks, "SessionEnd", "capture");
-    // UserPromptSubmit → discover (surface a matching team skill for the task).
+    for (const eventName of RETIRED_SECURITY_TOOL_EVENTS)
+        removeCodiedevHook(hooks, eventName);
     upsertCodiedevHook(hooks, "UserPromptSubmit", "discover");
-    // Stop → backup (auto-back-up changed artifact files to your private library).
     upsertCodiedevHook(hooks, "Stop", "backup");
-    // StopFailure (matcher rate_limit) → limit (post rate-limit event to the team).
     upsertCodiedevHook(hooks, "StopFailure", "limit", "rate_limit");
-    // SessionStart → session-start (capture-coverage denominator: record that a
-    // session opened, independent of whether it later captures).
     upsertCodiedevHook(hooks, "SessionStart", "session-start");
     if (!fs.existsSync(CLAUDE_DIR)) {
         fs.mkdirSync(CLAUDE_DIR, { recursive: true });
     }
     fs.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2), "utf8");
 }
-// Self-heal: ensure the discovery (UserPromptSubmit) hook is present without a
-// full `connect` re-run. Called from the capture hook on SessionEnd, so a user
-// who upgrades the CLI gets the new hook wired on their next session. Only
-// writes when missing, to avoid churning settings.json every run.
 function ensureDiscoveryHookInstalled() {
     try {
         if (!fs.existsSync(CLAUDE_SETTINGS_PATH))
-            return; // not a Claude Code user
+            return;
         const raw = fs.readFileSync(CLAUDE_SETTINGS_PATH, "utf8");
         const settings = JSON.parse(raw);
         const hooks = (settings.hooks ?? {});
@@ -1484,13 +1266,8 @@ function ensureDiscoveryHookInstalled() {
         fs.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2), "utf8");
     }
     catch {
-        // Best-effort — never block a session on self-heal.
     }
 }
-// Self-heal: ensure the Stop → backup hook is present without a full `connect`
-// re-run, mirroring ensureDiscoveryHookInstalled. Called from the capture hook
-// so an upgraded-but-not-reconnected user gets auto-backup on their next
-// session. Only writes when missing, to avoid churning settings.json every run.
 function ensureBackupHookInstalled() {
     try {
         if (!fs.existsSync(CLAUDE_SETTINGS_PATH))
@@ -1508,12 +1285,8 @@ function ensureBackupHookInstalled() {
         upsertCodiedevHook(hooks, "Stop", "backup");
         fs.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2), "utf8");
     }
-    catch { /* best-effort */ }
+    catch { }
 }
-// Self-heal: ensure the StopFailure (matcher rate_limit) → limit hook is
-// present without a full `connect` re-run, mirroring ensureBackupHookInstalled.
-// Called from the capture hook so an upgraded-but-not-reconnected user gets the
-// limit-event hook wired on their next session. Only writes when missing.
 function ensureLimitHookInstalled() {
     try {
         if (!fs.existsSync(CLAUDE_SETTINGS_PATH))
@@ -1531,26 +1304,12 @@ function ensureLimitHookInstalled() {
         upsertCodiedevHook(hooks, "StopFailure", "limit", "rate_limit");
         fs.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2), "utf8");
     }
-    catch { /* best-effort */ }
-}
-// Self-heal ALL codiedev hooks in one read → one write. This replaces calling
-// the four per-hook ensure* functions in sequence, and fixes two real losses
-// seen in the field (Sonifi, 2026-07):
-//   1. The SessionEnd → capture hook — the one that actually uploads sessions
-//      — had NO self-heal at all: it was written once at `connect` and never
-//      repaired. Anything that stripped it (IT-managed dotfiles baseline, the
-//      race below) left SessionStart pinging forever while captures silently
-//      stopped — the exact "start pings arrive, captures never" signature.
-//   2. Each per-hook ensure* did its own read-modify-write of settings.json
-//      with no locking; two concurrent Claude Code sessions repairing
-//      different hooks could lose each other's writes. One read + one write
-//      shrinks that window and removes the intra-process version entirely.
-// The per-hook ensure* functions below are kept for tests/back-compat but are
-// no longer called from the hook entrypoint.
+    catch { }
+}
 function ensureAllCodiedevHooksInstalled() {
     try {
         if (!fs.existsSync(CLAUDE_SETTINGS_PATH))
-            return; // not a Claude Code user
+            return;
         const settings = JSON.parse(fs.readFileSync(CLAUDE_SETTINGS_PATH, "utf8"));
         const hooks = (settings.hooks ?? {});
         const wanted = [
@@ -1560,9 +1319,13 @@ function ensureAllCodiedevHooksInstalled() {
             ["StopFailure", "limit", "rate_limit"],
             ["SessionStart", "session-start"],
         ];
+        let changed = false;
+        for (const eventName of RETIRED_SECURITY_TOOL_EVENTS) {
+            changed = removeCodiedevHook(hooks, eventName) || changed;
+        }
         const missing = wanted.filter(([eventName]) => !hasCodiedevHook(hooks, eventName));
-        if (missing.length === 0)
-            return; // steady state: no write, no churn
+        if (missing.length === 0 && !changed)
+            return;
         settings.hooks = hooks;
         for (const [eventName, subcommand, matcher] of missing) {
             upsertCodiedevHook(hooks, eventName, subcommand, matcher);
@@ -1570,33 +1333,23 @@ function ensureAllCodiedevHooksInstalled() {
         fs.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2), "utf8");
     }
     catch {
-        // Best-effort — never block a session on self-heal.
     }
 }
-// Matches a hook config that bakes an install's own dist/hook.js rather than
-// the stable launcher (see launcher.ts). Runs on raw file text, where JSON
-// doubles Windows separators (codiedev\\dist\\hook.js), hence `+`.
 const DIRECT_HOOK_PATH = /codiedev[^"'\s/\\]*[\\/]+dist[\\/]+hook\.js/;
-/** Exported for unit testing. */
 function hasDirectHookPath(configText) {
     return DIRECT_HOOK_PATH.test(configText);
 }
-// Move configs written before the launcher existed onto it, by re-running each
-// harness's own installer (which, for Codex, also re-trusts the new commands).
-// Only harnesses that already carry a direct-path codiedev hook are touched,
-// each in isolation. Bails when the launcher can't be written, so a read-only
-// state dir doesn't rewrite every config on every hook call.
 function migrateHooksToLauncher() {
     const probe = resolveHookInvocation("session-start");
     if (!(0, launcher_1.usesLauncher)(probe.args[0]))
         return [];
     const targets = [
-        ["claude-code", CLAUDE_SETTINGS_PATH, installHook],
-        ["codex", CODEX_HOOKS_PATH, installCodexHook],
-        ["cursor", CURSOR_HOOKS_PATH, installCursorHook],
-        ["copilot", copilotHooksPath(), installCopilotHook],
-        ["opencode", OPENCODE_PLUGIN_PATH, installOpenCodeCapturePlugin],
-        ["pi", (0, piHooks_1.piExtensionPath)(), installPiExtension],
+        ["claude-code", CLAUDE_SETTINGS_PATH, () => installHook()],
+        ["codex", CODEX_HOOKS_PATH, () => installCodexHook()],
+        ["cursor", CURSOR_HOOKS_PATH, () => installCursorHook()],
+        ["copilot", copilotHooksPath(), () => installCopilotHook()],
+        ["opencode", OPENCODE_PLUGIN_PATH, () => installOpenCodeCapturePlugin()],
+        ["pi", (0, piHooks_1.piExtensionPath)(), () => installPiExtension()],
     ];
     const migrated = [];
     for (const [name, file, install] of targets) {
@@ -1607,18 +1360,12 @@ function migrateHooksToLauncher() {
             migrated.push(name);
         }
         catch {
-            // Best-effort per harness; the next direct-path hook call retries.
         }
     }
     return migrated;
 }
 function hasCodiedevHook(hooks, eventName) {
     const entries = hooks[eventName] ?? [];
-    // A malformed (non-array) event value would make `.some` throw and — under
-    // ensureAll's single try/catch — abort EVERY heal, including the capture
-    // heal. Report "present" instead: leave the foreign/corrupt key alone and
-    // keep healing the other events (the per-hook fault isolation the old
-    // ensure* functions had).
     if (!Array.isArray(entries))
         return true;
     return entries.some((hook) => {
@@ -1627,10 +1374,6 @@ function hasCodiedevHook(hooks, eventName) {
             inner.some((h) => (0, detection_1.isCodiedevHookCommand)(h.command)));
     });
 }
-// Self-heal: ensure the SessionStart → session-start hook is present without a
-// full `connect` re-run, mirroring ensureLimitHookInstalled. Called from the
-// capture hook so an upgraded-but-not-reconnected user starts emitting the
-// capture-coverage denominator on their next session. Only writes when missing.
 function ensureSessionStartHookInstalled() {
     try {
         if (!fs.existsSync(CLAUDE_SETTINGS_PATH))
@@ -1648,12 +1391,8 @@ function ensureSessionStartHookInstalled() {
         upsertCodiedevHook(hooks, "SessionStart", "session-start");
         fs.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2), "utf8");
     }
-    catch { /* best-effort */ }
+    catch { }
 }
-// ─────────────────────────────────────────────────────────────────────────────
-// MCP server installation — writes the codiedev MCP server config into each
-// agent CLI's expected location so "npx codiedev connect" wires it up once.
-// ─────────────────────────────────────────────────────────────────────────────
 const CLAUDE_USER_CONFIG_PATH = (0, harnessDirs_1.claudeUserConfigPath)();
 const CLAUDE_USER_INSTRUCTIONS_PATH = path.join((0, harnessDirs_1.claudeConfigDir)(), "CLAUDE.md");
 const CODEX_USER_INSTRUCTIONS_PATH = path.join((0, harnessDirs_1.codexHome)(), "AGENTS.md");
@@ -1668,6 +1407,11 @@ decisions, and messages via a CLI on every dev's machine.
 **When the user asks to share, push, ping, check messages, or capture a
 thought, use the \`codiedev\` CLI via Bash:**
 
+If \`codiedev\` is not on PATH, run the same subcommand with
+\`npx codiedev@latest\` instead (for example,
+\`npx codiedev@latest inbox\`). The \`connect\` command installs hooks
+but does not install a global \`codiedev\` executable.
+
 | Intent | Command |
 |---|---|
 | "push this spec" / "save this as a skill" | \`codiedev push <file.md>\` |
@@ -1736,12 +1480,6 @@ Tell the user the portal URL when the submit returns.
   API token from https://codiedev.com/portal/integrations/claude-code
 - "ambiguous recipient" → surface candidates to the user
 `;
-/**
- * Write the codiedev agent-facing docs block to the user-level Claude
- * instructions file so Claude Code picks up the commands in every session
- * (no per-repo CLAUDE.md needed). Idempotent — replaces the existing block
- * between its begin/end markers on re-run.
- */
 function writeInstructionsBlock(targetPath, body = CODIEDEV_INSTRUCTIONS_BODY) {
     const dir = path.dirname(targetPath);
     if (!fs.existsSync(dir)) {
@@ -1758,14 +1496,12 @@ function writeInstructionsBlock(targetPath, body = CODIEDEV_INSTRUCTIONS_BODY) {
     const endIdx = existing.indexOf(CODIEDEV_INSTRUCTIONS_END);
     let next;
     if (beginIdx !== -1 && endIdx !== -1 && endIdx > beginIdx) {
-        // Replace the existing block in place.
         next =
             existing.slice(0, beginIdx) +
                 block +
                 existing.slice(endIdx + CODIEDEV_INSTRUCTIONS_END.length);
     }
     else if (existing.trim()) {
-        // Append with a blank-line separator.
         next = existing.replace(/\n*$/, "\n\n") + block;
     }
     else {
@@ -1782,20 +1518,15 @@ function installCodexInstructions() {
 function copilotInstructionsPath() {
     return path.join((0, copilotHooks_1.copilotHome)(), "copilot-instructions.md");
 }
-/** pi's global context file, loaded into every session's system prompt. */
 function piInstructionsPath() {
     return path.join((0, harnessDirs_1.piAgentDir)(), "AGENTS.md");
 }
-/** pi has no session-start output channel, so team skill context rides in
- * AGENTS.md the way it does for Copilot. */
 function installPiInstructions() {
     writeInstructionsBlock(piInstructionsPath(), `${teamSkillContext_1.TEAM_SKILL_CONTEXT}\n\n${CODIEDEV_INSTRUCTIONS_BODY}`);
 }
 function installCopilotInstructions() {
     writeInstructionsBlock(copilotInstructionsPath(), `${teamSkillContext_1.TEAM_SKILL_CONTEXT}\n\n${CODIEDEV_INSTRUCTIONS_BODY}`);
 }
-// Cursor uses .mdc rule files with YAML frontmatter (description, alwaysApply,
-// globs). `.cursorrules` is deprecated and ignored by Agent mode as of 2026.
 const CURSOR_INSTRUCTIONS_FRONTMATTER = `---
 description: Codiedev team artifact layer — push, pull, search, ping, and share artifacts with teammates
 alwaysApply: true
@@ -1817,8 +1548,6 @@ function installCursorInstructions() {
     if (fs.existsSync(CURSOR_RULES_PATH)) {
         existing = fs.readFileSync(CURSOR_RULES_PATH, "utf8");
     }
-    // If the file already has our markers, replace just the block — preserve
-    // any frontmatter edits the user made.
     const beginIdx = existing.indexOf(CODIEDEV_INSTRUCTIONS_BEGIN);
     const endIdx = existing.indexOf(CODIEDEV_INSTRUCTIONS_END);
     let next;
@@ -1847,13 +1576,6 @@ function installedInstructionsTargets() {
         { path: piInstructionsPath(), body: withTeamContext },
     ];
 }
-/**
- * Re-render the codiedev block in every instructions file that already has
- * one, so an upgrade (background self-update or a manual `npm i`) stops
- * teaching retired commands without the user re-running `connect`. Never
- * creates a file or adds a block: a user who deleted it, or never connected
- * that harness, is left alone. Returns the paths it rewrote.
- */
 function refreshInstalledInstructions(targets = installedInstructionsTargets()) {
     const refreshed = [];
     for (const target of targets) {
@@ -1872,7 +1594,6 @@ function refreshInstalledInstructions(targets = installedInstructionsTargets())
             refreshed.push(target.path);
         }
         catch {
-            // Missing or unreadable file: nothing of ours to refresh.
         }
     }
     return refreshed;
@@ -1893,10 +1614,6 @@ function readMcpConfigSafely(path) {
         return {};
     }
 }
-/**
- * Install the Codiedev MCP server into Claude Code's user-scope config.
- * Safe to call multiple times — updates the existing entry if present.
- */
 function installClaudeCodeMcp() {
     const config = readMcpConfigSafely(CLAUDE_USER_CONFIG_PATH);
     const mcpServers = config.mcpServers ?? {};
@@ -1909,12 +1626,6 @@ function installClaudeCodeMcp() {
     config.mcpServers = mcpServers;
     fs.writeFileSync(CLAUDE_USER_CONFIG_PATH, JSON.stringify(config, null, 2), "utf8");
 }
-/**
- * Install the Codiedev MCP server into Cursor's user-scope config.
- * Cursor uses the same `mcpServers` schema as Claude Code; just a different
- * file path (~/.cursor/mcp.json). Project-scoped servers can also live at
- * <project>/.cursor/mcp.json — we only manage the user-scope one.
- */
 function installCursorMcp() {
     if (!fs.existsSync(CURSOR_DIR)) {
         fs.mkdirSync(CURSOR_DIR, { recursive: true });
@@ -1930,13 +1641,6 @@ function installCursorMcp() {
     config.mcpServers = mcpServers;
     fs.writeFileSync(CURSOR_MCP_PATH, JSON.stringify(config, null, 2), "utf8");
 }
-/**
- * Install the Codiedev MCP server into VS Code's user-scope MCP config so
- * GitHub Copilot Chat picks it up. VS Code uses a different schema than
- * Claude / Cursor: top-level key is `servers` (not `mcpServers`). On first
- * Copilot Chat run after install, VS Code prompts the user to trust the
- * server — that's expected and documented in the connect success message.
- */
 function installVSCodeMcp() {
     if (!fs.existsSync(VSCODE_USER_DIR)) {
         fs.mkdirSync(VSCODE_USER_DIR, { recursive: true });
@@ -1953,14 +1657,6 @@ function installVSCodeMcp() {
     config.servers = servers;
     fs.writeFileSync(VSCODE_USER_MCP_PATH, JSON.stringify(config, null, 2), "utf8");
 }
-// ─────────────────────────────────────────────────────────────────────────────
-// Migration cleanup — strips MCP server entries written by pre-CLI-only
-// versions of `codiedev connect`. Those entries pointed at `npx codiedev-mcp`,
-// a binary that was removed from package.json in 0.3.4. Without these
-// cleanups, customers who upgrade to 0.7.11+ keep seeing "MCP server failed
-// to start" errors in their agent UIs even though the CLI works fine.
-// All cleanup helpers are idempotent and safe to run when no entry exists.
-// ─────────────────────────────────────────────────────────────────────────────
 function removeJsonKey(filePath, parentKey) {
     if (!fs.existsSync(filePath))
         return;
@@ -1969,7 +1665,7 @@ function removeJsonKey(filePath, parentKey) {
         parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
     }
     catch {
-        return; // Don't damage a file we can't parse.
+        return;
     }
     const parent = parsed[parentKey];
     if (!parent || typeof parent !== "object")
@@ -1979,33 +1675,15 @@ function removeJsonKey(filePath, parentKey) {
     delete parent.codiedev;
     fs.writeFileSync(filePath, JSON.stringify(parsed, null, 2), "utf8");
 }
-/**
- * Removes `mcpServers.codiedev` from `~/.claude.json` if present. Leaves
- * other MCP servers and unrelated top-level settings untouched.
- */
 function cleanupClaudeCodeMcp() {
     removeJsonKey(CLAUDE_USER_CONFIG_PATH, "mcpServers");
 }
-/**
- * Removes `mcpServers.codiedev` from `~/.cursor/mcp.json` if present.
- */
 function cleanupCursorMcp() {
     removeJsonKey(CURSOR_MCP_PATH, "mcpServers");
 }
-/**
- * Removes `servers.codiedev` from VS Code's user-scope mcp.json. VS Code
- * uses a different schema (`servers` not `mcpServers`), so this is a
- * separate helper.
- */
 function cleanupVSCodeMcp() {
     removeJsonKey(VSCODE_USER_MCP_PATH, "servers");
 }
-/**
- * Removes the `# codiedev-mcp` block from `~/.codex/config.toml`. The
- * install side appends a well-marked block; we strip it the same way —
- * the marker line through the end of its TOML section. Whitespace-only
- * gaps between sections are preserved.
- */
 function cleanupCodexMcp() {
     if (!fs.existsSync(CODEX_CONFIG_PATH))
         return;
@@ -2022,31 +1700,22 @@ function cleanupCodexMcp() {
             continue;
         }
         if (skipping) {
-            // Stay in skip mode through the [mcp_servers.codiedev] block until
-            // we hit a blank line or a different TOML section header.
             const trimmed = line.trim();
             if (trimmed === "") {
                 skipping = false;
-                continue; // also drop the blank that immediately follows the block
+                continue;
             }
             if (trimmed.startsWith("[") && !trimmed.startsWith("[mcp_servers.codiedev")) {
                 skipping = false;
                 out.push(line);
                 continue;
             }
-            // Skip lines belonging to the codiedev block.
             continue;
         }
         out.push(line);
     }
     fs.writeFileSync(CODEX_CONFIG_PATH, out.join("\n"), "utf8");
 }
-/**
- * Best-effort append of the Codiedev MCP server block to ~/.codex/config.toml.
- *
- * Codex uses TOML and we don't want a full parser for such a small addition,
- * so we append a well-marked block if one isn't already present. Idempotent.
- */
 function installCodexMcp() {
     if (!fs.existsSync(CODEX_DIR)) {
         fs.mkdirSync(CODEX_DIR, { recursive: true });
@@ -2069,9 +1738,6 @@ function installCodexMcp() {
     fs.writeFileSync(CODEX_CONFIG_PATH, existing + block, "utf8");
     return true;
 }
-// Codex doesn't have a SessionEnd event yet — Stop fires after every turn.
-// The backend dedupes on (companyId, sessionId) and replaces the stored
-// transcript on re-upload, so the latest turn's snapshot wins.
 function installCodexHook() {
     let hooksFile = {};
     try {
@@ -2081,15 +1747,13 @@ function installCodexHook() {
         }
     }
     catch {
-        // Start fresh if missing or invalid
     }
     if (!hooksFile.hooks) {
         hooksFile.hooks = {};
     }
     const hooks = hooksFile.hooks;
-    if (!hooks.Stop) {
+    if (!hooks.Stop)
         hooks.Stop = [];
-    }
     const existing = hooks.Stop;
     const filtered = existing.filter((hook) => {
         const inner = hook.hooks;
@@ -2115,7 +1779,6 @@ function installCodexHook() {
             },
         ],
     });
-    // Stop → backup: auto-back-up changed artifact files to the private library.
     filtered.push({
         hooks: [
             {
@@ -2126,8 +1789,8 @@ function installCodexHook() {
         ],
     });
     hooks.Stop = filtered;
-    // Codex models UserPromptSubmit as a non-matcher event (the trust-key model
-    // intentionally excludes it from MATCHER_EVENTS), so omit the matcher key.
+    for (const eventName of RETIRED_SECURITY_TOOL_EVENTS)
+        removeCodiedevHook(hooks, eventName);
     upsertCodiedevHook(hooks, "UserPromptSubmit", "discover-codex", null);
     if (!fs.existsSync(CODEX_DIR)) {
         fs.mkdirSync(CODEX_DIR, { recursive: true });
@@ -2135,8 +1798,6 @@ function installCodexHook() {
     fs.writeFileSync(CODEX_HOOKS_PATH, JSON.stringify(hooksFile, null, 2), "utf8");
     (0, codexHookTrust_1.writeCodexHookTrust)(CODEX_CONFIG_PATH, CODEX_HOOKS_PATH, hooksFile);
 }
-// Existing Codex users already have capture-codex on Stop. After a CLI
-// upgrade, that hook repairs newer lifecycle hooks without requiring connect.
 function ensureCodexLimitHookInstalled() {
     try {
         if (!fs.existsSync(CODEX_HOOKS_PATH))
@@ -2153,6 +1814,9 @@ function ensureCodexLimitHookInstalled() {
             return Array.isArray(inner) && inner.some((hook) => typeof hook.command === "string" && hook.command.trim().endsWith(subcommand));
         });
         let changed = false;
+        for (const eventName of RETIRED_SECURITY_TOOL_EVENTS) {
+            changed = removeCodiedevHook(hooks, eventName) || changed;
+        }
         if (!hasCommand(stop, "limit-codex")) {
             stop.unshift({
                 hooks: [{ type: "command", command: resolveHookCommand("limit-codex"), timeout: 10 }],
@@ -2171,18 +1835,11 @@ function ensureCodexLimitHookInstalled() {
             return;
         hooksFile.hooks = hooks;
         fs.writeFileSync(CODEX_HOOKS_PATH, JSON.stringify(hooksFile, null, 2), "utf8");
-        // Trust keys include each hook's positional index. Adding the new hook at
-        // the front shifts capture/backup, so refresh every Codiedev hash together.
         (0, codexHookTrust_1.writeCodexHookTrust)(CODEX_CONFIG_PATH, CODEX_HOOKS_PATH, hooksFile);
     }
     catch {
-        // Best-effort: capture must never fail because hook repair did.
     }
 }
-// Cursor's hooks.json uses { version: 1, hooks: { sessionEnd: [{ command, type, timeout }] } }.
-// `sessionEnd` fires when a conversation closes (completed, aborted, error,
-// window_close, user_close); the base stdin payload includes transcript_path
-// and session_id which `codiedev-hook capture-cursor` reads to upload.
 function installCursorHook() {
     if (!fs.existsSync(CURSOR_DIR)) {
         fs.mkdirSync(CURSOR_DIR, { recursive: true });
@@ -2222,34 +1879,28 @@ function installCursorHook() {
     replaceManaged("sessionStart", ["session-start-cursor"]);
     replaceManaged("sessionEnd", ["capture-cursor"]);
     replaceManaged("stop", ["backup-cursor"]);
-    for (const event of ["postToolUse", "postToolUseFailure", "subagentStart", "subagentStop"])
-        replaceManaged(event, ["observe-cursor"]);
-    // Cursor cannot inject dynamic context from beforeSubmitPrompt today.
-    // Remove older Codiedev discovery entries so prompts are not uploaded for
-    // a response the host will discard; preserve any third-party hooks.
+    replaceManaged("subagentStart", ["observe-cursor"]);
+    replaceManaged("subagentStop", ["observe-cursor"]);
     replaceManaged("beforeSubmitPrompt", []);
+    replaceManaged("preToolUse", []);
+    replaceManaged("postToolUse", ["observe-cursor"]);
+    replaceManaged("postToolUseFailure", ["observe-cursor"]);
     fs.writeFileSync(CURSOR_HOOKS_PATH, JSON.stringify(hooksFile, null, 2), "utf8");
 }
-// GitHub Copilot reads every `$COPILOT_HOME/hooks/*.json`, so Codiedev owns
-// one file and never edits anyone else's. camelCase events only: VS Code also
-// accepts Claude-style PascalCase names from the same file, and configuring
-// both would fire every hook twice.
 function copilotHooksPath() {
     return path.join((0, copilotHooks_1.copilotHome)(), "hooks", "codiedev.json");
 }
-function copilotManagedHooks(agentSecurityEnabled) {
+function copilotManagedHooks() {
     return [
         ["sessionStart", "session-start-copilot", 10],
         ["userPromptSubmitted", "discover-copilot", 10],
-        // agentStop = end of a turn: a non-final snapshot. VS Code sessions live
-        // until the chat is closed, so this is what keeps them captured.
         ["agentStop", "backup-copilot", 30],
         ["sessionEnd", "capture-copilot", 30],
         ["errorOccurred", "limit-copilot", 10],
     ];
 }
 const COPILOT_EVENTS = ["sessionStart", "userPromptSubmitted", "agentStop", "sessionEnd", "preToolUse", "postToolUse", "errorOccurred"];
-function installCopilotHook(agentSecurityEnabled = false) {
+function installCopilotHook() {
     const hooksPath = copilotHooksPath();
     let hooksFile = {};
     try {
@@ -2263,10 +1914,9 @@ function installCopilotHook(agentSecurityEnabled = false) {
     }
     hooksFile.version = 1;
     const hooks = (hooksFile.hooks && typeof hooksFile.hooks === "object" ? hooksFile.hooks : {});
-    const managed = copilotManagedHooks(agentSecurityEnabled);
+    const managed = copilotManagedHooks();
     for (const eventName of COPILOT_EVENTS) {
         const existing = Array.isArray(hooks[eventName]) ? hooks[eventName] : [];
-        // Anything a user added to this file by hand stays.
         const preserved = existing.filter((hook) => !(0, detection_1.isCodiedevHookCommand)((hook.bash ?? hook.powershell ?? hook.command)));
         const ours = managed
             .filter(([event]) => event === eventName)
@@ -2283,9 +1933,7 @@ function installCopilotHook(agentSecurityEnabled = false) {
     fs.mkdirSync(path.dirname(hooksPath), { recursive: true });
     fs.writeFileSync(hooksPath, JSON.stringify(hooksFile, null, 2), "utf8");
 }
-/** Self-heal the Copilot hook file after upgrades or drift (like Cursor's). */
 function ensureCopilotCodiedevHooksInstalled() {
-    const agentSecurityEnabled = false; // production line: no security hooks
     try {
         const hooksPath = copilotHooksPath();
         if (!fs.existsSync(hooksPath))
@@ -2295,26 +1943,31 @@ function ensureCopilotCodiedevHooksInstalled() {
         const commandsFor = (eventName) => (Array.isArray(hooks[eventName]) ? hooks[eventName] : [])
             .map((entry) => (entry.bash ?? entry.powershell ?? entry.command))
             .filter((command) => typeof command === "string" && (0, detection_1.isCodiedevHookCommand)(command));
-        const required = copilotManagedHooks(agentSecurityEnabled);
+        const required = copilotManagedHooks();
         const complete = required.every(([eventName, subcommand]) => commandsFor(eventName).filter((command) => command.trim().endsWith(subcommand)).length === 1);
         const stale = COPILOT_EVENTS.some((eventName) => commandsFor(eventName).length !== required.filter(([event]) => event === eventName).length);
         if (complete && !stale)
             return;
-        installCopilotHook(agentSecurityEnabled);
+        installCopilotHook();
     }
     catch {
-        // Best-effort — a malformed hook file must never block capture.
     }
 }
-/** Repair Cursor's complete flat hook set after upgrades or configuration
- * drift. This is deliberately separate from Claude Code's nested-hook healer:
- * the schemas and event names differ, and mixing them risks corrupting both. */
 function ensureCursorCodiedevHooksInstalled() {
     try {
         if (!fs.existsSync(CURSOR_HOOKS_PATH))
             return;
         const parsed = JSON.parse(fs.readFileSync(CURSOR_HOOKS_PATH, "utf8"));
         const hooks = parsed.hooks ?? {};
+        const has = (eventName, subcommand) => {
+            const entries = hooks[eventName];
+            return Array.isArray(entries) && entries.some((entry) => {
+                const command = entry.command;
+                return typeof command === "string"
+                    && (0, detection_1.isCodiedevHookCommand)(command)
+                    && command.trim().endsWith(subcommand);
+            });
+        };
         const required = [
             ["sessionStart", "session-start-cursor"],
             ["sessionEnd", "capture-cursor"],
@@ -2324,24 +1977,19 @@ function ensureCursorCodiedevHooksInstalled() {
             ["subagentStart", "observe-cursor"],
             ["subagentStop", "observe-cursor"],
         ];
-        const has = (eventName, subcommand) => {
+        const hasStaleSecurity = [
+            "beforeSubmitPrompt", "preToolUse", "postToolUse", "postToolUseFailure",
+        ].some((eventName) => {
             const entries = hooks[eventName];
-            return Array.isArray(entries) && entries.some((entry) => {
-                const command = entry.command;
-                return typeof command === "string"
-                    && (0, detection_1.isCodiedevHookCommand)(command)
-                    && command.trim().endsWith(subcommand);
-            });
-        };
-        const promptEntries = hooks.beforeSubmitPrompt;
-        const hasStalePromptHook = Array.isArray(promptEntries) && promptEntries.some((entry) => (0, detection_1.isCodiedevHookCommand)(entry.command));
-        if (!required.every(([eventName, subcommand]) => has(eventName, subcommand)) ||
-            hasStalePromptHook) {
-            installCursorHook();
+            return Array.isArray(entries) && entries.some((entry) => (0, detection_1.isCodiedevHookCommand)(entry.command) &&
+                !String(entry.command).trim().endsWith("observe-cursor"));
+        });
+        if (required.every(([eventName, subcommand]) => has(eventName, subcommand)) && !hasStaleSecurity) {
+            return;
         }
+        installCursorHook();
     }
     catch {
-        // Best-effort repair only.
     }
 }
 function parseClaudeSteering(content) {
@@ -2350,10 +1998,8 @@ function parseClaudeSteering(content) {
     for (const line of content.split("\n")) {
         if (!line.trim())
             continue;
-        // "[Request interrupted by user]" / "...for tool use" — Claude Code markers
         if (line.includes("[Request interrupted by user"))
             interrupts++;
-        // Standard Claude Code tool-rejection sentinels in tool_result content
         if (line.includes("doesn't want to take this action") ||
             line.includes("user doesn't want to proceed"))
             rejections++;
@@ -2378,7 +2024,6 @@ function parseCodexSteering(content) {
             }
         }
         catch {
-            // skip malformed
         }
     }
     return { interrupts, rejections };
@@ -2399,7 +2044,7 @@ function parseClaudeUsage(content) {
             if (typeof value === "string" && value.trim() && !value.startsWith("<"))
                 model = value;
         }
-        catch { /* partial records */ }
+        catch { }
     }
     const sum = (field) => models.reduce((total, usage) => total + usage[field], 0);
     const cacheReadTokens = sum("cacheReadTokens"), cacheCreationTokens = sum("cacheCreationTokens");
@@ -2407,9 +2052,6 @@ function parseClaudeUsage(content) {
         cacheTokens: cacheReadTokens + cacheCreationTokens, cacheReadTokens, cacheCreationTokens, model };
     return model ? stats : fromClaudeCostState(content, stats);
 }
-// Some Claude Code transcripts carry no assistant records, only a closing
-// `cost-state` whose `modelUsage` is keyed by model id. Without it these
-// sessions upload with no model and trip harness health model_missing.
 function fromClaudeCostState(content, stats) {
     let usage;
     for (const line of content.split("\n")) {
@@ -2420,15 +2062,13 @@ function fromClaudeCostState(content, stats) {
             if (e?.type === "cost-state" && e.modelUsage && typeof e.modelUsage === "object")
                 usage = e.modelUsage;
         }
-        catch { /* partial records */ }
+        catch { }
     }
     const n = (v) => typeof v === "number" && Number.isFinite(v) && v > 0 ? v : 0;
     const entries = Object.entries(usage ?? {}).filter(([id, u]) => id.trim() && !id.startsWith("<") && u && typeof u === "object");
     if (!entries.length)
         return stats;
-    // A session that switched models names the one that did most of the work.
     const [model] = entries.reduce((best, entry) => n(entry[1].outputTokens) > n(best[1].outputTokens) ? entry : best);
-    // Assistant records, when present, already counted tokens; never add twice.
     if (stats.inputTokens || stats.outputTokens || stats.cacheTokens)
         return { ...stats, model };
     const total = (field) => entries.reduce((sum, [, u]) => sum + n(u[field]), 0);
@@ -2437,8 +2077,6 @@ function fromClaudeCostState(content, stats) {
         cacheTokens: cacheReadTokens + cacheCreationTokens, cacheReadTokens, cacheCreationTokens, model };
 }
 function parseCodexUsage(content) {
-    // Codex reports a CUMULATIVE token_count per turn — the last one is the
-    // session total. `input_tokens` includes the cached portion, so subtract it.
     let model = null;
     let last = null;
     for (const line of content.split("\n")) {
@@ -2456,7 +2094,6 @@ function parseCodexUsage(content) {
             }
         }
         catch {
-            // skip malformed
         }
     }
     if (!last) {
@@ -2466,31 +2103,19 @@ function parseCodexUsage(content) {
     const input = last.input_tokens ?? 0;
     return {
         inputTokens: Math.max(0, input - cached),
-        // Reasoning is included in output_tokens, not additional output.
         outputTokens: last.output_tokens ?? 0,
-        // Codex only reports cached reads; creation is structurally zero.
         cacheTokens: cached,
         cacheReadTokens: cached,
         cacheCreationTokens: 0,
         model,
     };
 }
-// opencode SDK transcripts (the plugin's client.session.messages dump) are a
-// single JSON ARRAY of {info, parts} — not Claude Code's JSONL. Sum assistant
-// token/cost metadata; model = providerID/modelID (matches modelPricing slugs
-// like "openrouter/…" never resolving — stored cost is authoritative here).
 function parseOpencodeUsage(content) {
     let inputTokens = 0, outputTokens = 0, cacheReadTokens = 0, cacheCreationTokens = 0, costUsd = 0;
-    // A session can switch models (user picks another, or a provider falls back).
-    // Attribute it to the model that did the most work rather than whichever
-    // spoke last, since this label drives pricing and the model-mix card.
     const outputByModel = new Map();
     let lastModel = null;
     try {
         const parsed = JSON.parse(content);
-        // Accept both shapes the SDK can produce: a bare array, or the
-        // {data: [...]} envelope normalizeOpenCodeTranscript already unwraps.
-        // Disagreeing with that parser would silently zero out a session's usage.
         const list = Array.isArray(parsed)
             ? parsed
             : (parsed && typeof parsed === "object" && Array.isArray(parsed.data)
@@ -2520,14 +2145,10 @@ function parseOpencodeUsage(content) {
             }
         }
     }
-    catch { /* malformed transcript — zero-safe */ }
-    // Ties (e.g. every turn reporting zero output) fall back to the last model
-    // seen, preserving the previous behaviour for single-model sessions.
+    catch { }
     let model = lastModel;
     let best = -1;
     for (const [id, out] of outputByModel) {
-        // >= so the later model wins a tie, matching the previous last-wins
-        // behaviour when no turn reports output tokens.
         if (out >= best) {
             best = out;
             model = id;
@@ -2543,8 +2164,6 @@ function parseUsage(content, mode) {
         return parseOpencodeUsage(content);
     return mode === "codex" ? parseCodexUsage(content) : parseClaudeUsage(content);
 }
-// Lead-time start proxy: the earliest top-level `timestamp` in the transcript.
-// Both Claude Code and Codex stamp every line, so this is mode-agnostic.
 function parseSessionStart(content) {
     let min = null;
     for (const line of content.split("\n")) {
@@ -2560,7 +2179,6 @@ function parseSessionStart(content) {
             }
         }
         catch {
-            // skip malformed
         }
     }
     return min;
@@ -2596,15 +2214,10 @@ function parseClaudeCodeStats(content) {
             }
         }
         catch {
-            // Skip malformed lines
         }
     }
     return { messageCount, toolCallCount };
 }
-/** Convert OpenCode's SDK message array (`{info, parts}[]`) into the same
- * newline-delimited shape used by Claude Code. The rest of capture—privacy
- * exclusions, git keys, token parsing, scrubbing, storage, and merge joins—can
- * therefore stay one shared pipeline instead of becoming a parallel product. */
 function normalizeOpenCodeTranscript(content) {
     let parsed;
     try {
@@ -2677,13 +2290,6 @@ function normalizeOpenCodeTranscript(content) {
     }
     return lines.join("\n") + (lines.length ? "\n" : "");
 }
-// Codex session JSONL format (rollout-*.jsonl):
-//   {type:"session_meta", payload:{id, cwd, git:{repository_url,...}, ...}}
-//   {type:"response_item", payload:{type:"message", role, content:[{type:"input_text",text}|{type:"output_text",text}]}}
-//   {type:"response_item", payload:{type:"function_call", name, arguments, call_id}}
-//   {type:"response_item", payload:{type:"function_call_output", call_id, output}}
-//   {type:"event_msg", payload:{type:"token_count"|"agent_reasoning"|...}}
-//   {type:"turn_context", payload:{cwd, model, ...}}
 function parseCodexStats(content) {
     let messageCount = 0;
     let toolCallCount = 0;
@@ -2704,13 +2310,10 @@ function parseCodexStats(content) {
             }
         }
         catch {
-            // Skip malformed lines
         }
     }
     return { messageCount, toolCallCount };
 }
-// Pull repository URL from the Codex transcript's session_meta line so we
-// don't depend on the hook's cwd being a git repo.
 function extractCodexRepoUrl(content) {
     const lines = content.split("\n");
     for (const line of lines) {
@@ -2723,24 +2326,16 @@ function extractCodexRepoUrl(content) {
                 const url = entry.payload?.git?.repository_url;
                 if (typeof url === "string" && url.length > 0)
                     return url;
-                return null; // session_meta is first — no point scanning further
+                return null;
             }
         }
         catch {
-            // Keep scanning
         }
     }
     return null;
 }
-// Give up after this many failed uploads (across sessions) so a permanently
-// failing job never litters /tmp forever. Paired with UPLOAD_TTL_MS.
 exports.MAX_UPLOAD_ATTEMPTS = 5;
 exports.UPLOAD_TTL_MS = 7 * 24 * 60 * 60 * 1000;
-// Open the capture log for appending so a detached child's stderr lands there
-// instead of vanishing into stdio:"ignore". Returns the stdio value to spawn
-// with plus the parent's fd (to close after spawn — the child gets its own
-// duplicate). Falls back to plain "ignore" when openSync is absent or throws,
-// so a missing/unwritable log dir never breaks a dispatch.
 function openCaptureLogStdio(openSync) {
     if (!openSync)
         return { stdio: "ignore" };
@@ -2752,70 +2347,36 @@ function openCaptureLogStdio(openSync) {
         return { stdio: "ignore" };
     }
 }
-// Best-effort close of the parent's log-fd copy. No-op when there's no fd or
-// no closeSync dep — never throws into the capture path.
 function closeCaptureLogFd(fd, closeSync) {
     if (fd === undefined || !closeSync)
         return;
     try {
         closeSync(fd);
     }
-    catch { /* best-effort */ }
-}
-// Hand the SessionEnd capture off to a detached child so the inline hook can
-// exit 0 immediately. Detaching only the network upload (dispatchCaptureDetached)
-// wasn't enough: the synchronous transcript read + parse and — the killer on
-// Windows — one `git rev-parse` per SHA in the transcript (parseAuthoredShas)
-// still ran inline, overrunning Claude Code's SessionEnd shutdown window and
-// triggering "Hook cancelled" on long sessions. This moves ALL of that work
-// into the child. The job carries only the raw hook inputs (the child re-reads
-// the transcript and re-runs git), so the parent's inline work is a single
-// small file write plus a spawn.
+    catch { }
+}
 function dispatchCaptureFinish(input, hookScriptPath, deps) {
     deps.writeFileSync(deps.tmpFile, JSON.stringify(input), { mode: 0o600 });
-    // Route the child's stderr to the capture log so any crash output is
-    // visible to `codiedev doctor`. The caller must explicitly pass openSync
-    // (e.g. fs.openSync in hook.ts) to enable this; when omitted (tests,
-    // older call-sites) we fall back to "ignore" so existing behaviour is
-    // unchanged and no real fd is opened.
     const { stdio, fd } = openCaptureLogStdio(deps.openSync);
     try {
         const child = deps.spawn(deps.nodePath ?? process.execPath, [hookScriptPath, "capture-finish", deps.tmpFile], { detached: true, stdio });
         child.unref();
     }
     finally {
-        // Close the PARENT's fd copy even when spawn throws — the child (if
-        // spawned) holds its own duplicate, so this never cuts off its stderr.
         closeCaptureLogFd(fd, deps.closeSync);
     }
 }
-// Fire-and-forget the session-capture upload from a fully detached child so the
-// SessionEnd hook can exit 0 immediately. Awaiting the upload inline let Claude
-// Code's shutdown window elapse and kill the hook ("Hook cancelled") on large
-// transcripts. The job (incl. bearer token) is written to a file rather than
-// passed via argv so it never shows up in the process list.
 function dispatchCaptureDetached(job, hookScriptPath, deps) {
     deps.writeFileSync(deps.tmpFile, JSON.stringify(job), { mode: 0o600 });
-    // Route the child's stderr to the capture log (same pattern as
-    // dispatchCaptureFinish). The caller must explicitly pass openSync to
-    // enable this; when omitted we fall back to "ignore" so existing callers
-    // keep working unchanged.
     const { stdio, fd } = openCaptureLogStdio(deps.openSync);
     try {
         const child = deps.spawn(deps.nodePath ?? process.execPath, [hookScriptPath, "upload", deps.tmpFile], { detached: true, stdio });
         child.unref();
     }
     finally {
-        // Close the PARENT's fd copy even when spawn throws — the child (if
-        // spawned) holds its own duplicate, so this never cuts off its stderr.
         closeCaptureLogFd(fd, deps.closeSync);
     }
 }
-// Deferred twin of dispatchCaptureDetached: persist the job, then spawn the
-// `upload-deferred` child which sleeps for delayMs before claiming + uploading
-// (or finding itself superseded by a newer turn). Used when decideDispatch
-// says a non-final per-turn capture is inside the throttle window. Identical
-// stdio/fd-hygiene contract to the other dispatch fns.
 function dispatchDeferredUpload(job, hookScriptPath, deps, delayMs) {
     deps.writeFileSync(deps.tmpFile, JSON.stringify(job), { mode: 0o600 });
     const { stdio, fd } = openCaptureLogStdio(deps.openSync);
@@ -2824,29 +2385,11 @@ function dispatchDeferredUpload(job, hookScriptPath, deps, delayMs) {
         child.unref();
     }
     finally {
-        // Close the PARENT's fd copy even when spawn throws — the child (if
-        // spawned) holds its own duplicate, so this never cuts off its stderr.
         closeCaptureLogFd(fd, deps.closeSync);
     }
 }
-// A claimed job whose uploader hasn't finished after this long is presumed
-// crashed and gets renamed back to its canonical name for a later retry.
 exports.CLAIM_STALE_MS = 15 * 60 * 1000;
-// A finish-input file older than this is an orphan: its capture-finish child
-// normally consumes + unlinks it within seconds, so an hour-old file means the
-// child died (spawn failure, OOM/AV kill, machine sleep). Generous so we never
-// race a legitimately slow child.
 exports.FINISH_ORPHAN_AGE_MS = 60 * 60 * 1000;
-// Retry kept-on-failure capture jobs: re-dispatch each pending
-// `codiedev-capture-*.json` to the detached uploader (which bumps attempts /
-// gives up at the cap). Best-effort — never throws into the hook.
-//
-// Each job is CLAIMED with an atomic rename before dispatch. Several
-// session-end hooks can run this sweep over the same tmpdir at once, and
-// without the claim each of them dispatched an uploader for the same job —
-// every duplicate upload triggered a full server-side re-summarize of the
-// session (real LLM spend per duplicate). Rename is atomic, so exactly one
-// sweeper wins each file; the losers' renames throw and they skip it.
 function sweepPendingCaptures(deps) {
     let files;
     try {
@@ -2856,10 +2399,6 @@ function sweepPendingCaptures(deps) {
         return;
     }
     const now = deps.now?.() ?? Date.now();
-    // Recover claims orphaned by a crashed/killed uploader: a stale claim is
-    // renamed back to its canonical name so a LATER sweep retries it. (Not this
-    // one — the uploader may legitimately still be running near the threshold,
-    // and dispatching reclaimed work immediately would race it.)
     for (const f of files) {
         const m = /^(codiedev-capture-.*\.json)\.claim-\d+$/.exec(f);
         if (!m)
@@ -2871,14 +2410,8 @@ function sweepPendingCaptures(deps) {
             }
         }
         catch {
-            // raced another sweeper or the uploader just finished — fine
         }
     }
-    // Orphaned finish-inputs: the FIRST detached child (capture-finish) died
-    // before it could build an upload job. That path has no retry queue — the
-    // payload is gone — but the loss must not stay invisible: report the
-    // sessionId (filename embeds it: codiedev-finish-<sid>-<pid>-<ts>.json) so
-    // it lands as a skip-reason, then clean the file up.
     if (deps.unlinkSync) {
         for (const f of files) {
             const m = /^codiedev-finish-(.+)-\d+-\d+\.json$/.exec(f);
@@ -2889,19 +2422,13 @@ function sweepPendingCaptures(deps) {
                 if (now - deps.statSync(orphanPath).mtimeMs < exports.FINISH_ORPHAN_AGE_MS)
                     continue;
                 deps.unlinkSync(orphanPath);
-                // finishInputTmpFile falls back to the PID when the hook had no
-                // session_id (codiedev-finish-<pid>-<pid>-<ts>.json). A pure-digit
-                // capture is that fallback, not a session id — reporting it would
-                // create a phantom session row server-side. Real session ids are
-                // UUIDs and never all-digits.
                 const sid = /^\d+$/.test(m[1]) ? undefined : m[1];
                 try {
                     deps.reportOrphan?.(sid);
                 }
-                catch { /* report is best-effort */ }
+                catch { }
             }
             catch {
-                // raced its owner or another sweeper — fine
             }
         }
     }
@@ -2909,12 +2436,6 @@ function sweepPendingCaptures(deps) {
         .filter((f) => /^codiedev-capture-.*\.json$/.test(f))
         .map((f) => path.join(deps.dir, f))
         .filter((p) => p !== deps.exclude)
-        // Min-age guard: a YOUNG job file may be a sleeping deferred upload whose
-        // own upload-deferred child will consume it within CAPTURE_THROTTLE_MS of
-        // its mtime. The sweep must not steal it — that would upload per-turn and
-        // defeat the throttle with 2+ concurrent sessions. Only genuinely stuck
-        // jobs (older than SWEEP_MIN_AGE_MS) are retried. A stat failure means the
-        // job was claimed/consumed mid-sweep — skip it.
         .filter((p) => {
         try {
             return now - deps.statSync(p).mtimeMs >= exports.SWEEP_MIN_AGE_MS;
@@ -2924,8 +2445,6 @@ function sweepPendingCaptures(deps) {
         }
     })
         .slice(0, deps.max ?? 10);
-    // One log fd shared by every re-dispatched uploader in this batch (each
-    // spawn duplicates it); the parent's copy is closed after the loop.
     const { stdio, fd } = openCaptureLogStdio(deps.openSync);
     for (const jobFile of jobs) {
         const claimed = `${jobFile}.claim-${process.pid}`;
@@ -2933,61 +2452,29 @@ function sweepPendingCaptures(deps) {
             deps.renameSync(jobFile, claimed);
         }
         catch {
-            continue; // another sweeper claimed it first
+            continue;
         }
         try {
             const child = deps.spawn(deps.nodePath ?? process.execPath, [deps.hookScriptPath, "upload", claimed], { detached: true, stdio });
             child.unref();
         }
         catch {
-            // Couldn't fork the uploader — release the claim so a later sweep
-            // retries instead of the job dying invisible under the claimed name.
             try {
                 deps.renameSync(claimed, jobFile);
             }
             catch {
-                // best-effort
             }
         }
     }
     closeCaptureLogFd(fd, deps.closeSync);
-    // Housekeeping: prune per-session upload-state files older than the upload
-    // TTL so capture-state doesn't grow forever. Best-effort, never throws.
     try {
         (deps.pruneState ?? pruneCaptureStateDir)();
     }
     catch {
-        // best-effort
     }
 }
-// ─────────────────────────────────────────────────────────────────────────────
-// Per-session upload throttle — defers mid-session Stop-hook uploads so we
-// don't hammer the server (and re-summarize) after every single turn.
-// ─────────────────────────────────────────────────────────────────────────────
-// Minimum interval between non-final uploads for the same session. 10 minutes:
-// fine-grained enough to capture recent work while avoiding per-turn churn.
 exports.CAPTURE_THROTTLE_MS = 10 * 60 * 1000;
-// Minimum AGE of a job file before the retry sweep may claim it. An actively
-// deferred job is consumed by its own upload-deferred child within
-// CAPTURE_THROTTLE_MS of its mtime — a sweep stealing it early would upload
-// per-turn and defeat the throttle whenever 2+ sessions run concurrently.
-// The 2-min slack covers the child's wake-up + claim. Side effect: failed
-// uploads (whose retry bump refreshes mtime) now wait ~12 min between retry
-// attempts — fine for a 7-day-TTL retry queue, and a free rate-limit on
-// retry storms.
 exports.SWEEP_MIN_AGE_MS = exports.CAPTURE_THROTTLE_MS + 2 * 60 * 1000;
-// Map the hook's capture argv to the payload's `final` flag. EXPLICIT
-// ALLOWLIST: only claude-code's SessionEnd entrypoints ("capture", or the bare
-// hook with no subcommand) are a true final signal. capture-opencode/
-// capture-desktop (per-turn snapshot) and capture-opencode-final/
-// capture-desktop-final (real session end) get an explicit false/true.
-// Cursor's capture-cursor is wired only to sessionEnd, so it is also a true
-// final signal. Everything else — capture-codex (Codex's Stop fires per-turn;
-// final:true would close the server-side session lease every turn) and any
-// FUTURE mode (e.g. a capture-windsurf added to resolveMode but not audited
-// here) — gets undefined, i.e. legacy server behaviour. Defaulting unknowns
-// to true would silently re-introduce the per-turn lease-close bug for every
-// new agent.
 function resolveCaptureFinal(argv2) {
     if (argv2 === "capture-opencode" || argv2 === "capture-desktop" || argv2 === "capture-pi")
         return false;
@@ -2997,16 +2484,6 @@ function resolveCaptureFinal(argv2) {
         ? true
         : undefined;
 }
-// Build a UNIQUE finish-input tmpFile name per dispatch. Both the Stop hook and
-// SessionEnd dispatch capture-finish children, and the child unlinks its input
-// in `finally` — a SHARED per-session name let interleavings drop the final
-// dispatch (Stop's child unlinks the file SessionEnd just wrote) or
-// double-dispatch. Unique names mean each child owns its file exclusively; at
-// worst concurrent Stop+SessionEnd children both upload, which is harmless
-// (the server upserts by sessionId). Orphans (child dies before unlink) sit in
-// tmpdir OUTSIDE the sweep regex (codiedev-finish- ≠ codiedev-capture-);
-// negligible volume (one tiny JSON per crashed child), though note Windows
-// %TEMP% is not auto-cleaned — acceptable.
 function finishInputTmpFile(sessionId) {
     const safeId = String(sessionId ?? process.pid).replace(/[^A-Za-z0-9._-]/g, "_");
     return path.join(os.tmpdir(), `codiedev-finish-${safeId}-${process.pid}-${Date.now()}.json`);
@@ -3017,46 +2494,29 @@ function captureUploadTmpFile(sessionId, mode, pid = process.pid, now = Date.now
         ? `codiedev-capture-${id}-${pid}-${now}.json`
         : `codiedev-capture-${id}.json`);
 }
-// Best-effort cancellation for a scheduled per-turn upload when a real final
-// capture arrives. Deferred jobs deliberately share one canonical filename;
-// removing it makes every sleeping uploader lose its later claim-by-rename.
-// The backend's capturedAt guard covers the narrow race where a child claimed
-// the file immediately before this unlink.
 function cancelDeferredCaptureUpload(sessionId, deps = fs) {
     try {
         deps.unlinkSync(captureUploadTmpFile(sessionId, "deferred"));
         return true;
     }
     catch {
-        // Missing means there was nothing pending (or another process won).
         return false;
     }
 }
-// Decide whether to upload immediately or defer until the throttle window expires.
-//   final=true  → always immediate (SessionEnd: close the session now)
-//   null        → immediate (first upload for this session)
-//   outside window → immediate
-//   inside window  → deferred with exact remaining delay
-//   future clock skew → deferred clamped to CAPTURE_THROTTLE_MS
 function decideDispatch(args) {
     if (args.final || args.lastUploadAt === null)
         return { mode: "immediate" };
     const elapsed = args.now - args.lastUploadAt;
-    // Clock-skew guard: elapsed < 0 means lastUploadAt is in the future. Clamping
-    // to 0 also bounds delayMs to at most CAPTURE_THROTTLE_MS (safeElapsed >= 0).
     const safeElapsed = Math.max(0, elapsed);
     if (safeElapsed >= exports.CAPTURE_THROTTLE_MS)
         return { mode: "immediate" };
     return { mode: "deferred", delayMs: exports.CAPTURE_THROTTLE_MS - safeElapsed };
 }
-// Per-session state dir: ~/.codiedev/capture-state/<sanitized-session-id>.json
 const CAPTURE_STATE_DIR = path.join(CONFIG_DIR, "capture-state");
 function captureStatePath(sessionId) {
     const safe = sessionId.replace(/[^A-Za-z0-9_-]/g, "_");
     return path.join(CAPTURE_STATE_DIR, `${safe}.json`);
 }
-// Read the per-session upload state from ~/.codiedev/capture-state/<id>.json.
-// Returns null when missing or unreadable. Never throws.
 function readSessionUploadState(sessionId, deps = fs) {
     try {
         const p = captureStatePath(sessionId);
@@ -3068,8 +2528,6 @@ function readSessionUploadState(sessionId, deps = fs) {
         return null;
     }
 }
-// Write the per-session upload state to ~/.codiedev/capture-state/<id>.json.
-// Best-effort: never throws into the capture path.
 function writeSessionUploadState(sessionId, state, deps = fs) {
     try {
         if (!deps.existsSync(CAPTURE_STATE_DIR)) {
@@ -3079,13 +2537,8 @@ function writeSessionUploadState(sessionId, state, deps = fs) {
         deps.writeFileSync(p, JSON.stringify(state), { mode: 0o600 });
     }
     catch {
-        // best-effort — never break the capture path
     }
 }
-// Prune per-session upload-state files older than UPLOAD_TTL_MS (7 days — same
-// TTL as the upload retry queue) so ~/.codiedev/capture-state (one tiny file
-// per session) doesn't grow forever. Called from sweepPendingCaptures, i.e. on
-// the cadence captures already run housekeeping. Best-effort: never throws.
 function pruneCaptureStateDir(deps = fs, dir = CAPTURE_STATE_DIR, now = Date.now()) {
     try {
         for (const f of deps.readdirSync(dir)) {
@@ -3095,25 +2548,13 @@ function pruneCaptureStateDir(deps = fs, dir = CAPTURE_STATE_DIR, now = Date.now
                     deps.unlinkSync(p);
             }
             catch {
-                // raced another pruner or unreadable — skip
             }
         }
     }
     catch {
-        // dir missing/unreadable — nothing to prune
     }
 }
-// Base64 length above which the transcript goes straight to storage instead
-// of inline in the captureSession JSON body. The backend's HTTP-action
-// isolate has a 64MB cap and inline base64 amplifies ~8x in memory (request
-// text + parsed JSON + decode output all resident) — ~7MB transcripts OOM it
-// (observed live 2026-07-02). 2M base64 chars ≈ 1.5MB raw: far below the
-// cliff, while per-turn snapshots (typically KBs) skip the extra roundtrips.
 exports.DIRECT_UPLOAD_THRESHOLD_CHARS = 2_000_000;
-// "Last session captured" breadcrumb. Written next to config.json on a
-// successful capture upload; read by `codiedev doctor` so a user can confirm
-// their most recent session actually landed (the single hardest thing to
-// self-verify today — it previously required eyeballing the portal).
 const LAST_CAPTURE_PATH = path.join(CONFIG_DIR, "last-capture.json");
 function buildLastCaptureRecord(job, now) {
     const b = job.body;
@@ -3136,7 +2577,6 @@ function writeLastCapture(record, deps = fs, filePath = LAST_CAPTURE_PATH) {
         deps.writeFileSync(filePath, JSON.stringify(record), { mode: 0o600 });
     }
     catch {
-        // breadcrumb is best-effort — never throw on the capture path.
     }
 }
 function readLastCapture(deps = fs, filePath = LAST_CAPTURE_PATH) {
@@ -3149,21 +2589,16 @@ function readLastCapture(deps = fs, filePath = LAST_CAPTURE_PATH) {
         return null;
     }
 }
-// Runs inside the detached child spawned by `dispatchCaptureDetached`: read the
-// persisted job, POST it, and ALWAYS delete the temp file afterwards (even on
-// failure) so we don't litter the tmp dir. Never throws — capture is
-// best-effort.
 async function runCaptureUpload(jobFile, deps) {
     let job = null;
     try {
         job = JSON.parse(deps.readFileSync(jobFile, "utf8"));
     }
     catch {
-        // unreadable/corrupt job — delete it and stop.
         try {
             deps.unlinkSync(jobFile);
         }
-        catch { /* gone */ }
+        catch { }
         return;
     }
     const sessionId = job.body?.sessionId;
@@ -3172,18 +2607,15 @@ async function runCaptureUpload(jobFile, deps) {
             try {
                 deps.log({ stage: "upload", sessionId, outcome: "skip", detail: "ignored-path" });
             }
-            catch { /* log is best-effort */ }
+            catch { }
         }
         try {
             deps.unlinkSync(jobFile);
         }
-        catch { /* gone */ }
+        catch { }
         return;
     }
     try {
-        // Big transcript + capable deps → direct-to-storage: fetch a one-time
-        // upload URL, PUT the raw bytes, send captureSession the storageId. Any
-        // step failing throws into the retry path below, same as a failed POST.
         let body = job.body;
         const transcript = body?.transcript;
         if (transcript &&
@@ -3195,41 +2627,39 @@ async function runCaptureUpload(jobFile, deps) {
             const { storageId } = await deps.uploadBytes(uploadUrl, Buffer.from(transcript, "base64"), "application/json");
             body = { ...body, transcriptStorageId: storageId };
             delete body.transcript;
+            job.body = body;
+            if (deps.writeFileSync) {
+                deps.writeFileSync(jobFile, JSON.stringify(job), { mode: 0o600 });
+            }
         }
         await deps.post(job.url, body, job.token);
-        // success — drop a "last session captured" breadcrumb (before removing the
-        // job) so doctor can confirm the most recent session actually landed.
         if (deps.recordSuccess) {
             try {
                 deps.recordSuccess(job);
             }
-            catch { /* breadcrumb is best-effort */ }
+            catch { }
         }
-        // Write the per-session upload state so the throttle can defer the next
-        // non-final (per-turn) upload until the window expires.
         const uploadedSessionId = job.body?.sessionId;
         if (uploadedSessionId && deps.writeSessionState) {
             try {
                 deps.writeSessionState(uploadedSessionId, { lastUploadAt: deps.now ? deps.now() : Date.now() });
             }
-            catch { /* best-effort */ }
+            catch { }
         }
         const attempt = (job.attempts ?? 0) + 1;
         if (deps.log) {
             try {
                 deps.log({ stage: "upload", sessionId, outcome: "ok", detail: `attempt=${attempt}` });
             }
-            catch { /* log is best-effort */ }
+            catch { }
         }
         try {
             deps.unlinkSync(jobFile);
         }
-        catch { /* gone */ }
+        catch { }
         return;
     }
     catch (err) {
-        // Failure: keep the job for a later sweep to retry, UNLESS we've hit the
-        // attempt cap or TTL — then give up so /tmp doesn't accumulate forever.
         const now = deps.now ? deps.now() : Date.now();
         const attempts = (job.attempts ?? 0) + 1;
         const queuedAt = job.queuedAt ?? now;
@@ -3246,19 +2676,12 @@ async function runCaptureUpload(jobFile, deps) {
                         detail: `attempt=${attempts} age=${ageMs}ms`,
                     });
                 }
-                catch { /* log is best-effort */ }
+                catch { }
             }
-            // Unlink FIRST: if the skip ping below hangs (no timeout on injected
-            // post impls), a still-present job file would be reclaimed by the
-            // 15-min stale-claim sweep and re-enter this give-up path forever.
             try {
                 deps.unlinkSync(jobFile);
             }
-            catch { /* gone */ }
-            // Tell the server this capture is permanently lost and why. The full
-            // transcript POST may be what's blocked (proxy/DLP body inspection) —
-            // this tiny ping often still passes, turning an invisible loss into a
-            // per-reason bucket on the admin Capture Health panel.
+            catch { }
             if (sessionId) {
                 try {
                     const skipUrl = job.url.replace(/\/api\/captureSession$/, "/api/cli/sessionSkip");
@@ -3270,52 +2693,42 @@ async function runCaptureUpload(jobFile, deps) {
                         }, job.token);
                     }
                 }
-                catch { /* best-effort — the ping may be blocked too */ }
+                catch { }
             }
             return;
         }
-        // Log the error before persisting the retry bump.
         if (deps.log) {
             try {
                 const msg = err.message ?? String(err);
-                // Extract http=<status> when the error message carries one (format used
-                // by postJson: "HTTP <status>: <body>"). Truncate to 200 chars.
                 const httpMatch = msg.match(/\bhttp[= ](\d{3})\b/i);
                 const httpPart = httpMatch ? `http=${httpMatch[1]} ` : "";
                 const detail = `${httpPart}${msg.slice(0, 200)} attempt=${attempts}`;
                 deps.log({ stage: "upload", sessionId, outcome: "ERROR", detail });
             }
-            catch { /* log is best-effort */ }
+            catch { }
         }
-        // The sweep hands us a CLAIMED path (`<job>.claim-<pid>`). Persist the
-        // retry bump under the canonical name — the sweep only matches
-        // `codiedev-capture-*.json`, so a bump left on the claimed path would
-        // never be retried (a silently dropped capture).
         const canonical = jobFile.replace(/\.claim-\d+$/, "");
-        const writeFn = deps.writeFileSync; // always set here: giveUp branch checked !deps.writeFileSync
+        const writeFn = deps.writeFileSync;
         try {
             writeFn(canonical, JSON.stringify({ ...job, attempts, queuedAt }), { mode: 0o600 });
             if (canonical !== jobFile) {
                 try {
                     deps.unlinkSync(jobFile);
                 }
-                catch { /* gone */ }
+                catch { }
             }
         }
         catch {
-            // couldn't persist the bump — drop it rather than risk a stuck file.
             try {
                 deps.unlinkSync(jobFile);
             }
-            catch { /* gone */ }
+            catch { }
         }
     }
 }
 async function runDeferredUpload(jobFile, delayMs, deps) {
     const sleep = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
     await sleep(delayMs);
-    // Claim via rename. If the file is gone or already claimed, a newer turn's
-    // upload superseded this one: log and exit silently.
     const claimed = `${jobFile}.claim-${process.pid}`;
     try {
         deps.renameSync(jobFile, claimed);
@@ -3323,40 +2736,24 @@ async function runDeferredUpload(jobFile, delayMs, deps) {
     catch {
         if (deps.log) {
             try {
-                // The job file is gone, so its body (and sessionId) is unreadable —
-                // recover the session id from the per-session filename so doctor can
-                // still tie this line to a session.
                 const sid = /^codiedev-capture-(.+)\.json/.exec(path.basename(jobFile))?.[1];
                 deps.log({ stage: "upload-deferred", sessionId: sid, outcome: "superseded" });
             }
-            catch { /* log is best-effort */ }
+            catch { }
         }
         return;
     }
     await runCaptureUpload(claimed, deps);
 }
-// Classify a transcript read failure at capture time. ENOENT = the transcript
-// never existed: a desktop-app phantom helper session (SessionStart/End hooks
-// fire, no conversation ever happens), not lost work — the backend excludes
-// "no-transcript" from coverage. Anything else means a real transcript was
-// there but the read failed: a genuine loss, tagged with the errno so it stays
-// diagnosable from the server side.
 function transcriptReadSkipReason(err) {
     const code = err?.code;
     if (code === "ENOENT")
         return "no-transcript";
     return `transcript-unreadable:${code || "unknown"}`;
 }
-// Codex's Stop hook also runs the plain `backup` command for artifact backup.
-// Its transcript is a Codex rollout, already captured per turn by
-// capture-codex; parsing it as Claude Code would upload an empty duplicate
-// session with no model under source claude-code.
 function isCodexRolloutPath(transcriptPath) {
     return Boolean(transcriptPath && /^rollout-.*\.jsonl$/.test(path.basename(transcriptPath)));
 }
-// Per-turn snapshots are backups, not session endings. Reporting their local
-// read/empty condition as a session skip would hide or close coverage while the
-// agent is still running; only final/legacy capture paths emit the skip ping.
 function shouldReportCaptureSkip(final) {
     return final !== false;
 }