@cortexkit/aft-opencode 0.18.2 → 0.18.4

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

@@ -38,6 +38,8 @@ export declare class BridgePool {
      * cold-start cost on a cheap query.
      */
     getAnyActiveBridge(projectRoot: string): BinaryBridge | null;
+    /** Get an alive bridge only when it belongs to the requested project root. */
+    getActiveBridgeForRoot(projectRoot: string): BinaryBridge | null;
     /**
      * Get or create the bridge for `projectRoot`.
      *

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":"AACA,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,8EAA8E;IAC9E,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAQhE;;;;;;;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-client.d.ts

@@ -6,6 +6,8 @@ export declare class AftRpcClient {
     constructor(storageDir: string, directory: string);
     /** Call an RPC method. Retries port resolution if the server isn't ready yet. */
     call<T = Record<string, unknown>>(method: string, params?: Record<string, unknown>): Promise<T>;
+    private callResolved;
+    private retryAfterReset;
     /** Check if the RPC server is reachable. */
     isAvailable(): Promise<boolean>;
     private resolvePort;

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

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-client.ts"],"names":[],"mappings":"AAQA,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;gBAElB,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAIjD,iFAAiF;IAC3E,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,OAAO,CAAC,CAAC,CAAC;IAoBb,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;YASvB,WAAW;YAIX,eAAe;IAoC7B,OAAO,CAAC,YAAY;YAuBN,WAAW;YAWX,gBAAgB;IAU9B,KAAK,IAAI,IAAI;CAKd"}
+{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-client.ts"],"names":[],"mappings":"AAQA,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;gBAElB,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAIjD,iFAAiF;IAC3E,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,OAAO,CAAC,CAAC,CAAC;YASC,YAAY;YA6BZ,eAAe;IAe7B,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;YASvB,WAAW;YAIX,eAAe;IAoC7B,OAAO,CAAC,YAAY;YAuBN,WAAW;YAWX,gBAAgB;IAU9B,KAAK,IAAI,IAAI;CAKd"}

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/shared/url-fetch.d.ts

@@ -1,6 +1,22 @@
+import { lookup } from "node:dns/promises";
+import { type Dispatcher } from "undici";
 interface FetchUrlOptions {
     allowPrivate?: boolean;
+    /** Test-only injection point. Production fetches use undici with DNS pinning. */
+    fetchImpl?: FetchImpl;
+    /** Test-only injection point. Production DNS resolution uses node:dns/promises.lookup. */
+    lookup?: LookupFn;
+    /** Test-only injection point for observing the DNS-pinned dispatcher. */
+    dispatcherFactory?: (validatedIp: string) => Dispatcher;
 }
+type LookupFn = typeof lookup;
+interface FetchInit {
+    signal?: AbortSignal;
+    redirect?: "manual";
+    dispatcher?: Dispatcher;
+    headers?: Record<string, string>;
+}
+type FetchImpl = (input: string, init: FetchInit) => Promise<Response>;
 /** Exported for unit tests. */
 export declare function _isPrivateIpv4(address: string): boolean;
 /**

package/dist/shared/url-fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url-fetch.d.ts","sourceRoot":"","sources":["../../src/shared/url-fetch.ts"],"names":[],"mappings":"AAsBA,UAAU,eAAe;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAyBD,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAavD;AAoND;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAgGjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAkCxD"}
+{"version":3,"file":"url-fetch.d.ts","sourceRoot":"","sources":["../../src/shared/url-fetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAW3C,OAAO,EAAS,KAAK,UAAU,EAAwB,MAAM,QAAQ,CAAC;AAWtE,UAAU,eAAe;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iFAAiF;IACjF,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,0FAA0F;IAC1F,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,yEAAyE;IACzE,iBAAiB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,UAAU,CAAC;CACzD;AAED,KAAK,QAAQ,GAAG,OAAO,MAAM,CAAC;AAC9B,UAAU,SAAS;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAyBvE,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAavD;AAgPD;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAgGjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAkCxD"}

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/reading.d.ts

@@ -1,7 +1,21 @@
 import type { ToolDefinition } from "@opencode-ai/plugin";
 import type { PluginContext } from "../types.js";
+interface ZoomBatchSymbolResult {
+    name: string;
+    success: boolean;
+    content?: string;
+    error?: string;
+}
+interface ZoomBatchResult {
+    complete: boolean;
+    symbols: ZoomBatchSymbolResult[];
+    text: string;
+}
 /**
  * Tool definitions for code reading commands: outline + zoom.
  */
 export declare function readingTools(ctx: PluginContext): Record<string, ToolDefinition>;
+/** Exported for regression tests. */
+export declare function formatZoomBatchResult(symbols: string[], responses: Record<string, unknown>[]): ZoomBatchResult;
+export {};
 //# sourceMappingURL=reading.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"reading.d.ts","sourceRoot":"","sources":["../../src/tools/reading.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA2CjD;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAuK/E"}
+{"version":3,"file":"reading.d.ts","sourceRoot":"","sources":["../../src/tools/reading.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA2CjD,UAAU,qBAAqB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,eAAe;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0K/E;AAED,qCAAqC;AACrC,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GACnC,eAAe,CA0BjB"}

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.4",
   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: {
@@ -32,14 +33,15 @@ var package_default = {
     "@opencode-ai/plugin": "^1.2.26",
     "@opencode-ai/sdk": "^1.2.26",
     "comment-json": "^4.6.2",
+    undici: "^7.25.0",
     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.4",
+    "@cortexkit/aft-darwin-x64": "0.18.4",
+    "@cortexkit/aft-linux-arm64": "0.18.4",
+    "@cortexkit/aft-linux-x64": "0.18.4",
+    "@cortexkit/aft-win32-x64": "0.18.4"
   },
   devDependencies: {
     "@types/node": "^22.0.0",
@@ -72,7 +74,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;
@@ -155,17 +158,40 @@ class AftRpcClient {
     if (!info) {
       throw new Error("AFT RPC server not available");
     }
-    const response = await this.fetchWithTimeout(`http://127.0.0.1:${info.port}/rpc/${method}`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ ...params, token: info.token })
-    });
+    return this.callResolved(method, params, info, true);
+  }
+  async callResolved(method, params, info, retryOnConnectionFailure) {
+    let response;
+    try {
+      response = await this.fetchWithTimeout(`http://127.0.0.1:${info.port}/rpc/${method}`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ ...params, token: info.token })
+      });
+    } catch (err) {
+      if (!retryOnConnectionFailure)
+        throw err;
+      return this.retryAfterReset(method, params, err);
+    }
     if (!response.ok) {
       const text = await response.text();
+      if (response.status >= 500 && retryOnConnectionFailure) {
+        return this.retryAfterReset(method, params, `HTTP ${response.status}: ${text}`);
+      }
       throw new Error(`RPC ${method} failed (${response.status}): ${text}`);
     }
     return await response.json();
   }
+  async retryAfterReset(method, params, reason) {
+    const message = reason instanceof Error ? reason.message : String(reason);
+    warn(`RPC ${method} failed on cached port; retrying after port refresh (${message})`);
+    this.reset();
+    const refreshed = await this.resolvePortInfo();
+    if (!refreshed) {
+      throw new Error("AFT RPC server not available after port refresh");
+    }
+    return this.callResolved(method, params, refreshed, false);
+  }
   async isAvailable() {
     try {
       const port = await this.resolvePort();

package/dist/workflow-hints.d.ts

@@ -0,0 +1,25 @@
+import type { AftConfig } from "./config.js";
+export interface WorkflowHintsOpts {
+    /** `tool_surface` setting — controls which tools are registered. */
+    toolSurface: "minimal" | "recommended" | "all";
+    /** `hoist_builtin_tools` setting — affects tool name (read vs aft_read). */
+    hoistBuiltins: boolean;
+    /** `experimental.semantic_search` — gates `aft_search` mention. */
+    semanticEnabled: boolean;
+    /** `experimental.bash.background` — gates background-bash paragraph. */
+    bashBackgroundEnabled: boolean;
+    /** Set of disabled tool names (after surface filtering). */
+    disabledTools: Set<string>;
+}
+/**
+ * Build the workflow hints block. Returns `null` when no hints are
+ * applicable for the configured surface (e.g. `tool_surface: "minimal"`
+ * with no aft_outline/aft_zoom available — only safety tool is registered).
+ */
+export declare function buildWorkflowHints(opts: WorkflowHintsOpts): string | null;
+/**
+ * Resolve workflow-hints opts from a loaded AftConfig and the active
+ * disabled-tools set computed at registration time.
+ */
+export declare function buildHintsFromConfig(config: AftConfig, disabledTools: Set<string>): string | null;
+//# sourceMappingURL=workflow-hints.d.ts.map

package/dist/workflow-hints.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,WAAW,EAAE,SAAS,GAAG,aAAa,GAAG,KAAK,CAAC;IAC/C,4EAA4E;IAC5E,aAAa,EAAE,OAAO,CAAC;IACvB,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,wEAAwE;IACxE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,4DAA4D;IAC5D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAID;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAoEzE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAQjG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.18.2",
+  "version": "0.18.4",
   "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": {
@@ -30,14 +31,15 @@
     "@opencode-ai/plugin": "^1.2.26",
     "@opencode-ai/sdk": "^1.2.26",
     "comment-json": "^4.6.2",
+    "undici": "^7.25.0",
     "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.4",
+    "@cortexkit/aft-darwin-x64": "0.18.4",
+    "@cortexkit/aft-linux-arm64": "0.18.4",
+    "@cortexkit/aft-linux-x64": "0.18.4",
+    "@cortexkit/aft-win32-x64": "0.18.4"
   },
   "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-client.ts

@@ -26,20 +26,53 @@ export class AftRpcClient {
       throw new Error("AFT RPC server not available");
     }
 
-    const response = await this.fetchWithTimeout(`http://127.0.0.1:${info.port}/rpc/${method}`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ ...params, token: info.token }),
-    });
+    return this.callResolved<T>(method, params, info, true);
+  }
+
+  private async callResolved<T>(
+    method: string,
+    params: Record<string, unknown>,
+    info: { port: number; token: string | null },
+    retryOnConnectionFailure: boolean,
+  ): Promise<T> {
+    let response: Response;
+    try {
+      response = await this.fetchWithTimeout(`http://127.0.0.1:${info.port}/rpc/${method}`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ ...params, token: info.token }),
+      });
+    } catch (err) {
+      if (!retryOnConnectionFailure) throw err;
+      return this.retryAfterReset<T>(method, params, err);
+    }
 
     if (!response.ok) {
       const text = await response.text();
+      if (response.status >= 500 && retryOnConnectionFailure) {
+        return this.retryAfterReset<T>(method, params, `HTTP ${response.status}: ${text}`);
+      }
       throw new Error(`RPC ${method} failed (${response.status}): ${text}`);
     }
 
     return (await response.json()) as T;
   }
 
+  private async retryAfterReset<T>(
+    method: string,
+    params: Record<string, unknown>,
+    reason: unknown,
+  ): Promise<T> {
+    const message = reason instanceof Error ? reason.message : String(reason);
+    warn(`RPC ${method} failed on cached port; retrying after port refresh (${message})`);
+    this.reset();
+    const refreshed = await this.resolvePortInfo();
+    if (!refreshed) {
+      throw new Error("AFT RPC server not available after port refresh");
+    }
+    return this.callResolved<T>(method, params, refreshed, false);
+  }
+
   /** Check if the RPC server is reachable. */
   async isAvailable(): Promise<boolean> {
     try {

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));
         })