@wrongstack/core 0.8.6 → 0.9.0

package/dist/{index-BvZld4Dr.d.ts → index-Dl3PaD7f.d.ts}

@@ -115,6 +115,15 @@ declare class WorktreeManager {
     private detectBaseBranch;
     private makeSlug;
     private collectStats;
+    /**
+     * `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.
+     */
+    private identityArgs;
     private unmergedFiles;
     private emitCommitted;
     private fail;

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import { S as SystemPromptBuilder, c as ModelCapabilities, a as BuildContext, C
 export { B as BindOptions, D as Decorator, F as Factory, M as Middleware, b as MiddlewareHandler, N as NextFn, P as Pipeline, d as PipelineOptions, e as Renderer, T as Token } from './system-prompt-CWA6ml-d.js';
 import { E as EventBus, c as EventName, L as Listener } from './events-yCpJD4wa.js';
 export { a as EventLogger, b as EventMap, S as ScopedEventBus } from './events-yCpJD4wa.js';
-import { d as WorktreeManager } from './index-BvZld4Dr.js';
-export { A as AllocateOpts, M as MergeOpts, a as MergeResult, R as RunController, b as RunControllerOptions, T as TOKENS, W as WorktreeHandle, e as WorktreeManagerOptions, c as WorktreeRunResult, f as WorktreeStatus, g as assertSafePath } from './index-BvZld4Dr.js';
+import { d as WorktreeManager } from './index-Dl3PaD7f.js';
+export { A as AllocateOpts, M as MergeOpts, a as MergeResult, R as RunController, b as RunControllerOptions, T as TOKENS, W as WorktreeHandle, e as WorktreeManagerOptions, c as WorktreeRunResult, f as WorktreeStatus, g as assertSafePath } from './index-Dl3PaD7f.js';
 import { d as Context, m as Provider, Q as Tool, c as ContentBlock, T as TextBlock } from './context-z2x5gv_V.js';
 export { A as AgentError, a as Capabilities, b as ConfigError, e as ContextInit, f as ConversationState, E as ERROR_CODES, g as ErrorCode, h as ErrorSeverity, i as ErrorSubsystem, F as FileSnapshot, j as FsError, I as ImageBlock, J as JSONSchema, M as Message, k as MessageRole, P as Permission, l as PluginError, n as ProviderError, o as ProviderErrorBody, R as ReadonlyConversationState, p as Request, q as Response, r as ResumedSession, s as RiskTier, t as RunEnv, u as RunOptions, S as SessionData, v as SessionError, w as SessionEvent, x as SessionMetadata, y as SessionStore, z as SessionSummary, B as SessionWriter, D as StateChange, G as StateChangeHandler, H as StopReason, K as StreamEvent, L as ThinkingBlock, N as TodoItem, O as TokenCounter, U as ToolCallContext, V as ToolError, W as ToolFinalEvent, X as ToolProgressEvent, Y as ToolResultBlock, Z as ToolStreamEvent, _ as ToolUseBlock, $ as Usage, a0 as WrongStackError, a1 as asBlocks, a2 as asText, a3 as extractRunEnv, a4 as isAgentError, a5 as isConfigError, a6 as isFsError, a7 as isImageBlock, a8 as isPluginError, a9 as isSessionError, aa as isTextBlock, ab as isThinkingBlock, ac as isToolError, ad as isToolResultBlock, ae as isToolUseBlock, af as isWrongStackError, ag as toWrongStackError, ah as wrapAsState } from './context-z2x5gv_V.js';
 export { P as ProviderRunner, R as RunProviderOptions } from './provider-runner-C4ouU7--.js';
@@ -36,7 +36,7 @@ export { C as CriticalPathResult, D as DEFAULT_SPEC_TEMPLATE, S as SpecAnalysis,
 export { A as AggregateHealth, H as HealthCheck, a as HealthCheckResult, b as HealthRegistry, c as HealthStatus, M as MetricLabels, d as MetricSeries, e as MetricsSink, f as MetricsSnapshot, S as Span, T as Tracer } from './observability-BhnVLBLS.js';
 export { AtomicWriteOptions, BuildChildEnvOptions, CompileFail, CompileResult, MessageRepairReport, MessageRepairResult, NewlineStyle, RequestTokenBreakdown, SafeParseResult, ToolOutputSerializerOptions, UnifiedDiffOptions, ValidationError, ValidationResult, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, formatTodosList, matchAny, matchGlob, normalizeToLf, repairToolUseAdjacency, safeParse, safeStringify, sanitizeJsonString, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema } from './utils/index.js';
 export { W as WstackPathOptions, a as WstackPaths, p as projectHash, r as resolveWstackPaths } from './wstack-paths-CJYrjQU8.js';
-export { A as AbandonedSession, a as AttachmentStoreOptions, C as ConfigLoaderOptions, b as ConfigMigration, c as ConfigMigrationError, d as ConfigSource, D as DEFAULT_CONFIG_MIGRATIONS, e as DefaultAttachmentStore, f as DefaultConfigLoader, g as DefaultConfigStore, h as DefaultMemoryStore, i as DefaultSessionStore, M as MemoryStoreOptions, j as MigrationContext, k as MigrationResult, P as PersistedQueueItem, l as PlanFile, m as PlanItem, n as PlanTemplate, Q as QueueStore, R as RecoveryLock, o as RecoveryLockOptions, S as SessionAnalyzer, p as SessionStoreOptions, T as TodosCheckpointFile, q as addPlanItem, r as attachPlanCheckpoint, s as attachTodosCheckpoint, t as clearPlan, u as deriveTodosFromPlanItem, v as emptyPlan, w as formatPlan, x as formatPlanTemplates, y as getPlanTemplate, z as listPlanTemplates, B as loadPlan, E as loadTodosCheckpoint, F as removePlanItem, G as runConfigMigrations, H as savePlan, I as saveTodosCheckpoint, J as setPlanItemStatus } from './plan-templates-Cqdy6rtM.js';
+export { A as AbandonedSession, a as AttachmentStoreOptions, C as ConfigLoaderOptions, b as ConfigMigration, c as ConfigMigrationError, d as ConfigSource, D as DEFAULT_CONFIG_MIGRATIONS, e as DefaultAttachmentStore, f as DefaultConfigLoader, g as DefaultConfigStore, h as DefaultMemoryStore, i as DefaultSessionStore, M as MemoryStoreOptions, j as MigrationContext, k as MigrationResult, P as PersistedQueueItem, l as PlanFile, m as PlanItem, n as PlanTemplate, Q as QueueStore, R as RecoveryLock, o as RecoveryLockOptions, S as SessionAnalyzer, p as SessionStoreOptions, T as TodosCheckpointFile, q as addPlanItem, r as attachPlanCheckpoint, s as attachTodosCheckpoint, t as clearPlan, u as deriveTodosFromPlanItem, v as emptyPlan, w as formatPlan, x as formatPlanTemplates, y as getPlanTemplate, z as listPlanTemplates, B as loadPlan, E as loadTodosCheckpoint, F as removePlanItem, G as runConfigMigrations, H as savePlan, I as saveTodosCheckpoint, J as setPlanItemStatus } from './plan-templates-Cc-04Z8o.js';
 export { D as DirectorStateCheckpoint, a as DirectorStateSnapshot, b as DirectorSubagentState, c as DirectorTaskState, l as loadDirectorState } from './director-state-BmYi3DGA.js';
 export { A as AutoApprovePermissionPolicy, D as DefaultPermissionPolicy, P as PermissionPolicyOptions } from './permission-policy-BBa1M1xc.js';
 export { AutoCompactionMiddleware, AutonomousRunner, AutonomousRunnerOptions, AutonomyPromptContributorOptions, DefaultSkillLoader, DoneCheckResult, DoneConditionChecker, EternalAutonomyEngine, EternalAutonomyOptions, EternalEngineState, IntelligentCompactor, IntelligentCompactorOptions, ParallelEngineState, ParallelEternalEngine, ParallelEternalOptions, SelectiveCompactor, SelectiveCompactorOptions, SkillLoaderOptions, buildGoalPreamble, makeAutonomyPromptContributor } from './execution/index.js';

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;
@@ -2694,7 +2694,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 +2706,7 @@ var InMemoryAgentBridge = class {
         return;
       }
       this.pendingRequests.set(correlationId, {
-        resolve: resolve8,
+        resolve: resolve9,
         reject,
         timer
       });
@@ -3990,7 +3990,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."
@@ -5369,9 +5371,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 +5389,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
@@ -6624,8 +6639,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 +6701,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 +6714,7 @@ async function runProviderWithRetry(opts) {
           settled = true;
           clearTimeout(t2);
           signal.removeEventListener("abort", onAbort);
-          resolve8();
+          resolve9();
         }, delay);
         if (signal.aborted) {
           onAbort();
@@ -8343,7 +8358,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 +8508,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 +11554,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 +11563,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 +11993,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 +13635,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 +13955,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 +13964,7 @@ function createDelegateTool(opts) {
             if (timer) clearTimeout(timer);
             offTool();
             offIter();
-            resolve8(value);
+            resolve9(value);
           };
           const arm = () => {
             if (timer) clearTimeout(timer);
@@ -17092,9 +17107,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 +17348,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 +17367,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 +18464,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 +18526,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 +18556,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 +18572,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 +18590,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 +19778,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);
     }
   }
@@ -21251,12 +21275,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 +21289,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 +21310,7 @@ function requestLimitExtension(opts) {
         if (!resolved) {
           resolved = true;
           clearTimeout(timer);
-          resolve8(100);
+          resolve9(100);
         }
       });
     }
@@ -21855,13 +21879,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 +22602,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 +23965,7 @@ var PhaseOrchestrator = class {
     };
   }
   delay(ms) {
-    return new Promise((resolve8) => setTimeout(resolve8, ms));
+    return new Promise((resolve9) => setTimeout(resolve9, ms));
   }
 };
 
@@ -24609,7 +24633,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 +24688,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 +24715,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 +24732,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 +24808,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 +24881,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);