@cortexkit/aft-opencode 0.18.3 → 0.19.0

package/dist/logger.d.ts

@@ -11,4 +11,22 @@ export declare function sessionLog(sessionId: string | undefined, message: strin
 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;
+/**
+ * Adapter that exposes this logger as a {@link import("@cortexkit/aft-bridge").Logger}
+ * for the shared bridge package. The bridge package never knows about this log
+ * file or the `[aft-plugin]` tag — it just calls `log/warn/error` and we map
+ * its `LogMeta.sessionId` into our internal session-prefix shape.
+ */
+export declare const bridgeLogger: {
+    log(message: string, meta?: {
+        sessionId?: string;
+    }): void;
+    warn(message: string, meta?: {
+        sessionId?: string;
+    }): void;
+    error(message: string, meta?: {
+        sessionId?: string;
+    }): void;
+    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":"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"}
+{"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;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY;iBACV,MAAM,SAAS;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;kBAGpC,MAAM,SAAS;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;mBAGpC,MAAM,SAAS;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;;CAIrD,CAAC"}

package/dist/notifications.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"notifications.d.ts","sourceRoot":"","sources":["../src/notifications.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAyOH,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/shared/last-assistant-model.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Cache-busting fix for prompt prefix cache eviction.
+ *
+ * PROBLEM: Every PromptInput we send to OpenCode (notifications, idle
+ * wakeups, ignored messages) creates a new user message. OpenCode's
+ * `createUserMessage` resolves variant relative to the chosen agent. If
+ * we don't pass model/variant, defaults take over and bust the provider
+ * prefix cache that the previous assistant turn warmed.
+ *
+ * APPROACH: Mirror what `opencode-xtra` does in production. Read recent
+ * messages from `client.session.messages()`, prefer the most recent
+ * assistant message, fall back to any role, MERGE across messages so
+ * partial fields (e.g. agent set on user message but not assistant) are
+ * filled in, and read BOTH the flat shape (`info.providerID`) used by
+ * AssistantMessage and the nested shape (`info.model.providerID`) used
+ * by UserMessage.
+ *
+ * IMPORTANT: This context is only meaningful for callers that DO trigger
+ * LLM inference (e.g. background-bash idle wakes with `noReply: false`).
+ * Callers using `noReply: true` (one-off ignored messages, warnings,
+ * announcements) never trigger inference, so they don't need model or
+ * variant — the model/variant pass-through there is unnecessary AND has
+ * been observed to crash OpenCode under some configurations. Limit
+ * model/variant pass-through to wake-style calls.
+ */
+export interface ResolvedPromptContext {
+    agent?: string;
+    model?: {
+        providerID: string;
+        modelID: string;
+    };
+    variant?: string;
+}
+/**
+ * Read recent messages from the OpenCode session and resolve the most
+ * recent assistant prompt context. Falls back to user messages if no
+ * assistant has the field. Merges across messages so partial fields are
+ * filled in. Returns null if no usable context is found.
+ *
+ * Mirrors `resolveSessionPromptParams` in `opencode-xtra` (the working
+ * reference implementation).
+ */
+export declare function resolvePromptContext(client: unknown, sessionId: string): Promise<ResolvedPromptContext | null>;
+export interface LastAssistantModel {
+    providerID: string;
+    modelID: string;
+    variant?: string;
+}
+/** @deprecated Use {@link resolvePromptContext} which also returns agent. */
+export declare function getLastAssistantModel(client: unknown, sessionId: string): Promise<LastAssistantModel | null>;
+//# sourceMappingURL=last-assistant-model.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"last-assistant-model.d.ts","sourceRoot":"","sources":["../../src/shared/last-assistant-model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA0ED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAwCvC;AAID,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,6EAA6E;AAC7E,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAQpC"}

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

@@ -0,0 +1,32 @@
+/**
+ * Resolve the project directory the session was created with. Returns
+ * `null` when the lookup is unavailable or fails — callers should fall
+ * back to the runtime's directory in that case.
+ *
+ * This function is best-effort: any error (missing `client.session.get`,
+ * network failure, malformed response) is logged and recorded as a
+ * negative cache entry so we don't retry on every tool call within the
+ * same session.
+ */
+export declare function getSessionDirectory(client: unknown, sessionId: string, fallbackDirectory: string): Promise<string | null>;
+/**
+ * Synchronous cache probe. Returns the resolved directory for a session if we
+ * already looked it up; otherwise `undefined` so the caller falls through to
+ * its synchronous fallback (typically `runtime.directory`).
+ *
+ * This is the hot path: `bridgeFor()` runs on every tool call and must not
+ * block on an SDK round-trip. The async {@link warmSessionDirectory} should
+ * be called eagerly (without await) at the start of each tool call to keep
+ * the cache filled, so by the time a second call from the same session
+ * arrives, this probe returns the correct directory.
+ */
+export declare function getSessionDirectoryCached(sessionId: string | undefined): string | null | undefined;
+/**
+ * Fire-and-forget cache warmup. Safe to call from synchronous code; failures
+ * are logged but not propagated. Subsequent calls to {@link getSessionDirectoryCached}
+ * will return the resolved directory once the lookup completes.
+ */
+export declare function warmSessionDirectory(client: unknown, sessionId: string | undefined, fallbackDirectory: string): void;
+/** Test-only: clear the cache between unit tests. */
+export declare function _resetSessionDirectoryCacheForTest(): void;
+//# sourceMappingURL=session-directory.d.ts.map

package/dist/shared/session-directory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-directory.d.ts","sourceRoot":"","sources":["../../src/shared/session-directory.ts"],"names":[],"mappings":"AA8CA;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA0CxB;AAWD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,GAAG,IAAI,GAAG,SAAS,CAK3B;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,iBAAiB,EAAE,MAAM,GACxB,IAAI,CAIN;AAED,qDAAqD;AACrD,wBAAgB,kCAAkC,IAAI,IAAI,CAEzD"}

package/dist/tools/_shared.d.ts

@@ -15,7 +15,7 @@
  * `bridge.send()` multiple times with shared state) should use `bridgeFor()`
  * and still pass `session_id` explicitly.
  */
-import type { BinaryBridge, BridgeRequestOptions } from "../bridge.js";
+import type { BinaryBridge, BridgeRequestOptions } from "@cortexkit/aft-bridge";
 import type { PluginContext } from "../types.js";
 /**
  * Per-command timeout overrides (milliseconds).
@@ -49,14 +49,25 @@ export interface ToolRuntime {
  * Prefers `worktree` because that stays stable across OpenCode sessions in
  * the same project; falls back to `directory` when unavailable (standalone
  * CLI use, older hosts). Normalizes trailing slashes and resolves symlinks
- * via `realpath` so `/repo` and `/repo/` and `/Users/.../repo -> /Volumes/...`
- * collapse to the same key.
+ * so `/repo` and `/repo/` and `/Users/.../repo -> /Volumes/...` collapse to
+ * the same key.
+ *
+ * NOTE: When the runtime carries a `sessionID` and we have a cached
+ * session-stored directory for it (see `shared/session-directory.ts`), the
+ * stored directory wins. This is the workaround for OpenCode's bug where
+ * `ctx.directory` is set to `process.cwd()` rather than the resumed
+ * session's actual project directory.
  */
 export declare function projectRootFor(runtime: ToolRuntime): string;
 /**
  * Get the BinaryBridge for the runtime's project root.
  *
  * Prefer `callBridge()` unless you need to send multiple requests yourself.
+ *
+ * This is synchronous and uses only the cached session directory. If the
+ * cache is cold, it falls back to `runtime.directory` — `callBridge()`
+ * eagerly warms the cache before calling this so the cache is hot for
+ * subsequent calls in the same session.
  */
 export declare function bridgeFor(ctx: PluginContext, runtime: ToolRuntime): BinaryBridge;
 /**
@@ -66,9 +77,20 @@ export declare function bridgeFor(ctx: PluginContext, runtime: ToolRuntime): Bin
  * the right bridge (project-keyed), attaches the session namespace from
  * `context.sessionID`, and returns whatever the binary responds.
  *
+ * Before routing, it ensures the session-directory cache is warm so the
+ * very first tool call on a resumed-from-wrong-cwd session still reaches
+ * the correct project bridge. Subsequent calls hit the cache synchronously.
+ *
  * The Rust side falls back to a shared default namespace when `session_id`
  * is absent (see `RawRequest::session()`), so hosts that don't expose a
  * session identifier still work — they just share undo/checkpoint state.
  */
-export declare function callBridge(ctx: PluginContext, runtime: ToolRuntime, command: string, params?: Record<string, unknown>, options?: BridgeRequestOptions): ReturnType<BinaryBridge["send"]>;
+export declare function callBridge(ctx: PluginContext, runtime: ToolRuntime, command: string, params?: Record<string, unknown>, options?: BridgeRequestOptions): Promise<Record<string, unknown>>;
+/**
+ * Eagerly warm the session-directory cache for a runtime. Safe to call from
+ * synchronous code — the lookup runs in the background and failures are
+ * logged. Useful in plugin lifecycle hooks (`chat.message`, etc.) where we
+ * want the cache filled before any tool call arrives.
+ */
+export declare function warmSessionDirectoryFromRuntime(ctx: PluginContext, runtime: ToolRuntime): void;
 //# sourceMappingURL=_shared.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../src/tools/_shared.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQlE,CAAC;AAEF,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAErE;AAED;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAa3D;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,YAAY,CAEhF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAiBlC"}
+{"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../src/tools/_shared.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAOhF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQlE,CAAC;AAEF,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAErE;AAED;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkBD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAW3D;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,YAAY,CAEhF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0BlC;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAE9F"}

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,CAoJjE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CA4BvE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAmBrE"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIvE,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;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"}
+{"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;AAqRtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAgJjE;AAqgCD;;;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;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,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,CAwJ/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/tui.js

@@ -2,7 +2,7 @@
 // package.json
 var package_default = {
   name: "@cortexkit/aft-opencode",
-  version: "0.18.3",
+  version: "0.19.0",
   type: "module",
   description: "OpenCode plugin for Agent File Tools (AFT) \u2014 tree-sitter and lsp powered code analysis",
   main: "dist/index.js",
@@ -30,17 +30,19 @@ var package_default = {
   },
   dependencies: {
     "@clack/prompts": "^1.2.0",
+    "@cortexkit/aft-bridge": "0.19.0",
     "@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.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"
+    "@cortexkit/aft-darwin-arm64": "0.19.0",
+    "@cortexkit/aft-darwin-x64": "0.19.0",
+    "@cortexkit/aft-linux-arm64": "0.19.0",
+    "@cortexkit/aft-linux-x64": "0.19.0",
+    "@cortexkit/aft-win32-x64": "0.19.0"
   },
   devDependencies: {
     "@types/node": "^22.0.0",
@@ -157,17 +159,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/types.d.ts

@@ -1,6 +1,6 @@
+import type { BridgePool } from "@cortexkit/aft-bridge";
 import type { PluginInput } from "@opencode-ai/plugin";
 import type { AftConfig } from "./config.js";
-import type { BridgePool } from "./pool.js";
 interface ShellEnvPluginHost {
     trigger?: (name: "shell.env", context: {
         cwd: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,UAAU,kBAAkB;IAC1B,OAAO,CAAC,EAAE,CACR,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7D,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,KACnC,OAAO,CAAC;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;CACnF;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,UAAU,kBAAkB;IAC1B,OAAO,CAAC,EAAE,CACR,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7D,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,KACnC,OAAO,CAAC;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;CACnF;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAC;CACpB"}

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,CA2EzE;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.3",
+  "version": "0.19.0",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -28,17 +28,19 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
+    "@cortexkit/aft-bridge": "0.19.0",
     "@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.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"
+    "@cortexkit/aft-darwin-arm64": "0.19.0",
+    "@cortexkit/aft-darwin-x64": "0.19.0",
+    "@cortexkit/aft-linux-arm64": "0.19.0",
+    "@cortexkit/aft-linux-x64": "0.19.0",
+    "@cortexkit/aft-win32-x64": "0.19.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/src/logger.ts

@@ -102,3 +102,22 @@ export function sessionError(sessionId: string | undefined, message: string, dat
 export function getLogFilePath(): string {
   return logFile;
 }
+
+/**
+ * Adapter that exposes this logger as a {@link import("@cortexkit/aft-bridge").Logger}
+ * for the shared bridge package. The bridge package never knows about this log
+ * file or the `[aft-plugin]` tag — it just calls `log/warn/error` and we map
+ * its `LogMeta.sessionId` into our internal session-prefix shape.
+ */
+export const bridgeLogger = {
+  log(message: string, meta?: { sessionId?: string }) {
+    sessionLog(meta?.sessionId, message);
+  },
+  warn(message: string, meta?: { sessionId?: string }) {
+    sessionWarn(meta?.sessionId, message);
+  },
+  error(message: string, meta?: { sessionId?: string }) {
+    sessionError(meta?.sessionId, message);
+  },
+  getLogFilePath: () => logFile,
+};

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

@@ -0,0 +1,179 @@
+/**
+ * Cache-busting fix for prompt prefix cache eviction.
+ *
+ * PROBLEM: Every PromptInput we send to OpenCode (notifications, idle
+ * wakeups, ignored messages) creates a new user message. OpenCode's
+ * `createUserMessage` resolves variant relative to the chosen agent. If
+ * we don't pass model/variant, defaults take over and bust the provider
+ * prefix cache that the previous assistant turn warmed.
+ *
+ * APPROACH: Mirror what `opencode-xtra` does in production. Read recent
+ * messages from `client.session.messages()`, prefer the most recent
+ * assistant message, fall back to any role, MERGE across messages so
+ * partial fields (e.g. agent set on user message but not assistant) are
+ * filled in, and read BOTH the flat shape (`info.providerID`) used by
+ * AssistantMessage and the nested shape (`info.model.providerID`) used
+ * by UserMessage.
+ *
+ * IMPORTANT: This context is only meaningful for callers that DO trigger
+ * LLM inference (e.g. background-bash idle wakes with `noReply: false`).
+ * Callers using `noReply: true` (one-off ignored messages, warnings,
+ * announcements) never trigger inference, so they don't need model or
+ * variant — the model/variant pass-through there is unnecessary AND has
+ * been observed to crash OpenCode under some configurations. Limit
+ * model/variant pass-through to wake-style calls.
+ */
+
+export interface ResolvedPromptContext {
+  agent?: string;
+  model?: { providerID: string; modelID: string };
+  variant?: string;
+}
+
+interface RawInfo {
+  role?: string;
+  agent?: string;
+  variant?: string;
+  providerID?: string;
+  modelID?: string;
+  model?: { providerID?: string; modelID?: string; variant?: string };
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function extractMessages(response: unknown): unknown[] {
+  if (Array.isArray(response)) return response;
+  if (isRecord(response) && Array.isArray(response.data)) return response.data;
+  return [];
+}
+
+function getRole(message: unknown): string | undefined {
+  if (!isRecord(message) || !isRecord(message.info)) return undefined;
+  return typeof message.info.role === "string" ? message.info.role : undefined;
+}
+
+function extractFromMessage(message: unknown): ResolvedPromptContext | null {
+  if (!isRecord(message) || !isRecord(message.info)) return null;
+  const info = message.info as RawInfo;
+  const modelInfo = isRecord(info.model) ? info.model : undefined;
+
+  const agent = typeof info.agent === "string" ? info.agent : undefined;
+  const providerID =
+    typeof modelInfo?.providerID === "string"
+      ? modelInfo.providerID
+      : typeof info.providerID === "string"
+        ? info.providerID
+        : undefined;
+  const modelID =
+    typeof modelInfo?.modelID === "string"
+      ? modelInfo.modelID
+      : typeof info.modelID === "string"
+        ? info.modelID
+        : undefined;
+  const variant =
+    typeof modelInfo?.variant === "string"
+      ? modelInfo.variant
+      : typeof info.variant === "string"
+        ? info.variant
+        : undefined;
+
+  if (!agent && (!providerID || !modelID) && !variant) return null;
+  const out: ResolvedPromptContext = {};
+  if (agent) out.agent = agent;
+  if (providerID && modelID) out.model = { providerID, modelID };
+  if (variant) out.variant = variant;
+  return out;
+}
+
+function mergeContexts(
+  base: ResolvedPromptContext,
+  patch: ResolvedPromptContext,
+): ResolvedPromptContext {
+  return {
+    agent: base.agent ?? patch.agent,
+    model: base.model ?? patch.model,
+    variant: base.variant ?? patch.variant,
+  };
+}
+
+function isComplete(ctx: ResolvedPromptContext): boolean {
+  return Boolean(ctx.agent && ctx.model && ctx.variant);
+}
+
+/**
+ * Read recent messages from the OpenCode session and resolve the most
+ * recent assistant prompt context. Falls back to user messages if no
+ * assistant has the field. Merges across messages so partial fields are
+ * filled in. Returns null if no usable context is found.
+ *
+ * Mirrors `resolveSessionPromptParams` in `opencode-xtra` (the working
+ * reference implementation).
+ */
+export async function resolvePromptContext(
+  client: unknown,
+  sessionId: string,
+): Promise<ResolvedPromptContext | null> {
+  if (!client || !sessionId) return null;
+  const c = client as {
+    session?: {
+      messages?: (input: { path: { id: string } }) => Promise<{ data?: unknown[] } | unknown[]>;
+    };
+  };
+  if (typeof c.session?.messages !== "function") return null;
+
+  let messages: unknown[] = [];
+  try {
+    const response = await c.session.messages({ path: { id: sessionId } });
+    messages = extractMessages(response);
+  } catch {
+    return null;
+  }
+  if (messages.length === 0) return null;
+
+  // Pass 1: prefer the most recent assistant, merge older assistants to
+  // fill missing fields.
+  let result: ResolvedPromptContext = {};
+  for (let i = messages.length - 1; i >= 0; i -= 1) {
+    if (getRole(messages[i]) !== "assistant") continue;
+    const ctx = extractFromMessage(messages[i]);
+    if (!ctx) continue;
+    result = mergeContexts(result, ctx);
+    if (isComplete(result)) return result;
+  }
+
+  // Pass 2: fall back to any role (covers user messages, which carry
+  // model nested under `info.model`).
+  for (let i = messages.length - 1; i >= 0; i -= 1) {
+    const ctx = extractFromMessage(messages[i]);
+    if (!ctx) continue;
+    result = mergeContexts(result, ctx);
+    if (isComplete(result)) return result;
+  }
+
+  if (!result.agent && !result.model && !result.variant) return null;
+  return result;
+}
+
+// --- Compatibility shim for any older caller still using this name ---
+
+export interface LastAssistantModel {
+  providerID: string;
+  modelID: string;
+  variant?: string;
+}
+
+/** @deprecated Use {@link resolvePromptContext} which also returns agent. */
+export async function getLastAssistantModel(
+  client: unknown,
+  sessionId: string,
+): Promise<LastAssistantModel | null> {
+  const ctx = await resolvePromptContext(client, sessionId);
+  if (!ctx?.model) return null;
+  return {
+    providerID: ctx.model.providerID,
+    modelID: ctx.model.modelID,
+    ...(ctx.variant ? { variant: ctx.variant } : {}),
+  };
+}