@wrongstack/core 0.109.1 → 0.141.0

package/dist/storage/index.js

@@ -1,6 +1,7 @@
 import { randomBytes, randomUUID, createHash } from 'crypto';
 import * as fsp from 'fs/promises';
-import * as path12 from 'path';
+import * as path13 from 'path';
+import 'fs';
 import * as os from 'os';
 import { hostname } from 'os';
 
@@ -12,9 +13,9 @@ function expectDefined(value, label) {
   return value;
 }
 async function atomicWrite(targetPath, content, opts = {}) {
-  const dir = path12.dirname(targetPath);
+  const dir = path13.dirname(targetPath);
   await fsp.mkdir(dir, { recursive: true });
-  const tmp = path12.join(dir, `.${path12.basename(targetPath)}.${randomBytes(6).toString("hex")}.tmp`);
+  const tmp = path13.join(dir, `.${path13.basename(targetPath)}.${randomBytes(6).toString("hex")}.tmp`);
   try {
     if (typeof content === "string") {
       await fsp.writeFile(tmp, content, { flag: "wx", encoding: opts.encoding ?? "utf8" });
@@ -53,9 +54,9 @@ async function ensureDir(dir) {
   await fsp.mkdir(dir, { recursive: true });
 }
 async function withFileLock(targetPath, fn, opts = {}) {
-  const dir = path12.dirname(targetPath);
+  const dir = path13.dirname(targetPath);
   await fsp.mkdir(dir, { recursive: true });
-  const lockPath = path12.join(dir, `.${path12.basename(targetPath)}.lock`);
+  const lockPath = path13.join(dir, `.${path13.basename(targetPath)}.lock`);
   const timeoutMs = opts.timeoutMs ?? 5e3;
   const staleMs = opts.staleMs ?? 3e4;
   const started = Date.now();
@@ -233,11 +234,11 @@ var DefaultSessionStore = class _DefaultSessionStore {
   }
   /** Absolute path to the session index file. */
   get indexFile() {
-    return path12.join(this.dir, "_index.jsonl");
+    return path13.join(this.dir, "_index.jsonl");
   }
   /** Join session ID to its absolute path within the store directory. */
   sessionPath(id, ext) {
-    return path12.join(this.dir, `${id}${ext}`);
+    return path13.join(this.dir, `${id}${ext}`);
   }
   /**
    * Ensure the directory implied by the session ID exists. When the ID
@@ -245,7 +246,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
    * subdirectory so sessions group naturally by day.
    */
   async ensureShardDir(id) {
-    const dirPath = path12.dirname(path12.join(this.dir, id));
+    const dirPath = path13.dirname(path13.join(this.dir, id));
     await ensureDir(dirPath);
     return dirPath;
   }
@@ -253,7 +254,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
     const id = meta.id && meta.id.length > 0 ? meta.id : generateSessionId(startedAt, meta.model ?? meta.provider);
     const shardDir = await this.ensureShardDir(id);
-    const file = path12.join(shardDir, `${path12.basename(id)}.jsonl`);
+    const file = path13.join(shardDir, `${path13.basename(id)}.jsonl`);
     let handle;
     try {
       handle = await fsp.open(file, "a", 384);
@@ -271,8 +272,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
         onClose: (s) => this.appendToIndex(s)
       });
     } catch (err) {
-      await handle.close().catch(() => {
-      });
+      await handle.close().catch((e) => console.warn(`[session-store] handle.close() failed: ${e}`));
       throw err;
     }
   }
@@ -303,8 +303,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
       );
       return { writer, data };
     } catch (err) {
-      await handle.close().catch(() => {
-      });
+      await handle.close().catch((e) => console.warn(`[session-store] handle.close() failed: ${e}`));
       throw err;
     }
   }
@@ -461,7 +460,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
         continue;
       if (entry.isDirectory()) {
         const childPrefix = depth === 0 ? entry.name : `${prefix}/${entry.name}`;
-        ids.push(...await this.collectSessionIds(path12.join(dir, entry.name), childPrefix, depth + 1));
+        ids.push(...await this.collectSessionIds(path13.join(dir, entry.name), childPrefix, depth + 1));
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
         if (entry.name === "_index.jsonl") continue;
         const base = entry.name.replace(/\.jsonl$/, "");
@@ -493,15 +492,15 @@ var DefaultSessionStore = class _DefaultSessionStore {
    * sidecars, and the session directory (fleet.json, shared/, subagents/).
    */
   async deleteSession(id) {
-    await fsp.unlink(this.sessionPath(id, ".jsonl")).catch(() => void 0);
-    await fsp.unlink(this.sessionPath(id, ".summary.json")).catch(() => void 0);
-    const shardDir = path12.dirname(path12.join(this.dir, id));
-    const base = path12.basename(id);
+    await fsp.unlink(this.sessionPath(id, ".jsonl")).catch((err) => console.warn(`[session-store] delete .jsonl failed: ${err}`));
+    await fsp.unlink(this.sessionPath(id, ".summary.json")).catch((err) => console.warn(`[session-store] delete .summary.json failed: ${err}`));
+    const shardDir = path13.dirname(path13.join(this.dir, id));
+    const base = path13.basename(id);
     for (const ext of [".plan.json", ".todos.json"]) {
-      await fsp.unlink(path12.join(shardDir, `${base}${ext}`)).catch(() => void 0);
+      await fsp.unlink(path13.join(shardDir, `${base}${ext}`)).catch((err) => console.warn(`[session-store] delete ${ext} failed: ${err}`));
     }
-    const sessDir = path12.join(shardDir, base);
-    await fsp.rm(sessDir, { recursive: true, force: true }).catch(() => void 0);
+    const sessDir = path13.join(shardDir, base);
+    await fsp.rm(sessDir, { recursive: true, force: true }).catch((err) => console.warn(`[session-store] delete session dir failed: ${err}`));
     await this.writeTombstone(id);
   }
   async delete(id) {
@@ -512,7 +511,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
     let deleted = 0;
     let activeSessionId = null;
     try {
-      const raw = await fsp.readFile(path12.join(this.dir, "active.json"), "utf8");
+      const raw = await fsp.readFile(path13.join(this.dir, "active.json"), "utf8");
       const active = JSON.parse(raw);
       activeSessionId = active.sessionId ?? null;
     } catch {
@@ -520,11 +519,11 @@ var DefaultSessionStore = class _DefaultSessionStore {
     const entries = await fsp.readdir(this.dir, { withFileTypes: true }).catch(() => []);
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const dateDir = path12.join(this.dir, entry.name);
+      const dateDir = path13.join(this.dir, entry.name);
       const files = await fsp.readdir(dateDir, { withFileTypes: true }).catch(() => []);
       for (const file of files) {
         if (!file.isFile() || !file.name.endsWith(".jsonl")) continue;
-        const jsonlPath = path12.join(dateDir, file.name);
+        const jsonlPath = path13.join(dateDir, file.name);
         try {
           const stat5 = await fsp.stat(jsonlPath);
           if (stat5.mtimeMs >= cutoff) continue;
@@ -542,7 +541,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
     }
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const dateDir = path12.join(this.dir, entry.name);
+      const dateDir = path13.join(this.dir, entry.name);
       try {
         const remaining = await fsp.readdir(dateDir);
         if (remaining.length === 0) {
@@ -707,7 +706,7 @@ var FileSessionWriter = class {
     this.meta = meta;
     this.events = events;
     this.resumed = opts.resumed ?? false;
-    this.manifestFile = opts.dir ? path12.join(opts.dir, `${path12.basename(id)}.summary.json`) : "";
+    this.manifestFile = opts.dir ? path13.join(opts.dir, `${path13.basename(id)}.summary.json`) : "";
     this.filePath = opts.filePath ?? "";
     this.secretScrubber = opts.secretScrubber;
     this.onCloseCb = opts.onClose;
@@ -1027,7 +1026,7 @@ function userInputTitle(content) {
 var QueueStore = class {
   file;
   constructor(opts) {
-    this.file = path12.join(opts.dir, "queue.json");
+    this.file = path13.join(opts.dir, "queue.json");
   }
   async write(items) {
     if (items.length === 0) {
@@ -1094,7 +1093,7 @@ var DefaultAttachmentStore = class {
     let data = input.data;
     if (this.spoolDir && bytes >= this.spoolThreshold) {
       await fsp.mkdir(this.spoolDir, { recursive: true });
-      spooledPath = path12.join(this.spoolDir, `${id}.bin`);
+      spooledPath = path13.join(this.spoolDir, `${id}.bin`);
       await atomicWrite(spooledPath, input.data, {
         encoding: input.kind === "image" ? "base64" : "utf8"
       });
@@ -1305,7 +1304,7 @@ var FileMemoryBackend = class {
   }
   async remember(scope, entry, filePath) {
     const file = this.resolveFile(filePath, scope);
-    await ensureDir(path12.dirname(file));
+    await ensureDir(path13.dirname(file));
     let existing = "";
     try {
       existing = await fsp.readFile(file, "utf8");
@@ -1322,39 +1321,41 @@ ${line}`;
   }
   async forget(scope, query, filePath) {
     const file = this.resolveFile(filePath, scope);
-    let existing;
-    try {
-      existing = await fsp.readFile(file, "utf8");
-    } catch {
-      return 0;
-    }
-    const needle = query.toLowerCase();
-    const idMatcher = /mem_\d+_\w+/;
-    let removed = 0;
-    const lines = existing.split("\n").filter((line) => {
-      const trimmed = line.trim();
-      if (!trimmed.startsWith("- ")) return true;
-      if (idMatcher.test(query)) {
-        const entryIdMatch = /mem_\d+_\w+/.exec(trimmed);
-        if (entryIdMatch && entryIdMatch[0] === query) {
+    return withFileLock(file, async () => {
+      let existing;
+      try {
+        existing = await fsp.readFile(file, "utf8");
+      } catch {
+        return 0;
+      }
+      const needle = query.toLowerCase();
+      const idMatcher = /mem_\d+_\w+/;
+      let removed = 0;
+      const lines = existing.split("\n").filter((line) => {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("- ")) return true;
+        if (idMatcher.test(query)) {
+          const entryIdMatch = /mem_\d+_\w+/.exec(trimmed);
+          if (entryIdMatch && entryIdMatch[0] === query) {
+            removed++;
+            return false;
+          }
+        }
+        if (trimmed.toLowerCase().includes(needle)) {
           removed++;
           return false;
         }
+        return true;
+      });
+      if (removed > 0) {
+        if (lines.length === 0 || lines.length === 1 && !lines[0]?.trim()) {
+          await atomicWrite(file, "");
+        } else {
+          await atomicWrite(file, lines.join("\n"));
+        }
       }
-      if (trimmed.toLowerCase().includes(needle)) {
-        removed++;
-        return false;
-      }
-      return true;
+      return removed;
     });
-    if (removed > 0) {
-      if (lines.length === 0 || lines.length === 1 && !lines[0]?.trim()) {
-        await atomicWrite(file, "");
-      } else {
-        await atomicWrite(file, lines.join("\n"));
-      }
-    }
-    return removed;
   }
   async readAll(scope, filePath) {
     const file = this.resolveFile(filePath, scope);
@@ -1715,8 +1716,8 @@ ${body.trim()}`);
     if (!this.persistBackup || scope === "project-agents") return;
     try {
       const content = await this.backend.readAll(scope, this.files[scope]);
-      const { writeFile: writeFile6, mkdir: mkdir5 } = await import('fs/promises');
-      await mkdir5(this.backupDir, { recursive: true });
+      const { writeFile: writeFile6, mkdir: mkdir6 } = await import('fs/promises');
+      await mkdir6(this.backupDir, { recursive: true });
       await writeFile6(`${this.backupDir}/${scope}.md`, content, "utf8");
     } catch {
     }
@@ -2067,7 +2068,7 @@ var SessionMemoryConsolidator = class {
       for (const op of parsed.operations) {
         switch (op.action) {
           case "add": {
-            if (op.text && op.text.trim()) {
+            if (op.text?.trim()) {
               await this.memoryStore.remember(op.text.trim(), void 0, {
                 type: op.type,
                 tags: op.tags,
@@ -2172,16 +2173,14 @@ function deepFreeze(obj) {
   }
   return Object.freeze(obj);
 }
-
-// src/security/config-secrets.ts
-function decryptConfigSecrets(cfg, vault) {
+function decryptConfigSecrets(cfg, vault, opts) {
+  const warn = ((msg) => console.warn(msg));
   return walk(cfg, vault, (v, key) => {
     try {
       return vault.decrypt(v);
     } catch (err) {
-      console.warn(
-        `[secret-vault] Failed to decrypt "${key}":`,
-        err instanceof Error ? err.message : err
+      warn(
+        `[secret-vault] Failed to decrypt "${key}": ${err instanceof Error ? err.message : err}`
       );
       return "";
     }
@@ -2439,12 +2438,14 @@ var DefaultConfigLoader = class {
   }
   async load(opts = {}) {
     let cfg = { ...BEHAVIOR_DEFAULTS };
-    const [global, local] = await Promise.all([
+    const [global, local, inProject] = await Promise.all([
       this.readJson(this.paths.globalConfig),
-      this.readJson(this.paths.projectLocalConfig)
+      this.readJson(this.paths.projectLocalConfig),
+      this.readJson(this.paths.inProjectConfig)
     ]);
     cfg = deepMerge(cfg, global);
     cfg = deepMerge(cfg, local);
+    cfg = deepMerge(cfg, inProject);
     for (const [key, fn] of Object.entries(ENV_MAP)) {
       const v = process.env[key];
       if (v) fn(cfg, v);
@@ -2643,7 +2644,7 @@ var RecoveryLock = class {
   sessionStore;
   probe;
   constructor(opts) {
-    this.file = path12.join(opts.dir, LOCK_FILE);
+    this.file = path13.join(opts.dir, LOCK_FILE);
     this.pid = opts.pid ?? process.pid;
     this.hostname = opts.hostname ?? os.hostname();
     this.maxAgeMs = opts.maxAgeMs ?? DEFAULT_MAX_AGE_MS;
@@ -2701,7 +2702,7 @@ var RecoveryLock = class {
    * null return before calling this.
    */
   async write(sessionId) {
-    await ensureDir(path12.dirname(this.file));
+    await ensureDir(path13.dirname(this.file));
     const lock = {
       v: 1,
       sessionId,
@@ -3188,7 +3189,7 @@ var AnnotationsStore = class {
     if (!sessionId || sessionId.includes("/") || sessionId.includes("\\") || sessionId.includes("..")) {
       throw new Error(`Invalid sessionId: ${sessionId}`);
     }
-    return path12.join(this.dir, `${sessionId}.annotations.json`);
+    return path13.join(this.dir, `${sessionId}.annotations.json`);
   }
   async readFile(sessionId) {
     const fp = this.filePath(sessionId);
@@ -3345,7 +3346,7 @@ var ReplayLogStore = class {
       out.push({
         sessionId,
         entryCount: all.length,
-        path: path12.join(this.dir, name)
+        path: path13.join(this.dir, name)
       });
     }
     return out.sort((a, b) => a.sessionId.localeCompare(b.sessionId));
@@ -3355,7 +3356,7 @@ var ReplayLogStore = class {
     if (!sessionId || sessionId.includes("/") || sessionId.includes("\\") || sessionId.includes("..")) {
       throw new Error(`Invalid sessionId: ${sessionId}`);
     }
-    return path12.join(this.dir, `${sessionId}.replay.jsonl`);
+    return path13.join(this.dir, `${sessionId}.replay.jsonl`);
   }
   async readAll(sessionId) {
     const fp = this.filePath(sessionId);
@@ -3544,7 +3545,7 @@ var SessionRecovery = class {
     if (!sessionId || sessionId.includes("/") || sessionId.includes("\\") || sessionId.includes("..")) {
       throw new Error(`Invalid sessionId: ${sessionId}`);
     }
-    return path12.join(this.dir, `${sessionId}.jsonl`);
+    return path13.join(this.dir, `${sessionId}.jsonl`);
   }
 };
 var GENESIS_PREV = "0".repeat(64);
@@ -3667,7 +3668,7 @@ var ToolAuditLog = class {
     if (!sessionId || sessionId.includes("/") || sessionId.includes("\\") || sessionId.includes("..")) {
       throw new Error(`Invalid sessionId: ${sessionId}`);
     }
-    return path12.join(this.dir, `${sessionId}.audit.jsonl`);
+    return path13.join(this.dir, `${sessionId}.audit.jsonl`);
   }
   async readAll(sessionId) {
     const fp = this.filePath(sessionId);
@@ -3852,7 +3853,7 @@ var DefaultSessionRewinder = class {
   sessionsDir;
   projectRoot;
   async listCheckpoints(sessionId) {
-    const file = path12.join(this.sessionsDir, `${sessionId}.jsonl`);
+    const file = path13.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp.readFile(file, "utf8");
     const events = parseEvents(raw);
     const fileCountMap = /* @__PURE__ */ new Map();
@@ -3877,7 +3878,7 @@ var DefaultSessionRewinder = class {
     return checkpoints;
   }
   async rewindToCheckpoint(sessionId, checkpointIndex) {
-    const file = path12.join(this.sessionsDir, `${sessionId}.jsonl`);
+    const file = path13.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp.readFile(file, "utf8");
     const events = parseEvents(raw);
     let targetIdx = -1;
@@ -3912,7 +3913,7 @@ var DefaultSessionRewinder = class {
     return { ...result, toPromptIndex: checkpointIndex, removedEvents };
   }
   async rewindLastN(sessionId, n) {
-    const file = path12.join(this.sessionsDir, `${sessionId}.jsonl`);
+    const file = path13.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp.readFile(file, "utf8");
     const events = parseEvents(raw);
     const checkpoints = [];
@@ -3941,7 +3942,7 @@ var DefaultSessionRewinder = class {
     return { ...result, toPromptIndex: targetIndex, removedEvents: snapshotsToRevert.length };
   }
   async rewindToStart(sessionId) {
-    const file = path12.join(this.sessionsDir, `${sessionId}.jsonl`);
+    const file = path13.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp.readFile(file, "utf8");
     const events = parseEvents(raw);
     const allSnapshots = [];
@@ -3977,10 +3978,10 @@ async function revertSnapshots(snapshots, projectRoot) {
   for (const snapshot of snapshots) {
     for (const file of snapshot.files) {
       try {
-        const absPath = path12.resolve(file.path);
-        const root = path12.resolve(projectRoot);
-        const rel = path12.relative(root, absPath);
-        if (rel.startsWith("..") || path12.isAbsolute(rel)) {
+        const absPath = path13.resolve(file.path);
+        const root = path13.resolve(projectRoot);
+        const rel = path13.relative(root, absPath);
+        if (rel.startsWith("..") || path13.isAbsolute(rel)) {
           errors.push(`${file.path}: path resolves outside project root \u2014 skipping`);
           continue;
         }
@@ -4561,11 +4562,11 @@ var color = {
   bgGreen: wrap("42", "49")
 };
 function projectHash(absRoot) {
-  return createHash("sha256").update(path12.resolve(absRoot)).digest("hex").slice(0, 12);
+  return createHash("sha256").update(path13.resolve(absRoot)).digest("hex").slice(0, 12);
 }
 function projectSlug(absRoot) {
-  const base = slugify(path12.basename(absRoot));
-  const hash = createHash("sha256").update(path12.resolve(absRoot)).digest("hex").slice(0, 6);
+  const base = slugify(path13.basename(absRoot));
+  const hash = createHash("sha256").update(path13.resolve(absRoot)).digest("hex").slice(0, 6);
   return `${base}-${hash}`;
 }
 function slugify(name) {
@@ -4573,42 +4574,43 @@ function slugify(name) {
 }
 function resolveWstackPaths(opts) {
   const home = opts.userHome ?? os.homedir();
-  const globalRoot = opts.globalRoot ?? path12.join(home, ".wrongstack");
+  const globalRoot = opts.globalRoot ?? path13.join(home, ".wrongstack");
   const hash = projectHash(opts.projectRoot);
   const slug = projectSlug(opts.projectRoot);
-  const projectDir = path12.join(globalRoot, "projects", slug);
+  const projectDir = path13.join(globalRoot, "projects", slug);
   return {
     globalRoot,
     configDir: globalRoot,
-    globalConfig: path12.join(globalRoot, "config.json"),
-    secretsKey: path12.join(globalRoot, ".key"),
-    globalMemory: path12.join(globalRoot, "memory.md"),
-    globalSkills: path12.join(globalRoot, "skills"),
-    globalPrompts: path12.join(globalRoot, "prompts"),
-    cacheDir: path12.join(globalRoot, "cache"),
-    modelsCache: path12.join(globalRoot, "cache", "models.dev.json"),
-    modelsOverlayCache: path12.join(globalRoot, "cache", "models-overlay.json"),
-    historyFile: path12.join(globalRoot, "history"),
-    logFile: path12.join(globalRoot, "logs", "wrongstack.log"),
+    globalConfig: path13.join(globalRoot, "config.json"),
+    secretsKey: path13.join(globalRoot, ".key"),
+    globalMemory: path13.join(globalRoot, "memory.md"),
+    globalSkills: path13.join(globalRoot, "skills"),
+    globalPrompts: path13.join(globalRoot, "prompts"),
+    cacheDir: path13.join(globalRoot, "cache"),
+    modelsCache: path13.join(globalRoot, "cache", "models.dev.json"),
+    modelsOverlayCache: path13.join(globalRoot, "cache", "models-overlay.json"),
+    historyFile: path13.join(globalRoot, "history"),
+    logFile: path13.join(globalRoot, "logs", "wrongstack.log"),
     projectDir,
-    projectCodebaseIndex: path12.join(projectDir, "codebase-index"),
-    projectMemory: path12.join(projectDir, "memory.md"),
-    projectSessions: path12.join(projectDir, "sessions"),
-    projectTrust: path12.join(projectDir, "trust.json"),
-    projectMeta: path12.join(projectDir, "meta.json"),
-    projectLocalConfig: path12.join(projectDir, "config.local.json"),
-    inProjectAgentsFile: path12.join(opts.projectRoot, ".wrongstack", "AGENTS.md"),
-    inProjectSkills: path12.join(opts.projectRoot, ".wrongstack", "skills"),
-    inProjectWorktrees: path12.join(opts.projectRoot, ".wrongstack", "worktrees"),
+    projectCodebaseIndex: path13.join(projectDir, "codebase-index"),
+    projectMemory: path13.join(projectDir, "memory.md"),
+    projectSessions: path13.join(projectDir, "sessions"),
+    projectTrust: path13.join(projectDir, "trust.json"),
+    projectMeta: path13.join(projectDir, "meta.json"),
+    projectLocalConfig: path13.join(projectDir, "config.local.json"),
+    inProjectConfig: path13.join(opts.projectRoot, ".wrongstack", "config.json"),
+    inProjectAgentsFile: path13.join(opts.projectRoot, ".wrongstack", "AGENTS.md"),
+    inProjectSkills: path13.join(opts.projectRoot, ".wrongstack", "skills"),
+    inProjectWorktrees: path13.join(opts.projectRoot, ".wrongstack", "worktrees"),
     projectHash: hash,
     projectSlug: slug,
-    projectGoal: path12.join(projectDir, "goal.json"),
-    projectSpecs: path12.join(projectDir, "specs"),
-    projectTaskGraphs: path12.join(projectDir, "task-graphs"),
-    projectSddSession: path12.join(projectDir, "sdd-session.json"),
-    projectPlan: path12.join(projectDir, "plan.json"),
-    projectAutophase: path12.join(projectDir, "autophase"),
-    syncConfig: path12.join(globalRoot, "sync.json")
+    projectGoal: path13.join(projectDir, "goal.json"),
+    projectSpecs: path13.join(projectDir, "specs"),
+    projectTaskGraphs: path13.join(projectDir, "task-graphs"),
+    projectSddSession: path13.join(projectDir, "sdd-session.json"),
+    projectPlan: path13.join(projectDir, "plan.json"),
+    projectAutophase: path13.join(projectDir, "autophase"),
+    syncConfig: path13.join(globalRoot, "sync.json")
   };
 }
 
@@ -4671,16 +4673,20 @@ async function loadGoal(filePath) {
   let raw;
   try {
     raw = await fsp.readFile(filePath, "utf8");
-  } catch {
-    return null;
+  } catch (err) {
+    const code = err.code;
+    if (code === "ENOENT") return null;
+    throw err;
   }
   try {
     const parsed = JSON.parse(raw);
     if (parsed?.version !== 1 || typeof parsed.goal !== "string" || !Array.isArray(parsed.journal)) {
+      console.warn(`[goal-store] Corrupt goal.json at ${filePath} \u2014 invalid schema. Consider deleting it and re-creating.`);
       return null;
     }
     return parsed;
   } catch {
+    console.warn(`[goal-store] Corrupt goal.json at ${filePath} \u2014 JSON parse failed. Consider deleting it and re-creating.`);
     return null;
   }
 }
@@ -4807,9 +4813,9 @@ function parseProgressFromText(text) {
   const re = /\[progress:\s*(\d{1,3})%\]\s*(?:[—\-]\s*(.+))?/i;
   const m = text.match(re);
   if (!m) return null;
-  const progress = Math.min(100, Math.max(0, Number.parseInt(m[1], 10)));
+  const progress = Math.min(100, Math.max(0, Number.parseInt(m[1] ?? "0", 10)));
   const note = m[2]?.trim() || void 0;
-  return { progress, note };
+  return note === void 0 ? { progress } : { progress, note };
 }
 function recordProgress(goal, progress, note) {
   const clamped = Math.min(100, Math.max(0, progress));
@@ -4829,7 +4835,7 @@ function computeTrend(history) {
   const recent = history.slice(-5);
   const deltas = [];
   for (let i = 1; i < recent.length; i++) {
-    deltas.push(recent[i].progress - recent[i - 1].progress);
+    deltas.push((recent[i]?.progress ?? 0) - (recent[i - 1]?.progress ?? 0));
   }
   if (deltas.length < 2) return void 0;
   const avgDelta = deltas.reduce((a, b) => a + b, 0) / deltas.length;
@@ -4851,7 +4857,7 @@ var DefaultPromptStore = class {
         if (!file.endsWith(".json")) continue;
         try {
           const raw = JSON.parse(
-            await fsp.readFile(path12.join(this.dir, file), "utf8")
+            await fsp.readFile(path13.join(this.dir, file), "utf8")
           );
           entries.push(raw.entry);
         } catch {
@@ -4864,7 +4870,7 @@ var DefaultPromptStore = class {
     );
   }
   async get(id) {
-    const file = path12.join(this.dir, `${id}.json`);
+    const file = path13.join(this.dir, `${id}.json`);
     try {
       const raw = JSON.parse(await fsp.readFile(file, "utf8"));
       return raw.entry;
@@ -4874,12 +4880,12 @@ var DefaultPromptStore = class {
   }
   async save(entry) {
     await ensureDir(this.dir);
-    const file = path12.join(this.dir, `${entry.id}.json`);
+    const file = path13.join(this.dir, `${entry.id}.json`);
     const raw = { version: 1, entry };
     await atomicWrite(file, JSON.stringify(raw, null, 2));
   }
   async delete(id) {
-    const file = path12.join(this.dir, `${id}.json`);
+    const file = path13.join(this.dir, `${id}.json`);
     try {
       await fsp.unlink(file);
       return true;
@@ -4913,7 +4919,7 @@ var CloudSync = class {
     this.paths = paths;
     this.getConfig = getConfig;
     this.setConfig = setConfig;
-    this.statePath = path12.join(paths.globalRoot, "sync-state.json");
+    this.statePath = path13.join(paths.globalRoot, "sync-state.json");
   }
   paths;
   getConfig;
@@ -5020,7 +5026,7 @@ var CloudSync = class {
       const rel = segments.slice(2).join("/");
       const destPath = resolvePulledCategoryPath(cat, localPath, rel, entry.path);
       const blobData = await this.getBlob(token, owner, repoName, entry.sha);
-      await fsp.mkdir(path12.dirname(destPath), { recursive: true });
+      await fsp.mkdir(path13.dirname(destPath), { recursive: true });
       await fsp.writeFile(destPath, Buffer.from(blobData, "base64"));
     }
     const localRev = await this.hashLocalCategories(cfg.categories);
@@ -5127,7 +5133,7 @@ var CloudSync = class {
           const files = await this.walkDir(localPath, localPath);
           for (const file of files) {
             const content = await fsp.readFile(file, "utf8");
-            const rel = path12.relative(localPath, file).replace(/\\/g, "/");
+            const rel = path13.relative(localPath, file).replace(/\\/g, "/");
             entries.push({ path: `data/${cat}/${rel}`, content, mode: "100644" });
             hashes.push(content);
           }
@@ -5184,7 +5190,7 @@ var CloudSync = class {
     const results = [];
     const entries = await fsp.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = path12.join(dir, entry.name);
+      const full = path13.join(dir, entry.name);
       if (entry.isDirectory()) {
         results.push(...await this.walkDir(full, base));
       } else {
@@ -5201,15 +5207,15 @@ function resolvePulledCategoryPath(cat, localPath, rel, remotePath) {
     return localPath;
   }
   if (!rel) return localPath;
-  const normalizedRel = path12.normalize(rel);
-  const traversesUp = normalizedRel === ".." || normalizedRel.startsWith(`..${path12.sep}`);
-  if (path12.isAbsolute(normalizedRel) || traversesUp) {
+  const normalizedRel = path13.normalize(rel);
+  const traversesUp = normalizedRel === ".." || normalizedRel.startsWith(`..${path13.sep}`);
+  if (path13.isAbsolute(normalizedRel) || traversesUp) {
     throw new Error(`Refusing CloudSync path traversal: ${remotePath}`);
   }
-  const dest = path12.resolve(localPath, normalizedRel);
-  const root = path12.resolve(localPath);
-  const relative3 = path12.relative(root, dest);
-  if (relative3.startsWith("..") || path12.isAbsolute(relative3)) {
+  const dest = path13.resolve(localPath, normalizedRel);
+  const root = path13.resolve(localPath);
+  const relative3 = path13.relative(root, dest);
+  if (relative3.startsWith("..") || path13.isAbsolute(relative3)) {
     throw new Error(`Refusing CloudSync path outside category root: ${remotePath}`);
   }
   return dest;