@cortexkit/aft-opencode 0.58.2 → 0.60.0

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

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/tools/search.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAyGjD;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA0BrD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAuJ9E"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/tools/search.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAyGjD;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA0BrD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAoL9E"}

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

@@ -1 +1 @@
-{"version":3,"file":"semantic.d.ts","sourceRoot":"","sources":["../../src/tools/semantic.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAoGjD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAyIhF"}
+{"version":3,"file":"semantic.d.ts","sourceRoot":"","sources":["../../src/tools/semantic.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAoGjD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAsKhF"}

package/dist/tui/aft-rpc.d.ts

@@ -10,8 +10,17 @@ export declare const IndexProgress: Schema.Struct<{
     readonly completed: Schema.optional<Schema.Number>;
     readonly total: Schema.optional<Schema.Number>;
 }>;
+/**
+ * A one-off notice for the user, shown by the OpenCode 2 TUI as a toast. It
+ * travels over RPC rather than into the session because anything written into
+ * a session (a synthetic record included) is sent to the model on later turns.
+ */
+export declare const HostToolOverlapNotice: Schema.Struct<{
+    readonly message: Schema.String;
+}>;
 export type AftRpcSession = typeof RpcSession.Type;
 export type AftIndexProgress = typeof IndexProgress.Type;
+export type AftHostToolOverlapNotice = typeof HostToolOverlapNotice.Type;
 export declare const AftRpc: {
     readonly id: "aft";
     readonly methods: {
@@ -43,6 +52,11 @@ export declare const AftRpc: {
                 readonly total: Schema.optional<Schema.Number>;
             }>;
         };
+        readonly hostToolOverlap: {
+            readonly schema: Schema.Struct<{
+                readonly message: Schema.String;
+            }>;
+        };
     };
 };
 //# sourceMappingURL=aft-rpc.d.ts.map

package/dist/tui/aft-rpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aft-rpc.d.ts","sourceRoot":"","sources":["../../src/tui/aft-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAahC,eAAO,MAAM,UAAU;;EAErB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;EAOxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;AACnD,MAAM,MAAM,gBAAgB,GAAG,OAAO,aAAa,CAAC,IAAI,CAAC;AAEzD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC"}
+{"version":3,"file":"aft-rpc.d.ts","sourceRoot":"","sources":["../../src/tui/aft-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAahC,eAAO,MAAM,UAAU;;EAErB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;EAOxB,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;EAEhC,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;AACnD,MAAM,MAAM,gBAAgB,GAAG,OAAO,aAAa,CAAC,IAAI,CAAC;AACzD,MAAM,MAAM,wBAAwB,GAAG,OAAO,qBAAqB,CAAC,IAAI,CAAC;AAEzE,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAcjB,CAAC"}

package/dist/tui/v2-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v2-status.d.ts","sourceRoot":"","sources":["../../src/tui/v2-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAwC,MAAM,kBAAkB,CAAC;AAsBhG;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,GAAG,MAAM,CAY/E;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAWF;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,GAAG,iBAAiB,CAsBvF"}
+{"version":3,"file":"v2-status.d.ts","sourceRoot":"","sources":["../../src/tui/v2-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAwC,MAAM,kBAAkB,CAAC;AAyBhG;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,GAAG,MAAM,CAY/E;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAWF;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,GAAG,iBAAiB,CAsBvF"}

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { AftTransportPool } from "@cortexkit/aft-bridge";
+import type { AftTransportPool, HostToolNames } from "@cortexkit/aft-bridge";
 import type { PluginInput } from "@opencode-ai/plugin";
 import type { AftConfig } from "./config.js";
 interface ShellEnvPluginHost {
@@ -25,6 +25,12 @@ export interface PluginContext {
     config: AftConfig;
     /** Whether hashline edit/read mode is active for this plugin registration. */
     hashlineEffective?: boolean;
+    /**
+     * What this host calls AFT's command and patch tools, sent on every request
+     * so AFT's reply text names them. Set by the OpenCode 2 runtime only; absent
+     * leaves AFT's own names.
+     */
+    hostToolNames?: HostToolNames;
     /** Absolute path to AFT's storage dir (e.g. ~/.local/share/opencode/storage/plugin/aft) */
     storageDir: string;
     /** Returns false when user and project config merge to `enabled: false` for this project. */

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,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,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,gBAAgB,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAC;IACnB,6FAA6F;IAC7F,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;CACrD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC7E,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,gBAAgB,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAC;IACnB,6FAA6F;IAC7F,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;CACrD"}

package/dist/v2-host-tool-names.d.ts

@@ -0,0 +1,43 @@
+/**
+ * The names AFT registers its command and patch tools under on OpenCode 2.
+ *
+ * OpenCode 2's timeline gives its rich rows (title, command and output for a
+ * command; file count and diff for a patch) only to tools it recognises by
+ * name, and those names are `shell` and `patch`. OpenCode 2 also files shell
+ * permission rules under `shell`. So on OpenCode 2 AFT's `bash` is registered
+ * as `shell` and its `apply_patch` as `patch`, replacing the host's built-ins
+ * under the same names. OpenCode 1 and Pi keep `bash` and `apply_patch`.
+ *
+ * Only the name the host and the model see changes. Inside the plugin the
+ * tool map, `disabled_tools`, the config keys and every call into AFT's engine
+ * keep the AFT names; this module translates at the host boundary in both
+ * directions. The engine gets the same map on every request (the
+ * `host_tool_names` field beside the session), so the text it renders names
+ * the tools the model can actually call.
+ */
+/** AFT tool name -> the name it is registered under on OpenCode 2. */
+export declare const V2_HOST_TOOL_NAMES: Readonly<Record<"bash" | "apply_patch", string>>;
+/** The name an AFT tool is registered under on OpenCode 2. */
+export declare function v2HostToolName(aftName: string): string;
+/**
+ * The AFT tool a host-side tool name refers to, for hook events the host keys
+ * by the registered name. A name AFT never renamed comes back unchanged.
+ */
+export declare function aftToolNameForV2Host(hostName: string): string;
+/**
+ * Rewrite the references to `bash` and `apply_patch` as tools in a description
+ * or hint written for OpenCode 1, so it names the tools an OpenCode 2 model
+ * can call.
+ *
+ * The shared descriptions are built once for both hosts, and on OpenCode 1
+ * they must stay byte-identical (a changed byte rebuilds every session's
+ * prompt cache), so they are rewritten here instead of being parameterised at
+ * every call site. Only a tool reference changes:
+ * - `bash(` and `` `bash` `` and a bare word `bash` become `shell`;
+ * - `` `apply_patch` `` and `apply_patch(` become `patch`.
+ * These stay: config keys (`bash.background`), companion tools (`bash_status`),
+ * task ids (`bash-6b45…`), and `bash` as a program or a syntax ("python/node/
+ * bash REPLs", "bash itself", "bash syntax").
+ */
+export declare function renameV2ToolReferences(text: string): string;
+//# sourceMappingURL=v2-host-tool-names.d.ts.map

package/dist/v2-host-tool-names.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"v2-host-tool-names.d.ts","sourceRoot":"","sources":["../src/v2-host-tool-names.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,sEAAsE;AACtE,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,aAAa,EAAE,MAAM,CAAC,CAG9E,CAAC;AAMH,8DAA8D;AAC9D,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI3D"}

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

@@ -35,6 +35,7 @@ export interface V2PromptDetachRuntime {
      * `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

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

@@ -1 +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"}
+{"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-session-lifecycle.d.ts

@@ -0,0 +1,22 @@
+import { Effect } from "effect";
+import type { PluginContext } from "./types.js";
+/** Hold a racing wake until the host classifies an interrupted tool's execution. */
+export declare function noteV2ToolAbort(client: unknown, sessionID: string): void;
+export declare function awaitV2ExecutionSettlement(client: unknown, sessionID: string): Promise<void>;
+export declare function v2SubagentStopped(client: unknown, sessionID: string): boolean;
+export declare function v2StopEpoch(client: unknown, sessionID: string): number;
+/** Only a command's spawning call records ownership; watching another session's task does not. */
+export declare function trackV2BackgroundTask(ctx: PluginContext, runtime: {
+    sessionID: string;
+    directory: string;
+}, taskId: string, startedEpoch: number): Promise<void>;
+export declare function allowV2WatchWake(client: unknown, sessionID: string, taskId: string): void;
+export declare function v2WatchWakeAllowed(client: unknown, sessionID: string, taskId: string): boolean;
+export declare function forgetV2Watch(client: unknown, sessionID: string, taskId: string): void;
+export declare function trackV2Watch(ctx: PluginContext, runtime: {
+    sessionID: string;
+    directory: string;
+}, taskId: string, watchId: unknown): Promise<void>;
+/** Own the lazy host subscription before any tool can register a watch. */
+export declare function registerV2SessionLifecycle(context: unknown, ctx?: PluginContext): Effect.Effect<void, never, import("effect/Scope").Scope>;
+//# sourceMappingURL=v2-session-lifecycle.d.ts.map

package/dist/v2-session-lifecycle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"v2-session-lifecycle.d.ts","sourceRoot":"","sources":["../src/v2-session-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAKxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAWhD,oFAAoF;AACpF,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAQxE;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAEf;AAqBD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAEtE;AAoBD,kGAAkG;AAClG,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EACjD,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAWf;AA0DD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAGzF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAG9F;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAQtF;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EACjD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED,2EAA2E;AAC3E,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,aAAa,4DAqF/E"}

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

@@ -0,0 +1,18 @@
+import { Effect } from "effect";
+import type { PluginContext } from "./types.js";
+/**
+ * Register the OpenCode 2 hooks that do what AFT's OpenCode 1 hooks do:
+ * normalise a call's raw arguments before the host validates them, append the
+ * merge-conflict hint to a command's result text, gate the editing tools by
+ * model and remember the session's current model.
+ *
+ * `registeredTools` holds AFT tool names; the host's events name tools by the
+ * name they are registered under, which differs for `bash` (`shell`) and
+ * `apply_patch` (`patch`). `bashDescription` is the description AFT's bash
+ * tool was built with, as written for OpenCode 1.
+ */
+export declare function registerV2ToolHooks(context: unknown, runtime: {
+    hashlineEffective?: boolean;
+    pool?: PluginContext["pool"];
+}, registeredTools: ReadonlySet<string>, bashDescription?: 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;AAKxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAsDhD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,EACtE,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,EACpC,eAAe,CAAC,EAAE,MAAM,4DAgGzB"}

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

@@ -1,4 +1,5 @@
 import type { BridgeOptions } from "@cortexkit/aft-bridge";
+import type { AftConfig } from "../config.js";
 import type { V2ToolConsumers } from "../tools/definitions/v2.js";
 import { type V2SessionAdmission } from "./session-delivery.js";
 export interface V2WakeHostContext {
@@ -15,7 +16,11 @@ export interface V2RuntimeConsumer extends V2ToolConsumers {
  * Creates the V2 execution consumers for one OpenCode Location. The bridge owns
  * one process-wide `onBashCompletion` callback, so it routes each notification
  * by session to the delivery object owned by that Location's Effect scope.
+ *
+ * `getConfig` returns the Location's current AFT config (a live reload
+ * replaces it); it decides whether an admitted completion detaches the
+ * session's waits.
  */
-export declare function createV2RuntimeConsumer(context: V2WakeHostContext): V2RuntimeConsumer;
+export declare function createV2RuntimeConsumer(context: V2WakeHostContext, getConfig?: () => AftConfig): V2RuntimeConsumer;
 export {};
 //# sourceMappingURL=runtime-consumer.d.ts.map

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;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"}
+{"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;AAS/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAQlE,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;AAiCD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,iBAAiB,EAC1B,SAAS,GAAE,MAAM,SAAsB,GACtC,iBAAiB,CAsFnB"}

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

@@ -1,9 +1,8 @@
 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.
+ * The `metadata.source` marker for AFT-written session input. Synthetic wakes
+ * retain it, and the prompt hook recognises it on machine-originated prompts
+ * so they are not treated as text an operator typed.
  */
 export declare const AFT_PROMPT_SOURCE = "aft";
 /** True when a prompt's metadata marks it as one AFT admitted itself. */
@@ -20,9 +19,15 @@ export interface V2SessionSyntheticInput {
     readonly text: string;
     readonly description?: string;
     readonly metadata?: Readonly<Record<string, unknown>>;
-    readonly resume: false;
+    readonly delivery?: "steer" | "queue";
+    readonly resume?: boolean;
 }
 export interface V2SessionAdmission {
+    get(input: {
+        readonly sessionID: string;
+    }): Effect.Effect<{
+        readonly revert?: unknown;
+    }, unknown>;
     prompt(input: V2SessionPromptInput): Effect.Effect<unknown, unknown>;
     synthetic(input: V2SessionSyntheticInput): Effect.Effect<unknown, unknown>;
 }
@@ -39,8 +44,8 @@ export interface StatusOnlyUpdate {
     readonly metadata?: Readonly<Record<string, unknown>>;
 }
 /**
- * Admit V2 session updates through the host's native inbox. Completion text is
- * model-directed, while status records are synthetic and never resume a turn.
+ * Admit V2 session updates as synthetic input so machine-written notices are
+ * not rendered as user turns. Completions wake execution; status does not.
  */
 export declare class V2SessionDelivery {
     private readonly session;

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;;;;;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"}
+{"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;;;;GAIG;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,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,CAAC;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,OAAO,CAAC,CAAC;IAClG,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;IAgDlE,MAAM,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC;IAe7D,OAAO,IAAI,IAAI;CAKhB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.58.2",
+  "version": "0.60.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.2",
+    "@cortexkit/aft-bridge": "0.60.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.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"
+    "@cortexkit/aft-darwin-arm64": "0.60.0",
+    "@cortexkit/aft-darwin-x64": "0.60.0",
+    "@cortexkit/aft-linux-arm64": "0.60.0",
+    "@cortexkit/aft-linux-x64": "0.60.0",
+    "@cortexkit/aft-win32-arm64": "0.60.0",
+    "@cortexkit/aft-win32-x64": "0.60.0"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",

package/src/entry/server-runtime.mjs

@@ -18,8 +18,16 @@ import { debug, log, warn } from "../logger.js";
 import { resolvePluginVersion } from "../plugin-version.js";
 import { registerAftConfigErrorRpc, registerAftRpc } from "../rpc/register.js";
 import { hoistedV2ToolConsumers, v2PromptChannelFor } from "../tools/hoisted/v2.js";
+import {
+  renameV2ToolReferences,
+  V2_HOST_TOOL_NAMES,
+} from "../v2-host-tool-names.js";
 import { registerV2PromptDetachHook } from "../v2-prompt-detach.js";
+import { registerV2ToolHooks } from "../v2-tool-hooks.js";
+import { registerV2SessionLifecycle } from "../v2-session-lifecycle.js";
+import { registerV2WorkflowHints } from "../v2-workflow-hints.js";
 import { createV2RuntimeConsumer } from "../wakes/runtime-consumer.js";
+import { buildHintsForRegisteredTools } from "../workflow-hints.js";
 import {
   buildAftToolDefinitions,
   openCodeHashlineEffective,
@@ -36,11 +44,15 @@ const defaults = {
   registerRpc: registerAftRpc,
   registerConfigErrorRpc: registerAftConfigErrorRpc,
   registerPromptHook: registerV2PromptDetachHook,
+  registerToolHooks: registerV2ToolHooks,
+  registerWorkflowHints: registerV2WorkflowHints,
   // 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) => ({
+  // `getConfig` returns the Location's current config, which a live reload
+  // replaces; the wake consumer reads it when a completion arrives.
+  toolConsumers: (context, config, getConfig = () => config) => ({
     ...hoistedV2ToolConsumers(context, v2PromptChannelFor(config?.opencode)),
-    ...createV2RuntimeConsumer(context),
+    ...createV2RuntimeConsumer(context, getConfig),
   }),
   acquireBridge,
   releaseBridge,
@@ -79,7 +91,8 @@ async function bootLocation(context, location, dependencies) {
     dependencies,
   );
   const canonicalDirectory = location.project?.canonical ?? directory;
-  const consumers = dependencies.toolConsumers(context, config);
+  let liveConfig = config;
+  const consumers = dependencies.toolConsumers(context, config, () => liveConfig);
   // Only a rejected configuration keeps AFT out of a project; there is no
   // config switch that turns it off.
   const isProjectEnabled = createProjectAcceptance(directory, dependencies);
@@ -107,6 +120,12 @@ async function bootLocation(context, location, dependencies) {
     client: context,
     config,
     hashlineEffective: openCodeHashlineEffective(config),
+    // The engine's reply text names AFT's command and patch tools ("Prefer
+    // `read` tool over bash."), and on OpenCode 2 they are `shell` and
+    // `patch`. Every tool request sends this map, beside its session; it is
+    // never configure state, because one AFT process can serve an OpenCode 1
+    // head, an OpenCode 2 session and a Pi session on the same project.
+    hostToolNames: V2_HOST_TOOL_NAMES,
     storageDir: environment.storageDir,
     isProjectEnabled,
   };
@@ -119,6 +138,9 @@ async function bootLocation(context, location, dependencies) {
   const { hashlineEditRegistered } = applyToolSurfaceOverrides(pool, config, registeredTools);
   reportHashlineDowngrade(config, registeredTools, notify);
   toolContext.hashlineEffective = hashlineEditRegistered;
+  // The hints are written for OpenCode 1's tool names; name OpenCode 2's.
+  const hints = buildHintsForRegisteredTools(config, registeredTools, hashlineEditRegistered);
+  const hintsBlock = hints === null ? null : renameV2ToolReferences(hints);
   // 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({
@@ -128,10 +150,11 @@ async function bootLocation(context, location, dependencies) {
     getConfig: () => toolContext.config,
     setConfig: (next) => {
       toolContext.config = next;
+      liveConfig = next;
     },
     notify,
   });
-  return { consumers, pool, tools, liveConfigReload, toolContext, directory };
+  return { consumers, pool, tools, liveConfigReload, toolContext, directory, hintsBlock };
 }
 
 /**
@@ -210,6 +233,7 @@ export function makeServerEffect(overrides = {}) {
       );
       const rpc = yield* dependencies.registerRpc(context, location, runtime.pool);
       yield* Effect.addFinalizer(() => Effect.promise(() => rpc.dispose()));
+      yield* registerV2SessionLifecycle(context, runtime.toolContext);
       // 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.
@@ -221,6 +245,7 @@ export function makeServerEffect(overrides = {}) {
         pool: runtime.pool,
         projectRoot: runtime.directory,
         getConfig: () => runtime.toolContext.config,
+        registerSession: runtime.consumers.registerSession,
       });
       yield* dependencies.registerTools(
         context,
@@ -228,6 +253,13 @@ export function makeServerEffect(overrides = {}) {
         runtime.tools,
         runtime.consumers,
       );
+      yield* dependencies.registerToolHooks(
+        context,
+        runtime.toolContext,
+        new Set(Object.keys(runtime.tools)),
+        runtime.tools.bash?.description,
+      );
+      yield* dependencies.registerWorkflowHints(context, runtime.hintsBlock);
     });
   };
 }

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