@wrongstack/cli 0.8.5 → 0.9.0

package/dist/index.js

@@ -3,7 +3,7 @@ import * as path25 from 'path';
 import { join } from 'path';
 import * as fsp3 from 'fs/promises';
 import { readdir, readFile } from 'fs/promises';
-import { color, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, SlashCommandRegistry, createDelegateTool, FLEET_ROSTER, createMcpControlTool, EternalAutonomyEngine, DefaultLogger, DefaultModelsRegistry, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokens, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, PhaseOrchestrator, makeLLMClassifier, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, atomicWrite, DefaultPluginAPI, makeAgentSubagentRunner, NULL_FLEET_BUS, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, AGENTS_BY_PHASE, dispatchAgent, formatTodosList, emptyPlan, clearPlan, savePlan, formatPlanTemplates, getPlanTemplate, addPlanItem, formatPlan, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, renderProgress, renderTaskGraph, loadGoal, goalFilePath, summarizeUsage, saveGoal, emptyGoal, buildGoalPreamble, formatGoal, pendingBtwCount, setBtwNote, InputBuilder, FsError, ERROR_CODES, projectHash, WrongStackError, defaultOrchestrator, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, SpecVersioning, ParallelEternalEngine, allServers as allServers$1 } from '@wrongstack/core';
+import { color, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, SlashCommandRegistry, createDelegateTool, FLEET_ROSTER, createMcpControlTool, EternalAutonomyEngine, DefaultLogger, DefaultModelsRegistry, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokens, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, atomicWrite, DefaultPluginAPI, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, AGENTS_BY_PHASE, dispatchAgent, formatTodosList, emptyPlan, clearPlan, savePlan, formatPlanTemplates, getPlanTemplate, addPlanItem, formatPlan, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, renderProgress, renderTaskGraph, loadGoal, goalFilePath, summarizeUsage, saveGoal, emptyGoal, buildGoalPreamble, formatGoal, pendingBtwCount, setBtwNote, InputBuilder, FsError, ERROR_CODES, projectHash, WrongStackError, defaultOrchestrator, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, SpecVersioning, ParallelEternalEngine, allServers as allServers$1 } from '@wrongstack/core';
 import { createRequire } from 'module';
 import * as os6 from 'os';
 import os6__default from 'os';
@@ -6141,6 +6141,51 @@ function buildAutoPhaseCommand(opts) {
   };
 }
 
+// src/slash-commands/worktree.ts
+function buildWorktreeCommand(opts) {
+  return {
+    name: "worktree",
+    aliases: ["wt"],
+    description: "Inspect/manage git worktrees used for AutoPhase per-phase isolation.",
+    argsHint: "[list | merge <branch> | prune | clean]",
+    help: [
+      "Usage: /worktree [subcommand]",
+      "",
+      "  list             List active worktrees (default).",
+      "  merge <branch>   Squash-merge <branch> into the current branch.",
+      "  prune            Remove stale worktree administrative entries.",
+      "  clean            Remove all wstack-managed worktrees and branches.",
+      "",
+      "AutoPhase allocates one worktree per phase under .wrongstack/worktrees/",
+      "so parallelizable phases run isolated, then merge back sequentially."
+    ].join("\n"),
+    async run(args) {
+      if (!opts.onWorktree) {
+        return { message: "\u26A0 No worktree manager active in this session." };
+      }
+      const parts = args.trim().split(/\s+/).filter(Boolean);
+      const sub = (parts[0] ?? "list").toLowerCase();
+      switch (sub) {
+        case "list":
+          return { message: await opts.onWorktree("list") };
+        case "merge": {
+          const branch = parts[1];
+          if (!branch) return { message: "Usage: /worktree merge <branch>" };
+          return { message: await opts.onWorktree("merge", branch) };
+        }
+        case "prune":
+          return { message: await opts.onWorktree("prune") };
+        case "clean":
+          return { message: await opts.onWorktree("clean") };
+        default:
+          return {
+            message: `Unknown subcommand "${sub}". Valid: list, merge <branch>, prune, clean.`
+          };
+      }
+    }
+  };
+}
+
 // src/slash-commands/index.ts
 function buildBuiltinSlashCommands(opts) {
   return [
@@ -6183,6 +6228,7 @@ function buildBuiltinSlashCommands(opts) {
     buildSecurityCommand(opts),
     buildFixCommand(opts),
     buildAutoPhaseCommand(opts),
+    buildWorktreeCommand(opts),
     buildStatuslineCommand({
       cwd: opts.cwd,
       hiddenItems: opts.statuslineHiddenItems ?? [],
@@ -6291,9 +6337,9 @@ async function runProjectCheck(opts) {
     }
     if (answer2 === "y" || answer2 === "yes") {
       try {
-        const { spawn: spawn3 } = await import('child_process');
+        const { spawn: spawn4 } = await import('child_process');
         await new Promise((resolve4, reject) => {
-          const child = spawn3("git", ["init"], { cwd: projectRoot });
+          const child = spawn4("git", ["init"], { cwd: projectRoot });
           child.on("error", reject);
           child.on("close", (code) => code === 0 ? resolve4() : reject(new Error(`git init failed with ${code}`)));
         });
@@ -9606,7 +9652,7 @@ var rewindCmd = async (args, deps) => {
   const flags = parseRewindFlags(args);
   const wpaths = resolveWstackPaths({ projectRoot: deps.projectRoot });
   const sessionsDir = path25.join(wpaths.globalRoot, "sessions");
-  const rewind = new DefaultSessionRewinder(sessionsDir);
+  const rewind = new DefaultSessionRewinder(sessionsDir, deps.projectRoot);
   let sessionId = findSessionId(args);
   if (!sessionId) {
     if (!deps.sessionStore) {
@@ -10942,7 +10988,14 @@ async function execute(deps) {
           "graph.completed",
           "graph.failed",
           "agent.assigned",
-          "agent.released"
+          "agent.released",
+          // Git-worktree isolation lifecycle → TUI worktree panel/monitor.
+          "worktree.allocated",
+          "worktree.committed",
+          "worktree.merged",
+          "worktree.conflict",
+          "worktree.released",
+          "worktree.failed"
         ];
         const onUntyped = events.on.bind(events);
         const offUntyped = events.off.bind(events);
@@ -11260,8 +11313,9 @@ var MultiAgentHost = class {
     return async (subCfg) => {
       const events = new EventBus();
       const provider = await this.buildSubagentProvider(config, subCfg.provider);
+      const subCwd = subCfg.cwd ?? this.deps.cwd;
       const baseSystem = await this.deps.systemPromptBuilder.build({
-        cwd: this.deps.cwd,
+        cwd: subCwd,
         projectRoot: this.deps.projectRoot,
         tools: this.filterTools(subCfg.tools),
         model: subCfg.model ?? config.model,
@@ -11297,7 +11351,7 @@ var MultiAgentHost = class {
         session: subSession,
         signal: new AbortController().signal,
         tokenCounter: this.deps.tokenCounter,
-        cwd: this.deps.cwd,
+        cwd: subCwd,
         projectRoot: this.deps.projectRoot,
         model: subCfg.model ?? config.model,
         tools: this.filterTools(subCfg.tools)
@@ -11865,14 +11919,33 @@ function samplePaths(set) {
   if (arr.length <= 2) return arr.join(", ");
   return `${arr[0]}, \u2026 (+${arr.length - 1} more)`;
 }
+var WORKTREE_PHASE_CONCURRENCY = 4;
+function gitText(args, cwd) {
+  return new Promise((resolve4) => {
+    let out = "";
+    const child = spawn("git", args, { cwd, env: buildChildEnv(), stdio: ["ignore", "pipe", "pipe"] });
+    child.stdout?.on("data", (c) => {
+      out += c.toString();
+    });
+    child.stderr?.on("data", (c) => {
+      out += c.toString();
+    });
+    child.on("error", () => resolve4({ code: 1, out }));
+    child.on("close", (code) => resolve4({ code: code ?? 1, out: out.trim() }));
+  });
+}
+async function isGitRepo2(cwd) {
+  const { code, out } = await gitText(["rev-parse", "--is-inside-work-tree"], cwd);
+  return code === 0 && out.trim() === "true";
+}
 function createAutoPhaseHost(deps) {
   const store = new PhaseStore({ baseDir: deps.storeDir });
   let active = null;
   const log = deps.log ?? (() => {
   });
-  async function runOnce(prompt, label, signal) {
+  async function runOnce(prompt, label, signal, cwd) {
     const factory = deps.multiAgentHost.makeSubagentFactory(deps.getConfig());
-    const built = await factory({ name: label });
+    const built = await factory({ name: label, cwd });
     try {
       const result = await built.agent.run(prompt, { signal });
       if (result.status !== "done") {
@@ -11936,16 +12009,23 @@ function createAutoPhaseHost(deps) {
         autonomous: true
       }).build();
       await persist(graph);
+      const worktreesEnabled = deps.worktrees !== false && process.env["WRONGSTACK_AUTOPHASE_WORKTREES"] !== "0";
+      let worktrees;
+      if (worktreesEnabled && await isGitRepo2(deps.projectRoot)) {
+        worktrees = new WorktreeManager({ projectRoot: deps.projectRoot, events: deps.events });
+        log(`\u{1F33F} Worktree isolation on \u2014 up to ${deps.maxConcurrentPhases ?? WORKTREE_PHASE_CONCURRENCY} phases run in parallel.`);
+      }
       const orchestrator = new PhaseOrchestrator({
         graph,
         ctx: {
-          executeTask: async (task, phaseId) => {
+          executeTask: async (task, phaseId, env) => {
             const phase = graph.phases.get(phaseId);
             const phaseName = phase?.name ?? phaseId;
             return runOnce(
               buildTaskPrompt(task, phaseName, goal),
               `autophase-${phaseName}-${task.title}`.slice(0, 48),
-              abort.signal
+              abort.signal,
+              env?.cwd
             );
           },
           onPhaseComplete: (phase) => {
@@ -11958,11 +12038,13 @@ function createAutoPhaseHost(deps) {
           }
         },
         events: deps.events,
+        worktrees,
         autonomous: true,
-        maxConcurrentPhases: 1,
-        // Sequential within a phase: each todo is a full-tool agent editing the
-        // shared working tree, and todos in a phase typically build on one
-        // another. Running two at once risks concurrent writes / lost edits.
+        // With isolation, parallelizable phases run concurrently; without it,
+        // stay strictly sequential to protect the shared working tree.
+        maxConcurrentPhases: worktrees ? deps.maxConcurrentPhases ?? WORKTREE_PHASE_CONCURRENCY : 1,
+        // Sequential within a phase: each todo is a full-tool agent and todos in
+        // a phase typically build on one another (they share the phase worktree).
         maxConcurrentTasks: 1
       });
       const onUntyped = deps.events.on;
@@ -12006,6 +12088,46 @@ function createAutoPhaseHost(deps) {
         getProgress: () => a.orchestrator.getProgress(),
         isRunning: () => a.orchestrator.isRunning()
       };
+    },
+    async onWorktree(action, target) {
+      const root = deps.projectRoot;
+      if (!await isGitRepo2(root)) return "\u26A0 Not a git repository \u2014 worktrees unavailable.";
+      switch (action) {
+        case "list": {
+          const { out } = await gitText(["worktree", "list"], root);
+          return out || "No worktrees.";
+        }
+        case "prune": {
+          await gitText(["worktree", "prune"], root);
+          const { out } = await gitText(["worktree", "list"], root);
+          return `Pruned stale worktree entries.
+${out}`;
+        }
+        case "merge": {
+          if (!target) return "Usage: /worktree merge <branch>";
+          if (target.startsWith("-")) return `Refusing unsafe branch name: ${target}`;
+          const base = (await gitText(["rev-parse", "--abbrev-ref", "HEAD"], root)).out || "HEAD";
+          await gitText(["merge", "--squash", target], root);
+          const commit = await gitText(["commit", "-m", `merge ${target} (squash)`], root);
+          if (commit.code !== 0 && !/nothing to commit/i.test(commit.out)) {
+            await gitText(["reset", "--hard", "HEAD"], root);
+            return `\u26A0 Merge of "${target}" into ${base} hit conflicts and was rolled back.
+${commit.out}`;
+          }
+          return `\u2713 Merged "${target}" into ${base} (squash).`;
+        }
+        case "clean": {
+          const list = (await gitText(["worktree", "list", "--porcelain"], root)).out;
+          const dirs = list.split("\n").filter((l) => l.startsWith("worktree ")).map((l) => l.slice("worktree ".length)).filter((d) => d.includes(".wrongstack") && d.includes("worktrees"));
+          for (const d of dirs) await gitText(["worktree", "remove", "--force", d], root);
+          await gitText(["worktree", "prune"], root);
+          const branches = (await gitText(["branch", "--list", "wstack/ap/*"], root)).out.split("\n").map((b) => b.replace(/^[*+]?\s*/, "").trim()).filter(Boolean);
+          for (const b of branches) await gitText(["branch", "-D", b], root);
+          return `\u{1F9F9} Removed ${dirs.length} worktree(s) and ${branches.length} branch(es).`;
+        }
+        default:
+          return `Unknown worktree action: ${action}`;
+      }
     }
   };
 }
@@ -12837,6 +12959,7 @@ async function main(argv) {
     getConfig: () => config,
     events,
     storeDir: wpaths.projectAutophase,
+    projectRoot,
     log: (line) => renderer.write(`${line}
 `)
   });
@@ -13360,10 +13483,10 @@ Restart WrongStack to load or unload plugin code in this session.`;
       void mcpRegistry.stopAll();
     },
     onBeforeExit: async () => {
-      const { spawn: spawn3 } = await import('child_process');
+      const { spawn: spawn4 } = await import('child_process');
       const cwd2 = projectRoot;
       const statusResult = await new Promise((resolve4, reject) => {
-        const child = spawn3("git", ["status", "--porcelain"], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
+        const child = spawn4("git", ["status", "--porcelain"], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
         let stdout = "";
         child.stdout?.on("data", (d) => {
           stdout += d;
@@ -13471,7 +13594,8 @@ Restart WrongStack to load or unload plugin code in this session.`;
     onAutoPhasePause: autoPhaseHost.onAutoPhasePause,
     onAutoPhaseResume: autoPhaseHost.onAutoPhaseResume,
     onAutoPhaseStop: autoPhaseHost.onAutoPhaseStop,
-    getAutoPhaseRunner: autoPhaseHost.getAutoPhaseRunner
+    getAutoPhaseRunner: autoPhaseHost.getAutoPhaseRunner,
+    onWorktree: autoPhaseHost.onWorktree
   });
   for (const cmd of slashCmds) slashRegistry.register(cmd);
   const eternalFlag = typeof flags["eternal"] === "string" ? flags["eternal"].trim() : "";