@mirrowel/opencode-subagent-explorer 0.1.0-dev.1 → 0.2.0-dev.1

package/dist/sessions.d.ts

@@ -1,10 +1,3 @@
-/**
- * Core subagent-session data layer. Pure tree/classification logic plus
- * fail-soft client seams. Every client call is attached to its namespace
- * object (v2-gen class methods throw when detached), feature-detected,
- * timeout-bounded, and envelope-unwrapping ({data} vs raw) so one code path
- * serves the v1 and v2 hosts and the studio embed alike.
- */
 export type SessionLite = {
     id: string;
     parentID?: string;
@@ -37,7 +30,33 @@ export declare function fetchSessions(client: unknown, directory: string): Promi
 /** Running session ids via `session.active()` with the `session.status()`
  * fallback (busy/retry = running). `undefined` when neither exists or both
  * fail — callers must treat that as "unknown", never "idle". */
+/**
+ * Running session ids via `session.active()` with the `session.status()`
+ * fallback (busy/retry/unknown-type = running). Mirrors the Config Studio
+ * reload coordinator's proven probing: PRESENCE in the active map means
+ * running (values may be falsy and must not be filtered), the status map
+ * keys carry `.type` (not `.status`), and all calls stay attached to the
+ * namespace object (SDK methods dereference `this`). `undefined` when
+ * neither exists or both fail - callers must treat that as "unknown",
+ * never "idle".
+ */
 export declare function fetchActiveSessionIDs(client: unknown): Promise<Set<string> | undefined>;
+/** Minimal agent-variants sidecar view: which parents exist and which have
+ * the base disabled. Absent file / parse errors -> empty (fail-soft). */
+export type AvSidecar = {
+    parents: Map<string, {
+        disableBase: boolean;
+    }>;
+};
+export declare function loadAvSidecar(globalConfigDir: string | undefined): AvSidecar;
+/** child session id -> the AV variant that created it (from the parent's
+ * task-part metadata). Windowed like AV's own correlation: only recent
+ * history is scanned, deep/old tasks simply stay unattributed. */
+export type VariantAttribution = Map<string, {
+    alias: string;
+    parent: string;
+}>;
+export declare function fetchVariantAttribution(client: unknown, parentSessionID: string | undefined, directory: string | undefined, avParents: Set<string>): Promise<VariantAttribution>;
 /** Builds the recursive subagent tree for `rootID`. Unknown-parent sessions
  * are ignored (not part of this session's tree). Guarded against cycles. */
 export declare function buildSessionTree(sessions: SessionLite[], rootID: string): SessionTreeNode[];

package/dist/sessions.js

@@ -5,6 +5,7 @@
  * timeout-bounded, and envelope-unwrapping ({data} vs raw) so one code path
  * serves the v1 and v2 hosts and the studio embed alike.
  */
+import { existsSync, readFileSync } from "node:fs";
 const CALL_TIMEOUT_MS = 5000;
 /** OpenCode's built-in agent ids (v1): anything else that is not in the
  * user's config was registered at runtime (plugins) and is treated as
@@ -73,28 +74,35 @@ export async function fetchSessions(client, directory) {
 /** Running session ids via `session.active()` with the `session.status()`
  * fallback (busy/retry = running). `undefined` when neither exists or both
  * fail — callers must treat that as "unknown", never "idle". */
+/**
+ * Running session ids via `session.active()` with the `session.status()`
+ * fallback (busy/retry/unknown-type = running). Mirrors the Config Studio
+ * reload coordinator's proven probing: PRESENCE in the active map means
+ * running (values may be falsy and must not be filtered), the status map
+ * keys carry `.type` (not `.status`), and all calls stay attached to the
+ * namespace object (SDK methods dereference `this`). `undefined` when
+ * neither exists or both fail - callers must treat that as "unknown",
+ * never "idle".
+ */
 export async function fetchActiveSessionIDs(client) {
     const namespace = client?.session;
     if (!namespace)
         return undefined;
     if (typeof namespace.active === "function") {
-        const active = unwrap(await withTimeout(() => namespace.active()));
-        if (active && typeof active === "object") {
-            const ids = new Set();
-            for (const [id, value] of Object.entries(active)) {
-                if (value)
-                    ids.add(id);
-            }
-            return ids;
+        const result = await withTimeout(() => namespace.active());
+        const data = result && typeof result === "object" ? result.data : undefined;
+        if (data && typeof data === "object" && !Array.isArray(data)) {
+            return new Set(Object.keys(data));
         }
     }
     if (typeof namespace.status === "function") {
-        const status = unwrap(await withTimeout(() => namespace.status()));
-        if (status && typeof status === "object") {
+        const result = await withTimeout(() => namespace.status());
+        const data = result && typeof result === "object" ? result.data : undefined;
+        if (data && typeof data === "object" && !Array.isArray(data)) {
             const ids = new Set();
-            for (const [id, value] of Object.entries(status)) {
-                const state = value?.status ?? value;
-                if (state === "busy" || state === "retry")
+            for (const [id, value] of Object.entries(data)) {
+                const type = value && typeof value === "object" ? (value.type ?? value.status) : value;
+                if (type === undefined || type === "busy" || type === "retry")
                     ids.add(id);
             }
             return ids;
@@ -102,6 +110,72 @@ export async function fetchActiveSessionIDs(client) {
     }
     return undefined;
 }
+export function loadAvSidecar(globalConfigDir) {
+    const parents = new Map();
+    if (!globalConfigDir)
+        return { parents };
+    try {
+        const path = `${globalConfigDir.replace(/[\\/]+$/, "")}/agent-variants.jsonc`;
+        if (!existsSync(path))
+            return { parents };
+        const raw = readFileSync(path, "utf8");
+        const json = JSON.parse(stripJsoncComments(raw));
+        for (const [parent, entry] of Object.entries(json.agents ?? {})) {
+            if (!entry || typeof entry !== "object")
+                continue;
+            parents.set(parent, { disableBase: entry.disable_base === true && entry.disable !== true });
+        }
+    }
+    catch {
+        // Not our file to complain about - AV may simply not be installed.
+    }
+    return { parents };
+}
+function stripJsoncComments(text) {
+    // Block comments, line comments, and trailing commas before } or ].
+    return text
+        .replace(/\/\*[\s\S]*?\*\//g, "")
+        .replace(/(^|[^:"'\\])\/\/.*$/gm, "$1")
+        .replace(/,(\s*[}\]])/g, "$1");
+}
+export async function fetchVariantAttribution(client, parentSessionID, directory, avParents) {
+    const map = new Map();
+    if (avParents.size === 0 || !parentSessionID)
+        return map;
+    const namespace = client?.session;
+    if (!namespace || typeof namespace.messages !== "function")
+        return map;
+    const messages = await withTimeout(() => {
+        // Try the flat (v2-gen) shape first, then the legacy {query} wrapper.
+        const flat = namespace.messages({ sessionID: parentSessionID, directory, limit: 50 });
+        return flat instanceof Promise ? flat : namespace.messages({ path: { id: parentSessionID }, query: { directory, limit: 50 } });
+    });
+    const list = Array.isArray(messages)
+        ? messages
+        : messages && typeof messages === "object"
+            ? (messages.data ?? messages)
+            : undefined;
+    if (!Array.isArray(list))
+        return map;
+    for (const message of list) {
+        for (const part of message.parts ?? []) {
+            if (part?.type !== "tool" || part.tool !== "task")
+                continue;
+            const metadata = part.state?.metadata;
+            const child = metadata?.sessionId;
+            const variantMeta = metadata?.agentVariants;
+            const alias = variantMeta?.alias;
+            const routedAgent = variantMeta?.routedAgent;
+            if (typeof child === "string" && typeof alias === "string" && !map.has(child)) {
+                map.set(child, {
+                    alias,
+                    parent: typeof routedAgent === "string" ? routedAgent : alias.replace(/-[a-z0-9-]+$/, ""),
+                });
+            }
+        }
+    }
+    return map;
+}
 /** Builds the recursive subagent tree for `rootID`. Unknown-parent sessions
  * are ignored (not part of this session's tree). Guarded against cycles. */
 export function buildSessionTree(sessions, rootID) {

package/dist/tui.js

@@ -66,6 +66,7 @@ import { useTerminalDimensions } from "@opentui/solid";
 import { createEffect, createMemo, createSignal, For, onCleanup, Show } from "solid-js";
 
 // src/sessions.ts
+import { existsSync, readFileSync } from "fs";
 var CALL_TIMEOUT_MS = 5000;
 var BUILTIN_AGENTS = new Set(["build", "plan"]);
 function withTimeout(fn, ms = CALL_TIMEOUT_MS) {
@@ -127,23 +128,20 @@ async function fetchActiveSessionIDs(client) {
   if (!namespace)
     return;
   if (typeof namespace.active === "function") {
-    const active = unwrap(await withTimeout(() => namespace.active()));
-    if (active && typeof active === "object") {
-      const ids = new Set;
-      for (const [id, value] of Object.entries(active)) {
-        if (value)
-          ids.add(id);
-      }
-      return ids;
+    const result = await withTimeout(() => namespace.active());
+    const data = result && typeof result === "object" ? result.data : undefined;
+    if (data && typeof data === "object" && !Array.isArray(data)) {
+      return new Set(Object.keys(data));
     }
   }
   if (typeof namespace.status === "function") {
-    const status = unwrap(await withTimeout(() => namespace.status()));
-    if (status && typeof status === "object") {
+    const result = await withTimeout(() => namespace.status());
+    const data = result && typeof result === "object" ? result.data : undefined;
+    if (data && typeof data === "object" && !Array.isArray(data)) {
       const ids = new Set;
-      for (const [id, value] of Object.entries(status)) {
-        const state = value?.status ?? value;
-        if (state === "busy" || state === "retry")
+      for (const [id, value] of Object.entries(data)) {
+        const type = value && typeof value === "object" ? value.type ?? value.status : value;
+        if (type === undefined || type === "busy" || type === "retry")
           ids.add(id);
       }
       return ids;
@@ -151,6 +149,60 @@ async function fetchActiveSessionIDs(client) {
   }
   return;
 }
+function loadAvSidecar(globalConfigDir) {
+  const parents = new Map;
+  if (!globalConfigDir)
+    return { parents };
+  try {
+    const path = `${globalConfigDir.replace(/[\\/]+$/, "")}/agent-variants.jsonc`;
+    if (!existsSync(path))
+      return { parents };
+    const raw = readFileSync(path, "utf8");
+    const json = JSON.parse(stripJsoncComments(raw));
+    for (const [parent, entry] of Object.entries(json.agents ?? {})) {
+      if (!entry || typeof entry !== "object")
+        continue;
+      parents.set(parent, { disableBase: entry.disable_base === true && entry.disable !== true });
+    }
+  } catch {}
+  return { parents };
+}
+function stripJsoncComments(text) {
+  return text.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|[^:"'\\])\/\/.*$/gm, "$1").replace(/,(\s*[}\]])/g, "$1");
+}
+async function fetchVariantAttribution(client, parentSessionID, directory, avParents) {
+  const map = new Map;
+  if (avParents.size === 0 || !parentSessionID)
+    return map;
+  const namespace = client?.session;
+  if (!namespace || typeof namespace.messages !== "function")
+    return map;
+  const messages = await withTimeout(() => {
+    const flat = namespace.messages({ sessionID: parentSessionID, directory, limit: 50 });
+    return flat instanceof Promise ? flat : namespace.messages({ path: { id: parentSessionID }, query: { directory, limit: 50 } });
+  });
+  const list = Array.isArray(messages) ? messages : messages && typeof messages === "object" ? messages.data ?? messages : undefined;
+  if (!Array.isArray(list))
+    return map;
+  for (const message of list) {
+    for (const part of message.parts ?? []) {
+      if (part?.type !== "tool" || part.tool !== "task")
+        continue;
+      const metadata = part.state?.metadata;
+      const child = metadata?.sessionId;
+      const variantMeta = metadata?.agentVariants;
+      const alias = variantMeta?.alias;
+      const routedAgent = variantMeta?.routedAgent;
+      if (typeof child === "string" && typeof alias === "string" && !map.has(child)) {
+        map.set(child, {
+          alias,
+          parent: typeof routedAgent === "string" ? routedAgent : alias.replace(/-[a-z0-9-]+$/, "")
+        });
+      }
+    }
+  }
+  return map;
+}
 function buildSessionTree(sessions, rootID) {
   const byParent = new Map;
   for (const session of sessions) {
@@ -313,28 +365,41 @@ function parentCandidates(sessions) {
 }
 
 // src/wizard.tsx
-async function loadExplorerData(api, directory) {
+function globalConfigDirOf(api) {
+  const config = api.state.path?.config;
+  if (!config)
+    return;
+  const index = Math.max(config.lastIndexOf("/"), config.lastIndexOf("\\"));
+  return index > 0 ? config.slice(0, index) : undefined;
+}
+async function loadExplorerData(api, directory, rootOverride) {
   const sessions = await fetchSessions(api.client, directory);
   if (!sessions)
     return;
-  const activeIDs = await fetchActiveSessionIDs(api.client);
+  const [activeIDs, avSidecar] = await Promise.all([fetchActiveSessionIDs(api.client), Promise.resolve(loadAvSidecar(globalConfigDirOf(api)))]);
+  const rootID = rootOverride ?? currentSessionID(api.currentSessionID?.(), sessions);
+  const variantOf = await fetchVariantAttribution(api.client, rootID, directory, new Set(avSidecar.parents.keys()));
   return {
     sessions,
     activeIDs,
     activeKnown: activeIDs !== undefined,
     hidden: hiddenAgentIDs(api.state.config),
-    configAgents: configAgentIDs(api.state.config)
+    configAgents: configAgentIDs(api.state.config),
+    variantOf,
+    avParents: avSidecar.parents
   };
 }
 function explorerRows(tree, data) {
   const rows = [];
   const walk = (nodes, depth) => {
     for (const node of nodes) {
+      const variant = data.variantOf.get(node.session.id);
       rows.push({
         session: node.session,
         depth,
         running: data.activeIDs?.has(node.session.id) ?? false,
-        hidden: isHiddenAgent(node.session.agent, data.hidden, data.configAgents)
+        hidden: variant ? false : isHiddenAgent(node.session.agent, data.hidden, data.configAgents),
+        variant
       });
       walk(node.children, depth + 1);
     }
@@ -342,6 +407,9 @@ function explorerRows(tree, data) {
   walk(tree, 0);
   return rows;
 }
+function agentLabelOf(row) {
+  return row.variant?.alias ?? row.session.agent ?? "unknown";
+}
 function themeOf(api) {
   return api.theme.current;
 }
@@ -714,7 +782,7 @@ function SubagentTreeDialog(props) {
               _$setProp(_el$30, "flexShrink", 0);
               _$setProp(_el$30, "wrapMode", "none");
               _$setProp(_el$30, "overflow", "hidden");
-              _$insert(_el$31, () => truncate(row.session.agent ?? "agent", agentWidth));
+              _$insert(_el$31, () => truncate(agentLabelOf(row), agentWidth));
               _$insert(_el$28, _$createComponent(Show, {
                 get when() {
                   return row.hidden;
@@ -1039,7 +1107,7 @@ function showConfirm(api, props) {
 async function deleteOne(api, row) {
   const label = `${rowTitle(row)}${row.hidden ? " [hidden agent]" : ""}`;
   const summary = `${label}
-agent: ${row.session.agent ?? "unknown"}
+${row.variant ? `variant: ${row.variant.alias} (of ${row.variant.parent})` : `agent: ${row.session.agent ?? "unknown"}`}
 last activity: ${formatAge(row.session.updated ?? row.session.created)}
 
 Deleting a session permanently removes it, its messages, and its history. The parent session keeps the task result text; only the jump target is lost.`;
@@ -1118,9 +1186,19 @@ function showRootPicker(api, sessions, currentRoot) {
     }), () => done(undefined));
   });
 }
-async function showDetails(api, row) {
+async function showDetails(api, row, data) {
   const details = await fetchSessionDetails(api.client, row.session.id);
-  const lines = [`title: ${rowTitle(row)}`, `agent: ${row.session.agent ?? "unknown"}${row.hidden ? " (hidden/background)" : ""}`, `session: ${row.session.id}`, `status: ${row.running ? "running" : "idle"}`, `created: ${formatAge(row.session.created)}`, `last activity: ${formatAge(row.session.updated ?? row.session.created)}`];
+  const parentAgent = row.session.agent ?? "unknown";
+  const lines = [`title: ${rowTitle(row)}`, row.variant ? `variant: ${row.variant.alias} (of ${row.variant.parent})` : `agent: ${parentAgent}${row.hidden ? " (hidden/background)" : ""}`];
+  if (row.variant) {
+    const parentEntry = data.avParents.get(row.variant.parent);
+    if (parentEntry) {
+      lines.push(`base ${row.variant.parent}: ${parentEntry.disableBase ? "disabled (variants only)" : "enabled"}`);
+    }
+  } else if (data.avParents.has(parentAgent)) {
+    lines.push(`base ${parentAgent}: ${data.avParents.get(parentAgent)?.disableBase ? "disabled (variants only)" : "enabled"}`);
+  }
+  lines.push(`session: ${row.session.id}`, `status: ${row.running ? "running" : "idle"}`, `created: ${formatAge(row.session.created)}`, `last activity: ${formatAge(row.session.updated ?? row.session.created)}`);
   if (details) {
     lines.push(`messages: ${details.messageCount}`);
     if (details.model)
@@ -1566,7 +1644,7 @@ async function mainMenu(api) {
   }
   let rootOverride;
   while (true) {
-    const data = await loadExplorerData(api, directory);
+    const data = await loadExplorerData(api, directory, rootOverride);
     if (!data) {
       await showInfo(api, {
         title: "Subagent Explorer",
@@ -1614,7 +1692,7 @@ The host client does not expose session.list for this directory.`
       continue;
     }
     if (action.type === "details") {
-      await showDetails(api, action.row);
+      await showDetails(api, action.row, data);
       continue;
     }
     if (action.type === "cleanup") {

package/dist/wizard.d.ts

@@ -10,12 +10,16 @@
  * import mainMenu from here and drive it with their own TuiHostApi instance.
  */
 import type { TuiHostApi as TuiPluginApi } from "./tui-host.js";
-import { type SessionLite, type SessionTreeNode } from "./sessions.js";
+import { type SessionLite, type SessionTreeNode, type VariantAttribution } from "./sessions.js";
 export type ExplorerRow = {
     session: SessionLite;
     depth: number;
     running: boolean;
     hidden: boolean;
+    variant?: {
+        alias: string;
+        parent: string;
+    };
 };
 export type ExplorerData = {
     sessions: SessionLite[];
@@ -23,6 +27,12 @@ export type ExplorerData = {
     activeKnown: boolean;
     hidden: Set<string>;
     configAgents: Set<string>;
+    /** child session id -> creating AV variant (recent history only). */
+    variantOf: VariantAttribution;
+    /** AV sidecar parents (empty when agent-variants is not installed). */
+    avParents: Map<string, {
+        disableBase: boolean;
+    }>;
 };
 export type TreeAction = {
     type: "delete";
@@ -41,8 +51,9 @@ export type TreeAction = {
 } | {
     type: "exit";
 };
-export declare function loadExplorerData(api: TuiPluginApi, directory: string): Promise<ExplorerData | undefined>;
+export declare function loadExplorerData(api: TuiPluginApi, directory: string, rootOverride?: string): Promise<ExplorerData | undefined>;
 export declare function explorerRows(tree: SessionTreeNode[], data: ExplorerData): ExplorerRow[];
+export declare function agentLabelOf(row: Pick<ExplorerRow, "session" | "variant">): string;
 /**
  * Pure dialog-height budget (same math as Config Studio's computeDialogRows):
  * OpenCode's dialog backdrop anchors at terminalHeight / 4, so a panel

package/dist/wizard.js

@@ -13,6 +13,7 @@ import { useTerminalDimensions } from "@opentui/solid";
 import { createEffect, createMemo, createSignal, For, onCleanup, Show } from "solid-js";
 
 // src/sessions.ts
+import { existsSync, readFileSync } from "fs";
 var CALL_TIMEOUT_MS = 5000;
 var BUILTIN_AGENTS = new Set(["build", "plan"]);
 function withTimeout(fn, ms = CALL_TIMEOUT_MS) {
@@ -74,23 +75,20 @@ async function fetchActiveSessionIDs(client) {
   if (!namespace)
     return;
   if (typeof namespace.active === "function") {
-    const active = unwrap(await withTimeout(() => namespace.active()));
-    if (active && typeof active === "object") {
-      const ids = new Set;
-      for (const [id, value] of Object.entries(active)) {
-        if (value)
-          ids.add(id);
-      }
-      return ids;
+    const result = await withTimeout(() => namespace.active());
+    const data = result && typeof result === "object" ? result.data : undefined;
+    if (data && typeof data === "object" && !Array.isArray(data)) {
+      return new Set(Object.keys(data));
     }
   }
   if (typeof namespace.status === "function") {
-    const status = unwrap(await withTimeout(() => namespace.status()));
-    if (status && typeof status === "object") {
+    const result = await withTimeout(() => namespace.status());
+    const data = result && typeof result === "object" ? result.data : undefined;
+    if (data && typeof data === "object" && !Array.isArray(data)) {
       const ids = new Set;
-      for (const [id, value] of Object.entries(status)) {
-        const state = value?.status ?? value;
-        if (state === "busy" || state === "retry")
+      for (const [id, value] of Object.entries(data)) {
+        const type = value && typeof value === "object" ? value.type ?? value.status : value;
+        if (type === undefined || type === "busy" || type === "retry")
           ids.add(id);
       }
       return ids;
@@ -98,6 +96,60 @@ async function fetchActiveSessionIDs(client) {
   }
   return;
 }
+function loadAvSidecar(globalConfigDir) {
+  const parents = new Map;
+  if (!globalConfigDir)
+    return { parents };
+  try {
+    const path = `${globalConfigDir.replace(/[\\/]+$/, "")}/agent-variants.jsonc`;
+    if (!existsSync(path))
+      return { parents };
+    const raw = readFileSync(path, "utf8");
+    const json = JSON.parse(stripJsoncComments(raw));
+    for (const [parent, entry] of Object.entries(json.agents ?? {})) {
+      if (!entry || typeof entry !== "object")
+        continue;
+      parents.set(parent, { disableBase: entry.disable_base === true && entry.disable !== true });
+    }
+  } catch {}
+  return { parents };
+}
+function stripJsoncComments(text) {
+  return text.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|[^:"'\\])\/\/.*$/gm, "$1").replace(/,(\s*[}\]])/g, "$1");
+}
+async function fetchVariantAttribution(client, parentSessionID, directory, avParents) {
+  const map = new Map;
+  if (avParents.size === 0 || !parentSessionID)
+    return map;
+  const namespace = client?.session;
+  if (!namespace || typeof namespace.messages !== "function")
+    return map;
+  const messages = await withTimeout(() => {
+    const flat = namespace.messages({ sessionID: parentSessionID, directory, limit: 50 });
+    return flat instanceof Promise ? flat : namespace.messages({ path: { id: parentSessionID }, query: { directory, limit: 50 } });
+  });
+  const list = Array.isArray(messages) ? messages : messages && typeof messages === "object" ? messages.data ?? messages : undefined;
+  if (!Array.isArray(list))
+    return map;
+  for (const message of list) {
+    for (const part of message.parts ?? []) {
+      if (part?.type !== "tool" || part.tool !== "task")
+        continue;
+      const metadata = part.state?.metadata;
+      const child = metadata?.sessionId;
+      const variantMeta = metadata?.agentVariants;
+      const alias = variantMeta?.alias;
+      const routedAgent = variantMeta?.routedAgent;
+      if (typeof child === "string" && typeof alias === "string" && !map.has(child)) {
+        map.set(child, {
+          alias,
+          parent: typeof routedAgent === "string" ? routedAgent : alias.replace(/-[a-z0-9-]+$/, "")
+        });
+      }
+    }
+  }
+  return map;
+}
 function buildSessionTree(sessions, rootID) {
   const byParent = new Map;
   for (const session of sessions) {
@@ -260,28 +312,41 @@ function parentCandidates(sessions) {
 }
 
 // src/wizard.tsx
-async function loadExplorerData(api, directory) {
+function globalConfigDirOf(api) {
+  const config = api.state.path?.config;
+  if (!config)
+    return;
+  const index = Math.max(config.lastIndexOf("/"), config.lastIndexOf("\\"));
+  return index > 0 ? config.slice(0, index) : undefined;
+}
+async function loadExplorerData(api, directory, rootOverride) {
   const sessions = await fetchSessions(api.client, directory);
   if (!sessions)
     return;
-  const activeIDs = await fetchActiveSessionIDs(api.client);
+  const [activeIDs, avSidecar] = await Promise.all([fetchActiveSessionIDs(api.client), Promise.resolve(loadAvSidecar(globalConfigDirOf(api)))]);
+  const rootID = rootOverride ?? currentSessionID(api.currentSessionID?.(), sessions);
+  const variantOf = await fetchVariantAttribution(api.client, rootID, directory, new Set(avSidecar.parents.keys()));
   return {
     sessions,
     activeIDs,
     activeKnown: activeIDs !== undefined,
     hidden: hiddenAgentIDs(api.state.config),
-    configAgents: configAgentIDs(api.state.config)
+    configAgents: configAgentIDs(api.state.config),
+    variantOf,
+    avParents: avSidecar.parents
   };
 }
 function explorerRows(tree, data) {
   const rows = [];
   const walk = (nodes, depth) => {
     for (const node of nodes) {
+      const variant = data.variantOf.get(node.session.id);
       rows.push({
         session: node.session,
         depth,
         running: data.activeIDs?.has(node.session.id) ?? false,
-        hidden: isHiddenAgent(node.session.agent, data.hidden, data.configAgents)
+        hidden: variant ? false : isHiddenAgent(node.session.agent, data.hidden, data.configAgents),
+        variant
       });
       walk(node.children, depth + 1);
     }
@@ -289,6 +354,9 @@ function explorerRows(tree, data) {
   walk(tree, 0);
   return rows;
 }
+function agentLabelOf(row) {
+  return row.variant?.alias ?? row.session.agent ?? "unknown";
+}
 function themeOf(api) {
   return api.theme.current;
 }
@@ -661,7 +729,7 @@ function SubagentTreeDialog(props) {
               _$setProp(_el$30, "flexShrink", 0);
               _$setProp(_el$30, "wrapMode", "none");
               _$setProp(_el$30, "overflow", "hidden");
-              _$insert(_el$31, () => truncate(row.session.agent ?? "agent", agentWidth));
+              _$insert(_el$31, () => truncate(agentLabelOf(row), agentWidth));
               _$insert(_el$28, _$createComponent(Show, {
                 get when() {
                   return row.hidden;
@@ -986,7 +1054,7 @@ function showConfirm(api, props) {
 async function deleteOne(api, row) {
   const label = `${rowTitle(row)}${row.hidden ? " [hidden agent]" : ""}`;
   const summary = `${label}
-agent: ${row.session.agent ?? "unknown"}
+${row.variant ? `variant: ${row.variant.alias} (of ${row.variant.parent})` : `agent: ${row.session.agent ?? "unknown"}`}
 last activity: ${formatAge(row.session.updated ?? row.session.created)}
 
 Deleting a session permanently removes it, its messages, and its history. The parent session keeps the task result text; only the jump target is lost.`;
@@ -1065,9 +1133,19 @@ function showRootPicker(api, sessions, currentRoot) {
     }), () => done(undefined));
   });
 }
-async function showDetails(api, row) {
+async function showDetails(api, row, data) {
   const details = await fetchSessionDetails(api.client, row.session.id);
-  const lines = [`title: ${rowTitle(row)}`, `agent: ${row.session.agent ?? "unknown"}${row.hidden ? " (hidden/background)" : ""}`, `session: ${row.session.id}`, `status: ${row.running ? "running" : "idle"}`, `created: ${formatAge(row.session.created)}`, `last activity: ${formatAge(row.session.updated ?? row.session.created)}`];
+  const parentAgent = row.session.agent ?? "unknown";
+  const lines = [`title: ${rowTitle(row)}`, row.variant ? `variant: ${row.variant.alias} (of ${row.variant.parent})` : `agent: ${parentAgent}${row.hidden ? " (hidden/background)" : ""}`];
+  if (row.variant) {
+    const parentEntry = data.avParents.get(row.variant.parent);
+    if (parentEntry) {
+      lines.push(`base ${row.variant.parent}: ${parentEntry.disableBase ? "disabled (variants only)" : "enabled"}`);
+    }
+  } else if (data.avParents.has(parentAgent)) {
+    lines.push(`base ${parentAgent}: ${data.avParents.get(parentAgent)?.disableBase ? "disabled (variants only)" : "enabled"}`);
+  }
+  lines.push(`session: ${row.session.id}`, `status: ${row.running ? "running" : "idle"}`, `created: ${formatAge(row.session.created)}`, `last activity: ${formatAge(row.session.updated ?? row.session.created)}`);
   if (details) {
     lines.push(`messages: ${details.messageCount}`);
     if (details.model)
@@ -1513,7 +1591,7 @@ async function mainMenu(api) {
   }
   let rootOverride;
   while (true) {
-    const data = await loadExplorerData(api, directory);
+    const data = await loadExplorerData(api, directory, rootOverride);
     if (!data) {
       await showInfo(api, {
         title: "Subagent Explorer",
@@ -1561,7 +1639,7 @@ The host client does not expose session.list for this directory.`
       continue;
     }
     if (action.type === "details") {
-      await showDetails(api, action.row);
+      await showDetails(api, action.row, data);
       continue;
     }
     if (action.type === "cleanup") {
@@ -1572,6 +1650,7 @@ The host client does not expose session.list for this directory.`
 }
 export {
   SubagentTreeDialog,
+  agentLabelOf,
   computeDialogRows,
   explorerRows,
   loadExplorerData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirrowel/opencode-subagent-explorer",
-  "version": "0.1.0-dev.1",
+  "version": "0.2.0-dev.1",
   "type": "module",
   "description": "OpenCode plugin for exploring and cleaning up subagent sessions of the current session",
   "license": "MIT",

package/src/sessions.ts

@@ -5,6 +5,7 @@
  * timeout-bounded, and envelope-unwrapping ({data} vs raw) so one code path
  * serves the v1 and v2 hosts and the studio embed alike.
  */
+import { existsSync, readFileSync } from "node:fs"
 
 export type SessionLite = {
   id: string
@@ -99,26 +100,34 @@ export async function fetchSessions(client: unknown, directory: string): Promise
 /** Running session ids via `session.active()` with the `session.status()`
  * fallback (busy/retry = running). `undefined` when neither exists or both
  * fail — callers must treat that as "unknown", never "idle". */
+/**
+ * Running session ids via `session.active()` with the `session.status()`
+ * fallback (busy/retry/unknown-type = running). Mirrors the Config Studio
+ * reload coordinator's proven probing: PRESENCE in the active map means
+ * running (values may be falsy and must not be filtered), the status map
+ * keys carry `.type` (not `.status`), and all calls stay attached to the
+ * namespace object (SDK methods dereference `this`). `undefined` when
+ * neither exists or both fail - callers must treat that as "unknown",
+ * never "idle".
+ */
 export async function fetchActiveSessionIDs(client: unknown): Promise<Set<string> | undefined> {
   const namespace = (client as { session?: Record<string, any> } | undefined)?.session
   if (!namespace) return undefined
   if (typeof namespace.active === "function") {
-    const active = unwrap(await withTimeout(() => namespace.active()))
-    if (active && typeof active === "object") {
-      const ids = new Set<string>()
-      for (const [id, value] of Object.entries(active as Record<string, unknown>)) {
-        if (value) ids.add(id)
-      }
-      return ids
+    const result = await withTimeout(() => namespace.active())
+    const data = result && typeof result === "object" ? (result as { data?: unknown }).data : undefined
+    if (data && typeof data === "object" && !Array.isArray(data)) {
+      return new Set(Object.keys(data as Record<string, unknown>))
     }
   }
   if (typeof namespace.status === "function") {
-    const status = unwrap(await withTimeout(() => namespace.status()))
-    if (status && typeof status === "object") {
+    const result = await withTimeout(() => namespace.status())
+    const data = result && typeof result === "object" ? (result as { data?: unknown }).data : undefined
+    if (data && typeof data === "object" && !Array.isArray(data)) {
       const ids = new Set<string>()
-      for (const [id, value] of Object.entries(status as Record<string, any>)) {
-        const state = value?.status ?? value
-        if (state === "busy" || state === "retry") ids.add(id)
+      for (const [id, value] of Object.entries(data as Record<string, any>)) {
+        const type = value && typeof value === "object" ? (value.type ?? value.status) : value
+        if (type === undefined || type === "busy" || type === "retry") ids.add(id)
       }
       return ids
     }
@@ -126,6 +135,85 @@ export async function fetchActiveSessionIDs(client: unknown): Promise<Set<string
   return undefined
 }
 
+/** Minimal agent-variants sidecar view: which parents exist and which have
+ * the base disabled. Absent file / parse errors -> empty (fail-soft). */
+export type AvSidecar = {
+  parents: Map<string, { disableBase: boolean }>
+}
+
+export function loadAvSidecar(globalConfigDir: string | undefined): AvSidecar {
+  const parents = new Map<string, { disableBase: boolean }>()
+  if (!globalConfigDir) return { parents }
+  try {
+    const path = `${globalConfigDir.replace(/[\\/]+$/, "")}/agent-variants.jsonc`
+    if (!existsSync(path)) return { parents }
+    const raw = readFileSync(path, "utf8")
+    const json = JSON.parse(stripJsoncComments(raw)) as {
+      agents?: Record<string, { disable_base?: boolean; disable?: boolean }>
+    }
+    for (const [parent, entry] of Object.entries(json.agents ?? {})) {
+      if (!entry || typeof entry !== "object") continue
+      parents.set(parent, { disableBase: entry.disable_base === true && entry.disable !== true })
+    }
+  } catch {
+    // Not our file to complain about - AV may simply not be installed.
+  }
+  return { parents }
+}
+
+function stripJsoncComments(text: string): string {
+  // Block comments, line comments, and trailing commas before } or ].
+  return text
+    .replace(/\/\*[\s\S]*?\*\//g, "")
+    .replace(/(^|[^:"'\\])\/\/.*$/gm, "$1")
+    .replace(/,(\s*[}\]])/g, "$1")
+}
+
+/** child session id -> the AV variant that created it (from the parent's
+ * task-part metadata). Windowed like AV's own correlation: only recent
+ * history is scanned, deep/old tasks simply stay unattributed. */
+export type VariantAttribution = Map<string, { alias: string; parent: string }>
+
+export async function fetchVariantAttribution(
+  client: unknown,
+  parentSessionID: string | undefined,
+  directory: string | undefined,
+  avParents: Set<string>,
+): Promise<VariantAttribution> {
+  const map: VariantAttribution = new Map()
+  if (avParents.size === 0 || !parentSessionID) return map
+  const namespace = (client as { session?: Record<string, any> } | undefined)?.session
+  if (!namespace || typeof namespace.messages !== "function") return map
+  const messages = await withTimeout(() => {
+    // Try the flat (v2-gen) shape first, then the legacy {query} wrapper.
+    const flat = namespace.messages({ sessionID: parentSessionID, directory, limit: 50 })
+    return flat instanceof Promise ? flat : namespace.messages({ path: { id: parentSessionID }, query: { directory, limit: 50 } })
+  })
+  const list = Array.isArray(messages)
+    ? messages
+    : messages && typeof messages === "object"
+      ? ((messages as { data?: unknown }).data ?? messages)
+      : undefined
+  if (!Array.isArray(list)) return map
+  for (const message of list as Array<{ parts?: Array<Record<string, any>> }>) {
+    for (const part of message.parts ?? []) {
+      if (part?.type !== "tool" || part.tool !== "task") continue
+      const metadata = part.state?.metadata as Record<string, any> | undefined
+      const child = metadata?.sessionId
+      const variantMeta = metadata?.agentVariants as Record<string, unknown> | undefined
+      const alias = variantMeta?.alias
+      const routedAgent = variantMeta?.routedAgent
+      if (typeof child === "string" && typeof alias === "string" && !map.has(child)) {
+        map.set(child, {
+          alias,
+          parent: typeof routedAgent === "string" ? routedAgent : alias.replace(/-[a-z0-9-]+$/, ""),
+        })
+      }
+    }
+  }
+  return map
+}
+
 /** Builds the recursive subagent tree for `rootID`. Unknown-parent sessions
  * are ignored (not part of this session's tree). Guarded against cycles. */
 export function buildSessionTree(sessions: SessionLite[], rootID: string): SessionTreeNode[] {

package/src/wizard.tsx

@@ -24,13 +24,16 @@ import {
   fetchActiveSessionIDs,
   fetchSessionDetails,
   fetchSessions,
+  fetchVariantAttribution,
   formatAge,
   hiddenAgentIDs,
   isHiddenAgent,
+  loadAvSidecar,
   parentCandidates,
   type CleanupPlan,
   type SessionLite,
   type SessionTreeNode,
+  type VariantAttribution,
 } from "./sessions.js"
 
 export type ExplorerRow = {
@@ -38,6 +41,7 @@ export type ExplorerRow = {
   depth: number
   running: boolean
   hidden: boolean
+  variant?: { alias: string; parent: string }
 }
 
 export type ExplorerData = {
@@ -46,6 +50,10 @@ export type ExplorerData = {
   activeKnown: boolean
   hidden: Set<string>
   configAgents: Set<string>
+  /** child session id -> creating AV variant (recent history only). */
+  variantOf: VariantAttribution
+  /** AV sidecar parents (empty when agent-variants is not installed). */
+  avParents: Map<string, { disableBase: boolean }>
 }
 
 export type TreeAction =
@@ -57,16 +65,30 @@ export type TreeAction =
   | { type: "size" }
   | { type: "exit" }
 
-export async function loadExplorerData(api: TuiPluginApi, directory: string): Promise<ExplorerData | undefined> {
+function globalConfigDirOf(api: TuiPluginApi): string | undefined {
+  const config = api.state.path?.config
+  if (!config) return undefined
+  const index = Math.max(config.lastIndexOf("/"), config.lastIndexOf("\\"))
+  return index > 0 ? config.slice(0, index) : undefined
+}
+
+export async function loadExplorerData(api: TuiPluginApi, directory: string, rootOverride?: string): Promise<ExplorerData | undefined> {
   const sessions = await fetchSessions(api.client, directory)
   if (!sessions) return undefined
-  const activeIDs = await fetchActiveSessionIDs(api.client)
+  const [activeIDs, avSidecar] = await Promise.all([
+    fetchActiveSessionIDs(api.client),
+    Promise.resolve(loadAvSidecar(globalConfigDirOf(api))),
+  ])
+  const rootID = rootOverride ?? currentSessionID(api.currentSessionID?.(), sessions)
+  const variantOf = await fetchVariantAttribution(api.client, rootID, directory, new Set(avSidecar.parents.keys()))
   return {
     sessions,
     activeIDs,
     activeKnown: activeIDs !== undefined,
     hidden: hiddenAgentIDs(api.state.config),
     configAgents: configAgentIDs(api.state.config),
+    variantOf,
+    avParents: avSidecar.parents,
   }
 }
 
@@ -74,11 +96,16 @@ export function explorerRows(tree: SessionTreeNode[], data: ExplorerData): Explo
   const rows: ExplorerRow[] = []
   const walk = (nodes: SessionTreeNode[], depth: number) => {
     for (const node of nodes) {
+      const variant = data.variantOf.get(node.session.id)
       rows.push({
         session: node.session,
         depth,
         running: data.activeIDs?.has(node.session.id) ?? false,
-        hidden: isHiddenAgent(node.session.agent, data.hidden, data.configAgents),
+        // Variant children are normal sessions re-attributed to their alias;
+        // only the base agent itself (or non-AV hidden agents) carries the
+        // hidden badge.
+        hidden: variant ? false : isHiddenAgent(node.session.agent, data.hidden, data.configAgents),
+        variant,
       })
       walk(node.children, depth + 1)
     }
@@ -87,6 +114,10 @@ export function explorerRows(tree: SessionTreeNode[], data: ExplorerData): Explo
   return rows
 }
 
+export function agentLabelOf(row: Pick<ExplorerRow, "session" | "variant">): string {
+  return row.variant?.alias ?? row.session.agent ?? "unknown"
+}
+
 function themeOf(api: TuiPluginApi) {
   return api.theme.current
 }
@@ -327,7 +358,7 @@ export function SubagentTreeDialog(props: {
                     onMouseUp={() => props.onDone({ type: "delete", row })}
                   >
                     <text fg={titleFg()} flexShrink={0}>{row.running ? "▶" : "·"}</text>
-                    <text width={agentWidth} flexShrink={0} fg={active() ? theme().background : theme().textMuted} wrapMode="none" overflow="hidden"><b>{truncate(row.session.agent ?? "agent", agentWidth)}</b></text>
+                    <text width={agentWidth} flexShrink={0} fg={active() ? theme().background : theme().textMuted} wrapMode="none" overflow="hidden"><b>{truncate(agentLabelOf(row), agentWidth)}</b></text>
                     <Show when={row.hidden}>
                       <text width={badgeWidth} flexShrink={0} fg={badgeFg()} wrapMode="none" overflow="hidden">{"[hidden]"}</text>
                     </Show>
@@ -480,7 +511,7 @@ function showConfirm(api: TuiPluginApi, props: { title: string; message: string
 
 async function deleteOne(api: TuiPluginApi, row: ExplorerRow): Promise<boolean> {
   const label = `${rowTitle(row)}${row.hidden ? " [hidden agent]" : ""}`
-  const summary = `${label}\nagent: ${row.session.agent ?? "unknown"}\nlast activity: ${formatAge(row.session.updated ?? row.session.created)}\n\nDeleting a session permanently removes it, its messages, and its history. The parent session keeps the task result text; only the jump target is lost.`
+  const summary = `${label}\n${row.variant ? `variant: ${row.variant.alias} (of ${row.variant.parent})` : `agent: ${row.session.agent ?? "unknown"}`}\nlast activity: ${formatAge(row.session.updated ?? row.session.created)}\n\nDeleting a session permanently removes it, its messages, and its history. The parent session keeps the task result text; only the jump target is lost.`
   const confirmed = row.running
     ? await showDangerConfirm(api, {
         title: "Delete RUNNING subagent session?",
@@ -556,16 +587,29 @@ function showRootPicker(api: TuiPluginApi, sessions: SessionLite[], currentRoot:
   })
 }
 
-async function showDetails(api: TuiPluginApi, row: ExplorerRow): Promise<void> {
+async function showDetails(api: TuiPluginApi, row: ExplorerRow, data: ExplorerData): Promise<void> {
   const details = await fetchSessionDetails(api.client, row.session.id)
+  const parentAgent = row.session.agent ?? "unknown"
   const lines = [
     `title: ${rowTitle(row)}`,
-    `agent: ${row.session.agent ?? "unknown"}${row.hidden ? " (hidden/background)" : ""}`,
+    row.variant
+      ? `variant: ${row.variant.alias} (of ${row.variant.parent})`
+      : `agent: ${parentAgent}${row.hidden ? " (hidden/background)" : ""}`,
+  ]
+  if (row.variant) {
+    const parentEntry = data.avParents.get(row.variant.parent)
+    if (parentEntry) {
+      lines.push(`base ${row.variant.parent}: ${parentEntry.disableBase ? "disabled (variants only)" : "enabled"}`)
+    }
+  } else if (data.avParents.has(parentAgent)) {
+    lines.push(`base ${parentAgent}: ${data.avParents.get(parentAgent)?.disableBase ? "disabled (variants only)" : "enabled"}`)
+  }
+  lines.push(
     `session: ${row.session.id}`,
     `status: ${row.running ? "running" : "idle"}`,
     `created: ${formatAge(row.session.created)}`,
     `last activity: ${formatAge(row.session.updated ?? row.session.created)}`,
-  ]
+  )
   if (details) {
     lines.push(`messages: ${details.messageCount}`)
     if (details.model) lines.push(`last model: ${details.model}`)
@@ -793,7 +837,7 @@ export async function mainMenu(api: TuiPluginApi): Promise<void> {
   }
   let rootOverride: string | undefined
   while (true) {
-    const data = await loadExplorerData(api, directory)
+    const data = await loadExplorerData(api, directory, rootOverride)
     if (!data) {
       await showInfo(api, {
         title: "Subagent Explorer",
@@ -833,7 +877,7 @@ export async function mainMenu(api: TuiPluginApi): Promise<void> {
       continue
     }
     if (action.type === "details") {
-      await showDetails(api, action.row)
+      await showDetails(api, action.row, data)
       continue
     }
     if (action.type === "cleanup") {