gsd-pi 2.74.0 → 2.75.0-dev.fd2382b9f

package/dist/resources/extensions/gsd/auto/detect-stuck.js

@@ -3,6 +3,7 @@
  *
  * Leaf node in the import DAG.
  */
+import { summarizeLogs } from "../workflow-logger.js";
 /**
  * Pattern matching ENOENT errors with a file path.
  * Matches: "ENOENT: no such file or directory, access '/path/to/file'"
@@ -15,6 +16,7 @@ const ENOENT_PATH_RE = /ENOENT[^']*'([^']+)'/;
  *
  * Rule 1: Same error string twice in a row → stuck immediately.
  * Rule 2: Same unit key 3+ consecutive times → stuck (preserves prior behavior).
+ * Rule 2b: Same unit key appears 3+ times anywhere in the active window → stuck.
  * Rule 3: Oscillation A→B→A→B in last 4 entries → stuck.
  * Rule 4: Same ENOENT path in any 2 entries within the window → stuck (#3575).
  *         Missing files don't self-heal between retries — retrying wastes budget.
@@ -22,13 +24,19 @@ const ENOENT_PATH_RE = /ENOENT[^']*'([^']+)'/;
 export function detectStuck(window) {
     if (window.length < 2)
         return null;
+    // Peek (not drain) the workflow-logger buffer so stuck reasons can surface
+    // the underlying diagnostic context (projection failures, DB degradations,
+    // reconcile warnings) that usually explains *why* the loop is stuck. The
+    // auto-loop's finalize step owns the buffer lifecycle — this is read-only.
+    const loggerSummary = summarizeLogs();
+    const suffix = loggerSummary ? ` — ${loggerSummary}` : "";
     const last = window[window.length - 1];
     const prev = window[window.length - 2];
     // Rule 1: Same error repeated consecutively
     if (last.error && prev.error && last.error === prev.error) {
         return {
             stuck: true,
-            reason: `Same error repeated: ${last.error.slice(0, 200)}`,
+            reason: `Same error repeated: ${last.error.slice(0, 200)}${suffix}`,
         };
     }
     // Rule 2: Same unit 3+ consecutive times
@@ -37,10 +45,18 @@ export function detectStuck(window) {
         if (lastThree.every((u) => u.key === last.key)) {
             return {
                 stuck: true,
-                reason: `${last.key} derived 3 consecutive times without progress`,
+                reason: `${last.key} derived 3 consecutive times without progress${suffix}`,
             };
         }
     }
+    // Rule 2b: Same unit key 3+ times anywhere in the active window
+    const countInWindow = window.filter((entry) => entry.key === last.key).length;
+    if (countInWindow >= 3) {
+        return {
+            stuck: true,
+            reason: `${last.key} derived ${countInWindow} times in last ${window.length} attempts without progress${suffix}`,
+        };
+    }
     // Rule 3: Oscillation (A→B→A→B in last 4)
     if (window.length >= 4) {
         const w = window.slice(-4);
@@ -49,7 +65,7 @@ export function detectStuck(window) {
             w[0].key !== w[1].key) {
             return {
                 stuck: true,
-                reason: `Oscillation detected: ${w[0].key} ↔ ${w[1].key}`,
+                reason: `Oscillation detected: ${w[0].key} ↔ ${w[1].key}${suffix}`,
             };
         }
     }
@@ -67,7 +83,7 @@ export function detectStuck(window) {
         if (count >= 2) {
             return {
                 stuck: true,
-                reason: `Missing file referenced twice: ${filePath} (ENOENT)`,
+                reason: `Missing file referenced twice: ${filePath} (ENOENT)${suffix}`,
             };
         }
         enoentPaths.set(filePath, count);

package/dist/resources/extensions/gsd/auto/loop.js

@@ -15,6 +15,9 @@ import { isInfrastructureError, isTransientCooldownError, getCooldownRetryAfterM
 import { resolveEngine } from "../engine-resolver.js";
 import { logWarning } from "../workflow-logger.js";
 import { gsdRoot } from "../paths.js";
+import { resolveUokFlags } from "../uok/flags.js";
+import { scheduleSidecarQueue } from "../uok/execution-graph.js";
+import { ExecutionGraphScheduler } from "../uok/execution-graph.js";
 import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 // ── Stuck detection persistence (#3704) ──────────────────────────────────
@@ -76,17 +79,73 @@ function checkMemoryPressure() {
     const pct = heapMB / limitMB;
     return { pressured: pct > MEMORY_PRESSURE_THRESHOLD, heapMB, limitMB, pct };
 }
+function resolveDispatchNodeKind(unitType, sidecarItem) {
+    if (sidecarItem?.kind === "hook")
+        return "hook";
+    if (sidecarItem?.kind === "triage")
+        return "verification";
+    if (sidecarItem?.kind === "quick-task")
+        return "team-worker";
+    if (unitType.startsWith("hook/"))
+        return "hook";
+    if (unitType === "reactive-execute")
+        return "subagent";
+    if (unitType === "gate-evaluate"
+        || unitType === "validate-milestone"
+        || unitType === "run-uat"
+        || unitType === "complete-slice") {
+        return "verification";
+    }
+    if (unitType === "replan-slice" || unitType === "reassess-roadmap") {
+        return "reprocess";
+    }
+    return "unit";
+}
+async function runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState, sidecarItem) {
+    if (dispatchContract === "legacy-direct") {
+        return runUnitPhase(ic, iterData, loopState, sidecarItem);
+    }
+    const scheduler = new ExecutionGraphScheduler();
+    let outcome = null;
+    const executeNode = async () => {
+        outcome = await runUnitPhase(ic, iterData, loopState, sidecarItem);
+    };
+    const kinds = [
+        "unit",
+        "hook",
+        "subagent",
+        "team-worker",
+        "verification",
+        "reprocess",
+    ];
+    for (const kind of kinds)
+        scheduler.registerHandler(kind, executeNode);
+    const nodeId = `dispatch:${ic.iteration}:${iterData.unitType}:${iterData.unitId}`;
+    await scheduler.run([
+        {
+            id: nodeId,
+            kind: resolveDispatchNodeKind(iterData.unitType, sidecarItem),
+            dependsOn: [],
+            metadata: {
+                unitType: iterData.unitType,
+                unitId: iterData.unitId,
+            },
+        },
+    ], { parallel: false, maxWorkers: 1 });
+    return outcome ?? { action: "break", reason: "scheduler-dispatch-missing-result" };
+}
 /**
  * Main auto-mode execution loop. Iterates: derive → dispatch → guards →
  * runUnit → finalize → repeat. Exits when s.active becomes false or a
  * terminal condition is reached.
  *
  * This is the linear replacement for the recursive
- * dispatchNextUnit → handleAgentEnd → dispatchNextUnit chain.
+ * dispatchNextUnit → resolveAgentEnd → dispatchNextUnit chain.
  */
-export async function autoLoop(ctx, pi, s, deps) {
+export async function autoLoop(ctx, pi, s, deps, options) {
     debugLog("autoLoop", { phase: "enter" });
     let iteration = 0;
+    const dispatchContract = options?.dispatchContract ?? "legacy-direct";
     // Load persisted stuck state so counters survive session restarts (#3704)
     const persisted = loadStuckState(s.basePath);
     const loopState = {
@@ -104,6 +163,40 @@ export async function autoLoop(ctx, pi, s, deps) {
         const flowId = randomUUID();
         let seqCounter = 0;
         const nextSeq = () => ++seqCounter;
+        const turnId = randomUUID();
+        s.currentTraceId = flowId;
+        s.currentTurnId = turnId;
+        const turnStartedAt = new Date().toISOString();
+        let observedUnitType;
+        let observedUnitId;
+        let turnFinished = false;
+        const finishTurn = (status, failureClass = "none", error) => {
+            if (turnFinished)
+                return;
+            turnFinished = true;
+            deps.uokObserver?.onTurnResult({
+                traceId: flowId,
+                turnId,
+                iteration,
+                unitType: observedUnitType,
+                unitId: observedUnitId,
+                status,
+                failureClass,
+                phaseResults: [],
+                error,
+                startedAt: turnStartedAt,
+                finishedAt: new Date().toISOString(),
+            });
+            s.currentTraceId = null;
+            s.currentTurnId = null;
+        };
+        deps.uokObserver?.onTurnStart({
+            traceId: flowId,
+            turnId,
+            iteration,
+            basePath: s.basePath,
+            startedAt: turnStartedAt,
+        });
         if (iteration > MAX_LOOP_ITERATIONS) {
             debugLog("autoLoop", {
                 phase: "exit",
@@ -111,6 +204,7 @@ export async function autoLoop(ctx, pi, s, deps) {
                 iteration,
             });
             await deps.stopAuto(ctx, pi, `Safety: loop exceeded ${MAX_LOOP_ITERATIONS} iterations — possible runaway`);
+            finishTurn("stopped", "manual-attention", "max-iterations");
             break;
         }
         // ── Memory pressure check (#3331) ──
@@ -123,19 +217,30 @@ export async function autoLoop(ctx, pi, s, deps) {
                 await deps.stopAuto(ctx, pi, `Memory pressure: heap at ${mem.heapMB}MB / ${mem.limitMB}MB (${Math.round(mem.pct * 100)}%). ` +
                     `Stopping gracefully to prevent OOM kill after ${iteration} iterations. ` +
                     `Resume with /gsd auto to continue from where you left off.`);
+                finishTurn("stopped", "timeout", "memory-pressure");
                 break;
             }
         }
         if (!s.cmdCtx) {
             debugLog("autoLoop", { phase: "exit", reason: "no-cmdCtx" });
+            finishTurn("stopped", "manual-attention", "missing-command-context");
             break;
         }
         try {
             // ── Blanket try/catch: one bad iteration must not kill the session
             const prefs = deps.loadEffectiveGSDPreferences()?.preferences;
+            const uokFlags = resolveUokFlags(prefs);
             // ── Check sidecar queue before deriveState ──
             let sidecarItem;
             if (s.sidecarQueue.length > 0) {
+                if (uokFlags.executionGraph && s.sidecarQueue.length > 1) {
+                    try {
+                        s.sidecarQueue = await scheduleSidecarQueue(s.sidecarQueue);
+                    }
+                    catch (err) {
+                        logWarning("dispatch", `sidecar queue scheduling failed: ${err instanceof Error ? err.message : String(err)}`);
+                    }
+                }
                 sidecarItem = s.sidecarQueue.shift();
                 debugLog("autoLoop", {
                     phase: "sidecar-dequeue",
@@ -210,25 +315,49 @@ export async function autoLoop(ctx, pi, s, deps) {
                     isRetry: false,
                     previousTier: undefined,
                 };
+                observedUnitType = iterData.unitType;
+                observedUnitId = iterData.unitId;
                 // ── Progress widget (mirrors dev path in runDispatch) ──
                 deps.updateProgressWidget(ctx, iterData.unitType, iterData.unitId, iterData.state);
                 // ── Guards (shared with dev path) ──
                 const guardsResult = await runGuards(ic, s.currentMilestoneId ?? "workflow");
-                if (guardsResult.action === "break")
+                deps.uokObserver?.onPhaseResult("guard", guardsResult.action, {
+                    unitType: iterData.unitType,
+                    unitId: iterData.unitId,
+                });
+                if (guardsResult.action === "break") {
+                    finishTurn("stopped", "manual-attention", "guard-break");
                     break;
+                }
                 // ── Unit execution (shared with dev path) ──
-                const unitPhaseResult = await runUnitPhase(ic, iterData, loopState);
-                if (unitPhaseResult.action === "break")
+                const unitPhaseResult = await runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState);
+                deps.uokObserver?.onPhaseResult("unit", unitPhaseResult.action, {
+                    unitType: iterData.unitType,
+                    unitId: iterData.unitId,
+                });
+                if (unitPhaseResult.action === "break") {
+                    finishTurn("stopped", "execution", "unit-break");
                     break;
+                }
                 // ── Verify first, then reconcile (only mark complete on pass) ──
                 debugLog("autoLoop", { phase: "custom-engine-verify", iteration, unitId: iterData.unitId });
                 const verifyResult = await policy.verify(iterData.unitType, iterData.unitId, { basePath: s.basePath });
                 if (verifyResult === "pause") {
                     await deps.pauseAuto(ctx, pi);
+                    deps.uokObserver?.onPhaseResult("custom-engine", "pause", {
+                        unitType: iterData.unitType,
+                        unitId: iterData.unitId,
+                    });
+                    finishTurn("paused", "manual-attention", "custom-engine-verify-pause");
                     break;
                 }
                 if (verifyResult === "retry") {
                     debugLog("autoLoop", { phase: "custom-engine-verify-retry", iteration, unitId: iterData.unitId });
+                    deps.uokObserver?.onPhaseResult("custom-engine", "retry", {
+                        unitType: iterData.unitType,
+                        unitId: iterData.unitId,
+                    });
+                    finishTurn("retry");
                     continue;
                 }
                 // Verification passed — mark step complete
@@ -248,37 +377,73 @@ export async function autoLoop(ctx, pi, s, deps) {
                 debugLog("autoLoop", { phase: "iteration-complete", iteration });
                 if (reconcileResult.outcome === "milestone-complete") {
                     await deps.stopAuto(ctx, pi, "Workflow complete");
+                    deps.uokObserver?.onPhaseResult("custom-engine", "milestone-complete", {
+                        unitType: iterData.unitType,
+                        unitId: iterData.unitId,
+                    });
+                    finishTurn("completed");
                     break;
                 }
                 if (reconcileResult.outcome === "pause") {
                     await deps.pauseAuto(ctx, pi);
+                    deps.uokObserver?.onPhaseResult("custom-engine", "pause", {
+                        unitType: iterData.unitType,
+                        unitId: iterData.unitId,
+                    });
+                    finishTurn("paused", "manual-attention");
                     break;
                 }
                 if (reconcileResult.outcome === "stop") {
                     await deps.stopAuto(ctx, pi, reconcileResult.reason ?? "Engine stopped");
+                    deps.uokObserver?.onPhaseResult("custom-engine", "stop", {
+                        unitType: iterData.unitType,
+                        unitId: iterData.unitId,
+                        reason: reconcileResult.reason,
+                    });
+                    finishTurn("stopped", "manual-attention", reconcileResult.reason);
                     break;
                 }
+                deps.uokObserver?.onPhaseResult("custom-engine", "continue", {
+                    unitType: iterData.unitType,
+                    unitId: iterData.unitId,
+                });
+                finishTurn("completed");
                 continue;
             }
             if (!sidecarItem) {
                 // ── Phase 1: Pre-dispatch ─────────────────────────────────────────
                 const preDispatchResult = await runPreDispatch(ic, loopState);
-                if (preDispatchResult.action === "break")
+                deps.uokObserver?.onPhaseResult("pre-dispatch", preDispatchResult.action);
+                if (preDispatchResult.action === "break") {
+                    finishTurn("stopped", "manual-attention", "pre-dispatch-break");
                     break;
-                if (preDispatchResult.action === "continue")
+                }
+                if (preDispatchResult.action === "continue") {
+                    finishTurn("skipped");
                     continue;
+                }
                 const preData = preDispatchResult.data;
                 // ── Phase 2: Guards ───────────────────────────────────────────────
                 const guardsResult = await runGuards(ic, preData.mid);
-                if (guardsResult.action === "break")
+                deps.uokObserver?.onPhaseResult("guard", guardsResult.action);
+                if (guardsResult.action === "break") {
+                    finishTurn("stopped", "manual-attention", "guard-break");
                     break;
+                }
                 // ── Phase 3: Dispatch ─────────────────────────────────────────────
                 const dispatchResult = await runDispatch(ic, preData, loopState);
-                if (dispatchResult.action === "break")
+                deps.uokObserver?.onPhaseResult("dispatch", dispatchResult.action);
+                if (dispatchResult.action === "break") {
+                    finishTurn("stopped", "manual-attention", "dispatch-break");
                     break;
-                if (dispatchResult.action === "continue")
+                }
+                if (dispatchResult.action === "continue") {
+                    finishTurn("skipped");
                     continue;
+                }
                 iterData = dispatchResult.data;
+                observedUnitType = iterData.unitType;
+                observedUnitId = iterData.unitId;
             }
             else {
                 // ── Sidecar path: use values from the sidecar item directly ──
@@ -294,21 +459,46 @@ export async function autoLoop(ctx, pi, s, deps) {
                     midTitle: sidecarState.activeMilestone?.title,
                     isRetry: false, previousTier: undefined,
                 };
+                observedUnitType = iterData.unitType;
+                observedUnitId = iterData.unitId;
+                deps.uokObserver?.onPhaseResult("dispatch", "sidecar", {
+                    unitType: iterData.unitType,
+                    unitId: iterData.unitId,
+                    sidecarKind: sidecarItem.kind,
+                });
             }
-            const unitPhaseResult = await runUnitPhase(ic, iterData, loopState, sidecarItem);
-            if (unitPhaseResult.action === "break")
+            const unitPhaseResult = await runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState, sidecarItem);
+            deps.uokObserver?.onPhaseResult("unit", unitPhaseResult.action, {
+                unitType: iterData.unitType,
+                unitId: iterData.unitId,
+            });
+            if (unitPhaseResult.action === "break") {
+                finishTurn("stopped", "execution", "unit-break");
                 break;
+            }
             // ── Phase 5: Finalize ───────────────────────────────────────────────
             const finalizeResult = await runFinalize(ic, iterData, loopState, sidecarItem);
-            if (finalizeResult.action === "break")
+            deps.uokObserver?.onPhaseResult("finalize", finalizeResult.action, {
+                unitType: iterData.unitType,
+                unitId: iterData.unitId,
+            });
+            if (finalizeResult.action === "break") {
+                const finalizeFailureClass = finalizeResult.reason === "git-closeout-failure"
+                    ? "git"
+                    : "closeout";
+                finishTurn("stopped", finalizeFailureClass, "finalize-break");
                 break;
-            if (finalizeResult.action === "continue")
+            }
+            if (finalizeResult.action === "continue") {
+                finishTurn("retry");
                 continue;
+            }
             consecutiveErrors = 0; // Iteration completed successfully
             consecutiveCooldowns = 0;
             recentErrorMessages.length = 0;
             deps.emitJournalEvent({ ts: new Date().toISOString(), flowId, seq: nextSeq(), eventType: "iteration-end", data: { iteration } });
             debugLog("autoLoop", { phase: "iteration-complete", iteration });
+            finishTurn("completed");
         }
         catch (loopErr) {
             // ── Blanket catch: absorb unexpected exceptions, apply graduated recovery ──
@@ -330,6 +520,7 @@ export async function autoLoop(ctx, pi, s, deps) {
                 });
                 ctx.ui.notify(`Auto-mode stopped: infrastructure error ${infraCode} — ${msg}`, "error");
                 await deps.stopAuto(ctx, pi, `Infrastructure error (${infraCode}): not recoverable by retry`);
+                finishTurn("failed", "execution", msg);
                 break;
             }
             // ── Credential cooldown: wait and retry with bounded budget ──
@@ -358,6 +549,7 @@ export async function autoLoop(ctx, pi, s, deps) {
                     : COOLDOWN_FALLBACK_WAIT_MS;
                 ctx.ui.notify(`Credentials in cooldown (${consecutiveCooldowns}/${MAX_COOLDOWN_RETRIES}) — waiting ${Math.round(waitMs / 1000)}s before retrying.`, "warning");
                 await new Promise(resolve => setTimeout(resolve, waitMs));
+                finishTurn("retry", "timeout", msg);
                 continue; // Retry iteration without incrementing consecutiveErrors
             }
             consecutiveErrors++;
@@ -375,6 +567,7 @@ export async function autoLoop(ctx, pi, s, deps) {
                     .join("\n");
                 ctx.ui.notify(`Auto-mode stopped: ${consecutiveErrors} consecutive iteration failures:\n${errorHistory}`, "error");
                 await deps.stopAuto(ctx, pi, `${consecutiveErrors} consecutive iteration failures`);
+                finishTurn("failed", "execution", msg);
                 break;
             }
             else if (consecutiveErrors === 2) {
@@ -386,8 +579,15 @@ export async function autoLoop(ctx, pi, s, deps) {
                 // 1st error: log and retry — transient failures happen
                 ctx.ui.notify(`Iteration error: ${msg}. Retrying.`, "warning");
             }
+            finishTurn("retry", "execution", msg);
         }
     }
     _clearCurrentResolve();
     debugLog("autoLoop", { phase: "exit", totalIterations: iteration });
 }
+export async function runUokKernelLoop(ctx, pi, s, deps) {
+    return autoLoop(ctx, pi, s, deps, { dispatchContract: "uok-scheduler" });
+}
+export async function runLegacyAutoLoop(ctx, pi, s, deps) {
+    return autoLoop(ctx, pi, s, deps, { dispatchContract: "legacy-direct" });
+}