@wrongstack/cli 0.5.6 → 0.5.7

package/dist/index.js

@@ -3,7 +3,7 @@ import * as path21 from 'path';
 import { join } from 'path';
 import * as fsp2 from 'fs/promises';
 import { readdir, readFile } from 'fs/promises';
-import { color, allServers, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, SlashCommandRegistry, loadPlugins, createDelegateTool, FLEET_ROSTER, DefaultLogger, DefaultModelsRegistry, ProviderRegistry, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokens, Agent, makeDirectorSessionFactory, Director, DefaultMultiAgentCoordinator, makeAgentSubagentRunner, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, atomicWrite, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, formatPlanTemplates, getPlanTemplate, addPlanItem, formatPlan, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, SpecStore, TaskGraphStore, SpecVersioning, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, InputBuilder, projectHash, defaultOrchestrator, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, DefaultPluginAPI } from '@wrongstack/core';
+import { color, allServers, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, SlashCommandRegistry, loadPlugins, createDelegateTool, FLEET_ROSTER, DefaultLogger, DefaultModelsRegistry, ProviderRegistry, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokens, Agent, FleetManager, makeDirectorSessionFactory, Director, makeAgentSubagentRunner, NULL_FLEET_BUS, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, atomicWrite, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, formatPlanTemplates, getPlanTemplate, addPlanItem, formatPlan, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, SpecStore, TaskGraphStore, SpecVersioning, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, InputBuilder, projectHash, defaultOrchestrator, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, DefaultPluginAPI } from '@wrongstack/core';
 import { createRequire } from 'module';
 import * as os6 from 'os';
 import os6__default from 'os';
@@ -7339,6 +7339,8 @@ async function execute(deps) {
         result = await agent.run(query, { signal: ctrl.signal });
       } finally {
         process.off("SIGINT", onSigint);
+        const { getProcessRegistry } = await import('@wrongstack/tools');
+        getProcessRegistry().killAll();
       }
       const after = tokenCounter.total();
       const costAfter = tokenCounter.estimateCost().total;
@@ -7537,22 +7539,18 @@ var MultiAgentHost = class {
     this.opts = opts;
   }
   deps;
-  coordinator;
-  /** Lazily built when `opts.directorMode` is set. Owns its own internal
-   *  coordinator; the host's `coordinator` field still points at it so
-   *  the rest of the methods don't need to branch. */
   director;
+  /** Own FleetManager — created in buildDirector(), used for pending task
+   *  tracking so status() can show descriptions without host-side state. */
+  fleetManager;
   /** Lazily built alongside the director — produces per-subagent JSONL
-   *  writers under `<sessionsRoot>/<runId>/`. Null in non-director mode. */
+   *  writers under `<sessionsRoot>/<runId>/`. Null without sessionsRoot. */
   sessionFactory;
-  pending = /* @__PURE__ */ new Map();
-  results = [];
   opts;
   /**
-   * Populated by `promoteToDirector` when it refuses to promote (typically
-   * because a non-director coordinator is already running). The delegate
+   * Populated by `promoteToDirector` when it refuses to promote. The delegate
    * tool reads this through `getPromotionBlockReason` to render an
-   * actionable error instead of a generic "could not activate director".
+   * actionable error instead of a generic "Director could not be activated".
    */
   promotionBlockReason = null;
   /**
@@ -7565,14 +7563,34 @@ var MultiAgentHost = class {
    * orchestration tools and `--director` becomes a no-op.
    */
   async ensureDirector() {
+    if (this.director) return this.director;
     if (!this.opts.directorMode) return null;
-    await this.ensureCoordinator();
+    await this.buildDirector();
     return this.director ?? null;
   }
-  async ensureCoordinator() {
-    if (this.coordinator) return this.coordinator;
+  /** Access the Director's internal coordinator. Returns the concrete
+   *  `DefaultMultiAgentCoordinator` so callers can use class-only surface
+   *  (`on`, `setRunner`) that isn't part of the `MultiAgentCoordinator`
+   *  interface. */
+  getCoordinator() {
+    return this.director.coordinator;
+  }
+  async buildDirector() {
+    if (this.director) return;
     const config = this.deps.configStore.get();
-    if (this.opts.directorMode && this.opts.sessionsRoot && !this.sessionFactory) {
+    const fleetManager = new FleetManager({
+      manifestPath: this.opts.manifestPath,
+      sessionsRoot: this.opts.sessionsRoot,
+      directorRunId: this.opts.directorRunId,
+      stateCheckpointPath: this.opts.stateCheckpointPath,
+      sessionWriter: this.opts.sessionWriter,
+      directorBudget: this.opts.directorBudget,
+      manifestDebounceMs: 2e3,
+      checkpointDebounceMs: this.opts.checkpointDebounceMs ?? 250,
+      maxSpawnDepth: 5
+    });
+    this.fleetManager = fleetManager;
+    if (this.opts.sessionsRoot && !this.sessionFactory) {
       this.sessionFactory = makeDirectorSessionFactory({
         sessionsRoot: this.opts.sessionsRoot,
         directorRunId: this.opts.directorRunId
@@ -7582,75 +7600,45 @@ var MultiAgentHost = class {
       coordinatorId: randomUUID(),
       doneCondition: { type: "all_tasks_done" },
       maxConcurrent: 8
-      // No defaultBudget. Caps land on a subagent ONLY when the
-      // orchestrator (delegate-tool / spawn_subagent) or the user
-      // (CLI flag) sets them explicitly. The prior defaults
-      // (1000 tools / 200 iter / 4h) silently killed long autonomous
-      // runs; for a "work until done" director we want no implicit
-      // ceilings. The orchestrator can still cap a single subagent
-      // by passing maxToolCalls/maxIterations through the spawn tool.
     };
-    if (this.opts.directorMode) {
-      const defaultScratchpad = this.opts.sharedScratchpadPath || (this.opts.sessionsRoot && this.opts.directorRunId ? path21.join(this.opts.sessionsRoot, this.opts.directorRunId, "shared") : void 0);
-      this.director = new Director({
-        config: coordinatorConfig,
-        manifestPath: this.opts.manifestPath,
-        sharedScratchpadPath: defaultScratchpad,
-        stateCheckpointPath: this.opts.stateCheckpointPath,
-        sessionWriter: this.opts.sessionWriter,
-        directorBudget: this.opts.directorBudget,
-        maxBudgetExtensions: this.opts.maxBudgetExtensions,
-        checkpointDebounceMs: this.opts.checkpointDebounceMs,
-        sessionsRoot: this.opts.sessionsRoot,
-        directorRunId: this.opts.directorRunId,
-        // Autonomy: allow nested directors a few levels deep. Default
-        // is 2 (root + one tier of workers), which trips the moment a
-        // worker tries to recurse into "let me delegate the parser
-        // analysis to a tighter specialist". 5 lets the director
-        // structure work as deeply as the task requires without us
-        // having to pass a flag every time.
-        maxSpawnDepth: 5
-      });
-      this.director.on("task.completed", ({ task, result }) => {
-        this.results.push(result);
-        this.pending.delete(task.id);
-        this.emitLifecycleCompleted(task.id, result);
+    const defaultScratchpad = this.opts.sharedScratchpadPath || (this.opts.sessionsRoot && this.opts.directorRunId ? path21.join(this.opts.sessionsRoot, this.opts.directorRunId, "shared") : void 0);
+    this.director = new Director({
+      config: coordinatorConfig,
+      manifestPath: this.opts.manifestPath,
+      sharedScratchpadPath: defaultScratchpad,
+      stateCheckpointPath: this.opts.stateCheckpointPath,
+      sessionWriter: this.opts.sessionWriter,
+      directorBudget: this.opts.directorBudget,
+      maxBudgetExtensions: this.opts.maxBudgetExtensions,
+      checkpointDebounceMs: this.opts.checkpointDebounceMs,
+      sessionsRoot: this.opts.sessionsRoot,
+      directorRunId: this.opts.directorRunId,
+      maxSpawnDepth: 5,
+      fleetManager
+      // pass so director.fleetManager is never undefined
+    });
+    this.director.on("task.completed", ({ task, result }) => {
+      this.fleetManager?.removePendingTask(task.id);
+      this.emitLifecycleCompleted(task.id, result);
+    });
+    this.director.fleet.filter("budget.threshold_reached", (e) => {
+      const payload = e.payload;
+      this.deps.events.emit("subagent.budget_warning", {
+        subagentId: e.subagentId,
+        kind: payload.kind,
+        used: payload.used,
+        limit: payload.limit
       });
-      this.director.fleet.filter("budget.threshold_reached", (e) => {
-        const payload = e.payload;
-        this.deps.events.emit("subagent.budget_warning", {
-          subagentId: e.subagentId,
-          kind: payload.kind,
-          used: payload.used,
-          limit: payload.limit
-        });
+    });
+    this.getCoordinator().on("task.assigned", ({ task, subagentId }) => {
+      this.deps.events.emit("subagent.task_started", {
+        subagentId,
+        taskId: task.id,
+        description: task.description
       });
-      this.coordinator = this.director.coordinator;
-    } else {
-      this.coordinator = new DefaultMultiAgentCoordinator(coordinatorConfig, {});
-      this.coordinator.on(
-        "task.completed",
-        ({ task, result }) => {
-          this.results.push(result);
-          this.pending.delete(task.id);
-          this.emitLifecycleCompleted(task.id, result);
-        }
-      );
-    }
-    this.coordinator.on(
-      "task.assigned",
-      ({ task, subagentId }) => {
-        this.deps.events.emit("subagent.task_started", {
-          subagentId,
-          taskId: task.id,
-          description: task.description
-        });
-      }
-    );
+    });
     const runner = this.buildSubagentRunner(config);
-    const innerCoord = this.opts.directorMode ? this.director.coordinator : this.coordinator;
-    innerCoord.setRunner(runner);
-    return this.coordinator;
+    this.getCoordinator().setRunner(runner);
   }
   /**
    * Build the per-subagent runner: agent factory → runner. Extracted so
@@ -7732,7 +7720,7 @@ var MultiAgentHost = class {
       };
       return { agent, events, dispose };
     };
-    return makeAgentSubagentRunner({ factory, fleetBus: this.director?.fleet });
+    return makeAgentSubagentRunner({ factory, fleetBus: this.director?.fleet ?? NULL_FLEET_BUS });
   }
   /**
    * Build a Provider for a subagent. When `overrideId` is supplied (from
@@ -7778,7 +7766,7 @@ var MultiAgentHost = class {
    * the full tool registry.
    */
   async spawn(description, opts) {
-    await this.ensureCoordinator();
+    await this.buildDirector();
     const subagentConfig = {
       name: opts?.name ?? "adhoc",
       role: "general",
@@ -7787,34 +7775,10 @@ var MultiAgentHost = class {
       tools: opts?.tools
     };
     const transcriptPath = this.sessionFactory ? path21.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
-    if (this.director) {
-      const subagentId = await this.director.spawn(subagentConfig);
-      const taskId2 = randomUUID();
-      this.pending.set(taskId2, { description, subagentId });
-      this.deps.events.emit("subagent.spawned", {
-        subagentId,
-        taskId: taskId2,
-        name: subagentConfig.name,
-        provider: opts?.provider,
-        model: opts?.model,
-        description,
-        transcriptPath
-      });
-      await this.director.assign({
-        id: taskId2,
-        description,
-        subagentId
-        // No maxToolCalls — same reasoning as the spawn config above.
-        // The director / orchestrator owns the budget decision.
-      });
-      return { subagentId, taskId: taskId2 };
-    }
-    const coord = this.coordinator;
-    const spawned = await coord.spawn(subagentConfig);
-    const taskId = randomUUID();
-    this.pending.set(taskId, { description, subagentId: spawned.subagentId });
+    const { subagentId, taskId } = await this._spawnAndAssign(subagentConfig);
+    this.fleetManager?.addPendingTask(taskId, subagentId, description);
     this.deps.events.emit("subagent.spawned", {
-      subagentId: spawned.subagentId,
+      subagentId,
       taskId,
       name: subagentConfig.name,
       provider: opts?.provider,
@@ -7822,13 +7786,22 @@ var MultiAgentHost = class {
       description,
       transcriptPath
     });
-    await coord.assign({
-      id: taskId,
-      description,
-      subagentId: spawned.subagentId
-      // No maxToolCalls — see comment on the director branch above.
-    });
-    return { subagentId: spawned.subagentId, taskId };
+    return { subagentId, taskId };
+  }
+  /**
+   * Common spawn + assign logic shared by both director mode and raw
+   * coordinator mode. Extracts the identical body from the two branches
+   * in `spawn()` so future changes (e.g. adding a new field to both
+   * paths) are made in one place.
+   *
+   * Returns `{ subagentId, taskId }`. Caller holds `pending` tracking
+   * and event emission — the helper only talks to the coordinator.
+   */
+  async _spawnAndAssign(subagentConfig) {
+    const taskId = randomUUID();
+    const subagentId = await this.director.spawn(subagentConfig);
+    await this.director.assign({ id: taskId, description: "", subagentId });
+    return { subagentId, taskId };
   }
   /**
    * Relay a `task.completed` notification (from either the Director or
@@ -7851,29 +7824,24 @@ var MultiAgentHost = class {
   }
   status() {
     const activeSubagentIds = /* @__PURE__ */ new Set();
-    if (this.coordinator) {
-      const s = this.coordinator.getStatus();
+    const live = [];
+    if (this.director) {
+      const coord = this.getCoordinator();
+      const s = coord.getStatus();
       for (const a of s.subagents) {
         if (a.status === "running" || a.status === "idle") {
           activeSubagentIds.add(a.id);
         }
-      }
-    }
-    const pending = Array.from(this.pending.entries()).filter(([, v]) => activeSubagentIds.has(v.subagentId)).map(([taskId, v]) => ({
-      taskId,
-      description: v.description,
-      subagentId: v.subagentId
-    }));
-    const live = [];
-    if (this.coordinator) {
-      const s = this.coordinator.getStatus();
-      for (const a of s.subagents) {
         live.push({ subagentId: a.id, status: a.status, task: a.currentTask });
       }
     }
+    const fleetStatus = this.fleetManager?.getFleetStatus() ?? { pending: []};
+    const pending = fleetStatus.pending.filter((p) => activeSubagentIds.has(p.subagentId));
+    const completed = this.director ? this.director.completedResults() : [];
+    const completedCount = completed.length;
     const liveCount = live.filter((s) => s.status === "running" || s.status === "idle").length;
-    const summary = !this.coordinator ? "No subagents have been spawned." : liveCount > 0 ? `${pending.length} pending, ${liveCount} active, ${this.results.length} completed.` : `${pending.length} pending, ${this.results.length} completed.`;
-    return { pending, completed: this.results, live, summary };
+    const summary = !this.director ? "No subagents have been spawned." : liveCount > 0 ? `${pending.length} pending, ${liveCount} active, ${completedCount} completed.` : `${pending.length} pending, ${completedCount} completed.`;
+    return { pending, completed, live, summary };
   }
   /**
    * Roll up per-subagent runtime cost from completed TaskResults. We don't
@@ -7886,8 +7854,9 @@ var MultiAgentHost = class {
    * the table renders the most interesting subagent at the top.
    */
   usage() {
+    const completed = this.director ? this.director.completedResults() : [];
     const bySubagent = /* @__PURE__ */ new Map();
-    for (const r of this.results) {
+    for (const r of completed) {
       const cur = bySubagent.get(r.subagentId) ?? {
         tasks: 0,
         iterations: 0,
@@ -7933,7 +7902,7 @@ var MultiAgentHost = class {
    */
   async manifest() {
     if (!this.director) return null;
-    return this.director.writeManifest();
+    return await this.director.fleetManager?.writeManifest() ?? null;
   }
   /**
    * Promote a non-director session to director mode at runtime. Only
@@ -7946,13 +7915,6 @@ var MultiAgentHost = class {
    */
   async promoteToDirector() {
     if (this.director) return this.director;
-    if (this.coordinator) {
-      const status = this.coordinator.getStatus();
-      const running = status.subagents.filter((s) => s.status === "running").length;
-      const idle = status.subagents.filter((s) => s.status === "idle").length;
-      this.promotionBlockReason = `Cannot promote to director: a non-director coordinator is already in use (${running} running, ${idle} idle, ${status.pendingTasks} pending tasks). Stop the existing subagents with /fleet kill <id> or wait for them to finish, then retry \u2014 or restart wstack with --director to start in director mode.`;
-      return null;
-    }
     this.opts.directorMode = true;
     if (this.opts.fleetRoot && !this.opts.manifestPath) {
       this.opts.manifestPath = path21.join(this.opts.fleetRoot, "fleet.json");
@@ -7994,13 +7956,13 @@ var MultiAgentHost = class {
    * called /fleet kill before any /spawn, and there's nothing to do.
    */
   async kill(subagentId) {
-    if (!this.coordinator) return false;
-    await this.coordinator.stop(subagentId);
+    if (!this.director) return false;
+    await this.getCoordinator().stop(subagentId);
     return true;
   }
   async stopAll() {
-    if (this.coordinator) {
-      await this.coordinator.stopAll();
+    if (this.director) {
+      await this.getCoordinator().stopAll();
     }
   }
 };