@cortexkit/aft-opencode 0.63.5 → 0.65.0

package/src/shared/session-directory.ts

@@ -12,8 +12,8 @@
  *
  * The session itself stores the correct directory in OpenCode's SQLite
  * (`Session.directory` in the SDK). This helper looks it up once per
- * session and caches the result — sessions don't change directory
- * across their lifetime, so the cache never needs invalidation.
+ * session and caches the result. A session.moved event invalidates the
+ * cached root because OpenCode 2 sessions can change Location.
  *
  * The bug should also be fixed upstream in OpenCode's
  * `packages/opencode/src/session/registry.ts`. Until then this
@@ -50,11 +50,16 @@ interface SessionInfo {
  * same test for its own session lookup.
  */
 interface V2SessionInfo {
-  location?: { directory?: unknown };
+  location?: { directory?: unknown; workspaceID?: string };
+}
+
+interface SessionLocation {
+  directory: string;
+  workspaceID?: string;
 }
 
 interface V2PluginContextShape {
-  location: { directory: string };
+  location: SessionLocation;
   session: {
     get(input: { sessionID: string }): Effect.Effect<V2SessionInfo | undefined, unknown>;
   };
@@ -92,6 +97,8 @@ interface OpenCodeClientShape {
 interface CacheEntry {
   /** Resolved directory, or `null` while a failed lookup is cooling down. */
   directory: string | null;
+  /** V2 Location refs distinguish workspaces that share a directory. */
+  location?: SessionLocation;
   /** When the answer was recorded; failed lookups become retryable after 30 seconds. */
   recordedAt: number;
 }
@@ -104,8 +111,9 @@ const lookupGenerations = new Map<string, object>();
 /**
  * Resolve the project directory the session was created with from the SDK's
  * session object. Returns the SDK-reported directory, or `null` when the
- * lookup is unavailable/fails — callers should fall back to the runtime's
- * directory in that case.
+ * lookup is unavailable/fails. Only session-scoped tool calls may fall back
+ * to their runtime directory; broadcast events must not open a route without
+ * a resolved session directory.
  *
  * This function is best-effort: any error (missing `client.session.get`,
  * network failure, malformed response) is logged and recorded as a
@@ -139,6 +147,55 @@ export async function getSessionDirectory(
   return lookup;
 }
 
+/** Session events may open routes only in the owning V2 Location. */
+export async function getSessionDirectoryForEvent(
+  client: unknown,
+  sessionId: string,
+  instanceDirectory: string,
+): Promise<string | null> {
+  const directory = await getSessionDirectory(client, sessionId, instanceDirectory);
+  if (
+    isV2PluginContext(client) &&
+    (directory !== client.location.directory ||
+      cache.get(sessionId)?.location?.workspaceID !== client.location.workspaceID)
+  )
+    return null;
+  return directory;
+}
+
+/** Deleted records cannot be queried: prefer the event's Location, then a previously resolved ref. */
+export function getSessionDirectoryForDeletedEvent(
+  client: unknown,
+  sessionId: string,
+  eventLocation: unknown,
+): string | null {
+  if (!sessionId || !isV2PluginContext(client)) return null;
+  let location: SessionLocation | undefined;
+  if (eventLocation === undefined) {
+    location = cache.get(sessionId)?.location;
+  } else {
+    if (!eventLocation || typeof eventLocation !== "object") return null;
+    const ref = eventLocation as { directory?: unknown; workspaceID?: unknown };
+    if (
+      typeof ref.directory !== "string" ||
+      !ref.directory ||
+      (ref.workspaceID !== undefined && typeof ref.workspaceID !== "string")
+    )
+      return null;
+    location = { directory: ref.directory, workspaceID: ref.workspaceID };
+    // The cleanup's bridge call also consults this cache. Preserve the event's
+    // ownership proof there instead of asking the host for an already-deleted record.
+    setCache(sessionId, location.directory, location);
+  }
+  if (
+    !location ||
+    location.directory !== client.location.directory ||
+    location.workspaceID !== client.location.workspaceID
+  )
+    return null;
+  return location.directory;
+}
+
 /** A late success may repair its provisional answer, but never overwrite a newer lookup. */
 async function boundedLookup(
   client: unknown,
@@ -152,6 +209,7 @@ async function boundedLookup(
     if (oldest !== undefined) lookupGenerations.delete(oldest);
   }
   let timer: ReturnType<typeof setTimeout> | undefined;
+  let location: CacheEntry["location"];
   try {
     const timeout = new Promise<null>((resolve) => {
       timer = setTimeout(() => {
@@ -163,10 +221,12 @@ async function boundedLookup(
       }, LOOKUP_TIMEOUT_MS);
     });
     const directory = await Promise.race([
-      lookupSessionDirectory(client, sessionId, fallbackDirectory)
+      lookupSessionDirectory(client, sessionId, fallbackDirectory, (ref) => {
+        location = ref;
+      })
         .then((directory) => {
           if (lookupGenerations.get(sessionId) === generation && directory !== null) {
-            setCache(sessionId, directory);
+            setCache(sessionId, directory, location);
           }
           return directory;
         })
@@ -175,7 +235,7 @@ async function boundedLookup(
         }),
       timeout,
     ]);
-    setCache(sessionId, directory);
+    setCache(sessionId, directory, location);
     return directory;
   } finally {
     clearTimeout(timer);
@@ -186,8 +246,9 @@ async function lookupSessionDirectory(
   client: unknown,
   sessionId: string,
   fallbackDirectory: string,
+  onLocation: (location: NonNullable<CacheEntry["location"]>) => void,
 ): Promise<string | null> {
-  if (isV2PluginContext(client)) return lookupV2SessionDirectory(client, sessionId);
+  if (isV2PluginContext(client)) return lookupV2SessionDirectory(client, sessionId, onLocation);
 
   const c = client as OpenCodeClientShape;
   const sessionApi = c?.session;
@@ -236,6 +297,7 @@ async function lookupSessionDirectory(
 async function lookupV2SessionDirectory(
   context: V2PluginContextShape,
   sessionId: string,
+  onLocation: (location: NonNullable<CacheEntry["location"]>) => void,
 ): Promise<string | null> {
   let dir: string | null = null;
   let failure: string | undefined;
@@ -247,8 +309,10 @@ async function lookupV2SessionDirectory(
       ),
     );
     const directory = session?.location?.directory;
-    if (typeof directory === "string" && directory.length > 0) dir = directory;
-    else failure = "the session record has no location.directory";
+    if (typeof directory === "string" && directory.length > 0) {
+      dir = directory;
+      onLocation({ directory, workspaceID: session?.location?.workspaceID });
+    } else failure = "the session record has no location.directory";
   } catch (err) {
     failure = err instanceof Error ? err.message || err.name : String(err);
   }
@@ -261,9 +325,13 @@ async function lookupV2SessionDirectory(
   return dir;
 }
 
-function setCache(sessionId: string, directory: string | null): void {
+function setCache(
+  sessionId: string,
+  directory: string | null,
+  location?: CacheEntry["location"],
+): void {
   if (cache.has(sessionId)) cache.delete(sessionId);
-  cache.set(sessionId, { directory, recordedAt: Date.now() });
+  cache.set(sessionId, { directory, location, recordedAt: Date.now() });
   if (cache.size > CACHE_MAX_ENTRIES) {
     const oldest = cache.keys().next().value;
     if (oldest !== undefined) cache.delete(oldest);
@@ -385,6 +453,13 @@ async function boundedVerification(client: unknown, sessionId: string): Promise<
   return dir;
 }
 
+/** Forget directory snapshots when the host moves or removes a session. */
+export function clearSessionDirectory(sessionId: string): void {
+  cache.delete(sessionId);
+  lookupGenerations.delete(sessionId);
+  verifyCache.delete(sessionId);
+}
+
 /** Release transport routes on deletion without querying a session the host has already removed. */
 export async function closeDeletedSessionRoutes(
   pool: AftTransportPool,
@@ -395,9 +470,7 @@ export async function closeDeletedSessionRoutes(
   const roots = new Set(pool.activeBridges().map((bridge) => bridge.getCwd()));
   roots.add(getSessionDirectoryCached(sessionId) ?? fallbackDirectory);
   await Promise.allSettled([...roots].map((root) => pool.closeSession(root, sessionId)));
-  cache.delete(sessionId);
-  lookupGenerations.delete(sessionId);
-  verifyCache.delete(sessionId);
+  clearSessionDirectory(sessionId);
 }
 
 /** Test-only: clear the cache between unit tests. */

package/src/shared/status.ts

@@ -59,11 +59,7 @@ export interface StatusBar {
   disabled_categories?: string[];
   errors?: number;
   warnings?: number;
-  dead_code?: number;
-  unused_exports?: number;
-  duplicates?: number;
   todos?: number;
-  tier2_stale?: boolean;
   /**
    * `no_language_server` means no server is running. `producer_missing`
    * masks both counts when an expected project producer has failed, even if
@@ -147,12 +143,12 @@ export interface AftStatusSnapshot {
   };
   storage_dir: string | null;
   /** Total checkpoints across all sessions sharing this bridge. */
-  checkpoints_total: number;
+  checkpoints_total: number | null;
   /** Current session's own slice of undo/checkpoint state. */
   session: {
     id: string;
     tracked_files: number;
-    checkpoints: number;
+    checkpoints: number | null;
   };
   /** Compression aggregate passthrough; rendering is added separately. */
   compression?: StatusCompression;
@@ -233,9 +229,6 @@ function readStatusBar(value: unknown): StatusBar | undefined {
     : [];
   const errors = readOptionalNumber(bar.errors);
   const warnings = readOptionalNumber(bar.warnings);
-  const deadCode = readOptionalNumber(bar.dead_code);
-  const unusedExports = readOptionalNumber(bar.unused_exports);
-  const duplicates = readOptionalNumber(bar.duplicates);
   const todos = readOptionalNumber(bar.todos);
   const noLanguageServer = bar.diagnostics === "no_language_server";
   const producerMissing = bar.diagnostics === "producer_missing";
@@ -257,9 +250,6 @@ function readStatusBar(value: unknown): StatusBar | undefined {
   if (
     errors === null &&
     warnings === null &&
-    deadCode === null &&
-    unusedExports === null &&
-    duplicates === null &&
     todos === null &&
     !noLanguageServer &&
     !producerMissing &&
@@ -271,11 +261,7 @@ function readStatusBar(value: unknown): StatusBar | undefined {
     ...(disabled.length > 0 ? { disabled_categories: disabled } : {}),
     ...(errors !== null ? { errors } : {}),
     ...(warnings !== null ? { warnings } : {}),
-    ...(deadCode !== null ? { dead_code: deadCode } : {}),
-    ...(unusedExports !== null ? { unused_exports: unusedExports } : {}),
-    ...(duplicates !== null ? { duplicates } : {}),
     ...(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 }
@@ -417,11 +403,11 @@ export function coerceAftStatus(response: Record<string, unknown>): AftStatusSna
       warm_entries: readNumber(symbolCache.warm_entries),
     },
     storage_dir: readNullableString(response.storage_dir),
-    checkpoints_total: readNumber(response.checkpoints_total),
+    checkpoints_total: readOptionalNumber(response.checkpoints_total),
     session: {
       id: readString(session.id, "__default__"),
       tracked_files: readNumber(session.tracked_files),
-      checkpoints: readNumber(session.checkpoints),
+      checkpoints: readOptionalNumber(session.checkpoints),
     },
     compression: readCompression(response.compression),
     status_bar: readStatusBar(response.status_bar),
@@ -501,13 +487,10 @@ export function formatStatusDialogMessage(status: AftStatusSnapshot): string {
     const rows = [
       ["errors", sb.errors],
       ["warnings", sb.warnings],
-      ["dead code", sb.dead_code],
-      ["unused exports", sb.unused_exports],
-      ["duplicates", sb.duplicates],
       ["todos", sb.todos],
     ].filter((row): row is [string, number] => typeof row[1] === "number");
     if (rows.length > 0) {
-      lines.push("", `Code Health${sb.tier2_stale ? " (~ stale)" : ""}`);
+      lines.push("", "Code Health");
       for (const [label, value] of rows) lines.push(`- ${label}: ${formatCount(value)}`);
     }
   }
@@ -660,13 +643,10 @@ export function formatStatusMarkdown(status: AftStatusSnapshot): string {
     const rows = [
       ["Errors", sb.errors],
       ["Warnings", sb.warnings],
-      ["Dead code", sb.dead_code],
-      ["Unused exports", sb.unused_exports],
-      ["Duplicates", sb.duplicates],
       ["TODOs", sb.todos],
     ].filter((row): row is [string, number] => typeof row[1] === "number");
     if (rows.length > 0) {
-      lines.push("", `### Code Health${sb.tier2_stale ? " (~ stale)" : ""}`);
+      lines.push("", "### Code Health");
       for (const [label, value] of rows) lines.push(`- **${label}:** ${formatCount(value)}`);
     }
   }

package/src/tui/index.tsx

@@ -155,7 +155,7 @@ function statusAcceptGate(directory: string): (result: unknown) => boolean {
   };
 }
 
-const StatusDialog = (props: StatusDialogProps) => {
+export const StatusDialog = (props: StatusDialogProps) => {
   const theme = createMemo(() => (props.api as any).theme.current as TuiThemeCurrent);
   const t = () => theme();
 
@@ -426,11 +426,15 @@ const StatusDialog = (props: StatusDialogProps) => {
               </text>
             </box>
             <R theme={t()} label="Tracked files" value={String(status()!.session.tracked_files)} />
-            <R theme={t()} label="Checkpoints" value={String(status()!.session.checkpoints)} />
+            <R
+              theme={t()}
+              label="Checkpoints"
+              value={status()!.session.checkpoints?.toString() ?? "—"}
+            />
             <R
               theme={t()}
               label="All-session checkpoints"
-              value={String(status()!.checkpoints_total)}
+              value={status()!.checkpoints_total?.toString() ?? "—"}
               tone="muted"
             />
           </box>
@@ -496,7 +500,7 @@ const StatusDialog = (props: StatusDialogProps) => {
       {statusBar() ? (
         <box flexDirection="column" width="100%" marginTop={1}>
           <text fg={t().text}>
-            <b>{statusBar()!.tier2_stale ? "Code Health ~" : "Code Health"}</b>
+            <b>Code Health</b>
           </text>
           {(statusBar()!.disabled_categories ?? []).map((key) => (
             <R theme={t()} label={key.replaceAll("_", " ")} value="○ off" tone="muted" />
@@ -517,30 +521,6 @@ const StatusDialog = (props: StatusDialogProps) => {
               tone={statusBar()!.warnings! > 0 ? "warn" : "muted"}
             />
           ) : null}
-          {statusBar()!.dead_code !== undefined ? (
-            <R
-              theme={t()}
-              label="Dead Code"
-              value={formatCountShort(statusBar()!.dead_code)}
-              tone="muted"
-            />
-          ) : null}
-          {statusBar()!.unused_exports !== undefined ? (
-            <R
-              theme={t()}
-              label="Unused Exports"
-              value={formatCountShort(statusBar()!.unused_exports)}
-              tone="muted"
-            />
-          ) : null}
-          {statusBar()!.duplicates !== undefined ? (
-            <R
-              theme={t()}
-              label="Duplicates"
-              value={formatCountShort(statusBar()!.duplicates)}
-              tone="muted"
-            />
-          ) : null}
           {statusBar()!.todos !== undefined ? (
             <R
               theme={t()}

package/src/tui/preferences.ts

@@ -40,7 +40,7 @@ export interface AftTuiPrefs {
   rememberCollapsed: boolean;
   collapsed: boolean | null;
   /**
-   * Whether OpenCode 2 shows AFT's health line (`AFT E0 W0 | D0 U0 C0 | T0`)
+   * Whether OpenCode 2 shows AFT's health line (`AFT E0 W0 | T0`)
    * in the prompt footer. Off hides it entirely; the sidebar and the status
    * dialog are unaffected.
    */

package/src/tui/shared-sidebar.ts

@@ -0,0 +1,14 @@
+import type * as SharedSidebar from "@cortexkit/opencode-sidebar";
+
+// Raw-source hosts use their ordinary runtime; published hosts use the virtual
+// runtime module selected by build-tui.ts instead of this loader.
+const generatedModule = "../tui-compiled/shared-sidebar-local.tsx";
+const sidebar: typeof SharedSidebar = await import(generatedModule).catch((cause: unknown) => {
+  throw new Error(
+    "AFT's generated shared sidebar could not be loaded. Run `bun run --cwd packages/opencode-plugin build:tui` before loading the TUI from source.",
+    { cause },
+  );
+});
+
+export const SidebarFrame = sidebar.SidebarFrame;
+export type { SidebarTheme } from "@cortexkit/opencode-sidebar";