gsd-pi 2.33.1-dev.ee47f1b → 2.34.0-dev.0150ae9

package/dist/resources/extensions/gsd/auto-recovery.js

@@ -1,27 +1,26 @@
 /**
  * Auto-mode Recovery — artifact resolution, verification, blocker placeholders,
- * skip artifacts, completed-unit persistence, merge state reconciliation,
+ * skip artifacts, merge state reconciliation,
  * self-heal runtime records, and loop remediation steps.
  *
  * Pure functions that receive all needed state as parameters — no module-level
  * globals or AutoContext dependency.
  */
-import { clearUnitRuntimeRecord, } from "./unit-runtime.js";
+import { clearUnitRuntimeRecord } from "./unit-runtime.js";
 import { clearParseCache, parseRoadmap, parsePlan } from "./files.js";
-import { nativeConflictFiles, nativeCommit, nativeCheckoutTheirs, nativeAddPaths, nativeMergeAbort, nativeResetHard, } from "./native-git-bridge.js";
-import { resolveMilestonePath, resolveSlicePath, resolveSliceFile, resolveTasksDir, relMilestoneFile, relSliceFile, relSlicePath, relTaskFile, buildMilestoneFileName, buildSliceFileName, buildTaskFileName, resolveMilestoneFile, clearPathCache, resolveGsdRootFile, gsdRoot, } from "./paths.js";
 import { isValidationTerminal } from "./state.js";
-import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync } from "node:fs";
-import { atomicWriteSync } from "./atomic-write.js";
-import { loadJsonFileOrNull } from "./json-persistence.js";
+import { nativeConflictFiles, nativeCommit, nativeCheckoutTheirs, nativeAddPaths, nativeMergeAbort, nativeResetHard, } from "./native-git-bridge.js";
+import { resolveMilestonePath, resolveSlicePath, resolveSliceFile, resolveTasksDir, relMilestoneFile, relSliceFile, relSlicePath, relTaskFile, buildMilestoneFileName, buildSliceFileName, buildTaskFileName, resolveMilestoneFile, clearPathCache, resolveGsdRootFile, } from "./paths.js";
+import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync, } from "node:fs";
 import { dirname, join } from "node:path";
-import { parseUnitId } from "./unit-id.js";
 // ─── Artifact Resolution & Verification ───────────────────────────────────────
 /**
  * Resolve the expected artifact for a unit to an absolute path.
  */
 export function resolveExpectedArtifactPath(unitType, unitId, base) {
-    const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+    const parts = unitId.split("/");
+    const mid = parts[0];
+    const sid = parts[1];
     switch (unitType) {
         case "research-milestone": {
             const dir = resolveMilestonePath(base, mid);
@@ -48,8 +47,11 @@ export function resolveExpectedArtifactPath(unitType, unitId, base) {
             return dir ? join(dir, buildSliceFileName(sid, "UAT-RESULT")) : null;
         }
         case "execute-task": {
+            const tid = parts[2];
             const dir = resolveSlicePath(base, mid, sid);
-            return dir && tid ? join(dir, "tasks", buildTaskFileName(tid, "SUMMARY")) : null;
+            return dir && tid
+                ? join(dir, "tasks", buildTaskFileName(tid, "SUMMARY"))
+                : null;
         }
         case "complete-slice": {
             const dir = resolveSlicePath(base, mid, sid);
@@ -108,21 +110,10 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
         return false;
     if (!existsSync(absPath))
         return false;
-    // validate-milestone must have a VALIDATION file with a terminal verdict
-    // (pass, needs-attention, or needs-remediation). Without this check, a
-    // VALIDATION file with missing/malformed frontmatter or an unrecognized
-    // verdict is treated as "complete" by the artifact check but deriveState
-    // still returns phase:"validating-milestone" (because isValidationTerminal
-    // returns false), creating an infinite skip loop that hits the lifetime cap.
     if (unitType === "validate-milestone") {
-        try {
-            const validationContent = readFileSync(absPath, "utf-8");
-            if (!isValidationTerminal(validationContent))
-                return false;
-        }
-        catch {
+        const validationContent = readFileSync(absPath, "utf-8");
+        if (!isValidationTerminal(validationContent))
             return false;
-        }
     }
     // plan-slice must produce a plan with actual task entries, not just a scaffold.
     // The plan file may exist from a prior discussion/context step with only headings
@@ -136,7 +127,10 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
     }
     // execute-task must also have its checkbox marked [x] in the slice plan
     if (unitType === "execute-task") {
-        const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+        const parts = unitId.split("/");
+        const mid = parts[0];
+        const sid = parts[1];
+        const tid = parts[2];
         if (mid && sid && tid) {
             const planAbs = resolveSliceFile(base, mid, sid, "PLAN");
             if (planAbs && existsSync(planAbs)) {
@@ -153,7 +147,9 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
     // but omitted T{tid}-PLAN.md files would be marked complete, causing execute-task
     // to dispatch with a missing task plan (see issue #739).
     if (unitType === "plan-slice") {
-        const { milestone: mid, slice: sid } = parseUnitId(unitId);
+        const parts = unitId.split("/");
+        const mid = parts[0];
+        const sid = parts[1];
         if (mid && sid) {
             try {
                 const planContent = readFileSync(absPath, "utf-8");
@@ -178,7 +174,9 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
     // state machine keeps returning the same complete-slice unit (roadmap still shows
     // the slice incomplete), so dispatchNextUnit recurses forever.
     if (unitType === "complete-slice") {
-        const { milestone: mid, slice: sid } = parseUnitId(unitId);
+        const parts = unitId.split("/");
+        const mid = parts[0];
+        const sid = parts[1];
         if (mid && sid) {
             const dir = resolveSlicePath(base, mid, sid);
             if (dir) {
@@ -193,7 +191,7 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
                 try {
                     const roadmapContent = readFileSync(roadmapFile, "utf-8");
                     const roadmap = parseRoadmap(roadmapContent);
-                    const slice = (roadmap.slices ?? []).find(s => s.id === sid);
+                    const slice = roadmap.slices.find((s) => s.id === sid);
                     if (slice && !slice.done)
                         return false;
                 }
@@ -233,7 +231,9 @@ export function writeBlockerPlaceholder(unitType, unitId, base, reason) {
     return diagnoseExpectedArtifact(unitType, unitId, base);
 }
 export function diagnoseExpectedArtifact(unitType, unitId, base) {
-    const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+    const parts = unitId.split("/");
+    const mid = parts[0];
+    const sid = parts[1];
     switch (unitType) {
         case "research-milestone":
             return `${relMilestoneFile(base, mid, "RESEARCH")} (milestone research)`;
@@ -244,6 +244,7 @@ export function diagnoseExpectedArtifact(unitType, unitId, base) {
         case "plan-slice":
             return `${relSliceFile(base, mid, sid, "PLAN")} (slice plan)`;
         case "execute-task": {
+            const tid = parts[2];
             return `Task ${tid} marked [x] in ${relSliceFile(base, mid, sid, "PLAN")} + summary written`;
         }
         case "complete-slice":
@@ -310,44 +311,6 @@ export function skipExecuteTask(base, mid, sid, tid, status, reason, maxAttempts
     }
     return true;
 }
-// ─── Disk-backed completed-unit helpers ───────────────────────────────────────
-function isStringArray(data) {
-    return Array.isArray(data) && data.every(item => typeof item === "string");
-}
-/** Path to the persisted completed-unit keys file. */
-export function completedKeysPath(base) {
-    return join(gsdRoot(base), "completed-units.json");
-}
-/** Write a completed unit key to disk (read-modify-write append to set). */
-export function persistCompletedKey(base, key) {
-    const file = completedKeysPath(base);
-    const keys = loadJsonFileOrNull(file, isStringArray) ?? [];
-    const keySet = new Set(keys);
-    if (!keySet.has(key)) {
-        keys.push(key);
-        atomicWriteSync(file, JSON.stringify(keys));
-    }
-}
-/** Remove a stale completed unit key from disk. */
-export function removePersistedKey(base, key) {
-    const file = completedKeysPath(base);
-    const keys = loadJsonFileOrNull(file, isStringArray);
-    if (!keys)
-        return;
-    const filtered = keys.filter(k => k !== key);
-    if (filtered.length !== keys.length) {
-        atomicWriteSync(file, JSON.stringify(filtered));
-    }
-}
-/** Load all completed unit keys from disk into the in-memory set. */
-export function loadPersistedKeys(base, target) {
-    const file = completedKeysPath(base);
-    const keys = loadJsonFileOrNull(file, isStringArray);
-    if (keys) {
-        for (const k of keys)
-            target.add(k);
-    }
-}
 // ─── Merge State Reconciliation ───────────────────────────────────────────────
 /**
  * Detect leftover merge state from a prior session and reconcile it.
@@ -377,8 +340,8 @@ export function reconcileMergeState(basePath, ctx) {
     }
     else {
         // Still conflicted — try auto-resolving .gsd/ state file conflicts (#530)
-        const gsdConflicts = conflictedFiles.filter(f => f.startsWith(".gsd/"));
-        const codeConflicts = conflictedFiles.filter(f => !f.startsWith(".gsd/"));
+        const gsdConflicts = conflictedFiles.filter((f) => f.startsWith(".gsd/"));
+        const codeConflicts = conflictedFiles.filter((f) => !f.startsWith(".gsd/"));
         if (gsdConflicts.length > 0 && codeConflicts.length === 0) {
             // All conflicts are in .gsd/ state files — auto-resolve by accepting theirs
             let resolved = true;
@@ -403,18 +366,24 @@ export function reconcileMergeState(basePath, ctx) {
                     try {
                         nativeMergeAbort(basePath);
                     }
-                    catch { /* best-effort */ }
+                    catch {
+                        /* best-effort */
+                    }
                 }
                 else if (hasSquashMsg) {
                     try {
                         unlinkSync(squashMsgPath);
                     }
-                    catch { /* best-effort */ }
+                    catch {
+                        /* best-effort */
+                    }
                 }
                 try {
                     nativeResetHard(basePath);
                 }
-                catch { /* best-effort */ }
+                catch {
+                    /* best-effort */
+                }
                 ctx.ui.notify("Detected leftover merge state — auto-resolve failed, cleaned up. Re-deriving state.", "warning");
             }
         }
@@ -424,18 +393,24 @@ export function reconcileMergeState(basePath, ctx) {
                 try {
                     nativeMergeAbort(basePath);
                 }
-                catch { /* best-effort */ }
+                catch {
+                    /* best-effort */
+                }
             }
             else if (hasSquashMsg) {
                 try {
                     unlinkSync(squashMsgPath);
                 }
-                catch { /* best-effort */ }
+                catch {
+                    /* best-effort */
+                }
             }
             try {
                 nativeResetHard(basePath);
             }
-            catch { /* best-effort */ }
+            catch {
+                /* best-effort */
+            }
             ctx.ui.notify("Detected leftover merge state with unresolved conflicts — cleaned up. Re-deriving state.", "warning");
         }
     }
@@ -443,11 +418,12 @@ export function reconcileMergeState(basePath, ctx) {
 }
 // ─── Self-Heal Runtime Records ────────────────────────────────────────────────
 /**
- * Self-heal: scan runtime records in .gsd/ and clear any where the expected
- * artifact already exists on disk. This repairs incomplete closeouts from
- * prior crashes — preventing spurious re-dispatch of already-completed units.
+ * Self-heal: scan runtime records in .gsd/ and clear stale ones.
+ * Clears dispatched records older than 1 hour (process crashed before
+ * completing the unit). deriveState() handles re-derivation — no need
+ * for completion key persistence here.
  */
-export async function selfHealRuntimeRecords(base, ctx, completedKeySet) {
+export async function selfHealRuntimeRecords(base, ctx) {
     try {
         const { listUnitRuntimeRecords } = await import("./unit-runtime.js");
         const records = listUnitRuntimeRecords(base);
@@ -456,24 +432,7 @@ export async function selfHealRuntimeRecords(base, ctx, completedKeySet) {
         const now = Date.now();
         for (const record of records) {
             const { unitType, unitId } = record;
-            const artifactPath = resolveExpectedArtifactPath(unitType, unitId, base);
-            // Case 1: Artifact exists — unit completed but closeout didn't finish.
-            // Use verifyExpectedArtifact (not just existsSync) so that execute-task
-            // also checks the plan checkbox is marked [x]. Without this, a task
-            // whose summary exists but checkbox is unchecked would be incorrectly
-            // marked as completed, causing deriveState to re-dispatch it endlessly.
-            if (artifactPath && existsSync(artifactPath) && verifyExpectedArtifact(unitType, unitId, base)) {
-                clearUnitRuntimeRecord(base, unitType, unitId);
-                // Also persist completion key if missing
-                const key = `${unitType}/${unitId}`;
-                if (!completedKeySet.has(key)) {
-                    persistCompletedKey(base, key);
-                    completedKeySet.add(key);
-                }
-                healed++;
-                continue;
-            }
-            // Case 2: No artifact but record is stale (dispatched > 1h ago, process crashed)
+            // Clear stale dispatched records (dispatched > 1h ago, process crashed)
             const age = now - (record.startedAt ?? 0);
             if (record.phase === "dispatched" && age > STALE_THRESHOLD_MS) {
                 clearUnitRuntimeRecord(base, unitType, unitId);
@@ -496,7 +455,10 @@ export async function selfHealRuntimeRecords(base, ctx, completedKeySet) {
  * These are shown when automatic reconciliation is not possible.
  */
 export function buildLoopRemediationSteps(unitType, unitId, base) {
-    const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+    const parts = unitId.split("/");
+    const mid = parts[0];
+    const sid = parts[1];
+    const tid = parts[2];
     switch (unitType) {
         case "execute-task": {
             if (!mid || !sid || !tid)