@wrongstack/cli 0.5.0 → 0.5.2

package/dist/index.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import * as path17 from 'path';
-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, atomicWrite, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, removePlanItem, formatPlan, setPlanItemStatus, addPlanItem, SpecStore, TaskGraphStore, SpecVersioning, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, InputBuilder, projectHash, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, DefaultPluginAPI } from '@wrongstack/core';
+import * as path18 from 'path';
+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, removePlanItem, formatPlan, setPlanItemStatus, addPlanItem, SpecStore, TaskGraphStore, SpecVersioning, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, InputBuilder, projectHash, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, DefaultPluginAPI } from '@wrongstack/core';
 import * as crypto from 'crypto';
 import { randomUUID } from 'crypto';
-import * as fs14 from 'fs/promises';
+import * as fs5 from 'fs/promises';
 import { DefaultSecretVault as DefaultSecretVault$1, encryptConfigSecrets, decryptConfigSecrets as decryptConfigSecrets$1 } from '@wrongstack/core/security';
 import { WebSocketServer, WebSocket } from 'ws';
 import { writeFileSync } from 'fs';
@@ -14,6 +14,7 @@ import { createDefaultContainer, routeImagesForModel, readClipboardImage } from
 import { builtinToolsPack, rememberTool, forgetTool } from '@wrongstack/tools';
 import * as os4 from 'os';
 import * as readline from 'readline';
+import { spawn } from 'child_process';
 import { SkillInstaller } from '@wrongstack/core/skills';
 import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
 
@@ -236,8 +237,8 @@ function buildSddCommand(opts) {
     async run(args) {
       const ctx = opts.context;
       const projectRoot = ctx?.projectRoot ?? process.cwd();
-      const specsDir = path17.join(projectRoot, ".wrongstack", "specs");
-      const graphsDir = path17.join(projectRoot, ".wrongstack", "task-graphs");
+      const specsDir = path18.join(projectRoot, ".wrongstack", "specs");
+      const graphsDir = path18.join(projectRoot, ".wrongstack", "task-graphs");
       const specStore = new SpecStore({ baseDir: specsDir });
       new TaskGraphStore({ baseDir: graphsDir });
       const versioning = new SpecVersioning();
@@ -253,7 +254,7 @@ function buildSddCommand(opts) {
           const forceFlag = rest.includes("--force") || rest.includes("-f");
           const title = rest.filter((a) => !a.startsWith("-")).join(" ").trim() || "Untitled Feature";
           if (!activeBuilder && !forceFlag) {
-            const sessionPath = path17.join(projectRoot, ".wrongstack", "sdd-session.json");
+            const sessionPath = path18.join(projectRoot, ".wrongstack", "sdd-session.json");
             try {
               const fsp = await import('fs/promises');
               await fsp.access(sessionPath);
@@ -291,7 +292,7 @@ function buildSddCommand(opts) {
             projectContext,
             minQuestions: 2,
             maxQuestions: 10,
-            sessionPath: path17.join(projectRoot, ".wrongstack", "sdd-session.json")
+            sessionPath: path18.join(projectRoot, ".wrongstack", "sdd-session.json")
           });
           activeBuilder.startSession(title);
           const aiPrompt = activeBuilder.getAIPrompt();
@@ -551,7 +552,7 @@ Start executing the tasks one by one.`
           };
         }
         case "cancel": {
-          const sessionPath = path17.join(projectRoot, ".wrongstack", "sdd-session.json");
+          const sessionPath = path18.join(projectRoot, ".wrongstack", "sdd-session.json");
           let deletedFromDisk = false;
           try {
             const fsp = await import('fs/promises');
@@ -577,7 +578,7 @@ Start executing the tasks one by one.`
           if (activeBuilder) {
             return { message: "An SDD session is already active. Use /sdd cancel first." };
           }
-          const sessionPath = path17.join(projectRoot, ".wrongstack", "sdd-session.json");
+          const sessionPath = path18.join(projectRoot, ".wrongstack", "sdd-session.json");
           const projectContext = await gatherProjectContext(projectRoot);
           activeBuilder = new AISpecBuilder({
             store: specStore,
@@ -803,7 +804,7 @@ async function gatherProjectContext(projectRoot) {
   const parts = [];
   try {
     const fsp = await import('fs/promises');
-    const pkgPath = path17.join(projectRoot, "package.json");
+    const pkgPath = path18.join(projectRoot, "package.json");
     const pkgRaw = await fsp.readFile(pkgPath, "utf8");
     const pkg = JSON.parse(pkgRaw);
     parts.push(`Project: ${String(pkg.name ?? "unknown")}`);
@@ -820,14 +821,14 @@ async function gatherProjectContext(projectRoot) {
   }
   try {
     const fsp = await import('fs/promises');
-    const tsconfigPath = path17.join(projectRoot, "tsconfig.json");
+    const tsconfigPath = path18.join(projectRoot, "tsconfig.json");
     await fsp.access(tsconfigPath);
     parts.push("Language: TypeScript");
   } catch {
   }
   try {
     const fsp = await import('fs/promises');
-    const srcDir = path17.join(projectRoot, "src");
+    const srcDir = path18.join(projectRoot, "src");
     const entries = await fsp.readdir(srcDir, { withFileTypes: true });
     const dirs = entries.filter((e) => e.isDirectory()).map((e) => e.name);
     if (dirs.length > 0) {
@@ -1381,7 +1382,7 @@ async function runWebUI(opts) {
     if (!opts.globalConfigPath) return {};
     let raw;
     try {
-      raw = await fs14.readFile(opts.globalConfigPath, "utf8");
+      raw = await fs5.readFile(opts.globalConfigPath, "utf8");
     } catch {
       return {};
     }
@@ -1392,7 +1393,7 @@ async function runWebUI(opts) {
       return {};
     }
     if (!parsed.providers) return {};
-    const keyFile = path17.join(path17.dirname(opts.globalConfigPath), ".key");
+    const keyFile = path18.join(path18.dirname(opts.globalConfigPath), ".key");
     const vault = new DefaultSecretVault$1({ keyFile });
     return decryptConfigSecrets$1(parsed.providers, vault);
   }
@@ -1400,7 +1401,7 @@ async function runWebUI(opts) {
     if (!opts.globalConfigPath) return;
     let raw;
     try {
-      raw = await fs14.readFile(opts.globalConfigPath, "utf8");
+      raw = await fs5.readFile(opts.globalConfigPath, "utf8");
     } catch {
       raw = "{}";
     }
@@ -1411,7 +1412,7 @@ async function runWebUI(opts) {
       parsed = {};
     }
     parsed.providers = providers;
-    const keyFile = path17.join(path17.dirname(opts.globalConfigPath), ".key");
+    const keyFile = path18.join(path18.dirname(opts.globalConfigPath), ".key");
     const vault = new DefaultSecretVault$1({ keyFile });
     const encrypted = encryptConfigSecrets(parsed, vault);
     await atomicWrite(opts.globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
@@ -1563,7 +1564,7 @@ function parseSpawnFlags(input) {
   return { description: rest.trim(), opts };
 }
 async function bootConfig(flags) {
-  const cwd = typeof flags["cwd"] === "string" ? path17.resolve(flags["cwd"]) : process.cwd();
+  const cwd = typeof flags["cwd"] === "string" ? path18.resolve(flags["cwd"]) : process.cwd();
   const pathResolver = new DefaultPathResolver(cwd);
   const projectRoot = pathResolver.projectRoot;
   const userHome = os4.homedir();
@@ -1614,13 +1615,13 @@ function flagsToConfigPatch(flags) {
 }
 async function ensureProjectMeta(paths, projectRoot) {
   try {
-    await fs14.mkdir(paths.projectDir, { recursive: true });
+    await fs5.mkdir(paths.projectDir, { recursive: true });
     const meta = {
       hash: paths.projectHash,
       root: projectRoot,
       lastSeen: (/* @__PURE__ */ new Date()).toISOString()
     };
-    await fs14.writeFile(paths.projectMeta, JSON.stringify(meta, null, 2));
+    await fs5.writeFile(paths.projectMeta, JSON.stringify(meta, null, 2));
   } catch {
   }
 }
@@ -1630,11 +1631,11 @@ var ReadlineInputReader = class {
   history = [];
   pending = false;
   constructor(opts = {}) {
-    this.historyFile = opts.historyFile ?? path17.join(os4.homedir(), ".wrongstack", "history");
+    this.historyFile = opts.historyFile ?? path18.join(os4.homedir(), ".wrongstack", "history");
   }
   async loadHistory() {
     try {
-      const raw = await fs14.readFile(this.historyFile, "utf8");
+      const raw = await fs5.readFile(this.historyFile, "utf8");
       this.history = raw.split("\n").filter(Boolean).slice(-1e3);
     } catch {
       this.history = [];
@@ -1642,8 +1643,8 @@ var ReadlineInputReader = class {
   }
   async saveHistory() {
     try {
-      await fs14.mkdir(path17.dirname(this.historyFile), { recursive: true });
-      await fs14.writeFile(this.historyFile, this.history.slice(-1e3).join("\n"));
+      await fs5.mkdir(path18.dirname(this.historyFile), { recursive: true });
+      await fs5.writeFile(this.historyFile, this.history.slice(-1e3).join("\n"));
     } catch {
     }
   }
@@ -2113,7 +2114,7 @@ async function saveToGlobalConfig(configPath, provider, model) {
 }
 async function pathExists(file) {
   try {
-    await fs14.access(file);
+    await fs5.access(file);
     return true;
   } catch {
     return false;
@@ -2124,10 +2125,10 @@ async function detectPackageManager(root, declared) {
     const name = declared.split("@")[0];
     if (name) return name;
   }
-  if (await pathExists(path17.join(root, "pnpm-lock.yaml"))) return "pnpm";
-  if (await pathExists(path17.join(root, "bun.lockb"))) return "bun";
-  if (await pathExists(path17.join(root, "bun.lock"))) return "bun";
-  if (await pathExists(path17.join(root, "yarn.lock"))) return "yarn";
+  if (await pathExists(path18.join(root, "pnpm-lock.yaml"))) return "pnpm";
+  if (await pathExists(path18.join(root, "bun.lockb"))) return "bun";
+  if (await pathExists(path18.join(root, "bun.lock"))) return "bun";
+  if (await pathExists(path18.join(root, "yarn.lock"))) return "yarn";
   return "npm";
 }
 function hasUsableScript(scripts, name) {
@@ -2148,7 +2149,7 @@ function parseMakeTargets(makefile) {
 async function detectProjectFacts(root) {
   const facts = { hints: [] };
   try {
-    const pkg = JSON.parse(await fs14.readFile(path17.join(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(await fs5.readFile(path18.join(root, "package.json"), "utf8"));
     const scripts = pkg.scripts ?? {};
     const pm = await detectPackageManager(root, pkg.packageManager);
     if (hasUsableScript(scripts, "build")) facts.build = `${pm} run build`;
@@ -2162,14 +2163,14 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    if (!await pathExists(path17.join(root, "pyproject.toml"))) throw new Error("not python");
+    if (!await pathExists(path18.join(root, "pyproject.toml"))) throw new Error("not python");
     facts.test ??= "pytest";
     facts.lint ??= "ruff check .";
     facts.hints.push("pyproject.toml");
   } catch {
   }
   try {
-    if (!await pathExists(path17.join(root, "go.mod"))) throw new Error("not go");
+    if (!await pathExists(path18.join(root, "go.mod"))) throw new Error("not go");
     facts.build ??= "go build ./...";
     facts.test ??= "go test ./...";
     facts.run ??= "go run .";
@@ -2177,7 +2178,7 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    if (!await pathExists(path17.join(root, "Cargo.toml"))) throw new Error("not rust");
+    if (!await pathExists(path18.join(root, "Cargo.toml"))) throw new Error("not rust");
     facts.build ??= "cargo build";
     facts.test ??= "cargo test";
     facts.lint ??= "cargo clippy";
@@ -2186,7 +2187,7 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    const makefile = await fs14.readFile(path17.join(root, "Makefile"), "utf8");
+    const makefile = await fs5.readFile(path18.join(root, "Makefile"), "utf8");
     const targets = parseMakeTargets(makefile);
     facts.build ??= targets.has("build") ? "make build" : "make";
     if (targets.has("test")) facts.test ??= "make test";
@@ -2320,6 +2321,175 @@ function buildClearCommand(opts) {
     }
   };
 }
+async function runGit(args, cwd) {
+  return new Promise((resolve3) => {
+    const child = spawn("git", args, {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (d) => stdout += d);
+    child.stderr?.on("data", (d) => stderr += d);
+    child.on("close", (code) => resolve3({ stdout, stderr, code: code ?? 0 }));
+  });
+}
+function detectCommitType(stats) {
+  const lines = stats.split("\n");
+  const hasTestFiles = lines.some(
+    (l) => l.includes("_test.") || l.includes(".test.") || l.includes(".spec.")
+  );
+  const hasDocs = lines.some(
+    (l) => l.includes("README") || l.includes("CHANGELOG") || l.includes("docs/") || l.includes(".md")
+  );
+  const hasConfig = lines.some(
+    (l) => l.includes("config") || l.includes("tsconfig") || l.includes(".json")
+  );
+  if (hasTestFiles) return "test";
+  if (hasDocs) return "docs";
+  if (hasConfig) return "chore";
+  return "feat";
+}
+async function generateCommitMessage(cwd) {
+  const statsResult = await runGit(["diff", "--stat"], cwd);
+  if (statsResult.code !== 0) return "chore: update";
+  const nameResult = await runGit(["diff", "--name-only"], cwd);
+  const files = nameResult.stdout.split("\n").filter(Boolean);
+  const commitType = detectCommitType(statsResult.stdout);
+  let scope = "";
+  if (files.length > 0) {
+    const primary = files[0].split("/")[0];
+    if (primary && primary !== "packages" && primary !== "apps" && primary !== "node_modules") {
+      scope = `(${primary})`;
+    }
+  }
+  if (files.length === 0) {
+    return `${commitType}${scope}: update`;
+  }
+  if (files.length <= 3) {
+    const summary2 = files.map((f) => f.split("/").pop()).join(", ");
+    return `${commitType}${scope}: ${summary2}`;
+  }
+  const summary = files.slice(0, 3).map((f) => f.split("/").pop()).join(", ") + ` and ${files.length - 3} more`;
+  return `${commitType}${scope}: ${summary}`;
+}
+async function hasUncommittedChanges(cwd) {
+  const result = await runGit(["status", "--porcelain"], cwd);
+  return result.stdout.trim().length > 0;
+}
+async function isGitRepo(cwd) {
+  const result = await runGit(["rev-parse", "--git-dir"], cwd);
+  return result.code === 0;
+}
+function buildCommitCommand(_opts) {
+  return {
+    name: "commit",
+    description: "Stage all changes and commit with auto-generated message.",
+    aliases: ["gc"],
+    async run(args, ctx) {
+      const cwd = ctx?.cwd ?? process.cwd();
+      if (!await isGitRepo(cwd)) {
+        return { message: "Not a git repository." };
+      }
+      if (!await hasUncommittedChanges(cwd)) {
+        return { message: "Nothing to commit (working tree clean)." };
+      }
+      const dryRun = args.includes("--dry-run") || args.includes("-n");
+      const message = await generateCommitMessage(cwd);
+      if (dryRun) {
+        return {
+          message: `Would commit:
+
+  ${color.green(message)}
+
+${color.dim("(dry-run \u2014 no actual commit)")}`
+        };
+      }
+      const stageResult = await runGit(["add", "."], cwd);
+      if (stageResult.code !== 0) {
+        return { message: `Stage failed: ${stageResult.stderr}` };
+      }
+      const commitResult = await runGit(["commit", "-m", message], cwd);
+      if (commitResult.code !== 0) {
+        return { message: `Commit failed: ${commitResult.stderr}` };
+      }
+      const hashResult = await runGit(["rev-parse", "--short", "HEAD"], cwd);
+      const hash = hashResult.stdout.trim();
+      const pushResult = await runGit(["remote"], cwd);
+      const hasRemote = pushResult.stdout.trim().length > 0;
+      let pushMsg = "";
+      if (hasRemote) {
+        pushMsg = `
+
+${color.dim("Tip: Run /push to push to remote")}`;
+      }
+      return {
+        message: `${color.green("\u2713")} Committed: ${color.bold(message)}
+  ${color.dim(hash)}${pushMsg}`
+      };
+    }
+  };
+}
+function buildGitcheckCommand(_opts) {
+  return {
+    name: "gitcheck",
+    description: "Check for uncommitted changes (for system prompt integration).",
+    aliases: ["gcstatus"],
+    async run(_args, ctx) {
+      const cwd = ctx?.cwd ?? process.cwd();
+      if (!await isGitRepo(cwd)) {
+        return { message: "" };
+      }
+      if (!await hasUncommittedChanges(cwd)) {
+        return { message: "" };
+      }
+      const statusResult = await runGit(["status", "--porcelain"], cwd);
+      const lines = statusResult.stdout.split("\n").filter(Boolean);
+      const count = lines.length;
+      if (count === 0) return { message: "" };
+      return {
+        message: `\u26A0 ${color.yellow(`${count} uncommitted change${count > 1 ? "s" : ""}`)} \u2014 consider /commit`
+      };
+    }
+  };
+}
+function buildPushCommand(_opts) {
+  return {
+    name: "push",
+    description: "Push to remote after commit.",
+    async run(args, ctx) {
+      const cwd = ctx?.cwd ?? process.cwd();
+      if (!await isGitRepo(cwd)) {
+        return { message: "Not a git repository." };
+      }
+      const dryRun = args.includes("--dry-run") || args.includes("-n");
+      const force = args.includes("--force") || args.includes("-f");
+      const remoteResult = await runGit(["remote"], cwd);
+      const remotes = remoteResult.stdout.split("\n").filter(Boolean);
+      if (remotes.length === 0) {
+        return { message: "No remote configured. Add one with: git remote add origin <url>" };
+      }
+      if (dryRun) {
+        return {
+          message: `Would push to ${remotes.join(", ")}${force ? " (force)" : ""}
+${color.dim("(dry-run)")}`
+        };
+      }
+      const branchResult = await runGit(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
+      const branch = branchResult.stdout.trim() || "main";
+      const pushArgs = ["push"];
+      if (force) pushArgs.push("--force");
+      pushArgs.push(...remotes, branch);
+      const pushResult = await runGit(pushArgs, cwd);
+      if (pushResult.code !== 0) {
+        return { message: `Push failed: ${pushResult.stderr}` };
+      }
+      return {
+        message: `${color.green("\u2713")} Pushed to ${remotes.join(", ")} (${branch})`
+      };
+    }
+  };
+}
 
 // src/slash-commands/compact.ts
 function buildCompactCommand(opts) {
@@ -2649,10 +2819,10 @@ function buildInitCommand(opts) {
     description: "Create .wrongstack/AGENTS.md project context for the system prompt.",
     async run(args, ctx) {
       const force = args.trim() === "--force";
-      const dir = path17.join(ctx.projectRoot, ".wrongstack");
-      const file = path17.join(dir, "AGENTS.md");
+      const dir = path18.join(ctx.projectRoot, ".wrongstack");
+      const file = path18.join(dir, "AGENTS.md");
       try {
-        await fs14.access(file);
+        await fs5.access(file);
         if (!force) {
           const msg2 = `AGENTS.md already exists at ${file}. Use "/init --force" to overwrite.`;
           opts.renderer.writeWarning(msg2);
@@ -2662,8 +2832,8 @@ function buildInitCommand(opts) {
       }
       const detected = await detectProjectFacts(ctx.projectRoot);
       const body = renderAgentsTemplate(detected);
-      await fs14.mkdir(dir, { recursive: true });
-      await fs14.writeFile(file, body, "utf8");
+      await fs5.mkdir(dir, { recursive: true });
+      await fs5.writeFile(file, body, "utf8");
       if (detected.hints.length > 0) {
         const msg2 = `Wrote ${file}
 Pre-filled: ${detected.hints.join(", ")}. Edit the file with project context and instructions the system prompt should carry.`;
@@ -2892,6 +3062,13 @@ function buildExitCommand(opts) {
     aliases: ["quit", "q"],
     description: "Exit the REPL.",
     async run() {
+      if (opts.onBeforeExit) {
+        const result = await opts.onBeforeExit();
+        if (result?.abort) {
+          opts.onExit?.();
+          return { message: result.message ?? "", exit: true };
+        }
+      }
       opts.onExit?.();
       return { exit: true };
     }
@@ -3264,11 +3441,11 @@ ${lines.join("\n\n")}
   };
 }
 function makeInstaller(opts, projectRoot, global) {
-  const globalRoot = path17.join(os4.homedir(), ".wrongstack");
+  const globalRoot = path18.join(os4.homedir(), ".wrongstack");
   return new SkillInstaller({
-    manifestPath: path17.join(globalRoot, "installed-skills.json"),
-    projectSkillsDir: path17.join(projectRoot, ".wrongstack", "skills"),
-    globalSkillsDir: path17.join(globalRoot, "skills"),
+    manifestPath: path18.join(globalRoot, "installed-skills.json"),
+    projectSkillsDir: path18.join(projectRoot, ".wrongstack", "skills"),
+    globalSkillsDir: path18.join(globalRoot, "skills"),
     projectHash: projectHash(projectRoot),
     skillLoader: opts.skillLoader
   });
@@ -3457,7 +3634,10 @@ function buildBuiltinSlashCommands(opts) {
     buildYoloCommand(opts),
     buildAutonomyCommand(opts),
     buildModeCommand(opts),
-    buildExitCommand(opts)
+    buildExitCommand(opts),
+    buildCommitCommand(),
+    buildGitcheckCommand(),
+    buildPushCommand()
   ];
 }
 
@@ -3476,13 +3656,13 @@ var MANIFESTS = [
 ];
 async function detectProjectKind(projectRoot) {
   try {
-    await fs14.access(path17.join(projectRoot, ".wrongstack", "AGENTS.md"));
+    await fs5.access(path18.join(projectRoot, ".wrongstack", "AGENTS.md"));
     return "initialized";
   } catch {
   }
   for (const m of MANIFESTS) {
     try {
-      await fs14.access(path17.join(projectRoot, m));
+      await fs5.access(path18.join(projectRoot, m));
       return "project";
     } catch {
     }
@@ -3490,12 +3670,12 @@ async function detectProjectKind(projectRoot) {
   return "empty";
 }
 async function scaffoldAgentsMd(projectRoot) {
-  const dir = path17.join(projectRoot, ".wrongstack");
-  const file = path17.join(dir, "AGENTS.md");
+  const dir = path18.join(projectRoot, ".wrongstack");
+  const file = path18.join(dir, "AGENTS.md");
   const facts = await detectProjectFacts(projectRoot);
   const body = renderAgentsTemplate(facts);
-  await fs14.mkdir(dir, { recursive: true });
-  await fs14.writeFile(file, body, "utf8");
+  await fs5.mkdir(dir, { recursive: true });
+  await fs5.writeFile(file, body, "utf8");
   return file;
 }
 async function runProjectCheck(opts) {
@@ -3504,7 +3684,7 @@ async function runProjectCheck(opts) {
   if (kind === "initialized") {
     renderer.write(
       `
-  ${color.green("\u2713")} Project initialized ${color.dim(`(${path17.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
+  ${color.green("\u2713")} Project initialized ${color.dim(`(${path18.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
 `
     );
     return true;
@@ -3531,11 +3711,43 @@ async function runProjectCheck(opts) {
     }
     return true;
   }
-  renderer.write(
-    `
+  const gitDir = path18.join(projectRoot, ".git");
+  let hasGit = false;
+  try {
+    await fs5.access(gitDir);
+    hasGit = true;
+  } catch {
+  }
+  if (!hasGit) {
+    renderer.write(
+      `
   ${color.dim("\u25CB")} ${color.dim(`No project manifest in ${projectRoot} \u2014 running in a scratch directory.`)}
 `
-  );
+    );
+    const answer2 = (await reader.readLine(
+      `  ${color.amber("?")} No git repo found. ${color.bold("Initialize git?")} ${color.dim("[y/N]")} `
+    )).trim().toLowerCase();
+    if (answer2 === "y" || answer2 === "yes") {
+      try {
+        const { spawn: spawn2 } = await import('child_process');
+        await new Promise((resolve3, reject) => {
+          const child = spawn2("git", ["init"], { cwd: projectRoot });
+          child.on("close", (code) => code === 0 ? resolve3() : reject(new Error(`git init failed with ${code}`)));
+        });
+        renderer.write(`  ${color.green("\u2713")} Git repository initialized
+`);
+      } catch (err) {
+        renderer.writeError(`git init failed: ${err instanceof Error ? err.message : String(err)}
+`);
+      }
+    }
+  } else {
+    renderer.write(
+      `
+  ${color.dim("\u25CB")} ${color.dim(`No project manifest in ${projectRoot} \u2014 running in a scratch directory.`)}
+`
+    );
+  }
   const answer = (await reader.readLine(`  ${color.amber("?")} Continue anyway? ${color.dim("[Y/n]")} `)).trim().toLowerCase();
   if (answer === "n" || answer === "no") {
     renderer.write(color.dim("  Cancelled.\n"));
@@ -3800,14 +4012,14 @@ function summarize(value, name) {
   if (typeof v === "object" && v !== null) {
     const o = v;
     if (name === "edit") {
-      const path18 = typeof o["path"] === "string" ? o["path"] : "";
+      const path19 = typeof o["path"] === "string" ? o["path"] : "";
       const reps = typeof o["replacements"] === "number" ? o["replacements"] : 0;
-      return `${path18}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
+      return `${path19}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
     }
     if (name === "write") {
-      const path18 = typeof o["path"] === "string" ? o["path"] : "";
+      const path19 = typeof o["path"] === "string" ? o["path"] : "";
       const bytes = typeof o["bytes"] === "number" ? o["bytes"] : void 0;
-      return bytes !== void 0 ? `${path18}  ${bytes}B` : path18;
+      return bytes !== void 0 ? `${path19}  ${bytes}B` : path19;
     }
     if (typeof o["count"] === "number") {
       return `${o["count"]} match${o["count"] === 1 ? "" : "es"}`;
@@ -4403,7 +4615,7 @@ async function readKeyInput(deps, intent) {
 async function loadProviders(deps) {
   let raw;
   try {
-    raw = await fs14.readFile(deps.globalConfigPath, "utf8");
+    raw = await fs5.readFile(deps.globalConfigPath, "utf8");
   } catch {
     return {};
   }
@@ -4419,7 +4631,7 @@ async function loadProviders(deps) {
 async function mutateProviders(deps, mutator) {
   let raw;
   try {
-    raw = await fs14.readFile(deps.globalConfigPath, "utf8");
+    raw = await fs5.readFile(deps.globalConfigPath, "utf8");
   } catch {
     raw = "{}";
   }
@@ -4559,7 +4771,7 @@ var doctorCmd = async (_args, deps) => {
     });
   }
   try {
-    await fs14.access(deps.paths.secretsKey);
+    await fs5.access(deps.paths.secretsKey);
     checks.push({ name: "secret vault", status: "ok", detail: deps.paths.secretsKey });
   } catch {
     checks.push({
@@ -4569,10 +4781,10 @@ var doctorCmd = async (_args, deps) => {
     });
   }
   try {
-    await fs14.mkdir(deps.paths.projectSessions, { recursive: true });
-    const probe = path17.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
-    await fs14.writeFile(probe, "");
-    await fs14.unlink(probe);
+    await fs5.mkdir(deps.paths.projectSessions, { recursive: true });
+    const probe = path18.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
+    await fs5.writeFile(probe, "");
+    await fs5.unlink(probe);
     checks.push({ name: "sessions writable", status: "ok", detail: deps.paths.projectSessions });
   } catch (err) {
     checks.push({
@@ -4673,8 +4885,8 @@ var exportCmd = async (args, deps) => {
     return 1;
   }
   if (output) {
-    await fs14.mkdir(path17.dirname(path17.resolve(deps.cwd, output)), { recursive: true });
-    await fs14.writeFile(path17.resolve(deps.cwd, output), rendered, "utf8");
+    await fs5.mkdir(path18.dirname(path18.resolve(deps.cwd, output)), { recursive: true });
+    await fs5.writeFile(path18.resolve(deps.cwd, output), rendered, "utf8");
     deps.renderer.write(`Wrote ${rendered.length} bytes to ${output}
 `);
   } else {
@@ -4731,17 +4943,17 @@ var initCmd = async (_args, deps) => {
   } else {
     deps.renderer.writeInfo(`Found API key in env (${provider.envVars.join(" / ")}).`);
   }
-  await fs14.mkdir(deps.paths.globalRoot, { recursive: true });
+  await fs5.mkdir(deps.paths.globalRoot, { recursive: true });
   const config = { version: 1, provider: providerId, model: modelId };
   if (apiKey) config.apiKey = apiKey;
-  const keyFile = path17.join(path17.dirname(deps.paths.globalConfig), ".key");
+  const keyFile = path18.join(path18.dirname(deps.paths.globalConfig), ".key");
   const vault = new DefaultSecretVault$1({ keyFile });
   const encrypted = encryptConfigSecrets(config, vault);
   await atomicWrite(deps.paths.globalConfig, JSON.stringify(encrypted, null, 2));
-  await fs14.mkdir(path17.join(deps.projectRoot, ".wrongstack"), { recursive: true });
-  const agentsFile = path17.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
+  await fs5.mkdir(path18.join(deps.projectRoot, ".wrongstack"), { recursive: true });
+  const agentsFile = path18.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
   try {
-    await fs14.access(agentsFile);
+    await fs5.access(agentsFile);
   } catch {
     const detected2 = await detectProjectFacts(deps.projectRoot);
     await atomicWrite(agentsFile, renderAgentsTemplate(detected2));
@@ -4817,7 +5029,7 @@ async function addMcpServer(args, deps) {
   serverCfg.enabled = enable;
   let existing = {};
   try {
-    existing = JSON.parse(await fs14.readFile(deps.paths.globalConfig, "utf8"));
+    existing = JSON.parse(await fs5.readFile(deps.paths.globalConfig, "utf8"));
   } catch {
   }
   const mcpServers = existing.mcpServers ?? {};
@@ -4837,7 +5049,7 @@ async function addMcpServer(args, deps) {
 async function removeMcpServer(name, deps) {
   let existing = {};
   try {
-    existing = JSON.parse(await fs14.readFile(deps.paths.globalConfig, "utf8"));
+    existing = JSON.parse(await fs5.readFile(deps.paths.globalConfig, "utf8"));
   } catch {
     deps.renderer.writeError("No config file found.\n");
     return 1;
@@ -4958,7 +5170,7 @@ function renderConfiguredPlugins(config) {
 }
 async function readConfig(file) {
   try {
-    return JSON.parse(await fs14.readFile(file, "utf8"));
+    return JSON.parse(await fs5.readFile(file, "utf8"));
   } catch {
     return {};
   }
@@ -5049,9 +5261,9 @@ var usageCmd = async (_args, deps) => {
   return 0;
 };
 var projectsCmd = async (_args, deps) => {
-  const projectsRoot = path17.join(deps.paths.globalRoot, "projects");
+  const projectsRoot = path18.join(deps.paths.globalRoot, "projects");
   try {
-    const entries = await fs14.readdir(projectsRoot);
+    const entries = await fs5.readdir(projectsRoot);
     if (entries.length === 0) {
       deps.renderer.write("No projects tracked.\n");
       return 0;
@@ -5059,7 +5271,7 @@ var projectsCmd = async (_args, deps) => {
     for (const hash of entries) {
       try {
         const meta = JSON.parse(
-          await fs14.readFile(path17.join(projectsRoot, hash, "meta.json"), "utf8")
+          await fs5.readFile(path18.join(projectsRoot, hash, "meta.json"), "utf8")
         );
         deps.renderer.write(
           `  ${color.dim(hash)}  ${color.dim(meta.lastSeen ?? "")}  ${meta.root ?? "?"}
@@ -5236,6 +5448,131 @@ var configCmd = async (args, deps) => {
   deps.renderer.writeError(`Unknown config subcommand: ${sub}`);
   return 1;
 };
+function parseRewindFlags(args) {
+  const flags = {};
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === "--all") flags.all = true;
+    else if (a === "--last") flags.last = args[++i] ?? "1";
+    else if (a === "--to") flags.to = args[++i] ?? "";
+    else if (a === "--list") flags.list = true;
+    else if (a === "--resume") flags.resume = true;
+  }
+  return flags;
+}
+var rewindCmd = async (args, deps) => {
+  const flags = parseRewindFlags(args);
+  const wpaths = resolveWstackPaths({ projectRoot: deps.projectRoot });
+  const sessionsDir = path18.join(wpaths.globalRoot, "sessions");
+  const rewind = new DefaultSessionRewinder(sessionsDir);
+  let sessionId = args.find((a) => !a.startsWith("--"));
+  if (!sessionId) {
+    if (!deps.sessionStore) {
+      deps.renderer.writeError("No session store available.");
+      return 1;
+    }
+    const sessions = await deps.sessionStore.list(1);
+    if (sessions.length === 0) {
+      deps.renderer.writeError("No sessions found.");
+      return 1;
+    }
+    sessionId = sessions[0].id;
+  }
+  if (flags.list) {
+    deps.renderer.write(`Session: ${color.bold(sessionId)}
+
+`);
+    const checkpoints = await rewind.listCheckpoints(sessionId);
+    if (checkpoints.length === 0) {
+      deps.renderer.write("No checkpoints in this session.\n");
+      return 0;
+    }
+    for (const cp of checkpoints) {
+      deps.renderer.write(
+        `  [${cp.promptIndex}] ${color.dim(cp.ts)}  ${cp.promptPreview}${cp.fileCount > 0 ? color.dim(` (${cp.fileCount} file${cp.fileCount === 1 ? "" : "s"})`) : ""}
+`
+      );
+    }
+    return 0;
+  }
+  try {
+    let result;
+    if (flags.all) {
+      deps.renderer.write("Rewinding to session start...\n");
+      result = await rewind.rewindToStart(sessionId);
+    } else if (flags.last) {
+      const n = parseInt(flags.last, 10);
+      if (isNaN(n) || n < 1) {
+        deps.renderer.writeError("--last requires a positive number");
+        return 1;
+      }
+      deps.renderer.write(`Rewinding last ${n} prompt(s)...
+`);
+      result = await rewind.rewindLastN(sessionId, n);
+    } else if (flags.to) {
+      const idx = parseInt(flags.to, 10);
+      if (isNaN(idx) || idx < 0) {
+        deps.renderer.writeError("--to requires a non-negative number");
+        return 1;
+      }
+      deps.renderer.write(`Rewinding to checkpoint ${idx}...
+`);
+      result = await rewind.rewindToCheckpoint(sessionId, idx);
+    } else {
+      deps.renderer.write("Usage: ws rewind --all | --last N | --to <index> [--list] [--resume]\n");
+      deps.renderer.write("  --all      Rewind to session start\n");
+      deps.renderer.write("  --last N   Rewind last N prompts\n");
+      deps.renderer.write("  --to N     Rewind to checkpoint N\n");
+      deps.renderer.write("  --list     List checkpoints\n");
+      deps.renderer.write("  --resume   After rewind, truncate session history at checkpoint\n");
+      return 1;
+    }
+    if (result.revertedFiles.length === 0) {
+      deps.renderer.write("No files to revert.\n");
+      if (flags.resume) {
+        const store = new DefaultSessionStore({ dir: sessionsDir });
+        const resumed = await store.resume(sessionId);
+        const toIdx = result.toPromptIndex;
+        await resumed.writer.truncateToCheckpoint(toIdx);
+        await resumed.writer.close();
+        deps.renderer.write(`  ${color.green("\u2713")} Session truncated at checkpoint ${toIdx}
+`);
+      }
+      return 0;
+    }
+    deps.renderer.write(`
+Reverted ${result.revertedFiles.length} file(s):
+`);
+    for (const f of result.revertedFiles) {
+      deps.renderer.write(`  ${color.green("\u2713")} ${f}
+`);
+    }
+    if (flags.resume) {
+      const store = new DefaultSessionStore({ dir: sessionsDir });
+      const resumed = await store.resume(sessionId);
+      const toIdx = result.toPromptIndex;
+      const removed = await resumed.writer.truncateToCheckpoint(toIdx);
+      await resumed.writer.close();
+      deps.renderer.write(`
+  ${color.green("\u2713")} Session truncated \u2014 ${removed} event(s) removed
+`);
+    }
+    if (result.errors.length > 0) {
+      deps.renderer.write(`
+${result.errors.length} error(s):
+`);
+      for (const e of result.errors) {
+        deps.renderer.write(`  ${color.red("\u2717")} ${e}
+`);
+      }
+      return 1;
+    }
+    return 0;
+  } catch (err) {
+    deps.renderer.writeError(err instanceof Error ? err.message : String(err));
+    return 1;
+  }
+};
 var toolsCmd = async (_args, deps) => {
   const reg = deps.toolRegistry;
   if (!reg) return 0;
@@ -5298,6 +5635,7 @@ var subcommands = {
   auth: authCmd,
   sessions: sessionsCmd,
   config: configCmd,
+  rewind: rewindCmd,
   tools: toolsCmd,
   skills: skillsCmd,
   providers: providersCmd,
@@ -5334,29 +5672,29 @@ function fmtDuration(ms) {
   const remMin = m - h * 60;
   return `${h}h${remMin}m`;
 }
-function fmtTaskResultLine(r, color30) {
+function fmtTaskResultLine(r, color32) {
   const stats = `${r.iterations}it ${r.toolCalls}tc ${fmtDuration(r.durationMs)}`;
   const errMsg = typeof r.error === "string" ? r.error : r.error?.message;
   const errKind = typeof r.error === "object" ? r.error?.kind : void 0;
   const errTail = errMsg ? ` \u2014 ${errMsg.replace(/\s+/g, " ").slice(0, 80)}${errMsg.length > 80 ? "\u2026" : ""}` : "";
-  const errKindChip = errKind ? color30.dim(` [${errKind}]`) : "";
-  const errSnip = errMsg || errKind ? `${errKindChip}${color30.dim(errTail)}` : "";
+  const errKindChip = errKind ? color32.dim(` [${errKind}]`) : "";
+  const errSnip = errMsg || errKind ? `${errKindChip}${color32.dim(errTail)}` : "";
   switch (r.status) {
     case "success":
-      return { mark: color30.green("\u2713"), stats, tail: "" };
+      return { mark: color32.green("\u2713"), stats, tail: "" };
     case "timeout":
-      return { mark: color30.yellow("\u23F1"), stats: `${color30.yellow("timeout")} ${stats}`, tail: errSnip };
+      return { mark: color32.yellow("\u23F1"), stats: `${color32.yellow("timeout")} ${stats}`, tail: errSnip };
     case "stopped":
-      return { mark: color30.dim("\u2298"), stats: `${color30.dim("stopped")} ${stats}`, tail: errSnip };
+      return { mark: color32.dim("\u2298"), stats: `${color32.dim("stopped")} ${stats}`, tail: errSnip };
     case "failed":
-      return { mark: color30.red("\u2717"), stats: `${color30.red("failed")} ${stats}`, tail: errSnip };
+      return { mark: color32.red("\u2717"), stats: `${color32.red("failed")} ${stats}`, tail: errSnip };
   }
 }
 function resolveBundledSkillsDir() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path17.join(path17.dirname(corePkg), "skills");
+    return path18.join(path18.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -6074,7 +6412,7 @@ async function execute(deps) {
           supportsVision,
           attachments,
           effectiveMaxContext,
-          projectName: path17.basename(projectRoot) || void 0,
+          projectName: path18.basename(projectRoot) || void 0,
           getAutonomy,
           skillLoader
         });
@@ -6092,7 +6430,7 @@ async function execute(deps) {
         supportsVision,
         attachments,
         effectiveMaxContext,
-        projectName: path17.basename(projectRoot) || void 0,
+        projectName: path18.basename(projectRoot) || void 0,
         getAutonomy,
         skillLoader
       });
@@ -6364,7 +6702,7 @@ var MultiAgentHost = class {
       model: opts?.model,
       tools: opts?.tools
     };
-    const transcriptPath = this.sessionFactory ? path17.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
+    const transcriptPath = this.sessionFactory ? path18.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
     if (this.director) {
       const subagentId = await this.director.spawn(subagentConfig);
       const taskId2 = randomUUID();
@@ -6524,16 +6862,16 @@ var MultiAgentHost = class {
     }
     this.opts.directorMode = true;
     if (this.opts.fleetRoot && !this.opts.manifestPath) {
-      this.opts.manifestPath = path17.join(this.opts.fleetRoot, "fleet.json");
+      this.opts.manifestPath = path18.join(this.opts.fleetRoot, "fleet.json");
     }
     if (this.opts.fleetRoot && !this.opts.sharedScratchpadPath) {
-      this.opts.sharedScratchpadPath = path17.join(this.opts.fleetRoot, "shared");
+      this.opts.sharedScratchpadPath = path18.join(this.opts.fleetRoot, "shared");
     }
     if (this.opts.fleetRoot && !this.opts.sessionsRoot) {
-      this.opts.sessionsRoot = path17.join(this.opts.fleetRoot, "subagents");
+      this.opts.sessionsRoot = path18.join(this.opts.fleetRoot, "subagents");
     }
     if (this.opts.fleetRoot && !this.opts.stateCheckpointPath) {
-      this.opts.stateCheckpointPath = path17.join(this.opts.fleetRoot, "director-state.json");
+      this.opts.stateCheckpointPath = path18.join(this.opts.fleetRoot, "director-state.json");
     }
     await this.ensureDirector();
     return this.director ?? null;
@@ -6654,11 +6992,11 @@ var SessionStats = class {
       if (e.name === "bash") this.bashCommands++;
       else if (e.name === "fetch") this.fetches++;
       if (!e.ok) return;
-      const path18 = typeof input?.path === "string" ? input.path : void 0;
-      if (e.name === "read" && path18) this.readPaths.add(path18);
-      else if (e.name === "edit" && path18) this.editedPaths.add(path18);
-      else if (e.name === "write" && path18) {
-        this.writtenPaths.add(path18);
+      const path19 = typeof input?.path === "string" ? input.path : void 0;
+      if (e.name === "read" && path19) this.readPaths.add(path19);
+      else if (e.name === "edit" && path19) this.editedPaths.add(path19);
+      else if (e.name === "write" && path19) {
+        this.writtenPaths.add(path19);
         const content = typeof input?.content === "string" ? input.content : "";
         this.bytesWritten += Buffer.byteLength(content, "utf8");
       }
@@ -6989,12 +7327,12 @@ async function setupSession(params) {
   }
   const sessionRef = { current: session };
   await recoveryLock.write(session.id).catch(() => void 0);
-  const attachments = new DefaultAttachmentStore({ spoolDir: path17.join(wpaths.projectSessions, session.id, "attachments") });
-  const queueStore = new QueueStore({ dir: path17.join(wpaths.projectSessions, session.id) });
+  const attachments = new DefaultAttachmentStore({ spoolDir: path18.join(wpaths.projectSessions, session.id, "attachments") });
+  const queueStore = new QueueStore({ dir: path18.join(wpaths.projectSessions, session.id) });
   const ctxSignal = new AbortController().signal;
   const context = new Context({ systemPrompt, provider, session, signal: ctxSignal, tokenCounter, cwd, projectRoot, model: config.model });
   if (restoredMessages.length > 0) context.state.replaceMessages(restoredMessages);
-  const todosCheckpointPath = path17.join(wpaths.projectSessions, `${session.id}.todos.json`);
+  const todosCheckpointPath = path18.join(wpaths.projectSessions, `${session.id}.todos.json`);
   if (resumeId) {
     try {
       const restoredTodos = await loadTodosCheckpoint(todosCheckpointPath);
@@ -7006,12 +7344,12 @@ async function setupSession(params) {
     }
   }
   const detachTodosCheckpoint = attachTodosCheckpoint(context.state, todosCheckpointPath, session.id);
-  const planPath = path17.join(wpaths.projectSessions, `${session.id}.plan.json`);
+  const planPath = path18.join(wpaths.projectSessions, `${session.id}.plan.json`);
   context.state.setMeta("plan.path", planPath);
   if (resumeId) {
     try {
-      const fleetRoot = path17.join(wpaths.projectSessions, session.id);
-      const dirState = await loadDirectorState(path17.join(fleetRoot, "director-state.json"));
+      const fleetRoot = path18.join(wpaths.projectSessions, session.id);
+      const dirState = await loadDirectorState(path18.join(fleetRoot, "director-state.json"));
       if (dirState) {
         const tCounts = {};
         for (const t of dirState.tasks) tCounts[t.status] = (tCounts[t.status] ?? 0) + 1;
@@ -7038,7 +7376,7 @@ function resolveBundledSkillsDir2() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path17.join(path17.dirname(corePkg), "skills");
+    return path18.join(path18.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -7125,7 +7463,7 @@ async function main(argv) {
       modeId,
       modePrompt,
       modelCapabilities,
-      planPath: () => sessionRef.current ? path17.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0
+      planPath: () => sessionRef.current ? path18.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0
     })
   );
   const toolRegistry = new ToolRegistry();
@@ -7153,7 +7491,7 @@ async function main(argv) {
       name: "session-store",
       check: async () => {
         try {
-          await fs14.access(wpaths.projectSessions);
+          await fs5.access(wpaths.projectSessions);
           return { status: "healthy" };
         } catch (e) {
           return { status: "unhealthy", detail: e instanceof Error ? e.message : "access denied" };
@@ -7170,7 +7508,7 @@ async function main(argv) {
     const dumpMetrics = () => {
       if (!metricsSink) return;
       try {
-        const out = path17.join(wpaths.projectSessions, "metrics.json");
+        const out = path18.join(wpaths.projectSessions, "metrics.json");
         const snap = metricsSink.snapshot();
         writeFileSync(out, JSON.stringify(snap, null, 2));
       } catch {
@@ -7389,12 +7727,12 @@ async function main(argv) {
   const directorMode = flags["director"] === true;
   let director = null;
   let autonomyMode = "off";
-  const fleetRoot = directorMode ? path17.join(wpaths.projectSessions, session.id) : void 0;
-  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path17.join(fleetRoot, "fleet.json") : void 0;
-  const sharedScratchpadPath = directorMode ? path17.join(fleetRoot, "shared") : void 0;
-  const subagentSessionsRoot = directorMode ? path17.join(fleetRoot, "subagents") : void 0;
-  const stateCheckpointPath = directorMode ? path17.join(fleetRoot, "director-state.json") : void 0;
-  const fleetRootForPromotion = path17.join(wpaths.projectSessions, session.id);
+  const fleetRoot = directorMode ? path18.join(wpaths.projectSessions, session.id) : void 0;
+  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path18.join(fleetRoot, "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path18.join(fleetRoot, "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path18.join(fleetRoot, "subagents") : void 0;
+  const stateCheckpointPath = directorMode ? path18.join(fleetRoot, "director-state.json") : void 0;
+  const fleetRootForPromotion = path18.join(wpaths.projectSessions, session.id);
   const multiAgentHost = new MultiAgentHost(
     {
       container,
@@ -7573,27 +7911,27 @@ async function main(argv) {
       return `Unknown fleet action: ${action}`;
     },
     onFleetLog: async (subagentId, mode) => {
-      const subagentsRoot = path17.join(fleetRootForPromotion, "subagents");
+      const subagentsRoot = path18.join(fleetRootForPromotion, "subagents");
       let runDirs;
       try {
-        runDirs = await fs14.readdir(subagentsRoot);
+        runDirs = await fs5.readdir(subagentsRoot);
       } catch {
         return "No fleet transcripts on disk \u2014 no subagents have been spawned for this session.";
       }
       const found = [];
       for (const runId of runDirs) {
-        const runDir = path17.join(subagentsRoot, runId);
+        const runDir = path18.join(subagentsRoot, runId);
         let files;
         try {
-          files = await fs14.readdir(runDir);
+          files = await fs5.readdir(runDir);
         } catch {
           continue;
         }
         for (const f of files) {
           if (!f.endsWith(".jsonl")) continue;
-          const full = path17.join(runDir, f);
+          const full = path18.join(runDir, f);
           try {
-            const stat2 = await fs14.stat(full);
+            const stat2 = await fs5.stat(full);
             found.push({
               runId,
               subagentId: f.replace(/\.jsonl$/, ""),
@@ -7632,7 +7970,7 @@ async function main(argv) {
         ].join("\n");
       }
       const t = matches[0];
-      const raw = await fs14.readFile(t.file, "utf8");
+      const raw = await fs5.readFile(t.file, "utf8");
       if (mode === "raw") return raw;
       const lines = raw.split("\n").filter((l) => l.trim());
       const counts = {};
@@ -7688,7 +8026,7 @@ async function main(argv) {
       }
       const dir = await multiAgentHost.ensureDirector();
       if (!dir) return "Director is not available.";
-      const dirStatePath = path17.join(fleetRootForPromotion, "director-state.json");
+      const dirStatePath = path18.join(fleetRootForPromotion, "director-state.json");
       const prior = await loadDirectorState(dirStatePath);
       if (!prior) {
         return "No prior director-state.json found \u2014 nothing to retry.";
@@ -7759,9 +8097,9 @@ async function main(argv) {
       for (const tool of director2.tools(FLEET_ROSTER)) {
         toolRegistry.register(tool);
       }
-      const mp = path17.join(fleetRootForPromotion, "fleet.json");
-      const sp = path17.join(fleetRootForPromotion, "shared");
-      const ss = path17.join(fleetRootForPromotion, "subagents");
+      const mp = path18.join(fleetRootForPromotion, "fleet.json");
+      const sp = path18.join(fleetRootForPromotion, "shared");
+      const ss = path18.join(fleetRootForPromotion, "subagents");
       const lines = [
         `${color.green("\u2713")} Promoted to director mode.`,
         `  Roster: ${Object.keys(FLEET_ROSTER).join(", ")}`,
@@ -7807,6 +8145,24 @@ Restart WrongStack to load or unload plugin code in this session.`;
     onExit: () => {
       void mcpRegistry.stopAll();
     },
+    onBeforeExit: async () => {
+      const { spawn: spawn2 } = await import('child_process');
+      const cwd2 = projectRoot;
+      const statusResult = await new Promise((resolve3) => {
+        const child = spawn2("git", ["status", "--porcelain"], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
+        let stdout = "";
+        child.stdout?.on("data", (d) => stdout += d);
+        child.on("close", (code) => resolve3({ stdout, code: code ?? 0 }));
+      });
+      if (statusResult.stdout.trim().length > 0) {
+        const lines = statusResult.stdout.split("\n").filter(Boolean);
+        return {
+          abort: true,
+          // signals there are uncommitted changes (used only for the message)
+          message: `\u26A0 ${color.yellow(`${lines.length} uncommitted change${lines.length > 1 ? "s" : ""}`)} \u2014 session ended without commit`
+        };
+      }
+    },
     onClear: () => {
       if (flags.tui && !flags["no-tui"]) return;
       try {