@locusai/cli 0.21.4 → 0.21.6

package/bin/locus.js

@@ -4557,8 +4557,18 @@ var init_claude = __esm(() => {
 
 // src/core/sandbox-ignore.ts
 import { exec } from "node:child_process";
-import { existsSync as existsSync13, readFileSync as readFileSync8 } from "node:fs";
-import { join as join12 } from "node:path";
+import {
+  cpSync,
+  existsSync as existsSync13,
+  mkdirSync as mkdirSync9,
+  mkdtempSync,
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync8,
+  rmSync,
+  statSync as statSync3
+} from "node:fs";
+import { tmpdir as tmpdir3 } from "node:os";
+import { dirname as dirname3, join as join12, relative } from "node:path";
 import { promisify } from "node:util";
 function parseIgnoreFile(filePath) {
   if (!existsSync13(filePath))
@@ -4606,6 +4616,124 @@ function buildCleanupScript(rules, workspacePath) {
   }
   return `${commands.join(" 2>/dev/null ; ")} 2>/dev/null`;
 }
+function patternToRegex(pattern) {
+  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
+  return new RegExp(`^${escaped}$`);
+}
+function findIgnoredPaths(projectRoot, rules) {
+  const positive = rules.filter((r) => !r.negated);
+  const negated = rules.filter((r) => r.negated);
+  if (positive.length === 0)
+    return [];
+  const positiveMatchers = positive.map((r) => ({
+    regex: patternToRegex(r.pattern),
+    isDirectory: r.isDirectory
+  }));
+  const negatedRegexes = negated.map((r) => patternToRegex(r.pattern));
+  const matches = [];
+  function walk(dir) {
+    let entries;
+    try {
+      entries = readdirSync3(dir);
+    } catch {
+      return;
+    }
+    for (const name of entries) {
+      if (SKIP_DIRS.has(name))
+        continue;
+      const fullPath = join12(dir, name);
+      let stat;
+      try {
+        stat = statSync3(fullPath);
+      } catch {
+        continue;
+      }
+      const isDir = stat.isDirectory();
+      let matched = false;
+      for (const m of positiveMatchers) {
+        if (m.isDirectory && !isDir)
+          continue;
+        if (m.regex.test(name)) {
+          matched = true;
+          break;
+        }
+      }
+      if (matched) {
+        const isNegated = negatedRegexes.some((nr) => nr.test(name));
+        if (!isNegated) {
+          matches.push(fullPath);
+          continue;
+        }
+      }
+      if (isDir) {
+        walk(fullPath);
+      }
+    }
+  }
+  walk(projectRoot);
+  return matches;
+}
+function backupIgnoredFiles(projectRoot) {
+  const log = getLogger();
+  const ignorePath = join12(projectRoot, ".sandboxignore");
+  const rules = parseIgnoreFile(ignorePath);
+  if (rules.length === 0)
+    return NOOP_BACKUP;
+  const paths = findIgnoredPaths(projectRoot, rules);
+  if (paths.length === 0)
+    return NOOP_BACKUP;
+  let backupDir;
+  try {
+    backupDir = mkdtempSync(join12(tmpdir3(), "locus-sandbox-backup-"));
+  } catch (err) {
+    log.debug("Failed to create sandbox backup dir", {
+      error: err instanceof Error ? err.message : String(err)
+    });
+    return NOOP_BACKUP;
+  }
+  const backed = [];
+  for (const src of paths) {
+    const rel = relative(projectRoot, src);
+    const dest = join12(backupDir, rel);
+    try {
+      mkdirSync9(dirname3(dest), { recursive: true });
+      cpSync(src, dest, { recursive: true, preserveTimestamps: true });
+      backed.push({ src, dest });
+    } catch (err) {
+      log.debug("Failed to back up ignored file", {
+        src,
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+  if (backed.length === 0) {
+    rmSync(backupDir, { recursive: true, force: true });
+    return NOOP_BACKUP;
+  }
+  log.debug("Backed up sandbox-ignored files", {
+    count: backed.length,
+    backupDir
+  });
+  return {
+    restore() {
+      for (const { src, dest } of backed) {
+        try {
+          mkdirSync9(dirname3(src), { recursive: true });
+          cpSync(dest, src, { recursive: true, preserveTimestamps: true });
+        } catch (err) {
+          log.debug("Failed to restore ignored file (potential data loss)", {
+            src,
+            error: err instanceof Error ? err.message : String(err)
+          });
+        }
+      }
+      try {
+        rmSync(backupDir, { recursive: true, force: true });
+      } catch {}
+      log.debug("Restored sandbox-ignored files", { count: backed.length });
+    }
+  };
+}
 async function enforceSandboxIgnore(sandboxName, projectRoot) {
   const log = getLogger();
   const ignorePath = join12(projectRoot, ".sandboxignore");
@@ -4629,10 +4757,20 @@ async function enforceSandboxIgnore(sandboxName, projectRoot) {
     });
   }
 }
-var execAsync;
+var execAsync, SKIP_DIRS, NOOP_BACKUP;
 var init_sandbox_ignore = __esm(() => {
   init_logger();
   execAsync = promisify(exec);
+  SKIP_DIRS = new Set([
+    "node_modules",
+    ".git",
+    ".locus",
+    "dist",
+    "build",
+    ".next",
+    ".cache"
+  ]);
+  NOOP_BACKUP = { restore() {} };
 });
 
 // src/ai/claude-sandbox.ts
@@ -4669,6 +4807,7 @@ class SandboxedClaudeRunner {
     }
     const claudeArgs = ["-p", options.prompt, ...buildClaudeArgs(options)];
     options.onStatusChange?.("Syncing sandbox...");
+    const backup = backupIgnoredFiles(options.cwd);
     await enforceSandboxIgnore(this.sandboxName, options.cwd);
     options.onStatusChange?.("Thinking...");
     const dockerArgs = [
@@ -4685,95 +4824,99 @@ class SandboxedClaudeRunner {
       args: dockerArgs.join(" "),
       cwd: options.cwd
     });
-    return await new Promise((resolve2) => {
-      let output = "";
-      let errorOutput = "";
-      this.process = spawn3("docker", dockerArgs, {
-        stdio: ["ignore", "pipe", "pipe"],
-        env: process.env
-      });
-      if (options.verbose) {
-        let lineBuffer = "";
-        const seenToolIds = new Set;
-        this.process.stdout?.on("data", (chunk) => {
-          lineBuffer += chunk.toString();
-          const lines = lineBuffer.split(`
-`);
-          lineBuffer = lines.pop() ?? "";
-          for (const line of lines) {
-            if (!line.trim())
-              continue;
-            try {
-              const event = JSON.parse(line);
-              if (event.type === "assistant" && event.message?.content) {
-                for (const item of event.message.content) {
-                  if (item.type === "tool_use" && item.id && !seenToolIds.has(item.id)) {
-                    seenToolIds.add(item.id);
-                    options.onToolActivity?.(formatToolCall2(item.name ?? "", item.input ?? {}));
+    try {
+      return await new Promise((resolve2) => {
+        let output = "";
+        let errorOutput = "";
+        this.process = spawn3("docker", dockerArgs, {
+          stdio: ["ignore", "pipe", "pipe"],
+          env: process.env
+        });
+        if (options.verbose) {
+          let lineBuffer = "";
+          const seenToolIds = new Set;
+          this.process.stdout?.on("data", (chunk) => {
+            lineBuffer += chunk.toString();
+            const lines = lineBuffer.split(`
+`);
+            lineBuffer = lines.pop() ?? "";
+            for (const line of lines) {
+              if (!line.trim())
+                continue;
+              try {
+                const event = JSON.parse(line);
+                if (event.type === "assistant" && event.message?.content) {
+                  for (const item of event.message.content) {
+                    if (item.type === "tool_use" && item.id && !seenToolIds.has(item.id)) {
+                      seenToolIds.add(item.id);
+                      options.onToolActivity?.(formatToolCall2(item.name ?? "", item.input ?? {}));
+                    }
                   }
+                } else if (event.type === "result") {
+                  const text = event.result ?? "";
+                  output = text;
+                  options.onOutput?.(text);
                 }
-              } else if (event.type === "result") {
-                const text = event.result ?? "";
-                output = text;
-                options.onOutput?.(text);
-              }
-            } catch {
-              const newLine = `${line}
+              } catch {
+                const newLine = `${line}
 `;
-              output += newLine;
-              options.onOutput?.(newLine);
+                output += newLine;
+                options.onOutput?.(newLine);
+              }
             }
-          }
-        });
-      } else {
-        this.process.stdout?.on("data", (chunk) => {
+          });
+        } else {
+          this.process.stdout?.on("data", (chunk) => {
+            const text = chunk.toString();
+            output += text;
+            options.onOutput?.(text);
+          });
+        }
+        this.process.stderr?.on("data", (chunk) => {
           const text = chunk.toString();
-          output += text;
-          options.onOutput?.(text);
+          errorOutput += text;
+          log.debug("sandboxed claude stderr", { text: text.slice(0, 500) });
         });
-      }
-      this.process.stderr?.on("data", (chunk) => {
-        const text = chunk.toString();
-        errorOutput += text;
-        log.debug("sandboxed claude stderr", { text: text.slice(0, 500) });
-      });
-      this.process.on("close", (code) => {
-        this.process = null;
-        if (this.aborted) {
+        this.process.on("close", (code) => {
+          this.process = null;
+          if (this.aborted) {
+            resolve2({
+              success: false,
+              output,
+              error: "Aborted by user",
+              exitCode: code ?? 143
+            });
+            return;
+          }
+          if (code === 0) {
+            resolve2({ success: true, output, exitCode: 0 });
+          } else {
+            resolve2({
+              success: false,
+              output,
+              error: errorOutput || `sandboxed claude exited with code ${code}`,
+              exitCode: code ?? 1
+            });
+          }
+        });
+        this.process.on("error", (err) => {
+          this.process = null;
           resolve2({
             success: false,
             output,
-            error: "Aborted by user",
-            exitCode: code ?? 143
+            error: `Failed to spawn docker sandbox: ${err.message}`,
+            exitCode: 1
           });
-          return;
-        }
-        if (code === 0) {
-          resolve2({ success: true, output, exitCode: 0 });
-        } else {
-          resolve2({
-            success: false,
-            output,
-            error: errorOutput || `sandboxed claude exited with code ${code}`,
-            exitCode: code ?? 1
+        });
+        if (options.signal) {
+          options.signal.addEventListener("abort", () => {
+            this.abort();
           });
         }
       });
-      this.process.on("error", (err) => {
-        this.process = null;
-        resolve2({
-          success: false,
-          output,
-          error: `Failed to spawn docker sandbox: ${err.message}`,
-          exitCode: 1
-        });
-      });
-      if (options.signal) {
-        options.signal.addEventListener("abort", () => {
-          this.abort();
-        });
-      }
-    });
+    } finally {
+      backup.restore();
+    }
   }
   abort() {
     this.aborted = true;
@@ -5043,6 +5186,7 @@ class SandboxedCodexRunner {
     }
     const codexArgs = buildCodexArgs(options.model);
     options.onStatusChange?.("Syncing sandbox...");
+    const backup = backupIgnoredFiles(options.cwd);
     await enforceSandboxIgnore(this.sandboxName, options.cwd);
     if (!this.codexInstalled) {
       options.onStatusChange?.("Checking codex...");
@@ -5065,111 +5209,115 @@ class SandboxedCodexRunner {
       args: dockerArgs.join(" "),
       cwd: options.cwd
     });
-    return await new Promise((resolve2) => {
-      let rawOutput = "";
-      let errorOutput = "";
-      this.process = spawn5("docker", dockerArgs, {
-        stdio: ["pipe", "pipe", "pipe"],
-        env: process.env
-      });
-      let agentMessages = [];
-      const flushAgentMessages = () => {
-        if (agentMessages.length > 0) {
-          options.onOutput?.(agentMessages.join(`
+    try {
+      return await new Promise((resolve2) => {
+        let rawOutput = "";
+        let errorOutput = "";
+        this.process = spawn5("docker", dockerArgs, {
+          stdio: ["pipe", "pipe", "pipe"],
+          env: process.env
+        });
+        let agentMessages = [];
+        const flushAgentMessages = () => {
+          if (agentMessages.length > 0) {
+            options.onOutput?.(agentMessages.join(`
 
 `));
-          agentMessages = [];
-        }
-      };
-      let lineBuffer = "";
-      this.process.stdout?.on("data", (chunk) => {
-        lineBuffer += chunk.toString();
-        const lines = lineBuffer.split(`
+            agentMessages = [];
+          }
+        };
+        let lineBuffer = "";
+        this.process.stdout?.on("data", (chunk) => {
+          lineBuffer += chunk.toString();
+          const lines = lineBuffer.split(`
 `);
-        lineBuffer = lines.pop() ?? "";
-        for (const line of lines) {
-          if (!line.trim())
-            continue;
-          rawOutput += `${line}
+          lineBuffer = lines.pop() ?? "";
+          for (const line of lines) {
+            if (!line.trim())
+              continue;
+            rawOutput += `${line}
 `;
-          log.debug("sandboxed codex stdout line", { line });
-          try {
-            const event = JSON.parse(line);
-            const { type, item } = event;
-            if (type === "item.started" && item?.type === "command_execution") {
-              const cmd = (item.command ?? "").split(`
+            log.debug("sandboxed codex stdout line", { line });
+            try {
+              const event = JSON.parse(line);
+              const { type, item } = event;
+              if (type === "item.started" && item?.type === "command_execution") {
+                const cmd = (item.command ?? "").split(`
 `)[0].slice(0, 80);
-              options.onToolActivity?.(`running: ${cmd}`);
-            } else if (type === "item.completed" && item?.type === "command_execution") {
-              const code = item.exit_code;
-              options.onToolActivity?.(code === 0 ? "done" : `exit ${code}`);
-            } else if (type === "item.completed" && item?.type === "reasoning") {
-              const text = (item.text ?? "").trim().replace(/\*\*([^*]+)\*\*/g, "$1").replace(/(?<!\*)\*([^*]+)\*(?!\*)/g, "$1");
-              if (text)
-                options.onToolActivity?.(text);
-            } else if (type === "item.completed" && item?.type === "agent_message") {
-              const text = item.text ?? "";
-              if (text) {
-                agentMessages.push(text);
-                options.onToolActivity?.(text.split(`
+                options.onToolActivity?.(`running: ${cmd}`);
+              } else if (type === "item.completed" && item?.type === "command_execution") {
+                const code = item.exit_code;
+                options.onToolActivity?.(code === 0 ? "done" : `exit ${code}`);
+              } else if (type === "item.completed" && item?.type === "reasoning") {
+                const text = (item.text ?? "").trim().replace(/\*\*([^*]+)\*\*/g, "$1").replace(/(?<!\*)\*([^*]+)\*(?!\*)/g, "$1");
+                if (text)
+                  options.onToolActivity?.(text);
+              } else if (type === "item.completed" && item?.type === "agent_message") {
+                const text = item.text ?? "";
+                if (text) {
+                  agentMessages.push(text);
+                  options.onToolActivity?.(text.split(`
 `)[0].slice(0, 80));
+                }
+              } else if (type === "turn.completed") {
+                flushAgentMessages();
               }
-            } else if (type === "turn.completed") {
-              flushAgentMessages();
-            }
-          } catch {
-            const newLine = `${line}
+            } catch {
+              const newLine = `${line}
 `;
-            rawOutput += newLine;
-            options.onOutput?.(newLine);
+              rawOutput += newLine;
+              options.onOutput?.(newLine);
+            }
           }
-        }
-      });
-      this.process.stderr?.on("data", (chunk) => {
-        const text = chunk.toString();
-        errorOutput += text;
-        log.debug("sandboxed codex stderr", { text: text.slice(0, 500) });
-      });
-      this.process.on("close", (code) => {
-        this.process = null;
-        flushAgentMessages();
-        if (this.aborted) {
+        });
+        this.process.stderr?.on("data", (chunk) => {
+          const text = chunk.toString();
+          errorOutput += text;
+          log.debug("sandboxed codex stderr", { text: text.slice(0, 500) });
+        });
+        this.process.on("close", (code) => {
+          this.process = null;
+          flushAgentMessages();
+          if (this.aborted) {
+            resolve2({
+              success: false,
+              output: rawOutput,
+              error: "Aborted by user",
+              exitCode: code ?? 143
+            });
+            return;
+          }
+          if (code === 0) {
+            resolve2({ success: true, output: rawOutput, exitCode: 0 });
+          } else {
+            resolve2({
+              success: false,
+              output: rawOutput,
+              error: errorOutput || `sandboxed codex exited with code ${code}`,
+              exitCode: code ?? 1
+            });
+          }
+        });
+        this.process.on("error", (err) => {
+          this.process = null;
           resolve2({
             success: false,
             output: rawOutput,
-            error: "Aborted by user",
-            exitCode: code ?? 143
+            error: `Failed to spawn docker sandbox: ${err.message}`,
+            exitCode: 1
           });
-          return;
-        }
-        if (code === 0) {
-          resolve2({ success: true, output: rawOutput, exitCode: 0 });
-        } else {
-          resolve2({
-            success: false,
-            output: rawOutput,
-            error: errorOutput || `sandboxed codex exited with code ${code}`,
-            exitCode: code ?? 1
+        });
+        if (options.signal) {
+          options.signal.addEventListener("abort", () => {
+            this.abort();
           });
         }
+        this.process.stdin?.write(options.prompt);
+        this.process.stdin?.end();
       });
-      this.process.on("error", (err) => {
-        this.process = null;
-        resolve2({
-          success: false,
-          output: rawOutput,
-          error: `Failed to spawn docker sandbox: ${err.message}`,
-          exitCode: 1
-        });
-      });
-      if (options.signal) {
-        options.signal.addEventListener("abort", () => {
-          this.abort();
-        });
-      }
-      this.process.stdin?.write(options.prompt);
-      this.process.stdin?.end();
-    });
+    } finally {
+      backup.restore();
+    }
   }
   abort() {
     this.aborted = true;
@@ -6887,7 +7035,7 @@ var init_sprint = __esm(() => {
 
 // src/core/prompt-builder.ts
 import { execSync as execSync7 } from "node:child_process";
-import { existsSync as existsSync14, readdirSync as readdirSync3, readFileSync as readFileSync9 } from "node:fs";
+import { existsSync as existsSync14, readdirSync as readdirSync4, readFileSync as readFileSync9 } from "node:fs";
 import { join as join13 } from "node:path";
 function buildExecutionPrompt(ctx) {
   const sections = [];
@@ -6965,7 +7113,7 @@ ${learnings}
   const discussionsDir = join13(projectRoot, ".locus", "discussions");
   if (existsSync14(discussionsDir)) {
     try {
-      const files = readdirSync3(discussionsDir).filter((f) => f.endsWith(".md")).slice(0, 3);
+      const files = readdirSync4(discussionsDir).filter((f) => f.endsWith(".md")).slice(0, 3);
       for (const file of files) {
         const content = readFileSafe(join13(discussionsDir, file));
         if (content) {
@@ -7583,8 +7731,8 @@ var init_commands = __esm(() => {
 });
 
 // src/repl/completions.ts
-import { readdirSync as readdirSync4 } from "node:fs";
-import { basename as basename2, dirname as dirname3, join as join14 } from "node:path";
+import { readdirSync as readdirSync5 } from "node:fs";
+import { basename as basename2, dirname as dirname4, join as join14 } from "node:path";
 
 class SlashCommandCompletion {
   commands;
@@ -7639,9 +7787,9 @@ class FilePathCompletion {
   }
   findMatches(partial) {
     try {
-      const dir = partial.includes("/") ? join14(this.projectRoot, dirname3(partial)) : this.projectRoot;
+      const dir = partial.includes("/") ? join14(this.projectRoot, dirname4(partial)) : this.projectRoot;
       const prefix = basename2(partial);
-      const entries = readdirSync4(dir, { withFileTypes: true });
+      const entries = readdirSync5(dir, { withFileTypes: true });
       return entries.filter((e) => {
         if (e.name.startsWith("."))
           return false;
@@ -7650,7 +7798,7 @@ class FilePathCompletion {
         return e.name.startsWith(prefix);
       }).map((e) => {
         const name = e.isDirectory() ? `${e.name}/` : e.name;
-        return partial.includes("/") ? `${dirname3(partial)}/${name}` : name;
+        return partial.includes("/") ? `${dirname4(partial)}/${name}` : name;
       }).slice(0, 20);
     } catch {
       return [];
@@ -7675,8 +7823,8 @@ class CombinedCompletion {
 var init_completions = () => {};
 
 // src/repl/input-history.ts
-import { existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "node:fs";
-import { dirname as dirname4, join as join15 } from "node:path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "node:fs";
+import { dirname as dirname5, join as join15 } from "node:path";
 
 class InputHistory {
   entries = [];
@@ -7730,9 +7878,9 @@ class InputHistory {
   }
   save() {
     try {
-      const dir = dirname4(this.filePath);
+      const dir = dirname5(this.filePath);
       if (!existsSync15(dir)) {
-        mkdirSync9(dir, { recursive: true });
+        mkdirSync10(dir, { recursive: true });
       }
       const content = this.entries.map((e) => this.escape(e)).join(`
 `);
@@ -7763,8 +7911,8 @@ var init_model_config = __esm(() => {
 // src/repl/session-manager.ts
 import {
   existsSync as existsSync16,
-  mkdirSync as mkdirSync10,
-  readdirSync as readdirSync5,
+  mkdirSync as mkdirSync11,
+  readdirSync as readdirSync6,
   readFileSync as readFileSync11,
   unlinkSync as unlinkSync3,
   writeFileSync as writeFileSync7
@@ -7776,7 +7924,7 @@ class SessionManager {
   constructor(projectRoot) {
     this.sessionsDir = join16(projectRoot, ".locus", "sessions");
     if (!existsSync16(this.sessionsDir)) {
-      mkdirSync10(this.sessionsDir, { recursive: true });
+      mkdirSync11(this.sessionsDir, { recursive: true });
     }
   }
   create(options) {
@@ -7901,7 +8049,7 @@ class SessionManager {
   }
   listSessionFiles() {
     try {
-      return readdirSync5(this.sessionsDir).filter((f) => f.endsWith(".json") && !f.startsWith(".")).map((f) => join16(this.sessionsDir, f));
+      return readdirSync6(this.sessionsDir).filter((f) => f.endsWith(".json") && !f.startsWith(".")).map((f) => join16(this.sessionsDir, f));
     } catch {
       return [];
     }
@@ -8945,12 +9093,12 @@ var init_conflict = __esm(() => {
 // src/core/run-state.ts
 import {
   existsSync as existsSync18,
-  mkdirSync as mkdirSync11,
+  mkdirSync as mkdirSync12,
   readFileSync as readFileSync12,
   unlinkSync as unlinkSync4,
   writeFileSync as writeFileSync8
 } from "node:fs";
-import { dirname as dirname5, join as join18 } from "node:path";
+import { dirname as dirname6, join as join18 } from "node:path";
 function getRunStatePath(projectRoot) {
   return join18(projectRoot, ".locus", "run-state.json");
 }
@@ -8967,9 +9115,9 @@ function loadRunState(projectRoot) {
 }
 function saveRunState(projectRoot, state) {
   const path = getRunStatePath(projectRoot);
-  const dir = dirname5(path);
+  const dir = dirname6(path);
   if (!existsSync18(dir)) {
-    mkdirSync11(dir, { recursive: true });
+    mkdirSync12(dir, { recursive: true });
   }
   writeFileSync8(path, `${JSON.stringify(state, null, 2)}
 `, "utf-8");
@@ -9117,7 +9265,7 @@ var init_shutdown = __esm(() => {
 
 // src/core/worktree.ts
 import { execSync as execSync13 } from "node:child_process";
-import { existsSync as existsSync19, readdirSync as readdirSync6, realpathSync, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync19, readdirSync as readdirSync7, realpathSync, statSync as statSync4 } from "node:fs";
 import { join as join19 } from "node:path";
 function git4(args, cwd) {
   return execSync13(`git ${args}`, {
@@ -9207,7 +9355,7 @@ function listWorktrees(projectRoot) {
   if (!existsSync19(worktreeDir)) {
     return [];
   }
-  const entries = readdirSync6(worktreeDir).filter((entry) => entry.startsWith("issue-"));
+  const entries = readdirSync7(worktreeDir).filter((entry) => entry.startsWith("issue-"));
   const gitWorktreeList = gitSafe3("worktree list --porcelain", projectRoot);
   const activeWorktrees = new Set;
   if (gitWorktreeList) {
@@ -10062,8 +10210,8 @@ __export(exports_plan, {
 });
 import {
   existsSync as existsSync20,
-  mkdirSync as mkdirSync12,
-  readdirSync as readdirSync7,
+  mkdirSync as mkdirSync13,
+  readdirSync as readdirSync8,
   readFileSync as readFileSync13,
   writeFileSync as writeFileSync9
 } from "node:fs";
@@ -10103,7 +10251,7 @@ function getPlansDir(projectRoot) {
 function ensurePlansDir(projectRoot) {
   const dir = getPlansDir(projectRoot);
   if (!existsSync20(dir)) {
-    mkdirSync12(dir, { recursive: true });
+    mkdirSync13(dir, { recursive: true });
   }
   return dir;
 }
@@ -10114,7 +10262,7 @@ function loadPlanFile(projectRoot, id) {
   const dir = getPlansDir(projectRoot);
   if (!existsSync20(dir))
     return null;
-  const files = readdirSync7(dir).filter((f) => f.endsWith(".json"));
+  const files = readdirSync8(dir).filter((f) => f.endsWith(".json"));
   const match = files.find((f) => f.startsWith(id));
   if (!match)
     return null;
@@ -10170,7 +10318,7 @@ function handleListPlans(projectRoot) {
 `);
     return;
   }
-  const files = readdirSync7(dir).filter((f) => f.endsWith(".json")).sort().reverse();
+  const files = readdirSync8(dir).filter((f) => f.endsWith(".json")).sort().reverse();
   if (files.length === 0) {
     process.stderr.write(`${dim("No saved plans yet.")}
 `);
@@ -10914,7 +11062,8 @@ Pay special attention to the above areas.`;
   }
   instructions += `
 
-End with an overall assessment: APPROVE, REQUEST_CHANGES, or COMMENT.
+End with an overall assessment: APPROVE or COMMENT.
+If there are issues or suggestions, use COMMENT — never request changes.
 Be constructive and specific. Praise good patterns too.`;
   parts.push(`<review-instructions>
 ${instructions}
@@ -11197,8 +11346,8 @@ __export(exports_discuss, {
 });
 import {
   existsSync as existsSync22,
-  mkdirSync as mkdirSync13,
-  readdirSync as readdirSync8,
+  mkdirSync as mkdirSync14,
+  readdirSync as readdirSync9,
   readFileSync as readFileSync15,
   unlinkSync as unlinkSync5,
   writeFileSync as writeFileSync10
@@ -11230,7 +11379,7 @@ function getDiscussionsDir(projectRoot) {
 function ensureDiscussionsDir(projectRoot) {
   const dir = getDiscussionsDir(projectRoot);
   if (!existsSync22(dir)) {
-    mkdirSync13(dir, { recursive: true });
+    mkdirSync14(dir, { recursive: true });
   }
   return dir;
 }
@@ -11269,7 +11418,7 @@ function listDiscussions(projectRoot) {
 `);
     return;
   }
-  const files = readdirSync8(dir).filter((f) => f.endsWith(".md")).sort().reverse();
+  const files = readdirSync9(dir).filter((f) => f.endsWith(".md")).sort().reverse();
   if (files.length === 0) {
     process.stderr.write(`${dim("No discussions yet.")}
 `);
@@ -11304,7 +11453,7 @@ function showDiscussion(projectRoot, id) {
 `);
     return;
   }
-  const files = readdirSync8(dir).filter((f) => f.endsWith(".md"));
+  const files = readdirSync9(dir).filter((f) => f.endsWith(".md"));
   const match = files.find((f) => f.startsWith(id));
   if (!match) {
     process.stderr.write(`${red("✗")} Discussion "${id}" not found.
@@ -11327,7 +11476,7 @@ function deleteDiscussion(projectRoot, id) {
 `);
     return;
   }
-  const files = readdirSync8(dir).filter((f) => f.endsWith(".md"));
+  const files = readdirSync9(dir).filter((f) => f.endsWith(".md"));
   const match = files.find((f) => f.startsWith(id));
   if (!match) {
     process.stderr.write(`${red("✗")} Discussion "${id}" not found.
@@ -11352,7 +11501,7 @@ async function convertDiscussionToPlan(projectRoot, id) {
 `);
     return;
   }
-  const files = readdirSync8(dir).filter((f) => f.endsWith(".md"));
+  const files = readdirSync9(dir).filter((f) => f.endsWith(".md"));
   const match = files.find((f) => f.startsWith(id));
   if (!match) {
     process.stderr.write(`${red("✗")} Discussion "${id}" not found.
@@ -11576,7 +11725,7 @@ __export(exports_artifacts, {
   formatDate: () => formatDate2,
   artifactsCommand: () => artifactsCommand
 });
-import { existsSync as existsSync23, readdirSync as readdirSync9, readFileSync as readFileSync16, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync23, readdirSync as readdirSync10, readFileSync as readFileSync16, statSync as statSync5 } from "node:fs";
 import { join as join23 } from "node:path";
 function printHelp5() {
   process.stderr.write(`
@@ -11603,9 +11752,9 @@ function listArtifacts(projectRoot) {
   const dir = getArtifactsDir(projectRoot);
   if (!existsSync23(dir))
     return [];
-  return readdirSync9(dir).filter((f) => f.endsWith(".md")).map((fileName) => {
+  return readdirSync10(dir).filter((f) => f.endsWith(".md")).map((fileName) => {
     const filePath = join23(dir, fileName);
-    const stat = statSync4(filePath);
+    const stat = statSync5(filePath);
     return {
       name: fileName.replace(/\.md$/, ""),
       fileName,
@@ -11620,7 +11769,7 @@ function readArtifact(projectRoot, name) {
   const filePath = join23(dir, fileName);
   if (!existsSync23(filePath))
     return null;
-  const stat = statSync4(filePath);
+  const stat = statSync5(filePath);
   return {
     content: readFileSync16(filePath, "utf-8"),
     info: {
@@ -11960,7 +12109,12 @@ async function handleAgentLogin(projectRoot, agent) {
   });
   await new Promise((resolve2) => {
     child.on("close", async (code) => {
-      await enforceSandboxIgnore(sandboxName, projectRoot);
+      const backup = backupIgnoredFiles(projectRoot);
+      try {
+        await enforceSandboxIgnore(sandboxName, projectRoot);
+      } finally {
+        backup.restore();
+      }
       if (code === 0) {
         process.stderr.write(`
 ${green("✓")} ${agent} session ended. Auth should now be persisted in the sandbox.
@@ -12407,7 +12561,12 @@ async function createProviderSandbox(provider, sandboxName, projectRoot) {
   if (provider === "codex") {
     await ensureCodexInSandbox(sandboxName);
   }
-  await enforceSandboxIgnore(sandboxName, projectRoot);
+  const backup = backupIgnoredFiles(projectRoot);
+  try {
+    await enforceSandboxIgnore(sandboxName, projectRoot);
+  } finally {
+    backup.restore();
+  }
   return true;
 }
 async function ensurePackageManagerInSandbox(sandboxName, pm) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@locusai/cli",
-  "version": "0.21.4",
+  "version": "0.21.6",
   "description": "GitHub-native AI engineering assistant",
   "type": "module",
   "bin": {