@cortexkit/aft-opencode 0.37.2 → 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";
@@ -14250,37 +14308,67 @@ 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);
+  const chain = splitTopLevelCommandChain(command);
   if (chain === null)
     return { command, stripped: false };
-  const prefix = chain.slice(0, -1).map((segment) => segment.trim()).filter(Boolean);
-  const pipeline3 = chain[chain.length - 1] ?? "";
-  const stages = splitTopLevelPipeline(pipeline3);
-  if (stages.length < 2)
+  let stripped = false;
+  const droppedFilterChains = [];
+  const rebuilt = chain.map(({ segment, separator }) => {
+    const result = stripSinglePipelineSegment(segment);
+    if (result.stripped) {
+      stripped = true;
+      droppedFilterChains.push(result.filters);
+    }
+    return `${result.segment}${separator}`;
+  }).join("");
+  if (!stripped)
     return { command, stripped: false };
+  return {
+    command: rebuilt,
+    stripped: true,
+    note: formatStripNote(droppedFilterChains)
+  };
+}
+function stripSinglePipelineSegment(segment) {
+  const leading = /^\s*/.exec(segment)?.[0] ?? "";
+  const trailing = /\s*$/.exec(segment)?.[0] ?? "";
+  const coreStart = leading.length;
+  const coreEnd = segment.length - trailing.length;
+  if (coreEnd <= coreStart)
+    return { segment, stripped: false };
+  const core = segment.slice(coreStart, coreEnd);
+  if (containsUnsplittableConstruct(core))
+    return { segment, stripped: false };
+  if (hasUnquotedBackground(core))
+    return { segment, stripped: false };
+  const stages = splitTopLevelPipeline(core);
+  if (stages.length < 2)
+    return { segment, stripped: false };
   const firstStage = stages[0]?.trim() ?? "";
   if (!isCompressorHandledRunner(firstStage))
-    return { command, stripped: false };
+    return { segment, stripped: false };
   const filterStages = stages.slice(1).map((stage) => stage.trim());
   for (const stage of filterStages) {
     if (!filterStageIsSafeToDrop(stage))
-      return { command, stripped: false };
+      return { segment, stripped: false };
   }
-  const filters = filterStages.join(" | ");
-  const rebuilt = [...prefix, firstStage].join(" && ");
   return {
-    command: rebuilt,
+    segment: `${leading}${firstStage}${trailing}`,
     stripped: true,
-    note: `[AFT dropped \`| ${filters}\` (compressed:false to keep)]`
+    filters: filterStages.join(" | ")
   };
 }
-function splitTopLevelAndChain(command) {
+function formatStripNote(droppedFilterChains) {
+  const filters = droppedFilterChains.map((filter) => `\`| ${filter}\``).join(", ");
+  return `[AFT dropped ${filters} (compressed:false to keep)]`;
+}
+function splitTopLevelCommandChain(command) {
   const segments = [];
   let start = 0;
   let quote = null;
   let escaped = false;
+  let inBacktick = false;
+  let parenDepth = 0;
   for (let index = 0;index < command.length; index++) {
     const char = command[index];
     const next = command[index + 1];
@@ -14288,6 +14376,13 @@ function splitTopLevelAndChain(command) {
       escaped = false;
       continue;
     }
+    if (inBacktick) {
+      if (char === "\\")
+        escaped = true;
+      else if (char === "`")
+        inBacktick = false;
+      continue;
+    }
     if (char === "\\" && quote !== "'") {
       escaped = true;
       continue;
@@ -14301,26 +14396,47 @@ function splitTopLevelAndChain(command) {
       quote = char;
       continue;
     }
-    if (char === "&" && next === "&") {
-      segments.push(command.slice(start, index));
-      start = index + 2;
-      index++;
+    if (char === "`") {
+      inBacktick = true;
       continue;
     }
-    if (char === "|" && next === "|")
-      return null;
-    if (char === ";")
-      return null;
+    if (char === "(") {
+      parenDepth++;
+      continue;
+    }
+    if (char === ")") {
+      if (parenDepth === 0)
+        return null;
+      parenDepth--;
+      continue;
+    }
+    if (parenDepth > 0)
+      continue;
     if (char === `
 ` || char === "\r")
       return null;
-    if (char === "&") {
-      const prev = command[index - 1];
-      if (prev !== ">" && next !== ">")
-        return null;
+    if (char === "#" && (index === 0 || command[index - 1] === " " || command[index - 1] === "\t"))
+      return null;
+    if (char === "&" && next === "&") {
+      segments.push({ segment: command.slice(start, index), separator: "&&" });
+      start = index + 2;
+      index++;
+      continue;
+    }
+    if (char === "|" && next === "|") {
+      segments.push({ segment: command.slice(start, index), separator: "||" });
+      start = index + 2;
+      index++;
+      continue;
+    }
+    if (char === ";") {
+      segments.push({ segment: command.slice(start, index), separator: ";" });
+      start = index + 1;
     }
   }
-  segments.push(command.slice(start));
+  if (escaped || quote || inBacktick || parenDepth !== 0)
+    return null;
+  segments.push({ segment: command.slice(start), separator: "" });
   return segments;
 }
 function splitTopLevelPipeline(command) {
@@ -14383,13 +14499,13 @@ function isCompressorHandledRunner(stage) {
       args = args.slice(1);
     const sub = args[0];
     const subNext = args[1];
-    return sub === "test" || sub === "run" && startsWithTest(subNext);
+    return sub === "test" || sub === "run" && isJsVerificationScript(subNext);
   }
   if (first === "npm" || first === "pnpm") {
-    return second === "test" || second === "run" && startsWithTest(third);
+    return second === "test" || second === "run" && isJsVerificationScript(third);
   }
   if (first === "yarn") {
-    return startsWithTest(second) || second === "run" && startsWithTest(third);
+    return isJsVerificationScript(second) || second === "run" && isJsVerificationScript(third);
   }
   if (first === "deno")
     return ["test", "lint", "check", "bench"].includes(second ?? "");
@@ -14467,8 +14583,10 @@ function hasBuildTask(args, tasks) {
   }
   return sawAllowed;
 }
-function startsWithTest(token) {
-  return token?.startsWith("test") === true;
+function isJsVerificationScript(token) {
+  if (!token)
+    return false;
+  return token.startsWith("test") || token === "typecheck" || token.startsWith("typecheck:");
 }
 var XCODEBUILD_VALUE_FLAGS = new Set([
   "-scheme",
@@ -33127,6 +33245,7 @@ function writeTerminal(terminal, data) {
 // src/shared/rpc-server.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
 import {
+  existsSync as existsSync14,
   mkdirSync as mkdirSync10,
   readdirSync as readdirSync5,
   readFileSync as readFileSync13,
@@ -33185,6 +33304,8 @@ function parseRpcPortRecord(content) {
 }
 
 // src/shared/rpc-server.ts
+var PORT_FILE_HEARTBEAT_MS = 15000;
+
 class AftRpcServer {
   server = null;
   port = 0;
@@ -33192,6 +33313,7 @@ class AftRpcServer {
   handlers = new Map;
   portFilePath;
   portsDir;
+  heartbeatTimer = null;
   instanceId;
   constructor(storageDir, directory) {
     this.portsDir = rpcPortFileDir(storageDir, directory);
@@ -33229,6 +33351,8 @@ class AftRpcServer {
           }), { encoding: "utf-8", mode: 384 });
           renameSync8(tmpPath, this.portFilePath);
           log2(`RPC server listening on 127.0.0.1:${this.port}`);
+          this.heartbeatTimer = setInterval(() => this.ensurePortFile(), PORT_FILE_HEARTBEAT_MS);
+          this.heartbeatTimer.unref?.();
           this.sweepDeadPortFiles();
         } catch (err) {
           warn2(`Failed to write RPC port file: ${err}`);
@@ -33263,7 +33387,28 @@ class AftRpcServer {
       } catch {}
     }
   }
+  ensurePortFile() {
+    if (!this.server || this.token === null)
+      return;
+    try {
+      if (existsSync14(this.portFilePath))
+        return;
+      const tmpPath = `${this.portFilePath}.tmp`;
+      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 port file was missing; rewrote ${this.portFilePath}`);
+    } catch {}
+  }
   stop() {
+    if (this.heartbeatTimer) {
+      clearInterval(this.heartbeatTimer);
+      this.heartbeatTimer = null;
+    }
     if (this.server) {
       this.server.close();
       this.server = null;
@@ -33622,7 +33767,7 @@ function formatStatusMarkdown(status) {
   }
   if (status.status_bar) {
     const sb = status.status_bar;
-    lines.push("", `### Code Health${sb.tier2_stale ? " (~ stale)" : ""}`, `- **Errors:** ${formatCount(sb.errors)}`, `- **Warnings:** ${formatCount(sb.warnings)}`, `- **Duplicates:** ${formatCount(sb.duplicates)}`, `- **TODOs:** ${formatCount(sb.todos)}`);
+    lines.push("", `### Code Health${sb.tier2_stale ? " (~ stale)" : ""}`, `- **Errors:** ${formatCount(sb.errors)}`, `- **Warnings:** ${formatCount(sb.warnings)}`, `- **Dead code:** ${formatCount(sb.dead_code)}`, `- **Unused exports:** ${formatCount(sb.unused_exports)}`, `- **Duplicates:** ${formatCount(sb.duplicates)}`, `- **TODOs:** ${formatCount(sb.todos)}`);
   }
   lines.push("", "### Current session", `- **ID:** \`${status.session.id}\``, `- **Tracked files:** ${formatCount(status.session.tracked_files)}`, `- **Checkpoints:** ${formatCount(status.session.checkpoints)}`, `- **Project checkpoints (all sessions):** ${formatCount(status.checkpoints_total)}`);
   return lines.join(`
@@ -33631,7 +33776,7 @@ function formatStatusMarkdown(status) {
 
 // src/shared/tui-config.ts
 var import_comment_json4 = __toESM(require_src2(), 1);
-import { existsSync as existsSync14, mkdirSync as mkdirSync11, readFileSync as readFileSync14, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync11, readFileSync as readFileSync14, writeFileSync as writeFileSync11 } from "node:fs";
 import { dirname as dirname10, join as join21 } from "node:path";
 
 // src/shared/opencode-config-dir.ts
@@ -33668,9 +33813,9 @@ function resolveTuiConfigPath() {
   const configDir = getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
   const jsoncPath = join21(configDir, "tui.jsonc");
   const jsonPath = join21(configDir, "tui.json");
-  if (existsSync14(jsoncPath))
+  if (existsSync15(jsoncPath))
     return jsoncPath;
-  if (existsSync14(jsonPath))
+  if (existsSync15(jsonPath))
     return jsonPath;
   return jsonPath;
 }
@@ -33678,7 +33823,7 @@ function ensureTuiPluginEntry() {
   try {
     const configPath = resolveTuiConfigPath();
     let config2 = {};
-    if (existsSync14(configPath)) {
+    if (existsSync15(configPath)) {
       config2 = import_comment_json4.parse(readFileSync14(configPath, "utf-8")) ?? {};
     }
     const plugins = Array.isArray(config2.plugin) ? config2.plugin.filter((value) => typeof value === "string") : [];
@@ -33730,6 +33875,12 @@ async function runCleanups(reason) {
     runningCleanups = false;
   }
 }
+var SIGNAL_EXIT_CODES = { SIGINT: 130, SIGTERM: 143, SIGHUP: 129 };
+var SIGNAL_CLEANUP_TIMEOUT_MS = 5000;
+function shouldForceExit(otherListenerCount) {
+  return otherListenerCount === 0;
+}
+var signalShutdownStarted = false;
 function installProcessHandlers() {
   const state = getState();
   if (state.installed)
@@ -33737,9 +33888,27 @@ function installProcessHandlers() {
   state.installed = true;
   const signals = ["SIGTERM", "SIGINT", "SIGHUP"];
   for (const sig of signals) {
-    process.on(sig, () => {
-      runCleanups(sig);
-    });
+    const handler = () => {
+      const others = process.listenerCount(sig) - 1;
+      if (!shouldForceExit(others)) {
+        const names = process.listeners(sig).filter((fn) => fn !== handler).map((fn) => fn.name || fn.toString().slice(0, 80).replace(/\s+/g, " ")).join(" | ");
+        log2(`${sig}: deferring termination to ${others} other listener(s); cleanup only. Others: ${names}`);
+        runCleanups(sig);
+        return;
+      }
+      if (signalShutdownStarted) {
+        process.exit(SIGNAL_EXIT_CODES[sig]);
+      }
+      signalShutdownStarted = true;
+      process.exitCode = SIGNAL_EXIT_CODES[sig];
+      const timeout = new Promise((resolve5) => {
+        setTimeout(resolve5, SIGNAL_CLEANUP_TIMEOUT_MS);
+      });
+      Promise.race([runCleanups(sig), timeout]).finally(() => {
+        process.exit(SIGNAL_EXIT_CODES[sig]);
+      });
+    };
+    process.on(sig, handler);
   }
   process.on("beforeExit", () => {
     runCleanups("beforeExit");
@@ -33910,7 +34079,15 @@ ${candidates.map((candidate) => `  - ${candidate}`).join(`
 `);
 }
 function collectStructuredExtras(response) {
-  const reserved = new Set(["id", "success", "code", "message", "data"]);
+  const reserved = new Set([
+    "id",
+    "success",
+    "code",
+    "message",
+    "data",
+    "status_bar",
+    "bg_completions"
+  ]);
   const extras = {};
   for (const [key, value] of Object.entries(response)) {
     if (reserved.has(key))
@@ -34190,16 +34367,24 @@ async function checkAstPathsPermission(context, paths) {
   }
   return;
 }
-var SUPPORTED_LANGS = ["typescript", "tsx", "javascript", "python", "rust", "go"];
+var SUPPORTED_LANGS = [
+  "typescript",
+  "tsx",
+  "javascript",
+  "python",
+  "rust",
+  "go",
+  "pascal"
+];
 function astTools(ctx) {
   const searchTool = {
-    description: `Search code patterns across filesystem using AST-aware matching. Supports 6 languages.
+    description: `Search code patterns across filesystem using AST-aware matching. Supports 7 languages.
 
 ` + `Use meta-variables: $VAR matches a single AST node, $$$ matches multiple nodes (variadic).
 ` + `IMPORTANT: Patterns must be complete AST nodes (valid code fragments).
 ` + `For functions, include params and body: 'export async function $NAME($$$) { $$$ }' not just 'export async function $NAME'.
 
-` + "Examples: pattern='console.log($MSG)' lang='typescript', pattern='async function $NAME($$$) { $$$ }' lang='javascript', pattern='def $FUNC($$$): $$$' lang='python'",
+` + "Examples: pattern='console.log($MSG)' lang='typescript', pattern='async function $NAME($$$) { $$$ }' lang='javascript', pattern='def $FUNC($$$): $$$' lang='python', pattern='Writeln($MSG);' lang='pascal'",
     args: {
       pattern: z3.string().describe("AST pattern with meta-variables ($VAR, $$$). Must be complete AST node."),
       lang: z3.enum(SUPPORTED_LANGS).describe("Target language"),
@@ -35745,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.
@@ -35889,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,
@@ -36038,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") {
@@ -36090,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);
@@ -36253,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;
@@ -36635,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,
@@ -38091,12 +38375,12 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.37.0";
+var ANNOUNCEMENT_VERSION = "0.39.0";
 var ANNOUNCEMENT_FEATURES = [
-  "Much lower background CPU: idle bridges shut down after 30 minutes, deleted project roots stop the watcher instead of spinning it, and background scans reuse warm caches on a bounded thread pool.",
-  "`aft_transform` removed: usage data showed agents never called it — `edit` covers everything it did, and every request now carries a smaller tool surface.",
-  "Leaner tools: `bash`, `write`, `edit`, `apply_patch`, `aft_search`, and `aft_refactor` descriptions trimmed and config-aware; system-prompt guidance rewritten around what to do instead of what to avoid.",
-  "Background bash reminders are right-sized: failures keep head + tail context, successes show a short tail, and compressors never print a success summary for a non-zero exit."
+  "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/shared/rpc-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-client.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC;CACvC;AA4BD,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAA6B;gBAE1C,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAKjD,iFAAiF;IAC3E,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC;YA8CC,OAAO;IAsBrB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAM5B,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;YACW,gBAAgB;IAwB9B,OAAO,CAAC,gBAAgB;IAwDxB,8EAA8E;IAC9E,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;YAsBX,WAAW;YAkCX,gBAAgB;IAmB9B,KAAK,IAAI,IAAI;CAKd"}
+{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-client.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC;CACvC;AA4BD,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAA6B;gBAE1C,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAKjD,iFAAiF;IAC3E,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC;YA8CC,OAAO;IAsBrB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAM5B,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;YACW,gBAAgB;IAwB9B,OAAO,CAAC,gBAAgB;IAwDxB,8EAA8E;IAC9E,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;YA6BX,WAAW;YAkCX,gBAAgB;IAmB9B,KAAK,IAAI,IAAI;CAKd"}

package/dist/shared/rpc-server.d.ts

@@ -6,6 +6,7 @@ export declare class AftRpcServer {
     private handlers;
     private portFilePath;
     private portsDir;
+    private heartbeatTimer;
     /** Unique per-instance ID — distinguishes our entry from duplicate plugin loads. */
     private instanceId;
     constructor(storageDir: string, directory: string);
@@ -20,6 +21,8 @@ export declare class AftRpcServer {
      * Never touches our own freshly written file.
      */
     private sweepDeadPortFiles;
+    /** Rewrite the port file if it disappeared (wrongful deletion recovery). */
+    private ensurePortFile;
     /** Stop the server and clean up port file. */
     stop(): void;
     private dispatch;

package/dist/shared/rpc-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-server.ts"],"names":[],"mappings":"AAcA,KAAK,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAExF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAS;IACzB,oFAAoF;IACpF,OAAO,CAAC,UAAU,CAAS;gBAEf,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAMjD,sCAAsC;IACtC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAIjD,6DAA6D;IACvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IA0D9B;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IA6B1B,8CAA8C;IAC9C,IAAI,IAAI,IAAI;IAaZ,OAAO,CAAC,QAAQ;CAoEjB"}
+{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-server.ts"],"names":[],"mappings":"AAeA,KAAK,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAIxF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAA+C;IACrE,oFAAoF;IACpF,OAAO,CAAC,UAAU,CAAS;gBAEf,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAMjD,sCAAsC;IACtC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAIjD,6DAA6D;IACvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAkE9B;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IA6B1B,4EAA4E;IAC5E,OAAO,CAAC,cAAc;IAsBtB,8CAA8C;IAC9C,IAAI,IAAI,IAAI;IAiBZ,OAAO,CAAC,QAAQ;CAoEjB"}

package/dist/shared/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/shared/status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/shared/status.ts"],"names":[],"mappings":"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"}

package/dist/shutdown-hooks.d.ts

@@ -16,6 +16,23 @@
  */
 type Cleanup = () => Promise<void> | void;
 export declare function runCleanups(reason: string): Promise<void>;
+/** Conventional exit codes for fatal signals (128 + signal number). */
+export declare const SIGNAL_EXIT_CODES: {
+    readonly SIGINT: 130;
+    readonly SIGTERM: 143;
+    readonly SIGHUP: 129;
+};
+/**
+ * Decide whether AFT's handler must terminate the process after cleanup.
+ *
+ * Registering ANY listener for SIGINT/SIGTERM/SIGHUP disables Node/Bun's
+ * default terminate-on-signal behavior. If AFT's listener is the only one,
+ * the default was suppressed solely by us, so we must exit or the host hangs
+ * forever (OpenCode serve + Desktop /event SSE hung on Ctrl-C until SIGKILL).
+ * If the host or another plugin also listens, terminating is THEIR call —
+ * forcing an exit here would race a host's graceful shutdown.
+ */
+export declare function shouldForceExit(otherListenerCount: number): boolean;
 /**
  * Register a shutdown cleanup. Call from plugin initialization; returned
  * function unregisters (use in `dispose` so plugin reloads don't leak).

package/dist/shutdown-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown-hooks.d.ts","sourceRoot":"","sources":["../src/shutdown-hooks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,KAAK,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAoB1C,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/D;AA0BD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,IAAI,CAO/D"}
+{"version":3,"file":"shutdown-hooks.d.ts","sourceRoot":"","sources":["../src/shutdown-hooks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,KAAK,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAoB1C,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/D;AAED,uEAAuE;AACvE,eAAO,MAAM,iBAAiB;;;;CAAsD,CAAC;AAKrF;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAEnE;AA2DD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,IAAI,CAO/D"}

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

@@ -1 +1 @@
-{"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../src/tools/_shared.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAUhF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,KAAG,GACR,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,OAAO,EACV,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAMpD;AAMD,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAIhD,OAAO,EAAE,+BAA+B,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AA2B3F,8EAA8E;AAC9E,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,MAAM,CAsDR;AAsBD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkBD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAW3D;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQjD;AAED;;2BAE2B;AAC3B,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAGtF;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,YAAY,CAEhF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAgClC;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAE9F"}
+{"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../src/tools/_shared.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAUhF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,KAAG,GACR,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,OAAO,EACV,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAepB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAMpD;AAMD,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAIhD,OAAO,EAAE,+BAA+B,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AA2B3F,8EAA8E;AAC9E,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,MAAM,CAsDR;AAiCD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkBD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAW3D;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQjD;AAED;;2BAE2B;AAC3B,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAGtF;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,YAAY,CAEhF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAgClC;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAE9F"}

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

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/tools/ast.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA6DjD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAwS3E"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/tools/ast.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAqEjD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAwS3E"}

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.37.2";
+var version = "0.39.0";
 
 // src/shared/rpc-client.ts
 import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";
@@ -248,6 +248,8 @@ class AftRpcClient {
       return;
     }
     this.stalePortFailures.delete(key);
+    if (info.pid === undefined || isPidAlive(info.pid))
+      return;
     try {
       const current = this.parsePortFile(info.path);
       if (current?.port === info.port && current.token === info.token) {
@@ -599,7 +601,7 @@ function collapsedHealthLights(statusBar) {
   if (!statusBar)
     return null;
   const diagnostics = statusBar.errors > 0 ? "err" : statusBar.warnings > 0 ? "warn" : "ok";
-  const code = statusBar.duplicates > 0 ? "warn" : "ok";
+  const code = statusBar.dead_code > 0 || statusBar.unused_exports > 0 || statusBar.duplicates > 0 ? "warn" : "ok";
   const todos = statusBar.todos > 0 ? "warn" : "ok";
   return { diagnostics, code, todos };
 }
@@ -1022,6 +1024,18 @@ var SidebarContent = (props) => {
                 value: formatCount(statusBar().warnings),
                 tone: statusBar().warnings > 0 ? "warn" : "muted"
               }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV(StatRow, {
+                theme: props.theme,
+                label: "Dead Code",
+                value: formatCount(statusBar().dead_code),
+                tone: "muted"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV(StatRow, {
+                theme: props.theme,
+                label: "Unused Exports",
+                value: formatCount(statusBar().unused_exports),
+                tone: "muted"
+              }, undefined, false, undefined, this),
               /* @__PURE__ */ jsxDEV(StatRow, {
                 theme: props.theme,
                 label: "Duplicates",
@@ -1556,6 +1570,18 @@ var StatusDialog = (props) => {
             value: formatCountShort(status().status_bar.warnings),
             tone: status().status_bar.warnings > 0 ? "warn" : "muted"
           }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV2(R, {
+            theme: t(),
+            label: "Dead Code",
+            value: formatCountShort(status().status_bar.dead_code),
+            tone: "muted"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV2(R, {
+            theme: t(),
+            label: "Unused Exports",
+            value: formatCountShort(status().status_bar.unused_exports),
+            tone: "muted"
+          }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV2(R, {
             theme: t(),
             label: "Duplicates",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.37.2",
+  "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.37.2",
+    "@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.37.2",
-    "@cortexkit/aft-darwin-x64": "0.37.2",
-    "@cortexkit/aft-linux-arm64": "0.37.2",
-    "@cortexkit/aft-linux-x64": "0.37.2",
-    "@cortexkit/aft-win32-arm64": "0.37.2",
-    "@cortexkit/aft-win32-x64": "0.37.2"
+    "@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",

package/src/shared/rpc-client.ts

@@ -281,6 +281,13 @@ export class AftRpcClient {
     }
 
     this.stalePortFailures.delete(key);
+    // Deletion requires a provably-dead owner. Health checks time out under
+    // host load (blocked event loop during builds/streaming), and unlinking a
+    // LIVE server's port file is permanent: the server only wrote it at
+    // startup, so the sidebar could never reconnect until host restart
+    // (issue #110). Live-pid and pid-less files are skipped this round and
+    // retried on the next poll instead.
+    if (info.pid === undefined || isPidAlive(info.pid)) return;
     try {
       // Do not unlink a replacement written after the failed health checks.
       const current = this.parsePortFile(info.path);

package/src/shared/rpc-server.ts

@@ -1,5 +1,6 @@
 import { randomBytes } from "node:crypto";
 import {
+  existsSync,
   mkdirSync,
   readdirSync,
   readFileSync,
@@ -14,6 +15,8 @@ import { isPidAlive, parseRpcPortRecord, rpcPortFileDir } from "./rpc-utils";
 
 type RpcHandler = (params: Record<string, unknown>) => Promise<Record<string, unknown>>;
 
+const PORT_FILE_HEARTBEAT_MS = 15_000;
+
 export class AftRpcServer {
   private server: Server | null = null;
   private port = 0;
@@ -21,6 +24,7 @@ export class AftRpcServer {
   private handlers = new Map<string, RpcHandler>();
   private portFilePath: string;
   private portsDir: string;
+  private heartbeatTimer: ReturnType<typeof setInterval> | null = null;
   /** Unique per-instance ID — distinguishes our entry from duplicate plugin loads. */
   private instanceId: string;
 
@@ -75,6 +79,14 @@ export class AftRpcServer {
           );
           renameSync(tmpPath, this.portFilePath);
           log(`RPC server listening on 127.0.0.1:${this.port}`);
+          // Self-heal: the port file is this server's only discoverability
+          // record, and historically it was written exactly once — anything
+          // that deleted it (a client misjudging a load-induced health-check
+          // timeout as staleness, cache cleanup, manual sweeps) silently
+          // orphaned the server until host restart (issue #110: sidebar stuck
+          // on the lazy placeholder forever). Recreate it if it goes missing.
+          this.heartbeatTimer = setInterval(() => this.ensurePortFile(), PORT_FILE_HEARTBEAT_MS);
+          this.heartbeatTimer.unref?.();
           // Hygiene: sweep dead siblings while we're here. The client only
           // reclaims dead-pid files on a cold port scan, and it caches the
           // first warm port afterwards — so crash/restart leftovers piled up
@@ -129,8 +141,35 @@ export class AftRpcServer {
     }
   }
 
+  /** Rewrite the port file if it disappeared (wrongful deletion recovery). */
+  private ensurePortFile(): void {
+    if (!this.server || this.token === null) return;
+    try {
+      if (existsSync(this.portFilePath)) return;
+      const tmpPath = `${this.portFilePath}.tmp`;
+      writeFileSync(
+        tmpPath,
+        JSON.stringify({
+          port: this.port,
+          token: this.token,
+          pid: process.pid,
+          started_at: Date.now(),
+        }),
+        { encoding: "utf-8", mode: 0o600 },
+      );
+      renameSync(tmpPath, this.portFilePath);
+      log(`RPC port file was missing; rewrote ${this.portFilePath}`);
+    } catch {
+      // best-effort; retried on the next heartbeat
+    }
+  }
+
   /** Stop the server and clean up port file. */
   stop(): void {
+    if (this.heartbeatTimer) {
+      clearInterval(this.heartbeatTimer);
+      this.heartbeatTimer = null;
+    }
     if (this.server) {
       this.server.close();
       this.server = null;

package/src/shared/status.ts

@@ -337,9 +337,8 @@ export function formatStatusDialogMessage(status: AftStatusSnapshot): string {
       `Code Health${sb.tier2_stale ? " (~ stale)" : ""}`,
       `- errors: ${formatCount(sb.errors)}`,
       `- warnings: ${formatCount(sb.warnings)}`,
-      // dead code / unused exports hidden until oxc resolver lands (restore both)
-      // `- dead code: ${formatCount(sb.dead_code)}`,
-      // `- unused exports: ${formatCount(sb.unused_exports)}`,
+      `- dead code: ${formatCount(sb.dead_code)}`,
+      `- unused exports: ${formatCount(sb.unused_exports)}`,
       `- duplicates: ${formatCount(sb.duplicates)}`,
       `- todos: ${formatCount(sb.todos)}`,
     );
@@ -447,9 +446,8 @@ export function formatStatusMarkdown(status: AftStatusSnapshot): string {
       `### Code Health${sb.tier2_stale ? " (~ stale)" : ""}`,
       `- **Errors:** ${formatCount(sb.errors)}`,
       `- **Warnings:** ${formatCount(sb.warnings)}`,
-      // dead code / unused exports hidden until oxc resolver lands (restore both)
-      // `- **Dead code:** ${formatCount(sb.dead_code)}`,
-      // `- **Unused exports:** ${formatCount(sb.unused_exports)}`,
+      `- **Dead code:** ${formatCount(sb.dead_code)}`,
+      `- **Unused exports:** ${formatCount(sb.unused_exports)}`,
       `- **Duplicates:** ${formatCount(sb.duplicates)}`,
       `- **TODOs:** ${formatCount(sb.todos)}`,
     );

package/src/tui/index.tsx

@@ -507,9 +507,7 @@ const StatusDialog = (props: StatusDialogProps) => {
             value={formatCountShort(status()!.status_bar!.warnings)}
             tone={status()!.status_bar!.warnings > 0 ? "warn" : "muted"}
           />
-          {/* Dead Code / Unused Exports hidden until the oxc resolver lands
-          (current scanner over-reports on barrel re-exports). Restore both. */}
-          {/* <R
+          <R
             theme={t()}
             label="Dead Code"
             value={formatCountShort(status()!.status_bar!.dead_code)}
@@ -520,7 +518,7 @@ const StatusDialog = (props: StatusDialogProps) => {
             label="Unused Exports"
             value={formatCountShort(status()!.status_bar!.unused_exports)}
             tone="muted"
-          /> */}
+          />
           <R
             theme={t()}
             label="Duplicates"

package/src/tui/sidebar.tsx

@@ -185,11 +185,8 @@ export type HealthLightTone = "ok" | "warn" | "err";
 export interface HealthLights {
   // Diagnostics: red if any errors, yellow if any warnings, else green.
   diagnostics: HealthLightTone;
-  // Code cruft: yellow if there is any duplicate, green when zero. Never red —
-  // cruft is not a build failure. NOTE: dead_code / unused_exports are
-  // temporarily excluded from this signal (and the expanded rows below) until
-  // the oxc-based resolver lands and makes those counts trustworthy on real
-  // TS/JS codebases. Restore them here when that engine ships.
+  // Code cruft: yellow if there is any dead code, unused export, or duplicate,
+  // green when zero. Never red — cruft is not a build failure.
   code: HealthLightTone;
   // TODOs: yellow if any, else green.
   todos: HealthLightTone;
@@ -202,8 +199,9 @@ export function collapsedHealthLights(statusBar: StatusBar | undefined): HealthL
   const diagnostics: HealthLightTone =
     statusBar.errors > 0 ? "err" : statusBar.warnings > 0 ? "warn" : "ok";
   const code: HealthLightTone =
-    // statusBar.dead_code > 0 || statusBar.unused_exports > 0 ||  // restore with oxc engine
-    statusBar.duplicates > 0 ? "warn" : "ok";
+    statusBar.dead_code > 0 || statusBar.unused_exports > 0 || statusBar.duplicates > 0
+      ? "warn"
+      : "ok";
   const todos: HealthLightTone = statusBar.todos > 0 ? "warn" : "ok";
   return { diagnostics, code, todos };
 }
@@ -744,11 +742,7 @@ const SidebarContent = (props: {
                 value={formatCount(statusBar()!.warnings)}
                 tone={statusBar()!.warnings > 0 ? "warn" : "muted"}
               />
-              {/* Dead Code / Unused Exports temporarily hidden until the
-              oxc-based resolver lands and makes these trustworthy on real
-              TS/JS codebases (current tree-sitter scanner over-reports via
-              barrel re-export gaps). Restore both rows when that ships. */}
-              {/* <StatRow
+              <StatRow
                 theme={props.theme}
                 label="Dead Code"
                 value={formatCount(statusBar()!.dead_code)}
@@ -759,7 +753,7 @@ const SidebarContent = (props: {
                 label="Unused Exports"
                 value={formatCount(statusBar()!.unused_exports)}
                 tone="muted"
-              /> */}
+              />
               <StatRow
                 theme={props.theme}
                 label="Duplicates"