@cortexkit/aft-opencode 0.58.1 → 0.59.0

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

@@ -0,0 +1,70 @@
+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;
+    registerSession?: (sessionID: string) => void;
+}
+/**
+ * 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":"AAUA,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;IACvB,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/C;AAqCD;;;;;;;;;;;;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,CAgBnD;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/v2-tool-hooks.d.ts

@@ -0,0 +1,6 @@
+import { Effect } from "effect";
+/** Port the V1 raw-argument, result-text and current-model seams to V2. */
+export declare function registerV2ToolHooks(context: unknown, runtime: {
+    hashlineEffective?: boolean;
+}, registeredTools: ReadonlySet<string>): Effect.Effect<void, never, import("effect/Scope").Scope>;
+//# sourceMappingURL=v2-tool-hooks.d.ts.map

package/dist/v2-tool-hooks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"v2-tool-hooks.d.ts","sourceRoot":"","sources":["../src/v2-tool-hooks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAqBxC,2EAA2E;AAC3E,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,EACxC,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,4DA6DrC"}

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

@@ -0,0 +1,4 @@
+import { Effect } from "effect";
+/** V2 consumes session system hooks, not V1's chat.system.transform. */
+export declare function registerV2WorkflowHints(context: unknown, hintsBlock: string | null): Effect.Effect<boolean, never, import("effect/Scope").Scope>;
+//# sourceMappingURL=v2-workflow-hints.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"v2-workflow-hints.d.ts","sourceRoot":"","sources":["../src/v2-workflow-hints.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,wEAAwE;AACxE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,+DAelF"}

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;AAyJD,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,EAAQ,MAAM,QAAQ,CAAC;AAEtC;;;;;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;IAqClE,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.59.0",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -33,13 +33,13 @@
     "schema": "bun scripts/build-schema.ts",
     "build:tool-schemas": "bun run scripts/build-tool-schemas.ts",
     "prepublishOnly": "bun run build",
-    "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'",
+    "test:unit": "bun test src/__tests__ ./test/ ./__tests__/ --path-ignore-patterns 'src/__tests__/e2e/**'",
     "build:tui": "bun scripts/build-tui.ts",
     "smoke:tui": "bun test ./scripts/smoke-tui-pack-install.ts"
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.58.1",
+    "@cortexkit/aft-bridge": "0.59.0",
     "@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.59.0",
+    "@cortexkit/aft-darwin-x64": "0.59.0",
+    "@cortexkit/aft-linux-arm64": "0.59.0",
+    "@cortexkit/aft-linux-x64": "0.59.0",
+    "@cortexkit/aft-win32-arm64": "0.59.0",
+    "@cortexkit/aft-win32-x64": "0.59.0"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",

package/src/entry/server-runtime.mjs

@@ -17,8 +17,13 @@ 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 { registerV2HostToolOverlapNotice } from "../v2-host-tool-overlap.js";
+import { registerV2PromptDetachHook } from "../v2-prompt-detach.js";
+import { registerV2ToolHooks } from "../v2-tool-hooks.js";
+import { registerV2WorkflowHints } from "../v2-workflow-hints.js";
 import { createV2RuntimeConsumer } from "../wakes/runtime-consumer.js";
+import { buildHintsForRegisteredTools } from "../workflow-hints.js";
 import {
   buildAftToolDefinitions,
   openCodeHashlineEffective,
@@ -34,8 +39,14 @@ const defaults = {
   registerTools: registerAftTools,
   registerRpc: registerAftRpc,
   registerConfigErrorRpc: registerAftConfigErrorRpc,
-  toolConsumers: (context) => ({
-    ...hoistedV2ToolConsumers(context),
+  registerPromptHook: registerV2PromptDetachHook,
+  registerToolHooks: registerV2ToolHooks,
+  registerWorkflowHints: registerV2WorkflowHints,
+  registerHostToolOverlapNotice: registerV2HostToolOverlapNotice,
+  // 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 +86,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);
@@ -115,6 +126,7 @@ async function bootLocation(context, location, dependencies) {
   const { hashlineEditRegistered } = applyToolSurfaceOverrides(pool, config, registeredTools);
   reportHashlineDowngrade(config, registeredTools, notify);
   toolContext.hashlineEffective = hashlineEditRegistered;
+  const hintsBlock = buildHintsForRegisteredTools(config, registeredTools, hashlineEditRegistered);
   // Keep this Location's live config keys current when a config file changes.
   // The finalizer that releases the bridge also stops the watch.
   const liveConfigReload = dependencies.startLiveConfigReload({
@@ -127,7 +139,7 @@ async function bootLocation(context, location, dependencies) {
     },
     notify,
   });
-  return { consumers, pool, tools, liveConfigReload };
+  return { consumers, pool, tools, liveConfigReload, toolContext, directory, hintsBlock };
 }
 
 /**
@@ -206,12 +218,36 @@ 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,
+        registerSession: runtime.consumers.registerSession,
+      });
       yield* dependencies.registerTools(
         context,
         location,
         runtime.tools,
         runtime.consumers,
       );
+      yield* dependencies.registerToolHooks(context, runtime.toolContext, new Set(Object.keys(runtime.tools)));
+      yield* dependencies.registerWorkflowHints(context, runtime.hintsBlock);
+      // Tell the user once when the host's own patch or shell tool still runs
+      // beside AFT's apply_patch or bash. Checked on the first prompt, once
+      // every plugin has registered its tools, and shown by AFT's TUI plugin
+      // as a toast; nothing is written into the session, which the model reads.
+      yield* dependencies.registerHostToolOverlapNotice(
+        context,
+        new Set(Object.keys(runtime.tools)),
+        (message) => rpc.emitHostToolOverlap({ message }),
+      );
     });
   };
 }

package/src/shared/ignored-message.ts

@@ -1,4 +1,7 @@
+import { Effect } from "effect";
+
 import { resolvePromptContext } from "./last-assistant-model.js";
+import { isV2PluginContext } from "./v2-context.js";
 
 /**
  * Append an `ignored: true` synthetic user message to a session.
@@ -24,6 +27,21 @@ export async function sendIgnoredMessage(
   sessionID: string,
   text: string,
 ): Promise<void> {
+  if (isV2PluginContext(client)) {
+    const context = client as {
+      session: {
+        synthetic(input: {
+          sessionID: string;
+          text: string;
+          resume: false;
+        }): Effect.Effect<unknown, unknown>;
+      };
+    };
+    // V2 owns the current agent/model itself. Synthetic inbox entries neither
+    // switch that context nor resume a turn, and must actually run as Effects.
+    await Effect.runPromise(context.session.synthetic({ sessionID, text, resume: false }));
+    return;
+  }
   const typedClient = client as {
     session?: {
       prompt?: (input: unknown) => unknown;

package/src/shared/read-vision.ts

@@ -1,4 +1,7 @@
+import { Effect } from "effect";
+
 import { resolvePromptContext } from "./last-assistant-model.js";
+import { isV2PluginContext } from "./v2-context.js";
 
 export const VISION_HOST_TIMEOUT_MS = 1500;
 type Model = { providerID: string; modelID: string };
@@ -69,12 +72,19 @@ export async function currentSessionVisionCapability(
   let capability = state.capabilities.get(key);
   if (!capability) {
     capability = (async () => {
-      const api = (client as { provider?: { list?: () => Promise<unknown> } }).provider;
+      const api = (client as { provider?: { list?: () => unknown } }).provider;
       if (!api?.list) return undefined;
-      const list = api.list.bind(api);
+      const list = async () => {
+        const result = api.list?.();
+        return isV2PluginContext(client)
+          ? Effect.runPromise(result as Effect.Effect<unknown, unknown>)
+          : await result;
+      };
       const listed = record(await bounded(list));
       const catalog = record(listed?.data) ?? listed;
-      const providers = catalog?.all ?? catalog?.providers;
+      const providers = Array.isArray(listed?.data)
+        ? listed.data
+        : (catalog?.all ?? catalog?.providers);
       if (!Array.isArray(providers)) return undefined;
       const provider = providers.map(record).find((entry) => entry?.id === currentModel.providerID);
       const models = provider?.models;
@@ -83,7 +93,7 @@ export async function currentSessionVisionCapability(
           ? models.find((entry) => record(entry)?.id === currentModel.modelID)
           : record(models)?.[currentModel.modelID],
       );
-      const inputs = record(entry?.modalities)?.input;
+      const inputs = record(entry?.capabilities)?.input ?? record(entry?.modalities)?.input;
       return Array.isArray(inputs)
         ? inputs.includes("image")
         : typeof entry?.attachment === "boolean"

package/src/shared/rpc-client.ts

@@ -133,19 +133,46 @@ export class AftRpcClient {
     const { signal } = options;
     throwIfAborted(signal);
 
+    // Fast path: reuse the endpoint that served the last warm response while
+    // it is still the newest live port file, skipping discovery's sequential
+    // health checks. Anything other than an accepted warm response falls back
+    // to the full scan below.
+    let placeholder: T | null = null;
+    let lastError: unknown = null;
+    let answeredPort: number | null = null;
+    const cached = this.cachedEndpoint();
+    if (cached) {
+      try {
+        const result = await this.callOne<T>(method, params, cached, signal);
+        if (this.looksLikePlaceholder(result)) {
+          placeholder = result;
+          answeredPort = cached.port;
+        } else if (!options.accept || options.accept(result)) {
+          return result;
+        } else {
+          answeredPort = cached.port;
+        }
+      } catch {
+        throwIfAborted(signal);
+      }
+      this.port = null;
+      this.token = null;
+    }
+
     // Try ALL discovered ports for this project (OpenCode TUI under --port 0
     // loads our plugin twice in the same process, so two RPC servers listen
-    // and we have to try both — only one's bridge is actually warm).
-    const infos = await this.resolvePortInfos(signal);
-    if (infos.length === 0) {
+    // and we have to try both — only one's bridge is actually warm). A port
+    // that already answered on the fast path is not asked again.
+    const infos = (await this.resolvePortInfos(signal)).filter(
+      (info) => info.port !== answeredPort,
+    );
+    if (infos.length === 0 && placeholder === null) {
       throw new Error("AFT RPC server not available");
     }
 
     // First pass: try every port. Prefer responses that look like "warm
     // bridge" output (i.e. not the synthetic `status: "not_initialized"`
     // placeholder served when this instance's bridge hasn't been spawned).
-    let placeholder: T | null = null;
-    let lastError: unknown = null;
     for (const info of infos) {
       throwIfAborted(signal);
       try {
@@ -250,6 +277,20 @@ export class AftRpcClient {
     return status === "not_initialized";
   }
 
+  /**
+   * The endpoint that served the last warm response, if it is still the newest
+   * live port file for this project. Discovery tries ports newest first and
+   * returns the first warm answer, so while this holds the full scan would
+   * reach the same server first. Reading the port files also drops entries
+   * whose owning process has died, so a dead server is never reused.
+   */
+  private cachedEndpoint(): PortInfo | null {
+    if (this.port === null) return null;
+    const [newest] = this.readAllPortFiles();
+    if (!newest || newest.port !== this.port || newest.token !== this.token) return null;
+    return newest;
+  }
+
   /** Check if any RPC server is reachable. */
   async isAvailable(): Promise<boolean> {
     try {

package/src/shared/rpc-server.ts

@@ -319,6 +319,10 @@ export class AftRpcServer {
       return json({ error: "Invalid JSON" }, 400);
     }
 
+    if (!params || typeof params !== "object" || Array.isArray(params)) {
+      return json({ error: "Expected a JSON object" }, 400);
+    }
+
     if (!tokensMatch(typeof params.token === "string" ? params.token : "", this.token)) {
       return json({ error: "Forbidden" }, 403);
     }
@@ -453,6 +457,12 @@ export class AftRpcServer {
         return;
       }
 
+      if (!params || typeof params !== "object" || Array.isArray(params)) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "Expected a JSON object" }));
+        return;
+      }
+
       if (!tokensMatch(typeof params.token === "string" ? params.token : "", this.token)) {
         res.writeHead(403, { "Content-Type": "application/json" });
         res.end(JSON.stringify({ error: "Forbidden" }));