@cortexkit/aft-opencode 0.59.0 → 0.60.0

package/src/shared/status.ts

@@ -64,11 +64,12 @@ export interface StatusBar {
   todos?: number;
   tier2_stale?: boolean;
   /**
-   * `"no_language_server"` when no language server is running, so errors and
-   * warnings will not arrive until one starts. Absent while the counts are
-   * present or a running server has not reported yet.
+   * `no_language_server` means no server is running. `producer_missing`
+   * masks both counts when an expected project producer has failed, even if
+   * another server supplied counts; diagnostics_gaps identifies the failures.
    */
-  diagnostics?: "no_language_server";
+  diagnostics?: "no_language_server" | "producer_missing";
+  diagnostics_gaps?: Array<{ language: string; producer: string; root: string }>;
 }
 
 export interface AftStatusSnapshot {
@@ -225,6 +226,22 @@ function readStatusBar(value: unknown): StatusBar | undefined {
   const duplicates = readOptionalNumber(bar.duplicates);
   const todos = readOptionalNumber(bar.todos);
   const noLanguageServer = bar.diagnostics === "no_language_server";
+  const producerMissing = bar.diagnostics === "producer_missing";
+  const diagnosticsGaps = Array.isArray(bar.diagnostics_gaps)
+    ? bar.diagnostics_gaps
+        .map(asRecord)
+        .filter(
+          (gap) =>
+            typeof gap.language === "string" &&
+            typeof gap.producer === "string" &&
+            typeof gap.root === "string",
+        )
+        .map((gap) => ({
+          language: gap.language as string,
+          producer: gap.producer as string,
+          root: gap.root as string,
+        }))
+    : [];
   if (
     errors === null &&
     warnings === null &&
@@ -233,6 +250,7 @@ function readStatusBar(value: unknown): StatusBar | undefined {
     duplicates === null &&
     todos === null &&
     !noLanguageServer &&
+    !producerMissing &&
     disabled.length === 0
   ) {
     return undefined;
@@ -247,6 +265,9 @@ function readStatusBar(value: unknown): StatusBar | undefined {
     ...(todos !== null ? { todos } : {}),
     ...(bar.tier2_stale === true ? { tier2_stale: true } : {}),
     ...(noLanguageServer ? { diagnostics: "no_language_server" as const } : {}),
+    ...(producerMissing
+      ? { diagnostics: "producer_missing" as const, diagnostics_gaps: diagnosticsGaps }
+      : {}),
   };
 }
 

package/src/tui/v2-status.ts

@@ -12,6 +12,7 @@ function count(value: number | undefined, off = false): string {
  */
 function diagnosticsPart(bar: StatusBar): string {
   if (bar.disabled_categories?.includes("diagnostics")) return "E○ W○";
+  if (bar.diagnostics === "producer_missing") return "E? W?";
   if (
     bar.errors === undefined &&
     bar.warnings === undefined &&

package/src/tui/v2.tsx

@@ -333,10 +333,13 @@ function AftStatusCommands(props: { context: V2TuiContext; rpc: AftRpcClient })
 const HOST_TOOL_OVERLAP_TOAST_MS = 15_000;
 
 /**
- * Show the server's one-off built-in tool overlap notice as a toast. A toast
- * reaches the person at the terminal and nothing else; the server sends this
- * at most once per host process, so every TUI subscribed at that moment shows
- * it once. A host without a toast surface shows nothing.
+ * Show a server's one-off built-in tool overlap notice as a toast. A toast
+ * reaches the person at the terminal and nothing else. The current server no
+ * longer sends this notice: on OpenCode 2 AFT registers its command and patch
+ * tools as `shell` and `patch`, replacing the host's built-ins instead of
+ * sitting beside them. The subscription stays so a TUI still shows the notice
+ * from an older AFT server running in the same host during an upgrade. A host
+ * without a toast surface shows nothing.
  */
 export function subscribeV2HostToolOverlapToast(
   context: Pick<V2TuiContext, "ui">,

package/src/tui-compiled/v2-status.ts

@@ -12,6 +12,7 @@ function count(value: number | undefined, off = false): string {
  */
 function diagnosticsPart(bar: StatusBar): string {
   if (bar.disabled_categories?.includes("diagnostics")) return "E○ W○";
+  if (bar.diagnostics === "producer_missing") return "E? W?";
   if (
     bar.errors === undefined &&
     bar.warnings === undefined &&

package/src/tui-compiled/v2.tsx

@@ -251,10 +251,13 @@ function AftStatusCommands(props) {
 const HOST_TOOL_OVERLAP_TOAST_MS = 15_000;
 
 /**
- * Show the server's one-off built-in tool overlap notice as a toast. A toast
- * reaches the person at the terminal and nothing else; the server sends this
- * at most once per host process, so every TUI subscribed at that moment shows
- * it once. A host without a toast surface shows nothing.
+ * Show a server's one-off built-in tool overlap notice as a toast. A toast
+ * reaches the person at the terminal and nothing else. The current server no
+ * longer sends this notice: on OpenCode 2 AFT registers its command and patch
+ * tools as `shell` and `patch`, replacing the host's built-ins instead of
+ * sitting beside them. The subscription stays so a TUI still shows the notice
+ * from an older AFT server running in the same host during an upgrade. A host
+ * without a toast surface shows nothing.
  */
 export function subscribeV2HostToolOverlapToast(context, rpc, options) {
   return rpc.events.on("hostToolOverlap", event => {

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

@@ -1,66 +0,0 @@
-/**
- * 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

@@ -1 +0,0 @@
-{"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"}