@cortexkit/aft-opencode 0.30.0 → 0.30.2

package/dist/tui.js

@@ -1,78 +1,10 @@
 // src/tui/index.tsx
 import { createMemo as createMemo2, createSignal as createSignal2, onCleanup as onCleanup2 } from "solid-js";
 // package.json
-var package_default = {
-  name: "@cortexkit/aft-opencode",
-  version: "0.30.0",
-  type: "module",
-  description: "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
-  main: "dist/index.js",
-  types: "dist/index.d.ts",
-  license: "MIT",
-  repository: {
-    type: "git",
-    url: "https://github.com/cortexkit/aft"
-  },
-  files: [
-    "dist",
-    "src/tui",
-    "src/shared",
-    "src/logger.ts",
-    "README.md"
-  ],
-  scripts: {
-    build: "bun build src/index.ts --outdir dist --target node --format esm --external @opencode-ai/plugin --external @opencode-ai/sdk && bun build src/tui/index.tsx --outfile dist/tui.js --target node --format esm --external @opencode-ai/plugin --external @opencode-ai/plugin/tui --external @opencode-ai/sdk --external @opentui/solid --external solid-js && tsc --emitDeclarationOnly",
-    typecheck: "tsc --noEmit",
-    pretest: "cd ../.. && cargo build",
-    test: "bun test",
-    "test:e2e": "bun test src/__tests__/e2e/",
-    lint: "biome check src",
-    schema: "bun scripts/build-schema.ts",
-    prepublishOnly: "bun run build"
-  },
-  dependencies: {
-    "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.30.0",
-    "@opencode-ai/plugin": "^1.15.5",
-    "@opencode-ai/sdk": "^1.15.5",
-    "@xterm/headless": "^5.5.0",
-    "comment-json": "^4.6.2",
-    undici: "^7.25.0",
-    zod: "^4.1.8"
-  },
-  optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.30.0",
-    "@cortexkit/aft-darwin-x64": "0.30.0",
-    "@cortexkit/aft-linux-arm64": "0.30.0",
-    "@cortexkit/aft-linux-x64": "0.30.0",
-    "@cortexkit/aft-win32-arm64": "0.30.0",
-    "@cortexkit/aft-win32-x64": "0.30.0"
-  },
-  devDependencies: {
-    "@types/node": "^22.0.0",
-    typescript: "^5.8.0"
-  },
-  exports: {
-    ".": {
-      types: "./dist/index.d.ts",
-      import: "./dist/index.js"
-    },
-    "./tui": {
-      types: "./src/tui/index.tsx",
-      import: "./src/tui/index.tsx"
-    }
-  },
-  "oc-plugin": [
-    "server",
-    "tui"
-  ],
-  peerDependencies: {
-    "@opencode-ai/plugin": ">=1.15.5"
-  }
-};
+var version = "0.30.2";
 
 // src/shared/rpc-client.ts
-import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";
 import { join as join3 } from "node:path";
 
 // src/logger.ts
@@ -154,26 +86,55 @@ function rpcPortFileDir(storageDir, directory) {
 var MAX_RETRIES = 10;
 var RETRY_DELAY_MS = 500;
 var REQUEST_TIMEOUT_MS = 5000;
+function abortError(signal) {
+  const reason = signal.reason;
+  if (reason instanceof Error)
+    return reason;
+  return new Error("AFT RPC request aborted");
+}
+function throwIfAborted(signal) {
+  if (signal?.aborted)
+    throw abortError(signal);
+}
+function delay(ms, signal) {
+  throwIfAborted(signal);
+  return new Promise((resolve, reject) => {
+    let timer;
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(signal ? abortError(signal) : new Error("AFT RPC request aborted"));
+    };
+    timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
 
 class AftRpcClient {
   port = null;
   token = null;
   portsDir;
   legacyPortFile;
+  stalePortFailures = new Map;
   constructor(storageDir, directory) {
     this.portsDir = rpcPortFileDir(storageDir, directory);
     this.legacyPortFile = rpcPortFilePath(storageDir, directory);
   }
-  async call(method, params = {}) {
-    const infos = await this.resolvePortInfos();
+  async call(method, params = {}, options = {}) {
+    const { signal } = options;
+    throwIfAborted(signal);
+    const infos = await this.resolvePortInfos(signal);
     if (infos.length === 0) {
       throw new Error("AFT RPC server not available");
     }
     let placeholder = null;
     let lastError = null;
     for (const info of infos) {
+      throwIfAborted(signal);
       try {
-        const result = await this.callOne(method, params, info);
+        const result = await this.callOne(method, params, info, signal);
         if (this.looksLikePlaceholder(result)) {
           placeholder = result;
           continue;
@@ -182,6 +143,7 @@ class AftRpcClient {
         this.token = info.token;
         return result;
       } catch (err) {
+        throwIfAborted(signal);
         lastError = err;
       }
     }
@@ -189,12 +151,12 @@ class AftRpcClient {
       return placeholder;
     throw lastError instanceof Error ? lastError : new Error(String(lastError));
   }
-  async callOne(method, params, info) {
+  async callOne(method, params, info, signal) {
     const response = await this.fetchWithTimeout(`http://127.0.0.1:${info.port}/rpc/${method}`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ ...params, token: info.token })
-    });
+    }, signal);
     if (!response.ok) {
       const text = await response.text();
       throw new Error(`RPC ${method} failed (${response.status}): ${text}`);
@@ -215,49 +177,60 @@ class AftRpcClient {
       return false;
     }
   }
-  async resolvePortInfos() {
+  async resolvePortInfos(signal) {
     for (let attempt = 0;attempt < MAX_RETRIES; attempt++) {
+      throwIfAborted(signal);
       const infos = this.readAllPortFiles();
       if (infos.length > 0) {
         const alive = [];
         for (const info of infos) {
-          if (await this.healthCheck(info.port)) {
+          throwIfAborted(signal);
+          if (await this.healthCheck(info.port, signal)) {
+            this.clearPortFailure(info);
             alive.push(info);
+          } else {
+            this.recordPortFailure(info);
           }
         }
         if (alive.length > 0)
           return alive;
       }
       if (attempt < MAX_RETRIES - 1) {
-        await new Promise((r) => setTimeout(r, RETRY_DELAY_MS));
+        await delay(RETRY_DELAY_MS, signal);
       }
     }
     return [];
   }
   readAllPortFiles() {
     const collected = [];
+    const seenPorts = new Set;
+    const add = (info) => {
+      if (seenPorts.has(info.port))
+        return;
+      seenPorts.add(info.port);
+      collected.push(info);
+    };
     if (existsSync(this.portsDir)) {
       try {
-        const entries = readdirSync(this.portsDir);
+        const entries = readdirSync(this.portsDir).sort();
         for (const entry of entries) {
           if (!entry.endsWith(".json"))
             continue;
-          const info = this.parsePortFile(join3(this.portsDir, entry));
+          const filePath = join3(this.portsDir, entry);
+          const info = this.parsePortFile(filePath);
           if (info)
-            collected.push(info);
+            add({ ...info, source: "instance", path: filePath });
         }
       } catch {}
     }
-    if (collected.length === 0) {
-      const info = this.parsePortFile(this.legacyPortFile);
-      if (info)
-        collected.push(info);
-    }
+    const legacyInfo = this.parsePortFile(this.legacyPortFile);
+    if (legacyInfo)
+      add({ ...legacyInfo, source: "legacy", path: this.legacyPortFile });
     return collected;
   }
-  parsePortFile(path2) {
+  parsePortFile(filePath) {
     try {
-      const content = readFileSync(path2, "utf-8").trim();
+      const content = readFileSync(filePath, "utf-8").trim();
       let port;
       let token;
       if (content.startsWith("{")) {
@@ -277,28 +250,59 @@ class AftRpcClient {
       return null;
     }
   }
-  async healthCheck(port) {
+  portFailureKey(info) {
+    if (info.source !== "instance" || !info.path)
+      return null;
+    return `${info.path}\x00${info.port}\x00${info.token ?? ""}`;
+  }
+  clearPortFailure(info) {
+    const key = this.portFailureKey(info);
+    if (key)
+      this.stalePortFailures.delete(key);
+  }
+  recordPortFailure(info) {
+    const key = this.portFailureKey(info);
+    if (!key || !info.path)
+      return;
+    const failures = (this.stalePortFailures.get(key) ?? 0) + 1;
+    if (failures < 2) {
+      this.stalePortFailures.set(key, failures);
+      return;
+    }
+    this.stalePortFailures.delete(key);
     try {
-      const response = await this.fetchWithTimeout(`http://127.0.0.1:${port}/health`, {
-        method: "GET"
-      });
+      const current = this.parsePortFile(info.path);
+      if (current?.port === info.port && current.token === info.token) {
+        unlinkSync(info.path);
+      }
+    } catch {}
+  }
+  async healthCheck(port, signal) {
+    try {
+      const response = await this.fetchWithTimeout(`http://127.0.0.1:${port}/health`, { method: "GET" }, signal);
       return response.ok;
     } catch {
+      throwIfAborted(signal);
       return false;
     }
   }
-  async fetchWithTimeout(url, options) {
+  async fetchWithTimeout(url, options, signal) {
+    throwIfAborted(signal);
     const controller = new AbortController;
     const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    const onAbort = () => controller.abort();
+    signal?.addEventListener("abort", onAbort, { once: true });
     try {
       return await fetch(url, { ...options, signal: controller.signal });
     } finally {
       clearTimeout(timeout);
+      signal?.removeEventListener("abort", onAbort);
     }
   }
   reset() {
     this.port = null;
     this.token = null;
+    this.stalePortFailures.clear();
   }
 }
 
@@ -418,6 +422,28 @@ function coerceAftStatus(response) {
 
 // src/tui/sidebar.tsx
 import { createEffect, createMemo, createSignal, on, onCleanup } from "solid-js";
+
+// src/shared/storage-paths.ts
+import { homedir } from "node:os";
+import { join as join4 } from "node:path";
+function homeDir() {
+  if (process.platform === "win32")
+    return process.env.USERPROFILE || process.env.HOME || homedir();
+  return process.env.HOME || homedir();
+}
+function dataHome() {
+  if (process.env.XDG_DATA_HOME)
+    return process.env.XDG_DATA_HOME;
+  if (process.platform === "win32") {
+    return process.env.LOCALAPPDATA || process.env.APPDATA || join4(homeDir(), "AppData", "Local");
+  }
+  return join4(homeDir(), ".local", "share");
+}
+function resolveCortexKitStorageRoot() {
+  return join4(dataHome(), "cortexkit", "aft");
+}
+
+// src/tui/sidebar.tsx
 import { jsxDEV, Fragment } from "@opentui/solid/jsx-dev-runtime";
 var SINGLE_BORDER = { type: "single" };
 var REFRESH_DEBOUNCE_MS = 200;
@@ -520,45 +546,92 @@ var SectionHeader = (props) => /* @__PURE__ */ jsxDEV("box", {
     }, undefined, false, undefined, this)
   }, undefined, false, undefined, this)
 }, undefined, false, undefined, this);
+function resolveTuiStorageDir() {
+  return resolveCortexKitStorageRoot();
+}
 var sidebarClients = new Map;
 function getClient(directory) {
   let client = sidebarClients.get(directory);
   if (client)
     return client;
-  const home = process.env.HOME || process.env.USERPROFILE || "";
-  const dataHome = process.env.XDG_DATA_HOME || `${home}/.local/share`;
-  const storageDir = `${dataHome}/cortexkit/aft`;
-  client = new AftRpcClient(storageDir, directory);
+  client = new AftRpcClient(resolveTuiStorageDir(), directory);
   sidebarClients.set(directory, client);
   return client;
 }
+function scopedSidebarSnapshot(scoped, directory, sessionID) {
+  if (!scoped)
+    return null;
+  if (scoped.directory !== directory || scoped.sessionID !== sessionID)
+    return null;
+  return scoped.snapshot;
+}
 var SidebarContent = (props) => {
   const [status, setStatus] = createSignal(null);
-  let inflight = false;
+  let inflight = null;
+  let generation = 0;
   let debounceTimer;
   let pollTimer;
-  const refresh = async () => {
-    const sid = props.sessionID();
-    if (!sid)
+  const currentDirectory = () => props.api.state.path.directory ?? "";
+  const requestRender = () => {
+    try {
+      props.api.renderer.requestRender();
+    } catch {}
+  };
+  const abortInflight = () => {
+    if (!inflight)
       return;
-    if (inflight)
+    inflight.controller.abort();
+    inflight = null;
+  };
+  const clearStatusForContext = (directory, sessionID) => {
+    const current = status();
+    if (!current)
       return;
-    const directory = props.api.state.path.directory ?? "";
-    if (!directory)
+    if (current.directory === directory && current.sessionID === sessionID)
       return;
-    inflight = true;
+    setStatus(null);
+    requestRender();
+  };
+  const refresh = async () => {
+    const sid = props.sessionID();
+    const directory = currentDirectory();
+    if (!sid || !directory) {
+      generation++;
+      abortInflight();
+      if (status()) {
+        setStatus(null);
+        requestRender();
+      }
+      return;
+    }
+    clearStatusForContext(directory, sid);
+    if (inflight) {
+      if (inflight.directory === directory && inflight.sessionID === sid)
+        return;
+      generation++;
+      abortInflight();
+    }
+    const requestGeneration = ++generation;
+    const controller = new AbortController;
+    inflight = { controller, generation: requestGeneration, directory, sessionID: sid };
     try {
       const client = getClient(directory);
-      const response = await client.call("status", { sessionID: sid });
+      const response = await client.call("status", { sessionID: sid }, { signal: controller.signal });
+      if (controller.signal.aborted || requestGeneration !== generation)
+        return;
+      if (currentDirectory() !== directory || props.sessionID() !== sid)
+        return;
       if (response && response.success !== false) {
         const snapshot = coerceAftStatus(response);
-        setStatus(snapshot);
-        try {
-          props.api.renderer.requestRender();
-        } catch {}
+        setStatus({ directory, sessionID: sid, snapshot });
+        requestRender();
       }
-    } catch {} finally {
-      inflight = false;
+    } catch {
+      if (controller.signal.aborted || requestGeneration !== generation)
+        return;
+    } finally {
+      if (inflight?.generation === requestGeneration)
+        inflight = null;
     }
   };
   const scheduleRefresh = () => {
@@ -570,6 +643,8 @@ var SidebarContent = (props) => {
     }, REFRESH_DEBOUNCE_MS);
   };
   onCleanup(() => {
+    generation++;
+    abortInflight();
     if (debounceTimer)
       clearTimeout(debounceTimer);
     if (pollTimer)
@@ -604,13 +679,15 @@ var SidebarContent = (props) => {
           unsub();
         } catch {}
       }
+      generation++;
+      abortInflight();
       if (pollTimer) {
         clearInterval(pollTimer);
         pollTimer = undefined;
       }
     });
   }, { defer: false }));
-  const s = createMemo(() => status());
+  const s = () => scopedSidebarSnapshot(status(), currentDirectory(), props.sessionID());
   const notInitialized = () => s()?.cache_role === "not_initialized";
   const searchStatus = () => statusDisplay(s()?.search_index?.status ?? "disabled");
   const semanticStatus = () => statusDisplay(s()?.semantic_index?.status ?? "disabled");
@@ -821,10 +898,7 @@ function getRpcClient(directory) {
   let client = rpcClients.get(directory);
   if (client)
     return client;
-  const home = process.env.HOME || process.env.USERPROFILE || "";
-  const dataHome = process.env.XDG_DATA_HOME || `${home}/.local/share`;
-  const storageDir = `${dataHome}/cortexkit/aft`;
-  client = new AftRpcClient(storageDir, directory);
+  client = new AftRpcClient(resolveTuiStorageDir(), directory);
   rpcClients.set(directory, client);
   return client;
 }
@@ -902,16 +976,41 @@ var StatusDialog = (props) => {
   const t = () => theme();
   const [status, setStatus] = createSignal2(props.initial);
   const [error, setError] = createSignal2(props.initialError);
-  const timer = setInterval(async () => {
+  let pollGeneration = 0;
+  let pollController = null;
+  const pollStatus = async () => {
+    if (pollController)
+      return;
+    const controller = new AbortController;
+    const requestGeneration = ++pollGeneration;
+    pollController = controller;
     try {
-      const response = await props.client.call("status", { sessionID: props.sessionID });
+      const response = await props.client.call("status", { sessionID: props.sessionID }, { signal: controller.signal });
+      if (controller.signal.aborted || requestGeneration !== pollGeneration)
+        return;
       if (response.success !== false) {
         setStatus(coerceAftStatus(response));
         setError(null);
       }
-    } catch {}
+    } catch {
+      if (controller.signal.aborted || requestGeneration !== pollGeneration)
+        return;
+    } finally {
+      if (pollController === controller)
+        pollController = null;
+    }
+  };
+  const timer = setInterval(() => {
+    pollStatus();
   }, POLL_INTERVAL_MS2);
-  onCleanup2(() => clearInterval(timer));
+  onCleanup2(() => {
+    clearInterval(timer);
+    pollGeneration++;
+    if (pollController) {
+      pollController.abort();
+      pollController = null;
+    }
+  });
   const cacheRoleTone = (role) => role === "main" ? "accent" : role === "worktree" ? "warn" : "muted";
   const compressionAggregateRows = () => formatCompressionSidebarRows(status()?.compression);
   return /* @__PURE__ */ jsxDEV2("box", {
@@ -939,7 +1038,7 @@ var StatusDialog = (props) => {
             fg: t().textMuted,
             children: [
               "v",
-              status()?.version ?? package_default.version
+              status()?.version ?? version
             ]
           }, undefined, true, undefined, this)
         ]
@@ -1346,7 +1445,7 @@ ${featureText}`;
 }
 var tui = async (api) => {
   try {
-    api.slots.register(createAftSidebarSlot(api, package_default.version));
+    api.slots.register(createAftSidebarSlot(api, version));
   } catch {}
   registerStatusCommand(api);
   showStartupNotifications(api);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.30.0",
+  "version": "0.30.2",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.30.0",
+    "@cortexkit/aft-bridge": "0.30.2",
     "@opencode-ai/plugin": "^1.15.5",
     "@opencode-ai/sdk": "^1.15.5",
     "@xterm/headless": "^5.5.0",
@@ -38,12 +38,12 @@
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.30.0",
-    "@cortexkit/aft-darwin-x64": "0.30.0",
-    "@cortexkit/aft-linux-arm64": "0.30.0",
-    "@cortexkit/aft-linux-x64": "0.30.0",
-    "@cortexkit/aft-win32-arm64": "0.30.0",
-    "@cortexkit/aft-win32-x64": "0.30.0"
+    "@cortexkit/aft-darwin-arm64": "0.30.2",
+    "@cortexkit/aft-darwin-x64": "0.30.2",
+    "@cortexkit/aft-linux-arm64": "0.30.2",
+    "@cortexkit/aft-linux-x64": "0.30.2",
+    "@cortexkit/aft-win32-arm64": "0.30.2",
+    "@cortexkit/aft-win32-x64": "0.30.2"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/src/shared/last-assistant-model.ts

@@ -8,12 +8,11 @@
  * prefix cache that the previous assistant turn warmed.
  *
  * APPROACH: Mirror what `opencode-xtra` does in production. Read recent
- * messages from `client.session.messages()`, prefer the most recent
- * assistant message, fall back to any role, MERGE across messages so
- * partial fields (e.g. agent set on user message but not assistant) are
- * filled in, and read BOTH the flat shape (`info.providerID`) used by
- * AssistantMessage and the nested shape (`info.model.providerID`) used
- * by UserMessage.
+ * messages from `client.session.messages()`, walk newest→oldest across
+ * roles, and MERGE field-by-field so the newest context-bearing message
+ * wins while older messages only fill fields it did not provide. Read BOTH
+ * the flat shape (`info.providerID`) used by AssistantMessage and the
+ * nested shape (`info.model.providerID`) used by UserMessage.
  *
  * IMPORTANT: This context is only meaningful for callers that DO trigger
  * LLM inference (e.g. background-bash idle wakes with `noReply: false`).
@@ -49,11 +48,6 @@ function extractMessages(response: unknown): unknown[] {
   return [];
 }
 
-function getRole(message: unknown): string | undefined {
-  if (!isRecord(message) || !isRecord(message.info)) return undefined;
-  return typeof message.info.role === "string" ? message.info.role : undefined;
-}
-
 function extractFromMessage(message: unknown): ResolvedPromptContext | null {
   if (!isRecord(message) || !isRecord(message.info)) return null;
   const info = message.info as RawInfo;
@@ -103,10 +97,10 @@ function isComplete(ctx: ResolvedPromptContext): boolean {
 }
 
 /**
- * Read recent messages from the OpenCode session and resolve the most
- * recent assistant prompt context. Falls back to user messages if no
- * assistant has the field. Merges across messages so partial fields are
- * filled in. Returns null if no usable context is found.
+ * Read recent messages from the OpenCode session and resolve the newest
+ * effective prompt context across roles. Merges across messages so partial
+ * fields are filled in from older messages only when the newer context did
+ * not provide them. Returns null if no usable context is found.
  *
  * Mirrors `resolveSessionPromptParams` in `opencode-xtra` (the working
  * reference implementation).
@@ -153,19 +147,7 @@ export async function resolvePromptContext(
   }
   if (messages.length === 0) return null;
 
-  // Pass 1: prefer the most recent assistant, merge older assistants to
-  // fill missing fields.
   let result: ResolvedPromptContext = {};
-  for (let i = messages.length - 1; i >= 0; i -= 1) {
-    if (getRole(messages[i]) !== "assistant") continue;
-    const ctx = extractFromMessage(messages[i]);
-    if (!ctx) continue;
-    result = mergeContexts(result, ctx);
-    if (isComplete(result)) return result;
-  }
-
-  // Pass 2: fall back to any role (covers user messages, which carry
-  // model nested under `info.model`).
   for (let i = messages.length - 1; i >= 0; i -= 1) {
     const ctx = extractFromMessage(messages[i]);
     if (!ctx) continue;