@cortexkit/aft-opencode 0.58.2 → 0.59.0

package/src/tui/aft-rpc.ts

@@ -24,8 +24,18 @@ export const IndexProgress = Schema.Struct({
   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 const HostToolOverlapNotice = Schema.Struct({
+  message: Schema.String,
+});
+
 export type AftRpcSession = typeof RpcSession.Type;
 export type AftIndexProgress = typeof IndexProgress.Type;
+export type AftHostToolOverlapNotice = typeof HostToolOverlapNotice.Type;
 
 export const AftRpc = Rpc.define({
   id: "aft",
@@ -39,5 +49,6 @@ export const AftRpc = Rpc.define({
     statusInvalidated: { schema: RpcSession },
     showStatusDialog: { schema: RpcSession },
     indexProgress: { schema: IndexProgress },
+    hostToolOverlap: { schema: HostToolOverlapNotice },
   },
 });

package/src/tui/index.tsx

@@ -230,6 +230,7 @@ const StatusDialog = (props: StatusDialogProps) => {
   // The earlier `formatCompressionDialogRows` returned padded strings that
   // looked offset against neighboring sections.
   const compressionAggregateRows = () => formatCompressionSidebarRows(status()?.compression);
+  const statusBar = () => status()?.status_bar ?? status()?.status_bar_values;
 
   return (
     <box
@@ -492,56 +493,59 @@ const StatusDialog = (props: StatusDialogProps) => {
 
       {/* Human health values are optional. Omit a category until the server
           proves it rather than displaying an unproven zero as clean. */}
-      {status()?.status_bar ? (
+      {statusBar() ? (
         <box flexDirection="column" width="100%" marginTop={1}>
           <text fg={t().text}>
-            <b>{status()!.status_bar!.tier2_stale ? "Code Health ~" : "Code Health"}</b>
+            <b>{statusBar()!.tier2_stale ? "Code Health ~" : "Code Health"}</b>
           </text>
-          {status()!.status_bar!.errors !== undefined ? (
+          {(statusBar()!.disabled_categories ?? []).map((key) => (
+            <R theme={t()} label={key.replaceAll("_", " ")} value="○ off" tone="muted" />
+          ))}
+          {statusBar()!.errors !== undefined ? (
             <R
               theme={t()}
               label="Errors"
-              value={formatCountShort(status()!.status_bar!.errors)}
-              tone={status()!.status_bar!.errors! > 0 ? "err" : "muted"}
+              value={formatCountShort(statusBar()!.errors)}
+              tone={statusBar()!.errors! > 0 ? "err" : "muted"}
             />
           ) : null}
-          {status()!.status_bar!.warnings !== undefined ? (
+          {statusBar()!.warnings !== undefined ? (
             <R
               theme={t()}
               label="Warnings"
-              value={formatCountShort(status()!.status_bar!.warnings)}
-              tone={status()!.status_bar!.warnings! > 0 ? "warn" : "muted"}
+              value={formatCountShort(statusBar()!.warnings)}
+              tone={statusBar()!.warnings! > 0 ? "warn" : "muted"}
             />
           ) : null}
-          {status()!.status_bar!.dead_code !== undefined ? (
+          {statusBar()!.dead_code !== undefined ? (
             <R
               theme={t()}
               label="Dead Code"
-              value={formatCountShort(status()!.status_bar!.dead_code)}
+              value={formatCountShort(statusBar()!.dead_code)}
               tone="muted"
             />
           ) : null}
-          {status()!.status_bar!.unused_exports !== undefined ? (
+          {statusBar()!.unused_exports !== undefined ? (
             <R
               theme={t()}
               label="Unused Exports"
-              value={formatCountShort(status()!.status_bar!.unused_exports)}
+              value={formatCountShort(statusBar()!.unused_exports)}
               tone="muted"
             />
           ) : null}
-          {status()!.status_bar!.duplicates !== undefined ? (
+          {statusBar()!.duplicates !== undefined ? (
             <R
               theme={t()}
               label="Duplicates"
-              value={formatCountShort(status()!.status_bar!.duplicates)}
+              value={formatCountShort(statusBar()!.duplicates)}
               tone="muted"
             />
           ) : null}
-          {status()!.status_bar!.todos !== undefined ? (
+          {statusBar()!.todos !== undefined ? (
             <R
               theme={t()}
               label="TODOs"
-              value={formatCountShort(status()!.status_bar!.todos)}
+              value={formatCountShort(statusBar()!.todos)}
               tone="muted"
             />
           ) : null}

package/src/tui/sidebar-view.tsx

@@ -421,7 +421,7 @@ export const AftSidebarPanel = (props: AftSidebarPanelProps) => {
   const trigramBytes = () => s()?.disk?.trigram_disk_bytes ?? 0;
   const semanticBytes = () => s()?.disk?.semantic_disk_bytes ?? 0;
   const compressionRows = () => formatCompressionSidebarRows(s()?.compression);
-  const statusBar = () => s()?.status_bar;
+  const statusBar = () => s()?.status_bar ?? s()?.status_bar_values;
 
   const degradedSummary = () => {
     const snap = s();
@@ -653,6 +653,14 @@ export const AftSidebarPanel = (props: AftSidebarPanelProps) => {
                 palette={props.palette}
                 title={statusBar()!.tier2_stale ? "Code Health ~" : "Code Health"}
               />
+              {(statusBar()!.disabled_categories ?? []).map((key) => (
+                <StatRow
+                  palette={props.palette}
+                  label={key.replaceAll("_", " ")}
+                  value="○ off"
+                  tone="muted"
+                />
+              ))}
               {statusBar()!.errors !== undefined && (
                 <StatRow
                   palette={props.palette}

package/src/tui/v2-status.ts

@@ -1,6 +1,7 @@
 import { type AftStatusSnapshot, degradedHeaderMarker, type StatusBar } from "../shared/status";
 
-function count(value: number | undefined): string {
+function count(value: number | undefined, off = false): string {
+  if (off) return "○";
   return value === undefined ? "?" : String(value);
 }
 
@@ -10,6 +11,7 @@ function count(value: number | undefined): string {
  * indefinitely.
  */
 function diagnosticsPart(bar: StatusBar): string {
+  if (bar.disabled_categories?.includes("diagnostics")) return "E○ W○";
   if (
     bar.errors === undefined &&
     bar.warnings === undefined &&
@@ -36,8 +38,8 @@ export function formatAftStatusSegment(status: AftStatusSnapshot | null): string
   const stale = bar.tier2_stale ? "~" : "";
   return (
     `AFT ${diagnosticsPart(bar)} | ` +
-    `${stale}D${count(bar.dead_code)} U${count(bar.unused_exports)} ` +
-    `C${count(bar.duplicates)} | T${count(bar.todos)}`
+    `${stale}D${count(bar.dead_code, bar.disabled_categories?.includes("dead_code"))} U${count(bar.unused_exports, bar.disabled_categories?.includes("unused_exports"))} ` +
+    `C${count(bar.duplicates, bar.disabled_categories?.includes("duplicates"))} | T${count(bar.todos, bar.disabled_categories?.includes("todos"))}`
   );
 }
 
@@ -53,8 +55,8 @@ function healthSummary(bar: StatusBar | undefined): string {
   const stale = bar.tier2_stale ? "~" : "";
   return (
     `${diagnosticsPart(bar)} ` +
-    `${stale}D${count(bar.dead_code)} U${count(bar.unused_exports)} ` +
-    `C${count(bar.duplicates)} T${count(bar.todos)}`
+    `${stale}D${count(bar.dead_code, bar.disabled_categories?.includes("dead_code"))} U${count(bar.unused_exports, bar.disabled_categories?.includes("unused_exports"))} ` +
+    `C${count(bar.duplicates, bar.disabled_categories?.includes("duplicates"))} T${count(bar.todos, bar.disabled_categories?.includes("todos"))}`
   );
 }
 

package/src/tui/v2.tsx

@@ -28,6 +28,11 @@ type AftRpcClient = {
       handler: (event: { data: { sessionID?: string } }) => void | Promise<void>,
       options?: { signal?: AbortSignal },
     ): () => void;
+    on(
+      name: "hostToolOverlap",
+      handler: (event: { data: { message: string } }) => void | Promise<void>,
+      options?: { signal?: AbortSignal },
+    ): () => void;
   };
 };
 
@@ -87,6 +92,14 @@ type V2TuiContext = {
   };
   ui: {
     dialog: { alert(input: { title: string; message: string }): Promise<void> };
+    toast?: {
+      show(input: {
+        title?: string;
+        message: string;
+        variant?: "info" | "success" | "warning" | "error";
+        duration?: number;
+      }): void;
+    };
     router: { current(): { type: string; sessionID?: string } };
     slot(claim: {
       append: "app" | "prompt.footer.status" | "sidebar.content";
@@ -316,6 +329,36 @@ function AftStatusCommands(props: { context: V2TuiContext; rpc: AftRpcClient })
   return null;
 }
 
+/** How long the built-in tool overlap toast stays up: long enough to read the command. */
+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.
+ */
+export function subscribeV2HostToolOverlapToast(
+  context: Pick<V2TuiContext, "ui">,
+  rpc: AftRpcClient,
+  options?: { signal?: AbortSignal },
+): () => void {
+  return rpc.events.on(
+    "hostToolOverlap",
+    (event) => {
+      const toast = context.ui.toast;
+      if (typeof toast?.show !== "function") return;
+      toast.show({
+        title: "AFT",
+        message: event.data.message,
+        variant: "warning",
+        duration: HOST_TOOL_OVERLAP_TOAST_MS,
+      });
+    },
+    options,
+  );
+}
+
 export async function setupV2Tui(context: V2TuiContext): Promise<() => void> {
   const rpc = context.client.rpc(AftRpc);
   const controller = new AbortController();
@@ -343,10 +386,14 @@ export async function setupV2Tui(context: V2TuiContext): Promise<() => void> {
     (event) => showStatusDialog(context, rpc, event.data.sessionID ?? activeSessionID(context)),
     { signal: controller.signal },
   );
+  const stopOverlapToasts = subscribeV2HostToolOverlapToast(context, rpc, {
+    signal: controller.signal,
+  });
 
   return () => {
     controller.abort();
     stopDialogEvents();
+    stopOverlapToasts();
     for (const cleanup of slotCleanups) cleanup();
   };
 }

package/src/tui-compiled/aft-rpc.ts

@@ -24,8 +24,18 @@ export const IndexProgress = Schema.Struct({
   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 const HostToolOverlapNotice = Schema.Struct({
+  message: Schema.String,
+});
+
 export type AftRpcSession = typeof RpcSession.Type;
 export type AftIndexProgress = typeof IndexProgress.Type;
+export type AftHostToolOverlapNotice = typeof HostToolOverlapNotice.Type;
 
 export const AftRpc = Rpc.define({
   id: "aft",
@@ -39,5 +49,6 @@ export const AftRpc = Rpc.define({
     statusInvalidated: { schema: RpcSession },
     showStatusDialog: { schema: RpcSession },
     indexProgress: { schema: IndexProgress },
+    hostToolOverlap: { schema: HostToolOverlapNotice },
   },
 });

package/src/tui-compiled/index.tsx

@@ -197,6 +197,7 @@ const StatusDialog = props => {
   // The earlier `formatCompressionDialogRows` returned padded strings that
   // looked offset against neighboring sections.
   const compressionAggregateRows = () => formatCompressionSidebarRows(status()?.compression);
+  const statusBar = () => status()?.status_bar ?? status()?.status_bar_values;
   return (() => {
     var _el$4 = _$createElement("box"),
       _el$5 = _$createElement("box"),
@@ -698,7 +699,7 @@ const StatusDialog = props => {
       })() : null;
     })(), _el$9);
     _$insert(_el$4, (() => {
-      var _c$9 = _$memo(() => !!status()?.status_bar);
+      var _c$9 = _$memo(() => !!statusBar());
       return () => _c$9() ? (() => {
         var _el$53 = _$createElement("box"),
           _el$54 = _$createElement("text"),
@@ -708,85 +709,95 @@ const StatusDialog = props => {
         _$setProp(_el$53, "width", "100%");
         _$setProp(_el$53, "marginTop", 1);
         _$insertNode(_el$54, _el$55);
-        _$insert(_el$55, () => status().status_bar.tier2_stale ? "Code Health ~" : "Code Health");
+        _$insert(_el$55, () => statusBar().tier2_stale ? "Code Health ~" : "Code Health");
+        _$insert(_el$53, () => (statusBar().disabled_categories ?? []).map(key => _$createComponent(R, {
+          get theme() {
+            return t();
+          },
+          get label() {
+            return key.replaceAll("_", " ");
+          },
+          value: "\u25CB off",
+          tone: "muted"
+        })), null);
         _$insert(_el$53, (() => {
-          var _c$14 = _$memo(() => status().status_bar.errors !== undefined);
+          var _c$14 = _$memo(() => statusBar().errors !== undefined);
           return () => _c$14() ? _$createComponent(R, {
             get theme() {
               return t();
             },
             label: "Errors",
             get value() {
-              return formatCountShort(status().status_bar.errors);
+              return formatCountShort(statusBar().errors);
             },
             get tone() {
-              return status().status_bar.errors > 0 ? "err" : "muted";
+              return statusBar().errors > 0 ? "err" : "muted";
             }
           }) : null;
         })(), null);
         _$insert(_el$53, (() => {
-          var _c$15 = _$memo(() => status().status_bar.warnings !== undefined);
+          var _c$15 = _$memo(() => statusBar().warnings !== undefined);
           return () => _c$15() ? _$createComponent(R, {
             get theme() {
               return t();
             },
             label: "Warnings",
             get value() {
-              return formatCountShort(status().status_bar.warnings);
+              return formatCountShort(statusBar().warnings);
             },
             get tone() {
-              return status().status_bar.warnings > 0 ? "warn" : "muted";
+              return statusBar().warnings > 0 ? "warn" : "muted";
             }
           }) : null;
         })(), null);
         _$insert(_el$53, (() => {
-          var _c$16 = _$memo(() => status().status_bar.dead_code !== undefined);
+          var _c$16 = _$memo(() => statusBar().dead_code !== undefined);
           return () => _c$16() ? _$createComponent(R, {
             get theme() {
               return t();
             },
             label: "Dead Code",
             get value() {
-              return formatCountShort(status().status_bar.dead_code);
+              return formatCountShort(statusBar().dead_code);
             },
             tone: "muted"
           }) : null;
         })(), null);
         _$insert(_el$53, (() => {
-          var _c$17 = _$memo(() => status().status_bar.unused_exports !== undefined);
+          var _c$17 = _$memo(() => statusBar().unused_exports !== undefined);
           return () => _c$17() ? _$createComponent(R, {
             get theme() {
               return t();
             },
             label: "Unused Exports",
             get value() {
-              return formatCountShort(status().status_bar.unused_exports);
+              return formatCountShort(statusBar().unused_exports);
             },
             tone: "muted"
           }) : null;
         })(), null);
         _$insert(_el$53, (() => {
-          var _c$18 = _$memo(() => status().status_bar.duplicates !== undefined);
+          var _c$18 = _$memo(() => statusBar().duplicates !== undefined);
           return () => _c$18() ? _$createComponent(R, {
             get theme() {
               return t();
             },
             label: "Duplicates",
             get value() {
-              return formatCountShort(status().status_bar.duplicates);
+              return formatCountShort(statusBar().duplicates);
             },
             tone: "muted"
           }) : null;
         })(), null);
         _$insert(_el$53, (() => {
-          var _c$19 = _$memo(() => status().status_bar.todos !== undefined);
+          var _c$19 = _$memo(() => statusBar().todos !== undefined);
           return () => _c$19() ? _$createComponent(R, {
             get theme() {
               return t();
             },
             label: "TODOs",
             get value() {
-              return formatCountShort(status().status_bar.todos);
+              return formatCountShort(statusBar().todos);
             },
             tone: "muted"
           }) : null;

package/src/tui-compiled/sidebar-view.tsx

@@ -407,7 +407,7 @@ export const AftSidebarPanel = props => {
   const trigramBytes = () => s()?.disk?.trigram_disk_bytes ?? 0;
   const semanticBytes = () => s()?.disk?.semantic_disk_bytes ?? 0;
   const compressionRows = () => formatCompressionSidebarRows(s()?.compression);
-  const statusBar = () => s()?.status_bar;
+  const statusBar = () => s()?.status_bar ?? s()?.status_bar_values;
   const degradedSummary = () => {
     const snap = s();
     if (!snap?.degraded) return null;
@@ -744,7 +744,16 @@ export const AftSidebarPanel = props => {
         get title() {
           return statusBar().tier2_stale ? "Code Health ~" : "Code Health";
         }
-      }), _$memo(() => _$memo(() => statusBar().errors !== undefined)() && _$createComponent(StatRow, {
+      }), _$memo(() => (statusBar().disabled_categories ?? []).map(key => _$createComponent(StatRow, {
+        get palette() {
+          return props.palette;
+        },
+        get label() {
+          return key.replaceAll("_", " ");
+        },
+        value: "\u25CB off",
+        tone: "muted"
+      }))), _$memo(() => _$memo(() => statusBar().errors !== undefined)() && _$createComponent(StatRow, {
         get palette() {
           return props.palette;
         },

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

@@ -1,6 +1,7 @@
 import { type AftStatusSnapshot, degradedHeaderMarker, type StatusBar } from "../shared/status";
 
-function count(value: number | undefined): string {
+function count(value: number | undefined, off = false): string {
+  if (off) return "○";
   return value === undefined ? "?" : String(value);
 }
 
@@ -10,6 +11,7 @@ function count(value: number | undefined): string {
  * indefinitely.
  */
 function diagnosticsPart(bar: StatusBar): string {
+  if (bar.disabled_categories?.includes("diagnostics")) return "E○ W○";
   if (
     bar.errors === undefined &&
     bar.warnings === undefined &&
@@ -36,8 +38,8 @@ export function formatAftStatusSegment(status: AftStatusSnapshot | null): string
   const stale = bar.tier2_stale ? "~" : "";
   return (
     `AFT ${diagnosticsPart(bar)} | ` +
-    `${stale}D${count(bar.dead_code)} U${count(bar.unused_exports)} ` +
-    `C${count(bar.duplicates)} | T${count(bar.todos)}`
+    `${stale}D${count(bar.dead_code, bar.disabled_categories?.includes("dead_code"))} U${count(bar.unused_exports, bar.disabled_categories?.includes("unused_exports"))} ` +
+    `C${count(bar.duplicates, bar.disabled_categories?.includes("duplicates"))} | T${count(bar.todos, bar.disabled_categories?.includes("todos"))}`
   );
 }
 
@@ -53,8 +55,8 @@ function healthSummary(bar: StatusBar | undefined): string {
   const stale = bar.tier2_stale ? "~" : "";
   return (
     `${diagnosticsPart(bar)} ` +
-    `${stale}D${count(bar.dead_code)} U${count(bar.unused_exports)} ` +
-    `C${count(bar.duplicates)} T${count(bar.todos)}`
+    `${stale}D${count(bar.dead_code, bar.disabled_categories?.includes("dead_code"))} U${count(bar.unused_exports, bar.disabled_categories?.includes("unused_exports"))} ` +
+    `C${count(bar.duplicates, bar.disabled_categories?.includes("duplicates"))} T${count(bar.todos, bar.disabled_categories?.includes("todos"))}`
   );
 }
 

package/src/tui-compiled/v2.tsx

@@ -246,6 +246,28 @@ function AftStatusCommands(props) {
   }));
   return null;
 }
+
+/** How long the built-in tool overlap toast stays up: long enough to read the command. */
+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.
+ */
+export function subscribeV2HostToolOverlapToast(context, rpc, options) {
+  return rpc.events.on("hostToolOverlap", event => {
+    const toast = context.ui.toast;
+    if (typeof toast?.show !== "function") return;
+    toast.show({
+      title: "AFT",
+      message: event.data.message,
+      variant: "warning",
+      duration: HOST_TOOL_OVERLAP_TOAST_MS
+    });
+  }, options);
+}
 export async function setupV2Tui(context) {
   const rpc = context.client.rpc(AftRpc);
   const controller = new AbortController();
@@ -282,9 +304,13 @@ export async function setupV2Tui(context) {
   const stopDialogEvents = rpc.events.on("showStatusDialog", event => showStatusDialog(context, rpc, event.data.sessionID ?? activeSessionID(context)), {
     signal: controller.signal
   });
+  const stopOverlapToasts = subscribeV2HostToolOverlapToast(context, rpc, {
+    signal: controller.signal
+  });
   return () => {
     controller.abort();
     stopDialogEvents();
+    stopOverlapToasts();
     for (const cleanup of slotCleanups) cleanup();
   };
 }