@cortexkit/aft-opencode 0.36.0 → 0.36.1

package/dist/index.js

@@ -12781,6 +12781,11 @@ function formatEditSummary(data) {
     const n = data.files_modified;
     return `Applied edits to ${n} file${n === 1 ? "" : "s"}.`;
   }
+  if (typeof data.total_files === "number") {
+    const files = data.total_files;
+    const reps = data.total_replacements ?? 0;
+    return `Edited ${files} file${files === 1 ? "" : "s"} (${reps} replacement${reps === 1 ? "" : "s"}).`;
+  }
   const additions = data.diff?.additions ?? 0;
   const deletions = data.diff?.deletions ?? 0;
   const counts = `+${additions}/-${deletions}`;
@@ -13994,7 +13999,23 @@ function isProcessAlive(pid) {
   }
 }
 // ../aft-bridge/dist/pipe-strip.js
-var NOISE_FILTERS = new Set(["grep", "rg", "head", "tail", "cat", "less", "more"]);
+var NOISE_FILTERS = new Set([
+  "grep",
+  "rg",
+  "head",
+  "tail",
+  "cat",
+  "less",
+  "more",
+  "sed",
+  "awk",
+  "cut",
+  "sort",
+  "uniq",
+  "tr",
+  "column",
+  "fold"
+]);
 var GREP_GUARD_FLAGS = new Set([
   "c",
   "count",
@@ -14008,6 +14029,8 @@ var GREP_GUARD_FLAGS = new Set([
 function maybeStripCompressorPipe(command, compressionEnabled) {
   if (!compressionEnabled)
     return { command, stripped: false };
+  if (containsUnsplittableConstruct(command))
+    return { command, stripped: false };
   const chain = splitTopLevelAndChain(command);
   if (chain === null)
     return { command, stripped: false };
@@ -14021,7 +14044,7 @@ function maybeStripCompressorPipe(command, compressionEnabled) {
     return { command, stripped: false };
   const filterStages = stages.slice(1).map((stage) => stage.trim());
   for (const stage of filterStages) {
-    if (!isPlainNoiseFilter(stage))
+    if (!filterStageIsSafeToDrop(stage))
       return { command, stripped: false };
   }
   const filters = filterStages.join(" | ");
@@ -14067,6 +14090,14 @@ function splitTopLevelAndChain(command) {
       return null;
     if (char === ";")
       return null;
+    if (char === `
+` || char === "\r")
+      return null;
+    if (char === "&") {
+      const prev = command[index - 1];
+      if (prev !== ">" && next !== ">")
+        return null;
+    }
   }
   segments.push(command.slice(start));
   return segments;
@@ -14109,45 +14140,262 @@ function isCompressorHandledRunner(stage) {
   const tokens = tokenizeStage(stage);
   if (tokens.length === 0)
     return false;
-  const [first, second, third] = tokens;
-  if (!first)
-    return false;
   if (tokens.some((token) => token === "&&" || token === "||" || token.includes(";"))) {
     return false;
   }
+  const first = runnerName(tokens[0]);
+  const second = tokens[1];
+  const third = tokens[2];
+  const rest = tokens.slice(1);
+  if (!first)
+    return false;
   if (first === "bun")
     return second === "test" || second === "run" && startsWithTest(third);
-  if (first === "cargo")
-    return ["test", "build", "check", "clippy"].includes(second ?? "");
-  if (first === "go")
-    return second === "test" || second === "build";
-  if (["npm", "pnpm"].includes(first)) {
+  if (first === "npm" || first === "pnpm") {
     return second === "test" || second === "run" && startsWithTest(third);
   }
-  if (first === "yarn")
-    return second === "test";
+  if (first === "yarn") {
+    return startsWithTest(second) || second === "run" && startsWithTest(third);
+  }
+  if (first === "deno")
+    return ["test", "lint", "check", "bench"].includes(second ?? "");
+  if (first === "npx") {
+    return ["tsc", "eslint", "vitest", "jest", "playwright", "biome"].includes(second ?? "");
+  }
   if (first === "playwright")
     return second === "test";
-  if (first === "npx")
-    return ["tsc", "eslint", "vitest", "jest"].includes(second ?? "");
-  return ["vitest", "jest", "pytest", "tsc", "eslint", "biome", "ruff", "mypy"].includes(first);
+  if (first === "cargo") {
+    return ["test", "build", "check", "clippy", "nextest"].includes(second ?? "");
+  }
+  if (first === "go")
+    return ["test", "build", "vet"].includes(second ?? "");
+  if (first === "gradle" || first === "gradlew") {
+    return hasBuildTask(rest, ["test", "check", "build", "assemble", "clean"]);
+  }
+  if (first === "mvn" || first === "mvnw") {
+    return hasBuildTask(rest, ["test", "verify", "package", "install"]);
+  }
+  if (first === "dotnet")
+    return ["test", "build"].includes(second ?? "");
+  if (first === "rspec")
+    return true;
+  if (first === "rake")
+    return second === "test" || second === "spec";
+  if (first === "phpunit" || first === "pest")
+    return true;
+  if (first === "xcodebuild")
+    return xcodebuildHasBuildAction(rest);
+  if (first === "swift")
+    return second === "test" || second === "build";
+  if (first === "make" || first === "gmake") {
+    return hasBuildTask(rest, ["test", "check", "lint", "clean"]);
+  }
+  return [
+    "vitest",
+    "jest",
+    "pytest",
+    "tsc",
+    "eslint",
+    "biome",
+    "ruff",
+    "mypy",
+    "tox",
+    "nox"
+  ].includes(first);
+}
+function runnerName(token) {
+  if (!token)
+    return "";
+  const slash = token.lastIndexOf("/");
+  return slash === -1 ? token : token.slice(slash + 1);
+}
+function hasBuildTask(args, tasks) {
+  const isAllowedTask = (arg) => tasks.some((task) => arg === task || arg.endsWith(`:${task}`));
+  const isFlagOrProperty = (arg) => arg.startsWith("-") || arg.includes("=");
+  let sawAllowed = false;
+  for (const arg of args) {
+    if (isFlagOrProperty(arg))
+      continue;
+    if (!isAllowedTask(arg))
+      return false;
+    sawAllowed = true;
+  }
+  return sawAllowed;
 }
 function startsWithTest(token) {
   return token?.startsWith("test") === true;
 }
-function isPlainNoiseFilter(stage) {
-  const tokens = tokenizeStage(stage);
-  const head = tokens[0];
+var XCODEBUILD_VALUE_FLAGS = new Set([
+  "-scheme",
+  "-target",
+  "-project",
+  "-workspace",
+  "-configuration",
+  "-sdk",
+  "-destination",
+  "-arch",
+  "-derivedDataPath",
+  "-resultBundlePath",
+  "-xcconfig",
+  "-toolchain"
+]);
+var XCODEBUILD_BUILD_ACTIONS = new Set([
+  "build",
+  "test",
+  "build-for-testing",
+  "test-without-building",
+  "analyze"
+]);
+function xcodebuildHasBuildAction(args) {
+  for (let i = 0;i < args.length; i++) {
+    const arg = args[i];
+    if (arg.startsWith("-")) {
+      if (XCODEBUILD_VALUE_FLAGS.has(arg))
+        i++;
+      continue;
+    }
+    if (XCODEBUILD_BUILD_ACTIONS.has(arg))
+      return true;
+  }
+  return false;
+}
+function containsUnsplittableConstruct(command) {
+  let quote = null;
+  let escaped = false;
+  for (let i = 0;i < command.length; i++) {
+    const char = command[i];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (char === "\\" && quote !== "'") {
+      escaped = true;
+      continue;
+    }
+    if (quote === "'") {
+      if (char === "'")
+        quote = null;
+      continue;
+    }
+    if (quote === '"') {
+      if (char === '"')
+        quote = null;
+      else if (char === "`")
+        return true;
+      else if (char === "$" && command[i + 1] === "(")
+        return true;
+      continue;
+    }
+    if (char === "'" || char === '"') {
+      quote = char;
+      continue;
+    }
+    if (char === "`")
+      return true;
+    if (char === "(" || char === ")")
+      return true;
+  }
+  return false;
+}
+var READS_FILE_OPERAND = new Set(["cat", "tac", "nl", "less", "more"]);
+function filterStageIsSafeToDrop(stage) {
+  const head = tokenizeStage(stage)[0];
   if (!head)
     return false;
   if (head === "wc")
     return false;
   if (!NOISE_FILTERS.has(head))
     return false;
-  if ((head === "grep" || head === "rg") && hasIntentChangingGrepFlag(tokens.slice(1)))
+  if (/[<>]/.test(stage))
+    return false;
+  if (hasUnquotedBackground(stage))
+    return false;
+  const args = tokenizeStage(stage).slice(1);
+  const hasFlag = (...names) => args.some((a) => names.some((n) => a === n || a.startsWith(`${n}=`)));
+  if (head === "grep" || head === "rg") {
+    if (hasIntentChangingGrepFlag(args))
+      return false;
+    if (countBareOperands(args) > 1)
+      return false;
+    return true;
+  }
+  if (head === "head" || head === "tail") {
+    if (bareOperands(args).some((op) => !/^\d+$/.test(op)))
+      return false;
+    return true;
+  }
+  if (READS_FILE_OPERAND.has(head)) {
+    if (countBareOperands(args) > 0)
+      return false;
+    return true;
+  }
+  if (head === "sed") {
+    if (hasFlag("-i", "--in-place"))
+      return false;
+    if (countBareOperands(args) > 1)
+      return false;
+    return true;
+  }
+  if (head === "awk") {
+    if (countBareOperands(args) > 1)
+      return false;
+    return true;
+  }
+  if (head === "sort" && hasFlag("-o", "--output"))
+    return false;
+  if (bareOperands(args).some((op) => op.includes("/") || op.includes(".")))
     return false;
   return true;
 }
+function bareOperands(args) {
+  const out = [];
+  let afterDoubleDash = false;
+  for (const arg of args) {
+    if (!afterDoubleDash && arg === "--") {
+      afterDoubleDash = true;
+      continue;
+    }
+    if (!afterDoubleDash && arg.startsWith("-") && arg !== "-")
+      continue;
+    out.push(arg);
+  }
+  return out;
+}
+function countBareOperands(args) {
+  return bareOperands(args).length;
+}
+function hasUnquotedBackground(stage) {
+  let quote = null;
+  let escaped = false;
+  for (let i = 0;i < stage.length; i++) {
+    const char = stage[i];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (char === "\\" && quote !== "'") {
+      escaped = true;
+      continue;
+    }
+    if (quote) {
+      if (char === quote)
+        quote = null;
+      continue;
+    }
+    if (char === "'" || char === '"') {
+      quote = char;
+      continue;
+    }
+    if (char === "&") {
+      const prev = stage[i - 1];
+      const next = stage[i + 1];
+      if (prev === "&" || next === "&" || prev === ">" || next === ">")
+        continue;
+      return true;
+    }
+  }
+  return false;
+}
 function hasIntentChangingGrepFlag(args) {
   for (const arg of args) {
     if (arg === "--")
@@ -32515,38 +32763,6 @@ function discoverRelevantGithubServers(projectRoot) {
   return relevant;
 }
 
-// src/metadata-store.ts
-var pendingStore = new Map;
-var STALE_TIMEOUT_MS = 15 * 60 * 1000;
-function makeKey(sessionID, callID) {
-  return `${sessionID}:${callID}`;
-}
-function cleanupStaleEntries() {
-  const now = Date.now();
-  for (const [key, entry] of pendingStore) {
-    if (now - entry.storedAt > STALE_TIMEOUT_MS) {
-      pendingStore.delete(key);
-    }
-  }
-}
-function storeToolMetadata(sessionID, callID, data) {
-  cleanupStaleEntries();
-  pendingStore.set(makeKey(sessionID, callID), {
-    ...data,
-    storedAt: Date.now()
-  });
-}
-function consumeToolMetadata(sessionID, callID) {
-  const key = makeKey(sessionID, callID);
-  const stored = pendingStore.get(key);
-  if (stored) {
-    pendingStore.delete(key);
-    const { storedAt: _, ...data } = stored;
-    return data;
-  }
-  return;
-}
-
 // src/normalize-schemas.ts
 import { tool } from "@opencode-ai/plugin";
 function stripRootJsonSchemaFields(jsonSchema) {
@@ -32718,10 +32934,12 @@ class AftRpcServer {
           const dir = dirname9(this.portFilePath);
           mkdirSync10(dir, { recursive: true, mode: 448 });
           const tmpPath = `${this.portFilePath}.tmp`;
-          writeFileSync10(tmpPath, JSON.stringify({ port: this.port, token: this.token }), {
-            encoding: "utf-8",
-            mode: 384
-          });
+          writeFileSync10(tmpPath, JSON.stringify({
+            port: this.port,
+            token: this.token,
+            pid: process.pid,
+            started_at: Date.now()
+          }), { encoding: "utf-8", mode: 384 });
           renameSync8(tmpPath, this.portFilePath);
           log2(`RPC server listening on 127.0.0.1:${this.port}`);
         } catch (err) {
@@ -33193,7 +33411,7 @@ function registerShutdownCleanup(fn) {
 
 // src/status-bar-inject.ts
 var emitStateBySession = new Map;
-function statusBarSuffixForSession(sessionID, counts) {
+function statusBarSuffixForSession(sessionID, counts, force = false) {
   if (!counts)
     return "";
   let state = emitStateBySession.get(sessionID);
@@ -33201,12 +33419,67 @@ function statusBarSuffixForSession(sessionID, counts) {
     state = createStatusBarEmitState();
     emitStateBySession.set(sessionID, state);
   }
+  if (force) {
+    state.last = counts;
+    state.callsSinceEmit = 0;
+    return statusBarLine(counts);
+  }
   return shouldEmitStatusBar(state, counts) ? statusBarLine(counts) : "";
 }
 function clearStatusBarSession(sessionID) {
   emitStateBySession.delete(sessionID);
 }
 
+// src/tool-perf.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var perfStore = new AsyncLocalStorage;
+function markBridgeStart() {
+  const slot = perfStore.getStore();
+  if (slot && slot.bridgeStart === undefined) {
+    slot.bridgeStart = performance.now();
+  }
+}
+function markBridgeEnd() {
+  const slot = perfStore.getStore();
+  if (slot) {
+    slot.bridgeEnd = performance.now();
+  }
+}
+function emit(slot) {
+  const t3 = performance.now();
+  const total = Math.round(t3 - slot.t0);
+  if (slot.bridgeStart !== undefined && slot.bridgeEnd !== undefined) {
+    const pre = Math.round(slot.bridgeStart - slot.t0);
+    const bridge = Math.round(slot.bridgeEnd - slot.bridgeStart);
+    const post = Math.round(t3 - slot.bridgeEnd);
+    sessionLog(slot.sessionID, `perf tool=${slot.tool} total=${total}ms pre=${pre}ms bridge=${bridge}ms post=${post}ms`);
+  } else {
+    sessionLog(slot.sessionID, `perf tool=${slot.tool} total=${total}ms (no bridge call)`);
+  }
+}
+function instrumentToolMap(tools) {
+  for (const [name, def] of Object.entries(tools)) {
+    const original = def.execute;
+    if (typeof original !== "function")
+      continue;
+    def.execute = (args, context) => {
+      const slot = {
+        tool: name,
+        sessionID: context?.sessionID,
+        t0: performance.now()
+      };
+      return perfStore.run(slot, async () => {
+        try {
+          return await original(args, context);
+        } finally {
+          emit(slot);
+        }
+      });
+    };
+  }
+  return tools;
+}
+
 // src/tools/ast.ts
 import { tool as tool3 } from "@opencode-ai/plugin";
 
@@ -33360,7 +33633,13 @@ async function callBridge(ctx, runtime, command, params = {}, options) {
     configureWarningClient: ctx.client,
     ...options
   };
-  const response = await bridgeFor(ctx, runtime).send(command, merged, Object.keys(sendOptions).length > 0 ? sendOptions : undefined);
+  markBridgeStart();
+  let response;
+  try {
+    response = await bridgeFor(ctx, runtime).send(command, merged, Object.keys(sendOptions).length > 0 ? sendOptions : undefined);
+  } finally {
+    markBridgeEnd();
+  }
   ingestBgCompletions(runtime.sessionID, response.bg_completions);
   return response;
 }
@@ -34291,22 +34570,17 @@ function createBashTool(ctx) {
         throw new Error(data.message || "bash failed");
       }
       if (data.status === "running" && typeof data.task_id === "string") {
-        const callID2 = getCallID(context);
         const taskId = data.task_id;
+        const uiTitle = description ?? shortenCommand(command);
         if (effectiveBackground) {
           trackBgTask(context.sessionID, taskId);
           let startedLine = formatBackgroundLaunch(taskId, requestedPty);
           if (isSubagent && allowSubagentBg)
             startedLine += subagentGuidance(taskId);
+          startedLine = appendPipeStripNote(startedLine, pipeStrip.note);
           const metadataPayload2 = { description, output: startedLine, status: "running", taskId };
           metadata?.(metadataPayload2);
-          if (callID2) {
-            storeToolMetadata(context.sessionID, callID2, {
-              title: description ?? shortenCommand(command),
-              metadata: metadataPayload2
-            });
-          }
-          return startedLine;
+          return { output: startedLine, title: uiTitle, metadata: metadataPayload2 };
         }
         const foregroundWaitMs = resolveForegroundWaitMs(bashCfg.foreground_wait_window_ms);
         const waitTimeoutMs = subagentForcedForeground ? effectiveTimeout ?? DEFAULT_HARD_TIMEOUT_MS : effectiveTimeout !== undefined ? Math.min(effectiveTimeout, foregroundWaitMs) : foregroundWaitMs;
@@ -34320,13 +34594,7 @@ function createBashTool(ctx) {
             const rendered2 = appendPipeStripNote(formatForegroundResult(status), pipeStrip.note);
             const metadataPayload2 = foregroundMetadata(description, status, rendered2);
             metadata?.(metadataPayload2);
-            if (callID2) {
-              storeToolMetadata(context.sessionID, callID2, {
-                title: description ?? shortenCommand(command),
-                metadata: metadataPayload2
-              });
-            }
-            return rendered2;
+            return { output: rendered2, title: uiTitle, metadata: metadataPayload2 };
           }
           if (Date.now() - startedAt >= waitTimeoutMs) {
             if (subagentForcedForeground) {
@@ -34343,15 +34611,10 @@ function createBashTool(ctx) {
             let message = formatPromotionMessage(taskId, effectiveTimeout, foregroundWaitMs);
             if (isSubagent && allowSubagentBg)
               message += subagentGuidance(taskId);
+            message = appendPipeStripNote(message, pipeStrip.note);
             const metadataPayload2 = { description, output: message, status: "running", taskId };
             metadata?.(metadataPayload2);
-            if (callID2) {
-              storeToolMetadata(context.sessionID, callID2, {
-                title: description ?? shortenCommand(command),
-                metadata: metadataPayload2
-              });
-            }
-            return message;
+            return { output: message, title: uiTitle, metadata: metadataPayload2 };
           }
           await sleep(FOREGROUND_POLL_INTERVAL_MS);
         }
@@ -34362,7 +34625,6 @@ function createBashTool(ctx) {
       const truncated = data.truncated;
       const outputPath = data.output_path;
       const timedOut = data.timed_out === true;
-      const callID = getCallID(context);
       const metadataPayload = {
         description,
         output: metadataOutput,
@@ -34371,12 +34633,6 @@ function createBashTool(ctx) {
         ...outputPath ? { outputPath } : {}
       };
       metadata?.(metadataPayload);
-      if (callID) {
-        storeToolMetadata(context.sessionID, callID, {
-          title: description ?? shortenCommand(command),
-          metadata: metadataPayload
-        });
-      }
       let rendered = output;
       if (truncated && outputPath) {
         rendered += `
@@ -34391,7 +34647,11 @@ function createBashTool(ctx) {
 [exit code: ${exit}]`;
       }
       rendered = appendPipeStripNote(rendered, pipeStrip.note);
-      return rendered;
+      return {
+        output: rendered,
+        title: description ?? shortenCommand(command),
+        metadata: metadataPayload
+      };
     }
   };
 }
@@ -34874,10 +35134,6 @@ function createBashWriteTool(ctx) {
 }
 
 // src/tools/hoisted.ts
-function getCallID2(ctx) {
-  const c = ctx;
-  return c.callID ?? c.callId ?? c.call_id;
-}
 function relativeToWorktree(fp, worktree) {
   return path4.relative(worktree, fp);
 }
@@ -35163,19 +35419,16 @@ function createReadTool(ctx) {
         } catch {}
         const sizeStr = fileSize > 1048576 ? `${(fileSize / 1048576).toFixed(1)}MB` : fileSize > 1024 ? `${(fileSize / 1024).toFixed(0)}KB` : `${fileSize} bytes`;
         const msg = `${label} read successfully`;
-        const imgCallID = getCallID2(context);
-        if (imgCallID) {
-          storeToolMetadata(context.sessionID, imgCallID, {
-            title: path4.relative(projectRoot, filePath),
-            metadata: {
-              preview: msg,
-              filepath: filePath,
-              isImage,
-              isPdf: mime === "application/pdf"
-            }
-          });
-        }
-        return `${msg} (${ext.slice(1).toUpperCase()}, ${sizeStr}). File: ${filePath}`;
+        return {
+          output: `${msg} (${ext.slice(1).toUpperCase()}, ${sizeStr}). File: ${filePath}`,
+          title: path4.relative(projectRoot, filePath),
+          metadata: {
+            preview: msg,
+            filepath: filePath,
+            isImage,
+            isPdf: mime === "application/pdf"
+          }
+        };
       }
       let startLine = args.startLine;
       let endLine = args.endLine;
@@ -35196,32 +35449,24 @@ function createReadTool(ctx) {
       if (data.success === false) {
         throw new Error(data.message || "read failed");
       }
-      const readCallID = getCallID2(context);
+      const dp = relativeToWorktree(filePath, projectRoot) || file2;
       if (data.entries) {
-        if (readCallID) {
-          const dp = relativeToWorktree(filePath, projectRoot) || file2;
-          storeToolMetadata(context.sessionID, readCallID, { title: dp, metadata: { title: dp } });
-        }
-        return data.entries.join(`
-`);
+        return {
+          output: data.entries.join(`
+`),
+          title: dp,
+          metadata: { title: dp }
+        };
       }
       if (data.binary) {
-        if (readCallID) {
-          const dp = relativeToWorktree(filePath, projectRoot) || file2;
-          storeToolMetadata(context.sessionID, readCallID, { title: dp, metadata: { title: dp } });
-        }
-        return data.message;
-      }
-      if (readCallID) {
-        const dp = relativeToWorktree(filePath, projectRoot) || file2;
-        storeToolMetadata(context.sessionID, readCallID, { title: dp, metadata: { title: dp } });
+        return { output: data.message, title: dp, metadata: { title: dp } };
       }
       let output = data.content;
       const agentSpecifiedRange = args.startLine !== undefined || args.endLine !== undefined || args.offset !== undefined || args.limit !== undefined;
       const footer = formatReadFooter(agentSpecifiedRange, data);
       if (footer)
         output += footer;
-      return output;
+      return { output, title: dp, metadata: { title: dp } };
     }
   };
 }
@@ -35311,27 +35556,24 @@ Note: LSP server(s) did not respond in time: ${pendingServers.join(", ")}. Diagn
 Note: LSP server(s) exited during this edit: ${exitedServers.join(", ")}. Their diagnostics could not be collected.`;
       }
       const diff = data.diff;
-      const callID = getCallID2(context);
-      if (callID) {
-        const dp = relativeToWorktree(filePath, projectRoot);
-        const beforeContent = diff?.before ?? "";
-        const afterContent = diff?.after ?? content;
-        storeToolMetadata(context.sessionID, callID, {
-          title: dp,
-          metadata: {
-            diff: buildUnifiedDiff(filePath, beforeContent, afterContent),
-            filediff: {
-              file: filePath,
-              before: beforeContent,
-              after: afterContent,
-              additions: diff?.additions ?? 0,
-              deletions: diff?.deletions ?? 0
-            },
-            diagnostics: {}
-          }
-        });
-      }
-      return output;
+      const dp = relativeToWorktree(filePath, projectRoot);
+      const beforeContent = diff?.before ?? "";
+      const afterContent = diff?.after ?? content;
+      return {
+        output,
+        title: dp,
+        metadata: {
+          diff: buildUnifiedDiff(filePath, beforeContent, afterContent),
+          filediff: {
+            file: filePath,
+            before: beforeContent,
+            after: afterContent,
+            additions: diff?.additions ?? 0,
+            deletions: diff?.deletions ?? 0
+          },
+          diagnostics: {}
+        }
+      };
     }
   };
 }
@@ -35340,45 +35582,39 @@ function getEditDescription(writeToolName) {
 
 **Modes** (determined by which parameters you provide):
 
-Mode priority: operations > appendContent > edits > symbol (without oldString) > oldString (find/replace). If none match, the call is rejected — there is no implicit "write" fallback.
-
-1. **Multi-file transaction** — pass \`operations\` array
-   Edits across multiple files with checkpoint-based rollback on failure.
-   Each operation: \`{ "file": "path", "command": "edit_match" | "write", ... }\`.
-   For \`edit_match\`: include \`match\`, \`replacement\`. For \`write\`: include \`content\`.
-   Example: \`{ "operations": [{ "file": "a.ts", "command": "edit_match", "match": "old", "replacement": "new" }, { "file": "b.ts", "command": "write", "content": "..." }] }\`
+Mode priority: appendContent > edits > symbol (without oldString) > oldString (find/replace). If none match, the call is rejected — there is no implicit "write" fallback. To edit multiple files, make parallel \`edit\` calls in one response.
 
-2. **Append** — pass \`filePath\` + \`appendContent\`
+1. **Append** — pass \`filePath\` + \`appendContent\`
    Appends text to the end of a file, creating the file if it does not exist.
    Example: \`{ "filePath": "notes.txt", "appendContent": "new line\\n" }\`
 
-3. **Batch edits** — pass \`filePath\` + \`edits\` array
+2. **Batch edits** — pass \`filePath\` + \`edits\` array
    Multiple edits in one file atomically. Each edit is either:
    - \`{ "oldString": "old", "newString": "new" }\` — find/replace
    - \`{ "startLine": 5, "endLine": 7, "content": "new lines" }\` — replace line range (1-based, both inclusive)
    Set content to empty string to delete lines.
 
-4. **Symbol replace** — pass \`filePath\` + \`symbol\` + \`content\`
+3. **Symbol replace** — pass \`filePath\` + \`symbol\` + \`content\`
    Replaces an entire named symbol (function, class, type) with new content.
    Includes decorators, attributes, and doc comments in the replacement range.
    **Important:** You must NOT provide \`oldString\` when using symbol mode — if present, the tool silently falls back to find/replace mode.
    Example: \`{ "filePath": "src/app.ts", "symbol": "handleRequest", "content": "function handleRequest() { ... }" }\`
 
-5. **Find and replace** — pass \`filePath\` + \`oldString\` + \`newString\`
+4. **Find and replace** — pass \`filePath\` + \`oldString\` + \`newString\`
    Finds the exact text in \`oldString\` and replaces it with \`newString\`.
    Supports fuzzy matching (handles whitespace differences automatically).
    If multiple matches exist, specify which one with \`occurrence\` or use \`replaceAll: true\`.
    Example: \`{ "filePath": "src/app.ts", "oldString": "const x = 1", "newString": "const x = 2" }\`
 
-6. **Replace all occurrences** — add \`replaceAll: true\`
+5. **Replace all occurrences** — add \`replaceAll: true\`
    Replaces every occurrence of \`oldString\` in the file.
    Example: \`{ "filePath": "src/app.ts", "oldString": "oldName", "newString": "newName", "replaceAll": true }\`
 
-7. **Select specific occurrence** — add \`occurrence: N\` (0-indexed)
+6. **Select specific occurrence** — add \`occurrence: N\` (0-indexed)
    When multiple matches exist, select the Nth one (0 = first, 1 = second, etc.).
    Example: \`{ "filePath": "src/app.ts", "oldString": "TODO", "newString": "DONE", "occurrence": 0 }\`
 
-Note: Modes 6 and 7 are options on mode 5 (find/replace) — they require \`oldString\`.
+Note: Modes 5 and 6 are options on mode 4 (find/replace) — they require \`oldString\`.
 
 **Behavior:**
 - Backs up files before editing (recoverable via aft_safety undo)
@@ -35392,16 +35628,15 @@ function createEditTool(ctx, writeToolName = "write") {
   return {
     description: getEditDescription(writeToolName),
     args: {
-      filePath: z8.string().optional().describe("Path to the file to edit (absolute or relative to project root). Required for all modes except 'operations' multi-file transactions"),
+      filePath: z8.string().optional().describe("Path to the file to edit (absolute or relative to project root)"),
       oldString: z8.string().optional().describe("Text to find (exact match, with fuzzy fallback)"),
       newString: z8.string().optional().describe("Text to replace with (omit or set to empty string to delete the matched text)"),
       replaceAll: z8.boolean().optional().describe("Replace all occurrences"),
       occurrence: optionalInt(0, Number.MAX_SAFE_INTEGER).describe("0-indexed occurrence to replace when multiple matches exist"),
       symbol: z8.string().optional().describe("Named symbol to replace (function, class, type)"),
-      content: z8.string().optional().describe("Replacement content for symbol mode or operations[].command='write'. For whole-file writes, use the `write` tool."),
+      content: z8.string().optional().describe("Replacement content for symbol mode. For whole-file writes, use the `write` tool."),
       appendContent: z8.string().optional().describe("Text to append to the end of filePath; creates the file if needed"),
       edits: z8.array(z8.record(z8.string(), z8.unknown())).optional().describe("Batch edits — array of { oldString: string, newString: string } or { startLine: number (1-based), endLine: number (1-based, inclusive), content: string }"),
-      operations: z8.array(z8.record(z8.string(), z8.unknown())).optional().describe("Transaction — array of { file: string, command: 'edit_match' | 'write', match?: string, replacement?: string, content?: string } for multi-file edits with rollback. Note: uses 'file'/'match'/'replacement' (not filePath/oldString/newString)"),
       diagnostics: z8.boolean().optional().describe(DIAGNOSTICS_PARAM_DESCRIPTION)
     },
     execute: async (args, context) => {
@@ -35409,38 +35644,6 @@ function createEditTool(ctx, writeToolName = "write") {
       if (argsRecord.startLine !== undefined || argsRecord.endLine !== undefined) {
         throw new Error("edit: 'startLine'/'endLine' are not top-level parameters. For line-range edits, nest them inside the `edits` array: `edits: [{ startLine: N, endLine: M, content: \"...\" }]`. For find/replace, use `oldString`/`newString` instead.");
       }
-      if (Array.isArray(args.operations)) {
-        const ops = args.operations;
-        const files = ops.map((op) => op.file).filter(Boolean);
-        const projectRoot2 = await resolveProjectRoot(ctx, context);
-        {
-          const asked = new Set;
-          for (const file3 of files) {
-            const absPath = resolvePathFromProjectRoot(projectRoot2, file3);
-            if (asked.has(absPath))
-              continue;
-            asked.add(absPath);
-            const denial = await assertExternalDirectoryPermission(context, absPath);
-            if (denial)
-              return permissionDeniedResponse(denial);
-          }
-        }
-        await runAsk(context.ask({
-          permission: "edit",
-          patterns: files.map((f) => path4.relative(projectRoot2, resolvePathFromProjectRoot(projectRoot2, f))),
-          always: ["*"],
-          metadata: {}
-        }));
-        const resolvedOps = ops.map((op) => ({
-          ...op,
-          file: resolvePathFromProjectRoot(projectRoot2, op.file)
-        }));
-        const response = await callBridge(ctx, context, "transaction", { operations: resolvedOps });
-        if (response.success === false) {
-          throw new Error(response.message ?? "transaction failed");
-        }
-        return formatEditSummary(response);
-      }
       const file2 = args.filePath;
       if (!file2)
         throw new Error("'filePath' parameter is required");
@@ -35497,34 +35700,33 @@ function createEditTool(ctx, writeToolName = "write") {
         if (args.occurrence !== undefined)
           params.occurrence = args.occurrence;
       } else {
-        const hint = typeof args.content === "string" ? ` To write the whole file, use the '${writeToolName}' tool. To edit existing content, provide 'oldString' (and optionally 'newString'), 'symbol' + 'content', or an 'edits' array.` : " Provide 'oldString' (+ optional 'newString'), 'symbol' + 'content', 'edits' array, or 'operations' array.";
+        const hint = typeof args.content === "string" ? ` To write the whole file, use the '${writeToolName}' tool. To edit existing content, provide 'oldString' (and optionally 'newString'), 'symbol' + 'content', or an 'edits' array.` : " Provide 'oldString' (+ optional 'newString'), 'symbol' + 'content', or an 'edits' array.";
         throw new Error(`edit: no edit mode resolved from arguments.${hint}`);
       }
       params.diagnostics = args.diagnostics ?? diagnosticsOnEditDefault(ctx);
       params.include_diff_content = true;
       const data = await callBridge(ctx, context, command, params);
+      if (data.success === false) {
+        throw new Error(data.message || "edit failed");
+      }
+      let uiMeta;
+      let uiTitle;
       if (data.success && data.diff) {
         const diff = data.diff;
-        const callID = getCallID2(context);
-        if (callID) {
-          const dp = relativeToWorktree(filePath, projectRoot);
-          const beforeContent = diff.before ?? "";
-          const afterContent = diff.after ?? "";
-          storeToolMetadata(context.sessionID, callID, {
-            title: dp,
-            metadata: {
-              diff: buildUnifiedDiff(filePath, beforeContent, afterContent),
-              filediff: {
-                file: filePath,
-                before: beforeContent,
-                after: afterContent,
-                additions: diff.additions ?? 0,
-                deletions: diff.deletions ?? 0
-              },
-              diagnostics: {}
-            }
-          });
-        }
+        uiTitle = relativeToWorktree(filePath, projectRoot);
+        const beforeContent = diff.before ?? "";
+        const afterContent = diff.after ?? "";
+        uiMeta = {
+          diff: buildUnifiedDiff(filePath, beforeContent, afterContent),
+          filediff: {
+            file: filePath,
+            before: beforeContent,
+            after: afterContent,
+            additions: diff.additions ?? 0,
+            deletions: diff.deletions ?? 0
+          },
+          diagnostics: {}
+        };
       }
       let result = formatEditSummary(data);
       const globSkipNote = formatGlobSkipReasonsNote(data.format_skip_reasons);
@@ -35561,6 +35763,9 @@ Note: LSP server(s) did not respond in time: ${pendingServers.join(", ")}. Diagn
 
 Note: LSP server(s) exited during this edit: ${exitedServers.join(", ")}. Their diagnostics could not be collected.`;
       }
+      if (uiMeta) {
+        return { output: result, title: uiTitle ?? "", metadata: uiMeta };
+      }
       return result;
     }
   };
@@ -35710,6 +35915,9 @@ function createApplyPatchTool(ctx) {
                 include_diff_content: true,
                 multi_file_write_paths: multiFileWritePaths
               });
+              if (writeResult.success === false) {
+                throw new Error(writeResult.message ?? "write failed");
+              }
               const wrDiff = writeResult.diff;
               perFileDiffs.push({
                 filePath,
@@ -35735,7 +35943,12 @@ function createApplyPatchTool(ctx) {
           case "delete": {
             try {
               const before = await fs6.promises.readFile(filePath, "utf-8").catch(() => "");
-              await callBridge(ctx, context, "delete_file", { file: filePath });
+              const deleteResult = await callBridge(ctx, context, "delete_file", {
+                file: filePath
+              });
+              if (deleteResult.success === false) {
+                throw new Error(deleteResult.message ?? "delete failed");
+              }
               perFileDiffs.push({
                 filePath,
                 before,
@@ -35763,6 +35976,9 @@ function createApplyPatchTool(ctx) {
                 include_diff_content: true,
                 multi_file_write_paths: multiFileWritePaths
               });
+              if (writeResult.success === false) {
+                throw new Error(writeResult.message ?? "write failed");
+              }
               const diags = writeResult.lsp_diagnostics;
               if (diags && diags.length > 0) {
                 const errors3 = diags.filter((d) => d.severity === "error");
@@ -35842,10 +36058,11 @@ ${diagLines}`);
 `));
         }
       }
-      const callID = getCallID2(context);
-      if (callID) {
+      {
         const diffByPath = new Map(perFileDiffs.map((d) => [d.filePath, d]));
-        const files = hunks.map((h) => {
+        const failedPaths = new Set(failures);
+        const appliedHunks = hunks.filter((h) => !failedPaths.has(h.path));
+        const files = appliedHunks.map((h) => {
           const filePath = resolvePathFromProjectRoot(projectRoot, h.path);
           const rawMovePath = h.type === "update" ? h.move_path : undefined;
           const movePath = rawMovePath ? resolvePathFromProjectRoot(projectRoot, rawMovePath) : undefined;
@@ -35871,20 +36088,21 @@ ${diagLines}`);
           return `${prefix} ${f.relativePath}`;
         }).join(`
 `);
-        const title = `Success. Updated the following files:
+        const title = failures.length > 0 ? `Partially applied (${files.length} of ${hunks.length}). Updated:
+${fileList}` : `Success. Updated the following files:
 ${fileList}`;
         const diffText = files.map((f) => f.patch).filter(Boolean).join(`
 `);
-        storeToolMetadata(context.sessionID, callID, {
+        return {
+          output: results.join(`
+`),
           title,
           metadata: {
             diff: diffText,
             files
           }
-        });
+        };
       }
-      return results.join(`
-`);
     }
   };
 }
@@ -36408,10 +36626,6 @@ function navigationTools(ctx) {
 // src/tools/reading.ts
 import { tool as tool12 } from "@opencode-ai/plugin";
 var z12 = tool12.schema;
-function getCallID3(ctx) {
-  const c = ctx;
-  return c.callID ?? c.callId ?? c.call_id;
-}
 function buildZoomTitle(args) {
   if (!isEmptyParam(args.targets)) {
     if (Array.isArray(args.targets)) {
@@ -36574,25 +36788,26 @@ function readingTools(ctx) {
         const hasTargets = hasTargetsProvided(args.targets);
         const hasSymbols = !isEmptyParam(args.symbols);
         const wantCallgraph = args.callgraph === true;
-        const zoomCallID = getCallID3(context);
-        if (zoomCallID) {
-          const title = buildZoomTitle(args);
-          const display = { title };
-          if (hasFilePath)
-            display.filePath = args.filePath;
-          if (hasUrl)
-            display.url = args.url;
-          if (hasSymbols) {
-            display.symbols = typeof args.symbols === "string" ? args.symbols : JSON.stringify(args.symbols);
-          }
-          if (hasTargets)
-            display.targets = JSON.stringify(args.targets);
-          if (args.contextLines !== undefined)
-            display.contextLines = args.contextLines;
-          if (wantCallgraph)
-            display.callgraph = true;
-          storeToolMetadata(context.sessionID, zoomCallID, { title, metadata: display });
-        }
+        const zoomTitle = buildZoomTitle(args);
+        const zoomDisplay = { title: zoomTitle };
+        if (hasFilePath)
+          zoomDisplay.filePath = args.filePath;
+        if (hasUrl)
+          zoomDisplay.url = args.url;
+        if (hasSymbols) {
+          zoomDisplay.symbols = typeof args.symbols === "string" ? args.symbols : JSON.stringify(args.symbols);
+        }
+        if (hasTargets)
+          zoomDisplay.targets = JSON.stringify(args.targets);
+        if (args.contextLines !== undefined)
+          zoomDisplay.contextLines = args.contextLines;
+        if (wantCallgraph)
+          zoomDisplay.callgraph = true;
+        const withMeta = (output) => ({
+          output,
+          title: zoomTitle,
+          metadata: zoomDisplay
+        });
         if (hasTargets) {
           if (hasFilePath || hasUrl || hasSymbols) {
             throw new Error("'targets' is mutually exclusive with 'filePath', 'url', and 'symbols'");
@@ -36632,7 +36847,7 @@ function readingTools(ctx) {
             name: t.symbol,
             response: responses[i] ?? { success: false, message: "missing zoom response" }
           }));
-          return formatZoomMultiTargetResult(entries).text;
+          return withMeta(formatZoomMultiTargetResult(entries).text);
         }
         if (!hasFilePath && !hasUrl) {
           throw new Error("Provide exactly one of 'filePath', 'url', or 'targets'");
@@ -36665,9 +36880,9 @@ function readingTools(ctx) {
             if (response.success === false) {
               throw new Error(response.message || "zoom failed");
             }
-            return formatZoomText(targetLabel, response);
+            return withMeta(formatZoomText(targetLabel, response));
           }
-          return formatZoomBatchResult(targetLabel, symbolsArray, results).text;
+          return withMeta(formatZoomBatchResult(targetLabel, symbolsArray, results).text);
         }
         const params = { file: file2 };
         if (args.contextLines !== undefined)
@@ -36678,7 +36893,7 @@ function readingTools(ctx) {
         if (data.success === false) {
           throw new Error(data.message || "zoom failed");
         }
-        return formatZoomText(targetLabel, data);
+        return withMeta(formatZoomText(targetLabel, data));
       }
     }
   };
@@ -37092,7 +37307,7 @@ function formatGrepOutput(response) {
   const totalMatches = response.total_matches ?? matches.length;
   const filesWithMatches = response.files_with_matches ?? new Set(matches.map((m) => m.file)).size;
   if (matches.length === 0) {
-    return `Found ${totalMatches} match(es) in ${filesWithMatches} file(s).`;
+    return `Found ${totalMatches} match across ${filesWithMatches} file`;
   }
   const body = matches.map((match) => {
     const file2 = match.file ?? "unknown";
@@ -37103,7 +37318,7 @@ function formatGrepOutput(response) {
 `);
   return `${body}
 
-Found ${totalMatches} match(es) in ${filesWithMatches} file(s).`;
+Found ${totalMatches} match across ${filesWithMatches} file`;
 }
 function normalizeGlob(pattern) {
   if (!pattern.includes("/") && !pattern.startsWith("**/")) {
@@ -37818,10 +38033,10 @@ ${lines}
     const sessionID = params.sessionID || "rpc";
     const cachedDir = getSessionDirectoryCached(sessionID);
     const candidateDirs = new Set;
+    candidateDirs.add(input.directory);
     if (typeof cachedDir === "string" && cachedDir.length > 0) {
       candidateDirs.add(cachedDir);
     }
-    candidateDirs.add(input.directory);
     let bridge = null;
     for (const dir of candidateDirs) {
       bridge = pool.getActiveBridgeForRoot(dir);
@@ -37944,6 +38159,7 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     }
     log2(`Disabled ${disabled.size} tool(s): ${[...disabled].join(", ")}`);
   }
+  instrumentToolMap(allTools);
   const autoUpdateEventHook = createAutoUpdateCheckerHook(input, {
     enabled: true,
     autoUpdate: aftConfig.auto_update ?? true,
@@ -38050,13 +38266,6 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     "tool.execute.after": async (toolInput, output) => {
       if (!output)
         return;
-      const stored = consumeToolMetadata(toolInput.sessionID, toolInput.callID);
-      if (stored) {
-        if (stored.title)
-          output.title = stored.title;
-        if (stored.metadata)
-          output.metadata = { ...output.metadata, ...stored.metadata };
-      }
       if (toolInput.tool === "bash" && output.output) {
         output.output = maybeAppendConflictsHint(output.output);
       }
@@ -38064,7 +38273,7 @@ Install: ${getManualInstallHint()}`).catch(() => {});
       await appendInTurnBgCompletions({ ctx, directory: sessionDir, sessionID: toolInput.sessionID }, output);
       if (output.output !== undefined) {
         const activeBridge = ctx.pool.getActiveBridgeForRoot(sessionDir);
-        const suffix = statusBarSuffixForSession(toolInput.sessionID, activeBridge?.getStatusBar());
+        const suffix = statusBarSuffixForSession(toolInput.sessionID, activeBridge?.getStatusBar(), toolInput.tool === "aft_inspect");
         if (suffix)
           output.output += suffix;
       }