@macintacos/caret 0.8.1 → 0.8.2

package/dist/cli.js

@@ -1994,7 +1994,7 @@ var require_thread_stream = __commonJS((exports, module) => {
   var { version: version2 } = require_package();
   var { EventEmitter } = __require("events");
   var { Worker } = __require("worker_threads");
-  var { join: join6 } = __require("path");
+  var { join: join7 } = __require("path");
   var { pathToFileURL } = __require("url");
   var { wait } = require_wait();
   var {
@@ -2044,7 +2044,7 @@ var require_thread_stream = __commonJS((exports, module) => {
   function createWorker(stream, opts) {
     const { filename, workerData } = opts;
     const bundlerOverrides = "__bundlerPathsOverrides" in globalThis ? globalThis.__bundlerPathsOverrides : {};
-    const toExecute = bundlerOverrides["thread-stream-worker"] || join6(__dirname, "lib", "worker.js");
+    const toExecute = bundlerOverrides["thread-stream-worker"] || join7(__dirname, "lib", "worker.js");
     const worker = new Worker(toExecute, {
       ...opts.workerOpts,
       name: opts.workerOpts?.name || "thread-stream",
@@ -2508,9 +2508,9 @@ var require_thread_stream = __commonJS((exports, module) => {
 var require_transport = __commonJS((exports, module) => {
   var __dirname = "/Users/juliantorres/GitLocal/Play/caret/node_modules/.bun/pino@10.3.1/node_modules/pino/lib";
   var { createRequire } = __require("module");
-  var { existsSync: existsSync3 } = __require("fs");
+  var { existsSync: existsSync4 } = __require("fs");
   var getCallers = require_caller();
-  var { join: join6, isAbsolute, sep } = __require("path");
+  var { join: join7, isAbsolute, sep } = __require("path");
   var { fileURLToPath: fileURLToPath2 } = __require("url");
   var sleep = require_atomic_sleep();
   var onExit = require_on_exit_leak_free();
@@ -2582,7 +2582,7 @@ var require_transport = __commonJS((exports, module) => {
         return false;
       }
     }
-    return isAbsolute(path) && !existsSync3(path);
+    return isAbsolute(path) && !existsSync4(path);
   }
   function stripQuotes(value) {
     const first = value[0];
@@ -2663,7 +2663,7 @@ var require_transport = __commonJS((exports, module) => {
       throw new Error("only one of target or targets can be specified");
     }
     if (targets) {
-      target = bundlerOverrides["pino-worker"] || join6(__dirname, "worker.js");
+      target = bundlerOverrides["pino-worker"] || join7(__dirname, "worker.js");
       options.targets = targets.filter((dest) => dest.target).map((dest) => {
         return {
           ...dest,
@@ -2680,7 +2680,7 @@ var require_transport = __commonJS((exports, module) => {
         });
       });
     } else if (pipeline) {
-      target = bundlerOverrides["pino-worker"] || join6(__dirname, "worker.js");
+      target = bundlerOverrides["pino-worker"] || join7(__dirname, "worker.js");
       options.pipelines = [pipeline.map((dest) => {
         return {
           ...dest,
@@ -2703,7 +2703,7 @@ var require_transport = __commonJS((exports, module) => {
         return origin;
       }
       if (origin === "pino/file") {
-        return join6(__dirname, "..", "file.js");
+        return join7(__dirname, "..", "file.js");
       }
       let fixTarget2;
       for (const filePath of callers) {
@@ -3632,7 +3632,7 @@ var require_safe_stable_stringify = __commonJS((exports, module) => {
             return circularValue;
           }
           let res = "";
-          let join6 = ",";
+          let join7 = ",";
           const originalIndentation = indentation;
           if (Array.isArray(value)) {
             if (value.length === 0) {
@@ -3646,7 +3646,7 @@ var require_safe_stable_stringify = __commonJS((exports, module) => {
               indentation += spacer;
               res += `
 ${indentation}`;
-              join6 = `,
+              join7 = `,
 ${indentation}`;
             }
             const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -3654,13 +3654,13 @@ ${indentation}`;
             for (;i < maximumValuesToStringify - 1; i++) {
               const tmp2 = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
               res += tmp2 !== undefined ? tmp2 : "null";
-              res += join6;
+              res += join7;
             }
             const tmp = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
             res += tmp !== undefined ? tmp : "null";
             if (value.length - 1 > maximumBreadth) {
               const removedKeys = value.length - maximumBreadth - 1;
-              res += `${join6}"... ${getItemCount(removedKeys)} not stringified"`;
+              res += `${join7}"... ${getItemCount(removedKeys)} not stringified"`;
             }
             if (spacer !== "") {
               res += `
@@ -3681,7 +3681,7 @@ ${originalIndentation}`;
           let separator = "";
           if (spacer !== "") {
             indentation += spacer;
-            join6 = `,
+            join7 = `,
 ${indentation}`;
             whitespace = " ";
           }
@@ -3695,13 +3695,13 @@ ${indentation}`;
             const tmp = stringifyFnReplacer(key2, value, stack, replacer, spacer, indentation);
             if (tmp !== undefined) {
               res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-              separator = join6;
+              separator = join7;
             }
           }
           if (keyLength > maximumBreadth) {
             const removedKeys = keyLength - maximumBreadth;
             res += `${separator}"...":${whitespace}"${getItemCount(removedKeys)} not stringified"`;
-            separator = join6;
+            separator = join7;
           }
           if (spacer !== "" && separator.length > 1) {
             res = `
@@ -3741,7 +3741,7 @@ ${originalIndentation}`;
           }
           const originalIndentation = indentation;
           let res = "";
-          let join6 = ",";
+          let join7 = ",";
           if (Array.isArray(value)) {
             if (value.length === 0) {
               return "[]";
@@ -3754,7 +3754,7 @@ ${originalIndentation}`;
               indentation += spacer;
               res += `
 ${indentation}`;
-              join6 = `,
+              join7 = `,
 ${indentation}`;
             }
             const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -3762,13 +3762,13 @@ ${indentation}`;
             for (;i < maximumValuesToStringify - 1; i++) {
               const tmp2 = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
               res += tmp2 !== undefined ? tmp2 : "null";
-              res += join6;
+              res += join7;
             }
             const tmp = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
             res += tmp !== undefined ? tmp : "null";
             if (value.length - 1 > maximumBreadth) {
               const removedKeys = value.length - maximumBreadth - 1;
-              res += `${join6}"... ${getItemCount(removedKeys)} not stringified"`;
+              res += `${join7}"... ${getItemCount(removedKeys)} not stringified"`;
             }
             if (spacer !== "") {
               res += `
@@ -3781,7 +3781,7 @@ ${originalIndentation}`;
           let whitespace = "";
           if (spacer !== "") {
             indentation += spacer;
-            join6 = `,
+            join7 = `,
 ${indentation}`;
             whitespace = " ";
           }
@@ -3790,7 +3790,7 @@ ${indentation}`;
             const tmp = stringifyArrayReplacer(key2, value[key2], stack, replacer, spacer, indentation);
             if (tmp !== undefined) {
               res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-              separator = join6;
+              separator = join7;
             }
           }
           if (spacer !== "" && separator.length > 1) {
@@ -3847,20 +3847,20 @@ ${originalIndentation}`;
             indentation += spacer;
             let res2 = `
 ${indentation}`;
-            const join7 = `,
+            const join8 = `,
 ${indentation}`;
             const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
             let i = 0;
             for (;i < maximumValuesToStringify - 1; i++) {
               const tmp2 = stringifyIndent(String(i), value[i], stack, spacer, indentation);
               res2 += tmp2 !== undefined ? tmp2 : "null";
-              res2 += join7;
+              res2 += join8;
             }
             const tmp = stringifyIndent(String(i), value[i], stack, spacer, indentation);
             res2 += tmp !== undefined ? tmp : "null";
             if (value.length - 1 > maximumBreadth) {
               const removedKeys = value.length - maximumBreadth - 1;
-              res2 += `${join7}"... ${getItemCount(removedKeys)} not stringified"`;
+              res2 += `${join8}"... ${getItemCount(removedKeys)} not stringified"`;
             }
             res2 += `
 ${originalIndentation}`;
@@ -3876,16 +3876,16 @@ ${originalIndentation}`;
             return '"[Object]"';
           }
           indentation += spacer;
-          const join6 = `,
+          const join7 = `,
 ${indentation}`;
           let res = "";
           let separator = "";
           let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
           if (isTypedArrayWithEntries(value)) {
-            res += stringifyTypedArray(value, join6, maximumBreadth);
+            res += stringifyTypedArray(value, join7, maximumBreadth);
             keys = keys.slice(value.length);
             maximumPropertiesToStringify -= value.length;
-            separator = join6;
+            separator = join7;
           }
           if (deterministic) {
             keys = sort(keys, comparator);
@@ -3896,13 +3896,13 @@ ${indentation}`;
             const tmp = stringifyIndent(key2, value[key2], stack, spacer, indentation);
             if (tmp !== undefined) {
               res += `${separator}${strEscape(key2)}: ${tmp}`;
-              separator = join6;
+              separator = join7;
             }
           }
           if (keyLength > maximumBreadth) {
             const removedKeys = keyLength - maximumBreadth;
             res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-            separator = join6;
+            separator = join7;
           }
           if (separator !== "") {
             res = `
@@ -5803,8 +5803,8 @@ __export(exports_dist, {
 });
 import { styleText as styleText2, stripVTControlCharacters } from "util";
 import process$1 from "process";
-import { existsSync as existsSync9, lstatSync, readdirSync as readdirSync5 } from "fs";
-import { dirname as dirname7, join as join12 } from "path";
+import { existsSync as existsSync10, lstatSync, readdirSync as readdirSync6 } from "fs";
+import { dirname as dirname8, join as join13 } from "path";
 function isUnicodeSupported() {
   if (process$1.platform !== "win32") {
     return process$1.env.TERM !== "linux";
@@ -6515,10 +6515,10 @@ ${n3}
         return [];
       try {
         let i;
-        existsSync9(t2) ? lstatSync(t2).isDirectory() && (!e.directory || t2.endsWith("/")) ? i = t2 : i = dirname7(t2) : i = dirname7(t2);
+        existsSync10(t2) ? lstatSync(t2).isDirectory() && (!e.directory || t2.endsWith("/")) ? i = t2 : i = dirname8(t2) : i = dirname8(t2);
         const c2 = t2.length > 1 && t2.endsWith("/") ? t2.slice(0, -1) : t2;
-        return readdirSync5(i).map((r2) => {
-          const n3 = join12(i, r2), m3 = lstatSync(n3);
+        return readdirSync6(i).map((r2) => {
+          const n3 = join13(i, r2), m3 = lstatSync(n3);
           return {
             name: r2,
             path: n3,
@@ -8248,8 +8248,8 @@ function fatalDenyLine3(reason) {
 }
 
 // src/adapters/opencode/install.ts
-import { existsSync as existsSync2, readFileSync as readFileSync3 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync3, readFileSync as readFileSync4 } from "fs";
+import { join as join5 } from "path";
 
 // node_modules/.bun/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/scanner.js
 function createScanner(text, ignoreTrivia = false) {
@@ -9575,10 +9575,19 @@ function applyEdits(text, edits) {
 }
 
 // src/adapters/opencode/paths.ts
-import { existsSync } from "fs";
+import { existsSync, readdirSync } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { basename, dirname, join as join3 } from "path";
 var CARET_PACKAGE = "@macintacos/caret";
+function localPluginSpecifier(repoDir) {
+  return `file:${repoDir}`;
+}
+function isLocalPluginSpecifier(spec) {
+  return spec.startsWith("file:");
+}
+function localSpecifierPath(spec) {
+  return isLocalPluginSpecifier(spec) ? spec.slice("file:".length) : undefined;
+}
 var COMMAND_DIRNAME = "commands";
 var COMMAND_NAMESPACE = "caret:";
 function namespacedCommandFilename(sourceName) {
@@ -9603,42 +9612,207 @@ function resolveConfigFile(configDir) {
 function commandDir(configDir) {
   return join3(configDir, COMMAND_DIRNAME);
 }
-function opencodeCachePackageDir(pkg = CARET_PACKAGE) {
+var LEGACY_PLUGIN_FILENAME = "caret.ts";
+var LEGACY_PLUGIN_DIRNAMES = ["plugins", "plugin"];
+var LEGACY_COMMAND_DIRNAME = "command";
+function existingLegacyInstallFiles(configDir) {
+  const plugins = LEGACY_PLUGIN_DIRNAMES.map((d) => join3(configDir, d, LEGACY_PLUGIN_FILENAME));
+  let entries;
+  try {
+    entries = readdirSync(join3(configDir, LEGACY_COMMAND_DIRNAME), { withFileTypes: true });
+  } catch {
+    entries = [];
+  }
+  const commands = entries.filter((e) => !e.isDirectory() && e.name.startsWith(COMMAND_NAMESPACE)).filter((e) => e.name.endsWith(".md")).map((e) => join3(configDir, LEGACY_COMMAND_DIRNAME, e.name)).sort();
+  return [...plugins, ...commands].filter((p) => existsSync(p));
+}
+function opencodeCachePackagesDir() {
   const xdg = process.env.XDG_CACHE_HOME?.trim();
-  const base = xdg || join3(homedir3(), ".cache");
-  return join3(base, "opencode", "node_modules", pkg);
+  return join3(xdg || join3(homedir3(), ".cache"), "opencode", "packages");
+}
+function opencodeCachePackageDir(pkg = CARET_PACKAGE) {
+  return join3(opencodeCachePackagesDir(), pkg);
+}
+function existingOpencodeCachePackageDirs(pkg = CARET_PACKAGE) {
+  const bare = opencodeCachePackageDir(pkg);
+  const parent = dirname(bare);
+  const leaf = basename(bare);
+  let names;
+  try {
+    names = readdirSync(parent);
+  } catch {
+    return [];
+  }
+  const pinned = names.filter((n) => n.startsWith(`${leaf}@`)).sort();
+  return [...names.includes(leaf) ? [bare] : [], ...pinned.map((n) => join3(parent, n))];
+}
+
+// src/adapters/opencode/upgrade.ts
+import { existsSync as existsSync2, readFileSync as readFileSync3, rmSync } from "fs";
+import { join as join4 } from "path";
+
+// src/adapters/opencode/config-plugin.ts
+var FORMATTING = { insertSpaces: true, tabSize: 2 };
+function pluginArray(text) {
+  const cfg = parse3(text);
+  return Array.isArray(cfg?.plugin) ? cfg.plugin : [];
+}
+function splitPluginSpecifier(spec) {
+  if (isLocalPluginSpecifier(spec))
+    return { pkg: spec, version: null };
+  const from = spec.startsWith("@") ? spec.indexOf("/") : 0;
+  if (from === -1)
+    return { pkg: spec, version: null };
+  const at = spec.indexOf("@", from + 1);
+  return at === -1 ? { pkg: spec, version: null } : { pkg: spec.slice(0, at), version: spec.slice(at + 1) };
+}
+function packageName(spec) {
+  return splitPluginSpecifier(spec).pkg;
+}
+function entryNames(entry, pkg) {
+  return typeof entry === "string" && packageName(entry) === packageName(pkg);
+}
+function addPluginToConfigText(existing, pkg) {
+  const text = existing ?? `{}
+`;
+  const current = parse3(text)?.plugin;
+  if (Array.isArray(current)) {
+    if (current.some((e) => entryNames(e, pkg)))
+      return text;
+    const path = ["plugin", current.length];
+    const edits2 = modify(text, path, pkg, {
+      isArrayInsertion: true,
+      formattingOptions: FORMATTING
+    });
+    return applyEdits(text, edits2);
+  }
+  const edits = modify(text, ["plugin"], [pkg], { formattingOptions: FORMATTING });
+  return applyEdits(text, edits);
+}
+function findPluginEntry(existing, pkg) {
+  if (existing === null)
+    return null;
+  const entry = pluginArray(existing).find((e) => entryNames(e, pkg));
+  return typeof entry === "string" ? entry : null;
+}
+function pluginEntries(existing) {
+  return existing === null ? [] : pluginArray(existing).filter((e) => typeof e === "string");
+}
+function setPluginVersionInConfigText(existing, pkg, version) {
+  const arr = pluginArray(existing);
+  const i = arr.findIndex((e) => entryNames(e, pkg));
+  if (i === -1)
+    return existing;
+  const next = `${packageName(arr[i])}@${version}`;
+  const edits = modify(existing, ["plugin", i], next, { formattingOptions: FORMATTING });
+  return applyEdits(existing, edits);
+}
+function removePluginFromConfigText(existing, pkg) {
+  const arr = pluginArray(existing);
+  if (!arr.some((e) => entryNames(e, pkg)))
+    return existing;
+  const next = arr.filter((e) => !entryNames(e, pkg));
+  const edits = modify(existing, ["plugin"], next, { formattingOptions: FORMATTING });
+  return applyEdits(existing, edits);
+}
+
+// src/adapters/opencode/upgrade.ts
+var NPM_LATEST_URL = `https://registry.npmjs.org/${CARET_PACKAGE}/latest`;
+var NPM_TIMEOUT_MS = 3000;
+function parseVersionTriple(v) {
+  const m = v.trim().replace(/^v/, "").match(/^(\d+)\.(\d+)\.(\d+)/);
+  return m ? [Number(m[1]), Number(m[2]), Number(m[3])] : null;
+}
+function isNewer(latest, current) {
+  const a = parseVersionTriple(latest);
+  const b = parseVersionTriple(current);
+  if (!a || !b)
+    return false;
+  const [a0, a1, a2] = a;
+  const [b0, b1, b2] = b;
+  if (a0 !== b0)
+    return a0 > b0;
+  if (a1 !== b1)
+    return a1 > b1;
+  return a2 > b2;
+}
+function upgradeVerdict(input) {
+  const { entry, cached, published } = input;
+  if (published === null) {
+    return { kind: "unknown", reason: "could not reach npm for the published caret version" };
+  }
+  if (parseVersionTriple(published) === null) {
+    return { kind: "unknown", reason: `npm reported an unreadable version (${published})` };
+  }
+  if (entry === null)
+    return { kind: "fresh" };
+  const pinned = splitPluginSpecifier(entry).version;
+  if (pinned !== null && parseVersionTriple(pinned) !== null) {
+    return isNewer(published, pinned) ? { kind: "stale-pin", entry, pinned, published } : { kind: "current", version: pinned };
+  }
+  if (cached === null)
+    return { kind: "fresh" };
+  if (parseVersionTriple(cached) === null) {
+    return { kind: "unknown", reason: `OpenCode cached an unreadable version (${cached})` };
+  }
+  return isNewer(published, cached) ? { kind: "stale-cache", cached, published } : { kind: "current", version: cached };
+}
+function readCachedCaretVersion(dirs = existingOpencodeCachePackageDirs()) {
+  for (const d of dirs) {
+    try {
+      const deps = JSON.parse(readFileSync3(join4(d, "package.json"), "utf-8")).dependencies;
+      const v = deps?.[CARET_PACKAGE];
+      if (typeof v === "string" && v.length > 0)
+        return v;
+    } catch {}
+  }
+  return null;
+}
+function clearCachedCaret(dirs = existingOpencodeCachePackageDirs()) {
+  const cleared = [];
+  for (const d of dirs) {
+    if (!existsSync2(d))
+      continue;
+    rmSync(d, { recursive: true, force: true });
+    cleared.push(d);
+  }
+  return cleared;
+}
+async function publishedCaretVersion(fetchImpl = fetch) {
+  try {
+    const res = await fetchImpl(NPM_LATEST_URL, { signal: AbortSignal.timeout(NPM_TIMEOUT_MS) });
+    if (!res.ok)
+      return null;
+    const body = await res.json();
+    const v = body?.version;
+    return typeof v === "string" && v.length > 0 ? v : null;
+  } catch {
+    return null;
+  }
 }
 
 // src/adapters/opencode/install.ts
 function readOpencodeInstallState() {
   const dir = opencodeConfigDir();
-  if (!existsSync2(dir)) {
+  if (!existsSync3(dir)) {
     return { pluginVersion: "unknown", pluginEnabled: "unknown", hookInUserSettings: "unknown" };
   }
-  const cacheDir = opencodeCachePackageDir();
+  const version = readCachedCaretVersion(existingOpencodeCachePackageDirs()) ?? "unknown";
   return {
-    pluginVersion: readCachedVersion(cacheDir),
-    pluginEnabled: existsSync2(cacheDir),
+    pluginVersion: version,
+    pluginEnabled: version !== "unknown",
     hookInUserSettings: readCaretInPluginArray(dir)
   };
 }
-function readCachedVersion(cachePackageDir) {
-  try {
-    const v = JSON.parse(readFileSync3(join4(cachePackageDir, "package.json"), "utf-8")).version;
-    return typeof v === "string" ? v : "unknown";
-  } catch {
-    return "unknown";
-  }
-}
 function readCaretInPluginArray(dir) {
   let sawConfig = false;
   for (const name of CONFIG_FILENAMES) {
-    const path = join4(dir, name);
-    if (!existsSync2(path))
+    const path = join5(dir, name);
+    if (!existsSync3(path))
       continue;
     let cfg;
     try {
-      cfg = parse3(readFileSync3(path, "utf-8"));
+      cfg = parse3(readFileSync4(path, "utf-8"));
     } catch {
       continue;
     }
@@ -9719,10 +9893,10 @@ function fatalDeny(reason) {
 
 // src/commands/daemon.ts
 import { randomUUID } from "crypto";
-import { existsSync as existsSync5, unlinkSync as unlinkSync3 } from "fs";
+import { existsSync as existsSync6, unlinkSync as unlinkSync3 } from "fs";
 
 // src/config/settings.ts
-import { readFileSync as readFileSync5, statSync } from "fs";
+import { readFileSync as readFileSync6, statSync } from "fs";
 
 // node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -24065,8 +24239,8 @@ function ensureStateDir(target = stateDir()) {
 import { createHash } from "crypto";
 
 // src/ui/assets.ts
-import { readdirSync } from "fs";
-import { dirname, join as join5, relative } from "path";
+import { readdirSync as readdirSync2 } from "fs";
+import { dirname as dirname2, join as join6, relative } from "path";
 import { fileURLToPath } from "url";
 function fromPathMap(map2) {
   const paths = Object.keys(map2).sort();
@@ -24081,8 +24255,8 @@ function fromPathMap(map2) {
 function assetsFromDist(distDir) {
   const map2 = {};
   const walk = (dir) => {
-    for (const ent of readdirSync(dir, { withFileTypes: true })) {
-      const full = join5(dir, ent.name);
+    for (const ent of readdirSync2(dir, { withFileTypes: true })) {
+      const full = join6(dir, ent.name);
       if (ent.isDirectory())
         walk(full);
       else if (ent.isFile())
@@ -24096,6 +24270,12 @@ function assetsFromDist(distDir) {
   }
   return Object.keys(map2).length > 0 ? fromPathMap(map2) : undefined;
 }
+function uiDistCandidates(moduleUrl) {
+  return [
+    fileURLToPath(new URL("../ui/dist", moduleUrl)),
+    fileURLToPath(new URL("../../ui/dist", moduleUrl))
+  ];
+}
 async function loadUiAssets() {
   try {
     const mod = await import("@/ui-manifest.generated.ts");
@@ -24103,17 +24283,18 @@ async function loadUiAssets() {
       return fromPathMap(mod.UI_MANIFEST);
     }
   } catch {}
-  const srcDist = fileURLToPath(new URL("../../ui/dist", import.meta.url));
-  const fromSrc = assetsFromDist(srcDist);
-  if (fromSrc)
-    return fromSrc;
-  const besideDist = join5(dirname(process.execPath), "ui");
+  for (const dir of uiDistCandidates(import.meta.url)) {
+    const fromDist = assetsFromDist(dir);
+    if (fromDist)
+      return fromDist;
+  }
+  const besideDist = join6(dirname2(process.execPath), "ui");
   return assetsFromDist(besideDist);
 }
 // package.json
 var package_default = {
   name: "@macintacos/caret",
-  version: "0.8.1",
+  version: "0.8.2",
   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.",
@@ -24276,8 +24457,8 @@ function currentCommit() {
 var import_pino = __toESM(require_pino(), 1);
 
 // src/lib/caller-location.ts
-import { dirname as dirname2 } from "path";
-var PKG_ROOT = dirname2(dirname2(import.meta.dir));
+import { dirname as dirname3 } from "path";
+var PKG_ROOT = dirname3(dirname3(import.meta.dir));
 var FRAME = /^\s*at (?:.* \()?(?:file:\/\/)?(.+):(\d+):\d+\)?$/;
 var INTERNAL_SUFFIXES = ["src/lib/caller-location.ts", "src/lib/log.ts"];
 function parseCaller(stack, pkgRoot = PKG_ROOT) {
@@ -24375,7 +24556,7 @@ function shortId(id) {
 }
 
 // src/redact/node.ts
-import { readFileSync as readFileSync4, writeFileSync } from "fs";
+import { readFileSync as readFileSync5, writeFileSync } from "fs";
 import { homedir as homedir5 } from "os";
 var FOREIGN_HOME = /(\/Users\/|\/home\/)[^/\s"']+/g;
 function scrubString(s, home = homedir5()) {
@@ -24402,7 +24583,7 @@ function redactLogFiles(files = [logFile(), daemonLogFile()]) {
   for (const file2 of files) {
     let text;
     try {
-      text = readFileSync4(file2, "utf-8");
+      text = readFileSync5(file2, "utf-8");
     } catch {
       continue;
     }
@@ -24580,7 +24761,7 @@ function parseAndValidate(text, isCompiled) {
 function loadSettings(file2 = configFile(), isCompiled = isCompiledBinary()) {
   let text;
   try {
-    text = readFileSync5(file2, "utf-8");
+    text = readFileSync6(file2, "utf-8");
   } catch {
     return DEFAULTS;
   }
@@ -24602,7 +24783,7 @@ function createSettings(file2 = configFile(), isCompiled = isCompiledBinary()) {
       }
       let text;
       try {
-        text = readFileSync5(file2, "utf-8");
+        text = readFileSync6(file2, "utf-8");
       } catch {
         return lastGood;
       }
@@ -24793,7 +24974,8 @@ function isForeignWorld(h, currentStateDir) {
   return h.stateDir !== undefined && !sameWorldPath(h.stateDir, currentStateDir);
 }
 var FOREIGN_WORLD_ERROR = "port serves a different caret world (state dir mismatch) \u2014 set CARET_PORT to a free port";
-async function ensureDaemon(deps) {
+async function ensureDaemon(deps, opts = {}) {
+  const takeover = opts.takeover ?? true;
   for (let attempt = 0;attempt < deps.maxAttempts; attempt++) {
     const h = await deps.health(deps.baseUrl);
     if (h && h.service === "caret") {
@@ -24803,6 +24985,8 @@ async function ensureDaemon(deps) {
       if (h.build === deps.currentBuild && h.version === deps.currentVersion) {
         return deps.baseUrl;
       }
+      if (!takeover)
+        return deps.baseUrl;
       const retired = await deps.retire(deps.baseUrl, deps.readLock());
       if (!retired)
         return deps.baseUrl;
@@ -24915,11 +25099,11 @@ async function prodEnsureDeps(s) {
 
 // src/daemon/server.ts
 import { renameSync as renameSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "fs";
-import { dirname as dirname5 } from "path";
+import { dirname as dirname6 } from "path";
 
 // src/config/prefs.ts
 import { readFile as readFile2, writeFile } from "fs/promises";
-import { dirname as dirname3 } from "path";
+import { dirname as dirname4 } from "path";
 var DEFAULT_SET = { valid: ["default"], fallback: "default" };
 async function readApproveMode(file2 = prefsFile(), log = noopLogger, set2 = DEFAULT_SET) {
   try {
@@ -24940,7 +25124,7 @@ async function writeApproveMode(mode, file2 = prefsFile(), log = noopLogger, set
     log.warn("prefs", "ignoring invalid approve mode");
     return;
   }
-  ensureStateDir(dirname3(file2));
+  ensureStateDir(dirname4(file2));
   await writeFile(file2, JSON.stringify({ approveMode: mode }, null, 2), { mode: 384 });
   log.debug("prefs", `approve mode saved: ${mode}`);
 }
@@ -25043,8 +25227,8 @@ async function parseBody(req, schema) {
 }
 
 // src/plan/excerpt.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";
+import { readdirSync as readdirSync3, readFileSync as readFileSync7, realpathSync, statSync as statSync2 } from "fs";
+import { extname, isAbsolute, join as join7, relative as relative2, resolve, sep } from "path";
 var EXCERPT_RADIUS = 6;
 var EXCERPT_HEAD_LINES = 13;
 var MAX_EXCERPT_BYTES = 2 * 1024 * 1024;
@@ -25130,7 +25314,7 @@ function basenameSearch(cwdReal, name) {
     const currentDir = queue.shift();
     let entries;
     try {
-      entries = readdirSync2(currentDir, { withFileTypes: true });
+      entries = readdirSync3(currentDir, { withFileTypes: true });
     } catch {
       continue;
     }
@@ -25139,9 +25323,9 @@ function basenameSearch(cwdReal, name) {
         return null;
       if (entry.isFile()) {
         if (entry.name === name)
-          return join6(currentDir, entry.name);
+          return join7(currentDir, entry.name);
       } else if (entry.isDirectory() && !SKIP_DIRS.has(entry.name) && !entry.name.startsWith(".")) {
-        queue.push(join6(currentDir, entry.name));
+        queue.push(join7(currentDir, entry.name));
       }
     }
   }
@@ -25176,7 +25360,7 @@ function readFileExcerpt(cwd, candidate, line) {
     return null;
   let content;
   try {
-    content = readFileSync6(abs, "utf-8");
+    content = readFileSync7(abs, "utf-8");
   } catch {
     return null;
   }
@@ -25254,12 +25438,12 @@ function createDecisions(log = noopLogger) {
 import { randomBytes } from "crypto";
 
 // src/plan/canonical-file.ts
-import { appendFileSync, existsSync as existsSync3, statSync as statSync3, writeFileSync as writeFileSync2 } from "fs";
+import { appendFileSync, existsSync as existsSync4, statSync as statSync3, writeFileSync as writeFileSync2 } from "fs";
 function guardedPlanFileWrite(planFilePath, log, failMsg, write) {
   try {
     if (!planFilePath.endsWith(".md"))
       return;
-    if (!existsSync3(planFilePath) || !statSync3(planFilePath).isFile())
+    if (!existsSync4(planFilePath) || !statSync3(planFilePath).isFile())
       return;
     write(planFilePath);
   } catch (err) {
@@ -25281,10 +25465,10 @@ function appendReviewerNotesToPlanFile(planFilePath, notes, log) {
 
 // src/plan/rumdl.ts
 import { createHash as createHash2 } from "crypto";
-import { chmodSync as chmodSync2, existsSync as existsSync4, mkdirSync as mkdirSync2, renameSync, writeFileSync as writeFileSync3 } from "fs";
+import { chmodSync as chmodSync2, existsSync as existsSync5, mkdirSync as mkdirSync2, renameSync, writeFileSync as writeFileSync3 } from "fs";
 import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
-import { dirname as dirname4, join as join7 } from "path";
+import { dirname as dirname5, join as join8 } from "path";
 var RUMDL_VERSION = "0.2.37";
 var ASSETS = {
   "darwin-arm64": {
@@ -25325,17 +25509,17 @@ async function downloadRumdl(binPath, asset, fetchImpl = fetch) {
   if (actual !== asset.sha256) {
     throw new Error(`rumdl: checksum mismatch for ${asset.url} (expected ${asset.sha256}, got ${actual})`);
   }
-  const work = await mkdtemp(join7(tmpdir(), "caret-rumdl-"));
+  const work = await mkdtemp(join8(tmpdir(), "caret-rumdl-"));
   try {
-    const archive = join7(work, "rumdl.tar.gz");
+    const archive = join8(work, "rumdl.tar.gz");
     await Bun.write(archive, bytes);
     const tar = Bun.spawn(["tar", "-xzf", archive, "-C", work], { stderr: "pipe" });
     if (await tar.exited !== 0)
       throw new Error(`rumdl: failed to extract ${asset.url}`);
-    const extracted = join7(work, "rumdl");
-    if (!existsSync4(extracted))
+    const extracted = join8(work, "rumdl");
+    if (!existsSync5(extracted))
       throw new Error(`rumdl: binary not found in ${asset.url}`);
-    mkdirSync2(dirname4(binPath), { recursive: true });
+    mkdirSync2(dirname5(binPath), { recursive: true });
     const tmp = `${binPath}.${process.pid}.tmp`;
     await Bun.write(tmp, Bun.file(extracted));
     chmodSync2(tmp, 493);
@@ -25347,7 +25531,7 @@ async function downloadRumdl(binPath, asset, fetchImpl = fetch) {
 }
 var installPinnedRumdl = (binPath) => downloadRumdl(binPath, rumdlAsset());
 async function installedVersion(bin) {
-  if (!existsSync4(bin))
+  if (!existsSync5(bin))
     return null;
   try {
     const proc = Bun.spawn([bin, "--version"], { stdout: "pipe", stderr: "ignore" });
@@ -25918,7 +26102,7 @@ function createServer(opts) {
     if (!lockPath)
       return;
     try {
-      ensureStateDir(dirname5(lockPath));
+      ensureStateDir(dirname6(lockPath));
       const lock = {
         pid: process.pid,
         port: server.port ?? 0,
@@ -25955,7 +26139,7 @@ function createServer(opts) {
 
 // src/review/store.ts
 import { readdir, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 function createStore(dir, log = noopLogger) {
   const reviews = new Map;
   const epochs = new Map;
@@ -25964,7 +26148,7 @@ function createStore(dir, log = noopLogger) {
     const prev = writeChains.get(review.id) ?? Promise.resolve();
     const next = prev.catch(() => {}).then(async () => {
       ensureStateDir(dir);
-      await writeFile2(join8(dir, `${review.id}.json`), JSON.stringify(review, null, 2), {
+      await writeFile2(join9(dir, `${review.id}.json`), JSON.stringify(review, null, 2), {
         mode: 384
       });
       log.debug("store", `review persisted: ${shortId(review.id)}`, { reviewId: review.id });
@@ -26014,7 +26198,7 @@ function createStore(dir, log = noopLogger) {
       return review;
     },
     async persisted(id) {
-      return await readJsonFile(join8(dir, `${id}.json`)) ?? undefined;
+      return await readJsonFile(join9(dir, `${id}.json`)) ?? undefined;
     },
     size() {
       return reviews.size;
@@ -26041,7 +26225,7 @@ function createStore(dir, log = noopLogger) {
         if (!file2.endsWith(".json"))
           continue;
         try {
-          const review = JSON.parse(await readFile3(join8(dir, file2), "utf-8"));
+          const review = JSON.parse(await readFile3(join9(dir, file2), "utf-8"));
           if (isUnresolved(review.status)) {
             reviews.set(review.id, review);
             loaded++;
@@ -26063,7 +26247,7 @@ async function runDaemon(opts) {
   const log = createDaemonLogger(() => svc.current().logging.level, undefined, () => svc.current().logging.redact);
   const cfg = configFile();
   const boot = svc.current();
-  log.info("settings", existsSync5(cfg) ? `settings: reading ${cfg}` : `settings: no config at ${cfg}; using defaults`, { settings: boot });
+  log.info("settings", existsSync6(cfg) ? `settings: reading ${cfg}` : `settings: no config at ${cfg}; using defaults`, { settings: boot });
   warnInvalidEnvVars((msg) => log.warn("env", msg));
   const adapter = selectAdapter();
   const store = createStore(reviewsDir(), log);
@@ -26097,7 +26281,7 @@ async function runDaemon(opts) {
         }),
         settings: () => settings().current(),
         configPath: cfg,
-        configExists: () => existsSync5(cfg),
+        configExists: () => existsSync6(cfg),
         envOverrides
       }),
       log
@@ -26136,12 +26320,12 @@ async function runDaemon(opts) {
 }
 
 // src/commands/discovery.ts
-import { existsSync as existsSync6 } from "fs";
+import { existsSync as existsSync7 } from "fs";
 import { release } from "os";
 
 // src/discovery.ts
-import { readdirSync as readdirSync3, statSync as statSync4 } from "fs";
-import { basename, join as join9 } from "path";
+import { readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { basename as basename2, join as join10 } from "path";
 var CARET_BIN = "caret-native";
 async function safe(build) {
   try {
@@ -26321,7 +26505,7 @@ function parsePsLines(text) {
     const [, pidStr, comm] = m ?? [];
     if (pidStr === undefined || comm === undefined)
       continue;
-    const name = basename(comm.trim());
+    const name = basename2(comm.trim());
     if (name === CARET_BIN)
       out.push({ pid: Number(pidStr), name });
   }
@@ -26341,7 +26525,7 @@ function listReviewFiles() {
   const dir = reviewsDir();
   let files;
   try {
-    files = readdirSync3(dir);
+    files = readdirSync4(dir);
   } catch {
     return [];
   }
@@ -26351,7 +26535,7 @@ function listReviewFiles() {
       continue;
     if (out.length >= 5000)
       break;
-    const raw = readJsonFileSync(join9(dir, file2));
+    const raw = readJsonFileSync(join10(dir, file2));
     if (raw && typeof raw.id === "string" && typeof raw.status === "string") {
       out.push({ id: raw.id, status: raw.status });
     }
@@ -26414,7 +26598,7 @@ function prodDiscoveryDeps(s) {
     }),
     settings: () => s,
     configPath: configFile(),
-    configExists: () => existsSync6(configFile()),
+    configExists: () => existsSync7(configFile()),
     effective: () => ({
       port: getPort(s),
       idleMs: idleMs(s),
@@ -26452,36 +26636,36 @@ async function runDiscoverySubcommand(opts) {
 import {
   accessSync,
   constants,
-  existsSync as existsSync8,
+  existsSync as existsSync9,
   mkdirSync as mkdirSync3,
-  rmSync,
+  rmSync as rmSync2,
   statSync as statSync5,
   symlinkSync,
   writeFileSync as writeFileSync5
 } from "fs";
-import { join as join11, resolve as resolve2 } from "path";
+import { join as join12, resolve as resolve2 } from "path";
 
 // src/adapters/opencode/packaging.ts
-import { existsSync as existsSync7, readdirSync as readdirSync4, readFileSync as readFileSync7 } from "fs";
-import { dirname as dirname6, join as join10 } from "path";
+import { existsSync as existsSync8, readdirSync as readdirSync5, readFileSync as readFileSync8 } from "fs";
+import { dirname as dirname7, join as join11 } from "path";
 function resolveCaretRoot() {
   const candidates = [];
   const script = process.argv[1];
   if (script)
-    candidates.push(join10(dirname6(script), ".."));
-  candidates.push(join10(dirname6(process.execPath), ".."));
+    candidates.push(join11(dirname7(script), ".."));
+  candidates.push(join11(dirname7(process.execPath), ".."));
   for (const root of candidates) {
-    if (existsSync7(join10(root, "opencode", "caret.plugin.ts")))
+    if (existsSync8(join11(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 binPath = join10(root, "bin", "caret");
-  const commandsDir = join10(root, "opencode", "commands");
+  const binPath = join11(root, "bin", "caret");
+  const commandsDir = join11(root, "opencode", "commands");
   let commands = [];
   try {
-    commands = readdirSync4(commandsDir).filter((f) => f.endsWith(".md")).sort().map((f) => ({ name: f, contents: readFileSync7(join10(commandsDir, f), "utf-8") }));
+    commands = readdirSync5(commandsDir).filter((f) => f.endsWith(".md")).sort().map((f) => ({ name: f, contents: readFileSync8(join11(commandsDir, f), "utf-8") }));
   } catch {
     commands = [];
   }
@@ -26490,17 +26674,17 @@ function loadOpencodePackaging(root = resolveCaretRoot()) {
 
 // src/commands/install/local.ts
 function devMarketplaceDir() {
-  return join11(stateDir(), "dev-marketplace");
+  return join12(stateDir(), "dev-marketplace");
 }
 function resolveLocalCheckout(opts = {}, deps = {}) {
   const repoDir = resolve2(caretRoot(deps));
-  if (!existsSync8(join11(repoDir, ".claude-plugin", "marketplace.json"))) {
+  if (!existsSync9(join12(repoDir, ".claude-plugin", "marketplace.json"))) {
     throw new Error(`--from-local must run from a caret checkout (no .claude-plugin/marketplace.json at ${repoDir}). A published caret installs with a plain \`caret install\`.`);
   }
   if (opts.requireArtifacts !== false) {
     const missing = [
-      isExecutable(join11(repoDir, "bin", "caret-native")) ? null : "bin/caret-native",
-      isDirectory(join11(repoDir, "bin", "ui")) ? null : "bin/ui"
+      isExecutable(join12(repoDir, "bin", "caret-native")) ? null : "bin/caret-native",
+      isDirectory(join12(repoDir, "bin", "ui")) ? null : "bin/ui"
     ].filter((m) => m !== null);
     if (missing.length > 0) {
       throw new Error(`--from-local reuses the build artifacts bin/caret-native + bin/ui, and ${repoDir} is missing ${missing.join(" + ")} \u2014 run \`mise run build\` first.`);
@@ -26518,10 +26702,10 @@ function caretRoot(deps) {
   }
 }
 function writeDevMarketplace(repoDir, outDir) {
-  rmSync(outDir, { recursive: true, force: true });
-  mkdirSync3(join11(outDir, ".claude-plugin"), { recursive: true });
-  symlinkSync(resolve2(repoDir), join11(outDir, "caret"));
-  writeFileSync5(join11(outDir, ".claude-plugin", "marketplace.json"), `${JSON.stringify({
+  rmSync2(outDir, { recursive: true, force: true });
+  mkdirSync3(join12(outDir, ".claude-plugin"), { recursive: true });
+  symlinkSync(resolve2(repoDir), join12(outDir, "caret"));
+  writeFileSync5(join12(outDir, ".claude-plugin", "marketplace.json"), `${JSON.stringify({
     name: "caret",
     description: "Local caret dev build (generated by caret install --from-local).",
     owner: { name: "macintacos" },
@@ -26532,7 +26716,7 @@ function writeDevMarketplace(repoDir, outDir) {
 async function prewarmLocalBuild(repoDir, deps = {}) {
   const spawn = deps.spawn ?? runCaptured;
   try {
-    await spawn([join11(repoDir, "bin", "caret-native"), "prewarm"]);
+    await spawn([join12(repoDir, "bin", "caret-native"), "prewarm"]);
   } catch {}
 }
 function isExecutable(path) {
@@ -26569,6 +26753,9 @@ async function runCaptured(cmd) {
 }
 
 // src/commands/install/ui.ts
+function isTerminal() {
+  return process.stdin.isTTY === true && process.stdout.isTTY === true;
+}
 var silentUI = {
   intro: () => {},
   step: async (_label, work) => work(() => {}),
@@ -26641,15 +26828,41 @@ var PLUGIN_REF = "caret@caret";
 var claudeCli = async (args) => {
   try {
     const proc = Bun.spawn(["claude", ...args], { stdout: "pipe", stderr: "pipe" });
-    const [code, err] = await Promise.all([proc.exited, new Response(proc.stderr).text()]);
+    const [code, out, err] = await Promise.all([
+      proc.exited,
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text()
+    ]);
     if (code === 0)
-      return { ok: true, detail: "" };
-    return { ok: false, detail: err.trim() || `claude exited ${code}` };
+      return { ok: true, detail: "", stdout: out };
+    return { ok: false, detail: err.trim() || `claude exited ${code}`, stdout: out };
   } catch (e) {
     const missing = e instanceof Error && e.code === "ENOENT";
-    return { ok: false, missing, detail: e instanceof Error ? e.message : String(e) };
+    return { ok: false, missing, detail: e instanceof Error ? e.message : String(e), stdout: "" };
   }
 };
+function parsePluginVersion(stdout2, id) {
+  try {
+    const parsed = JSON.parse(stdout2);
+    if (!Array.isArray(parsed))
+      return null;
+    const rows = parsed.filter((p3) => typeof p3 === "object" && p3 !== null && ("id" in p3) && p3.id === id);
+    const version2 = (rows.find((p3) => p3.scope === "user") ?? rows[0])?.version;
+    return typeof version2 === "string" ? version2 : null;
+  } catch {
+    return null;
+  }
+}
+function updateLine(before, after, updated) {
+  if (!updated) {
+    return before ? `caret ${before} in Claude Code \u2014 the update did not land` : "Could not ask Claude Code for the latest caret";
+  }
+  if (!before || !after)
+    return "Asked Claude Code for the latest caret \u2014 restart to apply";
+  if (before === after)
+    return `caret ${after} in Claude Code \u2014 already current`;
+  return `caret ${before} \u2192 ${after} in Claude Code \u2014 restart to apply`;
+}
 function phases(uninstall, local, writeDev) {
   if (uninstall) {
     return [
@@ -26689,7 +26902,10 @@ function phases(uninstall, local, writeDev) {
     {
       label: "Registering the caret marketplace",
       done: `Registered the caret marketplace (${MARKETPLACE_SOURCE})`,
-      commands: [{ args: ["plugin", "marketplace", "add", MARKETPLACE_SOURCE], fatal: false }]
+      commands: [
+        { args: ["plugin", "marketplace", "add", MARKETPLACE_SOURCE], fatal: false },
+        { args: ["plugin", "marketplace", "update", MARKETPLACE_NAME], fatal: false }
+      ]
     },
     {
       label: "Installing the caret plugin",
@@ -26698,6 +26914,16 @@ function phases(uninstall, local, writeDev) {
         { args: ["plugin", "install", PLUGIN_REF, "--scope", "user"], fatal: true },
         { args: ["plugin", "enable", PLUGIN_REF], fatal: false }
       ]
+    },
+    {
+      label: "Updating the caret plugin",
+      done: ([before, update, after]) => updateLine(parsePluginVersion(before?.stdout ?? "", PLUGIN_REF), parsePluginVersion(after?.stdout ?? "", PLUGIN_REF), update?.ok === true),
+      warn: ([, update]) => update?.ok === false ? `Claude Code did not take the update (${update.detail}) \u2014 caret there is unchanged.` : null,
+      commands: [
+        { args: ["plugin", "list", "--json"], fatal: false },
+        { args: ["plugin", "update", PLUGIN_REF, "--scope", "user"], fatal: false },
+        { args: ["plugin", "list", "--json"], fatal: false }
+      ]
     }
   ];
 }
@@ -26730,8 +26956,9 @@ async function runInstallClaudeTarget(opts, deps = {}) {
   }
   for (const phase of plan) {
     try {
-      await ui.step(phase.label, async (detail) => {
+      const results = await ui.step(phase.label, async (detail) => {
         phase.before?.();
+        const collected = [];
         for (const { args, fatal, fallback } of phase.commands) {
           detail(`claude ${args.join(" ")}`);
           let r2 = await run(args);
@@ -26739,6 +26966,7 @@ async function runInstallClaudeTarget(opts, deps = {}) {
             detail(`claude ${fallback.join(" ")}`);
             r2 = await run(fallback);
           }
+          collected.push(r2);
           if (r2.ok)
             continue;
           if (r2.missing)
@@ -26746,7 +26974,11 @@ async function runInstallClaudeTarget(opts, deps = {}) {
           if (fatal)
             throw new PhaseFailure(`\`claude ${args.join(" ")}\`: ${r2.detail}`, false);
         }
-      }, () => phase.done);
+        return collected;
+      }, (collected) => typeof phase.done === "string" ? phase.done : phase.done(collected));
+      const warning = phase.warn?.(results);
+      if (warning)
+        ui.warn(warning);
     } catch (e) {
       if (!(e instanceof PhaseFailure))
         throw e;
@@ -26758,58 +26990,12 @@ async function runInstallClaudeTarget(opts, deps = {}) {
 }
 
 // src/commands/install/opencode.ts
-import { existsSync as existsSync11, readFileSync as readFileSync8, writeFileSync as writeFileSync7 } from "fs";
-import { basename as basename2, join as join13 } from "path";
-
-// src/adapters/opencode/config-plugin.ts
-var FORMATTING = { insertSpaces: true, tabSize: 2 };
-function pluginArray(text2) {
-  const cfg = parse3(text2);
-  return Array.isArray(cfg?.plugin) ? cfg.plugin : [];
-}
-function packageName(spec) {
-  if (spec.startsWith("@")) {
-    const slash = spec.indexOf("/");
-    if (slash === -1)
-      return spec;
-    const at2 = spec.indexOf("@", slash + 1);
-    return at2 === -1 ? spec : spec.slice(0, at2);
-  }
-  const at = spec.indexOf("@");
-  return at === -1 ? spec : spec.slice(0, at);
-}
-function entryNames(entry, pkg) {
-  return typeof entry === "string" && packageName(entry) === packageName(pkg);
-}
-function addPluginToConfigText(existing, pkg) {
-  const text2 = existing ?? `{}
-`;
-  const current = parse3(text2)?.plugin;
-  if (Array.isArray(current)) {
-    if (current.some((e) => entryNames(e, pkg)))
-      return text2;
-    const path2 = ["plugin", current.length];
-    const edits2 = modify(text2, path2, pkg, {
-      isArrayInsertion: true,
-      formattingOptions: FORMATTING
-    });
-    return applyEdits(text2, edits2);
-  }
-  const edits = modify(text2, ["plugin"], [pkg], { formattingOptions: FORMATTING });
-  return applyEdits(text2, edits);
-}
-function removePluginFromConfigText(existing, pkg) {
-  const arr = pluginArray(existing);
-  if (!arr.some((e) => entryNames(e, pkg)))
-    return existing;
-  const next = arr.filter((e) => !entryNames(e, pkg));
-  const edits = modify(existing, ["plugin"], next, { formattingOptions: FORMATTING });
-  return applyEdits(existing, edits);
-}
+import { existsSync as existsSync13, readFileSync as readFileSync9, writeFileSync as writeFileSync7 } from "fs";
+import { basename as basename3, join as join14 } from "path";
 
 // src/adapters/opencode/deploy.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync4, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
-import { dirname as dirname8 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync4, rmSync as rmSync3, writeFileSync as writeFileSync6 } from "fs";
+import { dirname as dirname9 } from "path";
 function renderPlugin(source, opts) {
   return source.replaceAll("__CARET_VERSION__", () => opts.version).replaceAll("__CARET_BIN__", () => opts.binPath);
 }
@@ -26817,7 +27003,7 @@ function deployFiles(files, opts) {
   const paths = [];
   for (const f2 of files) {
     if (!opts.dryRun) {
-      mkdirSync4(dirname8(f2.path), { recursive: true });
+      mkdirSync4(dirname9(f2.path), { recursive: true });
       writeFileSync6(f2.path, f2.contents);
     }
     paths.push(f2.path);
@@ -26827,49 +27013,15 @@ function deployFiles(files, opts) {
 function removeFiles(targets, opts) {
   const paths = [];
   for (const p3 of targets) {
-    if (!existsSync10(p3))
+    if (!existsSync11(p3))
       continue;
     if (!opts.dryRun)
-      rmSync2(p3, { force: true });
+      rmSync3(p3, { force: true });
     paths.push(p3);
   }
   return { paths, dryRun: opts.dryRun };
 }
 
-// src/commands/install/opencode.ts
-async function runInstallOpencodeTarget(opts, deps = {}) {
-  const dir = deps.configDir ?? opencodeConfigDir();
-  const pkg = deps.packaging ?? loadOpencodePackaging();
-  const ui = deps.ui ?? silentUI;
-  const configFile2 = resolveConfigFile(dir);
-  const commandPaths = pkg.commands.map((c3) => join13(commandDir(dir), namespacedCommandFilename(c3.name)));
-  if (opts.dryRun) {
-    const verb = opts.uninstall ? "remove" : "write";
-    ui.note([configFile2, ...commandPaths].join(`
-`), `OpenCode \u2014 would ${verb}`);
-    return;
-  }
-  if (opts.uninstall) {
-    await ui.step(`Removing ${CARET_PACKAGE} from OpenCode's plugin array`, async () => editConfig(configFile2, (text2) => text2 === null ? null : removePluginFromConfigText(text2, CARET_PACKAGE)), (changed) => changed.length > 0 ? `Removed ${CARET_PACKAGE} from ${basename2(configFile2)}` : `${CARET_PACKAGE} was not in ${basename2(configFile2)}`);
-    await ui.step("Removing the /caret:* command files", async () => removeFiles(commandPaths, { dryRun: false }), (removed) => `Removed ${removed.paths.length} command file(s) from ${dir}`);
-    return;
-  }
-  await ui.step(`Adding ${CARET_PACKAGE} to OpenCode's plugin array`, async () => editConfig(configFile2, (text2) => addPluginToConfigText(text2, CARET_PACKAGE)), (changed) => changed.length > 0 ? `Added ${CARET_PACKAGE} to ${basename2(configFile2)}` : `${CARET_PACKAGE} was already in ${basename2(configFile2)}`);
-  const files = pkg.commands.map((c3) => ({
-    path: join13(commandDir(dir), namespacedCommandFilename(c3.name)),
-    contents: renderPlugin(c3.contents, { version: VERSION, binPath: pkg.binPath })
-  }));
-  await ui.step("Deploying the /caret:* command files", async () => deployFiles(files, { dryRun: false }), (deployed) => `Deployed ${deployed.paths.length} command file(s) to ${dir}`);
-}
-function editConfig(path2, transform2) {
-  const existing = existsSync11(path2) ? readFileSync8(path2, "utf-8") : null;
-  const next = transform2(existing);
-  if (next === null || next === existing)
-    return [];
-  writeFileSync7(path2, next);
-  return [path2];
-}
-
 // src/commands/install/targets.ts
 import { existsSync as existsSync12 } from "fs";
 var INSTALL_TARGET_IDS = ["claude", "opencode"];
@@ -26916,6 +27068,140 @@ async function promptForTargets(detected, uninstall = false) {
   });
   return isCancel2(chosen) ? null : chosen;
 }
+function upgradeVerdictLine(verdict) {
+  switch (verdict.kind) {
+    case "fresh":
+      return "OpenCode will resolve caret on its next start";
+    case "current":
+      return `OpenCode's caret is ${verdict.version} \u2014 already current`;
+    case "stale-cache":
+      return `OpenCode's cached caret is ${verdict.cached}; ${verdict.published} is published`;
+    case "stale-pin":
+      return `Your config pins ${verdict.entry}; ${verdict.published} is published`;
+    case "unknown":
+      return "Could not check which caret OpenCode would load";
+  }
+}
+function upgradePromptMessage(verdict) {
+  const remedy = verdict.kind === "stale-pin" ? "Bump the pin?" : "Clear the cached copy so OpenCode re-resolves?";
+  return `${upgradeVerdictLine(verdict)}. ${remedy}`;
+}
+async function promptUpgrade(verdict, clack) {
+  const { confirm: confirm2, isCancel: isCancel2 } = clack ?? await Promise.resolve().then(() => (init_dist4(), exports_dist));
+  const answer = await confirm2({ message: upgradePromptMessage(verdict) });
+  return isCancel2(answer) ? null : answer === true;
+}
+
+// src/commands/install/opencode.ts
+function isCaretCheckout(dir) {
+  return existsSync13(join14(dir, "opencode", "caret.plugin.ts"));
+}
+function caretEntries(text2, isCheckout) {
+  return pluginEntries(text2).filter((entry) => {
+    const path2 = localSpecifierPath(entry);
+    return path2 === undefined ? splitPluginSpecifier(entry).pkg === CARET_PACKAGE : isCheckout(path2);
+  });
+}
+function sameEntryForm(entry, specifier) {
+  const entryIsLocal = isLocalPluginSpecifier(entry);
+  if (entryIsLocal !== isLocalPluginSpecifier(specifier))
+    return false;
+  return entryIsLocal ? entry === specifier : true;
+}
+function setCaretPluginEntry(text2, specifier, isCheckout) {
+  if (text2 === null)
+    return addPluginToConfigText(null, specifier);
+  const pruned = caretEntries(text2, isCheckout).filter((entry) => !sameEntryForm(entry, specifier)).reduce((acc, entry) => removePluginFromConfigText(acc, entry), text2);
+  return addPluginToConfigText(pruned, specifier);
+}
+async function runInstallOpencodeTarget(opts, deps = {}) {
+  const dir = deps.configDir ?? opencodeConfigDir();
+  const pkg = deps.packaging ?? loadOpencodePackaging();
+  const ui = deps.ui ?? silentUI;
+  const isCheckout = deps.isCheckout ?? isCaretCheckout;
+  const configFile2 = resolveConfigFile(dir);
+  const commandPaths = pkg.commands.map((c3) => join14(commandDir(dir), namespacedCommandFilename(c3.name)));
+  const legacy = existingLegacyInstallFiles(dir);
+  const specifier = opts.local ? localPluginSpecifier(opts.local.repoDir) : CARET_PACKAGE;
+  if (opts.dryRun) {
+    const verb = opts.uninstall ? "remove" : "write";
+    const found = checks3(opts) ? ["", previewLine(await check2(configFile2, deps))] : [];
+    const entry = opts.uninstall ? [] : ["", `plugin entry: ${specifier}`];
+    const sweep = legacy.length === 0 ? [] : ["", "pre-array-install files to remove:", ...legacy];
+    ui.note([configFile2, ...commandPaths, ...entry, ...sweep, ...found].join(`
+`), `OpenCode \u2014 would ${verb}`);
+    return;
+  }
+  if (opts.uninstall) {
+    await ui.step("Removing caret from OpenCode's plugin array", async () => editConfig(configFile2, (text2) => text2 === null ? null : caretEntries(text2, isCheckout).reduce((acc, entry) => removePluginFromConfigText(acc, entry), text2)), (changed) => changed.length > 0 ? `Removed caret from ${basename3(configFile2)}` : `caret was not in ${basename3(configFile2)}`);
+    await ui.step("Removing the /caret:* command files", async () => removeFiles(commandPaths, { dryRun: false }), (removed) => `Removed ${removed.paths.length} command file(s) from ${dir}`);
+    await sweepLegacy(legacy, dir, ui);
+    return;
+  }
+  await ui.step(`Adding ${specifier} to OpenCode's plugin array`, async () => editConfig(configFile2, (text2) => setCaretPluginEntry(text2, specifier, isCheckout)), (changed) => changed.length > 0 ? `Added ${specifier} to ${basename3(configFile2)}` : `${specifier} was already in ${basename3(configFile2)}`);
+  if (checks3(opts))
+    await upgradeStep(configFile2, opts, deps, ui);
+  await sweepLegacy(legacy, dir, ui);
+  const files = pkg.commands.map((c3) => ({
+    path: join14(commandDir(dir), namespacedCommandFilename(c3.name)),
+    contents: renderPlugin(c3.contents, { version: VERSION, binPath: pkg.binPath })
+  }));
+  await ui.step("Deploying the /caret:* command files", async () => deployFiles(files, { dryRun: false }), (deployed) => `Deployed ${deployed.paths.length} command file(s) to ${dir}`);
+}
+async function sweepLegacy(legacy, dir, ui) {
+  if (legacy.length === 0)
+    return;
+  await ui.step("Removing the pre-array-install files", async () => removeFiles(legacy, { dryRun: false }), (removed) => `Removed ${removed.paths.length} pre-array-install file(s) from ${dir}`);
+}
+function checks3(opts) {
+  return !opts.uninstall && opts.local === undefined;
+}
+function previewLine(verdict) {
+  const line = upgradeVerdictLine(verdict);
+  return verdict.kind === "unknown" ? `${line} (${verdict.reason})` : line;
+}
+async function check2(configFile2, deps) {
+  return upgradeVerdict({
+    entry: findPluginEntry(readConfigText(configFile2), CARET_PACKAGE),
+    cached: readCachedCaretVersion((deps.cacheDirs ?? existingOpencodeCachePackageDirs)()),
+    published: await (deps.published ?? publishedCaretVersion)()
+  });
+}
+async function upgradeStep(configFile2, opts, deps, ui) {
+  const verdict = await ui.step("Checking OpenCode's caret version", () => check2(configFile2, deps), upgradeVerdictLine);
+  if (verdict.kind === "unknown") {
+    ui.warn(`Could not check OpenCode's caret version (${verdict.reason}) \u2014 nothing changed.`);
+    return;
+  }
+  if (verdict.kind !== "stale-cache" && verdict.kind !== "stale-pin")
+    return;
+  if (!opts.refresh) {
+    if (!(deps.isInteractive ?? isTerminal)()) {
+      const take = verdict.kind === "stale-pin" ? "bump the pin" : "take it";
+      ui.info(`${upgradeVerdictLine(verdict)}. Re-run with --refresh to ${take}.`);
+      return;
+    }
+    if (await (deps.confirm ?? promptUpgrade)(verdict) !== true)
+      return;
+  }
+  if (verdict.kind === "stale-cache") {
+    const dirs = (deps.cacheDirs ?? existingOpencodeCachePackageDirs)();
+    await ui.step("Clearing OpenCode's cached caret", async () => (deps.clearCache ?? clearCachedCaret)(dirs), (cleared) => `Cleared ${cleared.length} cached ${cleared.length === 1 ? "copy" : "copies"} \u2014 OpenCode re-resolves on next start`);
+    return;
+  }
+  await ui.step(`Bumping ${CARET_PACKAGE} to ${verdict.published}`, async () => editConfig(configFile2, (text2) => text2 === null ? null : setPluginVersionInConfigText(text2, CARET_PACKAGE, verdict.published)), (changed) => changed.length > 0 ? `Bumped the pin to ${CARET_PACKAGE}@${verdict.published}` : `Left ${basename3(configFile2)} unchanged`);
+}
+function readConfigText(path2) {
+  return existsSync13(path2) ? readFileSync9(path2, "utf-8") : null;
+}
+function editConfig(path2, transform2) {
+  const existing = readConfigText(path2);
+  const next = transform2(existing);
+  if (next === null || next === existing)
+    return [];
+  writeFileSync7(path2, next);
+  return [path2];
+}
 
 // src/commands/install/index.ts
 function parseTargets(raw) {
@@ -26953,7 +27239,12 @@ async function runInstallSubcommand(opts, deps = {}) {
     return;
   const runOpencode = deps.runOpencode ?? runInstallOpencodeTarget;
   const runClaude = deps.runClaude ?? runInstallClaudeTarget;
-  const targetOpts = { uninstall: opts.uninstall, dryRun: opts.dryRun, local };
+  const targetOpts = {
+    uninstall: opts.uninstall,
+    dryRun: opts.dryRun,
+    refresh: opts.refresh ?? false,
+    local
+  };
   for (const target of targets) {
     let ok;
     try {
@@ -27040,7 +27331,7 @@ async function selectTargets(opts, deps, ui) {
     return parsed.targets;
   }
   const detected = (deps.detect ?? detectTargets)();
-  const isInteractive = deps.isInteractive ?? (() => process.stdin.isTTY === true && process.stdout.isTTY === true);
+  const isInteractive = deps.isInteractive ?? isTerminal;
   if (isInteractive() && !opts.dryRun) {
     const chosen = await (deps.prompt ?? promptForTargets)(detected, opts.uninstall);
     if (chosen === null) {
@@ -28546,7 +28837,7 @@ async function runReview(stdin2, deps) {
         if (err instanceof TimeoutError)
           throw err;
         step = "reconnect";
-        baseUrl = await deps.ensureDaemon();
+        baseUrl = await deps.ensureDaemon({ takeover: false });
         step = "longPoll";
       }
     }
@@ -28585,7 +28876,7 @@ function openBrowser(url2) {
 function prodReviewDeps(s, adapter) {
   return {
     parseHookInput: (stdin2) => adapter.parseHookInput(stdin2),
-    ensureDaemon: async () => ensureDaemon(await prodEnsureDeps(s)),
+    ensureDaemon: async (opts) => ensureDaemon(await prodEnsureDeps(s), opts),
     postReview,
     longPoll,
     openBrowser,
@@ -30696,10 +30987,11 @@ function buildProgram() {
   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").description("install caret into a coding agent, plus the rumdl plan formatter (omit --target to choose interactively)").option("--target <targets>", "comma-separated agents to install into: opencode, claude, or opencode,claude").option("--uninstall", "remove caret from the target(s) instead of installing").option("--dry-run", "print what would change without writing").option("--from-local", "dev loop: install the built caret checkout this binary runs from, then hand it the daemon").action((opts) => runInstallSubcommand({
+  program2.command("install").description("install caret into a coding agent, plus the rumdl plan formatter (omit --target to choose interactively)").option("--target <targets>", "comma-separated agents to install into: opencode, claude, or opencode,claude").option("--uninstall", "remove caret from the target(s) instead of installing").option("--dry-run", "print what would change without writing").option("--refresh", "take the published caret in every target without asking \u2014 clears OpenCode's cached copy, or bumps a pinned entry (Claude Code always takes an update)").option("--from-local", "dev loop: install the built caret checkout this binary runs from, then hand it the daemon").action((opts) => runInstallSubcommand({
     target: opts.target,
     uninstall: opts.uninstall ?? false,
     dryRun: opts.dryRun ?? false,
+    refresh: opts.refresh ?? false,
     fromLocal: opts.fromLocal ?? false
   }));
   return program2;