@archon-claw/cli 0.6.1 → 0.7.0

package/dist/cli.js

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
 import { fileURLToPath } from "url";
 import path from "path";
-import { readFileSync, readdirSync, statSync } from "fs";
+import { readFileSync } from "fs";
 import dotenv from "dotenv";
 import { Command } from "commander";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-import { loadAgentConfig } from "./config.js";
 import { createServer } from "./server.js";
-import { SessionStore } from "./session.js";
 import { startDev } from "./dev.js";
+import { scanAgentDirs, loadAgents, setupWatch } from "./watch.js";
 import { runToolTests, formatResults } from "./test-runner.js";
 import { runEvals } from "./eval/runner.js";
 const pkg = JSON.parse(readFileSync(path.resolve(__dirname, "../package.json"), "utf-8"));
@@ -24,33 +23,6 @@ program
         : path.resolve(process.cwd(), ".env");
     dotenv.config({ path: envPath });
 });
-/** Scan a directory for agent subdirectories and load them all */
-async function loadAgentsFromDir(agentsDir) {
-    const absDir = path.resolve(agentsDir);
-    const entries = readdirSync(absDir);
-    const agents = new Map();
-    for (const name of entries) {
-        const fullPath = path.join(absDir, name);
-        if (!statSync(fullPath).isDirectory())
-            continue;
-        // Skip hidden dirs and common non-agent dirs
-        if (name.startsWith(".") || name === "node_modules")
-            continue;
-        try {
-            const config = await loadAgentConfig(fullPath);
-            const sessions = new SessionStore(fullPath);
-            await sessions.init();
-            agents.set(name, { config, sessions });
-        }
-        catch (err) {
-            console.warn(`[warn] Skipping "${name}": ${err instanceof Error ? err.message : err}`);
-        }
-    }
-    if (agents.size === 0) {
-        throw new Error(`No valid agents found in ${absDir}`);
-    }
-    return agents;
-}
 program
     .command("dev")
     .description("Start dev server with hot-reload for agent development")
@@ -74,9 +46,18 @@ program
     .description("Start an agent HTTP server")
     .requiredOption("--agents-dir <path>", "Path to directory containing agent subdirectories")
     .option("-p, --port <port>", "Server port", "5100")
+    .option("-w, --watch", "Watch agent files for changes and hot-reload")
     .action(async (opts) => {
     try {
-        const agents = await loadAgentsFromDir(opts.agentsDir);
+        const absDir = path.resolve(opts.agentsDir);
+        const agentDirs = scanAgentDirs(absDir);
+        if (agentDirs.length === 0) {
+            throw new Error(`No agent directories found in ${absDir}`);
+        }
+        const agents = await loadAgents(agentDirs, "warn");
+        if (agents.size === 0) {
+            throw new Error(`No valid agents found in ${absDir}`);
+        }
         const port = parseInt(opts.port, 10);
         console.log("Agents loaded:");
         for (const [id, entry] of agents) {
@@ -87,9 +68,19 @@ program
                 (mcpCount > 0 ? `  MCP: ${mcpCount} servers` : "") +
                 `  Skills: ${Object.keys(config.skills).length}`);
         }
-        const server = createServer(agents, port);
+        // With --watch: pass getter function so server always sees latest agents
+        // Without --watch: pass static Map (no file watching overhead)
+        const server = opts.watch
+            ? createServer(() => agents, port)
+            : createServer(agents, port);
+        let watchHandle;
+        if (opts.watch) {
+            watchHandle = setupWatch(agentDirs, agents, "watch");
+            console.log("Watching for file changes...");
+        }
         const shutdown = async () => {
             console.log("\nShutting down...");
+            await watchHandle?.close();
             for (const [, entry] of agents) {
                 await entry.config.mcpManager?.shutdown();
             }

package/dist/dev.d.ts

@@ -1,5 +1,5 @@
 import http from "node:http";
-import { type FSWatcher } from "chokidar";
+import type { FSWatcher } from "chokidar";
 import { type AgentEntry } from "./server.js";
 export interface DevOptions {
     port: number;

package/dist/dev.js

@@ -1,23 +1,7 @@
 import path from "node:path";
-import { readdirSync, statSync } from "node:fs";
-import { watch } from "chokidar";
 import open from "open";
-import { loadAgentConfig } from "./config.js";
 import { createServer } from "./server.js";
-import { SessionStore } from "./session.js";
-/** Scan agents-dir for valid agent subdirectories */
-function scanAgentDirs(agentsDir) {
-    const results = [];
-    for (const name of readdirSync(agentsDir)) {
-        const fullPath = path.join(agentsDir, name);
-        if (!statSync(fullPath).isDirectory())
-            continue;
-        if (name.startsWith(".") || name === "node_modules")
-            continue;
-        results.push({ id: name, path: fullPath });
-    }
-    return results;
-}
+import { scanAgentDirs, loadAgents, setupWatch } from "./watch.js";
 export async function startDev(agentsDir, opts) {
     const absDir = path.resolve(agentsDir);
     const agentDirs = scanAgentDirs(absDir);
@@ -25,18 +9,7 @@ export async function startDev(agentsDir, opts) {
         throw new Error(`No agent directories found in ${absDir}`);
     }
     // Initial load of all agents
-    const currentAgents = new Map();
-    for (const { id, path: agentPath } of agentDirs) {
-        try {
-            const config = await loadAgentConfig(agentPath);
-            const sessions = new SessionStore(agentPath);
-            await sessions.init();
-            currentAgents.set(id, { config, sessions });
-        }
-        catch (err) {
-            console.warn(`[dev] Skipping "${id}": ${err instanceof Error ? err.message : err}`);
-        }
-    }
+    const currentAgents = await loadAgents(agentDirs, "dev");
     if (currentAgents.size === 0) {
         throw new Error(`No valid agents found in ${absDir}`);
     }
@@ -47,69 +20,8 @@ export async function startDev(agentsDir, opts) {
     if (opts.open && !process.env.SSH_CLIENT && !process.env.SSH_TTY) {
         open(`http://localhost:${opts.port}`).catch(() => { });
     }
-    // Per-agent reload logic
-    const reloadInFlight = new Set();
-    async function reloadAgent(agentId, changedFiles) {
-        if (reloadInFlight.has(agentId))
-            return;
-        reloadInFlight.add(agentId);
-        const agentEntry = agentDirs.find((d) => d.id === agentId);
-        if (!agentEntry) {
-            reloadInFlight.delete(agentId);
-            return;
-        }
-        const ts = new Date().toLocaleTimeString();
-        if (changedFiles?.length) {
-            const relFiles = changedFiles.map((f) => path.relative(agentEntry.path, f));
-            console.log(`\n[dev] ${ts} [${agentId}] Changed: ${relFiles.join(", ")}`);
-        }
-        try {
-            const existing = currentAgents.get(agentId);
-            await existing?.config.mcpManager?.shutdown();
-            const newConfig = await loadAgentConfig(agentEntry.path);
-            const sessions = existing?.sessions ?? new SessionStore(agentEntry.path);
-            if (!existing)
-                await sessions.init();
-            currentAgents.set(agentId, { config: newConfig, sessions });
-            console.log(`[dev] ${ts} [${agentId}] Reloaded \u2713` +
-                ` (tools: ${newConfig.tools.length}, skills: ${Object.keys(newConfig.skills).length})`);
-        }
-        catch (err) {
-            console.error(`[dev] ${ts} [${agentId}] Reload failed: ${err instanceof Error ? err.message : err}`);
-            console.error(`[dev] Continuing with previous valid configuration`);
-        }
-        finally {
-            reloadInFlight.delete(agentId);
-        }
-    }
-    // Watch each agent directory
-    const watchers = [];
-    for (const { id, path: agentPath } of agentDirs) {
-        if (!currentAgents.has(id))
-            continue; // Skip agents that failed to load
-        const watcher = watch(agentPath, {
-            ignored: [
-                "**/sessions/**",
-                "**/node_modules/**",
-                "**/eval-results/**",
-                "**/.DS_Store",
-            ],
-            ignoreInitial: true,
-        });
-        let debounceTimer = null;
-        let pendingFiles = [];
-        watcher.on("all", (_event, filePath) => {
-            pendingFiles.push(filePath);
-            if (debounceTimer)
-                clearTimeout(debounceTimer);
-            debounceTimer = setTimeout(async () => {
-                const files = [...pendingFiles];
-                pendingFiles = [];
-                await reloadAgent(id, files);
-            }, 100);
-        });
-        watchers.push(watcher);
-    }
+    // Setup file watchers
+    const watchHandle = setupWatch(agentDirs, currentAgents, "dev");
     // Graceful shutdown
     const shutdown = async () => {
         console.log("\nShutting down...");
@@ -121,9 +33,7 @@ export async function startDev(agentsDir, opts) {
     async function close() {
         process.removeListener("SIGINT", shutdown);
         process.removeListener("SIGTERM", shutdown);
-        for (const watcher of watchers) {
-            await watcher.close();
-        }
+        await watchHandle.close();
         for (const [, entry] of currentAgents) {
             await entry.config.mcpManager?.shutdown();
         }
@@ -131,9 +41,9 @@ export async function startDev(agentsDir, opts) {
     }
     return {
         server,
-        watchers,
+        watchers: watchHandle.watchers,
         getAgents: () => currentAgents,
-        reloadAgent,
+        reloadAgent: watchHandle.reloadAgent,
         close,
     };
 }

package/dist/watch.d.ts

@@ -0,0 +1,21 @@
+import { type FSWatcher } from "chokidar";
+import type { AgentEntry } from "./server.js";
+export interface AgentDir {
+    id: string;
+    path: string;
+}
+export interface WatchHandle {
+    watchers: FSWatcher[];
+    reloadAgent(agentId: string, changedFiles?: string[]): Promise<void>;
+    close(): Promise<void>;
+}
+/** Scan agents-dir for valid agent subdirectories */
+export declare function scanAgentDirs(agentsDir: string): AgentDir[];
+/** Load all agents from scanned directories into a Map */
+export declare function loadAgents(agentDirs: AgentDir[], logPrefix: string): Promise<Map<string, AgentEntry>>;
+/**
+ * Setup file watchers for agent directories.
+ * On file changes, automatically reloads the affected agent config while
+ * preserving existing sessions and gracefully handling errors.
+ */
+export declare function setupWatch(agentDirs: AgentDir[], currentAgents: Map<string, AgentEntry>, logPrefix?: string): WatchHandle;

package/dist/watch.js

@@ -0,0 +1,109 @@
+import path from "node:path";
+import { readdirSync, statSync } from "node:fs";
+import { watch } from "chokidar";
+import { loadAgentConfig } from "./config.js";
+import { SessionStore } from "./session.js";
+const IGNORED = [
+    "**/sessions/**",
+    "**/node_modules/**",
+    "**/eval-results/**",
+    "**/.DS_Store",
+];
+/** Scan agents-dir for valid agent subdirectories */
+export function scanAgentDirs(agentsDir) {
+    const results = [];
+    for (const name of readdirSync(agentsDir)) {
+        const fullPath = path.join(agentsDir, name);
+        if (!statSync(fullPath).isDirectory())
+            continue;
+        if (name.startsWith(".") || name === "node_modules")
+            continue;
+        results.push({ id: name, path: fullPath });
+    }
+    return results;
+}
+/** Load all agents from scanned directories into a Map */
+export async function loadAgents(agentDirs, logPrefix) {
+    const agents = new Map();
+    for (const { id, path: agentPath } of agentDirs) {
+        try {
+            const config = await loadAgentConfig(agentPath);
+            const sessions = new SessionStore(agentPath);
+            await sessions.init();
+            agents.set(id, { config, sessions });
+        }
+        catch (err) {
+            console.warn(`[${logPrefix}] Skipping "${id}": ${err instanceof Error ? err.message : err}`);
+        }
+    }
+    return agents;
+}
+/**
+ * Setup file watchers for agent directories.
+ * On file changes, automatically reloads the affected agent config while
+ * preserving existing sessions and gracefully handling errors.
+ */
+export function setupWatch(agentDirs, currentAgents, logPrefix = "watch") {
+    const reloadInFlight = new Set();
+    async function reloadAgent(agentId, changedFiles) {
+        if (reloadInFlight.has(agentId))
+            return;
+        reloadInFlight.add(agentId);
+        const agentEntry = agentDirs.find((d) => d.id === agentId);
+        if (!agentEntry) {
+            reloadInFlight.delete(agentId);
+            return;
+        }
+        const ts = new Date().toLocaleTimeString();
+        if (changedFiles?.length) {
+            const relFiles = changedFiles.map((f) => path.relative(agentEntry.path, f));
+            console.log(`\n[${logPrefix}] ${ts} [${agentId}] Changed: ${relFiles.join(", ")}`);
+        }
+        try {
+            const existing = currentAgents.get(agentId);
+            await existing?.config.mcpManager?.shutdown();
+            const newConfig = await loadAgentConfig(agentEntry.path);
+            const sessions = existing?.sessions ?? new SessionStore(agentEntry.path);
+            if (!existing)
+                await sessions.init();
+            currentAgents.set(agentId, { config: newConfig, sessions });
+            console.log(`[${logPrefix}] ${ts} [${agentId}] Reloaded \u2713` +
+                ` (tools: ${newConfig.tools.length}, skills: ${Object.keys(newConfig.skills).length})`);
+        }
+        catch (err) {
+            console.error(`[${logPrefix}] ${ts} [${agentId}] Reload failed: ${err instanceof Error ? err.message : err}`);
+            console.error(`[${logPrefix}] Continuing with previous valid configuration`);
+        }
+        finally {
+            reloadInFlight.delete(agentId);
+        }
+    }
+    const watchers = [];
+    for (const { id, path: agentPath } of agentDirs) {
+        if (!currentAgents.has(id))
+            continue;
+        const watcher = watch(agentPath, {
+            ignored: IGNORED,
+            ignoreInitial: true,
+        });
+        let debounceTimer = null;
+        let pendingFiles = [];
+        watcher.on("all", (_event, filePath) => {
+            pendingFiles.push(filePath);
+            if (debounceTimer)
+                clearTimeout(debounceTimer);
+            debounceTimer = setTimeout(async () => {
+                const files = [...pendingFiles];
+                pendingFiles = [];
+                await reloadAgent(id, files);
+            }, 100);
+        });
+        watchers.push(watcher);
+    }
+    async function close() {
+        for (const watcher of watchers) {
+            await watcher.close();
+        }
+    }
+    return { watchers, reloadAgent, close };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archon-claw/cli",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "AI Agent CLI",
   "type": "module",
   "bin": {
@@ -44,6 +44,8 @@
     "test": "vitest run --exclude dist --exclude examples",
     "test:watch": "vitest --exclude dist --exclude examples",
     "e2e": "playwright test",
-    "e2e:ui": "playwright test --ui"
+    "e2e:ui": "playwright test --ui",
+    "e2e:start-watch": "playwright test --config playwright.start-watch.config.ts",
+    "e2e:start-watch:ui": "playwright test --config playwright.start-watch.config.ts --ui"
   }
 }