@openacp/cli 2026.408.2 → 2026.408.4

package/dist/cli.js

@@ -199,11 +199,11 @@ async function shutdownLogger() {
   logDir = void 0;
   initialized = false;
   if (transport) {
-    await new Promise((resolve8) => {
-      const timeout = setTimeout(resolve8, 3e3);
+    await new Promise((resolve9) => {
+      const timeout = setTimeout(resolve9, 3e3);
       transport.on("close", () => {
         clearTimeout(timeout);
-        resolve8();
+        resolve9();
       });
       transport.end();
     });
@@ -343,21 +343,21 @@ function compareVersions(current, latest) {
 }
 async function runUpdate() {
   const { spawn: spawn9 } = await import("child_process");
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const child = spawn9("npm", ["install", "-g", `${NPM_PACKAGE}@latest`], {
       stdio: "inherit",
       shell: true
     });
     const onSignal = () => {
       child.kill("SIGTERM");
-      resolve8(false);
+      resolve9(false);
     };
     process.on("SIGINT", onSignal);
     process.on("SIGTERM", onSignal);
     child.on("close", (code) => {
       process.off("SIGINT", onSignal);
       process.off("SIGTERM", onSignal);
-      resolve8(code === 0);
+      resolve9(code === 0);
     });
   });
 }
@@ -5040,7 +5040,7 @@ import https from "https";
 import os8 from "os";
 import { execFileSync as execFileSync3 } from "child_process";
 function downloadFile(url, dest, maxRedirects = 10) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const file = fs13.createWriteStream(dest);
     const cleanup = () => {
       try {
@@ -5059,7 +5059,7 @@ function downloadFile(url, dest, maxRedirects = 10) {
         }
         file.close(() => {
           cleanup();
-          downloadFile(response.headers.location, dest, maxRedirects - 1).then(resolve8).catch(reject);
+          downloadFile(response.headers.location, dest, maxRedirects - 1).then(resolve9).catch(reject);
         });
         return;
       }
@@ -5083,7 +5083,7 @@ function downloadFile(url, dest, maxRedirects = 10) {
         }
       });
       response.pipe(file);
-      file.on("finish", () => file.close(() => resolve8(dest)));
+      file.on("finish", () => file.close(() => resolve9(dest)));
       file.on("error", (err) => {
         file.close(() => {
           cleanup();
@@ -5233,7 +5233,7 @@ var init_cloudflare = __esm({
         if (this.options.domain) {
           args2.push("--hostname", String(this.options.domain));
         }
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           let settled = false;
           const settle = (fn) => {
             if (!settled) {
@@ -5261,7 +5261,7 @@ var init_cloudflare = __esm({
               clearTimeout(timeout);
               this.publicUrl = match[0];
               log4.info({ url: this.publicUrl }, "Cloudflare tunnel ready");
-              settle(() => resolve8(this.publicUrl));
+              settle(() => resolve9(this.publicUrl));
             }
           };
           this.child.stdout?.on("data", onData);
@@ -5294,8 +5294,8 @@ var init_cloudflare = __esm({
         }
         child.kill("SIGTERM");
         const exited = await Promise.race([
-          new Promise((resolve8) => child.on("exit", () => resolve8(true))),
-          new Promise((resolve8) => setTimeout(() => resolve8(false), SIGKILL_TIMEOUT_MS))
+          new Promise((resolve9) => child.on("exit", () => resolve9(true))),
+          new Promise((resolve9) => setTimeout(() => resolve9(false), SIGKILL_TIMEOUT_MS))
         ]);
         if (!exited) {
           log4.warn("cloudflared did not exit after SIGTERM, sending SIGKILL");
@@ -5348,7 +5348,7 @@ var init_ngrok = __esm({
         if (this.options.region) {
           args2.push("--region", String(this.options.region));
         }
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           let settled = false;
           const settle = (fn) => {
             if (!settled) {
@@ -5378,7 +5378,7 @@ var init_ngrok = __esm({
               clearTimeout(timeout);
               this.publicUrl = match[0];
               log5.info({ url: this.publicUrl }, "ngrok tunnel ready");
-              settle(() => resolve8(this.publicUrl));
+              settle(() => resolve9(this.publicUrl));
             }
           };
           this.child.stdout?.on("data", onData);
@@ -5413,8 +5413,8 @@ var init_ngrok = __esm({
         }
         child.kill("SIGTERM");
         const exited = await Promise.race([
-          new Promise((resolve8) => child.on("exit", () => resolve8(true))),
-          new Promise((resolve8) => setTimeout(() => resolve8(false), SIGKILL_TIMEOUT_MS2))
+          new Promise((resolve9) => child.on("exit", () => resolve9(true))),
+          new Promise((resolve9) => setTimeout(() => resolve9(false), SIGKILL_TIMEOUT_MS2))
         ]);
         if (!exited) {
           log5.warn("ngrok did not exit after SIGTERM, sending SIGKILL");
@@ -5458,7 +5458,7 @@ var init_bore = __esm({
         if (this.options.secret) {
           args2.push("--secret", String(this.options.secret));
         }
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           let settled = false;
           const settle = (fn) => {
             if (!settled) {
@@ -5488,7 +5488,7 @@ var init_bore = __esm({
               clearTimeout(timeout);
               this.publicUrl = `http://${match[1]}:${match[2]}`;
               log6.info({ url: this.publicUrl }, "Bore tunnel ready");
-              settle(() => resolve8(this.publicUrl));
+              settle(() => resolve9(this.publicUrl));
             }
           };
           this.child.stdout?.on("data", onData);
@@ -5523,8 +5523,8 @@ var init_bore = __esm({
         }
         child.kill("SIGTERM");
         const exited = await Promise.race([
-          new Promise((resolve8) => child.on("exit", () => resolve8(true))),
-          new Promise((resolve8) => setTimeout(() => resolve8(false), SIGKILL_TIMEOUT_MS3))
+          new Promise((resolve9) => child.on("exit", () => resolve9(true))),
+          new Promise((resolve9) => setTimeout(() => resolve9(false), SIGKILL_TIMEOUT_MS3))
         ]);
         if (!exited) {
           log6.warn("bore did not exit after SIGTERM, sending SIGKILL");
@@ -5573,7 +5573,7 @@ var init_tailscale = __esm({
         if (this.options.bg) {
           args2.push("--bg");
         }
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           let settled = false;
           const settle = (fn) => {
             if (!settled) {
@@ -5603,7 +5603,7 @@ var init_tailscale = __esm({
               clearTimeout(timeout);
               this.publicUrl = match[0];
               log7.info({ url: this.publicUrl }, "Tailscale funnel ready");
-              settle(() => resolve8(this.publicUrl));
+              settle(() => resolve9(this.publicUrl));
             }
           };
           this.child.stdout?.on("data", onData);
@@ -5621,7 +5621,7 @@ var init_tailscale = __esm({
                 this.publicUrl = `https://${hostname}:${localPort}`;
                 this.child = null;
                 log7.info({ url: this.publicUrl }, "Tailscale funnel ready (constructed from hostname)");
-                settle(() => resolve8(this.publicUrl));
+                settle(() => resolve9(this.publicUrl));
               } else {
                 settle(() => reject(new Error(`tailscale exited with code ${code} before establishing funnel`)));
               }
@@ -5645,8 +5645,8 @@ var init_tailscale = __esm({
         }
         child.kill("SIGTERM");
         const exited = await Promise.race([
-          new Promise((resolve8) => child.on("exit", () => resolve8(true))),
-          new Promise((resolve8) => setTimeout(() => resolve8(false), SIGKILL_TIMEOUT_MS4))
+          new Promise((resolve9) => child.on("exit", () => resolve9(true))),
+          new Promise((resolve9) => setTimeout(() => resolve9(false), SIGKILL_TIMEOUT_MS4))
         ]);
         if (!exited) {
           log7.warn("tailscale did not exit after SIGTERM, sending SIGKILL");
@@ -5762,7 +5762,7 @@ var init_openacp = __esm({
       }
       async spawnCloudflared(binaryPath, token, port) {
         const args2 = ["tunnel", "run", "--url", `http://localhost:${port}`, "--token", token];
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           let settled = false;
           const settle = (fn) => {
             if (!settled) {
@@ -5772,7 +5772,7 @@ var init_openacp = __esm({
           };
           const timeout = setTimeout(() => {
             log8.info({ port }, "cloudflared still running after startup window \u2014 assuming tunnel active");
-            settle(resolve8);
+            settle(resolve9);
           }, STARTUP_TIMEOUT_MS);
           let child;
           try {
@@ -5788,7 +5788,7 @@ var init_openacp = __esm({
             if (/Registered tunnel connection/.test(line)) {
               clearTimeout(timeout);
               log8.info({ port }, "cloudflared connection registered");
-              settle(resolve8);
+              settle(resolve9);
             }
           };
           child.stdout?.on("data", onData);
@@ -7430,7 +7430,8 @@ __export(instance_context_exports, {
   createInstanceContext: () => createInstanceContext,
   generateSlug: () => generateSlug,
   getGlobalRoot: () => getGlobalRoot,
-  resolveInstanceRoot: () => resolveInstanceRoot
+  resolveInstanceRoot: () => resolveInstanceRoot,
+  resolveRunningInstance: () => resolveRunningInstance
 });
 import path23 from "path";
 import fs18 from "fs";
@@ -7482,6 +7483,38 @@ function resolveInstanceRoot(opts) {
 function getGlobalRoot() {
   return path23.join(os11.homedir(), ".openacp");
 }
+async function resolveRunningInstance(cwd) {
+  const globalRoot = getGlobalRoot();
+  let dir = path23.resolve(cwd);
+  while (true) {
+    const candidate = path23.join(dir, ".openacp");
+    if (candidate !== globalRoot && fs18.existsSync(candidate)) {
+      if (await isInstanceRunning(candidate)) return candidate;
+    }
+    const parent = path23.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  if (fs18.existsSync(globalRoot) && await isInstanceRunning(globalRoot)) return globalRoot;
+  return null;
+}
+async function isInstanceRunning(instanceRoot) {
+  const portFile = path23.join(instanceRoot, "api.port");
+  try {
+    const content = fs18.readFileSync(portFile, "utf-8").trim();
+    const port = parseInt(content, 10);
+    if (isNaN(port)) return false;
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 2e3);
+    const res = await fetch(`http://127.0.0.1:${port}/api/v1/system/health`, {
+      signal: controller.signal
+    });
+    clearTimeout(timeout);
+    return res.ok;
+  } catch {
+    return false;
+  }
+}
 var init_instance_context = __esm({
   "src/core/instance/instance-context.ts"() {
     "use strict";
@@ -14017,12 +14050,12 @@ function isProcessAlive(pid) {
   }
 }
 function checkPortInUse(port) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const server = net.createServer();
-    server.once("error", () => resolve8(true));
+    server.once("error", () => resolve9(true));
     server.once("listening", () => {
       server.close();
-      resolve8(false);
+      resolve9(false);
     });
     server.listen(port, "127.0.0.1");
   });
@@ -15175,8 +15208,27 @@ var init_stream_accumulator = __esm({
   }
 });
 
-// src/core/adapter-primitives/display-spec-builder.ts
+// src/core/utils/apply-patch-detection.ts
 function asRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function hasApplyPatchPatchText(rawInput) {
+  const input2 = asRecord(rawInput);
+  return !!input2 && (typeof input2.patchText === "string" || typeof input2.patch_text === "string");
+}
+function isApplyPatchOtherTool(kind, name, rawInput) {
+  if (kind !== "other") return false;
+  if (name.toLowerCase() === "apply_patch") return true;
+  return hasApplyPatchPatchText(rawInput);
+}
+var init_apply_patch_detection = __esm({
+  "src/core/utils/apply-patch-detection.ts"() {
+    "use strict";
+  }
+});
+
+// src/core/adapter-primitives/display-spec-builder.ts
+function asRecord2(value) {
   if (value !== null && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -15209,8 +15261,21 @@ function parseApplyPatchTargets(patchText) {
 function buildTitle(entry, kind) {
   if (entry.displayTitle) return entry.displayTitle;
   if (entry.displaySummary) return entry.displaySummary;
-  const input2 = asRecord(entry.rawInput);
+  const input2 = asRecord2(entry.rawInput);
   const nameLower = entry.name.toLowerCase();
+  if (isApplyPatchOtherTool(entry.kind, entry.name, entry.rawInput)) {
+    const patchText = getStringField(input2, ["patchText", "patch_text"]);
+    if (patchText) {
+      const targets = parseApplyPatchTargets(patchText);
+      if (targets.length === 1) return targets[0];
+      if (targets.length > 1) {
+        const shown = targets.slice(0, 2).join(", ");
+        const rest = targets.length - 2;
+        return rest > 0 ? `${shown} (+${rest} more)` : shown;
+      }
+    }
+    return "apply_patch";
+  }
   if (kind === "read") {
     const filePath = getStringField(input2, ["file_path", "filePath", "path"]);
     if (filePath) {
@@ -15259,36 +15324,6 @@ function buildTitle(entry, kind) {
     }
     return capitalize(entry.name);
   }
-  if (nameLower === "apply_patch") {
-    const patchText = getStringField(input2, ["patchText", "patch_text"]);
-    if (patchText) {
-      const targets = parseApplyPatchTargets(patchText);
-      if (targets.length === 1) return targets[0];
-      if (targets.length > 1) {
-        const shown = targets.slice(0, 2).join(", ");
-        const remaining2 = targets.length - 2;
-        return remaining2 > 0 ? `${shown} (+${remaining2} more)` : shown;
-      }
-    }
-    return "apply_patch";
-  }
-  if (nameLower === "todowrite") {
-    const todos = Array.isArray(input2.todos) ? input2.todos : [];
-    if (todos.length > 0) {
-      const inProgress = todos.filter((t) => {
-        if (!t || typeof t !== "object") return false;
-        const status = t.status;
-        return status === "in_progress";
-      }).length;
-      const completed = todos.filter((t) => {
-        if (!t || typeof t !== "object") return false;
-        const status = t.status;
-        return status === "completed";
-      }).length;
-      return `Todo list (${completed}/${todos.length} done${inProgress > 0 ? `, ${inProgress} active` : ""})`;
-    }
-    return "Todo list";
-  }
   if (kind === "fetch" || kind === "web") {
     const url = typeof input2.url === "string" ? input2.url : null;
     if (url && url !== "undefined") return url.length > 60 ? url.slice(0, 57) + "..." : url;
@@ -15299,19 +15334,6 @@ function buildTitle(entry, kind) {
   if (nameLower === "skill" && typeof input2.skill === "string" && input2.skill) {
     return input2.skill;
   }
-  if (nameLower === "apply_patch") {
-    const patchText = getStringField(input2, ["patchText", "patch_text"]);
-    if (patchText) {
-      const targets = parseApplyPatchTargets(patchText);
-      if (targets.length === 1) return targets[0];
-      if (targets.length > 1) {
-        const shown = targets.slice(0, 2).join(", ");
-        const rest = targets.length - 2;
-        return rest > 0 ? `${shown} (+${rest} more)` : shown;
-      }
-    }
-    return "apply_patch";
-  }
   if (nameLower === "todowrite") {
     const todos = Array.isArray(input2.todos) ? input2.todos : [];
     if (todos.length > 0) {
@@ -15341,6 +15363,7 @@ var init_display_spec_builder = __esm({
   "src/core/adapter-primitives/display-spec-builder.ts"() {
     "use strict";
     init_format_types();
+    init_apply_patch_detection();
     EXECUTE_KINDS = /* @__PURE__ */ new Set(["execute", "bash", "command", "terminal"]);
     INLINE_MAX_LINES = 15;
     INLINE_MAX_CHARS = 800;
@@ -15349,12 +15372,12 @@ var init_display_spec_builder = __esm({
         this.tunnelService = tunnelService;
       }
       buildToolSpec(entry, mode, sessionContext) {
-        const effectiveKind = entry.displayKind ?? entry.kind;
+        const effectiveKind = entry.displayKind ?? (isApplyPatchOtherTool(entry.kind, entry.name, entry.rawInput) ? "edit" : entry.kind);
         const icon = KIND_ICONS[effectiveKind] ?? KIND_ICONS["other"] ?? "\u{1F6E0}\uFE0F";
         const title = buildTitle(entry, effectiveKind);
         const isHidden = entry.isNoise && mode !== "high";
         const includeMeta = mode !== "low";
-        const input2 = asRecord(entry.rawInput);
+        const input2 = asRecord2(entry.rawInput);
         const rawDescription = typeof input2.description === "string" ? input2.description : null;
         const descLower = rawDescription?.toLowerCase();
         const description = includeMeta && rawDescription && rawDescription !== title && descLower !== effectiveKind && descLower !== entry.name.toLowerCase() ? rawDescription : null;
@@ -15800,10 +15823,10 @@ var init_send_queue = __esm({
         const type = opts?.type ?? "other";
         const key = opts?.key;
         const category = opts?.category;
-        let resolve8;
+        let resolve9;
         let reject;
         const promise = new Promise((res, rej) => {
-          resolve8 = res;
+          resolve9 = res;
           reject = rej;
         });
         promise.catch(() => {
@@ -15814,12 +15837,12 @@ var init_send_queue = __esm({
           );
           if (idx !== -1) {
             this.items[idx].resolve(void 0);
-            this.items[idx] = { fn, type, key, category, resolve: resolve8, reject, promise };
+            this.items[idx] = { fn, type, key, category, resolve: resolve9, reject, promise };
             this.scheduleProcess();
             return promise;
           }
         }
-        this.items.push({ fn, type, key, category, resolve: resolve8, reject, promise });
+        this.items.push({ fn, type, key, category, resolve: resolve9, reject, promise });
         this.scheduleProcess();
         return promise;
       }
@@ -18566,7 +18589,7 @@ function startDaemon(pidPath = getPidPath(), logDir2, instanceRoot) {
   return { pid: child.pid };
 }
 function sleep(ms) {
-  return new Promise((resolve8) => setTimeout(resolve8, ms));
+  return new Promise((resolve9) => setTimeout(resolve9, ms));
 }
 function isProcessAlive2(pid) {
   try {
@@ -18848,15 +18871,15 @@ var init_env_filter = __esm({
 function nodeToWebWritable(nodeStream) {
   return new WritableStream({
     write(chunk) {
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         const ok3 = nodeStream.write(chunk);
         if (ok3) {
-          resolve8();
+          resolve9();
           return;
         }
         const onDrain = () => {
           nodeStream.removeListener("error", onError);
-          resolve8();
+          resolve9();
         };
         const onError = (err) => {
           nodeStream.removeListener("drain", onDrain);
@@ -19166,12 +19189,12 @@ var init_terminal_manager = __esm({
             signal: state.exitStatus.signal
           };
         }
-        return new Promise((resolve8) => {
+        return new Promise((resolve9) => {
           state.process.on("exit", (code, signal) => {
-            resolve8({ exitCode: code, signal });
+            resolve9({ exitCode: code, signal });
           });
           if (state.exitStatus !== null) {
-            resolve8({
+            resolve9({
               exitCode: state.exitStatus.exitCode,
               signal: state.exitStatus.signal
             });
@@ -19319,18 +19342,41 @@ function resolveAgentCommand(cmd) {
   try {
     const fullPath = execFileSync6("which", [cmd], { encoding: "utf-8" }).trim();
     if (fullPath) {
-      const content = fs40.readFileSync(fullPath, "utf-8");
-      if (content.startsWith("#!/usr/bin/env node")) {
-        return { command: process.execPath, args: [fullPath] };
+      try {
+        const content = fs40.readFileSync(fullPath, "utf-8");
+        if (content.startsWith("#!/usr/bin/env node")) {
+          return { command: process.execPath, args: [fullPath] };
+        }
+      } catch {
       }
+      return { command: fullPath, args: [] };
     }
   } catch {
   }
   if (cmd === "npx" || cmd === "uvx") {
-    const sibling = path44.join(path44.dirname(process.execPath), cmd);
-    if (fs40.existsSync(sibling)) {
-      return { command: sibling, args: [] };
+    const seen = /* @__PURE__ */ new Set();
+    const candidates = [];
+    const addCandidate = (dir) => {
+      if (!seen.has(dir)) {
+        seen.add(dir);
+        candidates.push(dir);
+      }
+    };
+    addCandidate(path44.dirname(process.execPath));
+    try {
+      addCandidate(path44.dirname(fs40.realpathSync(process.execPath)));
+    } catch {
     }
+    addCandidate("/opt/homebrew/bin");
+    addCandidate("/usr/local/bin");
+    for (const dir of candidates) {
+      const candidate = path44.join(dir, cmd);
+      if (fs40.existsSync(candidate)) {
+        log31.info({ cmd, resolved: candidate }, "Resolved package runner from fallback search");
+        return { command: candidate, args: [] };
+      }
+    }
+    log31.warn({ cmd, execPath: process.execPath, candidates }, "Could not find package runner");
   }
   return { command: cmd, args: [] };
 }
@@ -19405,7 +19451,7 @@ var init_agent_instance = __esm({
             env: filterEnv(process.env, agentDef.env)
           }
         );
-        await new Promise((resolve8, reject) => {
+        await new Promise((resolve9, reject) => {
           instance.child.on("error", (err) => {
             reject(
               new Error(
@@ -19413,7 +19459,7 @@ var init_agent_instance = __esm({
               )
             );
           });
-          instance.child.on("spawn", () => resolve8());
+          instance.child.on("spawn", () => resolve9());
         });
         instance.stderrCapture = new StderrCapture(50);
         instance.child.stderr.on("data", (chunk) => {
@@ -19919,15 +19965,15 @@ ${skipNote}`;
         this._destroying = true;
         this.terminalManager.destroyAll();
         if (this.child.exitCode !== null) return;
-        await new Promise((resolve8) => {
+        await new Promise((resolve9) => {
           this.child.on("exit", () => {
             clearTimeout(forceKillTimer);
-            resolve8();
+            resolve9();
           });
           this.child.kill("SIGTERM");
           const forceKillTimer = setTimeout(() => {
             if (this.child.exitCode === null) this.child.kill("SIGKILL");
-            resolve8();
+            resolve9();
           }, 1e4);
           if (typeof forceKillTimer === "object" && forceKillTimer !== null && "unref" in forceKillTimer) {
             forceKillTimer.unref();
@@ -19991,8 +20037,8 @@ var init_prompt_queue = __esm({
       processorSettled = null;
       async enqueue(text6, attachments, routing, turnId) {
         if (this.processing) {
-          return new Promise((resolve8) => {
-            this.queue.push({ text: text6, attachments, routing, turnId, resolve: resolve8 });
+          return new Promise((resolve9) => {
+            this.queue.push({ text: text6, attachments, routing, turnId, resolve: resolve9 });
           });
         }
         await this.process(text6, attachments, routing, turnId);
@@ -20072,8 +20118,8 @@ var init_permission_gate = __esm({
         this.request = request;
         this.settled = false;
         this.clearTimeout();
-        return new Promise((resolve8, reject) => {
-          this.resolveFn = resolve8;
+        return new Promise((resolve9, reject) => {
+          this.resolveFn = resolve9;
           this.rejectFn = reject;
           this.timeoutTimer = setTimeout(() => {
             this.reject("Permission request timed out (no response received)");
@@ -21321,7 +21367,10 @@ var init_session_bridge = __esm({
 });
 
 // src/core/utils/extract-file-info.ts
-function extractFileInfo(name, kind, content, rawInput, meta) {
+function extractFileInfo(name, kind, content, rawInput, meta, rawOutput) {
+  if (isApplyPatchOtherTool(kind, name, rawInput)) {
+    return parseApplyPatchRawOutput(rawOutput);
+  }
   if (kind && !["read", "edit", "write"].includes(kind)) return null;
   let info = null;
   if (meta) {
@@ -21376,6 +21425,37 @@ function extractFileInfo(name, kind, content, rawInput, meta) {
   if (!info.filePath || !info.content) return null;
   return info;
 }
+function parseApplyPatchRawOutput(rawOutput) {
+  if (!rawOutput || typeof rawOutput !== "object" || Array.isArray(rawOutput)) return null;
+  const output = rawOutput;
+  const metadata = output.metadata;
+  if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) return null;
+  const files = metadata.files;
+  if (!Array.isArray(files)) return null;
+  const sortedFiles = [...files].sort((a, b) => getApplyPatchFileScore(b) - getApplyPatchFileScore(a));
+  for (const file of sortedFiles) {
+    if (!file || typeof file !== "object" || Array.isArray(file)) continue;
+    const f = file;
+    const filePath = typeof f.filePath === "string" ? f.filePath : typeof f.relativePath === "string" ? f.relativePath : null;
+    if (!filePath) continue;
+    const after = typeof f.after === "string" ? f.after : null;
+    if (!after) continue;
+    const before = typeof f.before === "string" ? f.before : void 0;
+    return {
+      filePath,
+      content: after,
+      oldContent: before
+    };
+  }
+  return null;
+}
+function getApplyPatchFileScore(file) {
+  if (!file || typeof file !== "object" || Array.isArray(file)) return 0;
+  const f = file;
+  const additions = typeof f.additions === "number" && Number.isFinite(f.additions) && f.additions >= 0 ? f.additions : 0;
+  const deletions = typeof f.deletions === "number" && Number.isFinite(f.deletions) && f.deletions >= 0 ? f.deletions : 0;
+  return additions + deletions;
+}
 function resolveToolResponse(meta) {
   const claudeCode = meta.claudeCode;
   if (claudeCode?.toolResponse && typeof claudeCode.toolResponse === "object") {
@@ -21444,6 +21524,7 @@ function parseContent(content) {
 var init_extract_file_info = __esm({
   "src/core/utils/extract-file-info.ts"() {
     "use strict";
+    init_apply_patch_detection();
   }
 });
 
@@ -21467,11 +21548,69 @@ function computeLineDiff(oldStr, newStr) {
     removed: Math.max(0, oldLines.length - prefixLen - suffixLen)
   };
 }
+function asRecord3(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function asNonNegativeNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
+}
+function extractDiffStatsFromRawOutput(rawOutput) {
+  const output = asRecord3(rawOutput);
+  const metadata = asRecord3(output?.metadata);
+  if (!metadata) return null;
+  const files = Array.isArray(metadata.files) ? metadata.files : null;
+  if (files && files.length > 0) {
+    let added2 = 0;
+    let removed2 = 0;
+    let hasAny = false;
+    for (const file of files) {
+      const fileMeta = asRecord3(file);
+      if (!fileMeta) continue;
+      const fileAdded = asNonNegativeNumber(fileMeta.additions);
+      const fileRemoved = asNonNegativeNumber(fileMeta.deletions);
+      if (fileAdded === null && fileRemoved === null) continue;
+      added2 += fileAdded ?? 0;
+      removed2 += fileRemoved ?? 0;
+      hasAny = true;
+    }
+    if (hasAny && (added2 > 0 || removed2 > 0)) return { added: added2, removed: removed2 };
+  }
+  const added = asNonNegativeNumber(metadata.additions);
+  const removed = asNonNegativeNumber(metadata.deletions);
+  if (added === null && removed === null) return null;
+  if ((added ?? 0) === 0 && (removed ?? 0) === 0) return null;
+  return {
+    added: added ?? 0,
+    removed: removed ?? 0
+  };
+}
+function extractDiffStatsFromToolPayload(name, kind, rawInput, rawOutput) {
+  if (kind === "edit" || kind === "write") {
+    const ri = asRecord3(rawInput);
+    if (!ri) return null;
+    const oldStr = typeof ri.old_string === "string" ? ri.old_string : typeof ri.oldText === "string" ? ri.oldText : null;
+    const newStr = typeof ri.new_string === "string" ? ri.new_string : typeof ri.newText === "string" ? ri.newText : typeof ri.content === "string" ? ri.content : null;
+    if (oldStr !== null && newStr !== null) {
+      const stats = computeLineDiff(oldStr, newStr);
+      return stats.added > 0 || stats.removed > 0 ? stats : null;
+    }
+    if (oldStr === null && newStr !== null && kind === "write") {
+      const added = newStr.split("\n").length;
+      return added > 0 ? { added, removed: 0 } : null;
+    }
+    return null;
+  }
+  if (isApplyPatchOtherTool(kind, name, rawInput)) {
+    return extractDiffStatsFromRawOutput(rawOutput);
+  }
+  return null;
+}
 var log33, BINARY_VIEWER_EXTENSIONS, MessageTransformer;
 var init_message_transformer = __esm({
   "src/core/message-transformer.ts"() {
     "use strict";
     init_extract_file_info();
+    init_apply_patch_detection();
     init_log();
     log33 = createChildLogger({ module: "message-transformer" });
     BINARY_VIEWER_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -21658,22 +21797,11 @@ var init_message_transformer = __esm({
         return input2 !== null && input2 !== void 0 && typeof input2 === "object" && !Array.isArray(input2) && Object.keys(input2).length > 0;
       }
       enrichWithViewerLinks(event, metadata, sessionContext) {
+        const name = "name" in event ? event.name || "" : "";
         const kind = "kind" in event ? event.kind : void 0;
-        if (!metadata.diffStats && (kind === "edit" || kind === "write")) {
-          const ri = event.rawInput;
-          if (ri) {
-            const oldStr = typeof ri.old_string === "string" ? ri.old_string : typeof ri.oldText === "string" ? ri.oldText : null;
-            const newStr = typeof ri.new_string === "string" ? ri.new_string : typeof ri.newText === "string" ? ri.newText : typeof ri.content === "string" ? ri.content : null;
-            if (oldStr !== null && newStr !== null) {
-              const stats = computeLineDiff(oldStr, newStr);
-              if (stats.added > 0 || stats.removed > 0) {
-                metadata.diffStats = stats;
-              }
-            } else if (oldStr === null && newStr !== null && kind === "write") {
-              const added = newStr.split("\n").length;
-              if (added > 0) metadata.diffStats = { added, removed: 0 };
-            }
-          }
+        if (!metadata.diffStats) {
+          const stats = extractDiffStatsFromToolPayload(name, kind, event.rawInput, event.rawOutput);
+          if (stats) metadata.diffStats = stats;
         }
         if (!this.tunnelService || !sessionContext) {
           log33.debug(
@@ -21682,7 +21810,6 @@ var init_message_transformer = __esm({
           );
           return;
         }
-        const name = "name" in event ? event.name || "" : "";
         log33.debug(
           { name, kind, status: event.status, hasContent: !!event.content, hasRawInput: !!event.rawInput },
           "enrichWithViewerLinks: inspecting event"
@@ -21692,7 +21819,8 @@ var init_message_transformer = __esm({
           kind,
           event.content,
           event.rawInput,
-          event.meta
+          event.meta,
+          event.rawOutput
         );
         if (!fileInfo) {
           log33.debug(
@@ -22650,6 +22778,7 @@ var init_agent_catalog = __esm({
     DEFAULT_TTL_HOURS = 24;
     AgentCatalog = class {
       store;
+      globalStore = null;
       registryAgents = [];
       cachePath;
       agentsDir;
@@ -22657,9 +22786,15 @@ var init_agent_catalog = __esm({
         this.store = store ?? new AgentStore();
         this.cachePath = cachePath ?? path48.join(os21.homedir(), ".openacp", "registry-cache.json");
         this.agentsDir = agentsDir;
+        const globalPath = path48.join(os21.homedir(), ".openacp", "agents.json");
+        const storePath = this.store.filePath;
+        if (path48.resolve(storePath) !== path48.resolve(globalPath)) {
+          this.globalStore = new AgentStore(globalPath);
+        }
       }
       load() {
         this.store.load();
+        this.globalStore?.load();
         this.loadRegistryFromCacheOrSnapshot();
         this.enrichInstalledFromRegistry();
       }
@@ -22699,19 +22834,20 @@ var init_agent_catalog = __esm({
         if (byId) return byId;
         return this.registryAgents.find((a) => getAgentAlias(a.id) === keyOrId);
       }
-      // --- Installed ---
+      // --- Installed (instance-first, global-fallback) ---
       getInstalled() {
-        return Object.values(this.store.getInstalled());
+        const merged = { ...this.globalStore?.getInstalled(), ...this.store.getInstalled() };
+        return Object.values(merged);
       }
       getInstalledEntries() {
-        return this.store.getInstalled();
+        return { ...this.globalStore?.getInstalled(), ...this.store.getInstalled() };
       }
       getInstalledAgent(key) {
-        return this.store.getAgent(key);
+        return this.store.getAgent(key) ?? this.globalStore?.getAgent(key);
       }
       // --- Discovery ---
       getAvailable() {
-        const installed = this.store.getInstalled();
+        const installed = this.getInstalledEntries();
         const items = [];
         const seenKeys = /* @__PURE__ */ new Set();
         for (const [key, agent] of Object.entries(installed)) {
@@ -22785,15 +22921,18 @@ var init_agent_catalog = __esm({
         this.store.addAgent(key, data);
       }
       async uninstall(key) {
-        if (!this.store.hasAgent(key)) {
-          return { ok: false, error: `"${key}" is not installed.` };
+        if (this.store.hasAgent(key)) {
+          await uninstallAgent(key, this.store);
+          return { ok: true };
         }
-        await uninstallAgent(key, this.store);
-        return { ok: true };
+        if (this.globalStore?.getAgent(key)) {
+          return { ok: false, error: `"${key}" is installed globally. Uninstall it from the global instance instead.` };
+        }
+        return { ok: false, error: `"${key}" is not installed.` };
       }
       // --- Resolution (for AgentManager) ---
       resolve(key) {
-        const agent = this.store.getAgent(key);
+        const agent = this.store.getAgent(key) ?? this.globalStore?.getAgent(key);
         if (!agent) return void 0;
         return {
           name: key,
@@ -23434,13 +23573,13 @@ var init_plugin_context = __esm({
 
 // src/core/plugin/lifecycle-manager.ts
 function withTimeout(promise, ms, label) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const timer = setTimeout(() => reject(new Error(`Timeout: ${label} exceeded ${ms}ms`)), ms);
     if (typeof timer === "object" && timer !== null && "unref" in timer) {
       ;
       timer.unref();
     }
-    promise.then(resolve8, reject).finally(() => clearTimeout(timer));
+    promise.then(resolve9, reject).finally(() => clearTimeout(timer));
   });
 }
 function resolvePluginConfig(pluginName, configManager) {
@@ -28789,7 +28928,7 @@ function showInteractiveMenu(options) {
     }
   }
   console.log("");
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     process.stdin.setRawMode(true);
     process.stdin.resume();
     const onData = async (buf) => {
@@ -28808,7 +28947,7 @@ function showInteractiveMenu(options) {
           console.error(err);
           process.exit(1);
         }
-        resolve8(true);
+        resolve9(true);
       }
     };
     const cleanup = () => {
@@ -28828,6 +28967,7 @@ var init_interactive_menu = __esm({
 // src/cli/instance-prompt.ts
 var instance_prompt_exports = {};
 __export(instance_prompt_exports, {
+  findParentInstance: () => findParentInstance,
   promptForInstance: () => promptForInstance
 });
 import fs57 from "fs";
@@ -28838,14 +28978,15 @@ async function promptForInstance(opts) {
   const globalConfigExists = fs57.existsSync(path69.join(globalRoot, "config.json"));
   const cwd = process.cwd();
   const localRoot = path69.join(cwd, ".openacp");
-  if (!globalConfigExists) return globalRoot;
+  const detectedParent = findParentInstance(cwd, globalRoot);
+  if (!globalConfigExists) return detectedParent ?? globalRoot;
   const isTTY = process.stdin.isTTY && process.stdout.isTTY;
-  if (!isTTY) return globalRoot;
+  if (!isTTY) return detectedParent ?? globalRoot;
   const registryPath = path69.join(globalRoot, "instances.json");
   const registry = new InstanceRegistry(registryPath);
   registry.load();
   const instances = registry.list().filter((e) => fs57.existsSync(e.root));
-  const instanceOptions = instances.map((e) => {
+  const instanceOptions = instances.filter((e) => !detectedParent || e.root !== detectedParent).map((e) => {
     let name = e.id;
     try {
       const raw = fs57.readFileSync(path69.join(e.root, "config.json"), "utf-8");
@@ -28858,6 +28999,17 @@ async function promptForInstance(opts) {
     const type = isGlobal ? "global" : "local";
     return { value: e.root, label: `${name} workspace (${type} \u2014 ${displayPath})` };
   });
+  if (detectedParent) {
+    let name = path69.basename(path69.dirname(detectedParent));
+    try {
+      const raw = fs57.readFileSync(path69.join(detectedParent, "config.json"), "utf-8");
+      const parsed = JSON.parse(raw);
+      if (parsed.instanceName) name = parsed.instanceName;
+    } catch {
+    }
+    const displayPath = detectedParent.replace(os32.homedir(), "~");
+    instanceOptions.unshift({ value: detectedParent, label: `${name} workspace (detected \u2014 ${displayPath})` });
+  }
   if (instanceOptions.length === 0) {
     const globalDisplay = globalRoot.replace(os32.homedir(), "~");
     instanceOptions.push({ value: globalRoot, label: `Global workspace (${globalDisplay})` });
@@ -28886,6 +29038,17 @@ async function promptForInstance(opts) {
   }
   return choice;
 }
+function findParentInstance(cwd, globalRoot) {
+  let dir = path69.dirname(cwd);
+  while (true) {
+    const candidate = path69.join(dir, ".openacp");
+    if (candidate !== globalRoot && fs57.existsSync(candidate)) return candidate;
+    const parent = path69.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
+}
 var init_instance_prompt = __esm({
   "src/cli/instance-prompt.ts"() {
     "use strict";
@@ -30633,6 +30796,7 @@ installs it globally if an update is available.
 init_api_client();
 init_helpers();
 init_output();
+init_instance_context();
 async function cmdAdopt(args2) {
   if (wantsHelp(args2)) {
     console.log(`
@@ -30686,10 +30850,11 @@ as a messaging thread. Requires a running daemon.
   const cwd = cwdIdx !== -1 && args2[cwdIdx + 1] ? args2[cwdIdx + 1] : process.cwd();
   const channelIdx = args2.indexOf("--channel");
   const channel = channelIdx !== -1 && args2[channelIdx + 1] ? args2[channelIdx + 1] : void 0;
-  const port = readApiPort();
+  const instanceRoot = await resolveRunningInstance(cwd);
+  const port = instanceRoot ? readApiPort(void 0, instanceRoot) : null;
   if (!port) {
-    if (json) jsonError(ErrorCodes.DAEMON_NOT_RUNNING, "OpenACP is not running. Start it with: openacp start");
-    console.log("OpenACP is not running. Start it with: openacp start");
+    if (json) jsonError(ErrorCodes.DAEMON_NOT_RUNNING, "No running OpenACP instance found. Start one with: openacp start");
+    console.log("No running OpenACP instance found. Start one with: openacp start");
     process.exit(1);
   }
   try {
@@ -30698,7 +30863,7 @@ as a messaging thread. Requires a running daemon.
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ agent, agentSessionId: sessionId, cwd, channel })
-    });
+    }, instanceRoot ?? void 0);
     const data = await res.json();
     if (data.ok) {
       if (json) jsonSuccess({ sessionId: data.sessionId, threadId: data.threadId, agent, status: data.status ?? "new" });