@outerlayer/cli 0.1.0 → 0.2.0

package/dist/{chunk-RCQXYLMO.js → chunk-65WXAANR.js}

@@ -1,25 +1,10 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
+import { parseTrackerNumber } from './chunk-WZBHBH3J.js';
 import { mkdirSync, appendFileSync, readFileSync } from 'fs';
 import { join } from 'path';
 
 createRequire(import.meta.url);
-
-// src/tracker-number.ts
-var MAX_TRACKER_NUMBER = Number.MAX_SAFE_INTEGER;
-function parseTrackerNumber(raw) {
-  if (raw === void 0) return void 0;
-  const text = typeof raw === "number" ? String(raw) : raw;
-  if (!/^\d+$/.test(text)) return void 0;
-  const n = Number(text);
-  if (!Number.isSafeInteger(n) || n <= 0) return void 0;
-  return n;
-}
-function trackerNumberError(flag, raw) {
-  return `invalid ${flag} "${raw}" \u2014 expected a positive integer no larger than ${MAX_TRACKER_NUMBER}`;
-}
-
-// src/work-launch.ts
 var HOW_TO_CREATE_AN_ITEM = "outerlayer work add";
 function parseWorkItemEnv(raw) {
   if (raw === void 0) return { reason: "OUTERLAYER_WORK is not set" };
@@ -93,4 +78,4 @@ function readLaunchSpoolState(home, readImpl = readLaunchSpool) {
   return { ids, ...malformedLines > 0 ? { malformedLines } : {} };
 }
 
-export { appendLaunchRecord, launchStatusIsDecisive, launchedItemForSession, launchesPath, parseTrackerNumber, parseWorkItemEnv, readLaunchSpoolState, trackerNumberError };
+export { appendLaunchRecord, launchStatusIsDecisive, launchedItemForSession, launchesPath, parseWorkItemEnv, readLaunchSpoolState };

package/dist/{chunk-4H56Y7O6.js → chunk-DCNOXRMV.js}

@@ -2,7 +2,7 @@
 import { createRequire } from 'node:module';
 import { startTimeOf, isSameProcess } from './chunk-OZ7C3XUE.js';
 import { RUNNER_DIR_MODE, RUNNER_FILE_MODE } from './chunk-JJP7YLMN.js';
-import { postJson, WorkCommandError } from './chunk-VU34RWDU.js';
+import { postJson, WorkCommandError } from './chunk-Q6CL5THG.js';
 import { relative, dirname, delimiter, join } from 'path';
 import { existsSync, readFileSync, mkdirSync, writeFileSync, openSync, statSync, closeSync, readdirSync } from 'fs';
 import { spawn } from 'child_process';

package/dist/{chunk-IWIUYLDR.js → chunk-I3ETLSNE.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
-import { existsSync, readFileSync, unlinkSync, readdirSync, mkdirSync, writeFileSync, chmodSync } from 'fs';
+import { readFileSync, readdirSync, existsSync, mkdirSync, writeFileSync, unlinkSync, chmodSync } from 'fs';
 import { join, isAbsolute, dirname, basename, resolve } from 'path';
 import { execFileSync } from 'child_process';
 
@@ -74,137 +74,7 @@ function contextExcludesPresent(gitCommonDir) {
   if (beginIdx === -1) return false;
   return BLOCK_LINES.every((l, i) => lines[beginIdx + i] === l);
 }
-var POST_REWRITE_MARKER = "# outerlayer post-rewrite journal";
-var POST_REWRITE_VERSION = `${POST_REWRITE_MARKER} v1`;
-var POST_REWRITE_HOOK_SCRIPT = `#!/bin/sh
-${POST_REWRITE_VERSION}
-# Appends exact old->new commit pairs (amend/rebase, incl. squashes) to the
-# OuterLayer spool so rewritten history stays creditable to the recorded
-# sessions that produced it. Always exits 0: journaling must never break a
-# rebase.
-# On a machine without OuterLayer (this hook can be committed into a repo
-# and run for every contributor) there is nothing to journal and no reason
-# to create ~/.outerlayer: bow out before touching the filesystem.
-[ -n "$OUTERLAYER_SPOOL_DIR" ] || [ -d "$HOME/.outerlayer" ] || exit 0
-SPOOL_DIR="\${OUTERLAYER_SPOOL_DIR:-$HOME/.outerlayer/spool}"
-mkdir -p "$SPOOL_DIR" 2>/dev/null || exit 0
-FILE="$SPOOL_DIR/rewrites.jsonl"
-if [ -f "$FILE" ] && [ "$(wc -c < "$FILE" 2>/dev/null || echo 0)" -gt 5242880 ]; then
-  mv -f "$FILE" "$FILE.1" 2>/dev/null || true
-fi
-REPO="$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null)"
-if [ -z "$REPO" ]; then
-  REPO="$(git rev-parse --git-common-dir 2>/dev/null)" || exit 0
-  case "$REPO" in /*) ;; *) REPO="$PWD/$REPO" ;; esac
-fi
-TS="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
-awk -v repo="$REPO" -v ts="$TS" -v src="$1" '
-  NF >= 2 && $1 ~ /^[0-9a-f]+$/ && $2 ~ /^[0-9a-f]+$/ {
-    pairs = pairs (n ? "," : "") "[\\"" $1 "\\",\\"" $2 "\\"]"; n++
-  }
-  END {
-    if (n) {
-      gsub(/\\\\/, "\\\\\\\\", repo); gsub(/"/, "\\\\\\"", repo)
-      printf "{\\"t\\":\\"%s\\",\\"repo\\":\\"%s\\",\\"source\\":\\"%s\\",\\"pairs\\":[%s]}\\n", ts, repo, src, pairs
-    }
-  }
-' >> "$FILE" 2>/dev/null || true
-exit 0
-`;
-var POST_COMMIT_HOOK_SCRIPT = `#!/bin/sh
-${POST_REWRITE_VERSION}
-# Appends every commit's SHA to the OuterLayer spool the moment it exists,
-# so a session whose transcript lost git's porcelain line (piped or muted
-# output) can still be credited at sync time. Always exits 0.
-# On a machine without OuterLayer (this hook can be committed into a repo
-# and run for every contributor) there is nothing to journal and no reason
-# to create ~/.outerlayer: bow out before touching the filesystem.
-[ -n "$OUTERLAYER_SPOOL_DIR" ] || [ -d "$HOME/.outerlayer" ] || exit 0
-SPOOL_DIR="\${OUTERLAYER_SPOOL_DIR:-$HOME/.outerlayer/spool}"
-mkdir -p "$SPOOL_DIR" 2>/dev/null || exit 0
-FILE="$SPOOL_DIR/commits.jsonl"
-if [ -f "$FILE" ] && [ "$(wc -c < "$FILE" 2>/dev/null || echo 0)" -gt 5242880 ]; then
-  mv -f "$FILE" "$FILE.1" 2>/dev/null || true
-fi
-REPO="$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null)"
-if [ -z "$REPO" ]; then
-  REPO="$(git rev-parse --git-common-dir 2>/dev/null)" || exit 0
-  case "$REPO" in /*) ;; *) REPO="$PWD/$REPO" ;; esac
-fi
-SHA="$(git rev-parse HEAD 2>/dev/null)" || exit 0
-TS="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
-case "$SHA" in
-  *[!0-9a-f]*) exit 0 ;;
-esac
-REPO_ESCAPED=$(printf '%s' "$REPO" | sed -e 's/\\\\/\\\\\\\\/g' -e 's/"/\\\\"/g')
-printf '{"t":"%s","repo":"%s","sha":"%s"}
-' "$TS" "$REPO_ESCAPED" "$SHA" >> "$FILE" 2>/dev/null || true
-exit 0
-`;
-var PREPARE_COMMIT_MSG_HOOK_SCRIPT = `#!/bin/sh
-${POST_REWRITE_VERSION}
-# Appends "OuterLayer-Session: <id>" to commits made during a recorded agent
-# session, so the commit itself carries the session identity through squash
-# and cross-machine rebases (the server-side trailer tier parses it). Stamps
-# NOTHING outside a session: the agent env marker is required, and the id
-# comes from the shell's own session variable \u2014 exact, because the commit
-# process is a child of the session that issued it \u2014 with the spool journal
-# as the fallback for harnesses that don't export one. Always exits 0.
-# The journal-fallback selection rules mirror detectActiveSession in
-# packages/cli/src/session-detect.ts \u2014 keep them in step.
-[ -n "$OUTERLAYER_NO_TRAILER" ] && exit 0
-[ -n "$CLAUDECODE" ] || exit 0
-MSG_FILE="$1"
-[ -f "$MSG_FILE" ] || exit 0
-grep -qi '^outerlayer-session:' "$MSG_FILE" 2>/dev/null && exit 0
-SID="$CLAUDE_CODE_SESSION_ID"
-case "$SID" in
-  *[!0-9a-fA-F-]*) SID="" ;;
-esac
-if [ -n "$SID" ]; then
-  printf '\\nOuterLayer-Session: %s\\n' "$SID" >> "$MSG_FILE" 2>/dev/null || true
-  exit 0
-fi
-SPOOL_DIR="\${OUTERLAYER_SPOOL_DIR:-$HOME/.outerlayer/spool}"
-EVENTS="$SPOOL_DIR/events.jsonl"
-[ -f "$EVENTS" ] || exit 0
-TOP="$(git rev-parse --show-toplevel 2>/dev/null)" || exit 0
-[ -n "$TOP" ] || exit 0
-TOP_REAL="$(cd "$TOP" 2>/dev/null && pwd -P)" || TOP_REAL="$TOP"
-CUTOFF="$(date -u -v-24H +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || date -u -d '24 hours ago' +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || echo 1970-01-01T00:00:00Z)"
-SID="$(tail -c 65536 "$EVENTS" 2>/dev/null | awk -v top="$TOP" -v topr="$TOP_REAL" -v cutoff="$CUTOFF" '
-  function field(line, key,   re, v) {
-    re = "\\"" key "\\":\\"[^\\"]*\\""
-    if (match(line, re) == 0) return ""
-    v = substr(line, RSTART, RLENGTH)
-    sub("^\\"" key "\\":\\"", "", v); sub("\\"$", "", v)
-    return v
-  }
-  # macOS spells one directory two ways (/var is a symlink to /private/var);
-  # git reports the resolved form while the session recorded the launch
-  # spelling, so both sides normalize before comparing.
-  function norm(p) { sub(/^\\/private\\//, "/", p); return p }
-  function cwdMatches(c,   cn, tn, rn) {
-    cn = norm(c); tn = norm(top); rn = norm(topr)
-    return cn == tn || cn == rn || index(cn, tn "/") == 1 || index(cn, rn "/") == 1
-  }
-  /^\\{/ {
-    sid = field($0, "sessionId"); if (sid == "") next
-    ev = field($0, "event")
-    if (ev == "SessionEnd") { ended[sid] = 1; next }
-    t = field($0, "t"); c = field($0, "cwd")
-    if (t >= cutoff && cwdMatches(c)) { lastAt[sid] = NR }
-  }
-  END {
-    best = ""; bestNr = 0
-    for (sid in lastAt) if (!ended[sid] && lastAt[sid] > bestNr) { best = sid; bestNr = lastAt[sid] }
-    if (best != "" && best ~ /^[0-9a-fA-F-]+$/) print best
-  }
-')"
-[ -n "$SID" ] || exit 0
-printf '\\nOuterLayer-Session: %s\\n' "$SID" >> "$MSG_FILE" 2>/dev/null || true
-exit 0
-`;
+var JOURNAL_HOOK_MARKER = "# outerlayer post-rewrite journal";
 var PRE_COMMIT_GUARD_MARKER = "# outerlayer materialized-context commit guard";
 var PRE_COMMIT_GUARD_VERSION = `${PRE_COMMIT_GUARD_MARKER} v1`;
 var PRE_COMMIT_GUARD_BODY_SIGNATURE = "outerlayer: refusing to commit materialized control-plane context";
@@ -242,12 +112,7 @@ echo "  $REMEDY" >&2
 exit 1
 `;
 function managedHookScripts() {
-  return [
-    ["post-rewrite", printableHookScript(POST_REWRITE_HOOK_SCRIPT)],
-    ["post-commit", printableHookScript(POST_COMMIT_HOOK_SCRIPT)],
-    ["prepare-commit-msg", printableHookScript(PREPARE_COMMIT_MSG_HOOK_SCRIPT)],
-    ["pre-commit", printableHookScript(PRE_COMMIT_GUARD_SCRIPT)]
-  ];
+  return [["pre-commit", printableHookScript(PRE_COMMIT_GUARD_SCRIPT)]];
 }
 function printableHookScript(script) {
   const lines = script.split("\n");
@@ -299,32 +164,6 @@ function installHookFile(dir, name, script, marker) {
   chmodSync(path, 493);
   return existing === void 0 ? "installed" : "updated";
 }
-function installPostRewriteHook(cwd, opts) {
-  const stampTrailers = opts?.stampTrailers ?? true;
-  const inRepo = git(cwd, ["rev-parse", "--is-inside-work-tree"]);
-  if (inRepo !== "true") return { status: "not-a-repo" };
-  if ((git(cwd, ["config", "core.hooksPath"]) ?? "") !== "") {
-    return { status: "skipped-custom-hooks-path" };
-  }
-  const dir = hooksDir(cwd);
-  if (dir === void 0) return { status: "not-a-repo" };
-  const pairOutcomes = [
-    installHookFile(dir, "post-rewrite", POST_REWRITE_HOOK_SCRIPT, POST_REWRITE_MARKER),
-    installHookFile(dir, "post-commit", POST_COMMIT_HOOK_SCRIPT, POST_REWRITE_MARKER)
-  ];
-  const outcomes = [...pairOutcomes];
-  if (stampTrailers) {
-    outcomes.push(installHookFile(dir, "prepare-commit-msg", PREPARE_COMMIT_MSG_HOOK_SCRIPT, POST_REWRITE_MARKER));
-  } else {
-    removeOurHookFile(join(dir, "prepare-commit-msg"), POST_REWRITE_MARKER);
-  }
-  const path = join(dir, "post-rewrite");
-  if (pairOutcomes.every((o) => o === "skipped-foreign")) return { status: "skipped-foreign", path };
-  if (outcomes.every((o) => o === "unchanged")) return { status: "unchanged", path };
-  if (outcomes.includes("updated")) return { status: "updated", path };
-  if (outcomes.includes("installed")) return { status: "installed", path };
-  return { status: "skipped-foreign", path };
-}
 function removeOurHookFile(path, marker) {
   if (!existsSync(path)) return false;
   let content;
@@ -341,33 +180,14 @@ function isOwnRecognitionLine(content, marker) {
   const secondLine = content.split("\n", 2)[1];
   return secondLine !== void 0 && secondLine.startsWith(marker);
 }
-function removePostRewriteHook(cwd) {
+function removeJournalHooks(cwd) {
   const dir = hooksDir(cwd);
   if (dir === void 0) return { removed: false };
   let removed = false;
   for (const name of ["post-rewrite", "post-commit", "prepare-commit-msg"]) {
-    if (removeOurHookFile(join(dir, name), POST_REWRITE_MARKER)) removed = true;
+    if (removeOurHookFile(join(dir, name), JOURNAL_HOOK_MARKER)) removed = true;
   }
-  return { removed, path: join(dir, "post-rewrite") };
-}
-function postRewriteHookPresence(cwd) {
-  const inRepo = git(cwd, ["rev-parse", "--is-inside-work-tree"]);
-  if (inRepo !== "true") return "not-a-repo";
-  if ((git(cwd, ["config", "core.hooksPath"]) ?? "") !== "") return "custom-hooks-path";
-  const dir = hooksDir(cwd);
-  if (dir === void 0) return "not-a-repo";
-  const states = ["post-rewrite", "post-commit"].map((name) => {
-    let content;
-    try {
-      content = readFileSync(join(dir, name), "utf8");
-    } catch {
-      return "absent";
-    }
-    return content.includes(POST_REWRITE_MARKER) ? "ours" : "foreign";
-  });
-  if (states.every((st) => st === "ours")) return "ours";
-  if (states.includes("foreign")) return "foreign";
-  return "absent";
+  return { removed, path: dir };
 }
 function installPreCommitGuardHook(cwd) {
   const inRepo = git(cwd, ["rev-parse", "--is-inside-work-tree"]);
@@ -469,4 +289,4 @@ function huskyPrepareScript(repoRoot) {
   return null;
 }
 
-export { contextExcludesPresent, deadHooksState, ensureContextExcludes, ensurePreCommitGuardHook, huskyPrepareScript, installPostRewriteHook, installPreCommitGuardHook, managedHookScripts, postRewriteHookPresence, preparePackageManagerCommand, removePostRewriteHook, removePreCommitGuardHook };
+export { contextExcludesPresent, deadHooksState, ensureContextExcludes, ensurePreCommitGuardHook, huskyPrepareScript, installPreCommitGuardHook, managedHookScripts, preparePackageManagerCommand, removeJournalHooks, removePreCommitGuardHook };

package/dist/{chunk-XN2XZFTK.js → chunk-NTTPJV35.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { decodeWrappedCommand } from './chunk-ECSYRPCC.js';
+import { decodeWrappedCommand } from './chunk-R5KBGVII.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
 import { readFileSync } from 'fs';
 import { spawn } from 'child_process';

package/dist/{chunk-A6NNKRJU.js → chunk-NXLLURA4.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { deadHooksState, huskyPrepareScript, preparePackageManagerCommand } from './chunk-IWIUYLDR.js';
+import { deadHooksState, huskyPrepareScript, preparePackageManagerCommand } from './chunk-I3ETLSNE.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
 import { readFileSync, mkdirSync, writeFileSync, renameSync, existsSync, statSync, appendFileSync, openSync, opendirSync, unlinkSync } from 'fs';
 import { spawn, execFileSync } from 'child_process';
@@ -385,7 +385,7 @@ function hookErrorsContext(home, writtenBytes, seenBytes) {
 }
 async function handleWorkLaunch(sessionId, home, env, spawnImpl = spawnDetached) {
   if (!sessionId || env.OUTERLAYER_WORK === void 0) return void 0;
-  const { parseWorkItemEnv, appendLaunchRecord } = await import('./work-launch-YNNCKIH3.js');
+  const { parseWorkItemEnv, appendLaunchRecord } = await import('./work-launch-LT663PB3.js');
   const parsed = parseWorkItemEnv(env.OUTERLAYER_WORK);
   if ("reason" in parsed) {
     logHookError(home, new Error(`OUTERLAYER_WORK ignored: ${parsed.reason}`));
@@ -597,7 +597,7 @@ async function runHookFast(event, home = homeFromEnv(), read = readStdin, env =
       recordHookErrorsSeen(home, hookErrorsBytes);
       if (contextPossiblyGoverned(sessionCwd, home)) {
         try {
-          const { materializeContext: materialize } = await import('./context-materialize-J6CRQ7O7.js');
+          const { materializeContext: materialize } = await import('./context-materialize-6WKT3RBQ.js');
           const sessionId = typeof payload.session_id === "string" ? payload.session_id : "unknown";
           const result = await materialize({ cwd: sessionCwd, sessionId, home });
           materializeMessage = result.message;
@@ -647,4 +647,4 @@ function logHookError(home, err) {
   }
 }
 
-export { AUTO_SYNC_DEBOUNCE_MS, SYNC_STALE_AFTER_MS, WORK_ADD_RETRIES, assessSyncHealth, checkInstalledCliStaleness, contextPossiblyGoverned, formatAgo, handleWorkLaunch, hookFiredMarkerPath, maybeAutoSync, readSyncStatus, refreshCommand, runHookFast, sanitizeForContext, spoolDir, workspaceRootOf, writeSyncStatus };
+export { AUTO_SYNC_DEBOUNCE_MS, SYNC_STALE_AFTER_MS, WORK_ADD_RETRIES, assessSyncHealth, checkInstalledCliStaleness, contextPossiblyGoverned, formatAgo, handleWorkLaunch, hookFiredMarkerPath, installedCliDistDir, maybeAutoSync, readSyncStatus, refreshCommand, runHookFast, sanitizeForContext, spoolDir, workspaceRootOf, writeSyncStatus };

package/dist/{chunk-VU34RWDU.js → chunk-Q6CL5THG.js}

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { resolveRepoIdentity, detectActiveSession } from './chunk-DEDV5V4U.js';
-import { parseTrackerNumber, trackerNumberError } from './chunk-RCQXYLMO.js';
+import { detectActiveSession } from './chunk-U32VSRLO.js';
+import { resolveRepoIdentity } from './chunk-4TNZMO7V.js';
+import { parseTrackerNumber, trackerNumberError } from './chunk-WZBHBH3J.js';
 import { readCloudConfig } from './chunk-TFUIDMOB.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
 

package/dist/{chunk-ECSYRPCC.js → chunk-R5KBGVII.js}

@@ -2,7 +2,7 @@
 import { createRequire } from 'node:module';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
 import { existsSync, readFileSync, mkdirSync, copyFileSync, writeFileSync } from 'fs';
-import { join, dirname } from 'path';
+import { join, dirname, isAbsolute } from 'path';
 
 createRequire(import.meta.url);
 var REGISTERED_EVENTS = ["SessionStart", "SessionEnd", "Stop"];
@@ -46,14 +46,20 @@ function quoteBin(bin) {
 function isOurBin(bin, cliBin) {
   if (cliBin !== void 0 && normalizeBinPath(bin) === normalizeBinPath(cliBin)) return true;
   const parts = bin.replace(/\\/g, "/").split("/");
+  if (isPublishedPackageBin(parts)) return true;
   const base = (parts.pop() ?? "").toLowerCase();
   if (base === "outerlayer" || base === "outerlayer.exe" || base === "outerlayer.cmd") return true;
   return parts.some((p) => p.toLowerCase() === ".outerlayer");
 }
+function isPublishedPackageBin(parts) {
+  const n = parts.length;
+  if (n === 2 && parts[0] === "@outerlayer" && /^cli(@[^/]+)?$/.test(parts[1])) return true;
+  return parts[n - 4] === "@outerlayer" && parts[n - 3] === "cli" && parts[n - 2] === "dist" && parts[n - 1] === "index.js";
+}
 function normalizeBinPath(bin) {
   return bin.replace(/\\/g, "/");
 }
-function parseCliInvocation(command, cliBin) {
+function splitCliInvocation(command, cliBin) {
   if (typeof command !== "string") return null;
   const tokens = tokenizeCommand(command.trim());
   if (!tokens) return null;
@@ -62,7 +68,25 @@ function parseCliInvocation(command, cliBin) {
   if (launcher === "node" || launcher === "node.exe" || launcher === "npx") i = 1;
   const bin = tokens[i];
   if (!bin || !isOurBin(bin, cliBin)) return null;
-  return tokens.slice(i + 1);
+  return { bin, args: tokens.slice(i + 1), viaNpx: launcher === "npx" };
+}
+function parseCliInvocation(command, cliBin) {
+  return splitCliInvocation(command, cliBin)?.args ?? null;
+}
+function ourCommandBins(settings) {
+  const bins = [];
+  const add = (command) => {
+    const parsed = splitCliInvocation(command);
+    if (!parsed || parsed.viaNpx) return;
+    if (!["hook", "hook-wrap", "statusline"].includes(parsed.args[0] ?? "")) return;
+    if (parsed.bin.includes("$") || !isAbsolute(parsed.bin)) return;
+    if (!bins.includes(parsed.bin)) bins.push(parsed.bin);
+  };
+  for (const matchers of Object.values(settings?.hooks ?? {})) {
+    for (const matcher of matchers ?? []) for (const h of matcher.hooks ?? []) add(h.command);
+  }
+  add(settings?.statusLine?.command);
+  return bins;
 }
 function parseLifecycleHookCommand(command, cliBin) {
   const args = parseCliInvocation(command, cliBin);
@@ -246,6 +270,28 @@ function wrapHooks(settings, cliBin, opts = {}) {
   }
   return { next, changed, wrapped };
 }
+function repointWrappedHooks(settings, cliBin) {
+  const next = settings ? structuredClone(settings) : {};
+  let changed = false;
+  if (!next.hooks || !cliBinResolvable(cliBin)) return { next, changed };
+  for (const matchers of Object.values(next.hooks)) {
+    for (const matcher of matchers ?? []) {
+      for (let hi = 0; hi < matcher.hooks.length; hi++) {
+        const h = matcher.hooks[hi];
+        const parsed = splitCliInvocation(h.command, cliBin);
+        if (!parsed || parsed.args[0] !== "hook-wrap") continue;
+        if (normalizeBinPath(parsed.bin) === normalizeBinPath(cliBin)) continue;
+        const original = wrappedOriginalCommand(h, cliBin);
+        if (original === null) continue;
+        const flag = parsed.args.includes("--capture-output") ? " --capture-output" : "";
+        const desired = `${quoteBin(cliBin)} hook-wrap --id ${encodeWrappedCommand(original)}${flag}`;
+        matcher.hooks[hi] = { ...h, command: desired, [WRAP_MARKER]: original };
+        changed = true;
+      }
+    }
+  }
+  return { next, changed };
+}
 function statuslineCommand(cliBin) {
   return `${quoteBin(cliBin)} statusline`;
 }
@@ -331,4 +377,4 @@ function unwrapHooks(settings, cliBin) {
   return { next, changed, unwrapped };
 }
 
-export { AUTO_WRAP_EVENTS, REGISTERED_EVENTS, SettingsParseError, cliBinResolvable, decodeWrappedCommand, isOurHookCommand, isOurStatuslineSlot, listHookCandidates, mergeHooks, mergeStatusline, readSettings, removeHooks, removeStatusline, settingsPath, statuslineWrappedOriginal, unwrapHooks, wrapHooks, wrappedOriginalCommand, writeSettings };
+export { AUTO_WRAP_EVENTS, REGISTERED_EVENTS, SettingsParseError, cliBinResolvable, decodeWrappedCommand, isOurHookCommand, isOurStatuslineSlot, listHookCandidates, mergeHooks, mergeStatusline, ourCommandBins, readSettings, removeHooks, removeStatusline, repointWrappedHooks, settingsPath, statuslineWrappedOriginal, unwrapHooks, wrapHooks, wrappedOriginalCommand, writeSettings };