@cortexkit/aft-opencode 0.58.2 → 0.59.0

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

@@ -0,0 +1,66 @@
+/**
+ * On OpenCode 2, AFT's `apply_patch` and `bash` sit beside the host's own
+ * `patch` and `shell` tools unless the user's opencode config turns the host
+ * plugins off (`-opencode.tool.patch` / `-opencode.tool.shell` under
+ * `plugins`, which `aft setup` and `aft doctor --fix` write). Someone who
+ * installed AFT without setup, or turned the host tools back on, gets two
+ * editing tools and two shells with nothing saying why. This module tells the
+ * user once per host process and points at `doctor --fix`.
+ *
+ * What counts is what the host actually registered: `context.tool.list()`
+ * returns the host's tools after every plugin's transform, keyed by the name
+ * the model sees. The check waits for the first user prompt rather than
+ * running at plugin start, because at start other plugins (the host's own
+ * patch and shell plugins included) may not have registered yet, and because
+ * the notice is an RPC event the host does not replay: a TUI that has not
+ * subscribed yet would miss it, while a prompt typed into the TUI proves its
+ * subscription is live. A host without `tool.list()`
+ * (OpenCode 2.0.3 has none) or a list call that fails gets no notice: the
+ * reason is logged once at debug level and nothing is guessed.
+ *
+ * The notice must reach the user and never the model. Nothing is written into
+ * the session: OpenCode 2 sends a synthetic session record to the model as a
+ * user message on every later turn, where a notice would read as an
+ * instruction. A server plugin has no toast or dialog of its own, so the
+ * notice goes out as an AFT RPC event and AFT's OpenCode 2 TUI plugin shows
+ * it as a toast. The desktop and web apps run no TUI plugin and show nothing;
+ * `aft doctor` reports the same problem there.
+ */
+import { Effect } from "effect";
+/** An AFT tool and the OpenCode 2 built-in that does the same job. */
+export interface HostToolOverlap {
+    readonly aft: "apply_patch" | "bash";
+    readonly host: "patch" | "shell";
+}
+/**
+ * The pairs where AFT registered its tool (it is not in `disabled_tools`) and
+ * the host also has its built-in, in a fixed order. `hostToolNames` is the
+ * host's whole registry after every transform, AFT's own tools included, so a
+ * name AFT registered itself is never taken for the host's built-in.
+ */
+export declare function findHostToolOverlaps(hostToolNames: ReadonlySet<string>, registeredAftTools: ReadonlySet<string>): HostToolOverlap[];
+/** One notice for every overlapping pair, or null when there is none. */
+export declare function hostToolOverlapNotice(overlaps: readonly HostToolOverlap[]): string | null;
+/** Reset the once-per-process state. Tests only. */
+export declare function __resetHostToolOverlapNoticeForTests(): void;
+interface PromptEvent {
+    readonly sessionID: string;
+    readonly metadata?: Record<string, unknown>;
+}
+/** Hands the notice text to the user-only channel (the TUI toast event). */
+export type HostToolOverlapDelivery = (message: string) => Promise<void>;
+/**
+ * The session `prompt` hook for one Location. It never fails and never waits:
+ * the host holds the prompt until the hook returns, so the check runs in the
+ * background after it.
+ */
+export declare function createHostToolOverlapPromptHook(context: unknown, registeredAftTools: ReadonlySet<string>, deliver: HostToolOverlapDelivery, onChecked?: (done: Promise<void>) => void): (event: PromptEvent) => Effect.Effect<void>;
+/**
+ * Register the overlap check on an OpenCode 2 host's session `prompt` hook.
+ * `registeredAftTools` is AFT's final tool surface, so a tool listed in
+ * `disabled_tools` never counts as an overlap. `deliver` must reach the user
+ * only, never the session.
+ */
+export declare function registerV2HostToolOverlapNotice(context: unknown, registeredAftTools: ReadonlySet<string>, deliver: HostToolOverlapDelivery, onChecked?: (done: Promise<void>) => void): Effect.Effect<boolean, never, unknown>;
+export {};
+//# sourceMappingURL=v2-host-tool-overlap.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"v2-host-tool-overlap.d.ts","sourceRoot":"","sources":["../src/v2-host-tool-overlap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKhC,sEAAsE;AACtE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;CAClC;AASD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,EAClC,kBAAkB,EAAE,WAAW,CAAC,MAAM,CAAC,GACtC,eAAe,EAAE,CAOnB;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,GAAG,MAAM,GAAG,IAAI,CAazF;AAQD,oDAAoD;AACpD,wBAAgB,oCAAoC,IAAI,IAAI,CAG3D;AAwDD,UAAU,WAAW;IACnB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,4EAA4E;AAC5E,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAgCzE;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,WAAW,CAAC,MAAM,CAAC,EACvC,OAAO,EAAE,uBAAuB,EAChC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,GACxC,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAe7C;AAOD;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,WAAW,CAAC,MAAM,CAAC,EACvC,OAAO,EAAE,uBAAuB,EAChC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,GACxC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAkBxC"}

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-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.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;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.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;;;;;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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.58.2",
+  "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.2",
+    "@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.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.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

@@ -18,8 +18,12 @@ 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 { 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,
@@ -36,6 +40,9 @@ const defaults = {
   registerRpc: registerAftRpc,
   registerConfigErrorRpc: registerAftConfigErrorRpc,
   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) => ({
@@ -119,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({
@@ -131,7 +139,7 @@ async function bootLocation(context, location, dependencies) {
     },
     notify,
   });
-  return { consumers, pool, tools, liveConfigReload, toolContext, directory };
+  return { consumers, pool, tools, liveConfigReload, toolContext, directory, hintsBlock };
 }
 
 /**
@@ -221,6 +229,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 +237,17 @@ export function makeServerEffect(overrides = {}) {
         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" }));

package/src/shared/session-directory.ts

@@ -68,12 +68,14 @@ function isV2PluginContext(client: unknown): client is V2PluginContextShape {
 }
 
 /**
- * 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.
+ * How long a session lookup may run on either host version. Tool routing
+ * awaits this lookup, so an unresponsive host must not hold the call forever.
+ * After this budget the call proceeds with its own directory instead.
  */
-export const V2_SESSION_LOOKUP_TIMEOUT_MS = 3_000;
+export const LOOKUP_TIMEOUT_MS = 1_000;
+export const V2_SESSION_LOOKUP_TIMEOUT_MS = LOOKUP_TIMEOUT_MS;
+/** A failed lookup is provisional; retry later without querying on every call. */
+export const FAILED_LOOKUP_RETRY_MS = 30_000;
 
 interface OpenCodeClientShape {
   session?: {
@@ -86,14 +88,15 @@ interface OpenCodeClientShape {
 }
 
 interface CacheEntry {
-  /** Resolved directory, or `null` if lookup failed and we should not retry. */
+  /** Resolved directory, or `null` while a failed lookup is cooling down. */
   directory: string | null;
-  /** Wall-clock timestamp of the cache entry, used only for LRU eviction. */
+  /** When the answer was recorded; failed lookups become retryable after 30 seconds. */
   recordedAt: number;
 }
 
 const CACHE_MAX_ENTRIES = 200;
 const cache = new Map<string, CacheEntry>();
+const inflight = new Map<string, Promise<string | null>>();
 
 /**
  * Resolve the project directory the session was created with from the SDK's
@@ -114,19 +117,63 @@ export async function getSessionDirectory(
   if (!sessionId) return null;
 
   const cached = cache.get(sessionId);
-  if (cached) {
+  if (
+    cached &&
+    (cached.directory !== null || Date.now() - cached.recordedAt < FAILED_LOOKUP_RETRY_MS)
+  ) {
     // Refresh LRU position
     cache.delete(sessionId);
     cache.set(sessionId, cached);
     return cached.directory;
   }
 
+  const pending = inflight.get(sessionId);
+  if (pending) return pending;
+  const lookup = boundedLookup(client, sessionId, fallbackDirectory).finally(() => {
+    inflight.delete(sessionId);
+  });
+  inflight.set(sessionId, lookup);
+  return lookup;
+}
+
+/** Ignore late answers: a timed-out lookup must not overwrite a later retry. */
+async function boundedLookup(
+  client: unknown,
+  sessionId: string,
+  fallbackDirectory: string,
+): Promise<string | null> {
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  try {
+    const timeout = new Promise<null>((resolve) => {
+      timer = setTimeout(() => {
+        sessionWarn(
+          sessionId,
+          `[aft-plugin] session lookup did not answer within ${LOOKUP_TIMEOUT_MS}ms; using the call's directory for now`,
+        );
+        resolve(null);
+      }, LOOKUP_TIMEOUT_MS);
+    });
+    const directory = await Promise.race([
+      lookupSessionDirectory(client, sessionId, fallbackDirectory),
+      timeout,
+    ]);
+    setCache(sessionId, directory);
+    return directory;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+async function lookupSessionDirectory(
+  client: unknown,
+  sessionId: string,
+  fallbackDirectory: string,
+): Promise<string | null> {
   if (isV2PluginContext(client)) return lookupV2SessionDirectory(client, sessionId);
 
   const c = client as OpenCodeClientShape;
   const sessionApi = c?.session;
   if (!sessionApi || typeof sessionApi.get !== "function") {
-    setCache(sessionId, null);
     return null;
   }
 
@@ -148,7 +195,7 @@ export async function getSessionDirectory(
       dir = session.directory;
     }
   } catch (err) {
-    // Don't poison the cache on transient errors — but do log once.
+    // The bounded caller caches failures briefly so a struggling host is not polled per call.
     sessionWarn(
       sessionId,
       `[aft-plugin] session.get lookup failed: ${err instanceof Error ? err.message : String(err)}`,
@@ -156,7 +203,6 @@ export async function getSessionDirectory(
     return null;
   }
 
-  setCache(sessionId, dir);
   return dir;
 }
 
@@ -164,12 +210,10 @@ export async function getSessionDirectory(
  * 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.
+ * The outer bounded lookup applies the same retry policy as OpenCode 1.
+ * The Effect timeout also interrupts the abandoned V2 lookup; fallback remains
+ * the tool call's runtime.directory (the host's Location directory), never
+ * the main checkout.
  */
 async function lookupV2SessionDirectory(
   context: V2PluginContextShape,
@@ -196,7 +240,6 @@ async function lookupV2SessionDirectory(
       `[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;
 }
 
@@ -226,6 +269,10 @@ export function getSessionDirectoryCached(
   if (!sessionId) return undefined;
   const cached = cache.get(sessionId);
   if (!cached) return undefined;
+  if (cached.directory === null && Date.now() - cached.recordedAt >= FAILED_LOOKUP_RETRY_MS) {
+    cache.delete(sessionId);
+    return undefined;
+  }
   return cached.directory;
 }
 
@@ -240,7 +287,7 @@ export function warmSessionDirectory(
   fallbackDirectory: string,
 ): void {
   if (!sessionId) return;
-  if (cache.has(sessionId)) return;
+  if (getSessionDirectoryCached(sessionId) !== undefined) return;
   void getSessionDirectory(client, sessionId, fallbackDirectory);
 }
 
@@ -302,5 +349,6 @@ export async function verifySessionDirectory(
 /** Test-only: clear the cache between unit tests. */
 export function _resetSessionDirectoryCacheForTest(): void {
   cache.clear();
+  inflight.clear();
   verifyCache.clear();
 }

package/src/shared/status.ts

@@ -55,6 +55,7 @@ export interface StatusCompression {
  * absence as a clean zero.
  */
 export interface StatusBar {
+  disabled_categories?: string[];
   errors?: number;
   warnings?: number;
   dead_code?: number;
@@ -214,6 +215,9 @@ function readCompression(value: unknown): StatusCompression | undefined {
 function readStatusBar(value: unknown): StatusBar | undefined {
   if (typeof value !== "object" || value === null) return undefined;
   const bar = asRecord(value);
+  const disabled = Array.isArray(bar.disabled_categories)
+    ? bar.disabled_categories.filter((key): key is string => typeof key === "string")
+    : [];
   const errors = readOptionalNumber(bar.errors);
   const warnings = readOptionalNumber(bar.warnings);
   const deadCode = readOptionalNumber(bar.dead_code);
@@ -228,11 +232,13 @@ function readStatusBar(value: unknown): StatusBar | undefined {
     unusedExports === null &&
     duplicates === null &&
     todos === null &&
-    !noLanguageServer
+    !noLanguageServer &&
+    disabled.length === 0
   ) {
     return undefined;
   }
   return {
+    ...(disabled.length > 0 ? { disabled_categories: disabled } : {}),
     ...(errors !== null ? { errors } : {}),
     ...(warnings !== null ? { warnings } : {}),
     ...(deadCode !== null ? { dead_code: deadCode } : {}),
@@ -437,8 +443,10 @@ export function formatStatusDialogMessage(status: AftStatusSnapshot): string {
     lines.push(`- storage dir: ${status.storage_dir ?? status.disk.storage_dir}`);
   }
 
-  if (status.status_bar) {
-    const sb = status.status_bar;
+  const sb = status.status_bar ?? status.status_bar_values;
+  if (sb) {
+    for (const key of sb.disabled_categories ?? [])
+      lines.push(`- ${key.replaceAll("_", " ")}: ○ off`);
     const rows = [
       ["errors", sb.errors],
       ["warnings", sb.warnings],
@@ -594,8 +602,10 @@ export function formatStatusMarkdown(status: AftStatusSnapshot): string {
     lines.push(`- **Storage dir:** \`${status.storage_dir ?? status.disk.storage_dir}\``);
   }
 
-  if (status.status_bar) {
-    const sb = status.status_bar;
+  const sb = status.status_bar ?? status.status_bar_values;
+  if (sb) {
+    for (const key of sb.disabled_categories ?? [])
+      lines.push(`- **${key.replaceAll("_", " ")}:** ○ off`);
     const rows = [
       ["Errors", sb.errors],
       ["Warnings", sb.warnings],

package/src/shared/v2-context.ts

@@ -0,0 +1,7 @@
+/** V2 passes a Location-scoped Effect context where V1 passes an SDK client. */
+export function isV2PluginContext(client: unknown): boolean {
+  return (
+    typeof (client as { location?: { directory?: unknown } } | null)?.location?.directory ===
+    "string"
+  );
+}