@openacp/cli 2026.408.2 → 2026.408.4

package/dist/index.js

@@ -198,11 +198,11 @@ async function shutdownLogger() {
   logDir = void 0;
   initialized = false;
   if (transport) {
-    await new Promise((resolve6) => {
-      const timeout = setTimeout(resolve6, 3e3);
+    await new Promise((resolve7) => {
+      const timeout = setTimeout(resolve7, 3e3);
       transport.on("close", () => {
         clearTimeout(timeout);
-        resolve6();
+        resolve7();
       });
       transport.end();
     });
@@ -289,7 +289,8 @@ __export(instance_context_exports, {
   createInstanceContext: () => createInstanceContext,
   generateSlug: () => generateSlug,
   getGlobalRoot: () => getGlobalRoot,
-  resolveInstanceRoot: () => resolveInstanceRoot
+  resolveInstanceRoot: () => resolveInstanceRoot,
+  resolveRunningInstance: () => resolveRunningInstance
 });
 import path2 from "path";
 import fs2 from "fs";
@@ -341,6 +342,38 @@ function resolveInstanceRoot(opts) {
 function getGlobalRoot() {
   return path2.join(os2.homedir(), ".openacp");
 }
+async function resolveRunningInstance(cwd) {
+  const globalRoot = getGlobalRoot();
+  let dir = path2.resolve(cwd);
+  while (true) {
+    const candidate = path2.join(dir, ".openacp");
+    if (candidate !== globalRoot && fs2.existsSync(candidate)) {
+      if (await isInstanceRunning(candidate)) return candidate;
+    }
+    const parent = path2.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  if (fs2.existsSync(globalRoot) && await isInstanceRunning(globalRoot)) return globalRoot;
+  return null;
+}
+async function isInstanceRunning(instanceRoot) {
+  const portFile = path2.join(instanceRoot, "api.port");
+  try {
+    const content = fs2.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";
@@ -875,6 +908,25 @@ var init_events = __esm({
   }
 });
 
+// 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/utils/bypass-detection.ts
 function isPermissionBypass(value) {
   const lower = value.toLowerCase();
@@ -2013,12 +2065,12 @@ function isProcessAlive(pid) {
   }
 }
 function checkPortInUse(port) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     const server = net.createServer();
-    server.once("error", () => resolve6(true));
+    server.once("error", () => resolve7(true));
     server.once("listening", () => {
       server.close();
-      resolve6(false);
+      resolve7(false);
     });
     server.listen(port, "127.0.0.1");
   });
@@ -2110,7 +2162,7 @@ import https from "https";
 import os9 from "os";
 import { execFileSync as execFileSync4 } from "child_process";
 function downloadFile(url, dest, maxRedirects = 10) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     const file = fs23.createWriteStream(dest);
     const cleanup = () => {
       try {
@@ -2129,7 +2181,7 @@ function downloadFile(url, dest, maxRedirects = 10) {
         }
         file.close(() => {
           cleanup();
-          downloadFile(response.headers.location, dest, maxRedirects - 1).then(resolve6).catch(reject);
+          downloadFile(response.headers.location, dest, maxRedirects - 1).then(resolve7).catch(reject);
         });
         return;
       }
@@ -2153,7 +2205,7 @@ function downloadFile(url, dest, maxRedirects = 10) {
         }
       });
       response.pipe(file);
-      file.on("finish", () => file.close(() => resolve6(dest)));
+      file.on("finish", () => file.close(() => resolve7(dest)));
       file.on("error", (err) => {
         file.close(() => {
           cleanup();
@@ -4975,10 +5027,10 @@ var init_send_queue = __esm({
         const type = opts?.type ?? "other";
         const key = opts?.key;
         const category = opts?.category;
-        let resolve6;
+        let resolve7;
         let reject;
         const promise = new Promise((res, rej) => {
-          resolve6 = res;
+          resolve7 = res;
           reject = rej;
         });
         promise.catch(() => {
@@ -4989,12 +5041,12 @@ var init_send_queue = __esm({
           );
           if (idx !== -1) {
             this.items[idx].resolve(void 0);
-            this.items[idx] = { fn, type, key, category, resolve: resolve6, reject, promise };
+            this.items[idx] = { fn, type, key, category, resolve: resolve7, reject, promise };
             this.scheduleProcess();
             return promise;
           }
         }
-        this.items.push({ fn, type, key, category, resolve: resolve6, reject, promise });
+        this.items.push({ fn, type, key, category, resolve: resolve7, reject, promise });
         this.scheduleProcess();
         return promise;
       }
@@ -5256,7 +5308,7 @@ var init_stream_accumulator = __esm({
 });
 
 // src/core/adapter-primitives/display-spec-builder.ts
-function asRecord(value) {
+function asRecord3(value) {
   if (value !== null && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -5289,8 +5341,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 = asRecord3(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) {
@@ -5339,36 +5404,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 remaining = targets.length - 2;
-        return remaining > 0 ? `${shown} (+${remaining} 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;
@@ -5379,19 +5414,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) {
@@ -5421,6 +5443,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;
@@ -5429,12 +5452,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 = asRecord3(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;
@@ -5819,14 +5842,14 @@ __export(version_exports, {
   runUpdate: () => runUpdate
 });
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { dirname as dirname10, join as join20, resolve as resolve5 } from "path";
+import { dirname as dirname10, join as join20, resolve as resolve6 } from "path";
 import { existsSync as existsSync17, readFileSync as readFileSync15 } from "fs";
 function findPackageJson() {
   let dir = dirname10(fileURLToPath2(import.meta.url));
   for (let i = 0; i < 5; i++) {
     const candidate = join20(dir, "package.json");
     if (existsSync17(candidate)) return candidate;
-    const parent = resolve5(dir, "..");
+    const parent = resolve6(dir, "..");
     if (parent === dir) break;
     dir = parent;
   }
@@ -5865,21 +5888,21 @@ function compareVersions(current, latest) {
 }
 async function runUpdate() {
   const { spawn: spawn4 } = await import("child_process");
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     const child = spawn4("npm", ["install", "-g", `${NPM_PACKAGE}@latest`], {
       stdio: "inherit",
       shell: true
     });
     const onSignal = () => {
       child.kill("SIGTERM");
-      resolve6(false);
+      resolve7(false);
     };
     process.on("SIGINT", onSignal);
     process.on("SIGTERM", onSignal);
     child.on("close", (code) => {
       process.off("SIGINT", onSignal);
       process.off("SIGTERM", onSignal);
-      resolve6(code === 0);
+      resolve7(code === 0);
     });
   });
 }
@@ -10778,15 +10801,15 @@ var ChannelAdapter = class {
 function nodeToWebWritable(nodeStream) {
   return new WritableStream({
     write(chunk) {
-      return new Promise((resolve6, reject) => {
+      return new Promise((resolve7, reject) => {
         const ok2 = nodeStream.write(chunk);
         if (ok2) {
-          resolve6();
+          resolve7();
           return;
         }
         const onDrain = () => {
           nodeStream.removeListener("error", onError);
-          resolve6();
+          resolve7();
         };
         const onError = (err) => {
           nodeStream.removeListener("drain", onDrain);
@@ -11222,12 +11245,12 @@ var TerminalManager = class {
         signal: state.exitStatus.signal
       };
     }
-    return new Promise((resolve6) => {
+    return new Promise((resolve7) => {
       state.process.on("exit", (code, signal) => {
-        resolve6({ exitCode: code, signal });
+        resolve7({ exitCode: code, signal });
       });
       if (state.exitStatus !== null) {
-        resolve6({
+        resolve7({
           exitCode: state.exitStatus.exitCode,
           signal: state.exitStatus.signal
         });
@@ -11358,18 +11381,41 @@ function resolveAgentCommand(cmd) {
   try {
     const fullPath = execFileSync("which", [cmd], { encoding: "utf-8" }).trim();
     if (fullPath) {
-      const content = fs8.readFileSync(fullPath, "utf-8");
-      if (content.startsWith("#!/usr/bin/env node")) {
-        return { command: process.execPath, args: [fullPath] };
+      try {
+        const content = fs8.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 = path7.join(path7.dirname(process.execPath), cmd);
-    if (fs8.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(path7.dirname(process.execPath));
+    try {
+      addCandidate(path7.dirname(fs8.realpathSync(process.execPath)));
+    } catch {
+    }
+    addCandidate("/opt/homebrew/bin");
+    addCandidate("/usr/local/bin");
+    for (const dir of candidates) {
+      const candidate = path7.join(dir, cmd);
+      if (fs8.existsSync(candidate)) {
+        log4.info({ cmd, resolved: candidate }, "Resolved package runner from fallback search");
+        return { command: candidate, args: [] };
+      }
     }
+    log4.warn({ cmd, execPath: process.execPath, candidates }, "Could not find package runner");
   }
   return { command: cmd, args: [] };
 }
@@ -11427,7 +11473,7 @@ var AgentInstance = class _AgentInstance extends TypedEmitter {
         env: filterEnv(process.env, agentDef.env)
       }
     );
-    await new Promise((resolve6, reject) => {
+    await new Promise((resolve7, reject) => {
       instance.child.on("error", (err) => {
         reject(
           new Error(
@@ -11435,7 +11481,7 @@ var AgentInstance = class _AgentInstance extends TypedEmitter {
           )
         );
       });
-      instance.child.on("spawn", () => resolve6());
+      instance.child.on("spawn", () => resolve7());
     });
     instance.stderrCapture = new StderrCapture(50);
     instance.child.stderr.on("data", (chunk) => {
@@ -11941,15 +11987,15 @@ ${skipNote}`;
     this._destroying = true;
     this.terminalManager.destroyAll();
     if (this.child.exitCode !== null) return;
-    await new Promise((resolve6) => {
+    await new Promise((resolve7) => {
       this.child.on("exit", () => {
         clearTimeout(forceKillTimer);
-        resolve6();
+        resolve7();
       });
       this.child.kill("SIGTERM");
       const forceKillTimer = setTimeout(() => {
         if (this.child.exitCode === null) this.child.kill("SIGKILL");
-        resolve6();
+        resolve7();
       }, 1e4);
       if (typeof forceKillTimer === "object" && forceKillTimer !== null && "unref" in forceKillTimer) {
         forceKillTimer.unref();
@@ -12003,8 +12049,8 @@ var PromptQueue = class {
   processorSettled = null;
   async enqueue(text3, attachments, routing, turnId) {
     if (this.processing) {
-      return new Promise((resolve6) => {
-        this.queue.push({ text: text3, attachments, routing, turnId, resolve: resolve6 });
+      return new Promise((resolve7) => {
+        this.queue.push({ text: text3, attachments, routing, turnId, resolve: resolve7 });
       });
     }
     await this.process(text3, attachments, routing, turnId);
@@ -12078,8 +12124,8 @@ var PermissionGate = class {
     this.request = request;
     this.settled = false;
     this.clearTimeout();
-    return new Promise((resolve6, reject) => {
-      this.resolveFn = resolve6;
+    return new Promise((resolve7, reject) => {
+      this.resolveFn = resolve7;
       this.rejectFn = reject;
       this.timeoutTimer = setTimeout(() => {
         this.reject("Permission request timed out (no response received)");
@@ -12688,7 +12734,11 @@ ${result.text}` : result.text;
 import * as path8 from "path";
 
 // src/core/utils/extract-file-info.ts
-function extractFileInfo(name, kind, content, rawInput, meta) {
+init_apply_patch_detection();
+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) {
@@ -12743,6 +12793,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") {
@@ -12810,6 +12891,7 @@ function parseContent(content) {
 }
 
 // src/core/message-transformer.ts
+init_apply_patch_detection();
 init_log();
 var log5 = createChildLogger({ module: "message-transformer" });
 var BINARY_VIEWER_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -12865,6 +12947,63 @@ function computeLineDiff(oldStr, newStr) {
     removed: Math.max(0, oldLines.length - prefixLen - suffixLen)
   };
 }
+function asRecord2(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 = asRecord2(rawOutput);
+  const metadata = asRecord2(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 = asRecord2(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 = asRecord2(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 MessageTransformer = class {
   tunnelService;
   /** Cache rawInput from tool_call so it's available in tool_update (which often lacks it) */
@@ -13014,22 +13153,11 @@ var MessageTransformer = class {
     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) {
       log5.debug(
@@ -13038,7 +13166,6 @@ var MessageTransformer = class {
       );
       return;
     }
-    const name = "name" in event ? event.name || "" : "";
     log5.debug(
       { name, kind, status: event.status, hasContent: !!event.content, hasRawInput: !!event.rawInput },
       "enrichWithViewerLinks: inspecting event"
@@ -13048,7 +13175,8 @@ var MessageTransformer = class {
       kind,
       event.content,
       event.rawInput,
-      event.meta
+      event.meta,
+      event.rawOutput
     );
     if (!fileInfo) {
       log5.debug(
@@ -14587,6 +14715,7 @@ var REGISTRY_URL = "https://cdn.agentclientprotocol.com/registry/v1/latest/regis
 var DEFAULT_TTL_HOURS = 24;
 var AgentCatalog = class {
   store;
+  globalStore = null;
   registryAgents = [];
   cachePath;
   agentsDir;
@@ -14594,9 +14723,15 @@ var AgentCatalog = class {
     this.store = store ?? new AgentStore();
     this.cachePath = cachePath ?? path13.join(os6.homedir(), ".openacp", "registry-cache.json");
     this.agentsDir = agentsDir;
+    const globalPath = path13.join(os6.homedir(), ".openacp", "agents.json");
+    const storePath = this.store.filePath;
+    if (path13.resolve(storePath) !== path13.resolve(globalPath)) {
+      this.globalStore = new AgentStore(globalPath);
+    }
   }
   load() {
     this.store.load();
+    this.globalStore?.load();
     this.loadRegistryFromCacheOrSnapshot();
     this.enrichInstalledFromRegistry();
   }
@@ -14636,19 +14771,20 @@ var AgentCatalog = class {
     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)) {
@@ -14722,15 +14858,18 @@ var AgentCatalog = class {
     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 };
+    }
+    if (this.globalStore?.getAgent(key)) {
+      return { ok: false, error: `"${key}" is installed globally. Uninstall it from the global instance instead.` };
     }
-    await uninstallAgent(key, this.store);
-    return { ok: true };
+    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,
@@ -15332,13 +15471,13 @@ init_events();
 var SETUP_TIMEOUT_MS = 3e4;
 var TEARDOWN_TIMEOUT_MS = 1e4;
 function withTimeout(promise, ms, label) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, 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(resolve6, reject).finally(() => clearTimeout(timer));
+    promise.then(resolve7, reject).finally(() => clearTimeout(timer));
   });
 }
 function resolvePluginConfig(pluginName, configManager) {
@@ -17665,7 +17804,7 @@ function startDaemon(pidPath = getPidPath(), logDir2, instanceRoot) {
   return { pid: child.pid };
 }
 function sleep(ms) {
-  return new Promise((resolve6) => setTimeout(resolve6, ms));
+  return new Promise((resolve7) => setTimeout(resolve7, ms));
 }
 function isProcessAlive2(pid) {
   try {