@cortexkit/aft-opencode 0.42.0 → 0.43.0

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { BridgePool } from "@cortexkit/aft-bridge";
+import type { AftTransportPool } from "@cortexkit/aft-bridge";
 import type { PluginInput } from "@opencode-ai/plugin";
 import type { AftConfig } from "./config.js";
 interface ShellEnvPluginHost {
@@ -19,12 +19,14 @@ interface ShellEnvPluginHost {
  * Bundles the binary bridge, the OpenCode SDK client, and plugin config.
  */
 export interface PluginContext {
-    pool: BridgePool;
+    pool: AftTransportPool;
     client: PluginInput["client"];
     plugin?: ShellEnvPluginHost;
     config: AftConfig;
     /** 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. */
+    isProjectEnabled?: (projectRoot: string) => boolean;
 }
 export {};
 //# sourceMappingURL=types.d.ts.map

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,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,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,UAAU,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAC;CACpB"}
+{"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,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAC;IACnB,6FAA6F;IAC7F,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;CACrD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -31,22 +31,21 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.42.0",
+    "@cortexkit/aft-bridge": "0.43.0",
     "@opentui/core": "^0.4.2",
     "@opentui/solid": "^0.4.2",
-    "@xterm/headless": "^5.5.0",
     "comment-json": "^4.6.2",
     "solid-js": "1.9.12",
     "undici": "^7.25.0",
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.42.0",
-    "@cortexkit/aft-darwin-x64": "0.42.0",
-    "@cortexkit/aft-linux-arm64": "0.42.0",
-    "@cortexkit/aft-linux-x64": "0.42.0",
-    "@cortexkit/aft-win32-arm64": "0.42.0",
-    "@cortexkit/aft-win32-x64": "0.42.0"
+    "@cortexkit/aft-darwin-arm64": "0.43.0",
+    "@cortexkit/aft-darwin-x64": "0.43.0",
+    "@cortexkit/aft-linux-arm64": "0.43.0",
+    "@cortexkit/aft-linux-x64": "0.43.0",
+    "@cortexkit/aft-win32-arm64": "0.43.0",
+    "@cortexkit/aft-win32-x64": "0.43.0"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",

package/src/shared/rpc-client.ts

@@ -10,6 +10,8 @@ type PortInfoSource = "instance" | "legacy";
 type ParsedPortInfo = { port: number; token: string | null; pid?: number; started_at?: number };
 type PortInfo = ParsedPortInfo & { source: PortInfoSource; path?: string };
 
+export type AftRpcEndpoint = { port: number; token: string | null };
+
 export interface AftRpcCallOptions {
   signal?: AbortSignal;
   /**
@@ -157,6 +159,13 @@ export class AftRpcClient {
     }
   }
 
+  /** Resolve the freshest live endpoint for the persistent TUI WebSocket. */
+  async resolveEndpoint(signal?: AbortSignal): Promise<AftRpcEndpoint | null> {
+    const [info] = await this.resolvePortInfos(signal);
+    if (!info) return null;
+    return { port: info.port, token: info.token };
+  }
+
   /**
    * Discover all live RPC port files for this project. Tries the per-instance
    * directory first (v0.28.2+), then the single legacy `port` file (older

package/src/shared/rpc-notifications.ts

@@ -1,9 +1,9 @@
 /**
  * In-memory notification queue for server → TUI push.
  *
- * Also tracks whether a TUI client is actively connected (polling).
- * The server plugin cannot use `process.env.OPENCODE_CLIENT` to detect TUI
- * because the server runs in a separate process from the TUI client.
+ * The queue is the durable at-least-once buffer; live WebSocket sinks are only
+ * a low-latency delivery path. A notification is pruned only after the TUI acks
+ * it with the highest id it handled.
  */
 
 export interface RpcNotification {
@@ -13,33 +13,80 @@ export interface RpcNotification {
   sessionId?: string;
 }
 
+export interface NotificationSink {
+  /** The TUI session that the sink's socket authenticated for. */
+  sessionId?: string;
+  /** Deliver one queued notification over the live socket. */
+  send: (notification: RpcNotification) => void;
+}
+
+export interface StatusChangeSink {
+  /** The TUI session that the sink's socket authenticated for. */
+  sessionId?: string;
+  /** Deliver a lightweight status invalidation over the live socket. */
+  send: (event: RpcStatusChange) => void;
+}
+
+export interface RpcStatusChange {
+  sessionId?: string;
+}
+
 let queue: RpcNotification[] = [];
 let nextNotificationId = 1;
-// Timestamp of last drain — used to detect if a TUI is actively polling.
-// The TUI polls every 500ms; we consider it connected if it polled within
-// the last 3 seconds (6× the poll interval, tolerates transient delays).
-//
-// PER-SESSION: a single server process can serve MANY sessions (e.g. a TUI on
-// session A plus an OpenCode Desktop opened on session B for the same project,
-// whose newer RPC server this TUI's port discovery then selects). The TUI
-// poller drains with ITS active session id, so a session is "TUI-connected"
-// only if a TUI recently drained FOR THAT session. A process-global timestamp
-// would make session B's producers (`/aft-status`, configure warnings, etc.)
-// take the TUI-dialog path because session A's TUI is polling — queuing a
-// B-scoped dialog action that A's poller correctly refuses to show, so B's
-// notice is lost (it also suppressed B's non-TUI fallback). Tracking drains per
-// session routes each producer to the right delivery path.
-const lastDrainAtBySession = new Map<string, number>();
-let lastDrainAtAny = 0;
-const TUI_CONNECTED_WINDOW_MS = 3_000;
+const notificationSinks = new Set<NotificationSink>();
+const statusChangeSinks = new Set<StatusChangeSink>();
+
+/** Register a live TUI notification sink. Returns an unregister function. */
+export function registerNotificationSink(sink: NotificationSink): () => void {
+  notificationSinks.add(sink);
+  return () => {
+    notificationSinks.delete(sink);
+  };
+}
 
-/** Push a notification for the TUI to pick up via polling. */
+/** Register a live TUI status-invalidation sink. Returns an unregister function. */
+export function registerStatusChangeSink(sink: StatusChangeSink): () => void {
+  statusChangeSinks.add(sink);
+  return () => {
+    statusChangeSinks.delete(sink);
+  };
+}
+
+function notificationMatchesSink(
+  notification: RpcNotification,
+  sink: { sessionId?: string },
+): boolean {
+  return (
+    notification.sessionId === undefined ||
+    sink.sessionId === undefined ||
+    notification.sessionId === sink.sessionId
+  );
+}
+
+function statusChangeMatchesSink(event: RpcStatusChange, sink: { sessionId?: string }): boolean {
+  return (
+    event.sessionId === undefined ||
+    sink.sessionId === undefined ||
+    event.sessionId === sink.sessionId
+  );
+}
+
+/** Push a notification for the TUI. Fans out to live sinks and keeps the queue. */
 export function pushNotification(
   type: string,
   payload: Record<string, unknown>,
   sessionId?: string,
 ): void {
-  queue.push({ id: nextNotificationId++, type, payload, sessionId });
+  const notification: RpcNotification = { id: nextNotificationId++, type, payload, sessionId };
+  queue.push(notification);
+  for (const sink of notificationSinks) {
+    if (!notificationMatchesSink(notification, sink)) continue;
+    try {
+      sink.send(notification);
+    } catch {
+      // A dead socket must not block other sinks; the queue replays on reconnect.
+    }
+  }
   // Cap queue size to prevent unbounded growth if a TUI is not draining.
   // Session-fair eviction: a naive `slice(-50)` drops the globally-oldest
   // items, so a noisy session could evict ANOTHER session's single unseen
@@ -64,8 +111,20 @@ export function pushNotification(
   }
 }
 
+/** Push a lightweight status invalidation to matching live TUI sockets. */
+export function pushStatusChange(sessionId?: string): void {
+  const event: RpcStatusChange = sessionId ? { sessionId } : {};
+  for (const sink of statusChangeSinks) {
+    if (!statusChangeMatchesSink(event, sink)) continue;
+    try {
+      sink.send(event);
+    } catch {
+      // A dead socket must not block other status listeners.
+    }
+  }
+}
+
 /** Return pending notifications after acking the client's last received id.
- *  Updates lastDrainAt so isTuiConnected() reflects recent activity.
  *
  *  Session scoping: when `sessionId` is provided, only notifications tagged for
  *  that session (or session-less/global ones) are returned and pruned — a
@@ -81,11 +140,9 @@ export function pushNotification(
  *
  *  Delivery is at-least-once (non-destructive return + prune-on-ack): a returned
  *  notification stays queued until a later call acks it via a higher
- *  `lastReceivedId`, so a lost poll response re-delivers on the next poll. */
+ *  `lastReceivedId`, so a dropped WS socket re-delivers the backlog on reconnect
+ *  (the client sends its `lastReceivedId` in the hello). */
 export function drainNotifications(lastReceivedId = 0, sessionId?: string): RpcNotification[] {
-  const now = Date.now();
-  lastDrainAtAny = now;
-  if (sessionId !== undefined) lastDrainAtBySession.set(sessionId, now);
   const matchesClient = (notification: RpcNotification): boolean =>
     sessionId === undefined ||
     notification.sessionId === undefined ||
@@ -102,20 +159,19 @@ export function drainNotifications(lastReceivedId = 0, sessionId?: string): RpcN
   );
 }
 
-/** Whether a TUI client is actively polling for notifications.
- *  Returns true only if a TUI has drained within the last 3 seconds.
- *
- *  Pass `sessionId` (preferred) to ask whether a TUI is polling FOR THAT
- *  SESSION — this is what producers (`/aft-status`, configure warnings, etc.)
- *  must use to decide dialog-vs-message, so a TUI on a different session in the
- *  same process does not misroute their delivery. Omit it only for legacy/global
- *  callers that genuinely have no session context; they fall back to "any
- *  session recently drained" (the pre-per-session behavior). */
+/** Whether a TUI client is connected via a live notification socket. */
 export function isTuiConnected(sessionId?: string): boolean {
-  const now = Date.now();
-  if (sessionId !== undefined) {
-    const at = lastDrainAtBySession.get(sessionId) ?? 0;
-    return at > 0 && now - at < TUI_CONNECTED_WINDOW_MS;
+  if (notificationSinks.size === 0) return false;
+  if (sessionId === undefined) return true;
+  for (const sink of notificationSinks) {
+    if (sink.sessionId === undefined || sink.sessionId === sessionId) return true;
   }
-  return lastDrainAtAny > 0 && now - lastDrainAtAny < TUI_CONNECTED_WINDOW_MS;
+  return false;
+}
+
+export function __resetRpcNotificationsForTest(): void {
+  queue = [];
+  nextNotificationId = 1;
+  notificationSinks.clear();
+  statusChangeSinks.clear();
 }