@cortexkit/aft-opencode 0.17.3 → 0.18.0

package/dist/index.js

@@ -4583,45 +4583,45 @@ var require_esprima = __commonJS((exports, module) => {
             this.errors = [];
             this.tolerant = false;
           }
-          ErrorHandler2.prototype.recordError = function(error) {
-            this.errors.push(error);
+          ErrorHandler2.prototype.recordError = function(error2) {
+            this.errors.push(error2);
           };
-          ErrorHandler2.prototype.tolerate = function(error) {
+          ErrorHandler2.prototype.tolerate = function(error2) {
             if (this.tolerant) {
-              this.recordError(error);
+              this.recordError(error2);
             } else {
-              throw error;
+              throw error2;
             }
           };
           ErrorHandler2.prototype.constructError = function(msg, column) {
-            var error = new Error(msg);
+            var error2 = new Error(msg);
             try {
-              throw error;
+              throw error2;
             } catch (base) {
               if (Object.create && Object.defineProperty) {
-                error = Object.create(base);
-                Object.defineProperty(error, "column", { value: column });
+                error2 = Object.create(base);
+                Object.defineProperty(error2, "column", { value: column });
               }
             }
-            return error;
+            return error2;
           };
           ErrorHandler2.prototype.createError = function(index, line, col, description) {
             var msg = "Line " + line + ": " + description;
-            var error = this.constructError(msg, col);
-            error.index = index;
-            error.lineNumber = line;
-            error.description = description;
-            return error;
+            var error2 = this.constructError(msg, col);
+            error2.index = index;
+            error2.lineNumber = line;
+            error2.description = description;
+            return error2;
           };
           ErrorHandler2.prototype.throwError = function(index, line, col, description) {
             throw this.createError(index, line, col, description);
           };
           ErrorHandler2.prototype.tolerateError = function(index, line, col, description) {
-            var error = this.createError(index, line, col, description);
+            var error2 = this.createError(index, line, col, description);
             if (this.tolerant) {
-              this.recordError(error);
+              this.recordError(error2);
             } else {
-              throw error;
+              throw error2;
             }
           };
           return ErrorHandler2;
@@ -7291,19 +7291,19 @@ var require_parse = __commonJS((exports, module) => {
   var symbolFor = (prefix) => Symbol.for(last_prop !== UNDEFINED ? prefix + COLON + last_prop : prefix);
   var transform = (k, { value, context = {} }) => reviver ? reviver(k, value, context) : value;
   var unexpected = () => {
-    const error = new SyntaxError(`Unexpected token '${current.value.slice(0, 1)}', "${current_code}" is not valid JSON`);
-    Object.assign(error, current.loc.start);
+    const error2 = new SyntaxError(`Unexpected token '${current.value.slice(0, 1)}', "${current_code}" is not valid JSON`);
+    Object.assign(error2, current.loc.start);
     free();
-    throw error;
+    throw error2;
   };
   var unexpected_end = () => {
-    const error = new SyntaxError("Unexpected end of JSON input");
-    Object.assign(error, last ? last.loc.end : {
+    const error2 = new SyntaxError("Unexpected end of JSON input");
+    Object.assign(error2, last ? last.loc.end : {
       line: 1,
       column: 0
     });
     free();
-    throw error;
+    throw error2;
   };
   var next = () => {
     const new_token = tokens[++index];
@@ -7652,10 +7652,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
+  var join2 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-    return join(comment, inside, gap);
+    return join2(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -7677,13 +7677,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join2(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += stringify(i, value, deeper_gap) || STR_NULL;
       inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
       after_comma = process_comments(value, AFTER(i), deeper_gap);
     }
-    inside += join(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join2(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return BRACKET_OPEN + join_content(inside, value, gap) + BRACKET_CLOSE;
   };
   var object_stringify = (value, gap) => {
@@ -7704,13 +7704,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join2(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += quote(key) + process_comments(value, AFTER_PROP(key), deeper_gap) + COLON + process_comments(value, AFTER_COLON(key), deeper_gap) + SPACE + sv + process_comments(value, AFTER_VALUE(key), deeper_gap);
       after_comma = process_comments(value, AFTER(key), deeper_gap);
     };
     keys.forEach(iteratee);
-    inside += join(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join2(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return CURLY_BRACKET_OPEN + join_content(inside, value, gap) + CURLY_BRACKET_CLOSE;
   };
   function stringify(key, holder, gap) {
@@ -7803,14 +7803,297 @@ var require_src2 = __commonJS((exports, module) => {
 });
 
 // src/index.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync10, readFileSync as readFileSync9, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync10, readFileSync as readFileSync9, writeFileSync as writeFileSync10 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import { homedir as homedir10 } from "os";
 import { join as join19 } from "path";
 
+// src/logger.ts
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+var TAG = "[aft-plugin]";
+var logFile = path.join(os.tmpdir(), "aft-plugin.log");
+var useStderr = process.env.AFT_LOG_STDERR === "1";
+var buffer = [];
+var flushTimer = null;
+var FLUSH_INTERVAL_MS = 500;
+var BUFFER_SIZE_LIMIT = 50;
+function flush() {
+  if (buffer.length === 0)
+    return;
+  const data = buffer.join("");
+  buffer = [];
+  try {
+    if (useStderr) {
+      process.stderr.write(data);
+    } else {
+      fs.appendFileSync(logFile, data);
+    }
+  } catch {}
+}
+function scheduleFlush() {
+  if (flushTimer)
+    return;
+  flushTimer = setTimeout(() => {
+    flushTimer = null;
+    flush();
+  }, FLUSH_INTERVAL_MS);
+  if (flushTimer && typeof flushTimer === "object" && "unref" in flushTimer) {
+    flushTimer.unref();
+  }
+}
+function write(level, message, data, sessionId) {
+  try {
+    const timestamp = new Date().toISOString();
+    const serialized = data === undefined ? "" : ` ${JSON.stringify(data)}`;
+    const sessionPrefix = sessionId ? ` [${sessionId}]` : "";
+    const line = `[${timestamp}] ${level} ${TAG}${sessionPrefix} ${message}${serialized}
+`;
+    if (useStderr) {
+      process.stderr.write(line);
+      return;
+    }
+    buffer.push(line);
+    if (buffer.length >= BUFFER_SIZE_LIMIT) {
+      flush();
+    } else {
+      scheduleFlush();
+    }
+  } catch {}
+}
+function log(message, data) {
+  write("INFO", message, data);
+}
+function warn(message, data) {
+  write("WARN", message, data);
+}
+function error(message, data) {
+  write("ERROR", message, data);
+}
+function sessionWarn(sessionId, message, data) {
+  write("WARN", message, data, sessionId);
+}
+function getLogFilePath() {
+  return logFile;
+}
+
+// src/bg-notifications.ts
+var sessionBgStates = new Map;
+var SESSION_BG_STATE_IDLE_TTL_MS = 60 * 60 * 1000;
+var DEBOUNCE_STEP_MS = 200;
+var DEBOUNCE_CAP_MS = 1000;
+var DEFAULT_SESSION_ID = "__default__";
+var LOG_PREFIX = "[aft-plugin] bg-notifications:";
+function trackBgTask(sessionID, taskId) {
+  stateFor(sessionID).outstandingTaskIds.add(taskId);
+}
+function ingestBgCompletions(sessionID, completions) {
+  if (!Array.isArray(completions) || completions.length === 0)
+    return [];
+  const state = stateFor(sessionID);
+  const accepted = [];
+  for (const completion of completions) {
+    if (!isBgCompletion(completion))
+      continue;
+    if (!state.outstandingTaskIds.has(completion.task_id))
+      continue;
+    state.outstandingTaskIds.delete(completion.task_id);
+    if (!state.pendingCompletions.some((pending) => pending.task_id === completion.task_id) && !accepted.some((pending) => pending.task_id === completion.task_id)) {
+      accepted.push(completion);
+    }
+  }
+  state.pendingCompletions.push(...accepted);
+  return accepted;
+}
+async function appendInTurnBgCompletions(drainContext, output) {
+  if (!output)
+    return;
+  const state = stateFor(drainContext.sessionID);
+  if (state.outstandingTaskIds.size === 0 && state.pendingCompletions.length === 0)
+    return;
+  if (state.outstandingTaskIds.size > 0) {
+    await drainCompletions(drainContext);
+  }
+  if (state.pendingCompletions.length === 0)
+    return;
+  const reminder = formatSystemReminder(state.pendingCompletions);
+  output.output = appendReminder(output.output ?? "", reminder);
+  state.pendingCompletions = [];
+}
+async function handleIdleBgCompletions(drainContext) {
+  const state = stateFor(drainContext.sessionID);
+  if (state.wakeFiredThisIdle)
+    return;
+  if (state.outstandingTaskIds.size > 0) {
+    await drainCompletions(drainContext);
+  }
+  if (state.pendingCompletions.length === 0)
+    return;
+  scheduleWake(state, async (reminder) => {
+    try {
+      const client = drainContext.client;
+      if (typeof client.session?.promptAsync !== "function") {
+        throw new Error("client.session.promptAsync is unavailable");
+      }
+      await client.session.promptAsync({
+        path: { id: drainContext.sessionID },
+        body: {
+          noReply: false,
+          parts: [{ type: "text", text: reminder }]
+        }
+      });
+    } catch (err) {
+      warn(`${LOG_PREFIX} wake send failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  });
+}
+function resetBgWake(sessionID) {
+  stateFor(sessionID).wakeFiredThisIdle = false;
+}
+function formatSystemReminder(completions) {
+  const bullets = completions.map((completion) => `- ${formatCompletion(completion)}`).join(`
+`);
+  return `<system-reminder>
+[BACKGROUND BASH COMPLETED]
+${bullets}
+
+Use bash_status({ task_id: "..." }) to retrieve full output.
+</system-reminder>`;
+}
+function extractSessionID(value) {
+  if (!value || typeof value !== "object")
+    return;
+  const record = value;
+  for (const key of ["sessionID", "sessionId", "id"]) {
+    if (typeof record[key] === "string")
+      return record[key];
+  }
+  const info = record.info;
+  if (info && typeof info === "object") {
+    const nested = info;
+    for (const key of ["sessionID", "sessionId", "id"]) {
+      if (typeof nested[key] === "string")
+        return nested[key];
+    }
+  }
+  return;
+}
+async function drainCompletions({ ctx, directory, sessionID }) {
+  try {
+    const bridge = ctx.pool.getAnyActiveBridge(directory) ?? ctx.pool.getBridge(directory);
+    const response = await bridge.send("bash_drain_completions", { session_id: sessionID });
+    if (response.success === false) {
+      warn(`${LOG_PREFIX} drain failed: ${String(response.message ?? "unknown error")}`);
+      return;
+    }
+    ingestBgCompletions(sessionID, response.bg_completions);
+  } catch (err) {
+    warn(`${LOG_PREFIX} drain failed: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}
+function scheduleWake(state, sendWake) {
+  const now = Date.now();
+  if (state.debounceTimer && state.pendingCompletions.length <= state.scheduledCompletionCount) {
+    return;
+  }
+  if (state.firstCompletionAt === null) {
+    state.firstCompletionAt = now;
+    state.scheduledFireAt = now + DEBOUNCE_STEP_MS;
+  } else {
+    const previousFireAt = state.scheduledFireAt ?? now;
+    state.scheduledFireAt = Math.min(previousFireAt + DEBOUNCE_STEP_MS, state.firstCompletionAt + DEBOUNCE_CAP_MS);
+  }
+  state.scheduledCompletionCount = state.pendingCompletions.length;
+  if (state.debounceTimer)
+    clearTimeout(state.debounceTimer);
+  const delay = Math.max(0, (state.scheduledFireAt ?? now) - now);
+  state.debounceTimer = setTimeout(() => {
+    const reminder = formatSystemReminder(state.pendingCompletions);
+    state.pendingCompletions = [];
+    state.debounceTimer = null;
+    state.wakeFiredThisIdle = true;
+    state.firstCompletionAt = null;
+    state.scheduledFireAt = null;
+    state.scheduledCompletionCount = 0;
+    sendWake(reminder);
+  }, delay);
+  state.debounceTimer.unref?.();
+}
+function stateFor(sessionID) {
+  const now = Date.now();
+  cleanupIdleSessionStates(now);
+  const key = sessionID || DEFAULT_SESSION_ID;
+  let state = sessionBgStates.get(key);
+  if (!state) {
+    state = {
+      outstandingTaskIds: new Set,
+      pendingCompletions: [],
+      debounceTimer: null,
+      wakeFiredThisIdle: false,
+      firstCompletionAt: null,
+      scheduledFireAt: null,
+      scheduledCompletionCount: 0,
+      lastSeenAt: now
+    };
+    sessionBgStates.set(key, state);
+  } else {
+    state.lastSeenAt = now;
+  }
+  return state;
+}
+function cleanupIdleSessionStates(now) {
+  const cutoff = now - SESSION_BG_STATE_IDLE_TTL_MS;
+  for (const [sessionID, state] of sessionBgStates) {
+    if (state.outstandingTaskIds.size > 0)
+      continue;
+    if (state.lastSeenAt >= cutoff)
+      continue;
+    if (state.debounceTimer)
+      clearTimeout(state.debounceTimer);
+    sessionBgStates.delete(sessionID);
+  }
+}
+function isBgCompletion(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return false;
+  const completion = value;
+  return typeof completion.task_id === "string" && typeof completion.status === "string" && (typeof completion.exit_code === "number" || completion.exit_code === null) && typeof completion.command === "string";
+}
+function appendReminder(output, reminder) {
+  return output.length > 0 ? `${output}
+
+${reminder}` : reminder;
+}
+function formatCompletion(completion) {
+  const status = formatStatus(completion);
+  const duration = formatDuration(completion);
+  return `task ${completion.task_id} (${status}${duration ? `, ${duration}` : ""}): ${completion.command}`;
+}
+function formatStatus(completion) {
+  if (completion.status === "timeout")
+    return "timed out";
+  if (completion.status === "killed")
+    return "killed";
+  if (completion.exit_code !== null)
+    return `exit ${completion.exit_code}`;
+  return completion.status;
+}
+function formatDuration(completion) {
+  const raw = completion.duration_ms ?? completion.runtime_ms ?? completion.runtime;
+  if (typeof raw !== "number" || !Number.isFinite(raw) || raw < 0)
+    return null;
+  if (raw < 1000)
+    return `${Math.round(raw)}ms`;
+  const totalSeconds = Math.round(raw / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m ${seconds}s` : `${seconds}s`;
+}
+
 // src/config.ts
 var import_comment_json = __toESM(require_src2(), 1);
-import { existsSync, readFileSync } from "fs";
+import { existsSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { join as join2 } from "path";
 
@@ -8579,10 +8862,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path) {
-  if (!path)
+function getElementAtPath(obj, path2) {
+  if (!path2)
     return obj;
-  return path.reduce((acc, key) => acc?.[key], obj);
+  return path2.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -8963,11 +9246,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path, issues) {
+function prefixIssues(path2, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path);
+    iss.path.unshift(path2);
     return iss;
   });
 }
@@ -9102,10 +9385,10 @@ var initializer = (inst, def) => {
 };
 var $ZodError = $constructor("$ZodError", initializer);
 var $ZodRealError = $constructor("$ZodError", initializer, { Parent: Error });
-function flattenError(error, mapper = (issue2) => issue2.message) {
+function flattenError(error2, mapper = (issue2) => issue2.message) {
   const fieldErrors = {};
   const formErrors = [];
-  for (const sub of error.issues) {
+  for (const sub of error2.issues) {
     if (sub.path.length > 0) {
       fieldErrors[sub.path[0]] = fieldErrors[sub.path[0]] || [];
       fieldErrors[sub.path[0]].push(mapper(sub));
@@ -9115,10 +9398,10 @@ function flattenError(error, mapper = (issue2) => issue2.message) {
   }
   return { formErrors, fieldErrors };
 }
-function formatError(error, mapper = (issue2) => issue2.message) {
+function formatError(error2, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error2) => {
-    for (const issue2 of error2.issues) {
+  const processError = (error3) => {
+    for (const issue2 of error3.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
         issue2.errors.map((issues) => processError({ issues }));
       } else if (issue2.code === "invalid_key") {
@@ -9145,14 +9428,14 @@ function formatError(error, mapper = (issue2) => issue2.message) {
       }
     }
   };
-  processError(error);
+  processError(error2);
   return fieldErrors;
 }
-function treeifyError(error, mapper = (issue2) => issue2.message) {
+function treeifyError(error2, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error2, path = []) => {
+  const processError = (error3, path2 = []) => {
     var _a, _b;
-    for (const issue2 of error2.issues) {
+    for (const issue2 of error3.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
         issue2.errors.map((issues) => processError({ issues }, issue2.path));
       } else if (issue2.code === "invalid_key") {
@@ -9160,7 +9443,7 @@ function treeifyError(error, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path, ...issue2.path];
+        const fullpath = [...path2, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -9187,13 +9470,13 @@ function treeifyError(error, mapper = (issue2) => issue2.message) {
       }
     }
   };
-  processError(error);
+  processError(error2);
   return result;
 }
 function toDotPath(_path) {
   const segs = [];
-  const path = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path) {
+  const path2 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path2) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -9208,9 +9491,9 @@ function toDotPath(_path) {
   }
   return segs.join("");
 }
-function prettifyError(error) {
+function prettifyError(error2) {
   const lines = [];
-  const issues = [...error.issues].sort((a, b) => (a.path ?? []).length - (b.path ?? []).length);
+  const issues = [...error2.issues].sort((a, b) => (a.path ?? []).length - (b.path ?? []).length);
   for (const issue2 of issues) {
     lines.push(`\u2716 ${issue2.message}`);
     if (issue2.path?.length)
@@ -12073,7 +12356,7 @@ __export(exports_locales, {
 });
 
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ar.js
-var error = () => {
+var error2 = () => {
   const Sizable = {
     string: { unit: "\u062D\u0631\u0641", verb: "\u0623\u0646 \u064A\u062D\u0648\u064A" },
     file: { unit: "\u0628\u0627\u064A\u062A", verb: "\u0623\u0646 \u064A\u062D\u0648\u064A" },
@@ -12175,11 +12458,11 @@ var error = () => {
 };
 function ar_default() {
   return {
-    localeError: error()
+    localeError: error2()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/az.js
-var error2 = () => {
+var error3 = () => {
   const Sizable = {
     string: { unit: "simvol", verb: "olmal\u0131d\u0131r" },
     file: { unit: "bayt", verb: "olmal\u0131d\u0131r" },
@@ -12280,7 +12563,7 @@ var error2 = () => {
 };
 function az_default() {
   return {
-    localeError: error2()
+    localeError: error3()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/be.js
@@ -12299,7 +12582,7 @@ function getBelarusianPlural(count, one, few, many) {
   }
   return many;
 }
-var error3 = () => {
+var error4 = () => {
   const Sizable = {
     string: {
       unit: {
@@ -12436,11 +12719,11 @@ var error3 = () => {
 };
 function be_default() {
   return {
-    localeError: error3()
+    localeError: error4()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/bg.js
-var error4 = () => {
+var error5 = () => {
   const Sizable = {
     string: { unit: "\u0441\u0438\u043C\u0432\u043E\u043B\u0430", verb: "\u0434\u0430 \u0441\u044A\u0434\u044A\u0440\u0436\u0430" },
     file: { unit: "\u0431\u0430\u0439\u0442\u0430", verb: "\u0434\u0430 \u0441\u044A\u0434\u044A\u0440\u0436\u0430" },
@@ -12556,11 +12839,11 @@ var error4 = () => {
 };
 function bg_default() {
   return {
-    localeError: error4()
+    localeError: error5()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ca.js
-var error5 = () => {
+var error6 = () => {
   const Sizable = {
     string: { unit: "car\xE0cters", verb: "contenir" },
     file: { unit: "bytes", verb: "contenir" },
@@ -12663,11 +12946,11 @@ var error5 = () => {
 };
 function ca_default() {
   return {
-    localeError: error5()
+    localeError: error6()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/cs.js
-var error6 = () => {
+var error7 = () => {
   const Sizable = {
     string: { unit: "znak\u016F", verb: "m\xEDt" },
     file: { unit: "bajt\u016F", verb: "m\xEDt" },
@@ -12774,11 +13057,11 @@ var error6 = () => {
 };
 function cs_default() {
   return {
-    localeError: error6()
+    localeError: error7()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/da.js
-var error7 = () => {
+var error8 = () => {
   const Sizable = {
     string: { unit: "tegn", verb: "havde" },
     file: { unit: "bytes", verb: "havde" },
@@ -12889,11 +13172,11 @@ var error7 = () => {
 };
 function da_default() {
   return {
-    localeError: error7()
+    localeError: error8()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/de.js
-var error8 = () => {
+var error9 = () => {
   const Sizable = {
     string: { unit: "Zeichen", verb: "zu haben" },
     file: { unit: "Bytes", verb: "zu haben" },
@@ -12997,11 +13280,11 @@ var error8 = () => {
 };
 function de_default() {
   return {
-    localeError: error8()
+    localeError: error9()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/en.js
-var error9 = () => {
+var error10 = () => {
   const Sizable = {
     string: { unit: "characters", verb: "to have" },
     file: { unit: "bytes", verb: "to have" },
@@ -13103,11 +13386,11 @@ var error9 = () => {
 };
 function en_default() {
   return {
-    localeError: error9()
+    localeError: error10()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/eo.js
-var error10 = () => {
+var error11 = () => {
   const Sizable = {
     string: { unit: "karaktrojn", verb: "havi" },
     file: { unit: "bajtojn", verb: "havi" },
@@ -13212,11 +13495,11 @@ var error10 = () => {
 };
 function eo_default() {
   return {
-    localeError: error10()
+    localeError: error11()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/es.js
-var error11 = () => {
+var error12 = () => {
   const Sizable = {
     string: { unit: "caracteres", verb: "tener" },
     file: { unit: "bytes", verb: "tener" },
@@ -13344,11 +13627,11 @@ var error11 = () => {
 };
 function es_default() {
   return {
-    localeError: error11()
+    localeError: error12()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/fa.js
-var error12 = () => {
+var error13 = () => {
   const Sizable = {
     string: { unit: "\u06A9\u0627\u0631\u0627\u06A9\u062A\u0631", verb: "\u062F\u0627\u0634\u062A\u0647 \u0628\u0627\u0634\u062F" },
     file: { unit: "\u0628\u0627\u06CC\u062A", verb: "\u062F\u0627\u0634\u062A\u0647 \u0628\u0627\u0634\u062F" },
@@ -13458,11 +13741,11 @@ var error12 = () => {
 };
 function fa_default() {
   return {
-    localeError: error12()
+    localeError: error13()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/fi.js
-var error13 = () => {
+var error14 = () => {
   const Sizable = {
     string: { unit: "merkki\xE4", subject: "merkkijonon" },
     file: { unit: "tavua", subject: "tiedoston" },
@@ -13570,11 +13853,11 @@ var error13 = () => {
 };
 function fi_default() {
   return {
-    localeError: error13()
+    localeError: error14()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/fr.js
-var error14 = () => {
+var error15 = () => {
   const Sizable = {
     string: { unit: "caract\xE8res", verb: "avoir" },
     file: { unit: "octets", verb: "avoir" },
@@ -13678,11 +13961,11 @@ var error14 = () => {
 };
 function fr_default() {
   return {
-    localeError: error14()
+    localeError: error15()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/fr-CA.js
-var error15 = () => {
+var error16 = () => {
   const Sizable = {
     string: { unit: "caract\xE8res", verb: "avoir" },
     file: { unit: "octets", verb: "avoir" },
@@ -13785,11 +14068,11 @@ var error15 = () => {
 };
 function fr_CA_default() {
   return {
-    localeError: error15()
+    localeError: error16()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/he.js
-var error16 = () => {
+var error17 = () => {
   const TypeNames = {
     string: { label: "\u05DE\u05D7\u05E8\u05D5\u05D6\u05EA", gender: "f" },
     number: { label: "\u05DE\u05E1\u05E4\u05E8", gender: "m" },
@@ -13978,11 +14261,11 @@ var error16 = () => {
 };
 function he_default() {
   return {
-    localeError: error16()
+    localeError: error17()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/hu.js
-var error17 = () => {
+var error18 = () => {
   const Sizable = {
     string: { unit: "karakter", verb: "legyen" },
     file: { unit: "byte", verb: "legyen" },
@@ -14086,7 +14369,7 @@ var error17 = () => {
 };
 function hu_default() {
   return {
-    localeError: error17()
+    localeError: error18()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/hy.js
@@ -14100,7 +14383,7 @@ function withDefiniteArticle(word) {
   const lastChar = word[word.length - 1];
   return word + (vowels.includes(lastChar) ? "\u0576" : "\u0568");
 }
-var error18 = () => {
+var error19 = () => {
   const Sizable = {
     string: {
       unit: {
@@ -14233,11 +14516,11 @@ var error18 = () => {
 };
 function hy_default() {
   return {
-    localeError: error18()
+    localeError: error19()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/id.js
-var error19 = () => {
+var error20 = () => {
   const Sizable = {
     string: { unit: "karakter", verb: "memiliki" },
     file: { unit: "byte", verb: "memiliki" },
@@ -14339,11 +14622,11 @@ var error19 = () => {
 };
 function id_default() {
   return {
-    localeError: error19()
+    localeError: error20()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/is.js
-var error20 = () => {
+var error21 = () => {
   const Sizable = {
     string: { unit: "stafi", verb: "a\xF0 hafa" },
     file: { unit: "b\xE6ti", verb: "a\xF0 hafa" },
@@ -14448,11 +14731,11 @@ var error20 = () => {
 };
 function is_default() {
   return {
-    localeError: error20()
+    localeError: error21()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/it.js
-var error21 = () => {
+var error22 = () => {
   const Sizable = {
     string: { unit: "caratteri", verb: "avere" },
     file: { unit: "byte", verb: "avere" },
@@ -14556,11 +14839,11 @@ var error21 = () => {
 };
 function it_default() {
   return {
-    localeError: error21()
+    localeError: error22()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ja.js
-var error22 = () => {
+var error23 = () => {
   const Sizable = {
     string: { unit: "\u6587\u5B57", verb: "\u3067\u3042\u308B" },
     file: { unit: "\u30D0\u30A4\u30C8", verb: "\u3067\u3042\u308B" },
@@ -14663,11 +14946,11 @@ var error22 = () => {
 };
 function ja_default() {
   return {
-    localeError: error22()
+    localeError: error23()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ka.js
-var error23 = () => {
+var error24 = () => {
   const Sizable = {
     string: { unit: "\u10E1\u10D8\u10DB\u10D1\u10DD\u10DA\u10DD", verb: "\u10E3\u10DC\u10D3\u10D0 \u10E8\u10D4\u10D8\u10EA\u10D0\u10D5\u10D3\u10D4\u10E1" },
     file: { unit: "\u10D1\u10D0\u10D8\u10E2\u10D8", verb: "\u10E3\u10DC\u10D3\u10D0 \u10E8\u10D4\u10D8\u10EA\u10D0\u10D5\u10D3\u10D4\u10E1" },
@@ -14775,11 +15058,11 @@ var error23 = () => {
 };
 function ka_default() {
   return {
-    localeError: error23()
+    localeError: error24()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/km.js
-var error24 = () => {
+var error25 = () => {
   const Sizable = {
     string: { unit: "\u178F\u17BD\u17A2\u1780\u17D2\u179F\u179A", verb: "\u1782\u17BD\u179A\u1798\u17B6\u1793" },
     file: { unit: "\u1794\u17C3", verb: "\u1782\u17BD\u179A\u1798\u17B6\u1793" },
@@ -14885,7 +15168,7 @@ var error24 = () => {
 };
 function km_default() {
   return {
-    localeError: error24()
+    localeError: error25()
   };
 }
 
@@ -14894,7 +15177,7 @@ function kh_default() {
   return km_default();
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ko.js
-var error25 = () => {
+var error26 = () => {
   const Sizable = {
     string: { unit: "\uBB38\uC790", verb: "to have" },
     file: { unit: "\uBC14\uC774\uD2B8", verb: "to have" },
@@ -15001,7 +15284,7 @@ var error25 = () => {
 };
 function ko_default() {
   return {
-    localeError: error25()
+    localeError: error26()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/lt.js
@@ -15018,7 +15301,7 @@ function getUnitTypeFromNumber(number2) {
     return "one";
   return "few";
 }
-var error26 = () => {
+var error27 = () => {
   const Sizable = {
     string: {
       unit: {
@@ -15204,11 +15487,11 @@ var error26 = () => {
 };
 function lt_default() {
   return {
-    localeError: error26()
+    localeError: error27()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/mk.js
-var error27 = () => {
+var error28 = () => {
   const Sizable = {
     string: { unit: "\u0437\u043D\u0430\u0446\u0438", verb: "\u0434\u0430 \u0438\u043C\u0430\u0430\u0442" },
     file: { unit: "\u0431\u0430\u0458\u0442\u0438", verb: "\u0434\u0430 \u0438\u043C\u0430\u0430\u0442" },
@@ -15313,11 +15596,11 @@ var error27 = () => {
 };
 function mk_default() {
   return {
-    localeError: error27()
+    localeError: error28()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ms.js
-var error28 = () => {
+var error29 = () => {
   const Sizable = {
     string: { unit: "aksara", verb: "mempunyai" },
     file: { unit: "bait", verb: "mempunyai" },
@@ -15420,11 +15703,11 @@ var error28 = () => {
 };
 function ms_default() {
   return {
-    localeError: error28()
+    localeError: error29()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/nl.js
-var error29 = () => {
+var error30 = () => {
   const Sizable = {
     string: { unit: "tekens", verb: "heeft" },
     file: { unit: "bytes", verb: "heeft" },
@@ -15530,11 +15813,11 @@ var error29 = () => {
 };
 function nl_default() {
   return {
-    localeError: error29()
+    localeError: error30()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/no.js
-var error30 = () => {
+var error31 = () => {
   const Sizable = {
     string: { unit: "tegn", verb: "\xE5 ha" },
     file: { unit: "bytes", verb: "\xE5 ha" },
@@ -15638,11 +15921,11 @@ var error30 = () => {
 };
 function no_default() {
   return {
-    localeError: error30()
+    localeError: error31()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ota.js
-var error31 = () => {
+var error32 = () => {
   const Sizable = {
     string: { unit: "harf", verb: "olmal\u0131d\u0131r" },
     file: { unit: "bayt", verb: "olmal\u0131d\u0131r" },
@@ -15747,11 +16030,11 @@ var error31 = () => {
 };
 function ota_default() {
   return {
-    localeError: error31()
+    localeError: error32()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ps.js
-var error32 = () => {
+var error33 = () => {
   const Sizable = {
     string: { unit: "\u062A\u0648\u06A9\u064A", verb: "\u0648\u0644\u0631\u064A" },
     file: { unit: "\u0628\u0627\u06CC\u067C\u0633", verb: "\u0648\u0644\u0631\u064A" },
@@ -15861,11 +16144,11 @@ var error32 = () => {
 };
 function ps_default() {
   return {
-    localeError: error32()
+    localeError: error33()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/pl.js
-var error33 = () => {
+var error34 = () => {
   const Sizable = {
     string: { unit: "znak\xF3w", verb: "mie\u0107" },
     file: { unit: "bajt\xF3w", verb: "mie\u0107" },
@@ -15970,11 +16253,11 @@ var error33 = () => {
 };
 function pl_default() {
   return {
-    localeError: error33()
+    localeError: error34()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/pt.js
-var error34 = () => {
+var error35 = () => {
   const Sizable = {
     string: { unit: "caracteres", verb: "ter" },
     file: { unit: "bytes", verb: "ter" },
@@ -16078,7 +16361,7 @@ var error34 = () => {
 };
 function pt_default() {
   return {
-    localeError: error34()
+    localeError: error35()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ru.js
@@ -16097,7 +16380,7 @@ function getRussianPlural(count, one, few, many) {
   }
   return many;
 }
-var error35 = () => {
+var error36 = () => {
   const Sizable = {
     string: {
       unit: {
@@ -16234,11 +16517,11 @@ var error35 = () => {
 };
 function ru_default() {
   return {
-    localeError: error35()
+    localeError: error36()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/sl.js
-var error36 = () => {
+var error37 = () => {
   const Sizable = {
     string: { unit: "znakov", verb: "imeti" },
     file: { unit: "bajtov", verb: "imeti" },
@@ -16343,11 +16626,11 @@ var error36 = () => {
 };
 function sl_default() {
   return {
-    localeError: error36()
+    localeError: error37()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/sv.js
-var error37 = () => {
+var error38 = () => {
   const Sizable = {
     string: { unit: "tecken", verb: "att ha" },
     file: { unit: "bytes", verb: "att ha" },
@@ -16453,11 +16736,11 @@ var error37 = () => {
 };
 function sv_default() {
   return {
-    localeError: error37()
+    localeError: error38()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ta.js
-var error38 = () => {
+var error39 = () => {
   const Sizable = {
     string: { unit: "\u0B8E\u0BB4\u0BC1\u0BA4\u0BCD\u0BA4\u0BC1\u0B95\u0BCD\u0B95\u0BB3\u0BCD", verb: "\u0B95\u0BCA\u0BA3\u0BCD\u0B9F\u0BBF\u0BB0\u0BC1\u0B95\u0BCD\u0B95 \u0BB5\u0BC7\u0BA3\u0BCD\u0B9F\u0BC1\u0BAE\u0BCD" },
     file: { unit: "\u0BAA\u0BC8\u0B9F\u0BCD\u0B9F\u0BC1\u0B95\u0BB3\u0BCD", verb: "\u0B95\u0BCA\u0BA3\u0BCD\u0B9F\u0BBF\u0BB0\u0BC1\u0B95\u0BCD\u0B95 \u0BB5\u0BC7\u0BA3\u0BCD\u0B9F\u0BC1\u0BAE\u0BCD" },
@@ -16563,11 +16846,11 @@ var error38 = () => {
 };
 function ta_default() {
   return {
-    localeError: error38()
+    localeError: error39()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/th.js
-var error39 = () => {
+var error40 = () => {
   const Sizable = {
     string: { unit: "\u0E15\u0E31\u0E27\u0E2D\u0E31\u0E01\u0E29\u0E23", verb: "\u0E04\u0E27\u0E23\u0E21\u0E35" },
     file: { unit: "\u0E44\u0E1A\u0E15\u0E4C", verb: "\u0E04\u0E27\u0E23\u0E21\u0E35" },
@@ -16673,11 +16956,11 @@ var error39 = () => {
 };
 function th_default() {
   return {
-    localeError: error39()
+    localeError: error40()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/tr.js
-var error40 = () => {
+var error41 = () => {
   const Sizable = {
     string: { unit: "karakter", verb: "olmal\u0131" },
     file: { unit: "bayt", verb: "olmal\u0131" },
@@ -16778,11 +17061,11 @@ var error40 = () => {
 };
 function tr_default() {
   return {
-    localeError: error40()
+    localeError: error41()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/uk.js
-var error41 = () => {
+var error42 = () => {
   const Sizable = {
     string: { unit: "\u0441\u0438\u043C\u0432\u043E\u043B\u0456\u0432", verb: "\u043C\u0430\u0442\u0438\u043C\u0435" },
     file: { unit: "\u0431\u0430\u0439\u0442\u0456\u0432", verb: "\u043C\u0430\u0442\u0438\u043C\u0435" },
@@ -16886,7 +17169,7 @@ var error41 = () => {
 };
 function uk_default() {
   return {
-    localeError: error41()
+    localeError: error42()
   };
 }
 
@@ -16895,7 +17178,7 @@ function ua_default() {
   return uk_default();
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/ur.js
-var error42 = () => {
+var error43 = () => {
   const Sizable = {
     string: { unit: "\u062D\u0631\u0648\u0641", verb: "\u06C1\u0648\u0646\u0627" },
     file: { unit: "\u0628\u0627\u0626\u0679\u0633", verb: "\u06C1\u0648\u0646\u0627" },
@@ -17001,11 +17284,11 @@ var error42 = () => {
 };
 function ur_default() {
   return {
-    localeError: error42()
+    localeError: error43()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/uz.js
-var error43 = () => {
+var error44 = () => {
   const Sizable = {
     string: { unit: "belgi", verb: "bo\u2018lishi kerak" },
     file: { unit: "bayt", verb: "bo\u2018lishi kerak" },
@@ -17110,11 +17393,11 @@ var error43 = () => {
 };
 function uz_default() {
   return {
-    localeError: error43()
+    localeError: error44()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/vi.js
-var error44 = () => {
+var error45 = () => {
   const Sizable = {
     string: { unit: "k\xFD t\u1EF1", verb: "c\xF3" },
     file: { unit: "byte", verb: "c\xF3" },
@@ -17218,11 +17501,11 @@ var error44 = () => {
 };
 function vi_default() {
   return {
-    localeError: error44()
+    localeError: error45()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/zh-CN.js
-var error45 = () => {
+var error46 = () => {
   const Sizable = {
     string: { unit: "\u5B57\u7B26", verb: "\u5305\u542B" },
     file: { unit: "\u5B57\u8282", verb: "\u5305\u542B" },
@@ -17327,11 +17610,11 @@ var error45 = () => {
 };
 function zh_CN_default() {
   return {
-    localeError: error45()
+    localeError: error46()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/zh-TW.js
-var error46 = () => {
+var error47 = () => {
   const Sizable = {
     string: { unit: "\u5B57\u5143", verb: "\u64C1\u6709" },
     file: { unit: "\u4F4D\u5143\u7D44", verb: "\u64C1\u6709" },
@@ -17434,11 +17717,11 @@ var error46 = () => {
 };
 function zh_TW_default() {
   return {
-    localeError: error46()
+    localeError: error47()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/locales/yo.js
-var error47 = () => {
+var error48 = () => {
   const Sizable = {
     string: { unit: "\xE0mi", verb: "n\xED" },
     file: { unit: "bytes", verb: "n\xED" },
@@ -17541,7 +17824,7 @@ var error47 = () => {
 };
 function yo_default() {
   return {
-    localeError: error47()
+    localeError: error48()
   };
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/core/registries.js
@@ -20940,13 +21223,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path = ref.slice(1).split("/").filter(Boolean);
-  if (path.length === 0) {
+  const path2 = ref.slice(1).split("/").filter(Boolean);
+  if (path2.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path[0] === defsKey) {
-    const key = path[1];
+  if (path2[0] === defsKey) {
+    const key = path2[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -21346,72 +21629,6 @@ function date4(params) {
 
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/classic/external.js
 config(en_default());
-// src/logger.ts
-import * as fs from "fs";
-import * as os from "os";
-import * as path from "path";
-var TAG = "[aft-plugin]";
-var logFile = path.join(os.tmpdir(), "aft-plugin.log");
-var useStderr = process.env.AFT_LOG_STDERR === "1";
-var buffer = [];
-var flushTimer = null;
-var FLUSH_INTERVAL_MS = 500;
-var BUFFER_SIZE_LIMIT = 50;
-function flush() {
-  if (buffer.length === 0)
-    return;
-  const data = buffer.join("");
-  buffer = [];
-  try {
-    if (useStderr) {
-      process.stderr.write(data);
-    } else {
-      fs.appendFileSync(logFile, data);
-    }
-  } catch {}
-}
-function scheduleFlush() {
-  if (flushTimer)
-    return;
-  flushTimer = setTimeout(() => {
-    flushTimer = null;
-    flush();
-  }, FLUSH_INTERVAL_MS);
-  if (flushTimer && typeof flushTimer === "object" && "unref" in flushTimer) {
-    flushTimer.unref();
-  }
-}
-function write(level, message, data) {
-  try {
-    const timestamp = new Date().toISOString();
-    const serialized = data === undefined ? "" : ` ${JSON.stringify(data)}`;
-    const line = `[${timestamp}] ${level} ${TAG} ${message}${serialized}
-`;
-    if (useStderr) {
-      process.stderr.write(line);
-      return;
-    }
-    buffer.push(line);
-    if (buffer.length >= BUFFER_SIZE_LIMIT) {
-      flush();
-    } else {
-      scheduleFlush();
-    }
-  } catch {}
-}
-function log(message, data) {
-  write("INFO", message, data);
-}
-function warn(message, data) {
-  write("WARN", message, data);
-}
-function error48(message, data) {
-  write("ERROR", message, data);
-}
-function getLogFilePath() {
-  return logFile;
-}
-
 // src/config.ts
 var FormatterEnum = exports_external.enum([
   "biome",
@@ -21466,6 +21683,14 @@ var LspConfigSchema = exports_external.object({
   grace_days: exports_external.number().int().positive().optional(),
   versions: exports_external.record(exports_external.string().trim().min(1), exports_external.string().trim().min(1)).optional()
 });
+var ExperimentalConfigSchema = exports_external.object({
+  bash: exports_external.object({
+    rewrite: exports_external.boolean().optional(),
+    compress: exports_external.boolean().optional(),
+    background: exports_external.boolean().optional()
+  }).optional(),
+  lsp_ty: exports_external.boolean().optional()
+});
 var AftConfigSchema = exports_external.object({
   format_on_edit: exports_external.boolean().optional(),
   validate_on_edit: exports_external.enum(["syntax", "full"]).optional(),
@@ -21475,22 +21700,22 @@ var AftConfigSchema = exports_external.object({
   tool_surface: exports_external.enum(["minimal", "recommended", "all"]).optional(),
   disabled_tools: exports_external.array(exports_external.string()).optional(),
   restrict_to_project_root: exports_external.boolean().optional(),
-  experimental_search_index: exports_external.boolean().optional(),
-  experimental_semantic_search: exports_external.boolean().optional(),
-  experimental_lsp_ty: exports_external.boolean().optional(),
+  search_index: exports_external.boolean().optional(),
+  semantic_search: exports_external.boolean().optional(),
+  experimental: ExperimentalConfigSchema.optional(),
   lsp: LspConfigSchema.optional(),
   url_fetch_allow_private: exports_external.boolean().optional(),
   semantic: SemanticConfigSchema.optional(),
   max_callgraph_files: exports_external.number().int().positive().optional(),
   auto_update: exports_external.boolean().optional()
-});
+}).strict();
 function normalizeLspExtension(extension) {
   return extension.trim().replace(/^\.+/, "");
 }
 function resolveLspConfigForConfigure(config2) {
   const overrides = {};
   const disabled = new Set(config2.lsp?.disabled ?? []);
-  let experimentalTy = config2.experimental_lsp_ty;
+  let experimentalTy = config2.experimental?.lsp_ty;
   switch (config2.lsp?.python ?? "auto") {
     case "ty":
       experimentalTy = true;
@@ -21531,6 +21756,130 @@ function resolveLspConfigForConfigure(config2) {
   }
   return overrides;
 }
+function resolveExperimentalConfigForConfigure(config2) {
+  const overrides = {};
+  if (config2.experimental?.bash?.rewrite !== undefined) {
+    overrides.experimental_bash_rewrite = config2.experimental.bash.rewrite;
+  }
+  if (config2.experimental?.bash?.compress !== undefined) {
+    overrides.experimental_bash_compress = config2.experimental.bash.compress;
+  }
+  if (config2.experimental?.bash?.background !== undefined) {
+    overrides.experimental_bash_background = config2.experimental.bash.background;
+  }
+  if (config2.experimental?.lsp_ty !== undefined) {
+    overrides.experimental_lsp_ty = config2.experimental.lsp_ty;
+  }
+  return overrides;
+}
+var CONFIG_MIGRATIONS = [
+  { oldKey: "experimental_search_index", newPath: ["search_index"] },
+  { oldKey: "experimental_semantic_search", newPath: ["semantic_search"] },
+  { oldKey: "experimental_lsp_ty", newPath: ["experimental", "lsp_ty"] },
+  { oldKey: "experimental_bash_rewrite", newPath: ["experimental", "bash", "rewrite"] },
+  { oldKey: "experimental_bash_compress", newPath: ["experimental", "bash", "compress"] },
+  { oldKey: "experimental_bash_background", newPath: ["experimental", "bash", "background"] }
+];
+function isWritableMigrationError(errorValue) {
+  const code = errorValue?.code;
+  return code === "EROFS" || code === "EACCES" || code === "EPERM";
+}
+function extractCommentsForPreservation(content) {
+  const comments = [];
+  const linePattern = /\/\/[^\n]*/g;
+  for (const match of content.match(linePattern) ?? []) {
+    comments.push(match.trim());
+  }
+  const blockPattern = /\/\*[\s\S]*?\*\//g;
+  for (const match of content.match(blockPattern) ?? []) {
+    comments.push(match.replace(/\s+/g, " ").trim());
+  }
+  return comments;
+}
+function ensureRecordAtPath(root, path2) {
+  let current = root;
+  for (const segment of path2) {
+    const existing = current[segment];
+    if (!existing || typeof existing !== "object" || Array.isArray(existing)) {
+      current[segment] = {};
+    }
+    current = current[segment];
+  }
+  return current;
+}
+function hasPath(root, path2) {
+  let current = root;
+  for (const segment of path2) {
+    if (!current || typeof current !== "object" || Array.isArray(current))
+      return false;
+    const record2 = current;
+    if (!Object.hasOwn(record2, segment))
+      return false;
+    current = record2[segment];
+  }
+  return true;
+}
+function setPath(root, path2, value) {
+  const parent = ensureRecordAtPath(root, path2.slice(0, -1));
+  parent[path2[path2.length - 1]] = value;
+}
+function migrateRawConfig(rawConfig, configPath, logger) {
+  const oldKeys = [];
+  for (const migration of CONFIG_MIGRATIONS) {
+    if (!Object.hasOwn(rawConfig, migration.oldKey))
+      continue;
+    if (hasPath(rawConfig, migration.newPath)) {
+      logger?.warn(`Config migration conflict at ${configPath}: ${migration.oldKey} ignored because ${migration.newPath.join(".")} is already set`);
+    } else {
+      setPath(rawConfig, migration.newPath, rawConfig[migration.oldKey]);
+    }
+    delete rawConfig[migration.oldKey];
+    oldKeys.push(migration.oldKey);
+  }
+  return oldKeys;
+}
+function migrateAftConfigFile(configPath, logger = { log, warn }) {
+  if (!existsSync(configPath)) {
+    return { migrated: false, oldKeys: [] };
+  }
+  let tmpPath = null;
+  let oldKeys = [];
+  try {
+    const content = readFileSync(configPath, "utf-8");
+    const rawConfig = import_comment_json.parse(content);
+    if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) {
+      return { migrated: false, oldKeys: [] };
+    }
+    oldKeys = migrateRawConfig(rawConfig, configPath, logger);
+    if (oldKeys.length === 0) {
+      return { migrated: false, oldKeys: [] };
+    }
+    const serialized = `${import_comment_json.stringify(rawConfig, null, 2)}
+`;
+    const originalComments = extractCommentsForPreservation(content);
+    const droppedComments = originalComments.filter((comment) => !serialized.includes(comment.trim()));
+    const nextContent = droppedComments.length > 0 ? `${droppedComments.join(`
+`)}
+${serialized}` : serialized;
+    tmpPath = `${configPath}.tmp.${process.pid}`;
+    writeFileSync(tmpPath, nextContent, "utf-8");
+    renameSync(tmpPath, configPath);
+    logger.log(`Migrated config at ${configPath}: removed ${oldKeys.join(", ")}`);
+    return { migrated: true, oldKeys };
+  } catch (err) {
+    if (tmpPath) {
+      try {
+        unlinkSync(tmpPath);
+      } catch {}
+    }
+    if (isWritableMigrationError(err)) {
+      const errorMsg = err instanceof Error ? err.message : String(err);
+      logger.warn(`Config migration could not write ${configPath} (${errorMsg}); using migrated config in memory`);
+      return { migrated: oldKeys.length > 0, oldKeys };
+    }
+    return { migrated: false, oldKeys: [] };
+  }
+}
 function detectConfigFile(basePath) {
   const jsoncPath = `${basePath}.jsonc`;
   const jsonPath = `${basePath}.json`;
@@ -21575,6 +21924,7 @@ function loadConfigFromPath(configPath) {
     }
     const content = readFileSync(configPath, "utf-8");
     const rawConfig = import_comment_json.parse(content);
+    migrateRawConfig(rawConfig, configPath, { log, warn });
     const result = AftConfigSchema.safeParse(rawConfig);
     if (result.success) {
       log(`Config loaded from ${configPath}`);
@@ -21585,7 +21935,7 @@ function loadConfigFromPath(configPath) {
     return parseConfigPartially(rawConfig);
   } catch (err) {
     const errorMsg = err instanceof Error ? err.message : String(err);
-    error48(`Error loading config from ${configPath}: ${errorMsg}`);
+    error(`Error loading config from ${configPath}: ${errorMsg}`);
     return null;
   }
 }
@@ -21623,6 +21973,25 @@ function mergeLspConfig(baseLsp, overrideLsp) {
   }
   return Object.fromEntries(Object.entries(lsp).filter(([, value]) => value !== undefined));
 }
+function mergeExperimentalConfig(baseExperimental, overrideExperimental) {
+  const bash = {
+    ...baseExperimental?.bash,
+    ...overrideExperimental?.bash
+  };
+  const experimental = {
+    ...baseExperimental,
+    ...overrideExperimental
+  };
+  if (Object.values(bash).some((value) => value !== undefined)) {
+    experimental.bash = bash;
+  } else {
+    delete experimental.bash;
+  }
+  if (Object.values(experimental).every((value) => value === undefined)) {
+    return;
+  }
+  return Object.fromEntries(Object.entries(experimental).filter(([, value]) => value !== undefined));
+}
 function getProjectLspStrippedKeys(lsp) {
   if (!lsp) {
     return [];
@@ -21645,9 +22014,9 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "hoist_builtin_tools",
   "format_on_edit",
   "validate_on_edit",
-  "experimental_search_index",
-  "experimental_semantic_search",
-  "experimental_lsp_ty"
+  "search_index",
+  "semantic_search",
+  "experimental"
 ]);
 function pickProjectSafeFields(override) {
   const safe = {};
@@ -21676,6 +22045,7 @@ function mergeConfigs(base, override) {
   const checker = { ...base.checker, ...override.checker };
   const semantic = mergeSemanticConfig(base.semantic, override.semantic);
   const lsp = mergeLspConfig(base.lsp, override.lsp);
+  const experimental = mergeExperimentalConfig(base.experimental, override.experimental);
   const safeOverride = pickProjectSafeFields(override);
   return {
     ...base,
@@ -21683,6 +22053,7 @@ function mergeConfigs(base, override) {
     ...Object.keys(formatter).length > 0 ? { formatter } : {},
     ...Object.keys(checker).length > 0 ? { checker } : {},
     ...lsp ? { lsp } : {},
+    experimental,
     semantic,
     ...disabledTools.length > 0 ? { disabled_tools: [...new Set(disabledTools)] } : {}
   };
@@ -21698,9 +22069,13 @@ function getOpenCodeConfigDir() {
 function loadAftConfig(projectDirectory) {
   const configDir = getOpenCodeConfigDir();
   const userBasePath = join2(configDir, "aft");
+  migrateAftConfigFile(`${userBasePath}.jsonc`);
+  migrateAftConfigFile(`${userBasePath}.json`);
   const userDetected = detectConfigFile(userBasePath);
   const userConfigPath = userDetected.format !== "none" ? userDetected.path : `${userBasePath}.json`;
   const projectBasePath = join2(projectDirectory, ".opencode", "aft");
+  migrateAftConfigFile(`${projectBasePath}.jsonc`);
+  migrateAftConfigFile(`${projectBasePath}.json`);
   const projectDetected = detectConfigFile(projectBasePath);
   const projectConfigPath = projectDetected.format !== "none" ? projectDetected.path : `${projectBasePath}.json`;
   let config2 = loadConfigFromPath(userConfigPath) ?? {};
@@ -21723,7 +22098,7 @@ function loadAftConfig(projectDirectory) {
 }
 
 // src/downloader.ts
-import { chmodSync, existsSync as existsSync2, mkdirSync, unlinkSync } from "fs";
+import { chmodSync, existsSync as existsSync2, mkdirSync, unlinkSync as unlinkSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join3 } from "path";
 
@@ -21765,12 +22140,12 @@ async function downloadBinary(version2) {
   const platformKey = `${process.platform}-${process.arch}`;
   const assetName = PLATFORM_ASSET_MAP[platformKey];
   if (!assetName) {
-    error48(`Unsupported platform: ${platformKey}`);
+    error(`Unsupported platform: ${platformKey}`);
     return null;
   }
   const tag = version2 ?? await fetchLatestTag();
   if (!tag) {
-    error48("Could not determine latest release version.");
+    error("Could not determine latest release version.");
     return null;
   }
   const versionedCacheDir = join3(getCacheDir(), tag);
@@ -21811,22 +22186,22 @@ async function downloadBinary(version2) {
     }
     log(`Checksum verified (SHA-256: ${actualHash.slice(0, 16)}...)`);
     const tmpPath = `${binaryPath}.tmp`;
-    const { writeFileSync } = await import("fs");
-    writeFileSync(tmpPath, Buffer.from(arrayBuffer));
+    const { writeFileSync: writeFileSync2 } = await import("fs");
+    writeFileSync2(tmpPath, Buffer.from(arrayBuffer));
     if (process.platform !== "win32") {
       chmodSync(tmpPath, 493);
     }
-    const { renameSync } = await import("fs");
-    renameSync(tmpPath, binaryPath);
+    const { renameSync: renameSync2 } = await import("fs");
+    renameSync2(tmpPath, binaryPath);
     log(`AFT binary ready at ${binaryPath}`);
     return binaryPath;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    error48(`Failed to download AFT binary: ${msg}`);
+    error(`Failed to download AFT binary: ${msg}`);
     const tmpPath = `${binaryPath}.tmp`;
     if (existsSync2(tmpPath)) {
       try {
-        unlinkSync(tmpPath);
+        unlinkSync2(tmpPath);
       } catch {}
     }
     return null;
@@ -21875,12 +22250,12 @@ async function fetchLatestTag() {
 // src/hooks/auto-update-checker/cache.ts
 var import_comment_json3 = __toESM(require_src2(), 1);
 import { spawn } from "child_process";
-import { existsSync as existsSync4, readFileSync as readFileSync3, rmSync, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync3, rmSync, writeFileSync as writeFileSync3 } from "fs";
 import { basename, dirname as dirname2, join as join6 } from "path";
 
 // src/hooks/auto-update-checker/checker.ts
 var import_comment_json2 = __toESM(require_src2(), 1);
-import { existsSync as existsSync3, readFileSync as readFileSync2, statSync, writeFileSync } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync2, statSync, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir4 } from "os";
 import { dirname, isAbsolute, join as join5, resolve } from "path";
 import { fileURLToPath } from "url";
@@ -22151,7 +22526,7 @@ function removeFromBunLock(installDir, packageName) {
       modified = true;
     }
     if (modified) {
-      writeFileSync2(lockPath, JSON.stringify(lock, null, 2));
+      writeFileSync3(lockPath, JSON.stringify(lock, null, 2));
       log(`[auto-update-checker] Removed from bun.lock: ${packageName}`);
     }
     return modified;
@@ -22173,7 +22548,7 @@ function ensureDependencyVersion(packageJsonPath, packageName, version2) {
       return true;
     dependencies[packageName] = version2;
     nextPackageJson.dependencies = dependencies;
-    writeFileSync2(packageJsonPath, JSON.stringify(nextPackageJson, null, 2));
+    writeFileSync3(packageJsonPath, JSON.stringify(nextPackageJson, null, 2));
     log(`[auto-update-checker] Updated dependency in package.json: ${packageName} \u2192 ${version2}`);
     return true;
   } catch (err) {
@@ -22398,8 +22773,8 @@ import {
   openSync,
   readFileSync as readFileSync4,
   statSync as statSync2,
-  unlinkSync as unlinkSync2,
-  writeFileSync as writeFileSync3
+  unlinkSync as unlinkSync3,
+  writeFileSync as writeFileSync4
 } from "fs";
 import { homedir as homedir5 } from "os";
 import { join as join7 } from "path";
@@ -22450,7 +22825,7 @@ function writeInstalledMetaIn(installDir, version2, sha256) {
       installedAt: new Date().toISOString(),
       ...sha256 ? { sha256 } : {}
     };
-    writeFileSync3(join7(installDir, INSTALLED_META_FILE), JSON.stringify(meta3), "utf8");
+    writeFileSync4(join7(installDir, INSTALLED_META_FILE), JSON.stringify(meta3), "utf8");
   } catch (err) {
     log(`[lsp-cache] failed to write installed-meta in ${installDir}: ${err}`);
   }
@@ -22490,7 +22865,7 @@ function acquireInstallLock(lockKey) {
     try {
       const fd = openSync(lock, "wx");
       try {
-        writeFileSync3(fd, `${process.pid}
+        writeFileSync4(fd, `${process.pid}
 ${new Date().toISOString()}
 `);
       } finally {
@@ -22528,7 +22903,7 @@ ${new Date().toISOString()}
   }
   log(`[lsp] reclaiming install lock for ${lockKey} (owner_pid=${owningPid ?? "unknown"}, alive=${ownerAlive}, age_ms=${age})`);
   try {
-    unlinkSync2(lock);
+    unlinkSync3(lock);
   } catch {}
   return tryClaim();
 }
@@ -22565,7 +22940,7 @@ function releaseInstallLock(lockKey) {
       return;
     }
     try {
-      unlinkSync2(lock);
+      unlinkSync3(lock);
     } catch (unlinkErr) {
       const code = unlinkErr.code;
       if (code !== "ENOENT") {
@@ -22609,7 +22984,7 @@ function writeVersionCheck(npmPackage, latest) {
     last_checked: new Date().toISOString(),
     latest_eligible: latest
   };
-  writeFileSync3(file2, JSON.stringify(record2, null, 2));
+  writeFileSync4(file2, JSON.stringify(record2, null, 2));
 }
 function shouldRecheckVersion(record2, weeklyCheckIntervalMs = 7 * 24 * 60 * 60 * 1000) {
   if (!record2)
@@ -22968,7 +23343,7 @@ function runInstall(spec, version2, cwd, signal) {
       }
     });
     child.on("error", (err) => {
-      error48(`[lsp] install ${target} failed to spawn: ${err}`);
+      error(`[lsp] install ${target} failed to spawn: ${err}`);
       finish(false);
     });
     child.on("exit", (code) => {
@@ -22976,7 +23351,7 @@ function runInstall(spec, version2, cwd, signal) {
         log(`[lsp] installed ${target}`);
         finish(true);
       } else {
-        error48(`[lsp] install ${target} exited with code ${code}; last stderr:
+        error(`[lsp] install ${target} exited with code ${code}; last stderr:
 ${stderrBuf.trim()}`);
         finish(false);
       }
@@ -23005,7 +23380,7 @@ async function ensureServerInstalled(spec, config2, fetchImpl, signal) {
             return null;
           });
           if (currentHash && currentHash !== installedMeta.sha256) {
-            error48(`[lsp] ${spec.npm}@${version2}: TOFU sha256 mismatch \u2014 refusing to use ` + `tampered binary. Recorded ${installedMeta.sha256}, current ${currentHash}. ` + `Run \`aft doctor --clear\` to re-install from scratch.`);
+            error(`[lsp] ${spec.npm}@${version2}: TOFU sha256 mismatch \u2014 refusing to use ` + `tampered binary. Recorded ${installedMeta.sha256}, current ${currentHash}. ` + `Run \`aft doctor --clear\` to re-install from scratch.`);
             return {
               started: false,
               reason: `TOFU sha256 mismatch on ${spec.npm}@${version2} \u2014 see plugin log`
@@ -23021,7 +23396,7 @@ async function ensureServerInstalled(spec, config2, fetchImpl, signal) {
       }
     }
     const ok = await runInstall(spec, version2, cachedPackageDir(spec.npm), signal).catch((err) => {
-      error48(`[lsp] background install ${spec.npm} crashed: ${err}`);
+      error(`[lsp] background install ${spec.npm} crashed: ${err}`);
       return false;
     });
     if (!ok) {
@@ -23111,7 +23486,7 @@ function runAutoInstall(projectRoot, config2, fetchImpl = fetch) {
       installsStarted -= 1;
       const reason = err instanceof Error ? err.message : String(err);
       skipped.push({ id: spec.id, reason: `install error: ${reason}` });
-      error48(`[lsp] background install ${spec.npm} promise rejected: ${reason}`);
+      error(`[lsp] background install ${spec.npm} promise rejected: ${reason}`);
     });
     installPromises.push(trackInFlightAutoInstall(controller, promise2));
   }
@@ -23138,10 +23513,10 @@ import {
   readdirSync as readdirSync2,
   readlinkSync,
   realpathSync,
-  renameSync,
+  renameSync as renameSync2,
   rmSync as rmSync2,
   statSync as statSync4,
-  unlinkSync as unlinkSync3
+  unlinkSync as unlinkSync4
 } from "fs";
 import { dirname as dirname3, join as join9, relative, resolve as resolve2 } from "path";
 import { Readable } from "stream";
@@ -23456,7 +23831,7 @@ async function downloadFile(url2, destPath, fetchImpl, assetSize, signal) {
     await pipeline(nodeStream, createWriteStream(destPath), { signal: timeout.signal });
   } catch (err) {
     try {
-      unlinkSync3(destPath);
+      unlinkSync4(destPath);
     } catch {}
     throw err;
   } finally {
@@ -23525,7 +23900,7 @@ function extractArchiveSafely(archivePath, destDir, archiveType) {
     try {
       rmSync2(destDir, { recursive: true, force: true });
     } catch {}
-    renameSync(stagingDir, destDir);
+    renameSync2(stagingDir, destDir);
   } catch (err) {
     try {
       rmSync2(stagingDir, { recursive: true, force: true });
@@ -23583,16 +23958,16 @@ async function downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl,
   try {
     await downloadFile(matchingAsset.url, archivePath, fetchImpl, matchingAsset.size, signal);
   } catch (err) {
-    error48(`[lsp] download ${spec.id} failed: ${err}`);
+    error(`[lsp] download ${spec.id} failed: ${err}`);
     return null;
   }
   let archiveSha256;
   try {
     archiveSha256 = await sha256OfFile(archivePath);
   } catch (err) {
-    error48(`[lsp] hash ${spec.id} failed: ${err}`);
+    error(`[lsp] hash ${spec.id} failed: ${err}`);
     try {
-      unlinkSync3(archivePath);
+      unlinkSync4(archivePath);
     } catch {}
     return null;
   }
@@ -23600,9 +23975,9 @@ async function downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl,
   const previousMeta = readInstalledMetaIn(ghPackageDir(spec));
   if (previousMeta && previousMeta.version === tag && previousMeta.sha256) {
     if (previousMeta.sha256 !== archiveSha256) {
-      error48(`[lsp] ${spec.id} ${tag}: TOFU sha256 mismatch \u2014 refusing install. ` + `Previously installed sha256=${previousMeta.sha256}, downloaded sha256=${archiveSha256}. ` + `This means the published release for tag ${tag} changed. Investigate before proceeding. ` + `Run \`aft doctor --clear\` to wipe the cache and force a fresh install if you've verified the change.`);
+      error(`[lsp] ${spec.id} ${tag}: TOFU sha256 mismatch \u2014 refusing install. ` + `Previously installed sha256=${previousMeta.sha256}, downloaded sha256=${archiveSha256}. ` + `This means the published release for tag ${tag} changed. Investigate before proceeding. ` + `Run \`aft doctor --clear\` to wipe the cache and force a fresh install if you've verified the change.`);
       try {
-        unlinkSync3(archivePath);
+        unlinkSync4(archivePath);
       } catch {}
       return null;
     }
@@ -23610,16 +23985,16 @@ async function downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl,
   try {
     extractArchiveSafely(archivePath, extractDir, expected.archive);
   } catch (err) {
-    error48(`[lsp] extract ${spec.id} failed: ${err}`);
+    error(`[lsp] extract ${spec.id} failed: ${err}`);
     return null;
   } finally {
     try {
-      unlinkSync3(archivePath);
+      unlinkSync4(archivePath);
     } catch {}
   }
   const innerBinaryPath = join9(extractDir, spec.binaryPathInArchive(platform2, arch, version2));
   if (!existsSync6(innerBinaryPath)) {
-    error48(`[lsp] ${spec.id}: extracted binary not found at ${innerBinaryPath}`);
+    error(`[lsp] ${spec.id}: extracted binary not found at ${innerBinaryPath}`);
     return null;
   }
   const targetBinary = ghBinaryPath(spec, platform2);
@@ -23631,7 +24006,7 @@ async function downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl,
       chmodSync2(targetBinary, 493);
     }
   } catch (err) {
-    error48(`[lsp] ${spec.id}: failed to place binary at ${targetBinary}: ${err}`);
+    error(`[lsp] ${spec.id}: failed to place binary at ${targetBinary}: ${err}`);
     return null;
   }
   log(`[lsp] installed ${spec.id} ${tag} at ${targetBinary}`);
@@ -23662,7 +24037,7 @@ async function ensureGithubInstalled(spec, config2, fetchImpl, platform2, arch,
       }
     }
     const archiveSha256 = await downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl, signal).catch((err) => {
-      error48(`[lsp] github install ${spec.id} crashed: ${err}`);
+      error(`[lsp] github install ${spec.id} crashed: ${err}`);
       return null;
     });
     if (!archiveSha256) {
@@ -23739,7 +24114,7 @@ function runGithubAutoInstall(relevantServers, config2, fetchImpl = fetch) {
       installsStarted -= 1;
       const reason = err instanceof Error ? err.message : String(err);
       skipped.push({ id: spec.id, reason: `install error: ${reason}` });
-      error48(`[lsp] github install ${spec.id} promise rejected: ${reason}`);
+      error(`[lsp] github install ${spec.id} promise rejected: ${reason}`);
     });
     installPromises.push(trackInFlightGithubInstall(controller, promise2));
   }
@@ -23859,7 +24234,7 @@ function normalizeToolMap(tools) {
 }
 
 // src/notifications.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir6, platform as platform2 } from "os";
 import { join as join10 } from "path";
 function isTuiMode() {
@@ -24021,7 +24396,7 @@ async function sendFeatureAnnouncement(opts, version2, features, storageDir) {
   if (storageDir) {
     try {
       mkdirSync4(storageDir, { recursive: true });
-      writeFileSync4(join10(storageDir, "last_announced_version"), version2);
+      writeFileSync5(join10(storageDir, "last_announced_version"), version2);
     } catch {}
   }
 }
@@ -24048,7 +24423,7 @@ function writeWarnedTools(storageDir, warned) {
   try {
     mkdirSync4(storageDir, { recursive: true });
     const warnedToolsPath = join10(storageDir, WARNED_TOOLS_FILE);
-    writeFileSync4(warnedToolsPath, `${JSON.stringify(warned, null, 2)}
+    writeFileSync5(warnedToolsPath, `${JSON.stringify(warned, null, 2)}
 `);
   } catch {}
 }
@@ -24157,8 +24532,8 @@ import {
   rmSync as rmSync3,
   statSync as statSync5,
   symlinkSync,
-  unlinkSync as unlinkSync4,
-  writeFileSync as writeFileSync5
+  unlinkSync as unlinkSync5,
+  writeFileSync as writeFileSync6
 } from "fs";
 import { dirname as dirname4, join as join11, relative as relative2, resolve as resolve3 } from "path";
 import { Readable as Readable2 } from "stream";
@@ -24231,7 +24606,7 @@ async function ensureOnnxRuntime(storageDir) {
       try {
         const currentHash = sha256File(libPath);
         if (currentHash !== meta3.sha256) {
-          error48(`ONNX Runtime at ${ortDir}: TOFU sha256 mismatch \u2014 refusing to use ` + `tampered binary. Recorded ${meta3.sha256}, current ${currentHash}. ` + `Run \`aft doctor --clear\` to re-download from scratch.`);
+          error(`ONNX Runtime at ${ortDir}: TOFU sha256 mismatch \u2014 refusing to use ` + `tampered binary. Recorded ${meta3.sha256}, current ${currentHash}. ` + `Run \`aft doctor --clear\` to re-download from scratch.`);
         } else {
           log(`ONNX Runtime found at ${ortDir} (TOFU verified)`);
           return ortDir;
@@ -24316,7 +24691,7 @@ async function downloadFileWithCap(url2, destPath) {
     await pipeline2(nodeStream, createWriteStream2(destPath), { signal: controller.signal });
   } catch (err) {
     try {
-      unlinkSync4(destPath);
+      unlinkSync5(destPath);
     } catch {}
     throw err;
   } finally {
@@ -24377,7 +24752,7 @@ async function downloadOnnxRuntime(info, targetDir) {
       await extractZipArchive(archivePath, tmpDir);
     }
     try {
-      unlinkSync4(archivePath);
+      unlinkSync5(archivePath);
     } catch {}
     validateExtractedTree(tmpDir);
     const extractedDir = join11(tmpDir, info.assetName, "lib");
@@ -24418,7 +24793,7 @@ async function downloadOnnxRuntime(info, targetDir) {
     for (const link of symlinks) {
       const dst = join11(targetDir, link.name);
       try {
-        unlinkSync4(dst);
+        unlinkSync5(dst);
       } catch {}
       symlinkSync(link.target, dst);
     }
@@ -24434,7 +24809,7 @@ async function downloadOnnxRuntime(info, targetDir) {
     log(`ONNX Runtime v${ORT_VERSION} installed to ${targetDir}`);
     return targetDir;
   } catch (err) {
-    error48(`Failed to download ONNX Runtime: ${err}`);
+    error(`Failed to download ONNX Runtime: ${err}`);
     try {
       rmSync3(tmpDir, { recursive: true, force: true });
     } catch {}
@@ -24465,7 +24840,7 @@ function writeOnnxInstalledMeta(installDir, version2, sha256, archiveSha256) {
       ...sha256 ? { sha256 } : {},
       archiveSha256
     };
-    writeFileSync5(join11(installDir, ONNX_INSTALLED_META_FILE), JSON.stringify(meta3), "utf8");
+    writeFileSync6(join11(installDir, ONNX_INSTALLED_META_FILE), JSON.stringify(meta3), "utf8");
   } catch (err) {
     log(`[onnx] failed to write installed-meta in ${installDir}: ${err}`);
   }
@@ -24499,7 +24874,7 @@ function acquireLock(lockPath2) {
     try {
       const fd = openSync2(lockPath2, "wx");
       try {
-        writeFileSync5(fd, `${process.pid}
+        writeFileSync6(fd, `${process.pid}
 ${new Date().toISOString()}
 `);
       } finally {
@@ -24537,7 +24912,7 @@ ${new Date().toISOString()}
   }
   log(`[onnx] reclaiming install lock (owner_pid=${owningPid ?? "unknown"}, alive=${ownerAlive}, age_ms=${age})`);
   try {
-    unlinkSync4(lockPath2);
+    unlinkSync5(lockPath2);
   } catch {}
   return tryClaim();
 }
@@ -24562,7 +24937,7 @@ function releaseLock(lockPath2) {
       return;
     }
     try {
-      unlinkSync4(lockPath2);
+      unlinkSync5(lockPath2);
     } catch (unlinkErr) {
       const code = unlinkErr.code;
       if (code !== "ENOENT") {
@@ -24698,6 +25073,9 @@ class BinaryBridge {
     if (this._shuttingDown) {
       throw new Error(`[aft-plugin] Bridge is shutting down, cannot send "${command}"`);
     }
+    if (Object.hasOwn(params, "id")) {
+      throw new Error("params cannot contain reserved key 'id'");
+    }
     this.ensureSpawned();
     if (!this.configured) {
       if (command !== "configure" && command !== "version") {
@@ -24726,18 +25104,37 @@ class BinaryBridge {
       }
     }
     const id = String(this.nextId++);
-    const request = { id, command, ...params };
+    let request;
+    if (Object.hasOwn(params, "command") || Object.hasOwn(params, "method")) {
+      const nested = { ...params };
+      const reserved = {};
+      for (const key of ["session_id", "lsp_hints"]) {
+        if (Object.hasOwn(nested, key)) {
+          reserved[key] = nested[key];
+          delete nested[key];
+        }
+      }
+      request = { id, command, ...reserved, params: nested };
+    } else {
+      request = { id, command, ...params };
+    }
     const line = `${JSON.stringify(request)}
 `;
-    const effectiveTimeoutMs = options?.timeoutMs ?? this.timeoutMs;
+    const effectiveTimeoutMs = options?.transportTimeoutMs ?? options?.timeoutMs ?? this.timeoutMs;
+    const requestSessionId = typeof params.session_id === "string" && params.session_id.length > 0 ? params.session_id : undefined;
     return new Promise((resolve4, reject) => {
       const timer = setTimeout(() => {
         this.pending.delete(id);
-        warn(`Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms \u2014 restarting bridge`);
+        const timeoutMsg = `Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms \u2014 restarting bridge`;
+        if (requestSessionId) {
+          sessionWarn(requestSessionId, timeoutMsg);
+        } else {
+          warn(timeoutMsg);
+        }
         reject(new Error(`[aft-plugin] Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
         this.handleTimeout();
       }, effectiveTimeoutMs);
-      this.pending.set(id, { resolve: resolve4, reject, timer });
+      this.pending.set(id, { resolve: resolve4, reject, timer, onProgress: options?.onProgress });
       if (!this.process?.stdin?.writable) {
         this.pending.delete(id);
         clearTimeout(timer);
@@ -24865,7 +25262,7 @@ class BinaryBridge {
     child.on("error", (err) => {
       if (this.process !== currentChild)
         return;
-      error48(`Process error: ${err.message}${this.formatStderrTail()}`);
+      error(`Process error: ${err.message}${this.formatStderrTail()}`);
       this.handleCrash();
     });
     child.on("exit", (code, signal) => {
@@ -24917,6 +25314,29 @@ class BinaryBridge {
         continue;
       try {
         const response = JSON.parse(line);
+        if (response.type === "progress") {
+          const requestId = response.request_id;
+          const entry = requestId ? this.pending.get(requestId) : undefined;
+          const kind = response.kind === "stderr" ? "stderr" : "stdout";
+          const text = typeof response.chunk === "string" ? response.chunk : "";
+          entry?.onProgress?.({ kind, text });
+          continue;
+        }
+        if (response.type === "permission_ask") {
+          const requestId = response.request_id;
+          const entry = requestId ? this.pending.get(requestId) : undefined;
+          if (requestId && entry) {
+            this.pending.delete(requestId);
+            clearTimeout(entry.timer);
+            entry.resolve({
+              success: false,
+              code: "permission_required",
+              message: "bash command requires permission",
+              asks: response.asks
+            });
+          }
+          continue;
+        }
         const id = response.id;
         if (id && this.pending.has(id)) {
           const entry = this.pending.get(id);
@@ -24941,7 +25361,11 @@ class BinaryBridge {
     this.configured = false;
     const tail = this.formatStderrTail();
     this.stderrTail = [];
-    this.rejectAllPending(new Error(`[aft-plugin] Bridge restarted after timeout${tail}`));
+    if (tail) {
+      error(`Bridge killed after timeout.${tail}`);
+    } else {
+      warn(`Bridge killed after timeout (see ${getLogFilePath()})`);
+    }
   }
   handleCrash(cause) {
     const proc = this.process;
@@ -24952,7 +25376,10 @@ class BinaryBridge {
     this.clearRestartResetTimer();
     this.configured = false;
     const tail = this.formatStderrTail();
-    this.rejectAllPending(new Error(`[aft-plugin] Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""}${tail}`));
+    if (tail) {
+      error(`Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""}.${tail}`);
+    }
+    this.rejectAllPending(new Error(`[aft-plugin] Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""} (see ${getLogFilePath()})`));
     if (this._restartCount < this.maxRestarts) {
       const delay = 100 * 2 ** this._restartCount;
       this._restartCount++;
@@ -24962,13 +25389,13 @@ class BinaryBridge {
           try {
             this.spawnProcess();
           } catch (err) {
-            error48(`Failed to restart: ${err.message}`);
+            error(`Failed to restart: ${err.message}`);
           }
         }
       }, delay);
       this.scheduleRestartCountReset();
     } else {
-      error48(`Max restarts (${this.maxRestarts}) reached, giving up. Logs: ${getLogFilePath()}${tail}`);
+      error(`Max restarts (${this.maxRestarts}) reached, giving up. Logs: ${getLogFilePath()}${tail}`);
       this.scheduleRestartCountReset();
     }
   }
@@ -25057,7 +25484,7 @@ class BridgePool {
     const now = Date.now();
     for (const [dir, entry] of this.bridges) {
       if (now - entry.lastUsed > this.idleTimeoutMs) {
-        entry.bridge.shutdown().catch((err) => error48("cleanup shutdown failed:", err));
+        entry.bridge.shutdown().catch((err) => error("cleanup shutdown failed:", err));
         this.bridges.delete(dir);
       }
     }
@@ -25073,7 +25500,7 @@ class BridgePool {
     }
     if (oldestDir) {
       const entry = this.bridges.get(oldestDir);
-      entry?.bridge.shutdown().catch((err) => error48("eviction shutdown failed:", err));
+      entry?.bridge.shutdown().catch((err) => error("eviction shutdown failed:", err));
       this.bridges.delete(oldestDir);
     }
   }
@@ -25103,7 +25530,7 @@ function normalizeKey(projectRoot) {
 
 // src/resolver.ts
 import { execSync, spawnSync } from "child_process";
-import { chmodSync as chmodSync3, copyFileSync as copyFileSync3, existsSync as existsSync9, mkdirSync as mkdirSync6, renameSync as renameSync2 } from "fs";
+import { chmodSync as chmodSync3, copyFileSync as copyFileSync3, existsSync as existsSync9, mkdirSync as mkdirSync6, renameSync as renameSync3 } from "fs";
 import { createRequire } from "module";
 import { homedir as homedir8 } from "os";
 import { join as join13 } from "path";
@@ -25131,7 +25558,7 @@ function copyToVersionedCache(npmBinaryPath) {
     if (process.platform !== "win32") {
       chmodSync3(tmpPath, 493);
     }
-    renameSync2(tmpPath, cachedPath);
+    renameSync3(tmpPath, cachedPath);
     log(`Copied npm binary to versioned cache: ${cachedPath}`);
     return cachedPath;
   } catch (err) {
@@ -25221,7 +25648,7 @@ async function findBinary() {
 
 // src/shared/rpc-server.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { mkdirSync as mkdirSync7, renameSync as renameSync3, unlinkSync as unlinkSync5, writeFileSync as writeFileSync6 } from "fs";
+import { mkdirSync as mkdirSync7, renameSync as renameSync4, unlinkSync as unlinkSync6, writeFileSync as writeFileSync7 } from "fs";
 import { createServer } from "http";
 import { dirname as dirname5 } from "path";
 
@@ -25270,8 +25697,8 @@ class AftRpcServer {
           const dir = dirname5(this.portFilePath);
           mkdirSync7(dir, { recursive: true });
           const tmpPath = `${this.portFilePath}.tmp`;
-          writeFileSync6(tmpPath, JSON.stringify({ port: this.port, token: this.token }), "utf-8");
-          renameSync3(tmpPath, this.portFilePath);
+          writeFileSync7(tmpPath, JSON.stringify({ port: this.port, token: this.token }), "utf-8");
+          renameSync4(tmpPath, this.portFilePath);
           log(`RPC server listening on 127.0.0.1:${this.port}`);
         } catch (err) {
           warn(`Failed to write RPC port file: ${err}`);
@@ -25288,7 +25715,7 @@ class AftRpcServer {
     }
     this.token = null;
     try {
-      unlinkSync5(this.portFilePath);
+      unlinkSync6(this.portFilePath);
     } catch {}
   }
   dispatch(req, res) {
@@ -25418,8 +25845,8 @@ function coerceAftStatus(response) {
       format_on_edit: readBoolean(features.format_on_edit),
       validate_on_edit: readString(features.validate_on_edit, "off"),
       restrict_to_project_root: readBoolean(features.restrict_to_project_root),
-      experimental_search_index: readBoolean(features.experimental_search_index),
-      experimental_semantic_search: readBoolean(features.experimental_semantic_search)
+      search_index: readBoolean(features.search_index ?? features.experimental_search_index),
+      semantic_search: readBoolean(features.semantic_search ?? features.experimental_semantic_search)
     },
     search_index: {
       status: readString(searchIndex.status, "unknown"),
@@ -25466,8 +25893,8 @@ function formatStatusMarkdown(status) {
     "",
     "### Enabled features",
     `- \`format_on_edit\`: ${formatFlag(status.features.format_on_edit)}`,
-    `- \`experimental_search_index\`: ${formatFlag(status.features.experimental_search_index)}`,
-    `- \`experimental_semantic_search\`: ${formatFlag(status.features.experimental_semantic_search)}`,
+    `- \`search_index\`: ${formatFlag(status.features.search_index)}`,
+    `- \`semantic_search\`: ${formatFlag(status.features.semantic_search)}`,
     "",
     "### Search index",
     `- **Status:** \`${status.search_index.status}\``,
@@ -25510,7 +25937,7 @@ function formatStatusMarkdown(status) {
 
 // src/shared/tui-config.ts
 var import_comment_json4 = __toESM(require_src2(), 1);
-import { existsSync as existsSync10, mkdirSync as mkdirSync8, readFileSync as readFileSync7, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync8, readFileSync as readFileSync7, writeFileSync as writeFileSync8 } from "fs";
 import { dirname as dirname6, join as join16 } from "path";
 
 // src/shared/opencode-config-dir.ts
@@ -25567,7 +25994,7 @@ function ensureTuiPluginEntry() {
     plugins.push(PLUGIN_ENTRY);
     config2.plugin = plugins;
     mkdirSync8(dirname6(configPath), { recursive: true });
-    writeFileSync7(configPath, `${import_comment_json4.stringify(config2, null, 2)}
+    writeFileSync8(configPath, `${import_comment_json4.stringify(config2, null, 2)}
 `);
     log(`[aft-plugin] added TUI plugin entry to ${configPath}`);
     return true;
@@ -25585,8 +26012,8 @@ import {
   mkdirSync as mkdirSync9,
   readdirSync as readdirSync4,
   readFileSync as readFileSync8,
-  unlinkSync as unlinkSync6,
-  writeFileSync as writeFileSync8
+  unlinkSync as unlinkSync7,
+  writeFileSync as writeFileSync9
 } from "fs";
 import { isIP } from "net";
 import { join as join17 } from "path";
@@ -25816,9 +26243,9 @@ async function fetchUrlToTempFile(url2, storageDir, options = {}) {
   const body = Buffer.concat(chunks);
   const contentFile = contentPath(storageDir, hash2, extension);
   const tmpContent = `${contentFile}.tmp-${process.pid}`;
-  writeFileSync8(tmpContent, body);
-  const { renameSync: renameSync4 } = await import("fs");
-  renameSync4(tmpContent, contentFile);
+  writeFileSync9(tmpContent, body);
+  const { renameSync: renameSync5 } = await import("fs");
+  renameSync5(tmpContent, contentFile);
   const meta3 = {
     url: url2,
     contentType,
@@ -25826,8 +26253,8 @@ async function fetchUrlToTempFile(url2, storageDir, options = {}) {
     fetchedAt: Date.now()
   };
   const tmpMeta = `${metaFile}.tmp-${process.pid}`;
-  writeFileSync8(tmpMeta, JSON.stringify(meta3));
-  renameSync4(tmpMeta, metaFile);
+  writeFileSync9(tmpMeta, JSON.stringify(meta3));
+  renameSync5(tmpMeta, metaFile);
   log(`URL cached (${total} bytes): ${url2}`);
   return contentFile;
 }
@@ -25848,13 +26275,13 @@ function cleanupUrlCache(storageDir) {
           const hash2 = entry.slice(0, -".meta.json".length);
           const content = contentPath(storageDir, hash2, meta3.extension);
           if (existsSync11(content))
-            unlinkSync6(content);
-          unlinkSync6(metaFile);
+            unlinkSync7(content);
+          unlinkSync7(metaFile);
           removed++;
         }
       } catch {
         try {
-          unlinkSync6(metaFile);
+          unlinkSync7(metaFile);
           removed++;
         } catch {}
       }
@@ -25950,7 +26377,7 @@ function projectRootFor(runtime) {
 function bridgeFor(ctx, runtime) {
   return ctx.pool.getBridge(projectRootFor(runtime));
 }
-function callBridge(ctx, runtime, command, params = {}) {
+function callBridge(ctx, runtime, command, params = {}, options) {
   const merged = { ...params };
   if (runtime.sessionID) {
     merged.session_id = runtime.sessionID;
@@ -25958,9 +26385,13 @@ function callBridge(ctx, runtime, command, params = {}) {
   const timeoutMs = timeoutForCommand(command);
   const sendOptions = {
     ...timeoutMs !== undefined ? { timeoutMs } : {},
-    configureWarningClient: ctx.client
+    configureWarningClient: ctx.client,
+    ...options
   };
-  return bridgeFor(ctx, runtime).send(command, merged, Object.keys(sendOptions).length > 0 ? sendOptions : undefined);
+  return bridgeFor(ctx, runtime).send(command, merged, Object.keys(sendOptions).length > 0 ? sendOptions : undefined).then((response) => {
+    ingestBgCompletions(runtime.sessionID, response.bg_completions);
+    return response;
+  });
 }
 
 // src/tools/permissions.ts
@@ -26139,7 +26570,7 @@ ${hint}`;
 
 ` + `**Warning: This tool modifies files directly.** Use dryRun=true to preview. Consider creating an aft_safety checkpoint before bulk replacements.
 
-` + "Returns: Text summary \u2014 'Replaced N match(es) across M file(s)' (or '[DRY RUN] Would replace...') followed by file:line blocks with before/after text.",
+` + "Returns: Text summary \u2014 'Replaced N match(es) across M file(s)' (or '[DRY RUN] Would replace...') followed by per-file output. In dry-run mode, each file is shown with its unified diff so you can verify the rewrite before applying (e.g. catch literal $$$ from anonymous-variadic typos). Diff preview is capped at 8KB total; remaining files are summarized.",
     args: {
       pattern: z2.string().describe("AST pattern with meta-variables ($VAR, $$$). Must be complete AST node."),
       rewrite: z2.string().describe("Replacement pattern (can use $VAR from pattern)"),
@@ -26205,7 +26636,36 @@ ${data.scope_warnings.map((w) => `  ${w}`).join(`
 ` : `Replaced ${matchCount} match(es) in ${filesWithMatches} file(s) (${filesSearched} searched)
 
 `;
-        if (data.matches) {
+        if (isDryRun && data.files && data.files.length > 0) {
+          const MAX_DIFF_BYTES = 8 * 1024;
+          let used = 0;
+          let filesShown = 0;
+          for (const f of data.files) {
+            const relFile = f.file ?? "unknown";
+            const reps = f.replacements ?? 0;
+            const diff = f.diff ?? "";
+            if (used + diff.length > MAX_DIFF_BYTES) {
+              const remaining = data.files.length - filesShown;
+              if (remaining > 0) {
+                output += `
+... (${remaining} more file(s) omitted from preview to stay under ${MAX_DIFF_BYTES / 1024}KB; total ${matchCount} replacements across ${filesWithMatches} files)
+`;
+              }
+              break;
+            }
+            output += `${relFile} (${reps} replacement${reps === 1 ? "" : "s"}):
+`;
+            output += diff;
+            if (!diff.endsWith(`
+`))
+              output += `
+`;
+            output += `
+`;
+            used += diff.length;
+            filesShown += 1;
+          }
+        } else if (data.matches) {
           for (const m of data.matches) {
             const relFile = m.file ?? "unknown";
             const line = m.line ?? 0;
@@ -26218,6 +26678,13 @@ ${data.scope_warnings.map((w) => `  ${w}`).join(`
 `;
             }
             output += `
+`;
+          }
+        } else if (data.files && data.files.length > 0) {
+          for (const f of data.files) {
+            const relFile = f.file ?? "unknown";
+            const reps = f.replacements ?? 0;
+            output += `  ${relFile}: ${reps} replacement${reps === 1 ? "" : "s"}
 `;
           }
         }
@@ -26253,7 +26720,7 @@ function conflictTools(ctx) {
 // src/tools/hoisted.ts
 import * as fs3 from "fs";
 import * as path4 from "path";
-import { tool as tool3 } from "@opencode-ai/plugin";
+import { tool as tool4 } from "@opencode-ai/plugin";
 
 // src/patch-parser.ts
 function stripHeredoc(input) {
@@ -26388,6 +26855,9 @@ function parsePatch(patchText) {
 function normalizeUnicode(str) {
   return str.replace(/[\u2018\u2019\u201A\u201B]/g, "'").replace(/[\u201C\u201D\u201E\u201F]/g, '"').replace(/[\u2010\u2011\u2012\u2013\u2014\u2015]/g, "-").replace(/\u2026/g, "...").replace(/\u00A0/g, " ");
 }
+function normalizeIndent(str) {
+  return str.replace(/^[\t ]+/, (m) => " ".repeat(m.length));
+}
 function tryMatch(lines, pattern, startIndex, compare, eof) {
   if (eof) {
     const fromEnd = lines.length - pattern.length;
@@ -26416,19 +26886,58 @@ function tryMatch(lines, pattern, startIndex, compare, eof) {
   }
   return -1;
 }
-function seekSequence(lines, pattern, startIndex, eof = false) {
+function seekSequenceTiered(lines, pattern, startIndex, eof = false) {
   if (pattern.length === 0)
-    return -1;
+    return null;
   const exact = tryMatch(lines, pattern, startIndex, (a, b) => a === b, eof);
   if (exact !== -1)
-    return exact;
+    return { found: exact, tier: "exact" };
   const rstrip = tryMatch(lines, pattern, startIndex, (a, b) => a.trimEnd() === b.trimEnd(), eof);
   if (rstrip !== -1)
-    return rstrip;
+    return { found: rstrip, tier: "rstrip" };
   const trim = tryMatch(lines, pattern, startIndex, (a, b) => a.trim() === b.trim(), eof);
   if (trim !== -1)
-    return trim;
-  return tryMatch(lines, pattern, startIndex, (a, b) => normalizeUnicode(a.trim()) === normalizeUnicode(b.trim()), eof);
+    return { found: trim, tier: "trim" };
+  const indent = tryMatch(lines, pattern, startIndex, (a, b) => normalizeIndent(a).trimEnd() === normalizeIndent(b).trimEnd(), eof);
+  if (indent !== -1)
+    return { found: indent, tier: "indent" };
+  const unicode = tryMatch(lines, pattern, startIndex, (a, b) => normalizeUnicode(a.trim()) === normalizeUnicode(b.trim()), eof);
+  if (unicode !== -1)
+    return { found: unicode, tier: "unicode" };
+  return null;
+}
+function seekSequence(lines, pattern, startIndex, eof = false) {
+  const r = seekSequenceTiered(lines, pattern, startIndex, eof);
+  return r ? r.found : -1;
+}
+function findClosestPartialMatch(lines, pattern) {
+  if (pattern.length === 0 || lines.length === 0)
+    return null;
+  const compareAny = (a, b) => a === b || a.trimEnd() === b.trimEnd() || a.trim() === b.trim() || normalizeIndent(a).trimEnd() === normalizeIndent(b).trimEnd() || normalizeUnicode(a.trim()) === normalizeUnicode(b.trim());
+  const candidates = [];
+  for (let i = 0;i < lines.length && candidates.length < 16; i++) {
+    if (compareAny(lines[i], pattern[0]))
+      candidates.push(i);
+  }
+  if (candidates.length === 0)
+    return null;
+  let best = { lineNumber: -1, matchedLines: 0, firstDivergence: -1 };
+  for (const start of candidates) {
+    let matched = 0;
+    for (let j = 0;j < pattern.length && start + j < lines.length; j++) {
+      if (!compareAny(lines[start + j], pattern[j]))
+        break;
+      matched++;
+    }
+    if (matched > best.matchedLines) {
+      best = {
+        lineNumber: start + 1,
+        matchedLines: matched,
+        firstDivergence: matched
+      };
+    }
+  }
+  return best.lineNumber === -1 ? null : best;
 }
 function applyUpdateChunks(originalContent, filePath, chunks) {
   const originalLines = originalContent.split(`
@@ -26465,9 +26974,30 @@ function applyUpdateChunks(originalContent, filePath, chunks) {
       replacements.push([found, pattern.length, newSlice]);
       lineIndex = found + pattern.length;
     } else {
+      const newSliceTrimmed = newSlice.filter((line) => line.trim().length > 0);
+      const alreadyApplied = newSliceTrimmed.length > 0 && seekSequence(originalLines, newSliceTrimmed, 0, chunk.is_end_of_file) !== -1;
+      const closest = findClosestPartialMatch(originalLines, pattern);
+      let closestHint = "";
+      if (closest && closest.matchedLines > 0) {
+        const fileLineNo = closest.lineNumber + closest.firstDivergence;
+        const expectedLine = pattern[closest.firstDivergence];
+        const actualLine = fileLineNo - 1 < originalLines.length ? originalLines[fileLineNo - 1] : "<EOF>";
+        closestHint = `
+
+Closest match starts at line ${closest.lineNumber} ` + `(${closest.matchedLines} of ${pattern.length} lines matched).
+` + `First divergence at line ${fileLineNo}:
+` + `  expected: ${JSON.stringify(expectedLine)}
+` + `  actual:   ${JSON.stringify(actualLine)}`;
+      }
+      const triedTiers = "exact, trimEnd, trim, indent (tab/space), unicode";
+      const alreadyAppliedHint = alreadyApplied ? `
+
+Hint: the replacement content for this hunk already appears in the file. ` + "The patch may have been partially applied in a prior turn \u2014 re-read the file " + "to confirm which hunks still need to apply." : "";
       throw new Error(`Failed to find expected lines in ${filePath}:
 ${chunk.old_lines.join(`
-`)}`);
+`)}
+
+` + `Tried match tiers: ${triedTiers}.${closestHint}${alreadyAppliedHint}`);
     }
   }
   replacements.sort((a, b) => a[0] - b[0]);
@@ -26483,14 +27013,163 @@ ${chunk.old_lines.join(`
 `);
 }
 
-// src/tools/hoisted.ts
+// src/tools/bash.ts
+import { tool as tool3 } from "@opencode-ai/plugin";
+var z3 = tool3.schema;
+var METADATA_PREVIEW_LIMIT = 30 * 1024;
+var DEFAULT_BASH_TIMEOUT_MS = 120000;
+var BASH_TRANSPORT_TIMEOUT_OVERHEAD_MS = 5000;
+var BASH_DESCRIPTION = `Hoisted bash tool with output compression, command rewriting to AFT tools, and optional background execution. By default, output is compressed; pass compressed: false for raw output. Pass background: true to spawn in the background and get a task_id for bash_status/bash_kill.`;
+async function withPermissionLoop(ctx, runtime, params, bridgeCall, options) {
+  const first = await bridgeCall(ctx, runtime, "bash", params, options);
+  if (first.success !== false || first.code !== "permission_required")
+    return first;
+  const asks = Array.isArray(first.asks) ? first.asks : [];
+  const permissionsGranted = [];
+  for (const ask of asks) {
+    const permission = ask.kind === "external_directory" ? "external_directory" : "bash";
+    await runtime.ask({
+      permission,
+      patterns: ask.patterns,
+      always: ask.always,
+      metadata: {}
+    });
+    permissionsGranted.push(...ask.always.length > 0 ? ask.always : ask.patterns);
+  }
+  const second = await bridgeCall(ctx, runtime, "bash", { ...params, permissions_granted: permissionsGranted }, options);
+  if (second.success === false && second.code === "permission_required") {
+    throw new Error("bash permission retry failed");
+  }
+  return second;
+}
+function createBashTool(ctx) {
+  return {
+    description: BASH_DESCRIPTION,
+    args: {
+      command: z3.string().describe("Shell command to execute through AFT's unified bash schema. Supports normal shell syntax, pipes, redirection, and command rewriting to dedicated AFT tools when available."),
+      timeout: z3.number().optional().describe("Maximum execution time in milliseconds for foreground commands. Defaults to 120000 (2 minutes) when omitted."),
+      workdir: z3.string().optional().describe("Working directory for command execution. Relative paths resolve through the bridge; defaults to the current tool context/project root when omitted."),
+      description: z3.string().optional().describe("Short 5-10 word human-readable summary shown in OpenCode UI metadata instead of raw shell syntax."),
+      background: z3.boolean().optional().describe("When true, spawn the command in the background and return a task_id for bash_status/bash_kill instead of waiting for completion. Defaults to false."),
+      compressed: z3.boolean().optional().describe("When true or omitted, return compressed output with noisy terminal control sequences reduced. Set to false for raw output.")
+    },
+    execute: async (args, context) => {
+      let accumulatedOutput = "";
+      const description = args.description;
+      const metadata = context.metadata;
+      const command = args.command;
+      const cwd = args.workdir ?? context.directory;
+      const shellEnv = await ctx.plugin?.trigger?.("shell.env", { cwd, sessionID: context.sessionID, callID: getCallID(context) }, { env: {} });
+      const data = await withPermissionLoop(ctx, context, {
+        command,
+        timeout: args.timeout,
+        workdir: args.workdir,
+        env: shellEnv?.env ?? {},
+        description,
+        background: args.background,
+        compressed: args.compressed,
+        permissions_requested: true
+      }, callBridge, {
+        transportTimeoutMs: bashTransportTimeoutMs(args.timeout),
+        onProgress: ({ text }) => {
+          accumulatedOutput = preview(accumulatedOutput + text);
+          metadata?.({ output: accumulatedOutput, description });
+        }
+      });
+      if (data.success === false) {
+        throw new Error(data.message || "bash failed");
+      }
+      if (data.status === "running" && typeof data.task_id === "string") {
+        const callID2 = getCallID(context);
+        const taskId = data.task_id;
+        trackBgTask(context.sessionID, taskId);
+        const startedLine = `Background task started: ${taskId}`;
+        const metadataPayload2 = { description, output: startedLine, status: "running", taskId };
+        metadata?.(metadataPayload2);
+        if (callID2) {
+          storeToolMetadata(context.sessionID, callID2, {
+            title: description ?? shortenCommand(command),
+            metadata: metadataPayload2
+          });
+        }
+        return startedLine;
+      }
+      const output = data.output ?? "";
+      const metadataOutput = preview(output);
+      const exit = data.exit_code;
+      const truncated = data.truncated;
+      const outputPath = data.output_path;
+      const timedOut = data.timed_out === true;
+      const callID = getCallID(context);
+      const metadataPayload = {
+        description,
+        output: metadataOutput,
+        exit,
+        truncated,
+        ...outputPath ? { outputPath } : {}
+      };
+      metadata?.(metadataPayload);
+      if (callID) {
+        storeToolMetadata(context.sessionID, callID, {
+          title: description ?? shortenCommand(command),
+          metadata: metadataPayload
+        });
+      }
+      let rendered = output;
+      if (truncated && outputPath) {
+        rendered += `
+[output truncated; full output at ${outputPath}]`;
+      }
+      if (timedOut) {
+        rendered += `
+[command timed out]`;
+      }
+      if (typeof exit === "number" && exit !== 0) {
+        rendered += `
+[exit code: ${exit}]`;
+      }
+      return rendered;
+    }
+  };
+}
+function bashTransportTimeoutMs(timeout) {
+  const bashTimeout = timeout ?? DEFAULT_BASH_TIMEOUT_MS;
+  return Math.max(30000, bashTimeout + BASH_TRANSPORT_TIMEOUT_OVERHEAD_MS);
+}
+function preview(output) {
+  return output.length <= METADATA_PREVIEW_LIMIT ? output : output.slice(-METADATA_PREVIEW_LIMIT);
+}
 function getCallID(ctx) {
   const c = ctx;
   return c.callID ?? c.callId ?? c.call_id;
 }
+function shortenCommand(command) {
+  const collapsed = command.replace(/\s+/g, " ").trim();
+  return collapsed.length <= 80 ? collapsed : `${collapsed.slice(0, 77)}...`;
+}
+
+// src/tools/hoisted.ts
+function getCallID2(ctx) {
+  const c = ctx;
+  return c.callID ?? c.callId ?? c.call_id;
+}
 function relativeToWorktree(fp, worktree) {
   return path4.relative(worktree, fp);
 }
+function formatReadFooter(agentSpecifiedRange, data) {
+  if (agentSpecifiedRange)
+    return "";
+  if (!data.truncated)
+    return "";
+  const startLine = data.start_line;
+  const endLine = data.end_line;
+  const totalLines = data.total_lines;
+  if (startLine === undefined || endLine === undefined || totalLines === undefined) {
+    return "";
+  }
+  return `
+(Showing lines ${startLine}-${endLine} of ${totalLines}. Use startLine/endLine to read other sections.)`;
+}
 function buildUnifiedDiff(fp, before, after) {
   const SIZE_CAP = 100 * 1024;
   if (before.length > SIZE_CAP || after.length > SIZE_CAP) {
@@ -26677,7 +27356,7 @@ function inferBeforeStart(ops, from, beforeLen) {
   }
   return beforeLen;
 }
-var z3 = tool3.schema;
+var z4 = tool4.schema;
 var READ_DESCRIPTION = `Read file contents or list directory entries.
 
 Use either startLine/endLine OR offset/limit to read a section of a file.
@@ -26701,11 +27380,11 @@ function createReadTool(ctx) {
   return {
     description: READ_DESCRIPTION,
     args: {
-      filePath: z3.string().describe("Path to file or directory (absolute or relative to project root)"),
-      startLine: z3.number().optional().describe("1-based line to start reading from"),
-      endLine: z3.number().optional().describe("1-based line to stop reading at (inclusive)"),
-      limit: z3.number().optional().describe("Max lines to return (default: 2000)"),
-      offset: z3.number().optional().describe("1-based line number to start reading from (use with limit). Ignored if startLine is provided")
+      filePath: z4.string().describe("Path to file or directory (absolute or relative to project root)"),
+      startLine: z4.number().optional().describe("1-based line to start reading from"),
+      endLine: z4.number().optional().describe("1-based line to stop reading at (inclusive)"),
+      limit: z4.number().optional().describe("Max lines to return (default: 2000)"),
+      offset: z4.number().optional().describe("1-based line number to start reading from (use with limit). Ignored if startLine is provided")
     },
     execute: async (args, context) => {
       const file2 = args.filePath;
@@ -26743,7 +27422,7 @@ function createReadTool(ctx) {
         } catch {}
         const sizeStr = fileSize > 1048576 ? `${(fileSize / 1048576).toFixed(1)}MB` : fileSize > 1024 ? `${(fileSize / 1024).toFixed(0)}KB` : `${fileSize} bytes`;
         const msg = `${label} read successfully`;
-        const imgCallID = getCallID(context);
+        const imgCallID = getCallID2(context);
         if (imgCallID) {
           storeToolMetadata(context.sessionID, imgCallID, {
             title: path4.relative(context.worktree, filePath),
@@ -26776,7 +27455,7 @@ function createReadTool(ctx) {
       if (data.success === false) {
         throw new Error(data.message || "read failed");
       }
-      const readCallID = getCallID(context);
+      const readCallID = getCallID2(context);
       if (data.entries) {
         if (readCallID) {
           const dp = relativeToWorktree(filePath, context.worktree) || file2;
@@ -26797,10 +27476,10 @@ function createReadTool(ctx) {
         storeToolMetadata(context.sessionID, readCallID, { title: dp, metadata: { title: dp } });
       }
       let output = data.content;
-      if (data.truncated) {
-        output += `
-(Showing lines ${data.start_line}-${data.end_line} of ${data.total_lines}. Use startLine/endLine to read other sections.)`;
-      }
+      const agentSpecifiedRange = args.startLine !== undefined || args.endLine !== undefined || args.offset !== undefined || args.limit !== undefined;
+      const footer = formatReadFooter(agentSpecifiedRange, data);
+      if (footer)
+        output += footer;
       return output;
     }
   };
@@ -26826,8 +27505,8 @@ function createWriteTool(ctx, editToolName = "edit") {
   return {
     description: getWriteDescription(editToolName),
     args: {
-      filePath: z3.string().describe("Path to the file to write (absolute or relative to project root)"),
-      content: z3.string().describe("The full content to write to the file")
+      filePath: z4.string().describe("Path to the file to write (absolute or relative to project root)"),
+      content: z4.string().describe("The full content to write to the file")
     },
     execute: async (args, context) => {
       const file2 = args.filePath;
@@ -26880,7 +27559,7 @@ Note: LSP server(s) did not respond in time: ${pendingServers.join(", ")}. Diagn
 Note: LSP server(s) exited during this edit: ${exitedServers.join(", ")}. Their diagnostics could not be collected.`;
       }
       const diff = data.diff;
-      const callID = getCallID(context);
+      const callID = getCallID2(context);
       if (callID) {
         const dp = relativeToWorktree(filePath, context.worktree);
         const beforeContent = diff?.before ?? "";
@@ -26909,7 +27588,7 @@ function getEditDescription(writeToolName) {
 
 **Modes** (determined by which parameters you provide):
 
-Mode priority: operations > edits > symbol (without oldString) > oldString (find/replace). If none match, the call is rejected \u2014 there is no implicit "write" fallback.
+Mode priority: operations > appendContent > edits > symbol (without oldString) > oldString (find/replace). If none match, the call is rejected \u2014 there is no implicit "write" fallback.
 
 1. **Multi-file transaction** \u2014 pass \`operations\` array
    Edits across multiple files with checkpoint-based rollback on failure.
@@ -26917,33 +27596,37 @@ Mode priority: operations > edits > symbol (without oldString) > oldString (find
    For \`edit_match\`: include \`match\`, \`replacement\`. For \`write\`: include \`content\`.
    Example: \`{ "operations": [{ "file": "a.ts", "command": "edit_match", "match": "old", "replacement": "new" }, { "file": "b.ts", "command": "write", "content": "..." }] }\`
 
-2. **Batch edits** \u2014 pass \`filePath\` + \`edits\` array
+2. **Append** \u2014 pass \`filePath\` + \`appendContent\`
+   Appends text to the end of a file, creating the file if it does not exist.
+   Example: \`{ "filePath": "notes.txt", "appendContent": "new line\\n" }\`
+
+3. **Batch edits** \u2014 pass \`filePath\` + \`edits\` array
    Multiple edits in one file atomically. Each edit is either:
    - \`{ "oldString": "old", "newString": "new" }\` \u2014 find/replace
    - \`{ "startLine": 5, "endLine": 7, "content": "new lines" }\` \u2014 replace line range (1-based, both inclusive)
    Set content to empty string to delete lines.
 
-3. **Symbol replace** \u2014 pass \`filePath\` + \`symbol\` + \`content\`
+4. **Symbol replace** \u2014 pass \`filePath\` + \`symbol\` + \`content\`
    Replaces an entire named symbol (function, class, type) with new content.
    Includes decorators, attributes, and doc comments in the replacement range.
    **Important:** You must NOT provide \`oldString\` when using symbol mode \u2014 if present, the tool silently falls back to find/replace mode.
    Example: \`{ "filePath": "src/app.ts", "symbol": "handleRequest", "content": "function handleRequest() { ... }" }\`
 
-4. **Find and replace** \u2014 pass \`filePath\` + \`oldString\` + \`newString\`
+5. **Find and replace** \u2014 pass \`filePath\` + \`oldString\` + \`newString\`
    Finds the exact text in \`oldString\` and replaces it with \`newString\`.
    Supports fuzzy matching (handles whitespace differences automatically).
    If multiple matches exist, specify which one with \`occurrence\` or use \`replaceAll: true\`.
    Example: \`{ "filePath": "src/app.ts", "oldString": "const x = 1", "newString": "const x = 2" }\`
 
-5. **Replace all occurrences** \u2014 add \`replaceAll: true\`
+6. **Replace all occurrences** \u2014 add \`replaceAll: true\`
    Replaces every occurrence of \`oldString\` in the file.
    Example: \`{ "filePath": "src/app.ts", "oldString": "oldName", "newString": "newName", "replaceAll": true }\`
 
-6. **Select specific occurrence** \u2014 add \`occurrence: N\` (0-indexed)
+7. **Select specific occurrence** \u2014 add \`occurrence: N\` (0-indexed)
    When multiple matches exist, select the Nth one (0 = first, 1 = second, etc.).
    Example: \`{ "filePath": "src/app.ts", "oldString": "TODO", "newString": "DONE", "occurrence": 0 }\`
 
-Note: Modes 5 and 6 are options on mode 4 (find/replace) \u2014 they require \`oldString\`.
+Note: Modes 6 and 7 are options on mode 5 (find/replace) \u2014 they require \`oldString\`.
 
 **Behavior:**
 - Backs up files before editing (recoverable via aft_safety undo)
@@ -26960,16 +27643,17 @@ function createEditTool(ctx, writeToolName = "write") {
   return {
     description: getEditDescription(writeToolName),
     args: {
-      filePath: z3.string().optional().describe("Path to the file to edit (absolute or relative to project root). Required for all modes except 'operations' multi-file transactions"),
-      oldString: z3.string().optional().describe("Text to find (exact match, with fuzzy fallback)"),
-      newString: z3.string().optional().describe("Text to replace with (omit or set to empty string to delete the matched text)"),
-      replaceAll: z3.boolean().optional().describe("Replace all occurrences"),
-      occurrence: z3.number().optional().describe("0-indexed occurrence to replace when multiple matches exist"),
-      symbol: z3.string().optional().describe("Named symbol to replace (function, class, type)"),
-      content: z3.string().optional().describe("New content for symbol replace or file write"),
-      edits: z3.array(z3.record(z3.string(), z3.unknown())).optional().describe("Batch edits \u2014 array of { oldString: string, newString: string } or { startLine: number (1-based), endLine: number (1-based, inclusive), content: string }"),
-      operations: z3.array(z3.record(z3.string(), z3.unknown())).optional().describe("Transaction \u2014 array of { file: string, command: 'edit_match' | 'write', match?: string, replacement?: string, content?: string } for multi-file edits with rollback. Note: uses 'file'/'match'/'replacement' (not filePath/oldString/newString)"),
-      dryRun: z3.boolean().optional().describe("Preview changes without applying (returns diff, default: false)")
+      filePath: z4.string().optional().describe("Path to the file to edit (absolute or relative to project root). Required for all modes except 'operations' multi-file transactions"),
+      oldString: z4.string().optional().describe("Text to find (exact match, with fuzzy fallback)"),
+      newString: z4.string().optional().describe("Text to replace with (omit or set to empty string to delete the matched text)"),
+      replaceAll: z4.boolean().optional().describe("Replace all occurrences"),
+      occurrence: z4.number().optional().describe("0-indexed occurrence to replace when multiple matches exist"),
+      symbol: z4.string().optional().describe("Named symbol to replace (function, class, type)"),
+      content: z4.string().optional().describe("New content for symbol replace or file write"),
+      appendContent: z4.string().optional().describe("Text to append to the end of filePath; creates the file if needed"),
+      edits: z4.array(z4.record(z4.string(), z4.unknown())).optional().describe("Batch edits \u2014 array of { oldString: string, newString: string } or { startLine: number (1-based), endLine: number (1-based, inclusive), content: string }"),
+      operations: z4.array(z4.record(z4.string(), z4.unknown())).optional().describe("Transaction \u2014 array of { file: string, command: 'edit_match' | 'write', match?: string, replacement?: string, content?: string } for multi-file edits with rollback. Note: uses 'file'/'match'/'replacement' (not filePath/oldString/newString)"),
+      dryRun: z4.boolean().optional().describe("Preview changes without applying (returns diff, default: false)")
     },
     execute: async (args, context) => {
       const argsRecord = args;
@@ -27007,7 +27691,12 @@ function createEditTool(ctx, writeToolName = "write") {
       });
       const params = { file: filePath };
       let command;
-      if (Array.isArray(args.edits)) {
+      if (typeof args.appendContent === "string") {
+        command = "edit_match";
+        params.op = "append";
+        params.append_content = args.appendContent;
+        params.create_dirs = true;
+      } else if (Array.isArray(args.edits)) {
         command = "batch";
         params.edits = args.edits.map((edit) => {
           const translated = {};
@@ -27051,7 +27740,7 @@ function createEditTool(ctx, writeToolName = "write") {
       const data = await callBridge(ctx, context, command, params);
       if (!args.dryRun && data.success && data.diff) {
         const diff = data.diff;
-        const callID = getCallID(context);
+        const callID = getCallID2(context);
         if (callID) {
           const dp = relativeToWorktree(filePath, context.worktree);
           const beforeContent = diff.before ?? "";
@@ -27150,7 +27839,7 @@ function createApplyPatchTool(ctx) {
   return {
     description: APPLY_PATCH_DESCRIPTION,
     args: {
-      patchText: z3.string().describe("The full patch text including Begin/End markers")
+      patchText: z4.string().describe("The full patch text including Begin/End markers")
     },
     execute: async (args, context) => {
       const patchText = args.patchText;
@@ -27182,6 +27871,7 @@ function createApplyPatchTool(ctx) {
         }
       }
       const relPaths = Array.from(affectedAbs).map((abs) => path4.relative(context.worktree, abs));
+      const multiFileWritePaths = Array.from(affectedAbs);
       await context.ask({
         permission: "edit",
         patterns: relPaths,
@@ -27201,12 +27891,18 @@ function createApplyPatchTool(ctx) {
         } catch {}
       }
       const results = [];
+      const failures = [];
       const perFileDiffs = [];
-      let patchFailed = false;
       for (const hunk of hunks) {
         const filePath = path4.resolve(context.directory, hunk.path);
         switch (hunk.type) {
           case "add": {
+            if (fs3.existsSync(filePath)) {
+              const msg = `Failed to create ${hunk.path}: file already exists. Use *** Update File: to modify, or *** Delete File: first if you want to replace it entirely.`;
+              results.push(msg);
+              failures.push(hunk.path);
+              break;
+            }
             try {
               const content = hunk.contents.endsWith(`
 `) ? hunk.contents : `${hunk.contents}
@@ -27216,7 +27912,8 @@ function createApplyPatchTool(ctx) {
                 content,
                 create_dirs: true,
                 diagnostics: true,
-                include_diff: true
+                include_diff: true,
+                multi_file_write_paths: multiFileWritePaths
               });
               const wrDiff = writeResult.diff;
               perFileDiffs.push({
@@ -27228,8 +27925,15 @@ function createApplyPatchTool(ctx) {
               });
               results.push(`Created ${hunk.path}`);
             } catch (e) {
-              patchFailed = true;
-              results.push(`Failed to create ${hunk.path}: ${e instanceof Error ? e.message : e}`);
+              const msg = `Failed to create ${hunk.path}: ${e instanceof Error ? e.message : e}`;
+              results.push(msg);
+              failures.push(hunk.path);
+              const filePath2 = path4.resolve(context.directory, hunk.path);
+              if (fs3.existsSync(filePath2)) {
+                try {
+                  await callBridge(ctx, context, "delete_file", { file: filePath2 });
+                } catch {}
+              }
             }
             break;
           }
@@ -27246,8 +27950,8 @@ function createApplyPatchTool(ctx) {
               });
               results.push(`Deleted ${hunk.path}`);
             } catch (e) {
-              patchFailed = true;
               results.push(`Failed to delete ${hunk.path}: ${e instanceof Error ? e.message : e}`);
+              failures.push(hunk.path);
             }
             break;
           }
@@ -27261,7 +27965,8 @@ function createApplyPatchTool(ctx) {
                 content: newContent,
                 create_dirs: true,
                 diagnostics: true,
-                include_diff: true
+                include_diff: true,
+                multi_file_write_paths: multiFileWritePaths
               });
               const diags = writeResult.lsp_diagnostics;
               if (diags && diags.length > 0) {
@@ -27289,51 +27994,60 @@ ${diagLines}`);
                 deletions
               });
               if (hunk.move_path) {
-                await callBridge(ctx, context, "delete_file", { file: filePath });
+                try {
+                  const deleteResult = await callBridge(ctx, context, "delete_file", {
+                    file: filePath
+                  });
+                  if (deleteResult.success === false) {
+                    throw new Error(deleteResult.message ?? "delete failed");
+                  }
+                } catch (deleteError) {
+                  try {
+                    if (!checkpointCreated) {
+                      throw new Error("pre-patch checkpoint was not created");
+                    }
+                    const rollbackResult = await callBridge(ctx, context, "restore_checkpoint", {
+                      name: checkpointName
+                    });
+                    if (rollbackResult.success === false) {
+                      throw new Error(rollbackResult.message ?? "checkpoint restore failed");
+                    }
+                    if (newlyCreatedAbs.has(targetPath) && fs3.existsSync(targetPath)) {
+                      const cleanupResult = await callBridge(ctx, context, "delete_file", {
+                        file: targetPath
+                      });
+                      if (cleanupResult.success === false) {
+                        throw new Error(cleanupResult.message ?? "new destination cleanup failed");
+                      }
+                    }
+                  } catch (rollbackError) {
+                    throw new Error(`success: false; code: move_partial_failure; files: [${filePath}, ${targetPath}]; wrote destination ${targetPath}, but failed to delete source ${filePath} (${formatError2(deleteError)}) and failed to restore pre-patch checkpoint ${checkpointName} (${formatError2(rollbackError)}). Both copies may exist or destination content may be changed: ${filePath}, ${targetPath}`);
+                  }
+                  throw new Error(`source delete failed after writing move destination; restored pre-patch checkpoint ${checkpointName}: ${formatError2(deleteError)}`);
+                }
                 results.push(`Updated and moved ${hunk.path} \u2192 ${hunk.move_path}`);
               } else {
                 results.push(`Updated ${hunk.path}`);
               }
             } catch (e) {
-              patchFailed = true;
               results.push(`Failed to update ${hunk.path}: ${e instanceof Error ? e.message : e}`);
+              failures.push(hunk.path);
               break;
             }
             break;
           }
         }
       }
-      if (patchFailed) {
-        const rollbackNotes = [];
-        if (checkpointCreated) {
-          try {
-            await callBridge(ctx, context, "restore_checkpoint", { name: checkpointName });
-            rollbackNotes.push("restored pre-existing files from checkpoint");
-          } catch {
-            rollbackNotes.push("checkpoint restore FAILED, pre-existing files may be inconsistent");
-          }
-        } else if (checkpointPaths.length > 0) {
-          rollbackNotes.push("no checkpoint was created, pre-existing files may be inconsistent");
-        }
-        let newlyDeleted = 0;
-        for (const createdAbs of newlyCreatedAbs) {
-          if (!fs3.existsSync(createdAbs))
-            continue;
-          try {
-            await callBridge(ctx, context, "delete_file", { file: createdAbs });
-            newlyDeleted++;
-          } catch {
-            rollbackNotes.push(`failed to delete newly-created ${path4.relative(context.worktree, createdAbs)}`);
-          }
-        }
-        if (newlyDeleted > 0) {
-          rollbackNotes.push(`removed ${newlyDeleted} newly-created file(s)`);
-        }
-        results.push(rollbackNotes.length > 0 ? `Patch failed \u2014 ${rollbackNotes.join("; ")}.` : "Patch failed \u2014 nothing to roll back.");
-        return results.join(`
+      if (failures.length > 0) {
+        const partial2 = failures.length < hunks.length;
+        const summary = partial2 ? `Patch partially applied \u2014 ${hunks.length - failures.length} of ${hunks.length} hunk(s) succeeded. Failed: ${failures.join(", ")}. Successful changes are kept; use \`aft_safety\` to revert if you want to abort.` : `Patch failed \u2014 none of the ${hunks.length} hunk(s) applied: ${failures.join(", ")}.`;
+        results.push(summary);
+        if (!partial2) {
+          return results.join(`
 `);
+        }
       }
-      const callID = getCallID(context);
+      const callID = getCallID2(context);
       if (callID) {
         const diffByPath = new Map(perFileDiffs.map((d) => [d.filePath, d]));
         const files = hunks.map((h) => {
@@ -27386,7 +28100,7 @@ function createDeleteTool(ctx) {
   return {
     description: DELETE_DESCRIPTION,
     args: {
-      filePath: z3.string().describe("Path to file to delete")
+      filePath: z4.string().describe("Path to file to delete")
     },
     execute: async (args, context) => {
       const filePath = path4.isAbsolute(args.filePath) ? args.filePath : path4.resolve(context.directory, args.filePath);
@@ -27410,8 +28124,8 @@ function createMoveTool(ctx) {
   return {
     description: MOVE_DESCRIPTION,
     args: {
-      filePath: z3.string().describe("Source file path to move"),
-      destination: z3.string().describe("Destination file path")
+      filePath: z4.string().describe("Source file path to move"),
+      destination: z4.string().describe("Destination file path")
     },
     execute: async (args, context) => {
       const filePath = path4.isAbsolute(args.filePath) ? args.filePath : path4.resolve(context.directory, args.filePath);
@@ -27435,6 +28149,7 @@ function createMoveTool(ctx) {
 }
 function hoistedTools(ctx) {
   return {
+    bash: createBashTool(ctx),
     read: createReadTool(ctx),
     write: createWriteTool(ctx, "edit"),
     edit: createEditTool(ctx, "write"),
@@ -27443,6 +28158,9 @@ function hoistedTools(ctx) {
     aft_move: createMoveTool(ctx)
   };
 }
+function formatError2(error49) {
+  return error49 instanceof Error ? error49.message : String(error49);
+}
 function aftPrefixedTools(ctx) {
   const aftEditTool = createEditTool(ctx, "aft_write");
   return {
@@ -27485,8 +28203,8 @@ function aftPrefixedTools(ctx) {
 }
 
 // src/tools/imports.ts
-import { tool as tool4 } from "@opencode-ai/plugin";
-var z4 = tool4.schema;
+import { tool as tool5 } from "@opencode-ai/plugin";
+var z5 = tool5.schema;
 function importTools(ctx) {
   return {
     aft_import: {
@@ -27503,15 +28221,15 @@ function importTools(ctx) {
 ` + `- remove: { file, removed, module, name?, formatted, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }
 ` + "- organize: { file, groups: [{ name, count }], removed_duplicates, formatted?, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }",
       args: {
-        op: z4.enum(["add", "remove", "organize"]).describe("Import operation"),
-        filePath: z4.string().describe("Path to the file (absolute or relative to project root)"),
-        module: z4.string().optional().describe("Module path (required for add, remove \u2014 e.g. 'react', './utils', 'std::fmt')"),
-        names: z4.array(z4.string()).optional().describe("Named imports to add (e.g. ['useState', 'useEffect'])"),
-        defaultImport: z4.string().optional().describe("Default import name (e.g. 'React')"),
-        typeOnly: z4.boolean().optional().describe("Type-only import (TS only, default: false)"),
-        removeName: z4.string().optional().describe("Named import to remove for 'remove' op; omit to remove entire import"),
-        validate: z4.enum(["syntax", "full"]).optional().describe("Validation level: 'syntax' (default) or 'full'. Syntax = tree-sitter parse check only. Full = also runs LSP type-checking (slower, catches more errors)"),
-        dryRun: z4.boolean().optional().describe("Preview without modifying the file (default: false)")
+        op: z5.enum(["add", "remove", "organize"]).describe("Import operation"),
+        filePath: z5.string().describe("Path to the file (absolute or relative to project root)"),
+        module: z5.string().optional().describe("Module path (required for add, remove \u2014 e.g. 'react', './utils', 'std::fmt')"),
+        names: z5.array(z5.string()).optional().describe("Named imports to add (e.g. ['useState', 'useEffect'])"),
+        defaultImport: z5.string().optional().describe("Default import name (e.g. 'React')"),
+        typeOnly: z5.boolean().optional().describe("Type-only import (TS only, default: false)"),
+        removeName: z5.string().optional().describe("Named import to remove for 'remove' op; omit to remove entire import"),
+        validate: z5.enum(["syntax", "full"]).optional().describe("Validation level: 'syntax' (default) or 'full'. Syntax = tree-sitter parse check only. Full = also runs LSP type-checking (slower, catches more errors)"),
+        dryRun: z5.boolean().optional().describe("Preview without modifying the file (default: false)")
       },
       execute: async (args, context) => {
         const op = args.op;
@@ -27556,8 +28274,8 @@ function importTools(ctx) {
 }
 
 // src/tools/lsp.ts
-import { tool as tool5 } from "@opencode-ai/plugin";
-var z5 = tool5.schema;
+import { tool as tool6 } from "@opencode-ai/plugin";
+var z6 = tool6.schema;
 function lspTools(ctx) {
   const diagnosticsTool = {
     description: "On-demand LSP file/scope check. Spawns the relevant language server (if " + "registered for the file's extension), opens the document, prefers LSP 3.17 " + "pull diagnostics when supported, and falls back to push + waitMs otherwise. " + "NOT a project-wide type checker \u2014 for full coverage run `tsc --noEmit`, " + "`cargo check`, `pyright`, etc.\n" + `
@@ -27579,10 +28297,10 @@ function lspTools(ctx) {
 ` + "- `total: 0, complete: true, lsp_servers_used: [{status: 'pull_ok'}]` \u2192 file is genuinely clean.\n" + "- `total: 0, lsp_servers_used: []` \u2192 **nothing was checked** (no server registered for this extension). Tell the user, don't claim 'no errors'.\n" + "- `lsp_servers_used: [{status: 'binary_not_installed: <name>'}]` \u2192 server matched the extension but its binary isn't on PATH. Tell the user to install it.\n" + "- `lsp_servers_used: [{status: 'no_root_marker (...)'}]` \u2192 server is registered but couldn't find a workspace root marker walking up from this file. The user's project layout doesn't match what the server expects.\n" + "- `complete: false` (directory mode) \u2192 some files in the directory weren't checked; see `unchecked_files`.\n" + `
 ` + "**When this tool gives an unhelpful answer**, run `bunx --bun @cortexkit/aft doctor lsp <filePath>` from a terminal to get a full per-server breakdown (registered servers, binary resolution, root-marker resolution, spawn outcome).",
     args: {
-      filePath: z5.string().optional().describe("Path to a file to check. Mutually exclusive with 'directory'. Omit both to dump all cached diagnostics."),
-      directory: z5.string().optional().describe("Path to a directory. Returns cached diagnostics + workspace pull from active servers; lists files we have no info for in 'unchecked_files'. Capped at 200 walked files."),
-      severity: z5.enum(["error", "warning", "information", "hint", "all"]).optional().describe("Filter by severity (default: 'all')."),
-      waitMs: z5.number().optional().describe("Wait up to N ms (max 10000, default 0) for push diagnostics to arrive. Only matters for servers that don't support LSP 3.17 pull (bash-language-server, yaml-language-server). Use after an edit to let the server re-analyze.")
+      filePath: z6.string().optional().describe("Path to a file to check. Mutually exclusive with 'directory'. Omit both to dump all cached diagnostics."),
+      directory: z6.string().optional().describe("Path to a directory. Returns cached diagnostics + workspace pull from active servers; lists files we have no info for in 'unchecked_files'. Capped at 200 walked files."),
+      severity: z6.enum(["error", "warning", "information", "hint", "all"]).optional().describe("Filter by severity (default: 'all')."),
+      waitMs: z6.number().optional().describe("Wait up to N ms (max 10000, default 0) for push diagnostics to arrive. Only matters for servers that don't support LSP 3.17 pull (bash-language-server, yaml-language-server). Use after an edit to let the server re-analyze.")
     },
     execute: async (args, context) => {
       const filePath = args.filePath || undefined;
@@ -27613,8 +28331,8 @@ function lspTools(ctx) {
 }
 
 // src/tools/navigation.ts
-import { tool as tool6 } from "@opencode-ai/plugin";
-var z6 = tool6.schema;
+import { tool as tool7 } from "@opencode-ai/plugin";
+var z7 = tool7.schema;
 function navigationTools(ctx) {
   return {
     aft_navigate: {
@@ -27631,11 +28349,11 @@ function navigationTools(ctx) {
 
 `,
       args: {
-        op: z6.enum(["call_tree", "callers", "trace_to", "impact", "trace_data"]).describe("Navigation operation"),
-        filePath: z6.string().describe("Path to the source file containing the symbol (absolute or relative to project root)"),
-        symbol: z6.string().describe("Name of the symbol to analyze"),
-        depth: z6.number().optional().describe("Max traversal depth (default: call_tree=5, callers=1, trace_to=10, impact=5, trace_data=5)"),
-        expression: z6.string().optional().describe("Expression to track through data flow (required for trace_data op)")
+        op: z7.enum(["call_tree", "callers", "trace_to", "impact", "trace_data"]).describe("Navigation operation"),
+        filePath: z7.string().describe("Path to the source file containing the symbol (absolute or relative to project root)"),
+        symbol: z7.string().describe("Name of the symbol to analyze"),
+        depth: z7.number().optional().describe("Max traversal depth (default: call_tree=5, callers=1, trace_to=10, impact=5, trace_data=5)"),
+        expression: z7.string().optional().describe("Expression to track through data flow (required for trace_data op)")
       },
       execute: async (args, context) => {
         const params = {
@@ -27662,7 +28380,7 @@ function navigationTools(ctx) {
 // src/tools/reading.ts
 import { readdir } from "fs/promises";
 import { extname as extname2, join as join18, resolve as resolve8 } from "path";
-import { tool as tool7 } from "@opencode-ai/plugin";
+import { tool as tool8 } from "@opencode-ai/plugin";
 var OUTLINE_EXTENSIONS = new Set([
   ".ts",
   ".tsx",
@@ -27699,7 +28417,7 @@ var OUTLINE_EXTENSIONS = new Set([
   ".sh",
   ".bash"
 ]);
-var z7 = tool7.schema;
+var z8 = tool8.schema;
 function readingTools(ctx) {
   return {
     aft_outline: {
@@ -27707,10 +28425,10 @@ function readingTools(ctx) {
 
 ` + "Provide exactly ONE of: 'filePath', 'files', 'directory', or 'url'.",
       args: {
-        filePath: z7.string().optional().describe("Path to a single file to outline"),
-        files: z7.array(z7.string()).optional().describe("Array of file paths to outline in one call"),
-        directory: z7.string().optional().describe("Directory to outline recursively (200 file limit)"),
-        url: z7.string().optional().describe("HTTP/HTTPS URL of an HTML or Markdown document to fetch and outline")
+        filePath: z8.string().optional().describe("Path to a single file to outline"),
+        files: z8.array(z8.string()).optional().describe("Array of file paths to outline in one call"),
+        directory: z8.string().optional().describe("Directory to outline recursively (200 file limit)"),
+        url: z8.string().optional().describe("HTTP/HTTPS URL of an HTML or Markdown document to fetch and outline")
       },
       execute: async (args, context) => {
         const filesArg = Array.isArray(args.files) ? args.files : undefined;
@@ -27780,11 +28498,11 @@ function readingTools(ctx) {
 
 Provide exactly ONE of 'filePath' or 'url'. Pass either 'symbol' for a single lookup or 'symbols' for multiple in one call.`,
       args: {
-        filePath: z7.string().optional().describe("Path to file (absolute or relative to project root)"),
-        url: z7.string().optional().describe("HTTP/HTTPS URL of an HTML or Markdown document to fetch and zoom into"),
-        symbol: z7.string().optional().describe("Symbol name for code, or heading text for Markdown/HTML"),
-        symbols: z7.array(z7.string()).optional().describe("Array of symbol names or heading texts for a single batched call"),
-        contextLines: z7.number().optional().describe("Lines of context before/after the symbol (default: 3)")
+        filePath: z8.string().optional().describe("Path to file (absolute or relative to project root)"),
+        url: z8.string().optional().describe("HTTP/HTTPS URL of an HTML or Markdown document to fetch and zoom into"),
+        symbol: z8.string().optional().describe("Symbol name for code, or heading text for Markdown/HTML"),
+        symbols: z8.array(z8.string()).optional().describe("Array of symbol names or heading texts for a single batched call"),
+        contextLines: z8.number().optional().describe("Lines of context before/after the symbol (default: 3)")
       },
       execute: async (args, context) => {
         const hasFilePath = typeof args.filePath === "string" && args.filePath.length > 0;
@@ -27885,7 +28603,7 @@ ${lines}`;
 }
 
 // src/tools/refactoring.ts
-import { tool as tool8 } from "@opencode-ai/plugin";
+import { tool as tool9 } from "@opencode-ai/plugin";
 
 // src/lsp.ts
 var LSP_SYMBOL_KIND_MAP = {
@@ -27944,7 +28662,7 @@ async function queryLspHints(client, symbolName, directory) {
 }
 
 // src/tools/refactoring.ts
-var z8 = tool8.schema;
+var z9 = tool9.schema;
 function refactoringTools(ctx) {
   return {
     aft_refactor: {
@@ -27962,16 +28680,16 @@ function refactoringTools(ctx) {
 
 ` + "Returns: move dry-run { ok, dry_run, diffs }; move apply { ok, files_modified, consumers_updated, checkpoint_name, results }. extract returns { file, name, parameters, return_type, syntax_valid, formatted, ... }. inline returns { file, symbol, call_context, substitutions, conflicts, syntax_valid, formatted, ... }.",
       args: {
-        op: z8.enum(["move", "extract", "inline"]).describe("Refactoring operation"),
-        filePath: z8.string().describe("Path to the source file (absolute or relative to project root)"),
-        symbol: z8.string().optional().describe("Symbol name \u2014 required for 'move' and 'inline' ops"),
-        destination: z8.string().optional().describe("Target file path \u2014 required for 'move' op"),
-        scope: z8.string().optional().describe("Disambiguation scope for 'move' op \u2014 when multiple top-level symbols share the same name, specify the containing scope to disambiguate (e.g. 'MyClass'). Does NOT enable access to nested symbols or class methods."),
-        name: z8.string().optional().describe("New function name \u2014 required for 'extract' op"),
-        startLine: z8.number().optional().describe("1-based start line \u2014 required for 'extract' op"),
-        endLine: z8.number().optional().describe("1-based end line (inclusive) \u2014 required for 'extract' op"),
-        callSiteLine: z8.number().optional().describe("1-based call site line \u2014 required for 'inline' op"),
-        dryRun: z8.boolean().optional().describe("Preview changes as diff without modifying files (default: false)")
+        op: z9.enum(["move", "extract", "inline"]).describe("Refactoring operation"),
+        filePath: z9.string().describe("Path to the source file (absolute or relative to project root)"),
+        symbol: z9.string().optional().describe("Symbol name \u2014 required for 'move' and 'inline' ops"),
+        destination: z9.string().optional().describe("Target file path \u2014 required for 'move' op"),
+        scope: z9.string().optional().describe("Disambiguation scope for 'move' op \u2014 when multiple top-level symbols share the same name, specify the containing scope to disambiguate (e.g. 'MyClass'). Does NOT enable access to nested symbols or class methods."),
+        name: z9.string().optional().describe("New function name \u2014 required for 'extract' op"),
+        startLine: z9.number().optional().describe("1-based start line \u2014 required for 'extract' op"),
+        endLine: z9.number().optional().describe("1-based end line (inclusive) \u2014 required for 'extract' op"),
+        callSiteLine: z9.number().optional().describe("1-based call site line \u2014 required for 'inline' op"),
+        dryRun: z9.boolean().optional().describe("Preview changes as diff without modifying files (default: false)")
       },
       execute: async (args, context) => {
         const op = args.op;
@@ -28041,8 +28759,8 @@ function refactoringTools(ctx) {
 }
 
 // src/tools/safety.ts
-import { tool as tool9 } from "@opencode-ai/plugin";
-var z9 = tool9.schema;
+import { tool as tool10 } from "@opencode-ai/plugin";
+var z10 = tool10.schema;
 function safetyTools(ctx) {
   return {
     aft_safety: {
@@ -28063,10 +28781,10 @@ function safetyTools(ctx) {
 
 ` + "Returns: undo { path, backup_id }. history { file, entries }. checkpoint { ok, name }. restore { ok, name }. list { checkpoints }.",
       args: {
-        op: z9.enum(["undo", "history", "checkpoint", "restore", "list"]).describe("Safety operation"),
-        filePath: z9.string().optional().describe("File path (required for undo, history). Absolute or relative to project root"),
-        name: z9.string().optional().describe("Checkpoint name (required for checkpoint, restore)"),
-        files: z9.array(z9.string()).optional().describe("Specific files to include in checkpoint (optional, defaults to all tracked files)")
+        op: z10.enum(["undo", "history", "checkpoint", "restore", "list"]).describe("Safety operation"),
+        filePath: z10.string().optional().describe("File path (required for undo, history). Absolute or relative to project root"),
+        name: z10.string().optional().describe("Checkpoint name (required for checkpoint, restore)"),
+        files: z10.array(z10.string()).optional().describe("Specific files to include in checkpoint (optional, defaults to all tracked files)")
       },
       execute: async (args, context) => {
         const op = args.op;
@@ -28268,8 +28986,8 @@ function semanticTools(ctx) {
 }
 
 // src/tools/structure.ts
-import { tool as tool10 } from "@opencode-ai/plugin";
-var z10 = tool10.schema;
+import { tool as tool11 } from "@opencode-ai/plugin";
+var z11 = tool11.schema;
 function structureTools(ctx) {
   return {
     aft_transform: {
@@ -28294,20 +29012,20 @@ function structureTools(ctx) {
 ` + `- add_decorator: { file, target, decorator, formatted, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }
 ` + "- add_struct_tags: { file, target, field, tag_string, formatted, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }",
       args: {
-        op: z10.enum(["add_member", "add_derive", "wrap_try_catch", "add_decorator", "add_struct_tags"]).describe("Transformation operation"),
-        filePath: z10.string().describe("Path to the source file (absolute or relative to project root)"),
-        container: z10.string().optional().describe("Container name for add_member \u2014 the class, struct, or impl block to insert into. Appears as 'scope' in the response."),
-        code: z10.string().optional().describe("Member code to insert (add_member)"),
-        position: z10.string().optional().describe("For add_member: 'first', 'last' (default), 'before:name', 'after:name'. For add_decorator: 'first' (default) or 'last' only."),
-        target: z10.string().optional().describe("Target symbol name (add_derive: struct/enum, wrap_try_catch: function, add_decorator: function/class, add_struct_tags: struct)"),
-        derives: z10.array(z10.string()).optional().describe("Derive macro names (add_derive \u2014 e.g. ['Clone', 'Debug'])"),
-        catchBody: z10.string().optional().describe("Catch block body (wrap_try_catch \u2014 default: 'throw error;')"),
-        decorator: z10.string().optional().describe("Decorator text without @ (add_decorator \u2014 e.g. 'staticmethod')"),
-        field: z10.string().optional().describe("Struct field name (add_struct_tags)"),
-        tag: z10.string().optional().describe("Tag key (add_struct_tags \u2014 e.g. 'json')"),
-        value: z10.string().optional().describe("Tag value (add_struct_tags \u2014 e.g. 'user_name,omitempty')"),
-        validate: z10.enum(["syntax", "full"]).optional().describe("Validation level: 'syntax' (default) or 'full'. Syntax = tree-sitter parse check only. Full = also runs LSP type-checking (slower, catches more errors)"),
-        dryRun: z10.boolean().optional().describe("Preview without modifying the file (default: false)")
+        op: z11.enum(["add_member", "add_derive", "wrap_try_catch", "add_decorator", "add_struct_tags"]).describe("Transformation operation"),
+        filePath: z11.string().describe("Path to the source file (absolute or relative to project root)"),
+        container: z11.string().optional().describe("Container name for add_member \u2014 the class, struct, or impl block to insert into. Appears as 'scope' in the response."),
+        code: z11.string().optional().describe("Member code to insert (add_member)"),
+        position: z11.string().optional().describe("For add_member: 'first', 'last' (default), 'before:name', 'after:name'. For add_decorator: 'first' (default) or 'last' only."),
+        target: z11.string().optional().describe("Target symbol name (add_derive: struct/enum, wrap_try_catch: function, add_decorator: function/class, add_struct_tags: struct)"),
+        derives: z11.array(z11.string()).optional().describe("Derive macro names (add_derive \u2014 e.g. ['Clone', 'Debug'])"),
+        catchBody: z11.string().optional().describe("Catch block body (wrap_try_catch \u2014 default: 'throw error;')"),
+        decorator: z11.string().optional().describe("Decorator text without @ (add_decorator \u2014 e.g. 'staticmethod')"),
+        field: z11.string().optional().describe("Struct field name (add_struct_tags)"),
+        tag: z11.string().optional().describe("Tag key (add_struct_tags \u2014 e.g. 'json')"),
+        value: z11.string().optional().describe("Tag value (add_struct_tags \u2014 e.g. 'user_name,omitempty')"),
+        validate: z11.enum(["syntax", "full"]).optional().describe("Validation level: 'syntax' (default) or 'full'. Syntax = tree-sitter parse check only. Full = also runs LSP type-checking (slower, catches more errors)"),
+        dryRun: z11.boolean().optional().describe("Preview without modifying the file (default: false)")
       },
       execute: async (args, context) => {
         const op = args.op;
@@ -28428,8 +29146,16 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "";
-var ANNOUNCEMENT_FEATURES = [];
+var ANNOUNCEMENT_VERSION = "0.18.0";
+var ANNOUNCEMENT_FEATURES = [
+  `New experimental features \u2014 AFT now optionally hoists bash:
+    - Run bash scripts in the background.
+    - Initial output compression for git, cargo, npm, bun, pnpm, pytest, tsc (more in 0.19).
+    - Rewrite cat/grep/find/sed/ls into AFT counterparts for faster, formatted output.
+  Check GitHub for how to enable.`,
+  "Trigram grep/glob and semantic search (aft_search) graduated out of experimental.",
+  "Lots of bugfixes and new end-to-end test coverage."
+];
 var plugin = async (input) => {
   const binaryPath = await findBinary();
   const aftConfig = loadAftConfig(input.directory);
@@ -28444,10 +29170,12 @@ var plugin = async (input) => {
   if (aftConfig.checker !== undefined)
     configOverrides.checker = aftConfig.checker;
   configOverrides.restrict_to_project_root = aftConfig.restrict_to_project_root ?? true;
-  if (aftConfig.experimental_search_index !== undefined)
-    configOverrides.experimental_search_index = aftConfig.experimental_search_index;
-  if (aftConfig.experimental_semantic_search !== undefined)
-    configOverrides.experimental_semantic_search = aftConfig.experimental_semantic_search;
+  configOverrides.bash_permissions = true;
+  if (aftConfig.search_index !== undefined)
+    configOverrides.search_index = aftConfig.search_index;
+  if (aftConfig.semantic_search !== undefined)
+    configOverrides.semantic_search = aftConfig.semantic_search;
+  Object.assign(configOverrides, resolveExperimentalConfigForConfigure(aftConfig));
   Object.assign(configOverrides, resolveLspConfigForConfigure(aftConfig));
   if (aftConfig.semantic !== undefined)
     configOverrides.semantic = aftConfig.semantic;
@@ -28456,7 +29184,7 @@ var plugin = async (input) => {
   const isFastembedSemanticBackend = (aftConfig.semantic?.backend ?? "fastembed") === "fastembed";
   const dataHome = process.env.XDG_DATA_HOME || join19(homedir10(), ".local", "share");
   configOverrides.storage_dir = join19(dataHome, "opencode", "storage", "plugin", "aft");
-  if (aftConfig.experimental_semantic_search && isFastembedSemanticBackend) {
+  if (aftConfig.semantic_search && isFastembedSemanticBackend) {
     const storageDir2 = configOverrides.storage_dir;
     const ortDylibDir = await ensureOnnxRuntime(storageDir2).catch((err) => {
       warn(`ONNX Runtime setup failed: ${err instanceof Error ? err.message : String(err)}. Semantic search will be unavailable.`);
@@ -28540,12 +29268,12 @@ ${lines}
           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));
+          }, (err) => error("Failed to replace binary:", err));
         } else {
           warn(`Could not find or download v${minVersion}. Continuing with v${binaryVersion}.`);
         }
       }, (err) => {
-        error48(`Auto-download failed: ${err.message}. Install manually: cargo install agent-file-tools@${minVersion}`);
+        error(`Auto-download failed: ${err.message}. Install manually: cargo install agent-file-tools@${minVersion}`);
       });
     },
     onConfigureWarnings: async ({ projectRoot, sessionId, client, warnings }) => {
@@ -28566,6 +29294,7 @@ ${lines}
   const ctx = {
     pool,
     client: input.client,
+    plugin: input.plugin,
     config: aftConfig,
     storageDir: configOverrides.storage_dir
   };
@@ -28604,14 +29333,14 @@ ${lines}
     if (storageDir && ANNOUNCEMENT_VERSION) {
       try {
         mkdirSync10(storageDir, { recursive: true });
-        writeFileSync9(join19(storageDir, "last_announced_version"), ANNOUNCEMENT_VERSION);
+        writeFileSync10(join19(storageDir, "last_announced_version"), ANNOUNCEMENT_VERSION);
       } catch {}
     }
     return { success: true };
   });
   rpcServer.handle("get-warnings", async () => {
     const warnings = [];
-    if (aftConfig.experimental_semantic_search && isFastembedSemanticBackend && !configOverrides._ort_dylib_dir) {
+    if (aftConfig.semantic_search && isFastembedSemanticBackend && !configOverrides._ort_dylib_dir) {
       if (!isOrtAutoDownloadSupported()) {
         warnings.push(`Semantic search requires ONNX Runtime.
 Install: ${getManualInstallHint()}`);
@@ -28635,7 +29364,7 @@ Install: ${getManualInstallHint()}`);
       sendFeatureAnnouncement(notifyOpts, ANNOUNCEMENT_VERSION, ANNOUNCEMENT_FEATURES, storageDir).catch(() => {});
     }, 8000);
   }
-  if (aftConfig.experimental_semantic_search && isFastembedSemanticBackend && !configOverrides._ort_dylib_dir) {
+  if (aftConfig.semantic_search && isFastembedSemanticBackend && !configOverrides._ort_dylib_dir) {
     setTimeout(() => {
       if (!configOverrides._ort_dylib_dir && !isOrtAutoDownloadSupported()) {
         sendWarning(notifyOpts, `Semantic search requires ONNX Runtime.
@@ -28661,8 +29390,8 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     ...structureTools(ctx),
     ...navigationTools(ctx),
     ...surface !== "minimal" && astTools(ctx),
-    ...surface !== "minimal" && aftConfig.experimental_semantic_search === true && semanticTools(ctx),
-    ...surface !== "minimal" && aftConfig.experimental_search_index === true && searchTools(ctx),
+    ...surface !== "minimal" && aftConfig.semantic_search === true && semanticTools(ctx),
+    ...surface !== "minimal" && aftConfig.search_index === true && searchTools(ctx),
     ...refactoringTools(ctx),
     ...surface !== "minimal" && lspTools(ctx),
     ...surface !== "minimal" && conflictTools(ctx)
@@ -28685,13 +29414,30 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     }
     log(`Disabled ${disabled.size} tool(s): ${[...disabled].join(", ")}`);
   }
+  const autoUpdateEventHook = createAutoUpdateCheckerHook(input, {
+    enabled: true,
+    autoUpdate: aftConfig.auto_update ?? true,
+    signal: autoUpdateAbort.signal
+  });
   return {
     tool: allTools,
-    event: createAutoUpdateCheckerHook(input, {
-      enabled: true,
-      autoUpdate: aftConfig.auto_update ?? true,
-      signal: autoUpdateAbort.signal
-    }),
+    event: async (eventInput) => {
+      await autoUpdateEventHook(eventInput);
+      if (eventInput.event.type !== "session.idle")
+        return;
+      const sessionID = extractSessionID(eventInput.event.properties);
+      if (!sessionID)
+        return;
+      await handleIdleBgCompletions({
+        ctx,
+        directory: input.directory,
+        sessionID,
+        client: input.client
+      });
+    },
+    "chat.message": async (messageInput) => {
+      resetBgWake(messageInput.sessionID ?? messageInput.sessionId ?? messageInput.id);
+    },
     "command.execute.before": async (commandInput, _output) => {
       if (isTuiMode2() || commandInput.command !== STATUS_COMMAND) {
         return;
@@ -28705,22 +29451,22 @@ Install: ${getManualInstallHint()}`).catch(() => {});
       await sendIgnoredMessage2(input.client, commandInput.sessionID, formatStatusMarkdown(status));
       throwSentinel(commandInput.command);
     },
-    "tool.execute.after": async (input2, output) => {
+    "tool.execute.after": async (toolInput, output) => {
       if (!output)
         return;
-      const stored = consumeToolMetadata(input2.sessionID, input2.callID);
+      const stored = consumeToolMetadata(toolInput.sessionID, toolInput.callID);
       if (stored) {
         if (stored.title)
           output.title = stored.title;
         if (stored.metadata)
           output.metadata = { ...output.metadata, ...stored.metadata };
       }
-      if (input2.tool === "bash" && output.output?.includes("Automatic merge failed; fix conflicts")) {
+      if (toolInput.tool === "bash" && output.output?.includes("Automatic merge failed; fix conflicts")) {
         output.output += `
 
 [Hint] Use aft_conflicts to see all conflict regions across files in a single call.`;
       }
-      if (input2.tool === "bash" && output.output) {
+      if (toolInput.tool === "bash" && output.output) {
         const firstLine = output.output.slice(0, 300).split(`
 `)[0] ?? "";
         if (/\b(rg|grep)\s/.test(firstLine)) {
@@ -28729,6 +29475,7 @@ Install: ${getManualInstallHint()}`).catch(() => {});
 [Hint] Use the grep tool instead of bash for faster indexed search.`;
         }
       }
+      await appendInTurnBgCompletions({ ctx, directory: input.directory, sessionID: toolInput.sessionID }, output);
     },
     config: async (config2) => {
       config2.command = {