@macintacos/caret 0.1.3 → 0.2.0

package/dist/cli.js

@@ -5790,7 +5790,7 @@ import { createHash } from "crypto";
 // package.json
 var package_default = {
   name: "@macintacos/caret",
-  version: "0.1.3",
+  version: "0.2.0",
   license: "MIT",
   type: "module",
   description: "A Claude Code plugin that replaces the terminal plan-approval prompt with a local web UI for inline review, annotation, and approval.",
@@ -5980,7 +5980,7 @@ function currentCommit() {
 }
 
 // src/commands/daemon.ts
-import { randomUUID as randomUUID2 } from "crypto";
+import { randomUUID } from "crypto";
 import { existsSync as existsSync3, unlinkSync as unlinkSync3 } from "fs";
 
 // src/daemon-lifecycle.ts
@@ -6026,6 +6026,22 @@ async function longPoll(baseUrl, id) {
     throw new Error(`decision long-poll failed: ${res.status}`);
   return await res.json();
 }
+async function listReviews(baseUrl) {
+  const res = await fetch(`${baseUrl}/api/reviews`, { signal: AbortSignal.timeout(1000) });
+  if (!res.ok)
+    throw new Error(`GET /api/reviews failed: ${res.status}`);
+  return await res.json();
+}
+async function resolveReview(baseUrl, id, body) {
+  const res = await fetch(`${baseUrl}/api/reviews/${id}/resolve`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+    signal: AbortSignal.timeout(1000)
+  });
+  if (!res.ok)
+    throw new Error(`POST /resolve failed: ${res.status}`);
+}
 
 // src/log.ts
 var import_pino = __toESM(require_pino(), 1);
@@ -6202,7 +6218,7 @@ function toClientReview(review) {
     annotations: cur.annotations,
     versions: review.versions,
     generalCommentDraft: review.generalCommentDraft ?? "",
-    composerScratches: review.composerScratches ?? [],
+    composerScratches: cur.composerScratches ?? [],
     createdAt: review.createdAt,
     updatedAt: review.updatedAt,
     decision: review.decision
@@ -20954,6 +20970,172 @@ function createDecisions(log = noopLogger) {
   };
 }
 
+// src/plan-files.ts
+import { readdirSync as readdirSync2, readFileSync as readFileSync6, realpathSync, statSync as statSync2 } from "fs";
+import { extname, isAbsolute, join as join6, relative as relative2, resolve, sep } from "path";
+var EXCERPT_RADIUS = 6;
+var EXCERPT_HEAD_LINES = 13;
+var MAX_EXCERPT_BYTES = 2 * 1024 * 1024;
+var MAX_SCAN_ENTRIES = 5000;
+var SKIP_DIRS = new Set(["node_modules", "dist", "build", "coverage", "out"]);
+var EXT_LANGUAGE = {
+  ".ts": "typescript",
+  ".mts": "typescript",
+  ".cts": "typescript",
+  ".tsx": "tsx",
+  ".js": "javascript",
+  ".mjs": "javascript",
+  ".cjs": "javascript",
+  ".jsx": "jsx",
+  ".svelte": "svelte",
+  ".vue": "vue",
+  ".json": "json",
+  ".jsonc": "jsonc",
+  ".css": "css",
+  ".scss": "scss",
+  ".less": "less",
+  ".html": "html",
+  ".htm": "html",
+  ".xml": "xml",
+  ".svg": "xml",
+  ".md": "markdown",
+  ".mdx": "mdx",
+  ".py": "python",
+  ".rb": "ruby",
+  ".rs": "rust",
+  ".go": "go",
+  ".java": "java",
+  ".kt": "kotlin",
+  ".c": "c",
+  ".h": "c",
+  ".cc": "cpp",
+  ".cpp": "cpp",
+  ".hpp": "cpp",
+  ".sh": "shellscript",
+  ".bash": "shellscript",
+  ".zsh": "shellscript",
+  ".toml": "toml",
+  ".yaml": "yaml",
+  ".yml": "yaml",
+  ".ini": "ini",
+  ".sql": "sql",
+  ".graphql": "graphql",
+  ".gql": "graphql",
+  ".php": "php",
+  ".swift": "swift",
+  ".dart": "dart"
+};
+function languageForPath(path) {
+  return EXT_LANGUAGE[extname(path).toLowerCase()] ?? "text";
+}
+function safeRealpath(path) {
+  try {
+    return realpathSync(path);
+  } catch {
+    return null;
+  }
+}
+function containedFile(cwdReal, abs) {
+  const real = safeRealpath(abs);
+  if (real === null)
+    return null;
+  if (real !== cwdReal && !real.startsWith(cwdReal + sep))
+    return null;
+  try {
+    if (!statSync2(real).isFile())
+      return null;
+  } catch {
+    return null;
+  }
+  return real;
+}
+function basenameSearch(cwdReal, name) {
+  if (name === "")
+    return null;
+  let scanned = 0;
+  const queue = [cwdReal];
+  while (queue.length > 0) {
+    const currentDir = queue.shift();
+    let entries;
+    try {
+      entries = readdirSync2(currentDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (++scanned > MAX_SCAN_ENTRIES)
+        return null;
+      if (entry.isFile()) {
+        if (entry.name === name)
+          return join6(currentDir, entry.name);
+      } else if (entry.isDirectory() && !SKIP_DIRS.has(entry.name) && !entry.name.startsWith(".")) {
+        queue.push(join6(currentDir, entry.name));
+      }
+    }
+  }
+  return null;
+}
+function resolveFileInCwd(cwd, candidate) {
+  if (cwd === "" || !isAbsolute(cwd))
+    return null;
+  const cwdReal = safeRealpath(cwd);
+  if (cwdReal === null)
+    return null;
+  const cleaned = candidate.trim();
+  if (cleaned === "")
+    return null;
+  const direct = containedFile(cwdReal, resolve(cwdReal, cleaned));
+  if (direct !== null)
+    return direct;
+  const name = cleaned.split("/").pop() ?? "";
+  return basenameSearch(cwdReal, name);
+}
+function readFileExcerpt(cwd, candidate, line) {
+  const abs = resolveFileInCwd(cwd, candidate);
+  if (abs === null)
+    return null;
+  let size;
+  try {
+    size = statSync2(abs).size;
+  } catch {
+    return null;
+  }
+  if (size > MAX_EXCERPT_BYTES)
+    return null;
+  let content;
+  try {
+    content = readFileSync6(abs, "utf-8");
+  } catch {
+    return null;
+  }
+  if (content.includes("\x00"))
+    return null;
+  const allLines = content.split(`
+`);
+  if (allLines.length > 1 && allLines[allLines.length - 1] === "")
+    allLines.pop();
+  const totalLines = allLines.length;
+  let startLine;
+  let endLine;
+  if (line !== undefined && line >= 1) {
+    const target = Math.min(line, totalLines);
+    startLine = Math.max(1, target - EXCERPT_RADIUS);
+    endLine = Math.min(totalLines, target + EXCERPT_RADIUS);
+  } else {
+    startLine = 1;
+    endLine = Math.min(totalLines, EXCERPT_HEAD_LINES);
+  }
+  const cwdReal = safeRealpath(cwd) ?? cwd;
+  return {
+    path: relative2(cwdReal, abs),
+    language: languageForPath(abs),
+    startLine,
+    endLine,
+    lines: allLines.slice(startLine - 1, endLine),
+    totalLines
+  };
+}
+
 // src/prefs.ts
 import { readFile as readFile2, writeFile } from "fs/promises";
 import { dirname as dirname3 } from "path";
@@ -20983,17 +21165,17 @@ async function writeApproveMode(mode, file2 = prefsFile(), log = noopLogger, set
 }
 
 // src/reviews.ts
-import { randomUUID } from "crypto";
+import { randomBytes } from "crypto";
 
 // src/plan-file.ts
-import { existsSync as existsSync2, statSync as statSync2, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync2, statSync as statSync3, writeFileSync as writeFileSync2 } from "fs";
 function writeCanonicalPlanFile(planFilePath, canonical, log) {
   if (!planFilePath)
     return;
   try {
     if (!planFilePath.endsWith(".md"))
       return;
-    if (!existsSync2(planFilePath) || !statSync2(planFilePath).isFile())
+    if (!existsSync2(planFilePath) || !statSync3(planFilePath).isFile())
       return;
     writeFileSync2(planFilePath, canonical);
   } catch (err) {
@@ -27764,6 +27946,9 @@ async function formatPlanMarkdown(plan, log = noopLogger, doFormat = prettierFor
 }
 
 // src/reviews.ts
+function newReviewId() {
+  return randomBytes(8).toString("base64url");
+}
 function deriveTitle(plan) {
   for (const line of plan.split(`
 `)) {
@@ -27812,7 +27997,7 @@ async function routeIncomingPlan(input, store, log = noopLogger) {
       expired
     };
   }
-  const id = randomUUID();
+  const id = newReviewId();
   const planEpoch = store.epochOf(sessionId);
   const review = {
     id,
@@ -27921,6 +28106,8 @@ var PlanInputSchema = exports_external.object({
   plan: exports_external.string().optional(),
   planFilePath: exports_external.string().optional()
 }).catch({});
+var MAX_FILE_REFS = 200;
+var FileRefsBodySchema = exports_external.object({ paths: exports_external.array(exports_external.string()).catch([]) }).catch({ paths: [] });
 var BehaviorSchema = exports_external.enum(["allow", "deny"]);
 var ResolveBodySchema = exports_external.object({
   behavior: BehaviorSchema.catch("allow"),
@@ -27971,11 +28158,13 @@ var nullToUndefined = (v2) => v2 ?? undefined;
 var DraftBodySchema = exports_external.object({
   annotations: exports_external.array(AnnotationSchema).nullish().transform(nullToUndefined),
   generalCommentDraft: exports_external.string().nullish().transform(nullToUndefined),
-  composerScratches: exports_external.array(PersistedScratchSchema).nullish().transform(nullToUndefined).catch(undefined)
+  composerScratches: exports_external.array(PersistedScratchSchema).nullish().transform(nullToUndefined).catch(undefined),
+  version: exports_external.number().int().min(1).nullish().transform(nullToUndefined).catch(undefined)
 }).catch({
   annotations: undefined,
   generalCommentDraft: undefined,
-  composerScratches: undefined
+  composerScratches: undefined,
+  version: undefined
 });
 async function parseBody(req, schema) {
   return schema.parse(await req.json().catch(() => ({})));
@@ -27998,7 +28187,7 @@ function resolveOptions(opts) {
     log: opts.log ?? noopLogger
   };
 }
-var ID_ROUTE_RE = /^\/api\/reviews\/([^/]+)(\/decision|\/resolve|\/draft|\/expire)?$/;
+var ID_ROUTE_RE = /^\/api\/reviews\/([^/]+)(\/decision|\/resolve|\/draft|\/expire|\/file-refs|\/file)?$/;
 function matchIdRoute(path) {
   const m = path.match(ID_ROUTE_RE);
   if (!m)
@@ -28012,11 +28201,11 @@ function createServer(opts) {
   const { awaitDecision, resolveDecision, clearDecision, openDecisionCount } = createDecisions(log);
   const approveModeSet = approveVariants && approveVariants.length > 0 ? { valid: approveVariants.map((v2) => v2.id), fallback: approveVariants[0]?.id ?? "default" } : { valid: ["default"], fallback: "default" };
   function raceDecision(id, ms2) {
-    return new Promise((resolve) => {
-      const t = setTimeout(() => resolve(null), ms2);
+    return new Promise((resolve2) => {
+      const t = setTimeout(() => resolve2(null), ms2);
       awaitDecision(id).then((d) => {
         clearTimeout(t);
-        resolve(d);
+        resolve2(d);
       });
     });
   }
@@ -28148,6 +28337,34 @@ function createServer(opts) {
     const r = store.get(id);
     return r ? Response.json(toClientReview(r)) : notFound();
   }
+  async function handleFileRefs(req, id) {
+    const r = store.get(id);
+    if (!r)
+      return notFound();
+    const { paths } = await parseBody(req, FileRefsBodySchema);
+    const seen = new Set;
+    const resolved = [];
+    for (const p of paths.slice(0, MAX_FILE_REFS)) {
+      if (seen.has(p))
+        continue;
+      seen.add(p);
+      if (resolveFileInCwd(r.cwd, p) !== null)
+        resolved.push(p);
+    }
+    log.debug("request", `file-refs resolved: ${resolved.length}/${seen.size}`, { reviewId: id });
+    return Response.json({ resolved });
+  }
+  function handleFileExcerpt(req, id) {
+    const r = store.get(id);
+    if (!r)
+      return notFound();
+    const params = new URL(req.url).searchParams;
+    const path = params.get("path") ?? "";
+    const lineRaw = params.get("line");
+    const line = lineRaw !== null && /^\d+$/.test(lineRaw) ? Number(lineRaw) : undefined;
+    const excerpt = readFileExcerpt(r.cwd, path, line);
+    return excerpt ? Response.json(excerpt) : notFound();
+  }
   async function handleDecision(id) {
     const inMem = store.get(id);
     if (inMem?.decision) {
@@ -28181,8 +28398,9 @@ function createServer(opts) {
       if (body.generalCommentDraft != null) {
         r.generalCommentDraft = body.generalCommentDraft;
       }
-      if (body.composerScratches != null) {
-        r.composerScratches = body.composerScratches;
+      const cur = currentVersion(r);
+      if (body.composerScratches != null && (body.version == null || body.version === cur.version)) {
+        cur.composerScratches = body.composerScratches;
       }
     });
     if (updated)
@@ -28204,7 +28422,7 @@ function createServer(opts) {
       r.decision = decision;
       r.status = decision.behavior === "allow" ? "approved" : "rejected";
       r.generalCommentDraft = "";
-      r.composerScratches = [];
+      currentVersion(r).composerScratches = [];
     });
     if (decision.behavior === "allow") {
       store.bumpEpoch(existing.sessionId);
@@ -28257,6 +28475,10 @@ function createServer(opts) {
       const { id, sub } = route;
       if (method === "GET" && !sub)
         return handleGetReview(id);
+      if (method === "GET" && sub === "/file")
+        return handleFileExcerpt(req, id);
+      if (method === "POST" && sub === "/file-refs")
+        return handleFileRefs(req, id);
       if (method === "GET" && sub === "/decision")
         return handleDecision(id);
       if (method === "PUT" && sub === "/draft")
@@ -28347,7 +28569,7 @@ function createServer(opts) {
 
 // src/store.ts
 import { readdir, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 function createStore(dir, log = noopLogger) {
   const reviews = new Map;
   const epochs = new Map;
@@ -28356,7 +28578,7 @@ function createStore(dir, log = noopLogger) {
     const prev = writeChains.get(review.id) ?? Promise.resolve();
     const next = prev.catch(() => {}).then(async () => {
       ensureStateDir(dir);
-      await writeFile2(join6(dir, `${review.id}.json`), JSON.stringify(review, null, 2), {
+      await writeFile2(join7(dir, `${review.id}.json`), JSON.stringify(review, null, 2), {
         mode: 384
       });
       log.debug("store", `review persisted: ${shortId(review.id)}`, { reviewId: review.id });
@@ -28399,14 +28621,14 @@ function createStore(dir, log = noopLogger) {
         return;
       review.status = "expired";
       review.generalCommentDraft = "";
-      review.composerScratches = [];
+      currentVersion(review).composerScratches = [];
       review.updatedAt = Math.max(Date.now(), review.updatedAt + 1);
       reviews.delete(id);
       await persist(review);
       return review;
     },
     async persisted(id) {
-      return await readJsonFile(join6(dir, `${id}.json`)) ?? undefined;
+      return await readJsonFile(join7(dir, `${id}.json`)) ?? undefined;
     },
     size() {
       return reviews.size;
@@ -28433,7 +28655,7 @@ function createStore(dir, log = noopLogger) {
         if (!file2.endsWith(".json"))
           continue;
         try {
-          const review = JSON.parse(await readFile3(join6(dir, file2), "utf-8"));
+          const review = JSON.parse(await readFile3(join7(dir, file2), "utf-8"));
           if (isUnresolved(review.status)) {
             reviews.set(review.id, review);
             loaded++;
@@ -28481,7 +28703,7 @@ async function runDaemon(opts) {
       buildId: await currentBuildId(),
       commit: currentCommit(),
       stateDir: stateDir(),
-      instanceId: randomUUID2().slice(0, 8),
+      instanceId: randomUUID().slice(0, 8),
       approveVariants: adapter.approveVariants,
       log
     });
@@ -28523,8 +28745,8 @@ import { existsSync as existsSync4 } from "fs";
 import { release } from "os";
 
 // src/discovery.ts
-import { readdirSync as readdirSync2, statSync as statSync3 } from "fs";
-import { basename, join as join7 } from "path";
+import { readdirSync as readdirSync3, statSync as statSync4 } from "fs";
+import { basename, join as join8 } from "path";
 var CARET_BIN = "caret-native";
 async function safe(build) {
   try {
@@ -28724,7 +28946,7 @@ function listReviewFiles() {
   const dir = reviewsDir();
   let files;
   try {
-    files = readdirSync2(dir);
+    files = readdirSync3(dir);
   } catch {
     return [];
   }
@@ -28734,7 +28956,7 @@ function listReviewFiles() {
       continue;
     if (out.length >= 5000)
       break;
-    const raw = readJsonFileSync(join7(dir, file2));
+    const raw = readJsonFileSync(join8(dir, file2));
     if (raw && typeof raw.id === "string" && typeof raw.status === "string") {
       out.push({ id: raw.id, status: raw.status });
     }
@@ -28745,7 +28967,7 @@ var TAIL_BYTES = 256 * 1024;
 async function logStats(path) {
   let size;
   try {
-    size = statSync3(path).size;
+    size = statSync4(path).size;
   } catch {
     return { path, exists: false, size: 0, errors: 0, warns: 0 };
   }
@@ -28832,8 +29054,8 @@ async function runDiscoverySubcommand(opts) {
 }
 
 // src/commands/install-opencode.ts
-import { existsSync as existsSync7, readFileSync as readFileSync7, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync8, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "fs";
+import { join as join10 } from "path";
 
 // src/adapters/opencode/deploy.ts
 import { existsSync as existsSync5, mkdirSync as mkdirSync2, rmSync, writeFileSync as writeFileSync4 } from "fs";
@@ -28892,27 +29114,27 @@ function removeFiles(targets, opts) {
 }
 
 // src/adapters/opencode/packaging.ts
-import { existsSync as existsSync6, readFileSync as readFileSync6, readdirSync as readdirSync3 } from "fs";
-import { dirname as dirname6, join as join8 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync7, readdirSync as readdirSync4 } from "fs";
+import { dirname as dirname6, join as join9 } from "path";
 function resolveCaretRoot() {
   const candidates = [];
   const script = process.argv[1];
   if (script)
-    candidates.push(join8(dirname6(script), ".."));
-  candidates.push(join8(dirname6(process.execPath), ".."));
+    candidates.push(join9(dirname6(script), ".."));
+  candidates.push(join9(dirname6(process.execPath), ".."));
   for (const root of candidates) {
-    if (existsSync6(join8(root, "opencode", "caret.plugin.ts")))
+    if (existsSync6(join9(root, "opencode", "caret.plugin.ts")))
       return root;
   }
   throw new Error(`caret OpenCode packaging not found (no opencode/caret.plugin.ts under: ${candidates.join(", ") || "(none)"}). The OpenCode plugin source must ship with caret.`);
 }
 function loadOpencodePackaging(root = resolveCaretRoot()) {
-  const pluginSource = readFileSync6(join8(root, "opencode", "caret.plugin.ts"), "utf-8");
-  const binPath = join8(root, "bin", "caret");
-  const commandsDir = join8(root, "opencode", "commands");
+  const pluginSource = readFileSync7(join9(root, "opencode", "caret.plugin.ts"), "utf-8");
+  const binPath = join9(root, "bin", "caret");
+  const commandsDir = join9(root, "opencode", "commands");
   let commands = [];
   try {
-    commands = readdirSync3(commandsDir).filter((f) => f.endsWith(".md")).sort().map((f) => ({ name: f, contents: readFileSync6(join8(commandsDir, f), "utf-8") }));
+    commands = readdirSync4(commandsDir).filter((f) => f.endsWith(".md")).sort().map((f) => ({ name: f, contents: readFileSync7(join9(commandsDir, f), "utf-8") }));
   } catch {
     commands = [];
   }
@@ -28924,7 +29146,7 @@ function runInstallOpencodeSubcommand(opts, deps = {}) {
   const dir = deps.configDir ?? opencodeConfigDir();
   const pkg = deps.packaging ?? loadOpencodePackaging();
   const pluginPath = pluginFilePath(dir);
-  const commandPaths = pkg.commands.map((c) => join9(commandDir(dir), namespacedCommandFilename(c.name)));
+  const commandPaths = pkg.commands.map((c) => join10(commandDir(dir), namespacedCommandFilename(c.name)));
   if (opts.uninstall) {
     const result2 = removeFiles([pluginPath, ...commandPaths], { dryRun: opts.dryRun });
     const manifest2 = uninstallManifest(dir, opts.dryRun);
@@ -28937,7 +29159,7 @@ function runInstallOpencodeSubcommand(opts, deps = {}) {
       contents: stripNonDefaultExports(renderPlugin(pkg.pluginSource, { version: VERSION, binPath: pkg.binPath }))
     },
     ...pkg.commands.map((c) => ({
-      path: join9(commandDir(dir), namespacedCommandFilename(c.name)),
+      path: join10(commandDir(dir), namespacedCommandFilename(c.name)),
       contents: renderPlugin(c.contents, { version: VERSION, binPath: pkg.binPath })
     }))
   ];
@@ -28974,7 +29196,7 @@ var bunInstall = (configDir2) => {
 };
 function installManifest(dir, dryRun) {
   const path = packageJsonPath(dir);
-  const existing = existsSync7(path) ? readFileSync7(path, "utf-8") : null;
+  const existing = existsSync7(path) ? readFileSync8(path, "utf-8") : null;
   let next;
   try {
     next = addPluginDependency(existing, OPENCODE_PLUGIN_DEP, OPENCODE_PLUGIN_DEP_VERSION);
@@ -28991,7 +29213,7 @@ function uninstallManifest(dir, dryRun) {
   const path = packageJsonPath(dir);
   if (!existsSync7(path))
     return [];
-  const existing = readFileSync7(path, "utf-8");
+  const existing = readFileSync8(path, "utf-8");
   let next;
   try {
     next = removePluginDependency(existing, OPENCODE_PLUGIN_DEP);
@@ -29029,6 +29251,51 @@ async function runPrewarm() {
   process.exit(0);
 }
 
+// src/reconcile.ts
+async function runReconcile(stdin, deps) {
+  const ctx = {};
+  try {
+    const input = deps.parseHookInput(stdin);
+    ctx.sessionId = input.sessionId;
+    if (!input.sessionId)
+      return;
+    const match = (await deps.listReviews()).find((r) => r.sessionId === input.sessionId);
+    if (!match) {
+      logDebug("reconcile", "no pending review for session; nothing to reconcile", { ...ctx });
+      return;
+    }
+    ctx.reviewId = match.id;
+    await deps.resolveReview(match.id);
+    logInfo("reconcile", "terminal approval reconciled", { ...ctx });
+  } catch (err) {
+    logDebug("reconcile", "reconcile skipped", { ...ctx, err: String(err) });
+  }
+}
+
+// src/commands/reconcile.ts
+function prodReconcileDeps(baseUrl, adapter) {
+  return {
+    parseHookInput: (stdin) => adapter.parseHookInput(stdin),
+    listReviews: () => listReviews(baseUrl),
+    resolveReview: (id) => resolveReview(baseUrl, id, { behavior: "allow" })
+  };
+}
+async function runReconcileSubcommand() {
+  try {
+    const loaded = loadSettings();
+    setLogLevel(loaded.logging.level);
+    setRedact(loaded.logging.redact);
+    warnInvalidEnvVars((msg) => logWarn("env", msg));
+    const adapter = selectAdapter();
+    const baseUrl = `http://localhost:${getPort(loaded)}`;
+    const stdin = await Bun.stdin.text();
+    await runReconcile(stdin, prodReconcileDeps(baseUrl, adapter));
+  } catch (err) {
+    logDebug("reconcile", "reconcile subcommand skipped", { err: String(err) });
+  }
+  process.exit(0);
+}
+
 // src/commands/redact.ts
 function runRedactSubcommand() {
   try {
@@ -30404,17 +30671,24 @@ function denyDecision(reason) {
 class TimeoutError extends Error {
 }
 function withTimeout(p, ms2, message) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const t = setTimeout(() => reject(new TimeoutError(message)), ms2);
     p.then((v3) => {
       clearTimeout(t);
-      resolve(v3);
+      resolve2(v3);
     }, (e) => {
       clearTimeout(t);
       reject(e);
     });
   });
 }
+async function expireAbandoned(expire, handle) {
+  if (!handle)
+    return;
+  try {
+    await expire(handle.baseUrl, handle.id);
+  } catch {}
+}
 async function runReview(stdin, deps) {
   let step = "parse";
   const ctx = {};
@@ -30434,6 +30708,7 @@ async function runReview(stdin, deps) {
     step = "postReview";
     const { id, hasLiveClient } = await deps.postReview(baseUrl, input);
     ctx.reviewId = id;
+    deps.onPosted?.(baseUrl, id);
     logDebug("review", `review created: ${shortId(id)}`, { ...ctx });
     const open = new URL(baseUrl);
     open.hostname = VANITY_HOST;
@@ -30509,6 +30784,7 @@ async function runReviewSubcommand() {
   warnInvalidEnvVars((msg) => logWarn("env", msg));
   const adapter = selectAdapter();
   let hookInput;
+  let posted;
   let responded = false;
   const respond = (decision) => {
     if (responded)
@@ -30517,21 +30793,26 @@ async function runReviewSubcommand() {
     process.stdout.write(`${adapter.emitDecision(decision, hookInput)}
 `);
   };
-  const denyAndExit = (reason) => {
+  const denyAndExit = async (reason) => {
     if (!responded)
       logError("signal", new Error(reason));
     respond({ behavior: "deny", feedback: `${reason} See ${logFile()}.`, decidedAt: Date.now() });
+    await expireAbandoned(expireReview, posted);
     process.exit(0);
   };
-  process.once("SIGINT", () => denyAndExit("caret: interrupted (SIGINT) \u2014 denying to fail safe."));
-  process.once("SIGTERM", () => denyAndExit("caret: terminated (SIGTERM) \u2014 denying to fail safe."));
+  process.once("SIGINT", () => void denyAndExit("caret: interrupted (SIGINT) \u2014 denying to fail safe."));
+  process.once("SIGTERM", () => void denyAndExit("caret: terminated (SIGTERM) \u2014 denying to fail safe."));
   const stdin = await Bun.stdin.text();
   try {
     hookInput = adapter.parseHookInput(stdin);
   } catch {
     hookInput = undefined;
   }
-  const out = await runReview(stdin, prodReviewDeps(loaded, adapter));
+  const deps = prodReviewDeps(loaded, adapter);
+  deps.onPosted = (baseUrl, id) => {
+    posted = { baseUrl, id };
+  };
+  const out = await runReview(stdin, deps);
   respond(out);
   process.exit(0);
 }
@@ -32589,10 +32870,11 @@ function runProgram(program2, onError) {
 
 // src/cli.ts
 function buildProgram() {
-  const program2 = createProgram("caret", "caret hook CLI: daemon | prewarm | review | redact | discovery | install-opencode").version(VERSION);
+  const program2 = createProgram("caret", "caret hook CLI: daemon | prewarm | review | reconcile | redact | discovery | install-opencode").version(VERSION);
   program2.command("daemon").description("run the review daemon").option("--ephemeral", "bind an OS-assigned port instead of the configured one").action((opts) => runDaemon({ ephemeral: opts.ephemeral ?? false }));
   program2.command("prewarm").description("warm-start the daemon").action(() => runPrewarm());
   program2.command("review").description("review a plan from stdin (ExitPlanMode hook)").action(() => runReviewSubcommand());
+  program2.command("reconcile").description("reconcile a terminal plan approval into the daemon (ExitPlanMode PostToolUse hook)").action(() => runReconcileSubcommand());
   program2.command("redact").description("write redacted copies of the logs").action(() => runRedactSubcommand());
   program2.command("discovery").description("print a diagnostics report").option("--json", "emit the machine-readable JSON document").action((opts) => runDiscoverySubcommand({ json: opts.json ?? false }));
   program2.command("install-opencode").description("install (or with --uninstall, remove) caret's OpenCode plugin + commands").option("--uninstall", "remove caret's OpenCode files instead of installing them").option("--dry-run", "print what would change without writing").action((opts) => runInstallOpencodeSubcommand({