@cortexkit/aft-opencode 0.13.0 → 0.14.0

package/dist/index.js

@@ -22233,12 +22233,14 @@ function clampSemanticTimeout(configOverrides, bridgeTimeoutMs) {
 
 class BinaryBridge {
   static RESTART_RESET_MS = 5 * 60 * 1000;
+  static STDERR_TAIL_MAX = 20;
   binaryPath;
   cwd;
   process = null;
   pending = new Map;
   nextId = 1;
   stdoutBuffer = "";
+  stderrTail = [];
   _restartCount = 0;
   _shuttingDown = false;
   timeoutMs;
@@ -22405,22 +22407,48 @@ class BinaryBridge {
       const lines = chunk.toString("utf-8").trimEnd().split(`
 `);
       for (const line of lines) {
+        if (!line)
+          continue;
         const stripped = line.replace(/^\[aft\]\s*/, "");
         log(`[aft] ${stripped}`);
+        this.pushStderrLine(stripped);
       }
     });
     child.on("error", (err) => {
-      error48(`Process error: ${err.message}`);
+      error48(`Process error: ${err.message}${this.formatStderrTail()}`);
       this.handleCrash();
     });
     child.on("exit", (code, signal) => {
       if (this._shuttingDown)
         return;
       log(`Process exited: code=${code}, signal=${signal}`);
+      if (signal === "SIGTERM" || signal === "SIGKILL" || signal === "SIGHUP" || signal === "SIGINT") {
+        this.process = null;
+        this.configured = false;
+        this.clearRestartResetTimer();
+        this.rejectAllPending(new Error(`[aft-plugin] Binary killed by ${signal}`));
+        return;
+      }
       this.handleCrash();
     });
     this.process = child;
     this.stdoutBuffer = "";
+    this.stderrTail = [];
+  }
+  pushStderrLine(line) {
+    this.stderrTail.push(line);
+    if (this.stderrTail.length > BinaryBridge.STDERR_TAIL_MAX) {
+      this.stderrTail.shift();
+    }
+  }
+  formatStderrTail() {
+    if (this.stderrTail.length === 0)
+      return "";
+    const tail = this.stderrTail.join(`
+  `);
+    return `
+  --- last ${this.stderrTail.length} stderr lines ---
+  ${tail}`;
   }
   onStdoutData(data) {
     this.stdoutBuffer += data;
@@ -22455,13 +22483,16 @@ class BinaryBridge {
     }
     this.clearRestartResetTimer();
     this.configured = false;
-    this.rejectAllPending(new Error("[aft-plugin] Bridge restarted after timeout"));
+    const tail = this.formatStderrTail();
+    this.stderrTail = [];
+    this.rejectAllPending(new Error(`[aft-plugin] Bridge restarted after timeout${tail}`));
   }
   handleCrash() {
     this.process = null;
     this.clearRestartResetTimer();
     this.configured = false;
-    this.rejectAllPending(new Error(`[aft-plugin] Binary crashed (restarts: ${this._restartCount})`));
+    const tail = this.formatStderrTail();
+    this.rejectAllPending(new Error(`[aft-plugin] Binary crashed (restarts: ${this._restartCount})${tail}`));
     if (this._restartCount < this.maxRestarts) {
       const delay = 100 * 2 ** this._restartCount;
       this._restartCount++;
@@ -22476,7 +22507,7 @@ class BinaryBridge {
         }
       }, delay);
     } else {
-      error48(`Max restarts (${this.maxRestarts}) reached, giving up. Logs: ${getLogFilePath()}`);
+      error48(`Max restarts (${this.maxRestarts}) reached, giving up. Logs: ${getLogFilePath()}${tail}`);
     }
   }
   rejectAllPending(error49) {
@@ -22530,8 +22561,14 @@ class BridgePool {
       this.cleanupTimer.unref();
     }
   }
-  getAnyActiveBridge(_directory) {
-    for (const [, entry] of this.bridges) {
+  getAnyActiveBridge(projectRoot) {
+    const key = normalizeKey(projectRoot);
+    const preferred = this.bridges.get(key);
+    if (preferred?.bridge.isAlive()) {
+      preferred.lastUsed = Date.now();
+      return preferred.bridge;
+    }
+    for (const entry of this.bridges.values()) {
       if (entry.bridge.isAlive()) {
         entry.lastUsed = Date.now();
         return entry.bridge;
@@ -22539,8 +22576,8 @@ class BridgePool {
     }
     return null;
   }
-  getBridge(directory, sessionID) {
-    const key = sessionID || directory.replace(/\/+$/, "");
+  getBridge(projectRoot) {
+    const key = normalizeKey(projectRoot);
     const existing = this.bridges.get(key);
     if (existing) {
       existing.lastUsed = Date.now();
@@ -22549,8 +22586,7 @@ class BridgePool {
     if (this.bridges.size >= this.maxPoolSize) {
       this.evictLRU();
     }
-    const normalized = directory.replace(/\/+$/, "");
-    const bridge = new BinaryBridge(this.binaryPath, normalized, this.bridgeOptions, this.configOverrides);
+    const bridge = new BinaryBridge(this.binaryPath, key, this.bridgeOptions, this.configOverrides);
     this.bridges.set(key, { bridge, lastUsed: Date.now() });
     return bridge;
   }
@@ -22601,6 +22637,9 @@ class BridgePool {
     return this.bridges.size;
   }
 }
+function normalizeKey(projectRoot) {
+  return projectRoot.replace(/[/\\]+$/, "");
+}
 
 // src/resolver.ts
 import { execSync, spawnSync } from "child_process";
@@ -22902,6 +22941,7 @@ function coerceAftStatus(response) {
   };
   const disk = asRecord(response.disk);
   const symbolCache = asRecord(response.symbol_cache);
+  const session = asRecord(response.session);
   return {
     version: readString(response.version, "unknown"),
     project_root: readNullableString(response.project_root),
@@ -22939,7 +22979,13 @@ function coerceAftStatus(response) {
       local_entries: readNumber(symbolCache.local_entries),
       warm_entries: readNumber(symbolCache.warm_entries)
     },
-    storage_dir: readNullableString(response.storage_dir)
+    storage_dir: readNullableString(response.storage_dir),
+    checkpoints_total: readNumber(response.checkpoints_total),
+    session: {
+      id: readString(session.id, "__default__"),
+      tracked_files: readNumber(session.tracked_files),
+      checkpoints: readNumber(session.checkpoints)
+    }
   };
 }
 function formatStatusMarkdown(status) {
@@ -22988,6 +23034,7 @@ function formatStatusMarkdown(status) {
   if (status.storage_dir ?? status.disk.storage_dir) {
     lines.push(`- **Storage dir:** \`${status.storage_dir ?? status.disk.storage_dir}\``);
   }
+  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(`
 `);
 }
@@ -23232,16 +23279,91 @@ function cleanupUrlCache(storageDir) {
   }
 }
 
+// src/shutdown-hooks.ts
+var GLOBAL_KEY2 = "__aftShutdownHooks__";
+function getState() {
+  const g = globalThis;
+  if (!g[GLOBAL_KEY2]) {
+    g[GLOBAL_KEY2] = { cleanups: new Set, installed: false };
+  }
+  return g[GLOBAL_KEY2];
+}
+var shuttingDown = false;
+async function runCleanups(reason) {
+  if (shuttingDown)
+    return;
+  shuttingDown = true;
+  const state = getState();
+  if (state.cleanups.size === 0)
+    return;
+  log(`Shutdown triggered by ${reason} \u2014 running ${state.cleanups.size} cleanup(s)`);
+  const cleanups = Array.from(state.cleanups);
+  state.cleanups.clear();
+  await Promise.allSettled(cleanups.map(async (fn) => {
+    try {
+      await fn();
+    } catch (err) {
+      log(`Cleanup error: ${err.message}`);
+    }
+  }));
+}
+function installProcessHandlers() {
+  const state = getState();
+  if (state.installed)
+    return;
+  state.installed = true;
+  const signals = ["SIGTERM", "SIGINT", "SIGHUP"];
+  for (const sig of signals) {
+    process.on(sig, () => {
+      runCleanups(sig);
+    });
+  }
+  process.on("beforeExit", () => {
+    runCleanups("beforeExit");
+  });
+}
+function registerShutdownCleanup(fn) {
+  installProcessHandlers();
+  const state = getState();
+  state.cleanups.add(fn);
+  return () => {
+    state.cleanups.delete(fn);
+  };
+}
+
 // src/tools/ast.ts
 import { tool as tool2 } from "@opencode-ai/plugin";
 
-// src/tools/permissions.ts
+// src/tools/_shared.ts
+import * as fs2 from "fs";
 import * as path2 from "path";
+function projectRootFor(runtime) {
+  const raw = runtime.worktree ?? runtime.directory;
+  const trimmed = raw.replace(/[/\\]+$/, "");
+  try {
+    return fs2.realpathSync(trimmed);
+  } catch {
+    return path2.resolve(trimmed);
+  }
+}
+function bridgeFor(ctx, runtime) {
+  return ctx.pool.getBridge(projectRootFor(runtime));
+}
+function callBridge(ctx, runtime, command, params = {}) {
+  const merged = { ...params };
+  if (runtime.sessionID) {
+    merged.session_id = runtime.sessionID;
+  }
+  return bridgeFor(ctx, runtime).send(command, merged);
+}
+
+// src/tools/permissions.ts
+import * as path3 from "path";
 function resolveAbsolutePath(context, target) {
-  return path2.isAbsolute(target) ? target : path2.resolve(context.directory, target);
+  return path3.isAbsolute(target) ? target : path3.resolve(context.directory, target);
 }
 function resolveRelativePattern(context, target) {
-  return path2.relative(context.worktree, resolveAbsolutePath(context, target)) || ".";
+  return path3.relative(context.worktree, resolveAbsolutePath(context, target)) || ".";
 }
 function resolveRelativePatterns(context, targets) {
   const seen = new Set;
@@ -23329,7 +23451,6 @@ function astTools(ctx) {
       contextLines: z2.number().optional().describe("Number of context lines to show around each match")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
       const params = {
         pattern: args.pattern,
         lang: args.lang
@@ -23340,7 +23461,7 @@ function astTools(ctx) {
         params.globs = args.globs;
       if (args.contextLines !== undefined)
         params.context = Number(args.contextLines);
-      const response = await bridge.send("ast_search", params);
+      const response = await callBridge(ctx, context, "ast_search", params);
       if (response.success === false) {
         throw new Error(response.message || "ast_search failed");
       }
@@ -23406,7 +23527,6 @@ ${hint}`;
       dryRun: z2.boolean().optional().describe("Preview changes without applying (default: false)")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
       const isDryRun = args.dryRun === true;
       if (!isDryRun) {
         const explicitPaths = Array.isArray(args.paths) ? resolveRelativePatterns(context, args.paths) : [];
@@ -23430,7 +23550,7 @@ ${hint}`;
       if (args.globs)
         params.globs = args.globs;
       params.dry_run = args.dryRun === true;
-      const response = await bridge.send("ast_replace", params);
+      const response = await callBridge(ctx, context, "ast_replace", params);
       if (response.success === false) {
         throw new Error(response.message || "ast_replace failed");
       }
@@ -23482,8 +23602,7 @@ function conflictTools(ctx) {
       description: "Show all git merge conflicts across the repository \u2014 returns line-numbered conflict regions with context for every conflicted file in a single call.",
       args: {},
       execute: async (_args, context) => {
-        const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
-        const response = await bridge.send("git_conflicts", {});
+        const response = await callBridge(ctx, context, "git_conflicts", {});
         if (response.success === false) {
           throw new Error(response.message || "git_conflicts failed");
         }
@@ -23494,8 +23613,8 @@ function conflictTools(ctx) {
 }
 
 // src/tools/hoisted.ts
-import * as fs2 from "fs";
-import * as path3 from "path";
+import * as fs3 from "fs";
+import * as path4 from "path";
 import { tool as tool3 } from "@opencode-ai/plugin";
 
 // src/patch-parser.ts
@@ -23732,7 +23851,7 @@ function getCallID(ctx) {
   return c.callID ?? c.callId ?? c.call_id;
 }
 function relativeToWorktree(fp, worktree) {
-  return path3.relative(worktree, fp);
+  return path4.relative(worktree, fp);
 }
 function buildUnifiedDiff(fp, before, after) {
   const SIZE_CAP = 100 * 1024;
@@ -23814,16 +23933,15 @@ function createReadTool(ctx) {
       offset: z3.number().optional().describe("1-based line number to start reading from (use with limit). Ignored if startLine is provided")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
       const file2 = args.filePath;
-      const filePath = path3.isAbsolute(file2) ? file2 : path3.resolve(context.directory, file2);
+      const filePath = path4.isAbsolute(file2) ? file2 : path4.resolve(context.directory, file2);
       await context.ask({
         permission: "read",
         patterns: [filePath],
         always: ["*"],
         metadata: {}
       });
-      const ext = path3.extname(filePath).toLowerCase();
+      const ext = path4.extname(filePath).toLowerCase();
       const mimeMap = {
         ".png": "image/png",
         ".jpg": "image/jpeg",
@@ -23845,7 +23963,7 @@ function createReadTool(ctx) {
         const label = isImage ? "Image" : "PDF";
         let fileSize = 0;
         try {
-          const stat = await import("fs/promises").then((fs3) => fs3.stat(filePath));
+          const stat = await import("fs/promises").then((fs4) => fs4.stat(filePath));
           fileSize = stat.size;
         } catch {}
         const sizeStr = fileSize > 1048576 ? `${(fileSize / 1048576).toFixed(1)}MB` : fileSize > 1024 ? `${(fileSize / 1024).toFixed(0)}KB` : `${fileSize} bytes`;
@@ -23853,7 +23971,7 @@ function createReadTool(ctx) {
         const imgCallID = getCallID(context);
         if (imgCallID) {
           storeToolMetadata(context.sessionID, imgCallID, {
-            title: path3.relative(context.worktree, filePath),
+            title: path4.relative(context.worktree, filePath),
             metadata: {
               preview: msg,
               filepath: filePath,
@@ -23879,7 +23997,7 @@ function createReadTool(ctx) {
         params.end_line = endLine;
       if (args.limit !== undefined && args.offset === undefined)
         params.limit = args.limit;
-      const data = await bridge.send("read", params);
+      const data = await callBridge(ctx, context, "read", params);
       if (data.success === false) {
         throw new Error(data.message || "read failed");
       }
@@ -23937,18 +24055,17 @@ function createWriteTool(ctx, editToolName = "edit") {
       content: z3.string().describe("The full content to write to the file")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
       const file2 = args.filePath;
       const content = args.content;
-      const filePath = path3.isAbsolute(file2) ? file2 : path3.resolve(context.directory, file2);
-      const relPath = path3.relative(context.worktree, filePath);
+      const filePath = path4.isAbsolute(file2) ? file2 : path4.resolve(context.directory, file2);
+      const relPath = path4.relative(context.worktree, filePath);
       await context.ask({
         permission: "edit",
         patterns: [relPath],
         always: ["*"],
         metadata: { filepath: filePath }
       });
-      const data = await bridge.send("write", {
+      const data = await callBridge(ctx, context, "write", {
         file: filePath,
         content,
         create_dirs: true,
@@ -24068,30 +24185,29 @@ function createEditTool(ctx, writeToolName = "write") {
       dryRun: z3.boolean().optional().describe("Preview changes without applying (returns diff, default: false)")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
       if (Array.isArray(args.operations)) {
         const ops = args.operations;
         const files = ops.map((op) => op.file).filter(Boolean);
         await context.ask({
           permission: "edit",
-          patterns: files.map((f) => path3.relative(context.worktree, path3.resolve(context.directory, f))),
+          patterns: files.map((f) => path4.relative(context.worktree, path4.resolve(context.directory, f))),
           always: ["*"],
           metadata: {}
         });
         const resolvedOps = ops.map((op) => ({
           ...op,
-          file: path3.isAbsolute(op.file) ? op.file : path3.resolve(context.directory, op.file)
+          file: path4.isAbsolute(op.file) ? op.file : path4.resolve(context.directory, op.file)
         }));
         const params2 = { operations: resolvedOps };
         params2.dry_run = args.dryRun === true;
-        const data2 = await bridge.send("transaction", params2);
+        const data2 = await callBridge(ctx, context, "transaction", params2);
         return JSON.stringify(data2);
       }
       const file2 = args.filePath;
       if (!file2)
         throw new Error("'filePath' parameter is required");
-      const filePath = path3.isAbsolute(file2) ? file2 : path3.resolve(context.directory, file2);
-      const relPath = path3.relative(context.worktree, filePath);
+      const filePath = path4.isAbsolute(file2) ? file2 : path4.resolve(context.directory, file2);
+      const relPath = path4.relative(context.worktree, filePath);
       await context.ask({
         permission: "edit",
         patterns: [relPath],
@@ -24144,7 +24260,7 @@ function createEditTool(ctx, writeToolName = "write") {
         params.diagnostics = true;
       if (!args.dryRun)
         params.include_diff = true;
-      const data = await bridge.send(command, params);
+      const data = await callBridge(ctx, context, command, params);
       if (!args.dryRun && data.success && data.diff) {
         const diff = data.diff;
         const callID = getCallID(context);
@@ -24237,7 +24353,6 @@ function createApplyPatchTool(ctx) {
       patchText: z3.string().describe("The full patch text including Begin/End markers")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
       const patchText = args.patchText;
       if (!patchText)
         throw new Error("'patchText' is required");
@@ -24250,7 +24365,7 @@ function createApplyPatchTool(ctx) {
       if (hunks.length === 0) {
         throw new Error("Empty patch: no file operations found");
       }
-      const allPaths = hunks.map((h) => path3.relative(context.worktree, path3.resolve(context.directory, h.path)));
+      const allPaths = hunks.map((h) => path4.relative(context.worktree, path4.resolve(context.directory, h.path)));
       await context.ask({
         permission: "edit",
         patterns: allPaths,
@@ -24260,9 +24375,9 @@ function createApplyPatchTool(ctx) {
       const checkpointName = `apply_patch_${Date.now()}`;
       let checkpointCreated = false;
       try {
-        await bridge.send("checkpoint", {
+        await callBridge(ctx, context, "checkpoint", {
           name: checkpointName,
-          files: allPaths.map((p) => path3.resolve(context.directory, p))
+          files: allPaths.map((p) => path4.resolve(context.directory, p))
         });
         checkpointCreated = true;
       } catch {}
@@ -24270,11 +24385,11 @@ function createApplyPatchTool(ctx) {
       const perFileDiffs = [];
       let patchFailed = false;
       for (const hunk of hunks) {
-        const filePath = path3.resolve(context.directory, hunk.path);
+        const filePath = path4.resolve(context.directory, hunk.path);
         switch (hunk.type) {
           case "add": {
             try {
-              await bridge.send("write", {
+              await callBridge(ctx, context, "write", {
                 file: filePath,
                 content: hunk.contents.endsWith(`
 `) ? hunk.contents : `${hunk.contents}
@@ -24292,8 +24407,8 @@ function createApplyPatchTool(ctx) {
           }
           case "delete": {
             try {
-              const before = await fs2.promises.readFile(filePath, "utf-8").catch(() => "");
-              await bridge.send("delete_file", { file: filePath });
+              const before = await fs3.promises.readFile(filePath, "utf-8").catch(() => "");
+              await callBridge(ctx, context, "delete_file", { file: filePath });
               perFileDiffs.push({ filePath, before, after: "" });
               results.push(`Deleted ${hunk.path}`);
             } catch (e) {
@@ -24304,10 +24419,10 @@ function createApplyPatchTool(ctx) {
           }
           case "update": {
             try {
-              const original = await fs2.promises.readFile(filePath, "utf-8");
+              const original = await fs3.promises.readFile(filePath, "utf-8");
               const newContent = applyUpdateChunks(original, filePath, hunk.chunks);
-              const targetPath = hunk.move_path ? path3.resolve(context.directory, hunk.move_path) : filePath;
-              const writeResult = await bridge.send("write", {
+              const targetPath = hunk.move_path ? path4.resolve(context.directory, hunk.move_path) : filePath;
+              const writeResult = await callBridge(ctx, context, "write", {
                 file: targetPath,
                 content: newContent,
                 create_dirs: true,
@@ -24317,7 +24432,7 @@ function createApplyPatchTool(ctx) {
               if (diags && diags.length > 0) {
                 const errors3 = diags.filter((d) => d.severity === "error");
                 if (errors3.length > 0) {
-                  const relPath = path3.relative(context.worktree, targetPath);
+                  const relPath = path4.relative(context.worktree, targetPath);
                   const diagLines = errors3.map((d) => `  Line ${d.line}: ${d.message}`).join(`
 `);
                   results.push(`
@@ -24327,7 +24442,7 @@ ${diagLines}`);
               }
               perFileDiffs.push({ filePath, before: original, after: newContent });
               if (hunk.move_path) {
-                await bridge.send("delete_file", { file: filePath });
+                await callBridge(ctx, context, "delete_file", { file: filePath });
                 results.push(`Updated and moved ${hunk.path} \u2192 ${hunk.move_path}`);
               } else {
                 results.push(`Updated ${hunk.path}`);
@@ -24344,7 +24459,7 @@ ${diagLines}`);
       if (patchFailed) {
         if (checkpointCreated) {
           try {
-            await bridge.send("restore_checkpoint", { name: checkpointName });
+            await callBridge(ctx, context, "restore_checkpoint", { name: checkpointName });
             results.push("Patch failed \u2014 restored files to pre-patch state.");
           } catch {
             results.push("Patch failed \u2014 checkpoint restore also failed, files may be inconsistent.");
@@ -24358,9 +24473,9 @@ ${diagLines}`);
       const callID = getCallID(context);
       if (callID) {
         const files = hunks.map((h) => {
-          const relPath = path3.relative(context.worktree, path3.resolve(context.directory, h.path));
+          const relPath = path4.relative(context.worktree, path4.resolve(context.directory, h.path));
           return {
-            filePath: path3.resolve(context.directory, h.path),
+            filePath: path4.resolve(context.directory, h.path),
             relativePath: relPath,
             type: h.type
           };
@@ -24397,15 +24512,14 @@ function createDeleteTool(ctx) {
       filePath: z3.string().describe("Path to file to delete")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
-      const filePath = path3.isAbsolute(args.filePath) ? args.filePath : path3.resolve(context.directory, args.filePath);
+      const filePath = path4.isAbsolute(args.filePath) ? args.filePath : path4.resolve(context.directory, args.filePath);
       await context.ask({
         permission: "edit",
         patterns: [filePath],
         always: ["*"],
         metadata: { action: "delete" }
       });
-      const result = await bridge.send("delete_file", { file: filePath });
+      const result = await callBridge(ctx, context, "delete_file", { file: filePath });
       if (result.success === false) {
         throw new Error(result.message || "delete failed");
       }
@@ -24423,16 +24537,15 @@ function createMoveTool(ctx) {
       destination: z3.string().describe("Destination file path")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
-      const filePath = path3.isAbsolute(args.filePath) ? args.filePath : path3.resolve(context.directory, args.filePath);
-      const destPath = path3.isAbsolute(args.destination) ? args.destination : path3.resolve(context.directory, args.destination);
+      const filePath = path4.isAbsolute(args.filePath) ? args.filePath : path4.resolve(context.directory, args.filePath);
+      const destPath = path4.isAbsolute(args.destination) ? args.destination : path4.resolve(context.directory, args.destination);
       await context.ask({
         permission: "edit",
         patterns: [filePath, destPath],
         always: ["*"],
         metadata: { action: "move" }
       });
-      const result = await bridge.send("move_file", {
+      const result = await callBridge(ctx, context, "move_file", {
         file: filePath,
         destination: destPath
       });
@@ -24502,7 +24615,6 @@ function importTools(ctx) {
         dryRun: z4.boolean().optional().describe("Preview without modifying the file (default: false)")
       },
       execute: async (args, context) => {
-        const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
         const op = args.op;
         const isDryRun = args.dryRun === true;
         if ((op === "add" || op === "remove") && typeof args.module !== "string") {
@@ -24534,7 +24646,7 @@ function importTools(ctx) {
           params.validate = args.validate;
         if (args.dryRun !== undefined)
           params.dry_run = args.dryRun;
-        const response = await bridge.send(commandMap[op], params);
+        const response = await callBridge(ctx, context, commandMap[op], params);
         if (response.success === false) {
           throw new Error(response.message || `${op} failed`);
         }
@@ -24557,7 +24669,6 @@ function lspTools(ctx) {
       waitMs: z5.number().optional().describe("Wait N ms for fresh diagnostics before returning (max 10000, default: 0). Use after edits to let the server re-analyze.")
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
       const filePath = args.filePath || undefined;
       const directory = args.directory || undefined;
       if (filePath !== undefined && directory !== undefined) {
@@ -24572,7 +24683,7 @@ function lspTools(ctx) {
         params.severity = args.severity;
       if (args.waitMs !== undefined)
         params.wait_ms = args.waitMs;
-      const result = await bridge.send("lsp_diagnostics", params);
+      const result = await callBridge(ctx, context, "lsp_diagnostics", params);
       if (result.success === false) {
         throw new Error(result.message || "lsp_diagnostics failed");
       }
@@ -24611,7 +24722,6 @@ function navigationTools(ctx) {
         expression: z6.string().optional().describe("Expression to track through data flow (required for trace_data op)")
       },
       execute: async (args, context) => {
-        const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
         const params = {
           file: args.filePath,
           symbol: args.symbol
@@ -24623,7 +24733,7 @@ function navigationTools(ctx) {
         if (args.op === "trace_data" && typeof args.expression !== "string") {
           throw new Error("'expression' is required for 'trace_data' op");
         }
-        const response = await bridge.send(args.op, params);
+        const response = await callBridge(ctx, context, args.op, params);
         if (response.success === false) {
           throw new Error(response.message || `${args.op} failed`);
         }
@@ -24635,7 +24745,7 @@ function navigationTools(ctx) {
 
 // src/tools/reading.ts
 import { readdir } from "fs/promises";
-import { extname as extname2, join as join12, resolve as resolve4 } from "path";
+import { extname as extname2, join as join12, resolve as resolve5 } from "path";
 import { tool as tool7 } from "@opencode-ai/plugin";
 var OUTLINE_EXTENSIONS = new Set([
   ".ts",
@@ -24687,7 +24797,6 @@ function readingTools(ctx) {
         url: z7.string().optional().describe("HTTP/HTTPS URL of an HTML or Markdown document to fetch and outline")
       },
       execute: async (args, context) => {
-        const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
         const filesArg = Array.isArray(args.files) ? args.files : undefined;
         const hasFilePath = typeof args.filePath === "string" && args.filePath.length > 0;
         const hasFiles = (filesArg?.length ?? 0) > 0;
@@ -24702,7 +24811,7 @@ function readingTools(ctx) {
         }
         if (hasUrl) {
           const cachedPath = await fetchUrlToTempFile(args.url, ctx.storageDir);
-          const response2 = await bridge.send("outline", { file: cachedPath });
+          const response2 = await callBridge(ctx, context, "outline", { file: cachedPath });
           if (response2.success === false) {
             throw new Error(response2.message || "outline failed");
           }
@@ -24712,7 +24821,7 @@ function readingTools(ctx) {
         if (!dirArg && typeof args.filePath === "string" && !Array.isArray(args.files)) {
           try {
             const { stat } = await import("fs/promises");
-            const resolved = resolve4(context.directory, args.filePath);
+            const resolved = resolve5(context.directory, args.filePath);
             const st = await stat(resolved);
             if (st.isDirectory()) {
               dirArg = args.filePath;
@@ -24720,7 +24829,7 @@ function readingTools(ctx) {
           } catch {}
         }
         if (dirArg) {
-          const dirPath = resolve4(context.directory, dirArg);
+          const dirPath = resolve5(context.directory, dirArg);
           const files = await discoverSourceFiles(dirPath);
           if (files.length === 0) {
             return JSON.stringify({
@@ -24728,20 +24837,20 @@ function readingTools(ctx) {
               message: `No source files found under ${dirArg}`
             });
           }
-          const response2 = await bridge.send("outline", { files });
+          const response2 = await callBridge(ctx, context, "outline", { files });
           if (response2.success === false) {
             throw new Error(response2.message || "outline failed");
           }
           return response2.text;
         }
         if (Array.isArray(args.files) && args.files.length > 0) {
-          const response2 = await bridge.send("outline", { files: args.files });
+          const response2 = await callBridge(ctx, context, "outline", { files: args.files });
           if (response2.success === false) {
             throw new Error(response2.message || "outline failed");
           }
           return response2.text;
         }
-        const response = await bridge.send("outline", { file: args.filePath });
+        const response = await callBridge(ctx, context, "outline", { file: args.filePath });
         if (response.success === false) {
           throw new Error(response.message || "outline failed");
         }
@@ -24760,7 +24869,6 @@ Provide exactly ONE of 'filePath' or 'url'. Pass either 'symbol' for a single lo
         contextLines: z7.number().optional().describe("Lines of context before/after the symbol (default: 3)")
       },
       execute: async (args, context) => {
-        const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
         const hasFilePath = typeof args.filePath === "string" && args.filePath.length > 0;
         const hasUrl = typeof args.url === "string" && args.url.length > 0;
         if (!hasFilePath && !hasUrl) {
@@ -24775,7 +24883,7 @@ Provide exactly ONE of 'filePath' or 'url'. Pass either 'symbol' for a single lo
             const params2 = { file: file2, symbol: sym };
             if (args.contextLines !== undefined)
               params2.context_lines = args.contextLines;
-            return bridge.send("zoom", params2);
+            return callBridge(ctx, context, "zoom", params2);
           }));
           return JSON.stringify(results);
         }
@@ -24784,7 +24892,7 @@ Provide exactly ONE of 'filePath' or 'url'. Pass either 'symbol' for a single lo
           params.symbol = args.symbol;
         if (args.contextLines !== undefined)
           params.context_lines = args.contextLines;
-        const data = await bridge.send("zoom", params);
+        const data = await callBridge(ctx, context, "zoom", params);
         if (data.success === false) {
           throw new Error(data.message || "zoom failed");
         }
@@ -24932,7 +25040,6 @@ function refactoringTools(ctx) {
         dryRun: z8.boolean().optional().describe("Preview changes as diff without modifying files (default: false)")
       },
       execute: async (args, context) => {
-        const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
         const op = args.op;
         if ((op === "move" || op === "inline") && typeof args.symbol !== "string") {
           throw new Error(`'symbol' is required for '${op}' op`);
@@ -24989,7 +25096,7 @@ function refactoringTools(ctx) {
         const hints = await queryLspHints(ctx.client, args.symbol ?? args.name);
         if (hints)
           params.lsp_hints = hints;
-        const response = await bridge.send(commandMap[op], params);
+        const response = await callBridge(ctx, context, commandMap[op], params);
         if (response.success === false) {
           throw new Error(response.message || `${op} failed`);
         }
@@ -25028,7 +25135,6 @@ function safetyTools(ctx) {
         files: z9.array(z9.string()).optional().describe("Specific files to include in checkpoint (optional, defaults to all tracked files)")
       },
       execute: async (args, context) => {
-        const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
         const op = args.op;
         if ((op === "undo" || op === "history") && typeof args.filePath !== "string") {
           throw new Error(`'filePath' is required for '${op}' op`);
@@ -25063,7 +25169,7 @@ function safetyTools(ctx) {
           params.name = args.name;
         if (args.files !== undefined)
           params.files = args.files;
-        const response = await bridge.send(commandMap[op], params);
+        const response = await callBridge(ctx, context, commandMap[op], params);
         if (response.success === false) {
           throw new Error(response.message || `${op} failed`);
         }
@@ -25113,8 +25219,7 @@ function searchTools(ctx) {
       path: arg(exports_external.string().optional().describe("Directory to search in, relative to project root"))
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
-      const response = await bridge.send("grep", {
+      const response = await callBridge(ctx, context, "grep", {
         pattern: args.pattern,
         case_sensitive: true,
         include: args.include ? String(args.include).split(",").map((s) => normalizeGlob(s.trim())).filter(Boolean) : undefined,
@@ -25134,7 +25239,6 @@ function searchTools(ctx) {
       path: arg(exports_external.string().optional().describe("Directory to search in, relative to project root"))
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
       let globPattern = String(args.pattern);
       let globPath = args.path ? String(args.path) : undefined;
       if (!globPath && globPattern.startsWith("/")) {
@@ -25147,7 +25251,7 @@ function searchTools(ctx) {
           }
         }
       }
-      const response = await bridge.send("glob", {
+      const response = await callBridge(ctx, context, "glob", {
         pattern: globPattern,
         path: globPath
       });
@@ -25183,8 +25287,7 @@ function semanticTools(ctx) {
       topK: arg2(exports_external.number().optional().describe("Number of results (default: 10)"))
     },
     execute: async (args, context) => {
-      const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
-      const response = await bridge.send("semantic_search", {
+      const response = await callBridge(ctx, context, "semantic_search", {
         query: args.query,
         top_k: args.topK ?? 10
       });
@@ -25248,7 +25351,6 @@ function structureTools(ctx) {
         dryRun: z10.boolean().optional().describe("Preview without modifying the file (default: false)")
       },
       execute: async (args, context) => {
-        const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
         const op = args.op;
         if (op === "add_member") {
           if (typeof args.container !== "string")
@@ -25312,7 +25414,7 @@ function structureTools(ctx) {
             params.value = args.value;
             break;
         }
-        const response = await bridge.send(op, params);
+        const response = await callBridge(ctx, context, op, params);
         if (response.success === false) {
           throw new Error(response.message || `${op} failed`);
         }
@@ -25358,6 +25460,8 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
+var ANNOUNCEMENT_VERSION = "";
+var ANNOUNCEMENT_FEATURES = [];
 var plugin = async (input) => {
   const binaryPath = await findBinary();
   const aftConfig = loadAftConfig(input.directory);
@@ -25401,10 +25505,10 @@ var plugin = async (input) => {
       }
       versionUpgradeAttempted = binaryVersion;
       warn(`WARNING: aft binary v${binaryVersion} is older than plugin v${minVersion}. ` + "Some features may not work. Attempting to download a compatible binary...");
-      ensureBinary(`v${minVersion}`).then((path4) => {
-        if (path4) {
-          log(`Found/downloaded compatible binary at ${path4}. Replacing running bridges...`);
-          pool.replaceBinary(path4).then(() => {
+      ensureBinary(`v${minVersion}`).then((path5) => {
+        if (path5) {
+          log(`Found/downloaded compatible binary at ${path5}. Replacing running bridges...`);
+          pool.replaceBinary(path5).then(() => {
             log("Binary replaced successfully. New bridges will use the updated binary.");
           }, (err) => error48("Failed to replace binary:", err));
         } else {
@@ -25423,36 +25527,39 @@ var plugin = async (input) => {
   };
   setSharedBridgePool(pool);
   const rpcServer = new AftRpcServer(configOverrides.storage_dir, input.directory);
+  const unregisterShutdown = registerShutdownCleanup(async () => {
+    try {
+      rpcServer.stop();
+    } catch {}
+    await pool.shutdown();
+  });
   rpcServer.handle("status", async (params) => {
     const sessionID = params.sessionID || "rpc";
-    const bridge = pool.getAnyActiveBridge(input.directory) ?? pool.getBridge(input.directory, sessionID);
-    return await bridge.send("status", {});
+    const bridge = pool.getAnyActiveBridge(input.directory) ?? pool.getBridge(input.directory);
+    return await bridge.send("status", { session_id: sessionID });
   });
   const storageDir = configOverrides.storage_dir;
-  const featureList = [
-    "Semantic code search (`aft_search`) \u2014 enable with `experimental_semantic_search: true` in aft.jsonc",
-    "/aft-status command \u2014 live index health, disk usage, and runtime details",
-    "HTML outline and zoom \u2014 heading hierarchy for .html/.htm files",
-    "And many bugfixes"
-  ];
   rpcServer.handle("get-announcement", async () => {
+    if (!ANNOUNCEMENT_VERSION || ANNOUNCEMENT_FEATURES.length === 0) {
+      return { show: false };
+    }
     if (storageDir) {
       const versionFile = join13(storageDir, "last_announced_version");
       try {
         if (existsSync8(versionFile)) {
           const lastVersion = readFileSync5(versionFile, "utf-8").trim();
-          if (lastVersion === PLUGIN_VERSION)
+          if (lastVersion === ANNOUNCEMENT_VERSION)
             return { show: false };
         }
       } catch {}
     }
-    return { show: true, version: PLUGIN_VERSION, features: featureList };
+    return { show: true, version: ANNOUNCEMENT_VERSION, features: ANNOUNCEMENT_FEATURES };
   });
   rpcServer.handle("mark-announced", async () => {
-    if (storageDir) {
+    if (storageDir && ANNOUNCEMENT_VERSION) {
       try {
         mkdirSync8(storageDir, { recursive: true });
-        writeFileSync5(join13(storageDir, "last_announced_version"), PLUGIN_VERSION);
+        writeFileSync5(join13(storageDir, "last_announced_version"), ANNOUNCEMENT_VERSION);
       } catch {}
     }
     return { success: true };
@@ -25478,9 +25585,11 @@ Install: ${getManualInstallHint()}`);
     client: input.client,
     directory: input.directory
   };
-  setTimeout(() => {
-    sendFeatureAnnouncement(notifyOpts, PLUGIN_VERSION, featureList, storageDir).catch(() => {});
-  }, 8000);
+  if (ANNOUNCEMENT_VERSION && ANNOUNCEMENT_FEATURES.length > 0) {
+    setTimeout(() => {
+      sendFeatureAnnouncement(notifyOpts, ANNOUNCEMENT_VERSION, ANNOUNCEMENT_FEATURES, storageDir).catch(() => {});
+    }, 8000);
+  }
   if (aftConfig.experimental_semantic_search && isFastembedSemanticBackend && !configOverrides._ort_dylib_dir) {
     setTimeout(() => {
       if (!configOverrides._ort_dylib_dir && !isOrtAutoDownloadSupported()) {
@@ -25537,8 +25646,8 @@ Install: ${getManualInstallHint()}`).catch(() => {});
       if (isTuiMode2() || commandInput.command !== STATUS_COMMAND) {
         return;
       }
-      const bridge = ctx.pool.getAnyActiveBridge(input.directory) ?? ctx.pool.getBridge(input.directory, commandInput.sessionID);
-      const response = await bridge.send("status", {});
+      const bridge = ctx.pool.getAnyActiveBridge(input.directory) ?? ctx.pool.getBridge(input.directory);
+      const response = await bridge.send("status", { session_id: commandInput.sessionID });
       if (response.success === false) {
         throw new Error(response.message || "status failed");
       }
@@ -25581,6 +25690,7 @@ Install: ${getManualInstallHint()}`).catch(() => {});
       };
     },
     dispose: () => {
+      unregisterShutdown();
       rpcServer.stop();
       clearSharedBridgePool();
       return pool.shutdown();