@evandu/super-pi 0.1.2 → 0.1.4

package/dist/server/application/catalog-service.d.ts

@@ -1,14 +1,34 @@
 import type { AgentRuntime } from "../runtime.js";
 import type { AgentCatalog, ModelCatalog, ModelSelection } from "../types.js";
 import type { EventBroadcaster } from "../server-context.js";
+import type { Store } from "../store.js";
 /**
  * Service managing model catalogs and agent definitions (primary and subagents).
  */
 export declare class CatalogService {
     private readonly runtime;
     private readonly broadcaster;
-    private readonly agentsDir;
-    constructor(runtime: AgentRuntime, broadcaster: EventBroadcaster, agentsDir: string);
+    private readonly store?;
+    private readonly rootDir?;
+    private readonly onDirsChanged?;
+    private agentDirs;
+    constructor(runtime: AgentRuntime, broadcaster: EventBroadcaster, agentsDir: string | readonly string[], store?: Store | undefined, rootDir?: string | undefined, onDirsChanged?: ((dirs: string[]) => void) | undefined);
+    /**
+     * Returns current active agent discovery directories.
+     */
+    getAgentDirs(): string[];
+    /**
+     * Updates agent discovery directories and notifies subscribers.
+     */
+    setAgentDirs(dirs: string[]): void;
+    /**
+     * Updates user-configured custom agent directories in store and triggers rescan.
+     */
+    setCustomDirs(dirs: string[]): Promise<void>;
+    /**
+     * Immediately re-reads agent definitions from disk and broadcasts catalogs.
+     */
+    rescan(): Promise<void>;
     /**
      * Fetches the model catalog from runtime, optionally tailored to a selected model.
      */

package/dist/server/application/catalog-service.js

@@ -1,4 +1,4 @@
-import { readAgents } from "../agents.js";
+import { readAgents, resolveAgentDirectories } from "../agents.js";
 function summarize(agent) {
     const { prompt, toolFlags, ...summary } = agent;
     const toolSummary = toolFlags.includes("--no-tools")
@@ -16,11 +16,54 @@ function summarize(agent) {
 export class CatalogService {
     runtime;
     broadcaster;
-    agentsDir;
-    constructor(runtime, broadcaster, agentsDir) {
+    store;
+    rootDir;
+    onDirsChanged;
+    agentDirs;
+    constructor(runtime, broadcaster, agentsDir, store, rootDir, onDirsChanged) {
         this.runtime = runtime;
         this.broadcaster = broadcaster;
-        this.agentsDir = agentsDir;
+        this.store = store;
+        this.rootDir = rootDir;
+        this.onDirsChanged = onDirsChanged;
+        this.agentDirs = Array.isArray(agentsDir) ? [...agentsDir] : [agentsDir];
+    }
+    /**
+     * Returns current active agent discovery directories.
+     */
+    getAgentDirs() {
+        return [...this.agentDirs];
+    }
+    /**
+     * Updates agent discovery directories and notifies subscribers.
+     */
+    setAgentDirs(dirs) {
+        this.agentDirs = [...dirs];
+        this.onDirsChanged?.(this.agentDirs);
+    }
+    /**
+     * Updates user-configured custom agent directories in store and triggers rescan.
+     */
+    async setCustomDirs(dirs) {
+        if (this.store) {
+            await this.store.setCustomAgentDirs(dirs);
+            this.broadcaster.broadcastState();
+        }
+        const resolved = resolveAgentDirectories({
+            customDirs: dirs,
+            rootDir: this.rootDir,
+        });
+        this.setAgentDirs(resolved);
+        await this.rescan();
+    }
+    /**
+     * Immediately re-reads agent definitions from disk and broadcasts catalogs.
+     */
+    async rescan() {
+        await Promise.all([
+            this.broadcastAgents(),
+            this.broadcastSubagents(),
+        ]);
     }
     /**
      * Fetches the model catalog from runtime, optionally tailored to a selected model.
@@ -39,23 +82,32 @@ export class CatalogService {
      * Reads one catalog filtered by mode at source.
      */
     async readAgentCatalog(mode) {
+        const primaryDir = this.agentDirs[0] ?? "";
         try {
-            const scan = await readAgents(this.agentsDir, { mode });
+            const scan = await readAgents(this.agentDirs, { mode });
             for (const problem of scan.problems) {
-                console.warn(`Super Pi: ${this.agentsDir}/${problem.file} is not a usable agent - ${problem.message}`);
+                console.warn(`Super Pi: ${problem.file} is not a usable agent - ${problem.message}`);
             }
             const agents = scan.agents.filter((agent) => !agent.hidden).map(summarize);
             if (!agents.length) {
-                console.warn(`Super Pi: no ${mode} agents found in ${this.agentsDir} (${scan.problems.length} file(s) rejected).`);
+                console.warn(`Super Pi: no ${mode} agents found in [${this.agentDirs.join(", ")}] (${scan.problems.length} file(s) rejected).`);
             }
-            return { source: "directory", agents, problems: scan.problems, directory: this.agentsDir, fetchedAt: new Date().toISOString() };
+            return {
+                source: "directory",
+                agents,
+                problems: scan.problems,
+                directory: primaryDir,
+                directories: [...this.agentDirs],
+                fetchedAt: new Date().toISOString(),
+            };
         }
         catch (error) {
             return {
                 source: "unavailable",
                 agents: [],
                 problems: [],
-                directory: this.agentsDir,
+                directory: primaryDir,
+                directories: [...this.agentDirs],
                 fetchedAt: new Date().toISOString(),
                 error: error instanceof Error ? error.message : "unknown error",
             };

package/dist/server/application/conversation-service.d.ts

@@ -27,8 +27,9 @@ export declare class ConversationService {
     private readonly catalogService;
     private readonly runService;
     private readonly extensionUiService;
-    private readonly agentsDir;
-    constructor(store: Store, runtime: AgentRuntime, subagents: SubagentRunRecorder, broadcaster: EventBroadcaster, catalogService: CatalogService, runService: RunService, extensionUiService: ExtensionUiService, agentsDir: string);
+    private agentsDir;
+    constructor(store: Store, runtime: AgentRuntime, subagents: SubagentRunRecorder, broadcaster: EventBroadcaster, catalogService: CatalogService, runService: RunService, extensionUiService: ExtensionUiService, agentsDir: string | string[]);
+    setAgentsDir(dir: string | string[]): void;
     /**
      * Creates a new conversation in a workspace.
      */

package/dist/server/application/conversation-service.js

@@ -22,6 +22,9 @@ export class ConversationService {
         this.extensionUiService = extensionUiService;
         this.agentsDir = agentsDir;
     }
+    setAgentsDir(dir) {
+        this.agentsDir = dir;
+    }
     /**
      * Creates a new conversation in a workspace.
      */
@@ -101,7 +104,8 @@ export class ConversationService {
         }
         const agent = await this.runtime.agentFor?.({ id: conversation.id, agentId });
         if (!agent) {
-            throw new Error(`Agent ${JSON.stringify(agentId)} 不存在或不是可用的 primary agent（目录：${this.agentsDir}）`);
+            const dirsLabel = Array.isArray(this.agentsDir) ? this.agentsDir.join(", ") : this.agentsDir;
+            throw new Error(`Agent ${JSON.stringify(agentId)} 不存在或不是可用的 primary agent（目录：${dirsLabel}）`);
         }
         if (agent.model) {
             const catalog = await this.runtime.catalog();

package/dist/server/application/run-service.d.ts

@@ -43,10 +43,11 @@ export declare class RunService {
     private readonly subagents;
     private readonly broadcaster;
     private readonly extensionUiService;
-    private readonly agentsDir;
+    private agentsDir;
     private readonly workflows;
     private readonly activeRuns;
-    constructor(store: Store, runtime: AgentRuntime, subagents: SubagentRunRecorder, broadcaster: EventBroadcaster, extensionUiService: ExtensionUiService, agentsDir: string, workflows: WorkflowEngine);
+    constructor(store: Store, runtime: AgentRuntime, subagents: SubagentRunRecorder, broadcaster: EventBroadcaster, extensionUiService: ExtensionUiService, agentsDir: string | string[], workflows: WorkflowEngine);
+    setAgentsDir(dir: string | string[]): void;
     /**
      * Resolves the conversation and workspace synchronously for a run.
      */

package/dist/server/application/run-service.js

@@ -25,6 +25,9 @@ export class RunService {
         this.agentsDir = agentsDir;
         this.workflows = workflows;
     }
+    setAgentsDir(dir) {
+        this.agentsDir = dir;
+    }
     /**
      * Resolves the conversation and workspace synchronously for a run.
      */

package/dist/server/application/workspace-service.d.ts

@@ -23,8 +23,9 @@ export declare class WorkspaceService {
     private readonly runService;
     private readonly extensionUiService;
     private readonly uploadsDir;
-    private readonly agentsDir;
-    constructor(store: Store, runtime: AgentRuntime, broadcaster: EventBroadcaster, catalogService: CatalogService, runService: RunService, extensionUiService: ExtensionUiService, uploadsDir: string, agentsDir: string);
+    private agentsDir;
+    constructor(store: Store, runtime: AgentRuntime, broadcaster: EventBroadcaster, catalogService: CatalogService, runService: RunService, extensionUiService: ExtensionUiService, uploadsDir: string, agentsDir: string | string[]);
+    setAgentsDir(dir: string | string[]): void;
     /**
      * Creates a new workspace.
      */

package/dist/server/application/workspace-service.js

@@ -21,6 +21,9 @@ export class WorkspaceService {
         this.uploadsDir = uploadsDir;
         this.agentsDir = agentsDir;
     }
+    setAgentsDir(dir) {
+        this.agentsDir = dir;
+    }
     /**
      * Creates a new workspace.
      */
@@ -91,7 +94,8 @@ export class WorkspaceService {
                 }
                 const agent = await this.runtime.agentFor({ id: workspaceId, agentId: settings.agentId });
                 if (!agent) {
-                    throw new Error(`Agent ${JSON.stringify(settings.agentId)} 不存在或不是可用的 primary agent（目录：${this.agentsDir}）`);
+                    const dirsLabel = Array.isArray(this.agentsDir) ? this.agentsDir.join(", ") : this.agentsDir;
+                    throw new Error(`Agent ${JSON.stringify(settings.agentId)} 不存在或不是可用的 primary agent（目录：${dirsLabel}）`);
                 }
                 agentToStore = agent.id;
             }

package/dist/server/command-handler.js

@@ -136,6 +136,14 @@ export class CommandHandler {
             await this.catalogService.broadcastSubagents();
             return;
         }
+        if (command.type === "agents.setCustomDirs") {
+            await this.catalogService.setCustomDirs(command.dirs);
+            return;
+        }
+        if (command.type === "agents.rescan") {
+            await this.catalogService.rescan();
+            return;
+        }
         throw new Error(`未知的命令类型：${JSON.stringify(command.type ?? null)}`);
     }
 }

package/dist/server/http-server.js

@@ -4,6 +4,7 @@ import { createServer } from "node:http";
 import { basename, dirname, extname, join, relative, resolve } from "node:path";
 import { describe as describeFilesError, fileMeta, listDirectory, MAX_FILE_BYTES, readWorkspaceFile, resolveInsideRoot, searchByName, toRelative, writeWorkspaceFile, } from "./files.js";
 import { findUploadFile, MAX_UPLOAD_BODY_BYTES, saveUpload } from "./upload.js";
+import { checkDiskVersion } from "./version.js";
 const MIME_TYPES = {
     ".css": "text/css; charset=utf-8",
     ".html": "text/html; charset=utf-8",
@@ -51,8 +52,9 @@ export function createHttpServer(options) {
             return;
         }
         if (url.pathname === "/api/health") {
+            const version = checkDiskVersion(rootDir);
             response.writeHead(200, { "content-type": "application/json; charset=utf-8" })
-                .end(JSON.stringify({ status: "ok", service: "super-pi" }));
+                .end(JSON.stringify({ status: "ok", service: "super-pi", ...version }));
             return;
         }
         if (url.pathname === "/api/subagent/dispatch") {

package/dist/server/index.js

@@ -4,6 +4,7 @@ import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 import { defaultStorePath, Store } from "./store.js";
 import { PiRpcRuntime, WelcomeRuntime } from "./runtime.js";
+import { resolveAgentDirectories } from "./agents.js";
 import { releaseAllCapabilities } from "./capability.js";
 import { SubagentSupervisor } from "./subagents.js";
 import { SubagentRunRecorder } from "./subagent-runs.js";
@@ -16,15 +17,16 @@ import { WorkspaceService } from "./application/workspace-service.js";
 import { CommandHandler } from "./command-handler.js";
 import { createHttpServer } from "./http-server.js";
 import { WsBroadcaster, WsServer } from "./ws-server.js";
+import { initRunningVersion } from "./version.js";
 // ------------------------------------------------------------- Environment & paths
 const rootDir = resolve(import.meta.dirname, "../..");
+initRunningVersion(rootDir);
 const port = Number.parseInt(process.env.SUPER_PI_PORT ?? "3080", 10);
 const host = process.env.SUPER_PI_HOST ?? "127.0.0.1";
 const defaultDataDir = !rootDir.includes("node_modules") && existsSync(join(rootDir, ".super-pi"))
     ? join(rootDir, ".super-pi")
     : join(homedir(), ".super-pi");
 const dataDir = resolve(process.env.SUPER_PI_DATA_DIR ?? defaultDataDir);
-const agentsDir = resolve(process.env.SUPER_PI_AGENTS_DIR ?? join(rootDir, "agents"));
 const agentPromptDir = join(dataDir, "agent-prompts");
 const clientDir = join(rootDir, "dist", "client");
 const accessToken = process.env.SUPER_PI_ACCESS_TOKEN;
@@ -33,23 +35,29 @@ await mkdir(uploadsDir, { recursive: true }).catch(() => { });
 const taskEndpoint = `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}/api/subagent/dispatch`;
 const todoEndpoint = `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}/api/todos`;
 const workflowEndpoint = `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}/api/workflow/run`;
+// ------------------------------------------------------------- Core singletons
+const store = await Store.open(defaultStorePath(dataDir));
+const initialAgentDirs = resolveAgentDirectories({
+    customDirs: store.snapshot().customAgentDirs,
+    rootDir,
+});
+const agentsDir = initialAgentDirs[0] ?? resolve(process.env.SUPER_PI_AGENTS_DIR ?? join(rootDir, "agents"));
 const paths = {
     dataDir,
     rootDir,
     agentsDir,
+    agentDirs: initialAgentDirs,
     agentPromptDir,
     uploadsDir,
     clientDir,
 };
-// ------------------------------------------------------------- Core singletons
-const store = await Store.open(defaultStorePath(dataDir));
 const runtime = process.env.SUPER_PI_RUNTIME === "welcome"
     ? new WelcomeRuntime()
-    : new PiRpcRuntime(join(dataDir, "pi-sessions"), undefined, { dir: agentsDir, promptDir: agentPromptDir }, { endpoint: taskEndpoint, todoEndpoint, workflowEndpoint, uploadsDir });
+    : new PiRpcRuntime(join(dataDir, "pi-sessions"), undefined, { dir: initialAgentDirs, promptDir: agentPromptDir }, { endpoint: taskEndpoint, todoEndpoint, workflowEndpoint, uploadsDir });
 const broadcaster = new WsBroadcaster(() => store.snapshot());
 const extensionUiService = new ExtensionUiService(broadcaster);
 const supervisor = new SubagentSupervisor(join(dataDir, "pi-sessions"), undefined, {
-    dir: agentsDir,
+    dir: initialAgentDirs,
     promptDir: agentPromptDir,
 });
 const subagents = new SubagentRunRecorder(supervisor, {
@@ -80,10 +88,19 @@ const workflows = new WorkflowEngine(subagents, {
     },
 });
 // ------------------------------------------------------------- Application services
-const catalogService = new CatalogService(runtime, broadcaster, agentsDir);
-const runService = new RunService(store, runtime, subagents, broadcaster, extensionUiService, agentsDir, workflows);
-const conversationService = new ConversationService(store, runtime, subagents, broadcaster, catalogService, runService, extensionUiService, agentsDir);
-const workspaceService = new WorkspaceService(store, runtime, broadcaster, catalogService, runService, extensionUiService, uploadsDir, agentsDir);
+const onDirsChanged = (dirs) => {
+    paths.agentDirs = dirs;
+    paths.agentsDir = dirs[0] ?? "";
+    runtime.setAgentsDir?.(dirs);
+    subagents.setAgentsDir(dirs);
+    runService.setAgentsDir(dirs);
+    conversationService.setAgentsDir(dirs);
+    workspaceService.setAgentsDir(dirs);
+};
+const catalogService = new CatalogService(runtime, broadcaster, initialAgentDirs, store, rootDir, onDirsChanged);
+const runService = new RunService(store, runtime, subagents, broadcaster, extensionUiService, initialAgentDirs, workflows);
+const conversationService = new ConversationService(store, runtime, subagents, broadcaster, catalogService, runService, extensionUiService, initialAgentDirs);
+const workspaceService = new WorkspaceService(store, runtime, broadcaster, catalogService, runService, extensionUiService, uploadsDir, initialAgentDirs);
 const serverContext = {
     paths,
     store,
@@ -120,7 +137,7 @@ process.on("SIGINT", () => shutdown("SIGINT"));
 process.on("SIGTERM", () => shutdown("SIGTERM"));
 // ------------------------------------------------------------- Transports & startup
 const httpServer = createHttpServer({ context: serverContext, onShutdown: shutdown });
-const wsServer = new WsServer({ httpServer, broadcaster, commandHandler, catalogService, accessToken });
+const wsServer = new WsServer({ httpServer, broadcaster, commandHandler, catalogService, accessToken, rootDir });
 httpServer.listen(port, host, () => {
     console.log(`Super Pi is running at http://${host}:${port}`);
 });

package/dist/server/runtime.d.ts

@@ -199,6 +199,8 @@ export interface AgentRuntime {
      * refusal, exactly as `revert`'s absence is, rather than passed over.
      */
     fork?(request: ForkRequest): Promise<ForkOutcome>;
+    /** Updates the active agent directory or directories to search. */
+    setAgentsDir?(dir: string | string[]): void;
 }
 /** Deterministic offline runtime used by tests and local UI development. */
 export declare class WelcomeRuntime implements AgentRuntime {
@@ -527,7 +529,7 @@ export declare class PiRpcRuntime implements AgentRuntime {
      * call site keeps its meaning - moving the agent directory into that slot would have silently fed a
      * launcher's file path in as a directory of agent definitions.
      */
-    private readonly agents;
+    private agents;
     /**
      * How the `task` extension reaches this server. A FOURTH positional parameter for the same reason as
      * the third: an options bag in one of the earlier slots would silently change what an existing
@@ -587,7 +589,7 @@ export declare class PiRpcRuntime implements AgentRuntime {
      * launcher's file path in as a directory of agent definitions.
      */
     agents?: {
-        dir: string;
+        dir: string | string[];
         promptDir: string;
     }, 
     /**
@@ -624,6 +626,7 @@ export declare class PiRpcRuntime implements AgentRuntime {
      * as the conversation's own role.
      */
     agentFor(conversation: Pick<Conversation, "id" | "agentId">): Promise<AgentDefinition | undefined>;
+    setAgentsDir(dir: string | string[]): void;
     /**
      * The `--extension` argv for this turn, or `[]` when the task tool is not available.
      *

package/dist/server/runtime.js

@@ -631,9 +631,13 @@ export class PiRpcRuntime {
         const agent = agents.find((item) => item.id === conversation.agentId);
         if (agent)
             return agent;
-        console.warn(`PiRpcRuntime: conversation ${conversation.id} names agent ${JSON.stringify(conversation.agentId)}, which is not a primary agent in ${this.agents.dir}${problems.length ? ` (${problems.length} file(s) there are not usable agents)` : ""} - running as Pi itself.`);
+        const dirLabel = Array.isArray(this.agents.dir) ? this.agents.dir.join(", ") : this.agents.dir;
+        console.warn(`PiRpcRuntime: conversation ${conversation.id} names agent ${JSON.stringify(conversation.agentId)}, which is not a primary agent in ${dirLabel}${problems.length ? ` (${problems.length} file(s) there are not usable agents)` : ""} - running as Pi itself.`);
         return undefined;
     }
+    setAgentsDir(dir) {
+        this.agents.dir = dir;
+    }
     /**
      * The `--extension` argv for this turn, or `[]` when the task tool is not available.
      *
@@ -677,7 +681,7 @@ export class PiRpcRuntime {
     async taskExtensionEnv(conversationId) {
         const { agents, problems } = await readAgents(this.agents.dir, { mode: "subagent" });
         for (const problem of problems)
-            console.warn(`PiRpcRuntime: ${this.agents.dir}/${problem.file} is not a usable sub-agent - ${problem.message}`);
+            console.warn(`PiRpcRuntime: ${problem.file} is not a usable sub-agent - ${problem.message}`);
         return {
             [TASK_ENDPOINT_ENV]: this.options.endpoint ?? "",
             [TASK_ROSTER_ENV]: rosterPayload(agents),

package/dist/server/server-context.d.ts

@@ -14,6 +14,7 @@ export interface ServerPaths {
     dataDir: string;
     rootDir: string;
     agentsDir: string;
+    agentDirs?: string[];
     agentPromptDir?: string;
     uploadsDir: string;
     clientDir: string;

package/dist/server/store.d.ts

@@ -448,6 +448,12 @@ export declare class Store {
         todos: TodoItem[];
         dropped: number;
     }>;
+    /**
+     * Updates user-configured custom agent discovery directories.
+     * Empty/whitespace paths are ignored, and if no valid paths remain, the key is deleted
+     * to keep state.json clean.
+     */
+    setCustomAgentDirs(dirs: string[]): Promise<string[]>;
     /**
      * Writes the whole state atomically: a temp file, then a rename over the real one.
      *

package/dist/server/store.js

@@ -1194,6 +1194,22 @@ export class Store {
         await this.persist();
         return { todos: structuredClone(todos), dropped };
     }
+    /**
+     * Updates user-configured custom agent discovery directories.
+     * Empty/whitespace paths are ignored, and if no valid paths remain, the key is deleted
+     * to keep state.json clean.
+     */
+    async setCustomAgentDirs(dirs) {
+        const cleaned = Array.from(new Set(dirs.map((d) => d.trim()).filter(Boolean)));
+        if (cleaned.length) {
+            this.state.customAgentDirs = cleaned;
+        }
+        else {
+            delete this.state.customAgentDirs;
+        }
+        await this.persist();
+        return structuredClone(cleaned);
+    }
     /**
      * Writes the whole state atomically: a temp file, then a rename over the real one.
      *

package/dist/server/subagent-runs.d.ts

@@ -89,6 +89,8 @@ export declare class SubagentRunRecorder {
      */
     private readonly controllers;
     constructor(supervisor: SubagentSupervisor, hooks: SubagentRunHooks);
+    /** Updates agent discovery directories on the underlying supervisor. */
+    setAgentsDir(dir: string | string[]): void;
     /** Every child still running, optionally narrowed to one conversation. The supervisor owns the pids. */
     liveRuns(conversationId?: string): {
         id: string;

package/dist/server/subagent-runs.js

@@ -44,6 +44,10 @@ export class SubagentRunRecorder {
         this.supervisor = supervisor;
         this.hooks = hooks;
     }
+    /** Updates agent discovery directories on the underlying supervisor. */
+    setAgentsDir(dir) {
+        this.supervisor.setAgentsDir?.(dir);
+    }
     /** Every child still running, optionally narrowed to one conversation. The supervisor owns the pids. */
     liveRuns(conversationId) {
         return this.supervisor.liveRuns(conversationId);

package/dist/server/subagents.d.ts

@@ -136,7 +136,7 @@ export declare class SubagentCancelled extends Error {
 /** Spawns sub-agent children Pi and drains their JSONL RPC streams. */
 export declare class SubagentSupervisor {
     private readonly sessionDir;
-    private readonly agents;
+    private agents;
     private readonly pi;
     /** Live children by run id, so a caller can name the process it means. Cleared in the run's `finally`. */
     private readonly children;
@@ -147,7 +147,7 @@ export declare class SubagentSupervisor {
      * child's spawn line depend on when it was started.
      */
     constructor(sessionDir: string, command?: string, agents?: {
-        dir: string;
+        dir: string | string[];
         promptDir: string;
     });
     /**
@@ -163,6 +163,7 @@ export declare class SubagentSupervisor {
         conversationId: string;
         pid: number | undefined;
     }[];
+    setAgentsDir(dir: string | string[]): void;
     /**
      * Runs one sub-agent to completion and returns what it said.
      *

package/dist/server/subagents.js

@@ -195,6 +195,9 @@ export class SubagentSupervisor {
     liveRuns(conversationId) {
         return [...this.children].map(([id, run]) => ({ id, conversationId: run.conversationId, pid: run.child.pid }));
     }
+    setAgentsDir(dir) {
+        this.agents.dir = dir;
+    }
     /**
      * Runs one sub-agent to completion and returns what it said.
      *
@@ -537,6 +540,7 @@ export class SubagentSupervisor {
         const agent = agents.find((item) => item.id === agentId);
         if (agent)
             return agent;
-        throw new Error(`sub-agent ${JSON.stringify(agentId)} is not a subagent definition in ${this.agents.dir}${problems.length ? ` (${problems.length} file(s) there are not usable agents)` : ""}. A sub-agent is an agents/*.md file with \`mode: subagent\`; a primary agent is chosen by a human and is deliberately not dispatchable as one.`);
+        const dirLabel = Array.isArray(this.agents.dir) ? this.agents.dir.join(", ") : this.agents.dir;
+        throw new Error(`sub-agent ${JSON.stringify(agentId)} is not a subagent definition in ${dirLabel}${problems.length ? ` (${problems.length} file(s) there are not usable agents)` : ""}. A sub-agent is an agents/*.md file with \`mode: subagent\`; a primary agent is chosen by a human and is deliberately not dispatchable as one.`);
     }
 }

package/dist/server/types.d.ts

@@ -254,6 +254,8 @@ export type AgentDefinition = {
      */
     tools?: Record<string, unknown>;
     prompt: string;
+    /** The directory this agent definition was discovered from. */
+    sourceDir?: string;
 };
 /**
  * What the picker receives. The prompt body is deliberately NOT sent: it is a whole system prompt,
@@ -261,6 +263,7 @@ export type AgentDefinition = {
  */
 export type AgentSummary = Omit<AgentDefinition, "prompt" | "toolFlags" | "tools"> & {
     toolSummary: string;
+    sourceDir?: string;
 };
 export type AgentCatalog = {
     source: "directory" | "unavailable";
@@ -271,6 +274,8 @@ export type AgentCatalog = {
         message: string;
     }[];
     directory: string;
+    /** All searched agent directories in priority order. */
+    directories?: string[];
     fetchedAt: string;
     error?: string;
 };
@@ -496,6 +501,7 @@ export type AppState = {
     backgroundTasks: BackgroundTaskSummary[];
     todos?: TodoItem[];
     workflows?: WorkflowRun[];
+    customAgentDirs?: string[];
 };
 export type TodoItem = {
     id?: string;
@@ -811,12 +817,25 @@ export type ClientCommand = {
 /** Asks for the `mode: subagent` half of the agent directory. Answered by `subagent.catalog`. */
  | {
     type: "subagent.catalog.fetch";
+} | {
+    type: "agents.setCustomDirs";
+    dirs: string[];
+} | {
+    type: "agents.rescan";
 } | ({
     type: "extension.ui.answer";
     conversationId: string;
     requestId: string;
 } & ExtensionUiAnswer);
+export type ServerVersionInfo = {
+    runningVersion: string;
+    diskVersion: string;
+    needsRestart: boolean;
+};
 export type ServerEvent = {
+    type: "server.version";
+    version: ServerVersionInfo;
+} | {
     type: "state";
     state: AppState;
 } | {

package/dist/server/version.d.ts

@@ -0,0 +1,10 @@
+import type { ServerVersionInfo } from "./types.js";
+/**
+ * Initializes the version captured when this server process booted up.
+ */
+export declare function initRunningVersion(rootDir: string): string;
+/**
+ * Checks whether the package.json version on disk has been updated beyond
+ * the version currently executing in this process.
+ */
+export declare function checkDiskVersion(rootDir: string): ServerVersionInfo;

package/dist/server/version.js

@@ -0,0 +1,39 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+let runningVersion = "0.1.3";
+/**
+ * Initializes the version captured when this server process booted up.
+ */
+export function initRunningVersion(rootDir) {
+    try {
+        const pkg = JSON.parse(readFileSync(join(rootDir, "package.json"), "utf8"));
+        if (pkg.version)
+            runningVersion = pkg.version;
+    }
+    catch {
+        // fallback to default
+    }
+    return runningVersion;
+}
+/**
+ * Checks whether the package.json version on disk has been updated beyond
+ * the version currently executing in this process.
+ */
+export function checkDiskVersion(rootDir) {
+    try {
+        const pkg = JSON.parse(readFileSync(join(rootDir, "package.json"), "utf8"));
+        const diskVersion = pkg.version ?? runningVersion;
+        return {
+            runningVersion,
+            diskVersion,
+            needsRestart: diskVersion !== runningVersion,
+        };
+    }
+    catch {
+        return {
+            runningVersion,
+            diskVersion: runningVersion,
+            needsRestart: false,
+        };
+    }
+}