@cortexkit/aft-opencode 0.38.0 → 0.39.0

package/dist/index.js

@@ -11607,25 +11607,26 @@ function maybeAppendConflictsHint(output) {
     return output;
   return output + CONFLICT_HINT;
 }
-function commandLeadsWithCodeSearch(command) {
-  const trimmed = command.trim();
-  if (!trimmed)
+function commandInvokesCodeSearch(command) {
+  const statements = splitTopLevelStatements(command);
+  if (statements === null)
     return false;
-  const afterCd = peelLeadingCdAnd(trimmed);
-  if (afterCd === null)
-    return false;
-  const firstStage = firstPipelineStage(afterCd);
-  if (firstStage === null)
-    return false;
-  const firstToken = readShellToken(firstStage, skipSpaces(firstStage, 0));
-  if (firstToken === null)
-    return false;
-  return firstToken.token === "grep" || firstToken.token === "rg";
+  for (const statement of statements) {
+    const firstStage = firstPipelineStage(statement);
+    if (firstStage === null)
+      continue;
+    const firstToken = readShellToken(firstStage, skipSpaces(firstStage, 0));
+    if (firstToken === null)
+      continue;
+    if (firstToken.token === "grep" || firstToken.token === "rg")
+      return true;
+  }
+  return false;
 }
 function maybeAppendGrepSearchHint(output, command, aftSearchRegistered) {
   if (output === "")
     return output;
-  if (!commandLeadsWithCodeSearch(command))
+  if (!commandInvokesCodeSearch(command))
     return output;
   if (output.includes(GREP_SEARCH_HINT_PREFIX))
     return output;
@@ -11634,21 +11635,78 @@ function maybeAppendGrepSearchHint(output, command, aftSearchRegistered) {
 
 ${hint}`;
 }
-function peelLeadingCdAnd(command) {
-  const first = readShellToken(command, skipSpaces(command, 0));
-  if (first === null)
-    return null;
-  if (first.token !== "cd")
-    return command;
-  const dir = readShellToken(command, skipSpaces(command, first.end));
-  if (dir === null)
+function splitTopLevelStatements(command) {
+  const statements = [];
+  let start = 0;
+  let quote = "none";
+  let escaped = false;
+  let inBacktick = false;
+  let parenDepth = 0;
+  for (let index = 0;index < command.length; index++) {
+    const ch = command[index];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (quote === "single") {
+      if (ch === "'")
+        quote = "none";
+      continue;
+    }
+    if (quote === "double") {
+      if (ch === "\\")
+        escaped = true;
+      else if (ch === '"')
+        quote = "none";
+      continue;
+    }
+    if (inBacktick) {
+      if (ch === "`")
+        inBacktick = false;
+      continue;
+    }
+    if (ch === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (ch === "'") {
+      quote = "single";
+      continue;
+    }
+    if (ch === '"') {
+      quote = "double";
+      continue;
+    }
+    if (ch === "`") {
+      inBacktick = true;
+      continue;
+    }
+    if (ch === "(") {
+      parenDepth++;
+      continue;
+    }
+    if (ch === ")") {
+      if (parenDepth > 0)
+        parenDepth--;
+      continue;
+    }
+    if (parenDepth > 0)
+      continue;
+    const next = command[index + 1];
+    if (ch === "&" && next === "&" || ch === "|" && next === "|") {
+      statements.push(command.slice(start, index));
+      index++;
+      start = index + 1;
+    } else if (ch === ";" || ch === `
+` || ch === "&") {
+      statements.push(command.slice(start, index));
+      start = index + 1;
+    }
+  }
+  if (quote !== "none" || inBacktick || escaped)
     return null;
-  if (!dir.token)
-    return command;
-  const afterDir = skipSpaces(command, dir.end);
-  if (!command.startsWith("&&", afterDir))
-    return command;
-  return command.slice(afterDir + 2).trim();
+  statements.push(command.slice(start));
+  return statements;
 }
 function firstPipelineStage(command) {
   let quote = "none";
@@ -35872,6 +35930,91 @@ var z8 = tool8.schema;
 function diagnosticsOnEditDefault(ctx) {
   return ctx.config.lsp?.diagnostics_on_edit ?? false;
 }
+async function readCurrentFileForPreview(filePath) {
+  try {
+    return await fs6.promises.readFile(filePath, "utf-8");
+  } catch (error50) {
+    if (error50 && typeof error50 === "object" && "code" in error50 && error50.code === "ENOENT") {
+      return "";
+    }
+    throw error50;
+  }
+}
+function previewDiffFromResponse(data, filePath) {
+  const previewDiff = data.preview_diff;
+  if (typeof previewDiff === "string")
+    return previewDiff;
+  const diff = data.diff;
+  if (typeof diff?.before === "string" && typeof diff.after === "string") {
+    return buildUnifiedDiff(filePath, diff.before, diff.after);
+  }
+  return "";
+}
+function virtualPatchContent(virtualFiles, filePath) {
+  return virtualFiles.has(filePath) ? virtualFiles.get(filePath) ?? null : undefined;
+}
+async function readPatchPreviewContent(virtualFiles, filePath, action, patchPath) {
+  const virtualContent = virtualPatchContent(virtualFiles, filePath);
+  if (virtualContent !== undefined) {
+    if (virtualContent === null) {
+      throw new Error(`Failed to ${action} ${patchPath}: file not found: ${filePath}`);
+    }
+    return virtualContent;
+  }
+  try {
+    return await fs6.promises.readFile(filePath, "utf-8");
+  } catch (error50) {
+    throw new Error(`Failed to ${action} ${patchPath}: ${formatError2(error50)}`);
+  }
+}
+async function buildApplyPatchPreview(hunks, projectRoot) {
+  const virtualFiles = new Map;
+  const patches = [];
+  let firstFilePath = "";
+  for (const hunk of hunks) {
+    const filePath = resolvePathFromProjectRoot(projectRoot, hunk.path);
+    if (!firstFilePath)
+      firstFilePath = filePath;
+    switch (hunk.type) {
+      case "add": {
+        const virtualContent = virtualPatchContent(virtualFiles, filePath);
+        const exists = virtualContent !== undefined ? virtualContent !== null : fs6.existsSync(filePath);
+        if (exists) {
+          throw new Error(`Failed to create ${hunk.path}: file already exists. Use *** Update File: to modify, or *** Delete File: first if you want to replace it entirely.`);
+        }
+        const after = hunk.contents.endsWith(`
+`) ? hunk.contents : `${hunk.contents}
+`;
+        patches.push(buildUnifiedDiff(filePath, "", after));
+        virtualFiles.set(filePath, after);
+        break;
+      }
+      case "delete": {
+        const before = await readPatchPreviewContent(virtualFiles, filePath, "delete", hunk.path);
+        patches.push(buildUnifiedDiff(filePath, before, ""));
+        virtualFiles.set(filePath, null);
+        break;
+      }
+      case "update": {
+        const before = await readPatchPreviewContent(virtualFiles, filePath, "update", hunk.path);
+        let after;
+        try {
+          after = applyUpdateChunks(before, filePath, hunk.chunks);
+        } catch (error50) {
+          throw new Error(`Failed to update ${hunk.path}: ${formatError2(error50)}`);
+        }
+        const targetPath = hunk.move_path ? resolvePathFromProjectRoot(projectRoot, hunk.move_path) : filePath;
+        patches.push(buildUnifiedDiff(targetPath, before, after));
+        if (hunk.move_path)
+          virtualFiles.set(filePath, null);
+        virtualFiles.set(targetPath, after);
+        break;
+      }
+    }
+  }
+  return { filepath: firstFilePath || projectRoot, diff: patches.join(`
+`) };
+}
 var READ_DESCRIPTION = `Read file contents or list directory entries.
 
 Use either startLine/endLine OR offset/limit to read a section of a file.
@@ -36016,16 +36159,18 @@ function createWriteTool(ctx, editToolName = "edit") {
       const filePath = resolvePathFromProjectRoot(projectRoot, file2);
       const relPath = path4.relative(projectRoot, filePath);
       {
-        const denial = await assertExternalDirectoryPermission(context, filePath);
-        if (denial)
-          return permissionDeniedResponse(denial);
-      }
-      await runAsk(context.ask({
-        permission: "edit",
-        patterns: [relPath],
-        always: ["*"],
-        metadata: { filepath: filePath }
-      }));
+        const denial2 = await assertExternalDirectoryPermission(context, filePath);
+        if (denial2)
+          return permissionDeniedResponse(denial2);
+      }
+      const currentContent = await readCurrentFileForPreview(filePath);
+      const previewDiff = buildUnifiedDiff(filePath, currentContent, content);
+      const denial = await askEditPermission(context, [relPath], {
+        filepath: filePath,
+        diff: previewDiff
+      });
+      if (denial)
+        return permissionDeniedResponse(denial);
       const data = await callBridge(ctx, context, "write", {
         file: filePath,
         content,
@@ -36165,16 +36310,10 @@ function createEditTool(ctx, writeToolName = "write") {
       const filePath = resolvePathFromProjectRoot(projectRoot, file2);
       const relPath = path4.relative(projectRoot, filePath);
       {
-        const denial = await assertExternalDirectoryPermission(context, filePath);
-        if (denial)
-          return permissionDeniedResponse(denial);
+        const denial2 = await assertExternalDirectoryPermission(context, filePath);
+        if (denial2)
+          return permissionDeniedResponse(denial2);
       }
-      await runAsk(context.ask({
-        permission: "edit",
-        patterns: [relPath],
-        always: ["*"],
-        metadata: { filepath: filePath }
-      }));
       const params = { file: filePath };
       let command;
       if (typeof args.appendContent === "string") {
@@ -36217,6 +36356,21 @@ function createEditTool(ctx, writeToolName = "write") {
         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}`);
       }
+      const previewData = await callBridge(ctx, context, command, {
+        ...params,
+        preview: true,
+        include_diff_content: true
+      });
+      if (previewData.success === false) {
+        throw new Error(previewData.message || "edit preview failed");
+      }
+      const previewDiff = previewDiffFromResponse(previewData, filePath);
+      const denial = await askEditPermission(context, [relPath], {
+        filepath: filePath,
+        diff: previewDiff
+      });
+      if (denial)
+        return permissionDeniedResponse(denial);
       params.diagnostics = diagnosticsOnEditDefault(ctx);
       params.include_diff_content = true;
       const data = await callBridge(ctx, context, command, params);
@@ -36380,17 +36534,18 @@ function createApplyPatchTool(ctx) {
           if (asked.has(filePath))
             continue;
           asked.add(filePath);
-          const denial = await assertExternalDirectoryPermission(context, filePath);
-          if (denial)
-            return permissionDeniedResponse(denial);
+          const denial2 = await assertExternalDirectoryPermission(context, filePath);
+          if (denial2)
+            return permissionDeniedResponse(denial2);
         }
       }
-      await runAsk(context.ask({
-        permission: "edit",
-        patterns: relPaths,
-        always: ["*"],
-        metadata: {}
-      }));
+      const preview2 = await buildApplyPatchPreview(hunks, projectRoot);
+      const denial = await askEditPermission(context, relPaths, {
+        filepath: preview2.filepath,
+        diff: preview2.diff
+      });
+      if (denial)
+        return permissionDeniedResponse(denial);
       const checkpointPaths = Array.from(affectedAbs).filter((abs) => !newlyCreatedAbs.has(abs));
       const checkpointName = `apply_patch_${Date.now()}`;
       let checkpointCreated = false;
@@ -36762,16 +36917,18 @@ function aftPrefixedTools(ctx) {
           const filePath = resolvePathFromProjectRoot(projectRoot, file2);
           const relPath = path4.relative(projectRoot, filePath);
           {
-            const denial = await assertExternalDirectoryPermission(context, filePath);
-            if (denial)
-              return permissionDeniedResponse(denial);
+            const denial2 = await assertExternalDirectoryPermission(context, filePath);
+            if (denial2)
+              return permissionDeniedResponse(denial2);
           }
-          await runAsk(context.ask({
-            permission: "edit",
-            patterns: [relPath],
-            always: ["*"],
-            metadata: { filepath: filePath }
-          }));
+          const currentContent = await readCurrentFileForPreview(filePath);
+          const previewDiff = buildUnifiedDiff(filePath, currentContent, normalizedArgs.content);
+          const denial = await askEditPermission(context, [relPath], {
+            filepath: filePath,
+            diff: previewDiff
+          });
+          if (denial)
+            return permissionDeniedResponse(denial);
           const writeParams = {
             file: filePath,
             content: normalizedArgs.content,
@@ -38218,12 +38375,12 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.38.0";
+var ANNOUNCEMENT_VERSION = "0.39.0";
 var ANNOUNCEMENT_FEATURES = [
-  "Code Health you can trust: dead code and unused exports are back in the sidebar and status displays, rebuilt on a real TS/JS module-graph engine (oxc) — barrel re-exports, entry points, and dynamic imports resolve correctly now.",
-  "Tools stay responsive during builds: filesystem events are processed off the request thread, so a cargo/webpack compile no longer queues your tool calls behind an event flood.",
-  "Pascal support in outline, zoom, and the AST tools.",
-  "Sidebar reliability: the status panel reconnects after heavy host load instead of going dark, and transient environment errors (schema fetch timeouts) no longer count as code errors."
+  "Accurate Rust dead code: constructors and associated functions reached through receiver-type inference are no longer mis-reported as dead.",
+  "Code Health scans reparse only the file you changed instead of the whole project on every edit — a single-file edit dropped from ~3s of scan work to ~130ms on this repo, byte-identical results.",
+  "R language support in outline, zoom, and the AST tools.",
+  "Edit approval prompts now show the pending diff instead of 'No diff provided', so you can review a change before approving it."
 ];
 var ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/DSa65w8wuf";
 var plugin = async (input) => initializePluginForDirectory(input);

package/dist/tools/hoisted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAItE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwEjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA4RtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwJjE;AA+mCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+FnF"}
+{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAItE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAyEjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA8YtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwJjE;AAmnCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAkGnF"}

package/dist/tui.js

@@ -1,7 +1,7 @@
 // src/tui/index.tsx
 import { createMemo as createMemo2, createSignal as createSignal2, onCleanup as onCleanup2 } from "solid-js";
 // package.json
-var version = "0.38.0";
+var version = "0.39.0";
 
 // src/shared/rpc-client.ts
 import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -30,19 +30,19 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.38.0",
+    "@cortexkit/aft-bridge": "0.39.0",
     "@xterm/headless": "^5.5.0",
     "comment-json": "^4.6.2",
     "undici": "^7.25.0",
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.38.0",
-    "@cortexkit/aft-darwin-x64": "0.38.0",
-    "@cortexkit/aft-linux-arm64": "0.38.0",
-    "@cortexkit/aft-linux-x64": "0.38.0",
-    "@cortexkit/aft-win32-arm64": "0.38.0",
-    "@cortexkit/aft-win32-x64": "0.38.0"
+    "@cortexkit/aft-darwin-arm64": "0.39.0",
+    "@cortexkit/aft-darwin-x64": "0.39.0",
+    "@cortexkit/aft-linux-arm64": "0.39.0",
+    "@cortexkit/aft-linux-x64": "0.39.0",
+    "@cortexkit/aft-win32-arm64": "0.39.0",
+    "@cortexkit/aft-win32-x64": "0.39.0"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.15.11",