@wrongstack/core 0.104.0 → 0.109.1

package/dist/{goal-store-ht0VmR1A.d.ts → goal-store-CV9Yz2X_.d.ts}

@@ -81,6 +81,17 @@ interface GoalFile {
 declare const MAX_JOURNAL_ENTRIES = 500;
 /**
  * Resolve the goal file path for a given project root.
+ *
+ * SINGLE canonical location: the per-project directory that
+ * `resolveWstackPaths()` uses for everything else (sessions, memory, specs) —
+ * `~/.wrongstack/projects/<slug>/goal.json`. This is the same path the `/goal`
+ * slash command writes via `opts.paths.projectGoal`, so every reader/writer
+ * (the eternal/parallel autonomy engines, the CLI autonomy commands, the TUI
+ * F9 panel, and `/goal` itself) now agree on one file.
+ *
+ * Previously this returned a SEPARATE hash-based dir (`projects/<hash>/`), which
+ * disagreed with `/goal` and littered the home dir with thousands of stray
+ * `<hash>/goal.json` directories that held nothing else.
  */
 declare function goalFilePath(projectRoot: string): string;
 declare function loadGoal(filePath: string): Promise<GoalFile | null>;

package/dist/index.d.ts

@@ -21,7 +21,7 @@ import { D as DefaultLogger } from './logger-B9J5puGM.js';
 export { a as DefaultLoggerOptions } from './logger-B9J5puGM.js';
 import { D as DefaultPathResolver } from './path-resolver-DDJiMAtX.js';
 export { a as DefaultTokenCounter } from './path-resolver-DDJiMAtX.js';
-export { C as CompactorOptions, g as DEFAULT_RECOVERY_STRATEGIES, D as DefaultErrorHandler, a as DefaultRetryPolicy, E as EternalAutonomyEngine, b as EternalAutonomyOptions, c as EternalEngineState, H as HybridCompactor, I as IterationStage, P as ParallelEngineState, d as ParallelEternalEngine, e as ParallelEternalOptions, f as ParallelIterationStage, R as RecoveryStrategy, T as ToolExecutor, h as buildRecoveryStrategies } from './parallel-eternal-engine-CUtmM_0V.js';
+export { C as CompactorOptions, g as DEFAULT_RECOVERY_STRATEGIES, D as DefaultErrorHandler, a as DefaultRetryPolicy, E as EternalAutonomyEngine, b as EternalAutonomyOptions, c as EternalEngineState, H as HybridCompactor, I as IterationStage, P as ParallelEngineState, d as ParallelEternalEngine, e as ParallelEternalOptions, f as ParallelIterationStage, R as RecoveryStrategy, T as ToolExecutor, h as buildRecoveryStrategies } from './parallel-eternal-engine-B2CbsKpc.js';
 import { S as SkillLoader } from './skill-Bj6Ezqb8.js';
 export { b as SkillEntry, a as SkillManifest } from './skill-Bj6Ezqb8.js';
 export { I as InputReader, P as PromptOption } from './input-reader-E-ffP2ee.js';
@@ -60,7 +60,7 @@ export { C as ContextManagerAction, a as ContextManagerInput, b as ContextManage
 export { DownloadResult, InstallResult, InstalledSkillEntry, ManifestData, ParsedRef, SkillInstaller, SkillInstallerOptions, SkillManifestStore, UpdateResult, downloadGitHubTarball, parseSkillRef } from './skills/index.js';
 import { ReplayLogStore, DefaultPromptStore } from './storage/index.js';
 export { ALL_SYNC_CATEGORIES, Annotation, AnnotationsStore, AnnotationsStoreOptions, AuditEntry, CloudSync, ConsolidationOp, DefaultSessionRewinder, GraphMemoryBackend, GraphMemoryBackendOptions, MemoryConsolidatorOptions, PromptEntry, PromptStore, RecoveryPlan, ReplayEntry, ReplayLogStoreOptions, SessionMemoryConsolidator, SessionRecovery, SessionRewinderOptions, StaleSession, SyncResult, TaskFile, ToolAuditLog, ToolAuditLogOptions, VerifyResult, emptyTaskFile, loadTasks, saveTasks } from './storage/index.js';
-export { G as GoalFile, J as JournalEntry, M as MAX_JOURNAL_ENTRIES, a as MAX_PROGRESS_HISTORY, P as ProgressSnapshot, b as appendJournal, e as emptyGoal, f as formatGoal, g as goalFilePath, l as loadGoal, p as parseProgressFromText, r as recordProgress, s as saveGoal, c as setProgress, d as summarizeUsage } from './goal-store-ht0VmR1A.js';
+export { G as GoalFile, J as JournalEntry, M as MAX_JOURNAL_ENTRIES, a as MAX_PROGRESS_HISTORY, P as ProgressSnapshot, b as appendJournal, e as emptyGoal, f as formatGoal, g as goalFilePath, l as loadGoal, p as parseProgressFromText, r as recordProgress, s as saveGoal, c as setProgress, d as summarizeUsage } from './goal-store-CV9Yz2X_.js';
 import { R as RetryPolicy, E as ErrorHandler } from './retry-policy-BcmuT_V0.js';
 import { L as Logger } from './logger-B63L5bTg.js';
 export { a as LogLevel } from './logger-B63L5bTg.js';

package/dist/index.js

@@ -5,7 +5,7 @@ import { readFile, readdir, stat, mkdir } from 'fs/promises';
 import * as path6 from 'path';
 import { join, extname, relative, isAbsolute, resolve, sep } from 'path';
 import * as fs2 from 'fs';
-import * as os7 from 'os';
+import * as os6 from 'os';
 import { hostname } from 'os';
 import { execFile, spawn } from 'child_process';
 import { promisify } from 'util';
@@ -99,7 +99,7 @@ async function withFileLock(targetPath, fn, opts = {}) {
       if (Date.now() - started >= timeoutMs) {
         throw new Error(`Timed out waiting for file lock: ${targetPath}`);
       }
-      await new Promise((resolve13) => setTimeout(resolve13, 25));
+      await new Promise((resolve12) => setTimeout(resolve12, 25));
     }
   }
   try {
@@ -132,7 +132,7 @@ async function renameWithRetry(from, to) {
       if (!code || !TRANSIENT_RENAME_CODES.has(code) || i === delays.length) {
         throw err;
       }
-      await new Promise((resolve13) => setTimeout(resolve13, delays[i]));
+      await new Promise((resolve12) => setTimeout(resolve12, delays[i]));
     }
   }
   throw lastErr;
@@ -2139,7 +2139,7 @@ var DefaultPathResolver = class {
   detectProjectRoot(start) {
     let dir = path6.resolve(start);
     const root = path6.parse(dir).root;
-    const home = path6.resolve(os7.homedir());
+    const home = path6.resolve(os6.homedir());
     const startPath = path6.resolve(start);
     while (dir !== root) {
       if (dir === home && dir !== startPath) {
@@ -3200,7 +3200,7 @@ var InMemoryAgentBridge = class {
       );
     }
     this.inflightGuards.add(correlationId);
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve12, reject) => {
       const timer = setTimeout(() => {
         this.inflightGuards.delete(correlationId);
         this.pendingRequests.delete(correlationId);
@@ -3212,7 +3212,7 @@ var InMemoryAgentBridge = class {
         return;
       }
       this.pendingRequests.set(correlationId, {
-        resolve: resolve13,
+        resolve: resolve12,
         reject,
         timer
       });
@@ -3405,11 +3405,11 @@ function validateAgainstSchema(value, schema) {
   walk2(value, schema, "", errors);
   return { ok: errors.length === 0, errors };
 }
-function walk2(value, schema, path37, errors) {
+function walk2(value, schema, path36, errors) {
   if (schema.enum !== void 0) {
     if (!schema.enum.some((e) => deepEqual(e, value))) {
       errors.push({
-        path: path37 || "<root>",
+        path: path36 || "<root>",
         message: `expected one of ${JSON.stringify(schema.enum)}, got ${JSON.stringify(value)}`
       });
       return;
@@ -3418,7 +3418,7 @@ function walk2(value, schema, path37, errors) {
   if (typeof schema.type === "string") {
     if (!checkType(value, schema.type)) {
       errors.push({
-        path: path37 || "<root>",
+        path: path36 || "<root>",
         message: `expected ${schema.type}, got ${describeType(value)}`
       });
       return;
@@ -3428,19 +3428,19 @@ function walk2(value, schema, path37, errors) {
     const obj = value;
     for (const req of schema.required ?? []) {
       if (!(req in obj)) {
-        errors.push({ path: joinPath(path37, req), message: "required property missing" });
+        errors.push({ path: joinPath(path36, req), message: "required property missing" });
       }
     }
     if (schema.properties) {
       for (const [key, subSchema] of Object.entries(schema.properties)) {
         if (key in obj) {
-          walk2(obj[key], subSchema, joinPath(path37, key), errors);
+          walk2(obj[key], subSchema, joinPath(path36, key), errors);
         }
       }
     }
   }
   if (schema.type === "array" && Array.isArray(value) && schema.items) {
-    value.forEach((item, i) => walk2(item, schema.items, `${path37}[${i}]`, errors));
+    value.forEach((item, i) => walk2(item, schema.items, `${path36}[${i}]`, errors));
   }
 }
 function checkType(value, type) {
@@ -4790,7 +4790,7 @@ function slugify(name) {
   return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) || "project";
 }
 function resolveWstackPaths(opts) {
-  const home = opts.userHome ?? os7.homedir();
+  const home = opts.userHome ?? os6.homedir();
   const globalRoot = opts.globalRoot ?? path6.join(home, ".wrongstack");
   const hash = projectHash(opts.projectRoot);
   const slug = projectSlug(opts.projectRoot);
@@ -4921,7 +4921,7 @@ function buildChildEnv(optsOrSessionId) {
 
 // src/utils/sleep.ts
 function sleep(ms) {
-  return new Promise((resolve13) => setTimeout(resolve13, ms));
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
 }
 var GLOB_CHARS = /* @__PURE__ */ new Set(["*", "?", "["]);
 var IS_WINDOWS = process.platform === "win32";
@@ -7113,7 +7113,7 @@ var RecoveryLock = class {
   constructor(opts) {
     this.file = path6.join(opts.dir, LOCK_FILE);
     this.pid = opts.pid ?? process.pid;
-    this.hostname = opts.hostname ?? os7.hostname();
+    this.hostname = opts.hostname ?? os6.hostname();
     this.maxAgeMs = opts.maxAgeMs ?? DEFAULT_MAX_AGE_MS;
     this.sessionStore = opts.sessionStore;
     this.probe = opts.isPidAlive ?? defaultIsPidAlive;
@@ -8660,8 +8660,8 @@ async function streamProviderToResponse(provider, req, signal, ctx, events) {
       try {
         await Promise.race([
           Promise.resolve(iter.return?.()),
-          new Promise((resolve13) => {
-            drainTimer = setTimeout(resolve13, STREAM_DRAIN_TIMEOUT_MS);
+          new Promise((resolve12) => {
+            drainTimer = setTimeout(resolve12, STREAM_DRAIN_TIMEOUT_MS);
           })
         ]);
       } finally {
@@ -8722,7 +8722,7 @@ async function runProviderWithRetry(opts) {
           description
         });
       }
-      await new Promise((resolve13, reject) => {
+      await new Promise((resolve12, reject) => {
         let settled = false;
         const onAbort = () => {
           if (settled) return;
@@ -8735,7 +8735,7 @@ async function runProviderWithRetry(opts) {
           settled = true;
           clearTimeout(t2);
           signal.removeEventListener("abort", onAbort);
-          resolve13();
+          resolve12();
         }, delay);
         if (signal.aborted) {
           onAbort();
@@ -9742,8 +9742,7 @@ var AutonomousRunner = class {
 init_atomic_write();
 var MAX_JOURNAL_ENTRIES = 500;
 function goalFilePath(projectRoot) {
-  const hash = createHash("sha256").update(path6.resolve(projectRoot)).digest("hex").slice(0, 12);
-  return path6.join(os7.homedir(), ".wrongstack", "projects", hash, "goal.json");
+  return resolveWstackPaths({ projectRoot }).projectGoal;
 }
 async function loadGoal(filePath) {
   let raw;
@@ -10798,12 +10797,12 @@ var SubagentBudget = class _SubagentBudget {
           if (!bus || !bus.hasListenerFor("budget.threshold_reached")) {
             return Promise.resolve("stop");
           }
-          return new Promise((resolve13) => {
+          return new Promise((resolve12) => {
             let resolved = false;
             const respond = (d) => {
               if (resolved) return;
               resolved = true;
-              resolve13(d);
+              resolve12(d);
             };
             const fallback = setTimeout(
               () => respond("stop"),
@@ -14219,7 +14218,7 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
       taskIds.map((id) => {
         const cached = this.completedResults.find((r) => r.taskId === id);
         if (cached) return cached;
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           const timeout = setTimeout(() => {
             this.off("task.completed", handler);
             reject(new Error(`awaitTasks timed out waiting for task "${id}"`));
@@ -14228,7 +14227,7 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
             if (result.taskId === id) {
               clearTimeout(timeout);
               this.off("task.completed", handler);
-              resolve13(result);
+              resolve12(result);
             }
           };
           this.on("task.completed", handler);
@@ -17559,11 +17558,11 @@ var Director = class _Director {
         if (cached) return cached;
         const existing = this.taskWaiters.get(id);
         if (existing) return existing.promise;
-        let resolve13;
+        let resolve12;
         const promise = new Promise((res) => {
-          resolve13 = res;
+          resolve12 = res;
         });
-        this.taskWaiters.set(id, { promise, resolve: resolve13 });
+        this.taskWaiters.set(id, { promise, resolve: resolve12 });
         return promise;
       })
     );
@@ -17953,7 +17952,7 @@ function createDelegateTool(opts) {
           subagentId
         });
         const dir = director;
-        const result = await new Promise((resolve13) => {
+        const result = await new Promise((resolve12) => {
           let settled = false;
           let timer;
           const finish = (value) => {
@@ -17963,7 +17962,7 @@ function createDelegateTool(opts) {
             offTool();
             offIter();
             offProgress();
-            resolve13(value);
+            resolve12(value);
           };
           const arm = () => {
             if (timer) clearTimeout(timer);
@@ -19661,9 +19660,9 @@ var AISpecBuilder = class {
     if (!this.sessionPath) return;
     try {
       const fsp21 = await import('fs/promises');
-      const path37 = await import('path');
+      const path36 = await import('path');
       const { atomicWrite: atomicWrite2 } = await Promise.resolve().then(() => (init_atomic_write(), atomic_write_exports));
-      await fsp21.mkdir(path37.dirname(this.sessionPath), { recursive: true });
+      await fsp21.mkdir(path36.dirname(this.sessionPath), { recursive: true });
       await atomicWrite2(this.sessionPath, JSON.stringify(this.session, null, 2));
     } catch {
     }
@@ -20373,15 +20372,15 @@ function computeCriticalPath(graph, _topoOrder, blockedByMap) {
       maxId = id;
     }
   }
-  const path37 = [];
+  const path36 = [];
   let current = maxId;
   const visited = /* @__PURE__ */ new Set();
   while (current && !visited.has(current)) {
     visited.add(current);
-    path37.unshift(current);
+    path36.unshift(current);
     current = prev.get(current) ?? null;
   }
-  return path37;
+  return path36;
 }
 function computeParallelGroups(graph, blockedByMap) {
   const groups = [];
@@ -21192,9 +21191,9 @@ var DefaultHealthRegistry = class {
   }
   async runOne(check) {
     let timer = null;
-    const timeout = new Promise((resolve13) => {
+    const timeout = new Promise((resolve12) => {
       timer = setTimeout(
-        () => resolve13({ status: "unhealthy", detail: `timeout after ${this.timeoutMs}ms` }),
+        () => resolve12({ status: "unhealthy", detail: `timeout after ${this.timeoutMs}ms` }),
         this.timeoutMs
       );
     });
@@ -21377,7 +21376,7 @@ async function startMetricsServer(opts) {
   const tls = opts.tls;
   const useHttps = !!(tls?.cert && tls?.key);
   const host = opts.host ?? "127.0.0.1";
-  const path37 = opts.path ?? "/metrics";
+  const path36 = opts.path ?? "/metrics";
   const healthPath = opts.healthPath ?? "/healthz";
   const healthRegistry = opts.healthRegistry;
   const listener = (req, res) => {
@@ -21387,7 +21386,7 @@ async function startMetricsServer(opts) {
       return;
     }
     const url = req.url.split("?")[0];
-    if (url === path37) {
+    if (url === path36) {
       let body;
       try {
         body = renderPrometheus(opts.sink.snapshot());
@@ -21433,14 +21432,14 @@ async function startMetricsServer(opts) {
     const { createServer } = await import('http');
     server = createServer(listener);
   }
-  await new Promise((resolve13, reject) => {
+  await new Promise((resolve12, reject) => {
     const onError = (err) => {
       server.off("listening", onListening);
       reject(err);
     };
     const onListening = () => {
       server.off("error", onError);
-      resolve13();
+      resolve12();
     };
     server.once("error", onError);
     server.once("listening", onListening);
@@ -21451,9 +21450,9 @@ async function startMetricsServer(opts) {
   const protocol = useHttps ? "https" : "http";
   return {
     port: boundPort,
-    url: `${protocol}://${host}:${boundPort}${path37}`,
-    close: () => new Promise((resolve13, reject) => {
-      server.close((err) => err ? reject(err) : resolve13());
+    url: `${protocol}://${host}:${boundPort}${path36}`,
+    close: () => new Promise((resolve12, reject) => {
+      server.close((err) => err ? reject(err) : resolve12());
     })
   };
 }
@@ -22154,7 +22153,7 @@ async function downloadGitHubTarball(parsed) {
       `Tarball too large (${(Number.parseInt(contentLength, 10) / 1024 / 1024).toFixed(1)}MB). Max: ${MAX_TARBALL_SIZE / 1024 / 1024}MB`
     );
   }
-  const tempDir = await fsp3.mkdtemp(path6.join(os7.tmpdir(), "wskill-"));
+  const tempDir = await fsp3.mkdtemp(path6.join(os6.tmpdir(), "wskill-"));
   try {
     if (!response.body) {
       throw new Error("Empty response body from GitHub API");
@@ -25383,7 +25382,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((resolve13) => setTimeout(resolve13, delay));
+      await new Promise((resolve12) => setTimeout(resolve12, delay));
       return this.completeWithRetry(provider, request, abortController, attempt + 1);
     }
   }
@@ -26905,13 +26904,13 @@ function createAgentToolHandler(a) {
     }
   }
   function waitForConfirm(info) {
-    return new Promise((resolve13) => {
+    return new Promise((resolve12) => {
       a.events.emit("tool.confirm_needed", {
         tool: info.tool,
         input: info.input,
         toolUseId: info.toolUseId,
         suggestedPattern: info.suggestedPattern,
-        resolve: resolve13
+        resolve: resolve12
       });
     });
   }
@@ -27167,12 +27166,12 @@ function buildBtwBlock(notes) {
 // src/core/iteration-limit.ts
 function requestLimitExtension(opts) {
   const { events, currentIterations, currentLimit, autoExtend, timeoutMs = 3e4 } = opts;
-  return new Promise((resolve13) => {
+  return new Promise((resolve12) => {
     let resolved = false;
     const timerFired = () => {
       if (!resolved) {
         resolved = true;
-        resolve13(0);
+        resolve12(0);
       }
     };
     const timer = setTimeout(timerFired, timeoutMs);
@@ -27181,14 +27180,14 @@ function requestLimitExtension(opts) {
       if (!resolved) {
         resolved = true;
         clearTimeout(timer);
-        resolve13(0);
+        resolve12(0);
       }
     };
     const grant = (extra) => {
       if (!resolved) {
         resolved = true;
         clearTimeout(timer);
-        resolve13(Math.max(0, extra));
+        resolve12(Math.max(0, extra));
       }
     };
     events.emit("iteration.limit_reached", {
@@ -27202,7 +27201,7 @@ function requestLimitExtension(opts) {
         if (!resolved) {
           resolved = true;
           clearTimeout(timer);
-          resolve13(100);
+          resolve12(100);
         }
       });
     }
@@ -27651,13 +27650,13 @@ var DEFAULT_TIMEOUT_MS3 = 5e3;
 var MAX_OUTPUT_BYTES = 64 * 1024;
 async function runShellHook(spec, input, logger) {
   const timeoutMs = spec.timeoutMs ?? DEFAULT_TIMEOUT_MS3;
-  return await new Promise((resolve13) => {
+  return await new Promise((resolve12) => {
     let settled = false;
     const done = (v) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve13(v);
+      resolve12(v);
     };
     let child;
     try {
@@ -27669,7 +27668,7 @@ async function runShellHook(spec, input, logger) {
       });
     } catch (err2) {
       logger?.warn?.(`hook spawn failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
-      return resolve13(null);
+      return resolve12(null);
     }
     const timer = setTimeout(() => {
       logger?.warn?.(`hook command timed out after ${timeoutMs}ms: ${spec.command}`);
@@ -27846,7 +27845,7 @@ async function bootConfig(options = {}) {
   const cwd = typeof flags["cwd"] === "string" ? path6.resolve(flags["cwd"]) : process.cwd();
   const pathResolver = new DefaultPathResolver(cwd);
   const projectRoot = pathResolver.projectRoot;
-  const userHome = os7.homedir();
+  const userHome = os6.homedir();
   const wpaths = resolveWstackPaths({ projectRoot, userHome });
   await fsp3.mkdir(wpaths.globalRoot, { recursive: true });
   await fsp3.mkdir(wpaths.projectDir, { recursive: true });
@@ -28270,8 +28269,8 @@ var InputBuilder = class {
   async registerFile(input) {
     const ref = await this.store.add({ ...input, kind: "file" });
     this.refs.push(ref);
-    const path37 = ref.meta.filename ?? ref.meta.label ?? String(ref.seq);
-    return `[file:${path37}]`;
+    const path36 = ref.meta.filename ?? ref.meta.label ?? String(ref.seq);
+    return `[file:${path36}]`;
   }
   /**
    * Whether `appendPaste(text)` would collapse the text to a placeholder
@@ -28638,7 +28637,7 @@ summarize it, and let the tool result hold only the summary.`);
     const cached = this.envCacheByRoot.get(ctx.projectRoot);
     if (cached) return cached;
     const today = this.opts.todayIso ?? (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-    const platform2 = `${os7.platform()} ${os7.release()}`;
+    const platform2 = `${os6.platform()} ${os6.release()}`;
     const shell = process.env.SHELL ?? process.env.ComSpec ?? "unknown";
     const node = process.version;
     const isGit = await this.dirExists(path6.join(ctx.projectRoot, ".git"));
@@ -28768,12 +28767,12 @@ ${this.skillBodyCache}`);
     }
   }
   async gitStatus(root) {
-    return new Promise((resolve13) => {
+    return new Promise((resolve12) => {
       let settled = false;
       const finish = (s) => {
         if (settled) return;
         settled = true;
-        resolve13(s);
+        resolve12(s);
       };
       let proc;
       const timer = setTimeout(() => {
@@ -30132,7 +30131,7 @@ var PhaseOrchestrator = class {
   async mergeOne(phase, handle) {
     if (!this.worktrees) return;
     try {
-      const resolve13 = this.ctx.resolveConflict ? async (info) => {
+      const resolve12 = this.ctx.resolveConflict ? async (info) => {
         const shouldResolve = await this.shouldAttemptConflictResolution(phase, info);
         if (!shouldResolve) return false;
         this.emit("phase.conflictResolving", {
@@ -30146,7 +30145,7 @@ var PhaseOrchestrator = class {
       const mergeOpts = {
         squash: true
       };
-      if (resolve13 !== void 0) mergeOpts.resolve = resolve13;
+      if (resolve12 !== void 0) mergeOpts.resolve = resolve12;
       const result = await this.worktrees.merge(handle, mergeOpts);
       if (result.resolved) {
         this.emit("phase.conflictResolved", { phaseId: phase.id, name: phase.name });
@@ -30497,7 +30496,7 @@ var PhaseOrchestrator = class {
     }
   }
   delay(ms) {
-    return new Promise((resolve13) => setTimeout(resolve13, ms));
+    return new Promise((resolve12) => setTimeout(resolve12, ms));
   }
 };
 
@@ -31569,12 +31568,12 @@ var BrainDecisionQueue = class {
       options: request.options,
       rationale: "Decision escalated to human authority."
     };
-    const pending = new Promise((resolve13) => {
-      const entry = { request, resolve: resolve13 };
+    const pending = new Promise((resolve12) => {
+      const entry = { request, resolve: resolve12 };
       if (this.opts.timeoutMs && this.opts.timeoutMs > 0) {
         entry.timer = setTimeout(() => {
           this.pending.delete(request.id);
-          resolve13({ type: "deny", reason: "Brain human decision timed out." });
+          resolve12({ type: "deny", reason: "Brain human decision timed out." });
         }, this.opts.timeoutMs);
       }
       this.pending.set(request.id, entry);
@@ -31689,8 +31688,8 @@ var CollaborationBus = class {
     if (this.isPaused()) return false;
     this.pausedAtMs = Date.now();
     this.pausedBy = byParticipant;
-    this.pausePromise = new Promise((resolve13) => {
-      this.pauseResolve = resolve13;
+    this.pausePromise = new Promise((resolve12) => {
+      this.pauseResolve = resolve12;
     });
     return true;
   }
@@ -31726,8 +31725,8 @@ var CollaborationBus = class {
       return true;
     }
     let timer;
-    const timeoutPromise = new Promise((resolve13) => {
-      timer = setTimeout(() => resolve13("timeout"), timeoutMs);
+    const timeoutPromise = new Promise((resolve12) => {
+      timer = setTimeout(() => resolve12("timeout"), timeoutMs);
     });
     const resumedPromise = this.pausePromise.then(() => "resumed");
     const winner = await Promise.race([resumedPromise, timeoutPromise]);
@@ -32218,7 +32217,7 @@ function createGitPlugin() {
 }
 async function runGit(args, cwd) {
   try {
-    return await new Promise((resolve13, reject) => {
+    return await new Promise((resolve12, reject) => {
       const child = spawn("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"], signal: AbortSignal.timeout(3e4) });
       let stdout = "";
       let stderr = "";
@@ -32239,7 +32238,7 @@ async function runGit(args, cwd) {
           })
         );
       });
-      child.on("close", (code) => resolve13({ stdout, stderr, code: code ?? 0 }));
+      child.on("close", (code) => resolve12({ stdout, stderr, code: code ?? 0 }));
     });
   } catch (err) {
     if (err instanceof WrongStackError) throw err;
@@ -32593,7 +32592,7 @@ function createSkillsPlugin(opts) {
   };
 }
 function makeInstaller(skillLoader, projectRoot) {
-  const globalRoot = path6.join(os7.homedir(), ".wrongstack");
+  const globalRoot = path6.join(os6.homedir(), ".wrongstack");
   return new SkillInstaller({
     manifestPath: path6.join(globalRoot, "installed-skills.json"),
     projectSkillsDir: path6.join(projectRoot, ".wrongstack", "skills"),