@cortexkit/aft-opencode 0.58.1 → 0.58.2

package/dist/tools/hoisted.d.ts

@@ -20,14 +20,16 @@ export declare const _buildUnifiedDiffForTest: (fp: string, before: string, afte
 export declare function createReadTool(ctx: PluginContext): ToolDefinition;
 /**
  * Returns AFT's host-slot tools keyed by the host's built-in names, plus the
- * move/delete tools and the bash companions.
+ * move/delete tools and, while `bash.background` is on, the bash companions.
  *
- * Every entry is always returned; `buildAftToolDefinitions` removes only the
- * names listed in the resolved `disabled_tools`. The bash companions
- * (`bash_status`, `bash_write`, `bash_watch`, `bash_kill`) are independent
- * registrations: disabling `bash` does not remove them, and when the bash
- * runtime gate (`bash.enabled`) is off every bash operation reports
- * `bash_disabled` instead of disappearing.
+ * `buildAftToolDefinitions` then removes the names listed in the resolved
+ * `disabled_tools`. The bash companions (`bash_status`, `bash_write`,
+ * `bash_watch`, `bash_kill`) are independent of `bash` itself: disabling
+ * `bash` does not remove them, and when the bash runtime gate (`bash.enabled`)
+ * is off every bash operation reports `bash_disabled` instead of disappearing.
+ * They exist only to inspect, wait on, feed and stop background tasks, so with
+ * `bash.background` off, when no background task can exist, they are not
+ * registered at all.
  */
 export declare function hoistedTools(ctx: PluginContext): Record<string, ToolDefinition>;
 //# sourceMappingURL=hoisted.d.ts.map

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;AAKH,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAMnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA4CjD,yFAAyF;AACzF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE/E;AAaD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AAqPtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAiKjE;AAkxBD;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAgB/E"}
+{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAUH,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAOnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA4CjD,yFAAyF;AACzF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE/E;AAaD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AAqPtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CA2JjE;AA+wBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAsB/E"}

package/dist/tools/reading.d.ts

@@ -11,9 +11,6 @@ interface ZoomBatchResult {
     symbols: ZoomBatchSymbolResult[];
     text: string;
 }
-/**
- * Tool definitions for code reading commands: outline + zoom.
- */
 export declare function readingTools(ctx: PluginContext): Record<string, ToolDefinition>;
 /**
  * Format multi-symbol zoom results as plain text. Successful entries use

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

@@ -1 +1 @@
-{"version":3,"file":"reading.d.ts","sourceRoot":"","sources":["../../src/tools/reading.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAInF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAyCjD,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,CA4S/E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GACnC,eAAe,CAyBjB"}
+{"version":3,"file":"reading.d.ts","sourceRoot":"","sources":["../../src/tools/reading.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAInF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA8CjD,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;AAsBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA2R/E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GACnC,eAAe,CAyBjB"}

package/dist/v2-prompt-detach.d.ts

@@ -0,0 +1,69 @@
+import { Effect } from "effect";
+import { interruptBashWaitsForChatMessage } from "./bash-wait-detach.js";
+import type { AftConfig } from "./config.js";
+/** An offset range into `prompt.text`; `end` is exclusive. */
+interface PromptMention {
+    start: number;
+    end: number;
+    text: string;
+}
+interface MentionCarrier {
+    mention?: PromptMention;
+}
+/** The fields of OpenCode 2's `SessionHooks["prompt"]` event this hook reads or edits. */
+export interface V2PromptHookEvent {
+    readonly sessionID: string;
+    prompt: {
+        text: string;
+        files?: MentionCarrier[];
+        agents?: MentionCarrier[];
+        skills?: MentionCarrier[];
+    };
+    metadata?: Record<string, unknown>;
+}
+type ChatMessagePool = Parameters<typeof interruptBashWaitsForChatMessage>[0];
+export interface V2PromptDetachRuntime {
+    /** The Location's bridge pool, where a session's waits live. */
+    readonly pool: ChatMessagePool;
+    /**
+     * The root this Location's tools run on (the Location's own directory); its
+     * bridge is asked to detach before any other.
+     */
+    readonly projectRoot: string;
+    /**
+     * Read on every prompt so a live config reload of
+     * `bash.detach_on_user_message` applies to the next message.
+     */
+    getConfig(): AftConfig;
+}
+/**
+ * Run the shared chat-message decision on one OpenCode 2 prompt and write the
+ * stripped text (and moved mention offsets) back onto it. Returns whether the
+ * session's waits were interrupted.
+ *
+ * A prompt AFT admitted itself (a completion wake) is passed to the shared
+ * decision as a synthetic part, exactly as OpenCode 1 marks such parts: it
+ * interrupts a wait whenever `bash.detach_on_user_message` is on, but its text
+ * is never read for `&detach` and never edited.
+ *
+ * All edits are computed before any is applied, so a throw leaves the prompt
+ * exactly as it arrived.
+ */
+export declare function interruptBashWaitsForV2Prompt(runtime: V2PromptDetachRuntime, event: V2PromptHookEvent): boolean;
+/**
+ * The callback registered as OpenCode 2's session `prompt` hook. The host
+ * waits for it before admitting the message and a failure would reject the
+ * message, so it never fails and never waits: errors are caught, logged once
+ * per distinct reason, and the prompt passes through unchanged; the bridge
+ * detach request it may start is not awaited.
+ */
+export declare function createV2PromptDetachHook(runtime: V2PromptDetachRuntime): (event: V2PromptHookEvent) => Effect.Effect<void>;
+/**
+ * Register the prompt hook on an OpenCode 2 host context. The registration is
+ * scoped by the host, so it ends with the Location. A host context without
+ * `session.hook` gets no hook, which leaves waits un-detachable by messages
+ * but otherwise working.
+ */
+export declare function registerV2PromptDetachHook(context: unknown, runtime: V2PromptDetachRuntime): Effect.Effect<boolean, never, unknown>;
+export {};
+//# sourceMappingURL=v2-prompt-detach.d.ts.map

package/dist/v2-prompt-detach.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"v2-prompt-detach.d.ts","sourceRoot":"","sources":["../src/v2-prompt-detach.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,gCAAgC,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAI7C,8DAA8D;AAC9D,UAAU,aAAa;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,cAAc;IACtB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,0FAA0F;AAC1F,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;QACzB,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;QAC1B,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;KAC3B,CAAC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,KAAK,eAAe,GAAG,UAAU,CAAC,OAAO,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9E,MAAM,WAAW,qBAAqB;IACpC,gEAAgE;IAChE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B;;;OAGG;IACH,SAAS,IAAI,SAAS,CAAC;CACxB;AAuDD;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAuBT;AAMD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,qBAAqB,GAC7B,CAAC,KAAK,EAAE,iBAAiB,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAenD;AAOD;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,qBAAqB,GAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAYxC"}

package/dist/wakes/runtime-consumer.d.ts

@@ -4,6 +4,8 @@ import { type V2SessionAdmission } from "./session-delivery.js";
 export interface V2WakeHostContext {
     readonly session: V2SessionAdmission;
 }
+/** Test-only: forget every route and held completion in the process-wide table. */
+export declare function __resetV2WakeRoutesForTests(): void;
 declare const sharedBridgeOptions: Pick<BridgeOptions, "onBashCompletion" | "onBashLongRunning">;
 export interface V2RuntimeConsumer extends V2ToolConsumers {
     readonly bridgeOptions: typeof sharedBridgeOptions;

package/dist/wakes/runtime-consumer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-consumer.d.ts","sourceRoot":"","sources":["../../src/wakes/runtime-consumer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,aAAa,EACd,MAAM,uBAAuB,CAAC;AAK/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,KAAK,kBAAkB,EAAqB,MAAM,uBAAuB,CAAC;AAEnF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;CACtC;AA0DD,QAAA,MAAM,mBAAmB,EAAE,IAAI,CAAC,aAAa,EAAE,kBAAkB,GAAG,mBAAmB,CAGtF,CAAC;AAEF,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,QAAQ,CAAC,aAAa,EAAE,OAAO,mBAAmB,CAAC;IACnD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,GAAG,iBAAiB,CAwBrF"}
+{"version":3,"file":"runtime-consumer.d.ts","sourceRoot":"","sources":["../../src/wakes/runtime-consumer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,aAAa,EACd,MAAM,uBAAuB,CAAC;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,KAAK,kBAAkB,EAAqB,MAAM,uBAAuB,CAAC;AAEnF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;CACtC;AAkJD,mFAAmF;AACnF,wBAAgB,2BAA2B,IAAI,IAAI,CAKlD;AAED,QAAA,MAAM,mBAAmB,EAAE,IAAI,CAAC,aAAa,EAAE,kBAAkB,GAAG,mBAAmB,CAGtF,CAAC;AAEF,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,QAAQ,CAAC,aAAa,EAAE,OAAO,mBAAmB,CAAC;IACnD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,GAAG,iBAAiB,CAiErF"}

package/dist/wakes/session-delivery.d.ts

@@ -1,4 +1,13 @@
 import { Effect } from "effect";
+/**
+ * The `metadata.source` value on every prompt AFT admits into a session itself
+ * (background-completion wakes). OpenCode 2 runs every prompt, AFT's own
+ * included, through the session `prompt` hook; the hook reads this marker to
+ * tell AFT's machine-written text from text an operator typed, never the text.
+ */
+export declare const AFT_PROMPT_SOURCE = "aft";
+/** True when a prompt's metadata marks it as one AFT admitted itself. */
+export declare function isAftOriginatedPrompt(metadata: unknown): boolean;
 export interface V2SessionPromptInput {
     readonly sessionID: string;
     readonly text: string;

package/dist/wakes/session-delivery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-delivery.d.ts","sourceRoot":"","sources":["../../src/wakes/session-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrE,SAAS,CAAC,KAAK,EAAE,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CAC5E;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACvD;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAIhB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAS;gBAEI,OAAO,EAAE,kBAAkB;IAExD,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IAuBlE,MAAM,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC;IAe7D,OAAO,IAAI,IAAI;CAKhB"}
+{"version":3,"file":"session-delivery.d.ts","sourceRoot":"","sources":["../../src/wakes/session-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,QAAQ,CAAC;AAEvC,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAMhE;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrE,SAAS,CAAC,KAAK,EAAE,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CAC5E;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACvD;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAIhB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAS;gBAEI,OAAO,EAAE,kBAAkB;IAExD,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IA0BlE,MAAM,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC;IAe7D,OAAO,IAAI,IAAI;CAKhB"}

package/dist/workflow-hints.d.ts

@@ -4,20 +4,25 @@ export interface WorkflowHintsOpts {
     bashBackgroundEnabled: boolean;
     /** Resolved bash compression flag. */
     bashCompressionEnabled: boolean;
+    /**
+     * Resolved `bash.rewrite` flag. Only rewritten `cat`/`head`/`tail` commands
+     * mint hashline tags through bash, so the hashline hint names them only when
+     * rewriting is on. Omitted means on.
+     */
+    bashRewriteEnabled?: boolean;
     /** Set of tool names that are not registered. */
     disabledTools: Set<string>;
     /** Whether the hashline `edit` arm is the one actually registered. */
     hashlineEffective?: boolean;
 }
 /**
- * Routing rule for hashline sessions.
- *
- * Navigation tools return source that looks edit-ready but never publishes a
- * snapshot, so an agent that inspects a symbol and then patches it is refused
- * for a tag it believes it already has. Naming the tag-minting tools is the
- * only way to distinguish "I have seen this code" from "I can address it".
+ * Routing rule for hashline sessions: which calls mint the tags a patch
+ * addresses (see `hashlineTagSourceSentence`). The bash rewrite path and each
+ * AFT navigation tool are named only when present.
  */
-export declare const HASHLINE_TAG_SOURCE_HINT = "**Hashline edit tags**: Only `read` (and accepted AFT `cat`/`head`/`tail` rewrites) mint hashline tags. `aft_zoom`, `aft_outline`, `grep`, `aft_search`, and conflict snippets do not. After navigation, call `read` on every file and range the patch addresses.";
+export declare function hashlineTagSourceHint(bashRewritesMintTags: boolean, isRegistered?: (toolName: string) => boolean): string;
+/** The hashline hint for a session whose bash rewrites `cat`/`head`/`tail`. */
+export declare const HASHLINE_TAG_SOURCE_HINT: string;
 /**
  * Build the workflow hints block. Returns `null` when no hints are
  * applicable for the configured surface (e.g. `tool_surface: "minimal"`
@@ -32,6 +37,14 @@ export declare function buildWorkflowHints(opts: WorkflowHintsOpts): string | nu
  * `bash.background` setting controls whether the hint appears.
  */
 export declare function buildHintsFromConfig(config: AftConfig, disabledTools: Set<string>, hashlineEffective?: boolean): string | null;
+/** Every tool name a workflow-hints section can mention. */
+export declare const WORKFLOW_HINT_TOOL_NAMES: readonly string[];
+/**
+ * Build the hints block for the tools that are actually registered. Every
+ * hint-relevant name missing from `registeredTools` is passed as absent, so
+ * sections for tools the agent cannot call are dropped.
+ */
+export declare function buildHintsForRegisteredTools(config: AftConfig, registeredTools: ReadonlySet<string>, hashlineEffective?: boolean): string | null;
 /**
  * Fold the hints block into a host `system[]` array in place.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,aAAa,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,2DAA2D;IAC3D,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sCAAsC;IACtC,sBAAsB,EAAE,OAAO,CAAC;IAChC,iDAAiD;IACjD,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAID;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,sQACgO,CAAC;AAEtQ;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAwIzE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,EAC1B,iBAAiB,UAAQ,GACxB,MAAM,GAAG,IAAI,CAOf;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ9E"}
+{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,aAAa,CAAC;AAGhE,MAAM,WAAW,iBAAiB;IAChC,2DAA2D;IAC3D,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sCAAsC;IACtC,sBAAsB,EAAE,OAAO,CAAC;IAChC;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iDAAiD;IACjD,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAID;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,OAAO,EAC7B,YAAY,GAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAoB,GACvD,MAAM,CAER;AAED,+EAA+E;AAC/E,eAAO,MAAM,wBAAwB,QAA8B,CAAC;AAEpE;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAkJzE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,EAC1B,iBAAiB,UAAQ,GACxB,MAAM,GAAG,IAAI,CASf;AAED,4DAA4D;AAC5D,eAAO,MAAM,wBAAwB,EAAE,SAAS,MAAM,EAYrD,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,EACpC,iBAAiB,UAAQ,GACxB,MAAM,GAAG,IAAI,CAGf;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ9E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.58.1",
+  "version": "0.58.2",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.58.1",
+    "@cortexkit/aft-bridge": "0.58.2",
     "@opencode/client": "2.0.11",
     "@opentui/core": "0.4.3",
     "@opentui/solid": "0.4.3",
@@ -50,12 +50,12 @@
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.58.1",
-    "@cortexkit/aft-darwin-x64": "0.58.1",
-    "@cortexkit/aft-linux-arm64": "0.58.1",
-    "@cortexkit/aft-linux-x64": "0.58.1",
-    "@cortexkit/aft-win32-arm64": "0.58.1",
-    "@cortexkit/aft-win32-x64": "0.58.1"
+    "@cortexkit/aft-darwin-arm64": "0.58.2",
+    "@cortexkit/aft-darwin-x64": "0.58.2",
+    "@cortexkit/aft-linux-arm64": "0.58.2",
+    "@cortexkit/aft-linux-x64": "0.58.2",
+    "@cortexkit/aft-win32-arm64": "0.58.2",
+    "@cortexkit/aft-win32-x64": "0.58.2"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",

package/src/entry/server-runtime.mjs

@@ -17,7 +17,8 @@ import { startOpenCodeLiveConfigReload } from "../config-live-reload.js";
 import { debug, log, warn } from "../logger.js";
 import { resolvePluginVersion } from "../plugin-version.js";
 import { registerAftConfigErrorRpc, registerAftRpc } from "../rpc/register.js";
-import { hoistedV2ToolConsumers } from "../tools/hoisted/v2.js";
+import { hoistedV2ToolConsumers, v2PromptChannelFor } from "../tools/hoisted/v2.js";
+import { registerV2PromptDetachHook } from "../v2-prompt-detach.js";
 import { createV2RuntimeConsumer } from "../wakes/runtime-consumer.js";
 import {
   buildAftToolDefinitions,
@@ -34,8 +35,11 @@ const defaults = {
   registerTools: registerAftTools,
   registerRpc: registerAftRpc,
   registerConfigErrorRpc: registerAftConfigErrorRpc,
-  toolConsumers: (context) => ({
-    ...hoistedV2ToolConsumers(context),
+  registerPromptHook: registerV2PromptDetachHook,
+  // The prompt server comes from the user-only `opencode` block of the
+  // Location's config; without it AFT finds the server it runs inside.
+  toolConsumers: (context, config) => ({
+    ...hoistedV2ToolConsumers(context, v2PromptChannelFor(config?.opencode)),
     ...createV2RuntimeConsumer(context),
   }),
   acquireBridge,
@@ -75,7 +79,7 @@ async function bootLocation(context, location, dependencies) {
     dependencies,
   );
   const canonicalDirectory = location.project?.canonical ?? directory;
-  const consumers = dependencies.toolConsumers(context);
+  const consumers = dependencies.toolConsumers(context, config);
   // Only a rejected configuration keeps AFT out of a project; there is no
   // config switch that turns it off.
   const isProjectEnabled = createProjectAcceptance(directory, dependencies);
@@ -127,7 +131,7 @@ async function bootLocation(context, location, dependencies) {
     },
     notify,
   });
-  return { consumers, pool, tools, liveConfigReload };
+  return { consumers, pool, tools, liveConfigReload, toolContext, directory };
 }
 
 /**
@@ -206,6 +210,18 @@ export function makeServerEffect(overrides = {}) {
       );
       const rpc = yield* dependencies.registerRpc(context, location, runtime.pool);
       yield* Effect.addFinalizer(() => Effect.promise(() => rpc.dispose()));
+      // OpenCode 2 has no chat.message hook; its session prompt hook is where a
+      // new message detaches a waiting bash, as chat.message does on OpenCode 1.
+      // The config is read through the tool context so live reloads apply.
+      // The bridge asked first is the one this Location's tools run on, the
+      // Location's own directory; for a Location in a linked git worktree that
+      // is the worktree, not the canonical main checkout the pool was acquired
+      // for (issue #387). Other bridges are still tried after it.
+      yield* dependencies.registerPromptHook(context, {
+        pool: runtime.pool,
+        projectRoot: runtime.directory,
+        getConfig: () => runtime.toolContext.config,
+      });
       yield* dependencies.registerTools(
         context,
         location,

package/src/shared/session-directory.ts

@@ -19,12 +19,62 @@
  * `packages/opencode/src/session/registry.ts`. Until then this
  * workaround makes AFT robust against the wrong cwd.
  */
+import { Effect } from "effect";
+
 import { sessionWarn } from "../logger.js";
 
 interface SessionInfo {
   directory?: string;
 }
 
+/**
+ * OpenCode 2 passes its plugin context where OpenCode 1 passes the SDK client
+ * (`entry/server-runtime.mjs` hands the context over as `client`). That context
+ * has a different session API, verified against the `v2` branch of the OpenCode repository:
+ *
+ * - `session.get` takes `{ sessionID }` and returns an Effect of `Session.Info`
+ *   (packages/client/src/effect/api/api.ts `SessionGetOperation`,
+ *   packages/plugin/src/effect/plugin.ts `Context`). Calling it the OpenCode 1
+ *   way builds an Effect that never runs, and awaiting an Effect yields the
+ *   Effect itself, so no directory was ever read.
+ * - `Session.Info` has no `directory`; the session's working directory is
+ *   `location.directory`, a required `Location.Ref`
+ *   (packages/schema/src/session.ts `Info`, packages/schema/src/location.ts
+ *   `Ref`). For a session created in a linked git worktree it is that worktree.
+ *
+ * It is told apart from an OpenCode 1 SDK client by having a string
+ * `location.directory` next to a `session.get` function; the OpenCode 2 entry
+ * refuses to boot without that `location`, and `subagent-detect.ts` uses the
+ * same test for its own session lookup.
+ */
+interface V2SessionInfo {
+  location?: { directory?: unknown };
+}
+
+interface V2PluginContextShape {
+  location: { directory: string };
+  session: {
+    get(input: { sessionID: string }): Effect.Effect<V2SessionInfo | undefined, unknown>;
+  };
+}
+
+function isV2PluginContext(client: unknown): client is V2PluginContextShape {
+  if (!client || typeof client !== "object") return false;
+  const candidate = client as { location?: { directory?: unknown }; session?: { get?: unknown } };
+  return (
+    typeof candidate.location?.directory === "string" &&
+    typeof candidate.session?.get === "function"
+  );
+}
+
+/**
+ * How long an OpenCode 2 session lookup may run. The lookup is awaited before
+ * the first tool call of a session is routed, so a host that never answers
+ * must not hold that call; after this long the call proceeds with the
+ * Location's directory instead.
+ */
+export const V2_SESSION_LOOKUP_TIMEOUT_MS = 3_000;
+
 interface OpenCodeClientShape {
   session?: {
     get?: (input: {
@@ -71,6 +121,8 @@ export async function getSessionDirectory(
     return cached.directory;
   }
 
+  if (isV2PluginContext(client)) return lookupV2SessionDirectory(client, sessionId);
+
   const c = client as OpenCodeClientShape;
   const sessionApi = c?.session;
   if (!sessionApi || typeof sessionApi.get !== "function") {
@@ -108,6 +160,46 @@ export async function getSessionDirectory(
   return dir;
 }
 
+/**
+ * OpenCode 2 lookup: run the context's `session.get` Effect under a timeout and
+ * read `location.directory`.
+ *
+ * Unlike the OpenCode 1 path, a failure or timeout is cached (as `null`), so it
+ * is logged once per session and never retried. The fallback is already right:
+ * with no cached directory, `projectRootFor` uses the tool call's Location
+ * directory for OpenCode 2 runtimes, and OpenCode 2 runs every session inside
+ * the Location created for that session's own directory. Retrying would only
+ * add up to the timeout to every later tool call while the host misbehaves.
+ */
+async function lookupV2SessionDirectory(
+  context: V2PluginContextShape,
+  sessionId: string,
+): Promise<string | null> {
+  let dir: string | null = null;
+  let failure: string | undefined;
+  try {
+    const session = await Effect.runPromise(
+      Effect.timeout(
+        context.session.get({ sessionID: sessionId }) as Effect.Effect<V2SessionInfo | undefined>,
+        V2_SESSION_LOOKUP_TIMEOUT_MS,
+      ),
+    );
+    const directory = session?.location?.directory;
+    if (typeof directory === "string" && directory.length > 0) dir = directory;
+    else failure = "the session record has no location.directory";
+  } catch (err) {
+    failure = err instanceof Error ? err.message || err.name : String(err);
+  }
+  if (failure !== undefined) {
+    sessionWarn(
+      sessionId,
+      `[aft-plugin] OpenCode 2 session lookup failed (${failure}); tool paths and bash use the Location directory ${context.location.directory} for this session`,
+    );
+  }
+  setCache(sessionId, dir);
+  return dir;
+}
+
 function setCache(sessionId: string, directory: string | null): void {
   if (cache.has(sessionId)) cache.delete(sessionId);
   cache.set(sessionId, { directory, recordedAt: Date.now() });

package/src/shared/subagent-detect.ts

@@ -21,10 +21,14 @@
  * identity is sticky (parentID never changes after session creation), so
  * the cache never needs invalidation.
  *
- * Errors are not cached. If the SDK is briefly unavailable on the first
- * call, we retry on the next bash invocation rather than permanently
- * misclassifying. This is cheap because the cache is hit on every
- * subsequent call within the same session.
+ * Every bridge call asks for the role (AFT words its replies by it), so the
+ * lookup must stay cheap and bounded:
+ * - concurrent first calls for one session share a single lookup;
+ * - a lookup that has not answered within LOOKUP_TIMEOUT_MS is abandoned and
+ *   that call proceeds as primary, so a slow host can't delay a read;
+ * - a failed or abandoned lookup is cached as "primary" for
+ *   FAILED_LOOKUP_RETRY_MS, then retried, so a struggling host is not asked on
+ *   every call but the real answer is still picked up later.
  *
  * Mirrors the pattern in `session-directory.ts`.
  */
@@ -48,20 +52,33 @@ interface OpenCodeClientShape {
 
 interface CacheEntry {
   isSubagent: boolean;
-  recordedAt: number;
+  /**
+   * When a provisional "primary" answer (recorded after a failed or timed-out
+   * lookup) stops counting and the host is asked again. Absent for a real
+   * answer, which never changes: a session's parent is fixed at creation.
+   */
+  retryAfter?: number;
 }
 
 const CACHE_MAX_ENTRIES = 200;
+/** Longest a caller waits for the host's session lookup. */
+export const LOOKUP_TIMEOUT_MS = 1_000;
+/** How long a failed or timed-out lookup is answered as "primary" before retrying. */
+export const FAILED_LOOKUP_RETRY_MS = 30_000;
 const cache = new Map<string, CacheEntry>();
+/** One lookup per session at a time; concurrent first calls await it. */
+const inflight = new Map<string, Promise<boolean>>();
+let now: () => number = () => Date.now();
 
 /**
  * Returns `true` when the given session has a non-empty `parentID`
  * (subagent). Returns `false` for primary sessions, when the SDK is
- * unavailable, or when any error occurs — the false default keeps
- * primary sessions working exactly as before.
+ * unavailable, or when the lookup fails or takes longer than
+ * LOOKUP_TIMEOUT_MS; the false default keeps primary sessions working
+ * exactly as before.
  *
- * First call per session: one SDK round-trip. All subsequent calls:
- * O(1) cache lookup.
+ * A known answer is an O(1) cache hit. Otherwise at most one host lookup
+ * per session is in flight, and it is bounded by LOOKUP_TIMEOUT_MS.
  */
 export async function resolveIsSubagent(
   client: unknown,
@@ -74,7 +91,7 @@ export async function resolveIsSubagent(
   }
 
   const cached = cache.get(sessionId);
-  if (cached) {
+  if (cached && (cached.retryAfter === undefined || now() < cached.retryAfter)) {
     // Refresh LRU position. Don't log the hit — it's pure noise; the
     // downstream call sites already log their effective gate decisions.
     cache.delete(sessionId);
@@ -82,6 +99,48 @@ export async function resolveIsSubagent(
     return cached.isSubagent;
   }
 
+  const pending = inflight.get(sessionId);
+  if (pending) return pending;
+  const lookup = boundedLookup(client, sessionId).finally(() => {
+    inflight.delete(sessionId);
+  });
+  inflight.set(sessionId, lookup);
+  return lookup;
+}
+
+/**
+ * Runs the host lookup, giving up after LOOKUP_TIMEOUT_MS. A real answer is
+ * cached for good; a failure or timeout is cached as "primary" until
+ * FAILED_LOOKUP_RETRY_MS has passed. The abandoned host call is left to
+ * settle on its own; its late answer is ignored.
+ */
+async function boundedLookup(client: unknown, sessionId: string): Promise<boolean> {
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  const timedOut = new Promise<"timeout">((resolve) => {
+    timer = setTimeout(() => resolve("timeout"), LOOKUP_TIMEOUT_MS);
+  });
+  let answer: boolean | "failed" | "timeout";
+  try {
+    answer = await Promise.race([lookupSession(client, sessionId), timedOut]);
+  } finally {
+    clearTimeout(timer);
+  }
+  if (typeof answer === "boolean") {
+    setCache(sessionId, answer);
+    return answer;
+  }
+  if (answer === "timeout") {
+    sessionWarn(
+      sessionId,
+      `[subagent-detect] session lookup did not answer within ${LOOKUP_TIMEOUT_MS}ms → primary for now`,
+    );
+  }
+  setCache(sessionId, false, now() + FAILED_LOOKUP_RETRY_MS);
+  return false;
+}
+
+/** The host's answer, or "failed" when the lookup threw. Never rejects. */
+async function lookupSession(client: unknown, sessionId: string): Promise<boolean | "failed"> {
   if (isV2PluginContext(client)) return resolveV2(client, sessionId);
 
   const c = client as OpenCodeClientShape;
@@ -93,7 +152,6 @@ export async function resolveIsSubagent(
       sessionId,
       `[subagent-detect] client.session.get unavailable (client=${typeof client}, session=${typeof sessionApi}, get=${typeof sessionApi?.get}) → caching as primary`,
     );
-    setCache(sessionId, false);
     return false;
   }
 
@@ -102,8 +160,6 @@ export async function resolveIsSubagent(
     `[subagent-detect] cache miss, calling client.session.get(id=${sessionId})`,
   );
 
-  let isSubagent = false;
-  let parentIdRaw: unknown;
   try {
     // Call as a method so the SDK's `this._client` reference resolves
     // correctly. Extracting `sessionApi.get` into a local would lose
@@ -119,25 +175,21 @@ export async function resolveIsSubagent(
     // `Session` depending on `ThrowOnError`. Handle both shapes.
     const session: SessionInfo | undefined =
       (result as { data?: SessionInfo } | undefined)?.data ?? (result as SessionInfo | undefined);
-    parentIdRaw = session?.parentID;
-    isSubagent =
+    const parentIdRaw = session?.parentID;
+    const isSubagent =
       session !== undefined && typeof session.parentID === "string" && session.parentID.length > 0;
     sessionLog(
       sessionId,
       `[subagent-detect] SDK returned session=${session !== undefined ? "present" : "undefined"}, parentID=${JSON.stringify(parentIdRaw)} → isSubagent=${isSubagent}`,
     );
+    return isSubagent;
   } catch (err) {
-    // Don't poison the cache on transient errors — but do log once.
-    // Return false so primary-session behavior is preserved.
     sessionWarn(
       sessionId,
       `[subagent-detect] SDK lookup failed: ${err instanceof Error ? err.message : String(err)}`,
     );
-    return false;
+    return "failed";
   }
-
-  setCache(sessionId, isSubagent);
-  return isSubagent;
 }
 
 /**
@@ -166,33 +218,35 @@ function isV2PluginContext(client: unknown): client is V2PluginContextShape {
   );
 }
 
-async function resolveV2(context: V2PluginContextShape, sessionId: string): Promise<boolean> {
+async function resolveV2(
+  context: V2PluginContextShape,
+  sessionId: string,
+): Promise<boolean | "failed"> {
   let session: SessionInfo | undefined;
   try {
     session = await Effect.runPromise(
       context.session.get({ sessionID: sessionId }) as Effect.Effect<SessionInfo | undefined>,
     );
   } catch (err) {
-    // Same policy as the V1 path: a failed lookup is not cached, and the call
-    // is treated as primary for now so the next tool call can retry.
+    // Same policy as the V1 path: a failed lookup counts as primary only
+    // until FAILED_LOOKUP_RETRY_MS has passed.
     sessionWarn(
       sessionId,
       `[subagent-detect] OpenCode 2 session lookup failed: ${err instanceof Error ? err.message : String(err)}`,
     );
-    return false;
+    return "failed";
   }
   const isSubagent = typeof session?.parentID === "string" && session.parentID.length > 0;
   sessionLog(
     sessionId,
     `[subagent-detect] OpenCode 2 session parentID=${JSON.stringify(session?.parentID)} → isSubagent=${isSubagent}`,
   );
-  setCache(sessionId, isSubagent);
   return isSubagent;
 }
 
-function setCache(sessionId: string, isSubagent: boolean): void {
+function setCache(sessionId: string, isSubagent: boolean, retryAfter?: number): void {
   if (cache.has(sessionId)) cache.delete(sessionId);
-  cache.set(sessionId, { isSubagent, recordedAt: Date.now() });
+  cache.set(sessionId, retryAfter === undefined ? { isSubagent } : { isSubagent, retryAfter });
   if (cache.size > CACHE_MAX_ENTRIES) {
     const oldest = cache.keys().next().value;
     if (oldest !== undefined) cache.delete(oldest);
@@ -202,4 +256,11 @@ function setCache(sessionId: string, isSubagent: boolean): void {
 /** Test-only cache reset. Not exported from the public surface. */
 export function _resetSubagentCacheForTest(): void {
   cache.clear();
+  inflight.clear();
+  now = () => Date.now();
+}
+
+/** Test-only clock override for the failed-lookup retry window. */
+export function _setSubagentClockForTest(clock: () => number): void {
+  now = clock;
 }