@wrongstack/core 0.8.6 → 0.9.1

package/dist/index.js

@@ -93,7 +93,7 @@ async function renameWithRetry(from, to) {
       if (!code || !TRANSIENT_RENAME_CODES.has(code) || i === delays.length) {
         throw err;
       }
-      await new Promise((resolve8) => setTimeout(resolve8, delays[i]));
+      await new Promise((resolve9) => setTimeout(resolve9, delays[i]));
     }
   }
   throw lastErr;
@@ -1021,6 +1021,9 @@ var DEFAULT_CONTEXT_CONFIG = Object.freeze({
   preserveK: 10,
   eliseThreshold: 2e3
 });
+var DEFAULT_AUTONOMY_CONFIG = Object.freeze({
+  autoProceedDelayMs: 45e3
+});
 
 // src/types/secret-vault.ts
 var ENCRYPTED_PREFIX = "enc:v1:";
@@ -2061,7 +2064,10 @@ var PATTERNS = [
     type: "bearer_token",
     // Anchored with alternation instead of negative lookahead — avoids V8
     // backtracking risk on adversarial input. Bounded at 512 chars.
-    regex: /(?:^|[^A-Za-z0-9_.~+/-])Bearer\s+[A-Za-z0-9._~+/-]{20,512}=*(?:$|[^A-Za-z0-9_.~+/-])/g
+    // Min 12 chars: some OAuth providers issue shorter-lived tokens (< 20
+    // chars). A 12-char base64 string has ~71 bits of entropy — above the
+    // threshold where random strings are unlikely to produce false matches.
+    regex: /(?:^|[^A-Za-z0-9_.~+/-])Bearer\s+[A-Za-z0-9._~+/-]{12,512}=*(?:$|[^A-Za-z0-9_.~+/-])/g
   },
   {
     type: "high_entropy_env",
@@ -2694,7 +2700,7 @@ var InMemoryAgentBridge = class {
       );
     }
     this.inflightGuards.add(correlationId);
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       const timer = setTimeout(() => {
         this.inflightGuards.delete(correlationId);
         this.pendingRequests.delete(correlationId);
@@ -2706,7 +2712,7 @@ var InMemoryAgentBridge = class {
         return;
       }
       this.pendingRequests.set(correlationId, {
-        resolve: resolve8,
+        resolve: resolve9,
         reject,
         timer
       });
@@ -3990,7 +3996,9 @@ function looksSecret(name) {
 }
 function buildChildEnv(optsOrSessionId) {
   const opts = typeof optsOrSessionId === "string" ? { sessionId: optsOrSessionId } : optsOrSessionId ?? {};
-  const passthrough = process.env["WRONGSTACK_CHILD_ENV_PASSTHROUGH"] === "1" || process.env["WRONGSTACK_BASH_ENV_PASSTHROUGH"] === "1";
+  const hasOwn = Object.prototype.hasOwnProperty.call(process.env, "WRONGSTACK_CHILD_ENV_PASSTHROUGH");
+  const legacyHasOwn = Object.prototype.hasOwnProperty.call(process.env, "WRONGSTACK_BASH_ENV_PASSTHROUGH");
+  const passthrough = hasOwn && process.env["WRONGSTACK_CHILD_ENV_PASSTHROUGH"] === "1" || legacyHasOwn && process.env["WRONGSTACK_BASH_ENV_PASSTHROUGH"] === "1";
   if (passthrough && !process.env["CI"]) {
     console.warn(
       "[WrongStack] WARNING: WRONGSTACK_*_ENV_PASSTHROUGH=1 is active \u2014\n  all parent env vars (including API keys) forwarded to child processes.\n  Do not use on shared or multi-tenant systems."
@@ -4123,24 +4131,30 @@ var DefaultSessionStore = class {
     this.dir = opts.dir;
     this.events = opts.events;
   }
-  async create(meta) {
+  /** Join session ID to its absolute path within the store directory. */
+  sessionPath(id, ext) {
+    return path6.join(this.dir, `${id}${ext}`);
+  }
+  async ensureShardDir(_id) {
     await ensureDir(this.dir);
+    return this.dir;
+  }
+  async create(meta) {
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
     const id = meta.id ?? `${startedAt.replace(/[:.]/g, "-")}-${randomBytes(2).toString("hex")}`;
-    const file = path6.join(this.dir, `${id}.jsonl`);
+    const shardDir = await this.ensureShardDir(id);
+    const file = path6.join(shardDir, `${id}.jsonl`);
     let handle;
     try {
       handle = await fsp2.open(file, "a", 384);
     } catch (err) {
       throw new Error(
         `Failed to open session file: ${err instanceof Error ? err.message : String(err)}`,
-        {
-          cause: err
-        }
+        { cause: err }
       );
     }
     try {
-      return new FileSessionWriter(id, handle, startedAt, meta, this.events, { dir: this.dir, filePath: file });
+      return new FileSessionWriter(id, handle, startedAt, meta, this.events, { dir: shardDir, filePath: file });
     } catch (err) {
       await handle.close().catch(() => {
       });
@@ -4148,15 +4162,7 @@ var DefaultSessionStore = class {
     }
   }
   async resume(id) {
-    const file = path6.join(this.dir, `${id}.jsonl`);
-    try {
-      await fsp2.access(file, fsp2.constants.R_OK);
-    } catch {
-      throw new Error(
-        `Session "${id}" not found \u2014 the session file does not exist or was deleted.`,
-        { cause: new Error("ENOENT") }
-      );
-    }
+    const file = this.sessionPath(id, ".jsonl");
     const data = await this.load(id);
     let handle;
     try {
@@ -4188,7 +4194,7 @@ var DefaultSessionStore = class {
     }
   }
   async load(id) {
-    const file = path6.join(this.dir, `${id}.jsonl`);
+    const file = this.sessionPath(id, ".jsonl");
     const raw = await fsp2.readFile(file, "utf8");
     const lines = raw.split("\n").filter((l) => l.trim());
     const events = [];
@@ -4208,8 +4214,7 @@ var DefaultSessionStore = class {
   async list(limit = 20) {
     try {
       await ensureDir(this.dir);
-      const files = await fsp2.readdir(this.dir);
-      const ids = files.filter((f) => f.endsWith(".jsonl")).map((f) => f.replace(/\.jsonl$/, ""));
+      const ids = await this.collectSessionIds(this.dir);
       const sessions = await Promise.all(ids.map((id) => this.summaryFor(id).catch(() => null)));
       const out = sessions.filter((s) => s !== null);
       out.sort((a, b) => {
@@ -4222,13 +4227,27 @@ var DefaultSessionStore = class {
       return [];
     }
   }
+  /** Recursively collect all session IDs from shard subdirectories. */
+  async collectSessionIds(dir) {
+    const ids = [];
+    const entries = await fsp2.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const full = path6.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        ids.push(...await this.collectSessionIds(full));
+      } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
+        ids.push(entry.name.replace(/\.jsonl$/, ""));
+      }
+    }
+    return ids;
+  }
   async summaryFor(id) {
-    const manifest = path6.join(this.dir, `${id}.summary.json`);
+    const manifest = this.sessionPath(id, ".summary.json");
     try {
       const raw = await fsp2.readFile(manifest, "utf8");
       return JSON.parse(raw);
     } catch {
-      const full = path6.join(this.dir, `${id}.jsonl`);
+      const full = this.sessionPath(id, ".jsonl");
       const stat8 = await fsp2.stat(full);
       const summary = await this.summarize(id, stat8.mtime.toISOString());
       await atomicWrite(manifest, JSON.stringify(summary), { mode: 384 }).catch((err) => {
@@ -4241,12 +4260,13 @@ var DefaultSessionStore = class {
     }
   }
   async delete(id) {
-    await fsp2.unlink(path6.join(this.dir, `${id}.jsonl`));
-    await fsp2.unlink(path6.join(this.dir, `${id}.summary.json`)).catch(() => void 0);
+    await fsp2.unlink(this.sessionPath(id, ".jsonl"));
+    await fsp2.unlink(this.sessionPath(id, ".summary.json")).catch(() => void 0);
   }
   async clearHistory(id) {
-    const file = path6.join(this.dir, `${id}.jsonl`);
-    const meta = path6.join(this.dir, `${id}.summary.json`);
+    await this.ensureShardDir(id);
+    const file = this.sessionPath(id, ".jsonl");
+    const meta = this.sessionPath(id, ".summary.json");
     const record = `${JSON.stringify({
       type: "session_start",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -4290,7 +4310,8 @@ var DefaultSessionStore = class {
       startedAt: start?.ts ?? (/* @__PURE__ */ new Date(0)).toISOString(),
       endedAt: end?.ts,
       model: start?.model,
-      provider: start?.provider
+      provider: start?.provider,
+      pendingToolUses: end?.pendingToolUses
     };
   }
   replay(events, sessionId = "unknown") {
@@ -4390,9 +4411,6 @@ var FileSessionWriter = class {
   tokenIn = 0;
   tokenOut = 0;
   filePath;
-  /** Public accessor for the JSONL path — required by SessionWriter so
-   *  observability surfaces (`/fleet log`, FleetPanel) can locate the
-   *  transcript without recomputing the path from session metadata. */
   get transcriptPath() {
     return this.filePath || void 0;
   }
@@ -4400,13 +4418,16 @@ var FileSessionWriter = class {
   resumed;
   appendFailCount = 0;
   lastAppendWarnAt = 0;
-  // Rewind support: track pending file changes and prompt index
   promptIndex = 0;
   pendingFileSnapshots = [];
-  // Register a pending file change. Call recordFileChange() from tools.
+  /** Tracks open tool_use IDs during the current run to serialize on close for resume. */
+  openToolUses = /* @__PURE__ */ new Set();
   recordFileChange(input) {
     this.pendingFileSnapshots.push(input);
   }
+  get pendingToolUses() {
+    return Array.from(this.openToolUses);
+  }
   async writeSessionStartLazy() {
     const record = `${JSON.stringify({
       type: this.resumed ? "session_resumed" : "session_start",
@@ -4449,13 +4470,12 @@ var FileSessionWriter = class {
       }
     }
   }
-  /**
-   * Watch events as they're appended and keep the summary state hot, so
-   * `close()` can flush a `<id>.summary.json` manifest without re-reading
-   * the JSONL. `list()` reads only manifests, turning a per-session full
-   * parse into a single stat+read.
-   */
   observeForSummary(event) {
+    if (event.type === "tool_use") {
+      this.openToolUses.add(event.id);
+    } else if (event.type === "tool_result") {
+      this.openToolUses.delete(event.id);
+    }
     if (event.type === "user_input" && this.summary.title === "(empty session)") {
       this.summary = { ...this.summary, title: userInputTitle(event.content) };
     } else if (event.type === "llm_response") {
@@ -4549,7 +4569,16 @@ var FileSessionWriter = class {
       }
     }
     const truncated = kept.join("\n");
-    await fsp2.writeFile(this.filePath, truncated + "\n", "utf8");
+    const tmpPath = `${this.filePath}.rewind.tmp`;
+    await fsp2.writeFile(tmpPath, truncated + "\n", "utf8");
+    try {
+      await this.handle.close();
+      await fsp2.rename(tmpPath, this.filePath);
+      this.handle = await fsp2.open(this.filePath, "a", 384);
+    } catch (err) {
+      await fsp2.unlink(tmpPath).catch(() => void 0);
+      throw err;
+    }
     await this.append({
       type: "rewound",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -5242,7 +5271,10 @@ var DefaultConfigLoader = class {
     }
     if (c.mode !== void 0 && !isContextWindowModeId(c.mode)) {
       const known = listContextWindowModes().map((m) => m.id).join(", ");
-      throw new Error(`Config: context.mode must be one of: ${known}`);
+      console.warn(
+        `[config] Ignoring unknown context.mode "${c.mode}" (expected one of: ${known}); falling back to "${DEFAULT_CONTEXT_WINDOW_MODE_ID}".`
+      );
+      c.mode = DEFAULT_CONTEXT_WINDOW_MODE_ID;
     }
   }
   validateIdentity(cfg) {
@@ -5369,9 +5401,14 @@ var RecoveryLock = class {
     };
   }
   /**
-   * Claim the lock for the given session. Overwrites any existing lock
-   * — the caller should have already handled abandonment (via
-   * `checkAbandoned`) before calling this.
+   * Claim the lock for the given session. Uses exclusive-create (`O_EXCL`)
+   * to detect whether another process acquired the lock between our
+   * `checkAbandoned()` call and now. If the file already exists, it means
+   * another process won the race and we throw instead of silently
+   * overwriting their recovery record.
+   *
+   * The caller MUST have already called `checkAbandoned()` and handled its
+   * null return before calling this.
    */
   async write(sessionId) {
     await ensureDir(path6.dirname(this.file));
@@ -5382,7 +5419,15 @@ var RecoveryLock = class {
       hostname: this.hostname,
       startedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    await atomicWrite(this.file, JSON.stringify(lock), { mode: 384 });
+    try {
+      await fsp2.writeFile(this.file, JSON.stringify(lock), { flag: "wx", mode: 384 });
+    } catch (err) {
+      const code = err.code;
+      if (code === "EEXIST") {
+        throw new Error(`Recovery lock already held by another process`);
+      }
+      throw err;
+    }
   }
   /**
    * Release the lock. Idempotent — silently succeeds if the file is
@@ -6150,7 +6195,7 @@ var DefaultPermissionPolicy = class {
         return { permission: "auto", source: "context", reason: "file already read in this session" };
       }
     }
-    if (tool.permission === "auto") {
+    if (tool.permission === "auto" && !tool.mutating) {
       return { permission: "auto", source: "default" };
     }
     if (this.promptDelegate) {
@@ -6624,8 +6669,8 @@ async function streamProviderToResponse(provider, req, signal, ctx, events) {
       try {
         await Promise.race([
           Promise.resolve(iter.return?.()),
-          new Promise((resolve8) => {
-            drainTimer = setTimeout(resolve8, 500);
+          new Promise((resolve9) => {
+            drainTimer = setTimeout(resolve9, 500);
           })
         ]);
       } finally {
@@ -6686,7 +6731,7 @@ async function runProviderWithRetry(opts) {
           description
         });
       }
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve9, reject) => {
         let settled = false;
         const onAbort = () => {
           if (settled) return;
@@ -6699,7 +6744,7 @@ async function runProviderWithRetry(opts) {
           settled = true;
           clearTimeout(t2);
           signal.removeEventListener("abort", onAbort);
-          resolve8();
+          resolve9();
         }, delay);
         if (signal.aborted) {
           onAbort();
@@ -8343,7 +8388,7 @@ ${recentJournal}` : "No prior iterations.",
   }
 };
 function sleep(ms) {
-  return new Promise((resolve8) => setTimeout(resolve8, ms));
+  return new Promise((resolve9) => setTimeout(resolve9, ms));
 }
 
 // src/coordination/subagent-budget.ts
@@ -8493,12 +8538,12 @@ var SubagentBudget = class _SubagentBudget {
           if (!bus || !bus.hasListenerFor("budget.threshold_reached")) {
             return Promise.resolve("stop");
           }
-          return new Promise((resolve8) => {
+          return new Promise((resolve9) => {
             let resolved = false;
             const respond = (d) => {
               if (resolved) return;
               resolved = true;
-              resolve8(d);
+              resolve9(d);
             };
             const fallback = setTimeout(
               () => respond("stop"),
@@ -11539,7 +11584,7 @@ var DefaultMultiAgentCoordinator = class extends EventEmitter {
       taskIds.map((id) => {
         const cached = this.completedResults.find((r) => r.taskId === id);
         if (cached) return cached;
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           const timeout = setTimeout(() => {
             this.off("task.completed", handler);
             reject(new Error(`awaitTasks timed out waiting for task "${id}"`));
@@ -11548,7 +11593,7 @@ var DefaultMultiAgentCoordinator = class extends EventEmitter {
             if (result.taskId === id) {
               clearTimeout(timeout);
               this.off("task.completed", handler);
-              resolve8(result);
+              resolve9(result);
             }
           };
           this.on("task.completed", handler);
@@ -11978,7 +12023,7 @@ function providerErrorToSubagentError(err, message, cause) {
 
 // src/execution/parallel-eternal-engine.ts
 function sleep2(ms) {
-  return new Promise((resolve8) => setTimeout(resolve8, ms));
+  return new Promise((resolve9) => setTimeout(resolve9, ms));
 }
 var GOAL_COMPLETE_MARKER2 = /^\s*\[goal[_\s-]?complete\]\s*$/im;
 var ParallelEternalEngine = class {
@@ -13620,11 +13665,11 @@ var Director = class {
         if (cached) return cached;
         const existing = this.taskWaiters.get(id);
         if (existing) return existing.promise;
-        let resolve8;
+        let resolve9;
         const promise = new Promise((res) => {
-          resolve8 = res;
+          resolve9 = res;
         });
-        this.taskWaiters.set(id, { promise, resolve: resolve8 });
+        this.taskWaiters.set(id, { promise, resolve: resolve9 });
         return promise;
       })
     );
@@ -13940,7 +13985,7 @@ function createDelegateTool(opts) {
           subagentId
         });
         const dir = director;
-        const result = await new Promise((resolve8) => {
+        const result = await new Promise((resolve9) => {
           let settled = false;
           let timer;
           const finish = (value) => {
@@ -13949,7 +13994,7 @@ function createDelegateTool(opts) {
             if (timer) clearTimeout(timer);
             offTool();
             offIter();
-            resolve8(value);
+            resolve9(value);
           };
           const arm = () => {
             if (timer) clearTimeout(timer);
@@ -17092,9 +17137,9 @@ var DefaultHealthRegistry = class {
   }
   async runOne(check) {
     let timer = null;
-    const timeout = new Promise((resolve8) => {
+    const timeout = new Promise((resolve9) => {
       timer = setTimeout(
-        () => resolve8({ status: "unhealthy", detail: `timeout after ${this.timeoutMs}ms` }),
+        () => resolve9({ status: "unhealthy", detail: `timeout after ${this.timeoutMs}ms` }),
         this.timeoutMs
       );
     });
@@ -17333,14 +17378,14 @@ async function startMetricsServer(opts) {
     const { createServer } = await import('http');
     server = createServer(listener);
   }
-  await new Promise((resolve8, reject) => {
+  await new Promise((resolve9, reject) => {
     const onError = (err) => {
       server.off("listening", onListening);
       reject(err);
     };
     const onListening = () => {
       server.off("error", onError);
-      resolve8();
+      resolve9();
     };
     server.once("error", onError);
     server.once("listening", onListening);
@@ -17352,8 +17397,8 @@ async function startMetricsServer(opts) {
   return {
     port: boundPort,
     url: `${protocol}://${host}:${boundPort}${path28}`,
-    close: () => new Promise((resolve8, reject) => {
-      server.close((err) => err ? reject(err) : resolve8());
+    close: () => new Promise((resolve9, reject) => {
+      server.close((err) => err ? reject(err) : resolve9());
     })
   };
 }
@@ -18449,10 +18494,12 @@ async function collectFiles(dir, baseDir) {
 // src/storage/session-rewinder.ts
 init_atomic_write();
 var DefaultSessionRewinder = class {
-  constructor(sessionsDir) {
+  constructor(sessionsDir, projectRoot) {
     this.sessionsDir = sessionsDir;
+    this.projectRoot = projectRoot;
   }
   sessionsDir;
+  projectRoot;
   async listCheckpoints(sessionId) {
     const file = path6.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp2.readFile(file, "utf8");
@@ -18509,7 +18556,7 @@ var DefaultSessionRewinder = class {
         }
       }
     }
-    const result = await revertSnapshots(snapshotsToRevert);
+    const result = await revertSnapshots(snapshotsToRevert, this.projectRoot);
     const removedEvents = events.length - targetIdx - 1;
     return { ...result, toPromptIndex: checkpointIndex, removedEvents };
   }
@@ -18539,7 +18586,7 @@ var DefaultSessionRewinder = class {
         snapshotsToRevert.push({ promptIndex: event.promptIndex, files: event.files });
       }
     }
-    const result = await revertSnapshots(snapshotsToRevert.reverse());
+    const result = await revertSnapshots(snapshotsToRevert.reverse(), this.projectRoot);
     return { ...result, toPromptIndex: targetIndex, removedEvents: snapshotsToRevert.length };
   }
   async rewindToStart(sessionId) {
@@ -18555,7 +18602,7 @@ var DefaultSessionRewinder = class {
     if (allSnapshots.length === 0) {
       return { revertedFiles: [], errors: [], toPromptIndex: 0, removedEvents: 0 };
     }
-    const result = await revertSnapshots(allSnapshots.reverse());
+    const result = await revertSnapshots(allSnapshots.reverse(), this.projectRoot);
     return { ...result, toPromptIndex: 0, removedEvents: allSnapshots.length };
   }
 };
@@ -18573,12 +18620,19 @@ function parseEvents(raw) {
   }
   return events;
 }
-async function revertSnapshots(snapshots) {
+async function revertSnapshots(snapshots, projectRoot) {
   const revertedFiles = [];
   const errors = [];
   for (const snapshot of snapshots) {
     for (const file of snapshot.files) {
       try {
+        const absPath = path6.resolve(file.path);
+        const root = path6.resolve(projectRoot);
+        const rel = path6.relative(root, absPath);
+        if (rel.startsWith("..") || path6.isAbsolute(rel)) {
+          errors.push(`${file.path}: path resolves outside project root \u2014 skipping`);
+          continue;
+        }
         if (file.action === "deleted") {
           if (file.before !== null) {
             await atomicWrite(file.path, file.before, { mode: 420 });
@@ -19754,7 +19808,7 @@ var SecurityScannerOrchestrator = class {
       const delay = Math.round(policy.delayMs(attempt));
       const status = isProviderErr ? err.status : 0;
       console.warn(`[SecurityScanner] retry ${attempt + 1} after ${delay}ms (status=${status}) \u2014 ${errAsErr.message}`);
-      await new Promise((resolve8) => setTimeout(resolve8, delay));
+      await new Promise((resolve9) => setTimeout(resolve9, delay));
       return this.completeWithRetry(provider, request, abortController, attempt + 1);
     }
   }
@@ -20769,7 +20823,7 @@ function createMcpControlTool(opts) {
     description: "Manage MCP server lifecycle: list available servers, search by name or capability, enable or disable servers at runtime, restart running servers.",
     category: "mcp",
     permission: "auto",
-    mutating: false,
+    mutating: true,
     riskTier: "standard",
     inputSchema,
     async execute(raw, ctx) {
@@ -21251,12 +21305,12 @@ function makeContinueToNextIterationTool() {
 // src/core/iteration-limit.ts
 function requestLimitExtension(opts) {
   const { events, currentIterations, currentLimit, autoExtend, timeoutMs = 3e4 } = opts;
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     let resolved = false;
     const timerFired = () => {
       if (!resolved) {
         resolved = true;
-        resolve8(0);
+        resolve9(0);
       }
     };
     const timer = setTimeout(timerFired, timeoutMs);
@@ -21265,14 +21319,14 @@ function requestLimitExtension(opts) {
       if (!resolved) {
         resolved = true;
         clearTimeout(timer);
-        resolve8(0);
+        resolve9(0);
       }
     };
     const grant = (extra) => {
       if (!resolved) {
         resolved = true;
         clearTimeout(timer);
-        resolve8(Math.max(0, extra));
+        resolve9(Math.max(0, extra));
       }
     };
     events.emit("iteration.limit_reached", {
@@ -21286,7 +21340,7 @@ function requestLimitExtension(opts) {
         if (!resolved) {
           resolved = true;
           clearTimeout(timer);
-          resolve8(100);
+          resolve9(100);
         }
       });
     }
@@ -21855,13 +21909,13 @@ var Agent = class {
     }
   }
   waitForConfirm(info) {
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       this.events.emit("tool.confirm_needed", {
         tool: info.tool,
         input: info.input,
         toolUseId: info.toolUseId,
         suggestedPattern: info.suggestedPattern,
-        resolve: resolve8
+        resolve: resolve9
       });
     });
   }
@@ -22578,12 +22632,12 @@ ${mem}`);
     }
   }
   async gitStatus(root) {
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       let settled = false;
       const finish = (s) => {
         if (settled) return;
         settled = true;
-        resolve8(s);
+        resolve9(s);
       };
       let proc;
       const timer = setTimeout(() => {
@@ -23941,7 +23995,7 @@ var PhaseOrchestrator = class {
     };
   }
   delay(ms) {
-    return new Promise((resolve8) => setTimeout(resolve8, ms));
+    return new Promise((resolve9) => setTimeout(resolve9, ms));
   }
 };
 
@@ -24609,7 +24663,11 @@ var WorktreeManager = class {
     const slug = this.makeSlug(opts.slugHint ?? ownerId);
     const branch = `wstack/ap/${slug}`;
     const dir = join(this.worktreesRoot(), slug);
-    assertSafePath(dir, this.projectRoot);
+    const absDir = resolve(dir);
+    const absRoot = resolve(this.projectRoot);
+    if (!absDir.startsWith(absRoot + sep)) {
+      throw new Error(`Worktree dir "${absDir}" resolves outside project root`);
+    }
     const baseBranch = opts.baseBranch ?? await this.detectBaseBranch();
     const handle = {
       id: slug,
@@ -24660,7 +24718,8 @@ var WorktreeManager = class {
       this.emitCommitted(handle, false);
       return { committed: false };
     }
-    const committed = await this.runGit(["commit", "-m", message], handle.dir);
+    const idArgs = await this.identityArgs(handle.dir);
+    const committed = await this.runGit([...idArgs, "commit", "-m", message], handle.dir);
     if (committed.code !== 0) {
       this.fail(handle, committed.stderr || "git commit failed");
       return { committed: false };
@@ -24686,7 +24745,10 @@ var WorktreeManager = class {
     const mergeArgs = squash ? ["merge", "--squash", handle.branch] : ["merge", "--no-ff", handle.branch];
     const merged = await this.runGit(mergeArgs, this.projectRoot);
     if (merged.code !== 0) {
-      const conflictFiles = await this.unmergedFiles();
+      const fromOutput = parseConflictPaths(`${merged.stdout}
+${merged.stderr}`);
+      const fromIndex = await this.unmergedFiles();
+      const conflictFiles = [.../* @__PURE__ */ new Set([...fromOutput, ...fromIndex])];
       await this.runGit(["reset", "--hard", "HEAD"], this.projectRoot);
       handle.conflictFiles = conflictFiles;
       this.setStatus(handle, "needs-review", { lastError: merged.stderr });
@@ -24700,7 +24762,8 @@ var WorktreeManager = class {
     }
     if (squash) {
       const msg = opts.message ?? `merge ${handle.branch} (squash)`;
-      const commit = await this.runGit(["commit", "-m", msg], this.projectRoot);
+      const idArgs = await this.identityArgs(this.projectRoot);
+      const commit = await this.runGit([...idArgs, "commit", "-m", msg], this.projectRoot);
       if (commit.code !== 0 && !/nothing to commit/i.test(commit.stdout + commit.stderr)) {
         this.fail(handle, commit.stderr || "squash commit failed");
         return { ok: false, stderr: commit.stderr };
@@ -24775,11 +24838,27 @@ var WorktreeManager = class {
     }
     return { insertions, deletions, files, sha };
   }
+  /**
+   * `git -c user.*` fallback so commits succeed on machines and CI runners
+   * that have no global git identity configured. Returns `[]` when both
+   * `user.name` and `user.email` are already set (the common case), so a real
+   * user's identity is never overridden. The worktree branch commits are
+   * squashed away on merge, so the fallback identity never reaches the base
+   * branch history.
+   */
+  async identityArgs(cwd) {
+    const name = (await this.runGit(["config", "user.name"], cwd)).stdout.trim();
+    const email = (await this.runGit(["config", "user.email"], cwd)).stdout.trim();
+    if (name && email) return [];
+    return [
+      "-c",
+      `user.name=${name || "WrongStack AutoPhase"}`,
+      "-c",
+      `user.email=${email || "autophase@wrongstack.local"}`
+    ];
+  }
   async unmergedFiles() {
-    const res = await this.runGit(
-      ["diff", "--name-only", "--diff-filter=U"],
-      this.projectRoot
-    );
+    const res = await this.runGit(["diff", "--name-only", "--diff-filter=U"], this.projectRoot);
     return res.stdout.split("\n").map((s) => s.trim()).filter(Boolean);
   }
   emitCommitted(handle, committed) {
@@ -24832,6 +24911,14 @@ var WorktreeManager = class {
     });
   }
 };
+function parseConflictPaths(output) {
+  const paths = /* @__PURE__ */ new Set();
+  for (const line of output.split("\n")) {
+    const m = line.match(/^CONFLICT \([^)]*\): Merge conflict in (.+?)\s*$/);
+    if (m?.[1]) paths.add(m[1]);
+  }
+  return [...paths];
+}
 function assertSafePath(dir, projectRoot) {
   const root = resolve(projectRoot);
   const abs = resolve(dir);
@@ -24840,6 +24927,6 @@ function assertSafePath(dir, projectRoot) {
   }
 }
 
-export { AGENTS_BY_PHASE, AGENT_CATALOG, AISpecBuilder, ALL_AGENT_DEFINITIONS, ALL_FLEET_AGENTS, AUDIT_LOG_AGENT, Agent, AgentError, AutoApprovePermissionPolicy, AutoCompactionMiddleware, AutoExecutor, AutoPhasePlanner, AutoPhaseRunner, AutonomousRunner, BUG_HUNTER_AGENT, BudgetExceededError, CONTEXT_WINDOW_MODES, CheckpointManager, ConfigError, ConfigMigrationError, Container, Context, ConversationState, DEFAULT_CONFIG_MIGRATIONS, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_DISPATCH_ROLE, DEFAULT_MAX_ITERATIONS, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SPEC_TEMPLATE, DEFAULT_SUBAGENT_BASELINE, DEFAULT_TOOLS_CONFIG, DefaultAttachmentStore, DefaultConfigLoader, DefaultConfigStore, DefaultErrorHandler, DefaultHealthRegistry, DefaultLogger, DefaultMemoryStore, DefaultModeStore, DefaultModelsRegistry, DefaultMultiAgentCoordinator, DefaultPathResolver, DefaultPermissionPolicy, DefaultPluginAPI, DefaultProviderRunner, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultTaskStore, DefaultTokenCounter, Director, DirectorStateCheckpoint, DoneConditionChecker, ERROR_CODES, EternalAutonomyEngine, EventBus, ExtensionRegistry, FLEET_ROSTER, FLEET_ROSTER_BUDGETS, FleetBus, FleetManager, FleetSpawnBudgetError, FleetUsageAggregator, FsError, GitignoreUpdater, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, InMemoryMetricsSink, InputBuilder, IntelligentCompactor, KERNEL_API_VERSION, LAYER_1_IDENTITY, LLMSelector, MAX_JOURNAL_ENTRIES, NULL_FLEET_BUS, NoopMetricsSink, NoopTracer, OTelTracer, PROMETHEUS_CONTENT_TYPE, ParallelEternalEngine, PhaseGraphBuilder, PhaseOrchestrator, PhaseStore, Pipeline, PluginError, ProviderError, ProviderRegistry, QueueStore, REFACTOR_PLANNER_AGENT, RecoveryLock, ReportGenerator, RunController, SECURITY_SCANNER_AGENT, SPEC_TEMPLATES, ScopedEventBus, SddParallelRun, SddTaskDecomposer, SecurityScanner, SecurityScannerOrchestrator, SelectiveCompactor, SessionAnalyzer, SessionError, SkillGenerator, SkillInstaller, SkillManifestStore, SlashCommandRegistry, SpecDrivenDev, SpecParser, SpecStore, SpecVersioning, SubagentBudget, TOKENS, TaskFlow, TaskGenerator, TaskGraphStore, TaskTracker, TechStackDetector, ToolError, ToolExecutor, ToolRegistry, WorktreeManager, WrongStackError, addPlanItem, allServers, analyzeCriticalPath, appendJournal, applyRosterBudget, asBlocks, asText, assertSafePath, atomicWrite, attachAutoExtend, attachPlanCheckpoint, attachTodosCheckpoint, awsServer, blockServer, braveSearchServer, buildBtwBlock, buildChildEnv, buildGoalPreamble, buildOtlpMetricsRequest, buildOtlpTracesRequest, buildRecoveryStrategies, classifyFamily, clearPlan, color, compileGlob, compileUserRegex, composeDirectorPrompt, composeSubagentPrompt, computeTaskProgress, consumeBtwNotes, context7Server, contextManagerTool, createAutoExecutor, createAutoPhaseFromTaskGraph, createContextManagerTool, createDefaultPipelines, createDelegateTool, createMcpControlTool, createMessage, createSecuritySlashCommand, createToolOutputSerializer, decryptConfigSecrets, defaultGitignoreUpdater, defaultOrchestrator, defaultReportGenerator, defaultSecurityScanner, defaultSkillGenerator, defaultTechStackDetector, deriveTodosFromPlanItem, detectNewlineStyle, dispatchAgent, downloadGitHubTarball, emptyGoal, emptyPlan, encryptConfigSecrets, ensureDir, estimateRequestTokens, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, everArtServer, extractRunEnv, filesystemServer, findCriticalPath, formatContextWindowModeList, formatGoal, formatPlan, formatPlanTemplates, formatTodosList, getAgentDefinition, getContextWindowMode, getPlanTemplate, getTemplate, githubServer, goalFilePath, googleMapsServer, isAgentError, isConfigError, isContextWindowModeId, isFsError, isImageBlock, isPluginError, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isWrongStackError, listContextWindowModes, listPlanTemplates, listTemplates, loadDirectorState, loadGoal, loadPlan, loadPlugins, loadProjectModes, loadTodosCheckpoint, loadUserModes, makeAgentSubagentRunner, makeAutonomyPromptContributor, makeContinueToNextIterationTool, makeDirectorSessionFactory, makeLLMClassifier, matchAny, matchGlob, migratePlaintextSecrets, miniMaxVisionServer, normalizeToLf, parseContinueDirective, parseSkillRef, pendingBtwCount, projectHash, removePlanItem, renderProgress, renderPrometheus, renderSpecAnalysis, renderTaskGraph, renderTaskList, repairToolUseAdjacency, resolveContextWindowPolicy, resolveWstackPaths, rewriteConfigEncrypted, rosterSummaryFromConfigs, runConfigMigrations, safeParse, safeStringify, sanitizeJsonString, saveGoal, savePlan, saveTodosCheckpoint, scoreAgents, securitySlashCommand, sentinelServer, setBtwNote, setPlanItemStatus, slackServer, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, stripAnsi, summarizeUsage, templateToMarkdown, toStyle, toWrongStackError, topologicalSort, unifiedDiff, unloadPlugins, validateAgainstSchema, wireMetricsToEvents, wrapAsState, zaiVisionServer };
+export { AGENTS_BY_PHASE, AGENT_CATALOG, AISpecBuilder, ALL_AGENT_DEFINITIONS, ALL_FLEET_AGENTS, AUDIT_LOG_AGENT, Agent, AgentError, AutoApprovePermissionPolicy, AutoCompactionMiddleware, AutoExecutor, AutoPhasePlanner, AutoPhaseRunner, AutonomousRunner, BUG_HUNTER_AGENT, BudgetExceededError, CONTEXT_WINDOW_MODES, CheckpointManager, ConfigError, ConfigMigrationError, Container, Context, ConversationState, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CONFIG_MIGRATIONS, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_DISPATCH_ROLE, DEFAULT_MAX_ITERATIONS, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SPEC_TEMPLATE, DEFAULT_SUBAGENT_BASELINE, DEFAULT_TOOLS_CONFIG, DefaultAttachmentStore, DefaultConfigLoader, DefaultConfigStore, DefaultErrorHandler, DefaultHealthRegistry, DefaultLogger, DefaultMemoryStore, DefaultModeStore, DefaultModelsRegistry, DefaultMultiAgentCoordinator, DefaultPathResolver, DefaultPermissionPolicy, DefaultPluginAPI, DefaultProviderRunner, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultTaskStore, DefaultTokenCounter, Director, DirectorStateCheckpoint, DoneConditionChecker, ERROR_CODES, EternalAutonomyEngine, EventBus, ExtensionRegistry, FLEET_ROSTER, FLEET_ROSTER_BUDGETS, FleetBus, FleetManager, FleetSpawnBudgetError, FleetUsageAggregator, FsError, GitignoreUpdater, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, InMemoryMetricsSink, InputBuilder, IntelligentCompactor, KERNEL_API_VERSION, LAYER_1_IDENTITY, LLMSelector, MAX_JOURNAL_ENTRIES, NULL_FLEET_BUS, NoopMetricsSink, NoopTracer, OTelTracer, PROMETHEUS_CONTENT_TYPE, ParallelEternalEngine, PhaseGraphBuilder, PhaseOrchestrator, PhaseStore, Pipeline, PluginError, ProviderError, ProviderRegistry, QueueStore, REFACTOR_PLANNER_AGENT, RecoveryLock, ReportGenerator, RunController, SECURITY_SCANNER_AGENT, SPEC_TEMPLATES, ScopedEventBus, SddParallelRun, SddTaskDecomposer, SecurityScanner, SecurityScannerOrchestrator, SelectiveCompactor, SessionAnalyzer, SessionError, SkillGenerator, SkillInstaller, SkillManifestStore, SlashCommandRegistry, SpecDrivenDev, SpecParser, SpecStore, SpecVersioning, SubagentBudget, TOKENS, TaskFlow, TaskGenerator, TaskGraphStore, TaskTracker, TechStackDetector, ToolError, ToolExecutor, ToolRegistry, WorktreeManager, WrongStackError, addPlanItem, allServers, analyzeCriticalPath, appendJournal, applyRosterBudget, asBlocks, asText, assertSafePath, atomicWrite, attachAutoExtend, attachPlanCheckpoint, attachTodosCheckpoint, awsServer, blockServer, braveSearchServer, buildBtwBlock, buildChildEnv, buildGoalPreamble, buildOtlpMetricsRequest, buildOtlpTracesRequest, buildRecoveryStrategies, classifyFamily, clearPlan, color, compileGlob, compileUserRegex, composeDirectorPrompt, composeSubagentPrompt, computeTaskProgress, consumeBtwNotes, context7Server, contextManagerTool, createAutoExecutor, createAutoPhaseFromTaskGraph, createContextManagerTool, createDefaultPipelines, createDelegateTool, createMcpControlTool, createMessage, createSecuritySlashCommand, createToolOutputSerializer, decryptConfigSecrets, defaultGitignoreUpdater, defaultOrchestrator, defaultReportGenerator, defaultSecurityScanner, defaultSkillGenerator, defaultTechStackDetector, deriveTodosFromPlanItem, detectNewlineStyle, dispatchAgent, downloadGitHubTarball, emptyGoal, emptyPlan, encryptConfigSecrets, ensureDir, estimateRequestTokens, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, everArtServer, extractRunEnv, filesystemServer, findCriticalPath, formatContextWindowModeList, formatGoal, formatPlan, formatPlanTemplates, formatTodosList, getAgentDefinition, getContextWindowMode, getPlanTemplate, getTemplate, githubServer, goalFilePath, googleMapsServer, isAgentError, isConfigError, isContextWindowModeId, isFsError, isImageBlock, isPluginError, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isWrongStackError, listContextWindowModes, listPlanTemplates, listTemplates, loadDirectorState, loadGoal, loadPlan, loadPlugins, loadProjectModes, loadTodosCheckpoint, loadUserModes, makeAgentSubagentRunner, makeAutonomyPromptContributor, makeContinueToNextIterationTool, makeDirectorSessionFactory, makeLLMClassifier, matchAny, matchGlob, migratePlaintextSecrets, miniMaxVisionServer, normalizeToLf, parseContinueDirective, parseSkillRef, pendingBtwCount, projectHash, removePlanItem, renderProgress, renderPrometheus, renderSpecAnalysis, renderTaskGraph, renderTaskList, repairToolUseAdjacency, resolveContextWindowPolicy, resolveWstackPaths, rewriteConfigEncrypted, rosterSummaryFromConfigs, runConfigMigrations, safeParse, safeStringify, sanitizeJsonString, saveGoal, savePlan, saveTodosCheckpoint, scoreAgents, securitySlashCommand, sentinelServer, setBtwNote, setPlanItemStatus, slackServer, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, stripAnsi, summarizeUsage, templateToMarkdown, toStyle, toWrongStackError, topologicalSort, unifiedDiff, unloadPlugins, validateAgainstSchema, wireMetricsToEvents, wrapAsState, zaiVisionServer };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map