@cortexkit/aft-opencode 0.18.2 → 0.18.3

package/dist/bg-notifications.d.ts

@@ -7,6 +7,10 @@ export interface BgCompletion {
     duration_ms?: number;
     runtime_ms?: number;
     runtime?: number;
+    /** Tail of stdout+stderr captured at completion (≤300 bytes from Rust). */
+    output_preview?: string;
+    /** True when the captured tail is shorter than the actual output. */
+    output_truncated?: boolean;
 }
 type SessionBgState = {
     outstandingTaskIds: Set<string>;
@@ -16,6 +20,11 @@ type SessionBgState = {
     firstCompletionAt: number | null;
     scheduledFireAt: number | null;
     scheduledCompletionCount: number;
+    retryDelayMs: number | null;
+    unknownCompletions: Array<{
+        completion: BgCompletion;
+        receivedAt: number;
+    }>;
     lastSeenAt: number;
 };
 export declare const sessionBgStates: Map<string, SessionBgState>;
@@ -24,9 +33,13 @@ interface DrainContext {
     ctx: PluginContext;
     directory: string;
     sessionID: string;
+    isActive?: () => boolean;
 }
 export declare function trackBgTask(sessionID: string | undefined, taskId: string): void;
 export declare function ingestBgCompletions(sessionID: string | undefined, completions: unknown): BgCompletion[];
+export declare function handlePushedBgCompletion(drainContext: DrainContext & {
+    client: unknown;
+}, completion: unknown): Promise<void>;
 export declare function appendInTurnBgCompletions(drainContext: DrainContext, output: {
     output?: string;
 } | undefined): Promise<void>;

package/dist/bg-notifications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bg-notifications.d.ts","sourceRoot":"","sources":["../src/bg-notifications.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,KAAK,cAAc,GAAG;IACpB,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,kBAAkB,EAAE,YAAY,EAAE,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,wBAAwB,EAAE,MAAM,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAa,CAAC;AAGtE,eAAO,MAAM,4BAA4B,QAAiB,CAAC;AAM3D,UAAU,YAAY;IACpB,GAAG,EAAE,aAAa,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAQD,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAE/E;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,EAAE,OAAO,GACnB,YAAY,EAAE,CAiBhB;AAED,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,GACtC,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,YAAY,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GAC/C,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE/D;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM,CAGjF;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAcnE;AAED,wBAAgB,kCAAkC,IAAI,IAAI,CAKzD"}
+{"version":3,"file":"bg-notifications.d.ts","sourceRoot":"","sources":["../src/bg-notifications.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,KAAK,cAAc,GAAG;IACpB,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,kBAAkB,EAAE,YAAY,EAAE,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,wBAAwB,EAAE,MAAM,CAAC;IACjC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,kBAAkB,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,YAAY,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5E,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAa,CAAC;AAGtE,eAAO,MAAM,4BAA4B,QAAiB,CAAC;AAQ3D,UAAU,YAAY;IACpB,GAAG,EAAE,aAAa,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC;CAC1B;AASD,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAgB/E;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,EAAE,OAAO,GACnB,YAAY,EAAE,CAoBhB;AAED,wBAAsB,wBAAwB,CAC5C,YAAY,EAAE,YAAY,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,EAChD,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,GACtC,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,YAAY,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GAC/C,OAAO,CAAC,IAAI,CAAC,CAEf;AAgDD,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE/D;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM,CASjF;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAcnE;AAED,wBAAgB,kCAAkC,IAAI,IAAI,CAKzD"}

package/dist/bridge.d.ts

@@ -1,3 +1,4 @@
+import type { BgCompletion } from "./bg-notifications.js";
 /**
  * Compare two semver version strings (major.minor.patch plus pre-release).
  * Returns: negative if a < b, 0 if equal, positive if a > b.
@@ -20,6 +21,12 @@ export interface BridgeOptions {
     onVersionMismatch?: (binaryVersion: string, minVersion: string) => void;
     /** Called after the first successful configure returns user-visible warnings. */
     onConfigureWarnings?: (context: ConfigureWarningsContext) => void | Promise<void>;
+    /** Called for server-pushed background bash completions. */
+    onBashCompletion?: (completion: BashCompletedPayload, bridge: BinaryBridge) => void | Promise<void>;
+}
+export interface BashCompletedPayload extends BgCompletion {
+    type: "bash_completed";
+    session_id: string;
 }
 export interface BridgeRequestOptions {
     onProgress?: (chunk: {
@@ -28,6 +35,23 @@ export interface BridgeRequestOptions {
     }) => void;
     /** Per-call transport timeout in milliseconds. Defaults to the bridge-wide timeout. */
     transportTimeoutMs?: number;
+    /**
+     * Skip the "kill the child process on timeout" behavior for this request.
+     *
+     * The default (false) treats a transport-level timeout as evidence the bridge
+     * is wedged — Rust normally responds well within the budget, so silence past
+     * the deadline almost always means a stuck child. Killing forces a clean
+     * respawn on the next call.
+     *
+     * Some commands enforce their own timeouts on the Rust side (notably `bash`,
+     * which uses a watchdog thread to terminate the child shell and return a
+     * timeout response). For those, a transport timeout means the response was
+     * lost or queued behind something else — the bridge itself is still healthy
+     * and should keep its warm state (LSP servers, semantic index, callers
+     * cache, undo history). Pass `keepBridgeOnTimeout: true` to reject the
+     * request without tearing down the bridge.
+     */
+    keepBridgeOnTimeout?: boolean;
 }
 interface SendOptions extends BridgeRequestOptions {
     timeoutMs?: number;
@@ -60,12 +84,14 @@ export declare class BinaryBridge {
     private minVersion;
     private onVersionMismatch;
     private onConfigureWarnings;
+    private onBashCompletion;
     private restartResetTimer;
     constructor(binaryPath: string, cwd: string, options?: BridgeOptions, configOverrides?: Record<string, unknown>);
     /** Number of times the binary has been restarted after a crash. */
     get restartCount(): number;
     /** Whether the child process is currently alive. */
     isAlive(): boolean;
+    hasPendingRequests(): boolean;
     /**
      * Send a command to the binary and return the parsed response.
      * Lazy-spawns the binary on first call.

package/dist/bridge.d.ts.map

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

package/dist/config.d.ts

@@ -11,6 +11,7 @@ export declare const LspServerSchema: z.ZodObject<{
 }, z.core.$strip>;
 export declare const AftConfigSchema: z.ZodObject<{
     format_on_edit: z.ZodOptional<z.ZodBoolean>;
+    formatter_timeout_secs: z.ZodOptional<z.ZodNumber>;
     validate_on_edit: z.ZodOptional<z.ZodEnum<{
         syntax: "syntax";
         full: "full";

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAmExB,eAAO,MAAM,eAAe;;;;;;;;;iBAE1B,CAAC;AA2CH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2DjB,CAAC;AAEZ,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,8BAA8B;IAC7C,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAMD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,SAAS,GAAG,qBAAqB,CAmDrF;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,SAAS,GAChB,8BAA8B,CAehC;AAED,KAAK,MAAM,GAAG;IACZ,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,CAAC;AAiGF,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAsB,GAC7B;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAwD1C;AAuTD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAiDjE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAmExB,eAAO,MAAM,eAAe;;;;;;;;;iBAE1B,CAAC;AA2CH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkEjB,CAAC;AAEZ,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,8BAA8B;IAC7C,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAMD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,SAAS,GAAG,qBAAqB,CAmDrF;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,SAAS,GAChB,8BAA8B,CAehC;AAED,KAAK,MAAM,GAAG;IACZ,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,CAAC;AAiGF,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAsB,GAC7B;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAwD1C;AAuTD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAiDjE"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAsJlD;;;;;;;;;;;;;;;;;;GAkBG;AACH,QAAA,MAAM,MAAM,EAAE,MAohBb,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAgKlD;;;;;;;;;;;;;;;;;;GAkBG;AACH,QAAA,MAAM,MAAM,EAAE,MAkiBb,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/index.js

@@ -7813,7 +7813,8 @@ 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 isTestEnv = process.env.BUN_TEST === "1" || false;
+var logFile = path.join(os.tmpdir(), isTestEnv ? "aft-plugin-test.log" : "aft-plugin.log");
 var useStderr = process.env.AFT_LOG_STDERR === "1";
 var buffer = [];
 var flushTimer = null;
@@ -7871,6 +7872,9 @@ function warn(message, data) {
 function error(message, data) {
   write("ERROR", message, data);
 }
+function sessionLog(sessionId, message, data) {
+  write("INFO", message, data, sessionId);
+}
 function sessionWarn(sessionId, message, data) {
   write("WARN", message, data, sessionId);
 }
@@ -7878,15 +7882,90 @@ function getLogFilePath() {
   return logFile;
 }
 
+// src/shared/last-user-model.ts
+var CACHE_TTL_MS = 5000;
+var CACHE_MAX_ENTRIES = 100;
+var cache = new Map;
+async function getLastUserModel(client, sessionId) {
+  const now = Date.now();
+  const cached = cache.get(sessionId);
+  if (cached && cached.expiresAt > now) {
+    cache.delete(sessionId);
+    cache.set(sessionId, cached);
+    return cached.model;
+  }
+  if (cached)
+    cache.delete(sessionId);
+  const c = client;
+  const fetcher = c?.session?.messages;
+  if (typeof fetcher !== "function") {
+    return null;
+  }
+  let messages;
+  try {
+    const result = await fetcher({ path: { id: sessionId } });
+    messages = result?.data ?? [];
+  } catch {
+    return null;
+  }
+  for (let i = messages.length - 1;i >= 0; i--) {
+    const info = messages[i]?.info;
+    if (info?.role !== "user")
+      continue;
+    if (isSyntheticIgnoredMessage(messages[i]))
+      continue;
+    const model = info.model;
+    if (!model?.providerID || !model?.modelID)
+      continue;
+    const resolved = {
+      providerID: model.providerID,
+      modelID: model.modelID,
+      ...model.variant ? { variant: model.variant } : {}
+    };
+    setCache(sessionId, resolved);
+    return resolved;
+  }
+  return null;
+}
+function setCache(sessionId, model) {
+  if (cache.has(sessionId))
+    cache.delete(sessionId);
+  cache.set(sessionId, { expiresAt: Date.now() + CACHE_TTL_MS, model });
+  while (cache.size > CACHE_MAX_ENTRIES) {
+    const oldest = cache.keys().next().value;
+    if (typeof oldest !== "string")
+      break;
+    cache.delete(oldest);
+  }
+}
+function isSyntheticIgnoredMessage(message) {
+  const parts = message?.info?.parts ?? message?.parts;
+  return Array.isArray(parts) && parts.length > 0 && parts.every((part) => part?.ignored === true);
+}
+
 // 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 UNKNOWN_COMPLETION_TTL_MS = 5000;
+var UNKNOWN_COMPLETION_CAP = 32;
 var DEFAULT_SESSION_ID = "__default__";
 var LOG_PREFIX = "[aft-plugin] bg-notifications:";
 function trackBgTask(sessionID, taskId) {
-  stateFor(sessionID).outstandingTaskIds.add(taskId);
+  const state = stateFor(sessionID);
+  pruneUnknownCompletions(state, Date.now());
+  const buffered = state.unknownCompletions.filter((entry) => entry.completion.task_id === taskId);
+  state.unknownCompletions = state.unknownCompletions.filter((entry) => entry.completion.task_id !== taskId);
+  if (buffered.length > 0) {
+    for (const entry of buffered) {
+      if (!state.pendingCompletions.some((pending) => pending.task_id === taskId)) {
+        state.pendingCompletions.push(entry.completion);
+      }
+    }
+    return;
+  }
+  state.outstandingTaskIds.add(taskId);
 }
 function ingestBgCompletions(sessionID, completions) {
   if (!Array.isArray(completions) || completions.length === 0)
@@ -7896,8 +7975,10 @@ function ingestBgCompletions(sessionID, completions) {
   for (const completion of completions) {
     if (!isBgCompletion(completion))
       continue;
-    if (!state.outstandingTaskIds.has(completion.task_id))
+    if (!state.outstandingTaskIds.has(completion.task_id)) {
+      bufferUnknownCompletion(state, completion);
       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);
@@ -7906,6 +7987,10 @@ function ingestBgCompletions(sessionID, completions) {
   state.pendingCompletions.push(...accepted);
   return accepted;
 }
+async function handlePushedBgCompletion(drainContext, completion) {
+  ingestBgCompletions(drainContext.sessionID, [completion]);
+  await triggerWakeIfPending(drainContext, true);
+}
 async function appendInTurnBgCompletions(drainContext, output) {
   if (!output)
     return;
@@ -7922,43 +8007,55 @@ async function appendInTurnBgCompletions(drainContext, output) {
   state.pendingCompletions = [];
 }
 async function handleIdleBgCompletions(drainContext) {
+  await triggerWakeIfPending(drainContext, false);
+}
+async function triggerWakeIfPending(drainContext, skipDrain) {
   const state = stateFor(drainContext.sessionID);
   if (state.wakeFiredThisIdle)
     return;
-  if (state.outstandingTaskIds.size > 0) {
+  if (drainContext.isActive?.())
+    return;
+  if (!skipDrain && 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)}`);
-    }
+    const client = drainContext.client;
+    if (typeof client.session?.promptAsync !== "function") {
+      throw new Error("client.session.promptAsync is unavailable");
+    }
+    const lastModel = await getLastUserModel(client, drainContext.sessionID);
+    const body = {
+      noReply: false,
+      parts: [{ type: "text", text: reminder }]
+    };
+    if (lastModel) {
+      body.model = { providerID: lastModel.providerID, modelID: lastModel.modelID };
+      if (lastModel.variant)
+        body.variant = lastModel.variant;
+    }
+    await client.session.promptAsync({
+      path: { id: drainContext.sessionID },
+      body
+    });
+  }, (err) => {
+    sessionWarn(drainContext.sessionID, `${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(`
+  const bullets = completions.map((completion) => formatCompletion(completion)).join(`
 `);
+  const anyTruncated = completions.some((c) => c.output_truncated === true);
+  const tail = anyTruncated ? `
+
+For truncated tasks, use bash_status({ taskId: "..." }) to retrieve full output.` : "";
   return `<system-reminder>
 [BACKGROUND BASH COMPLETED]
-${bullets}
-
-Use bash_status({ task_id: "..." }) to retrieve full output.
+${bullets}${tail}
 </system-reminder>`;
 }
 function extractSessionID(value) {
@@ -7984,15 +8081,15 @@ async function drainCompletions({ ctx, directory, sessionID }) {
     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")}`);
+      sessionWarn(sessionID, `${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)}`);
+    sessionWarn(sessionID, `${LOG_PREFIX} drain failed: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
-function scheduleWake(state, sendWake) {
+function scheduleWake(state, sendWake, onSendFailure) {
   const now = Date.now();
   if (state.debounceTimer && state.pendingCompletions.length <= state.scheduledCompletionCount) {
     return;
@@ -8007,16 +8104,24 @@ function scheduleWake(state, sendWake) {
   state.scheduledCompletionCount = state.pendingCompletions.length;
   if (state.debounceTimer)
     clearTimeout(state.debounceTimer);
-  const delay = Math.max(0, (state.scheduledFireAt ?? now) - now);
+  const delay = state.retryDelayMs ?? Math.max(0, (state.scheduledFireAt ?? now) - now);
   state.debounceTimer = setTimeout(() => {
-    const reminder = formatSystemReminder(state.pendingCompletions);
+    const pending = state.pendingCompletions;
+    const reminder = formatSystemReminder(pending);
     state.pendingCompletions = [];
     state.debounceTimer = null;
-    state.wakeFiredThisIdle = true;
     state.firstCompletionAt = null;
     state.scheduledFireAt = null;
     state.scheduledCompletionCount = 0;
-    sendWake(reminder);
+    sendWake(reminder).then(() => {
+      state.retryDelayMs = null;
+      state.wakeFiredThisIdle = true;
+    }).catch((err) => {
+      state.pendingCompletions = [...pending, ...state.pendingCompletions];
+      state.retryDelayMs = Math.min((delay || DEBOUNCE_STEP_MS) * 2, DEBOUNCE_CAP_MS);
+      onSendFailure(err);
+      scheduleWake(state, sendWake, onSendFailure);
+    });
   }, delay);
   state.debounceTimer.unref?.();
 }
@@ -8034,6 +8139,8 @@ function stateFor(sessionID) {
       firstCompletionAt: null,
       scheduledFireAt: null,
       scheduledCompletionCount: 0,
+      retryDelayMs: null,
+      unknownCompletions: [],
       lastSeenAt: now
     };
     sessionBgStates.set(key, state);
@@ -8054,6 +8161,18 @@ function cleanupIdleSessionStates(now) {
     sessionBgStates.delete(sessionID);
   }
 }
+function bufferUnknownCompletion(state, completion) {
+  const now = Date.now();
+  pruneUnknownCompletions(state, now);
+  state.unknownCompletions = state.unknownCompletions.filter((entry) => entry.completion.task_id !== completion.task_id);
+  state.unknownCompletions.push({ completion, receivedAt: now });
+  if (state.unknownCompletions.length > UNKNOWN_COMPLETION_CAP) {
+    state.unknownCompletions.splice(0, state.unknownCompletions.length - UNKNOWN_COMPLETION_CAP);
+  }
+}
+function pruneUnknownCompletions(state, now) {
+  state.unknownCompletions = state.unknownCompletions.filter((entry) => now - entry.receivedAt <= UNKNOWN_COMPLETION_TTL_MS);
+}
 function isBgCompletion(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return false;
@@ -8068,10 +8187,26 @@ ${reminder}` : reminder;
 function formatCompletion(completion) {
   const status = formatStatus(completion);
   const duration = formatDuration(completion);
-  return `task ${completion.task_id} (${status}${duration ? `, ${duration}` : ""}): ${completion.command}`;
+  const header = `- task ${completion.task_id} (${status}${duration ? `, ${duration}` : ""})`;
+  const previewBlock = formatOutputPreview(completion);
+  return previewBlock ? `${header}
+${previewBlock}` : header;
+}
+function formatOutputPreview(completion) {
+  const ansiRegex = /\x1b\[[0-9;]*[a-zA-Z]/g;
+  const raw = (completion.output_preview ?? "").replace(ansiRegex, "");
+  if (!raw.trim())
+    return "";
+  const trimmed = raw.replace(/\n+$/, "");
+  const ellipsis = completion.output_truncated ? "\u2026" : "";
+  const indented = trimmed.split(`
+`).map((line) => `    ${line}`).join(`
+`);
+  return ellipsis ? `    ${ellipsis}
+${indented}` : indented;
 }
 function formatStatus(completion) {
-  if (completion.status === "timeout")
+  if (completion.status === "timed_out" || completion.status === "timeout")
     return "timed out";
   if (completion.status === "killed")
     return "killed";
@@ -21693,6 +21828,7 @@ var ExperimentalConfigSchema = exports_external.object({
 });
 var AftConfigSchema = exports_external.object({
   format_on_edit: exports_external.boolean().optional(),
+  formatter_timeout_secs: exports_external.number().int().min(1).max(600).optional(),
   validate_on_edit: exports_external.enum(["syntax", "full"]).optional(),
   formatter: exports_external.record(exports_external.string(), FormatterEnum).optional(),
   checker: exports_external.record(exports_external.string(), CheckerEnum).optional(),
@@ -24332,13 +24468,17 @@ async function getSessionMessages(client, sessionId) {
 async function sendIgnoredMessage(client, sessionId, text) {
   try {
     const c = client;
-    const promptInput = {
-      path: { id: sessionId },
-      body: {
-        noReply: true,
-        parts: [{ type: "text", text, ignored: true }]
-      }
+    const lastModel = await getLastUserModel(client, sessionId);
+    const body = {
+      noReply: true,
+      parts: [{ type: "text", text, ignored: true }]
     };
+    if (lastModel) {
+      body.model = { providerID: lastModel.providerID, modelID: lastModel.modelID };
+      if (lastModel.variant)
+        body.variant = lastModel.variant;
+    }
+    const promptInput = { path: { id: sessionId }, body };
     if (typeof c.session?.prompt === "function") {
       await Promise.resolve(c.session.prompt(promptInput));
       return true;
@@ -24348,7 +24488,7 @@ async function sendIgnoredMessage(client, sessionId, text) {
       return true;
     }
   } catch (err) {
-    log(`[aft-plugin] notification send failed: ${err instanceof Error ? err.message : String(err)}`);
+    sessionLog(sessionId, `[aft-plugin] notification send failed: ${err instanceof Error ? err.message : String(err)}`);
   }
   return false;
 }
@@ -24374,7 +24514,7 @@ async function sendWarning(opts, message) {
   if (!sessionId)
     return;
   const text = `${WARNING_MARKER} ${message}`;
-  log(`[aft-plugin] sending warning to session ${sessionId}`);
+  sessionLog(sessionId, `[aft-plugin] sending warning to session ${sessionId}`);
   await sendIgnoredMessage(opts.client, sessionId, text);
 }
 async function sendFeatureAnnouncement(opts, version2, features, storageDir) {
@@ -24397,7 +24537,7 @@ async function sendFeatureAnnouncement(opts, version2, features, storageDir) {
       return;
     const text = [`${FEATURE_MARKER} v${version2}:`, ...features.map((f) => `  \u2022 ${f}`)].join(`
 `);
-    log(`[aft-plugin] sending feature announcement for v${version2}`);
+    sessionLog(sessionId, `[aft-plugin] sending feature announcement for v${version2}`);
     await sendIgnoredMessage(opts.client, sessionId, text);
   }
   if (storageDir) {
@@ -24515,7 +24655,7 @@ async function cleanupWarnings(opts) {
   }
   if (warningIds.length === 0)
     return;
-  log(`[aft-plugin] cleaning up ${warningIds.length} stale warning(s)`);
+  sessionLog(sessionId, `[aft-plugin] cleaning up ${warningIds.length} stale warning(s)`);
   for (const id of warningIds) {
     await deleteMessage(effectiveServerUrl, sessionId, id);
   }
@@ -25060,6 +25200,7 @@ class BinaryBridge {
   minVersion;
   onVersionMismatch;
   onConfigureWarnings;
+  onBashCompletion;
   restartResetTimer = null;
   constructor(binaryPath, cwd, options, configOverrides) {
     this.binaryPath = binaryPath;
@@ -25070,6 +25211,7 @@ class BinaryBridge {
     this.minVersion = options?.minVersion;
     this.onVersionMismatch = options?.onVersionMismatch;
     this.onConfigureWarnings = options?.onConfigureWarnings;
+    this.onBashCompletion = options?.onBashCompletion;
   }
   get restartCount() {
     return this._restartCount;
@@ -25077,6 +25219,9 @@ class BinaryBridge {
   isAlive() {
     return this.process !== null && this.process.exitCode === null && !this.process.killed;
   }
+  hasPendingRequests() {
+    return this.pending.size > 0;
+  }
   async send(command, params = {}, options) {
     if (this._shuttingDown) {
       throw new Error(`[aft-plugin] Bridge is shutting down, cannot send "${command}"`);
@@ -25130,17 +25275,21 @@ class BinaryBridge {
 `;
     const effectiveTimeoutMs = options?.transportTimeoutMs ?? options?.timeoutMs ?? this.timeoutMs;
     const requestSessionId = typeof params.session_id === "string" && params.session_id.length > 0 ? params.session_id : undefined;
+    const keepBridgeOnTimeout = options?.keepBridgeOnTimeout === true;
     return new Promise((resolve4, reject) => {
       const timer = setTimeout(() => {
         this.pending.delete(id);
-        const timeoutMsg = `Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms \u2014 restarting bridge`;
+        const restartSuffix = keepBridgeOnTimeout ? "" : " \u2014 restarting bridge";
+        const timeoutMsg = `Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms${restartSuffix}`;
         if (requestSessionId) {
           sessionWarn(requestSessionId, timeoutMsg);
         } else {
           warn(timeoutMsg);
         }
         reject(new Error(`[aft-plugin] Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
-        this.handleTimeout();
+        if (!keepBridgeOnTimeout) {
+          this.handleTimeout();
+        }
       }, effectiveTimeoutMs);
       this.pending.set(id, { resolve: resolve4, reject, timer, onProgress: options?.onProgress });
       if (!this.process?.stdin?.writable) {
@@ -25345,6 +25494,10 @@ class BinaryBridge {
           }
           continue;
         }
+        if (response.type === "bash_completed") {
+          this.onBashCompletion?.(response, this);
+          continue;
+        }
         const id = response.id;
         if (id && this.pending.has(id)) {
           const entry = this.pending.get(id);
@@ -25354,6 +25507,8 @@ class BinaryBridge {
           clearTimeout(entry.timer);
           this.scheduleRestartCountReset();
           entry.resolve(response);
+        } else if (typeof response.type === "string") {
+          log(`Ignoring unknown stdout push frame type: ${response.type}`);
         }
       } catch (_err) {
         warn(`Failed to parse stdout line: ${line}`);
@@ -25451,7 +25606,8 @@ class BridgePool {
       maxRestarts: options.maxRestarts,
       minVersion: options.minVersion,
       onVersionMismatch: options.onVersionMismatch,
-      onConfigureWarnings: options.onConfigureWarnings
+      onConfigureWarnings: options.onConfigureWarnings,
+      onBashCompletion: options.onBashCompletion
     };
     this.configOverrides = configOverrides;
     if (Number.isFinite(this.idleTimeoutMs)) {
@@ -25771,9 +25927,7 @@ class AftRpcServer {
         return;
       }
       const { token: _token, ...handlerParams } = params;
-      log(`RPC call: ${method} params=${JSON.stringify(handlerParams).slice(0, 200)}`);
       handler(handlerParams).then((result) => {
-        log(`RPC result: ${method} => ${JSON.stringify(result).slice(0, 200)}`);
         res.writeHead(200, { "Content-Type": "application/json" });
         res.end(JSON.stringify(result));
       }).catch((err) => {
@@ -26026,7 +26180,7 @@ import {
 import { isIP } from "net";
 import { join as join17 } from "path";
 var MAX_RESPONSE_BYTES = 10 * 1024 * 1024;
-var CACHE_TTL_MS = 24 * 60 * 60 * 1000;
+var CACHE_TTL_MS2 = 24 * 60 * 60 * 1000;
 var FETCH_TIMEOUT_MS = 30000;
 var MAX_REDIRECTS = 5;
 function cacheDir(storageDir) {
@@ -26206,7 +26360,7 @@ async function fetchUrlToTempFile(url2, storageDir, options = {}) {
       const meta4 = JSON.parse(readFileSync8(metaFile, "utf8"));
       const age = Date.now() - meta4.fetchedAt;
       const cached2 = contentPath(storageDir, hash2, meta4.extension);
-      if (age < CACHE_TTL_MS && existsSync11(cached2)) {
+      if (age < CACHE_TTL_MS2 && existsSync11(cached2)) {
         log(`URL cache hit: ${url2} (${Math.round(age / 1000)}s old)`);
         return cached2;
       }
@@ -26279,7 +26433,7 @@ function cleanupUrlCache(storageDir) {
       try {
         const meta3 = JSON.parse(readFileSync8(metaFile, "utf8"));
         const age = Date.now() - meta3.fetchedAt;
-        if (age > CACHE_TTL_MS) {
+        if (age > CACHE_TTL_MS2) {
           const hash2 = entry.slice(0, -".meta.json".length);
           const content = contentPath(storageDir, hash2, meta3.extension);
           if (existsSync11(content))
@@ -27079,6 +27233,7 @@ function createBashTool(ctx) {
         permissions_requested: true
       }, callBridge, {
         transportTimeoutMs: bashTransportTimeoutMs(args.timeout),
+        keepBridgeOnTimeout: true,
         onProgress: ({ text }) => {
           accumulatedOutput = preview(accumulatedOutput + text);
           metadata?.({ output: accumulatedOutput, description });
@@ -27140,6 +27295,49 @@ function createBashTool(ctx) {
     }
   };
 }
+function createBashStatusTool(ctx) {
+  return {
+    description: "Check the status and captured output of a background bash task spawned with bash({ background: true }). Returns status (running | completed | failed | killed | timed_out), exit code, duration, and a preview of captured output.",
+    args: {
+      taskId: z3.string().describe("Background task ID returned by bash({ background: true }), e.g. bgb-6b454047.")
+    },
+    execute: async (args, context) => {
+      const data = await callBridge(ctx, context, "bash_status", {
+        task_id: args.taskId
+      });
+      if (data.success === false) {
+        throw new Error(data.message ?? "bash_status failed");
+      }
+      const status = data.status;
+      const exit = typeof data.exit_code === "number" ? ` (exit ${data.exit_code})` : "";
+      const dur = typeof data.duration_ms === "number" ? ` ${Math.round(data.duration_ms / 1000)}s` : "";
+      let text = `Task ${args.taskId}: ${status}${exit}${dur}`;
+      const preview = data.output_preview;
+      if (preview && status !== "running") {
+        text += `
+${preview.slice(0, 2000)}`;
+      }
+      return text;
+    }
+  };
+}
+function createBashKillTool(ctx) {
+  return {
+    description: "Terminate a running background bash task spawned with bash({ background: true }). Returns confirmation of kill or an error if the task already finished.",
+    args: {
+      taskId: z3.string().describe("Background task ID returned by bash({ background: true }), e.g. bgb-6b454047.")
+    },
+    execute: async (args, context) => {
+      const data = await callBridge(ctx, context, "bash_kill", {
+        task_id: args.taskId
+      });
+      if (data.success === false) {
+        throw new Error(data.message ?? "bash_kill failed");
+      }
+      return `Task ${args.taskId}: ${String(data.status ?? "killed")}`;
+    }
+  };
+}
 function bashTransportTimeoutMs(timeout) {
   const bashTimeout = timeout ?? DEFAULT_BASH_TIMEOUT_MS;
   return Math.max(30000, bashTimeout + BASH_TRANSPORT_TIMEOUT_OVERHEAD_MS);
@@ -27770,6 +27968,11 @@ function createEditTool(ctx, writeToolName = "write") {
         }
       }
       let result = JSON.stringify(data);
+      const globSkipNote = formatGlobSkipReasonsNote(data.format_skip_reasons);
+      if (globSkipNote)
+        result += `
+
+${globSkipNote}`;
       if (!args.dryRun) {
         const diags = data.lsp_diagnostics;
         if (diags && diags.length > 0) {
@@ -27800,6 +28003,14 @@ Note: LSP server(s) exited during this edit: ${exitedServers.join(", ")}. Their
     }
   };
 }
+function formatGlobSkipReasonsNote(reasons) {
+  if (!Array.isArray(reasons))
+    return;
+  const actionable = reasons.filter((reason) => typeof reason === "string").filter((reason) => ["formatter_not_installed", "formatter_excluded_path", "timeout", "error"].includes(reason));
+  if (actionable.length === 0)
+    return;
+  return `Note: formatter skipped some glob edit result file(s): ${[...new Set(actionable)].sort().join(", ")}. See per-file format_skipped_reason values for details.`;
+}
 var APPLY_PATCH_DESCRIPTION = `Use the \`apply_patch\` tool to edit files. Your patch language is a stripped\u2011down, file\u2011oriented diff format designed to be easy to parse and safe to apply. You can think of it as a high\u2011level envelope:
 
 *** Begin Patch
@@ -28051,8 +28262,8 @@ ${diagLines}`);
         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(`
-`);
+          throw new Error(results.join(`
+`));
         }
       }
       const callID = getCallID2(context);
@@ -28158,6 +28369,8 @@ function createMoveTool(ctx) {
 function hoistedTools(ctx) {
   return {
     bash: createBashTool(ctx),
+    bash_status: createBashStatusTool(ctx),
+    bash_kill: createBashKillTool(ctx),
     read: createReadTool(ctx),
     write: createWriteTool(ctx, "edit"),
     edit: createEditTool(ctx, "write"),
@@ -28622,7 +28835,7 @@ var LSP_SYMBOL_KIND_MAP = {
   12: "function",
   23: "struct"
 };
-async function queryLspHints(client, symbolName, directory) {
+async function queryLspHints(client, symbolName, directory, sessionId) {
   try {
     const statusResult = await client.lsp.status();
     const servers = statusResult.data;
@@ -28664,7 +28877,7 @@ async function queryLspHints(client, symbolName, directory) {
     }
     return { symbols: hints };
   } catch (err) {
-    warn(`LSP query failed for "${symbolName}": ${err.message}`);
+    sessionWarn(sessionId, `LSP query failed for "${symbolName}": ${err.message}`);
     return;
   }
 }
@@ -28753,7 +28966,7 @@ function refactoringTools(ctx) {
             params.call_site_line = Number(args.callSiteLine);
             break;
         }
-        const hints = await queryLspHints(ctx.client, args.symbol ?? args.name);
+        const hints = await queryLspHints(ctx.client, args.symbol ?? args.name, undefined, context.sessionID);
         if (hints)
           params.lsp_hints = hints;
         const response = await callBridge(ctx, context, commandMap[op], params);
@@ -29129,13 +29342,17 @@ function coerceConfigureWarnings(warnings) {
 }
 async function sendIgnoredMessage2(client, sessionID, text) {
   const typedClient = client;
-  const promptInput = {
-    path: { id: sessionID },
-    body: {
-      noReply: true,
-      parts: [{ type: "text", text, ignored: true }]
-    }
+  const lastModel = await getLastUserModel(client, sessionID);
+  const body = {
+    noReply: true,
+    parts: [{ type: "text", text, ignored: true }]
   };
+  if (lastModel) {
+    body.model = { providerID: lastModel.providerID, modelID: lastModel.modelID };
+    if (lastModel.variant)
+      body.variant = lastModel.variant;
+  }
+  const promptInput = { path: { id: sessionID }, body };
   if (typeof typedClient.session?.prompt === "function") {
     await Promise.resolve(typedClient.session.prompt(promptInput));
     return;
@@ -29171,6 +29388,8 @@ var plugin = async (input) => {
   const configOverrides = {};
   if (aftConfig.format_on_edit !== undefined)
     configOverrides.format_on_edit = aftConfig.format_on_edit;
+  if (aftConfig.formatter_timeout_secs !== undefined)
+    configOverrides.formatter_timeout_secs = aftConfig.formatter_timeout_secs;
   if (aftConfig.validate_on_edit !== undefined)
     configOverrides.validate_on_edit = aftConfig.validate_on_edit;
   if (aftConfig.formatter !== undefined)
@@ -29306,6 +29525,15 @@ ${lines}
         pluginVersion: PLUGIN_VERSION,
         projectRoot
       }, validWarnings);
+    },
+    onBashCompletion: (completion, bridge) => {
+      handlePushedBgCompletion({
+        ctx,
+        directory: input.directory,
+        sessionID: completion.session_id,
+        client: input.client,
+        isActive: () => bridge.hasPendingRequests()
+      }, completion);
     }
   }, configOverrides);
   const ctx = {

package/dist/logger.d.ts

@@ -7,8 +7,8 @@ export declare function error(message: string, data?: unknown): void;
  * a session's tool call). Bridge-lifecycle logs (spawn, version, idle) are
  * project-scoped, not session-scoped — use `log`/`warn`/`error` for those.
  */
-export declare function sessionLog(sessionId: string, message: string, data?: unknown): void;
-export declare function sessionWarn(sessionId: string, message: string, data?: unknown): void;
-export declare function sessionError(sessionId: string, message: string, data?: unknown): void;
+export declare function sessionLog(sessionId: string | undefined, message: string, data?: unknown): void;
+export declare function sessionWarn(sessionId: string | undefined, message: string, data?: unknown): void;
+export declare function sessionError(sessionId: string | undefined, message: string, data?: unknown): void;
 export declare function getLogFilePath(): string;
 //# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAkEA,wBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAEzD;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAE1D;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAE3D;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAEnF;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAEpF;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAErF;AAED,wBAAgB,cAAc,IAAI,MAAM,CAEvC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAuEA,wBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAEzD;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAE1D;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAE3D;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAE/F;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAEhG;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAEjG;AAED,wBAAgB,cAAc,IAAI,MAAM,CAEvC"}

package/dist/lsp.d.ts

@@ -27,6 +27,6 @@ export declare const LSP_SYMBOL_KIND_MAP: Record<number, string>;
  * Failures are silent at the caller level — the binary falls back to
  * tree-sitter-only disambiguation when `lsp_hints` is absent.
  */
-export declare function queryLspHints(client: PluginInput["client"], symbolName: string, directory?: string): Promise<LspHints | undefined>;
+export declare function queryLspHints(client: PluginInput["client"], symbolName: string, directory?: string, sessionId?: string): Promise<LspHints | undefined>;
 export {};
 //# sourceMappingURL=lsp.d.ts.map

package/dist/lsp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lsp.d.ts","sourceRoot":"","sources":["../src/lsp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD,mEAAmE;AACnE,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,8DAA8D;AAC9D,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOtD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,EAC7B,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAwD/B"}
+{"version":3,"file":"lsp.d.ts","sourceRoot":"","sources":["../src/lsp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD,mEAAmE;AACnE,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,8DAA8D;AAC9D,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOtD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,EAC7B,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAwD/B"}

package/dist/notifications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notifications.d.ts","sourceRoot":"","sources":["../src/notifications.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAiOH,MAAM,WAAW,mBAAmB;IAClC,8BAA8B;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,yBAAyB,GAAG,uBAAuB,GAAG,oBAAoB,CAAC;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C1F;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAAE,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAqCf;AAwED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,uBAAuB,EAC7B,QAAQ,EAAE,gBAAgB,EAAE,GAC3B,OAAO,CAAC,IAAI,CAAC,CAwBf;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C9E"}
+{"version":3,"file":"notifications.d.ts","sourceRoot":"","sources":["../src/notifications.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA0OH,MAAM,WAAW,mBAAmB;IAClC,8BAA8B;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,yBAAyB,GAAG,uBAAuB,GAAG,oBAAoB,CAAC;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C1F;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAAE,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAqCf;AAwED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,uBAAuB,EAC7B,QAAQ,EAAE,gBAAgB,EAAE,GAC3B,OAAO,CAAC,IAAI,CAAC,CAwBf;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C9E"}

package/dist/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAY5D,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,UAAU;IACrB,iEAAiE;IACjE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IACxD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0B;IAC1D,OAAO,CAAC,YAAY,CAA+C;gBAGjE,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,WAAgB,EACzB,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAoB/C;;;;;;;OAOG;IACH,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAgB5D;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY;IAmB5C,wEAAwE;IACxE,OAAO,CAAC,OAAO;IAUf,yDAAyD;IACzD,OAAO,CAAC,QAAQ;IAgBhB,wDAAwD;IAClD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAU/B;;;OAGG;IACG,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnD,4CAA4C;IAC5C,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAY5D,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,UAAU;IACrB,iEAAiE;IACjE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IACxD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0B;IAC1D,OAAO,CAAC,YAAY,CAA+C;gBAGjE,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,WAAgB,EACzB,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAqB/C;;;;;;;OAOG;IACH,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAgB5D;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY;IAmB5C,wEAAwE;IACxE,OAAO,CAAC,OAAO;IAUf,yDAAyD;IACzD,OAAO,CAAC,QAAQ;IAgBhB,wDAAwD;IAClD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAU/B;;;OAGG;IACG,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnD,4CAA4C;IAC5C,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}

package/dist/shared/last-user-model.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Cache-busting fix: every PromptInput we send to OpenCode starts a new
+ * assistant turn (via `noReply: false`) or stores a new user message
+ * (via `noReply: true`). OpenCode's `createUserMessage` (in
+ * `packages/opencode/src/session/prompt.ts`) only preserves the user's
+ * model variant if we pass it explicitly — otherwise it falls back to
+ * `agent.variant` or undefined, silently switching the next assistant
+ * turn off the variant the human chose. That switch evicts the
+ * provider's prefix cache on every notification.
+ *
+ * This module fetches the last real user message's `{ providerID,
+ * modelID, variant }` and exposes it so prompt callers can include it
+ * verbatim in `PromptInput.model` + `PromptInput.variant`. Results are
+ * memoised per session for a short window so a batch of warnings or
+ * bg-completions only hits the messages API once.
+ */
+export interface LastUserModel {
+    providerID: string;
+    modelID: string;
+    variant?: string;
+}
+/**
+ * Returns the most recent real user message's model + variant for the
+ * session, or `null` when the session has no user messages or the
+ * client doesn't expose `session.messages`. Result is cached for
+ * {@link CACHE_TTL_MS} ms per session — long enough to coalesce a
+ * batch of notifications, short enough that an actual variant change
+ * inside the conversation is picked up promptly.
+ *
+ * NOTE: Skips synthetic user messages we just produced ourselves
+ * (those whose only parts are `ignored: true`). Otherwise our own
+ * announcement could pin the variant after a single round-trip and
+ * defeat the fix.
+ */
+export declare function getLastUserModel(client: unknown, sessionId: string): Promise<LastUserModel | null>;
+/** Test-only: drop the cache so unit tests can simulate fresh sessions. */
+export declare function __resetLastUserModelCacheForTests(): void;
+//# sourceMappingURL=last-user-model.d.ts.map

package/dist/shared/last-user-model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"last-user-model.d.ts","sourceRoot":"","sources":["../../src/shared/last-user-model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAwBH,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAWD;;;;;;;;;;;;GAYG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA0C/B;AAiBD,2EAA2E;AAC3E,wBAAgB,iCAAiC,IAAI,IAAI,CAExD"}

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

@@ -1 +1 @@
-{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-server.ts"],"names":[],"mappings":"AAOA,KAAK,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAExF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,YAAY,CAAS;gBAEjB,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAIjD,sCAAsC;IACtC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAIjD,6DAA6D;IACvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAuC9B,8CAA8C;IAC9C,IAAI,IAAI,IAAI;IAaZ,OAAO,CAAC,QAAQ;CAmEjB"}
+{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-server.ts"],"names":[],"mappings":"AAOA,KAAK,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAExF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,YAAY,CAAS;gBAEjB,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAIjD,sCAAsC;IACtC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAIjD,6DAA6D;IACvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAuC9B,8CAA8C;IAC9C,IAAI,IAAI,IAAI;IAaZ,OAAO,CAAC,QAAQ;CAoEjB"}

package/dist/tools/bash.d.ts

@@ -1,4 +1,6 @@
 import type { ToolDefinition } from "@opencode-ai/plugin";
 import type { PluginContext } from "../types.js";
 export declare function createBashTool(ctx: PluginContext): ToolDefinition;
+export declare function createBashStatusTool(ctx: PluginContext): ToolDefinition;
+export declare function createBashKillTool(ctx: PluginContext): ToolDefinition;
 //# sourceMappingURL=bash.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAsDjD,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CA8IjE"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAsDjD,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAoJjE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CA4BvE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAmBrE"}

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

@@ -1 +1 @@
-{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAkEjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA+QtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAgJjE;AA08BD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAU/E;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAmEnF"}
+{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAkEjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA+QtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAgJjE;AAm+BD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAY/E;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAmEnF"}

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

@@ -1 +1 @@
-{"version":3,"file":"refactoring.d.ts","sourceRoot":"","sources":["../../src/tools/refactoring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAajD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA2HnF"}
+{"version":3,"file":"refactoring.d.ts","sourceRoot":"","sources":["../../src/tools/refactoring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAajD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAgInF"}

package/dist/tui.js

@@ -2,7 +2,7 @@
 // package.json
 var package_default = {
   name: "@cortexkit/aft-opencode",
-  version: "0.18.2",
+  version: "0.18.3",
   type: "module",
   description: "OpenCode plugin for Agent File Tools (AFT) \u2014 tree-sitter and lsp powered code analysis",
   main: "dist/index.js",
@@ -25,6 +25,7 @@ var package_default = {
     pretest: "cd ../.. && cargo build",
     test: "bun test",
     "test:e2e": "bun test src/__tests__/e2e/",
+    lint: "biome check src",
     prepublishOnly: "bun run build"
   },
   dependencies: {
@@ -35,11 +36,11 @@ var package_default = {
     zod: "^4.1.8"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.18.2",
-    "@cortexkit/aft-darwin-x64": "0.18.2",
-    "@cortexkit/aft-linux-arm64": "0.18.2",
-    "@cortexkit/aft-linux-x64": "0.18.2",
-    "@cortexkit/aft-win32-x64": "0.18.2"
+    "@cortexkit/aft-darwin-arm64": "0.18.3",
+    "@cortexkit/aft-darwin-x64": "0.18.3",
+    "@cortexkit/aft-linux-arm64": "0.18.3",
+    "@cortexkit/aft-linux-x64": "0.18.3",
+    "@cortexkit/aft-win32-x64": "0.18.3"
   },
   devDependencies: {
     "@types/node": "^22.0.0",
@@ -72,7 +73,8 @@ 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 isTestEnv = process.env.BUN_TEST === "1" || false;
+var logFile = path.join(os.tmpdir(), isTestEnv ? "aft-plugin-test.log" : "aft-plugin.log");
 var useStderr = process.env.AFT_LOG_STDERR === "1";
 var buffer = [];
 var flushTimer = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -23,6 +23,7 @@
     "pretest": "cd ../.. && cargo build",
     "test": "bun test",
     "test:e2e": "bun test src/__tests__/e2e/",
+    "lint": "biome check src",
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
@@ -33,11 +34,11 @@
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.18.2",
-    "@cortexkit/aft-darwin-x64": "0.18.2",
-    "@cortexkit/aft-linux-arm64": "0.18.2",
-    "@cortexkit/aft-linux-x64": "0.18.2",
-    "@cortexkit/aft-win32-x64": "0.18.2"
+    "@cortexkit/aft-darwin-arm64": "0.18.3",
+    "@cortexkit/aft-darwin-x64": "0.18.3",
+    "@cortexkit/aft-linux-arm64": "0.18.3",
+    "@cortexkit/aft-linux-x64": "0.18.3",
+    "@cortexkit/aft-win32-x64": "0.18.3"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/src/logger.ts

@@ -3,7 +3,12 @@ import * as os from "node:os";
 import * as path from "node:path";
 
 const TAG = "[aft-plugin]";
-const logFile = path.join(os.tmpdir(), "aft-plugin.log");
+
+// Route test runs to a separate log file so `bun test` never pollutes the
+// live session log that users read to diagnose problems. Bun sets BUN_TEST=1
+// automatically; NODE_ENV=test covers other test harnesses.
+const isTestEnv = process.env.BUN_TEST === "1" || process.env.NODE_ENV === "test";
+const logFile = path.join(os.tmpdir(), isTestEnv ? "aft-plugin-test.log" : "aft-plugin.log");
 
 /**
  * When AFT_LOG_STDERR=1, logs go to stderr (useful for subprocess tests that
@@ -82,15 +87,15 @@ export function error(message: string, data?: unknown): void {
  * a session's tool call). Bridge-lifecycle logs (spawn, version, idle) are
  * project-scoped, not session-scoped — use `log`/`warn`/`error` for those.
  */
-export function sessionLog(sessionId: string, message: string, data?: unknown): void {
+export function sessionLog(sessionId: string | undefined, message: string, data?: unknown): void {
   write("INFO", message, data, sessionId);
 }
 
-export function sessionWarn(sessionId: string, message: string, data?: unknown): void {
+export function sessionWarn(sessionId: string | undefined, message: string, data?: unknown): void {
   write("WARN", message, data, sessionId);
 }
 
-export function sessionError(sessionId: string, message: string, data?: unknown): void {
+export function sessionError(sessionId: string | undefined, message: string, data?: unknown): void {
   write("ERROR", message, data, sessionId);
 }
 

package/src/shared/last-user-model.ts

@@ -0,0 +1,133 @@
+/**
+ * Cache-busting fix: every PromptInput we send to OpenCode starts a new
+ * assistant turn (via `noReply: false`) or stores a new user message
+ * (via `noReply: true`). OpenCode's `createUserMessage` (in
+ * `packages/opencode/src/session/prompt.ts`) only preserves the user's
+ * model variant if we pass it explicitly — otherwise it falls back to
+ * `agent.variant` or undefined, silently switching the next assistant
+ * turn off the variant the human chose. That switch evicts the
+ * provider's prefix cache on every notification.
+ *
+ * This module fetches the last real user message's `{ providerID,
+ * modelID, variant }` and exposes it so prompt callers can include it
+ * verbatim in `PromptInput.model` + `PromptInput.variant`. Results are
+ * memoised per session for a short window so a batch of warnings or
+ * bg-completions only hits the messages API once.
+ */
+
+interface SessionMessageInfo {
+  id?: string;
+  role?: string;
+  parts?: Array<{ ignored?: boolean }>;
+  model?: {
+    providerID?: string;
+    modelID?: string;
+    variant?: string;
+  };
+}
+
+interface SessionMessage {
+  info?: SessionMessageInfo;
+  parts?: Array<{ ignored?: boolean }>;
+}
+
+interface OpenCodeClientShape {
+  session?: {
+    messages?: (input: { path: { id: string } }) => Promise<{ data?: SessionMessage[] }>;
+  };
+}
+
+export interface LastUserModel {
+  providerID: string;
+  modelID: string;
+  variant?: string;
+}
+
+interface CacheEntry {
+  expiresAt: number;
+  model: LastUserModel | null;
+}
+
+const CACHE_TTL_MS = 5_000;
+const CACHE_MAX_ENTRIES = 100;
+const cache = new Map<string, CacheEntry>();
+
+/**
+ * Returns the most recent real user message's model + variant for the
+ * session, or `null` when the session has no user messages or the
+ * client doesn't expose `session.messages`. Result is cached for
+ * {@link CACHE_TTL_MS} ms per session — long enough to coalesce a
+ * batch of notifications, short enough that an actual variant change
+ * inside the conversation is picked up promptly.
+ *
+ * NOTE: Skips synthetic user messages we just produced ourselves
+ * (those whose only parts are `ignored: true`). Otherwise our own
+ * announcement could pin the variant after a single round-trip and
+ * defeat the fix.
+ */
+export async function getLastUserModel(
+  client: unknown,
+  sessionId: string,
+): Promise<LastUserModel | null> {
+  const now = Date.now();
+  const cached = cache.get(sessionId);
+  if (cached && cached.expiresAt > now) {
+    cache.delete(sessionId);
+    cache.set(sessionId, cached);
+    return cached.model;
+  }
+  if (cached) cache.delete(sessionId);
+
+  const c = client as OpenCodeClientShape;
+  const fetcher = c?.session?.messages;
+  if (typeof fetcher !== "function") {
+    return null;
+  }
+
+  let messages: SessionMessage[];
+  try {
+    const result = await fetcher({ path: { id: sessionId } });
+    messages = result?.data ?? [];
+  } catch {
+    // Don't cache failures — a transient API error shouldn't pin the
+    // session's variant resolution to "unknown" for 5 s.
+    return null;
+  }
+
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const info = messages[i]?.info;
+    if (info?.role !== "user") continue;
+    if (isSyntheticIgnoredMessage(messages[i])) continue;
+    const model = info.model;
+    if (!model?.providerID || !model?.modelID) continue;
+    const resolved: LastUserModel = {
+      providerID: model.providerID,
+      modelID: model.modelID,
+      ...(model.variant ? { variant: model.variant } : {}),
+    };
+    setCache(sessionId, resolved);
+    return resolved;
+  }
+
+  return null;
+}
+
+function setCache(sessionId: string, model: LastUserModel | null): void {
+  if (cache.has(sessionId)) cache.delete(sessionId);
+  cache.set(sessionId, { expiresAt: Date.now() + CACHE_TTL_MS, model });
+  while (cache.size > CACHE_MAX_ENTRIES) {
+    const oldest = cache.keys().next().value;
+    if (typeof oldest !== "string") break;
+    cache.delete(oldest);
+  }
+}
+
+function isSyntheticIgnoredMessage(message: SessionMessage | undefined): boolean {
+  const parts = message?.info?.parts ?? message?.parts;
+  return Array.isArray(parts) && parts.length > 0 && parts.every((part) => part?.ignored === true);
+}
+
+/** Test-only: drop the cache so unit tests can simulate fresh sessions. */
+export function __resetLastUserModelCacheForTests(): void {
+  cache.clear();
+}

package/src/shared/rpc-server.ts

@@ -130,10 +130,11 @@ export class AftRpcServer {
 
       const { token: _token, ...handlerParams } = params;
 
-      log(`RPC call: ${method} params=${JSON.stringify(handlerParams).slice(0, 200)}`);
+      // Successful RPC calls are intentionally NOT logged. The /aft-status
+      // TUI dialog polls every 1.5s while open, which used to spam the log
+      // with RPC call/result pairs. Errors are still logged (real signal).
       handler(handlerParams)
         .then((result) => {
-          log(`RPC result: ${method} => ${JSON.stringify(result).slice(0, 200)}`);
           res.writeHead(200, { "Content-Type": "application/json" });
           res.end(JSON.stringify(result));
         })