@wrongstack/cli 0.1.8 → 0.1.9

package/dist/index.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { color, DefaultLogger, DefaultModelsRegistry, Container, DefaultConfigStore, TOKENS, DefaultSecretScrubber, DefaultRetryPolicy, DefaultErrorHandler, DefaultTokenCounter, DefaultModeStore, DefaultSessionStore, DefaultMemoryStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultPermissionPolicy, HybridCompactor, ProviderRegistry, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, createDefaultPipelines, AutoCompactionMiddleware, Agent, SlashCommandRegistry, loadPlugins, DefaultPathResolver, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, InputBuilder, DefaultPluginAPI, atomicWrite, DefaultSessionReader, makeAgentSubagentRunner, Director, DefaultMultiAgentCoordinator, decryptConfigSecrets, encryptConfigSecrets } from '@wrongstack/core';
+import { color, DefaultLogger, DefaultModelsRegistry, Container, DefaultConfigStore, TOKENS, DefaultSecretScrubber, DefaultRetryPolicy, DefaultErrorHandler, DefaultTokenCounter, DefaultModeStore, DefaultSessionStore, DefaultMemoryStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultPermissionPolicy, HybridCompactor, ProviderRegistry, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, createDefaultPipelines, AutoCompactionMiddleware, Agent, SlashCommandRegistry, loadPlugins, FLEET_ROSTER, DefaultPathResolver, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, makeDirectorSessionFactory, makeAgentSubagentRunner, Director, DefaultMultiAgentCoordinator, InputBuilder, DefaultPluginAPI, atomicWrite, DefaultSessionReader, decryptConfigSecrets, encryptConfigSecrets } from '@wrongstack/core';
 import { WebSocketServer, WebSocket } from 'ws';
 import * as fs6 from 'fs/promises';
 import { writeFileSync } from 'fs';
 import { createRequire } from 'module';
-import * as path5 from 'path';
+import * as path6 from 'path';
 import { MCPRegistry } from '@wrongstack/mcp';
 import { buildProviderFactoriesFromRegistry, makeProviderFromConfig, capabilitiesFor } from '@wrongstack/providers';
 import { rememberTool, forgetTool } from '@wrongstack/tools';
@@ -541,7 +541,7 @@ var ReadlineInputReader = class {
   history = [];
   pending = false;
   constructor(opts = {}) {
-    this.historyFile = opts.historyFile ?? path5.join(os3.homedir(), ".wrongstack", "history");
+    this.historyFile = opts.historyFile ?? path6.join(os3.homedir(), ".wrongstack", "history");
   }
   async loadHistory() {
     try {
@@ -553,7 +553,7 @@ var ReadlineInputReader = class {
   }
   async saveHistory() {
     try {
-      await fs6.mkdir(path5.dirname(this.historyFile), { recursive: true });
+      await fs6.mkdir(path6.dirname(this.historyFile), { recursive: true });
       await fs6.writeFile(this.historyFile, this.history.slice(-1e3).join("\n"));
     } catch {
     }
@@ -1168,8 +1168,8 @@ function initCommand(opts) {
     description: "Scaffold .wrongstack/AGENTS.md in the current project.",
     async run(args, ctx) {
       const force = args.trim() === "--force";
-      const dir = path5.join(ctx.projectRoot, ".wrongstack");
-      const file = path5.join(dir, "AGENTS.md");
+      const dir = path6.join(ctx.projectRoot, ".wrongstack");
+      const file = path6.join(dir, "AGENTS.md");
       try {
         await fs6.access(file);
         if (!force) {
@@ -1200,7 +1200,7 @@ No project type auto-detected. Edit the file to add build/test commands and conv
 async function detectProjectFacts(root) {
   const facts = { hints: [] };
   try {
-    const pkg = JSON.parse(await fs6.readFile(path5.join(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(await fs6.readFile(path6.join(root, "package.json"), "utf8"));
     const scripts = pkg.scripts ?? {};
     const pm = (pkg.packageManager ?? "npm").split("@")[0] ?? "npm";
     if (scripts["build"]) facts.build = `${pm} run build`;
@@ -1211,28 +1211,28 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    await fs6.access(path5.join(root, "pyproject.toml"));
+    await fs6.access(path6.join(root, "pyproject.toml"));
     facts.test ??= "pytest";
     facts.lint ??= "ruff check .";
     facts.hints.push("pyproject.toml");
   } catch {
   }
   try {
-    await fs6.access(path5.join(root, "go.mod"));
+    await fs6.access(path6.join(root, "go.mod"));
     facts.build ??= "go build ./...";
     facts.test ??= "go test ./...";
     facts.hints.push("go.mod");
   } catch {
   }
   try {
-    await fs6.access(path5.join(root, "Cargo.toml"));
+    await fs6.access(path6.join(root, "Cargo.toml"));
     facts.build ??= "cargo build";
     facts.test ??= "cargo test";
     facts.hints.push("Cargo.toml");
   } catch {
   }
   try {
-    await fs6.access(path5.join(root, "Makefile"));
+    await fs6.access(path6.join(root, "Makefile"));
     facts.build ??= "make";
     facts.test ??= "make test";
     facts.hints.push("Makefile");
@@ -1808,13 +1808,13 @@ var MANIFESTS = [
 ];
 async function detectProjectKind(projectRoot) {
   try {
-    await fs6.access(path5.join(projectRoot, ".wrongstack", "AGENTS.md"));
+    await fs6.access(path6.join(projectRoot, ".wrongstack", "AGENTS.md"));
     return "initialized";
   } catch {
   }
   for (const m of MANIFESTS) {
     try {
-      await fs6.access(path5.join(projectRoot, m));
+      await fs6.access(path6.join(projectRoot, m));
       return "project";
     } catch {
     }
@@ -1822,8 +1822,8 @@ async function detectProjectKind(projectRoot) {
   return "empty";
 }
 async function scaffoldAgentsMd(projectRoot) {
-  const dir = path5.join(projectRoot, ".wrongstack");
-  const file = path5.join(dir, "AGENTS.md");
+  const dir = path6.join(projectRoot, ".wrongstack");
+  const file = path6.join(dir, "AGENTS.md");
   const facts = await detectProjectFacts(projectRoot);
   const body = renderAgentsTemplate(facts);
   await fs6.mkdir(dir, { recursive: true });
@@ -1836,7 +1836,7 @@ async function runProjectCheck(opts) {
   if (kind === "initialized") {
     renderer.write(
       `
-  ${color.green("\u2713")} Project initialized ${color.dim(`(${path5.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
+  ${color.green("\u2713")} Project initialized ${color.dim(`(${path6.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
 `
     );
     return true;
@@ -2498,7 +2498,7 @@ function renderProgress2(ratio, width) {
   return FILLED2.repeat(capped) + EMPTY2.repeat(width - capped);
 }
 async function bootConfig(flags) {
-  const cwd = typeof flags["cwd"] === "string" ? path5.resolve(flags["cwd"]) : process.cwd();
+  const cwd = typeof flags["cwd"] === "string" ? path6.resolve(flags["cwd"]) : process.cwd();
   const pathResolver = new DefaultPathResolver(cwd);
   const projectRoot = pathResolver.projectRoot;
   const userHome = os3.homedir();
@@ -2570,12 +2570,35 @@ var MultiAgentHost = class {
    *  coordinator; the host's `coordinator` field still points at it so
    *  the rest of the methods don't need to branch. */
   director;
+  /** Lazily built alongside the director — produces per-subagent JSONL
+   *  writers under `<sessionsRoot>/<runId>/`. Null in non-director mode. */
+  sessionFactory;
   pending = /* @__PURE__ */ new Map();
   results = [];
   opts;
+  /**
+   * Force the lazy build path to run *now* and return the live Director,
+   * or null when director mode is off. Used by the CLI to register the
+   * fleet's LLM-callable orchestration tools (spawn_subagent,
+   * assign_task, await_tasks, ask_subagent, roll_up, terminate_subagent,
+   * fleet_status, fleet_usage) into the leader's ToolRegistry before the
+   * agent starts — without this, the leader literally cannot see the
+   * orchestration tools and `--director` becomes a no-op.
+   */
+  async ensureDirector() {
+    if (!this.opts.directorMode) return null;
+    await this.ensureCoordinator();
+    return this.director ?? null;
+  }
   async ensureCoordinator() {
     if (this.coordinator) return this.coordinator;
     const config = this.deps.configStore.get();
+    if (this.opts.directorMode && this.opts.sessionsRoot && !this.sessionFactory) {
+      this.sessionFactory = makeDirectorSessionFactory({
+        sessionsRoot: this.opts.sessionsRoot,
+        directorRunId: this.opts.directorRunId
+      });
+    }
     const factory = async (subCfg) => {
       const events = new EventBus();
       const provider = await this.buildSubagentProvider(config, subCfg.provider);
@@ -2586,11 +2609,22 @@ var MultiAgentHost = class {
         model: subCfg.model ?? config.model,
         provider: subCfg.provider ?? config.provider
       });
-      const parentSession = this.deps.session;
-      const subSession = {
-        id: parentSession.id,
-        append: (ev) => parentSession.append({ ...ev })
-      };
+      let subSession;
+      if (this.sessionFactory) {
+        const subagentName = subCfg.name ?? subCfg.id ?? `sub_${randomUUID().slice(0, 8)}`;
+        subSession = await this.sessionFactory.createSubagentSession({
+          subagentId: subagentName,
+          provider: subCfg.provider ?? config.provider,
+          model: subCfg.model ?? config.model,
+          title: `subagent: ${subagentName}`
+        });
+      } else {
+        const parentSession = this.deps.session;
+        subSession = {
+          id: parentSession.id,
+          append: (ev) => parentSession.append({ ...ev })
+        };
+      }
       const ctx = new Context({
         systemPrompt: baseSystem,
         provider,
@@ -2628,7 +2662,8 @@ var MultiAgentHost = class {
       this.director = new Director({
         config: coordinatorConfig,
         runner,
-        manifestPath: this.opts.manifestPath
+        manifestPath: this.opts.manifestPath,
+        sharedScratchpadPath: this.opts.sharedScratchpadPath
       });
       this.director.on("task.completed", ({ task, result }) => {
         this.results.push(result);
@@ -3577,8 +3612,8 @@ async function initCmd(_args, deps) {
   };
   if (apiKey) config.apiKey = apiKey;
   await atomicWrite(deps.paths.globalConfig, JSON.stringify(config, null, 2));
-  await fs6.mkdir(path5.join(deps.projectRoot, ".wrongstack"), { recursive: true });
-  const agentsFile = path5.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
+  await fs6.mkdir(path6.join(deps.projectRoot, ".wrongstack"), { recursive: true });
+  const agentsFile = path6.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
   try {
     await fs6.access(agentsFile);
   } catch {
@@ -3986,7 +4021,7 @@ async function doctorCmd(_args, deps) {
   }
   try {
     await fs6.mkdir(deps.paths.projectSessions, { recursive: true });
-    const probe = path5.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
+    const probe = path6.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
     await fs6.writeFile(probe, "");
     await fs6.unlink(probe);
     checks.push({ name: "sessions writable", status: "ok", detail: deps.paths.projectSessions });
@@ -4089,8 +4124,8 @@ async function exportCmd(args, deps) {
     return 1;
   }
   if (output) {
-    await fs6.mkdir(path5.dirname(path5.resolve(deps.cwd, output)), { recursive: true });
-    await fs6.writeFile(path5.resolve(deps.cwd, output), rendered, "utf8");
+    await fs6.mkdir(path6.dirname(path6.resolve(deps.cwd, output)), { recursive: true });
+    await fs6.writeFile(path6.resolve(deps.cwd, output), rendered, "utf8");
     deps.renderer.write(`Wrote ${rendered.length} bytes to ${output}
 `);
   } else {
@@ -4150,7 +4185,7 @@ async function helpCmd(_args, deps) {
   return 0;
 }
 async function projectsCmd(_args, deps) {
-  const projectsRoot = path5.join(deps.paths.globalRoot, "projects");
+  const projectsRoot = path6.join(deps.paths.globalRoot, "projects");
   try {
     const entries = await fs6.readdir(projectsRoot);
     if (entries.length === 0) {
@@ -4160,7 +4195,7 @@ async function projectsCmd(_args, deps) {
     for (const hash of entries) {
       try {
         const meta = JSON.parse(
-          await fs6.readFile(path5.join(projectsRoot, hash, "meta.json"), "utf8")
+          await fs6.readFile(path6.join(projectsRoot, hash, "meta.json"), "utf8")
         );
         deps.renderer.write(
           `  ${color.dim(hash)}  ${color.dim(meta.lastSeen ?? "")}  ${meta.root ?? "?"}
@@ -4251,7 +4286,7 @@ function resolveBundledSkillsDir() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path5.join(path5.dirname(corePkg), "skills");
+    return path6.join(path6.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -4520,7 +4555,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     const dumpMetrics = () => {
       if (!metricsSink) return;
       try {
-        const out = path5.join(wpaths.projectSessions, "metrics.json");
+        const out = path6.join(wpaths.projectSessions, "metrics.json");
         const snap = metricsSink.snapshot();
         writeFileSync(out, JSON.stringify(snap, null, 2));
       } catch {
@@ -4677,10 +4712,10 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
   }
   await recoveryLock.write(session.id).catch(() => void 0);
   const attachments = new DefaultAttachmentStore({
-    spoolDir: path5.join(wpaths.projectSessions, session.id, "attachments")
+    spoolDir: path6.join(wpaths.projectSessions, session.id, "attachments")
   });
   const queueStore = new QueueStore({
-    dir: path5.join(wpaths.projectSessions, session.id)
+    dir: path6.join(wpaths.projectSessions, session.id)
   });
   const tokenCounter = container.resolve(TOKENS.TokenCounter);
   const stats = new SessionStats(events, tokenCounter);
@@ -4889,7 +4924,10 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     }
   };
   const directorMode = flags["director"] === true;
-  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path5.join(wpaths.projectSessions, session.id, "fleet.json") : void 0;
+  const fleetRoot = directorMode ? path6.join(wpaths.projectSessions, session.id) : void 0;
+  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path6.join(fleetRoot, "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path6.join(fleetRoot, "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path6.join(fleetRoot, "subagents") : void 0;
   const multiAgentHost = new MultiAgentHost({
     container,
     toolRegistry,
@@ -4901,9 +4939,27 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     tokenCounter,
     projectRoot,
     cwd
-  }, { directorMode, manifestPath });
+  }, {
+    directorMode,
+    manifestPath,
+    sharedScratchpadPath,
+    sessionsRoot: subagentSessionsRoot,
+    directorRunId: session.id
+  });
   if (directorMode) {
-    renderer.writeInfo(`Director mode enabled. Fleet manifest \u2192 ${manifestPath}`);
+    const director = await multiAgentHost.ensureDirector();
+    if (director) {
+      for (const tool of director.tools(FLEET_ROSTER)) {
+        toolRegistry.register(tool);
+      }
+      renderer.writeInfo(`Director mode enabled. Roster: ${Object.keys(FLEET_ROSTER).join(", ")}`);
+      renderer.writeInfo(`  fleet root \u2192 ${fleetRoot}`);
+      renderer.writeInfo(`  manifest   \u2192 ${manifestPath}`);
+      renderer.writeInfo(`  scratchpad \u2192 ${sharedScratchpadPath}`);
+      renderer.writeInfo(`  subagents  \u2192 ${subagentSessionsRoot}`);
+    } else {
+      renderer.writeInfo(`Director mode enabled. Fleet manifest \u2192 ${manifestPath}`);
+    }
   }
   const slashCmds = buildBuiltinSlashCommands({
     registry: slashRegistry,
@@ -5157,7 +5213,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
         tokenCounter,
         attachments,
         effectiveMaxContext,
-        projectName: path5.basename(projectRoot) || void 0
+        projectName: path6.basename(projectRoot) || void 0
       });
       await webuiPromise;
     } else {
@@ -5169,7 +5225,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
         tokenCounter,
         attachments,
         effectiveMaxContext,
-        projectName: path5.basename(projectRoot) || void 0
+        projectName: path6.basename(projectRoot) || void 0
       });
     }
   } finally {