gsd-pi 2.41.0-dev.0acbce9 → 2.41.0-dev.5a170d0

package/README.md

@@ -28,7 +28,7 @@ One command. Walk away. Come back to a built project with clean git history.
 
 ### New Features
 
-- **Browser-based web interface** — run GSD from the browser with `pi --web`. Full project management, real-time progress, and multi-project support via server-sent events. (#1717)
+- **Browser-based web interface** — run GSD from the browser with `gsd --web`. Full project management, real-time progress, and multi-project support via server-sent events. (#1717)
 - **Doctor: worktree lifecycle checks** — `/gsd doctor` now validates worktree health, detects orphaned worktrees, consolidates cleanup, and enhances `/worktree list` with lifecycle status. (#1814)
 - **CI: docs-only PR detection** — PRs that only change documentation skip build and test steps, with a new prompt injection scan for security. (#1699)
 - **Custom Models guide** — new documentation for adding custom providers (Ollama, vLLM, LM Studio, proxies) via `models.json`. (#1670)

package/dist/cli-web-branch.d.ts

@@ -13,6 +13,12 @@ export interface CliFlags {
     web?: boolean;
     /** Optional project path for web mode: `gsd --web <path>` or `gsd web start <path>` */
     webPath?: string;
+    /** Custom host to bind web server to: `--host 0.0.0.0` */
+    webHost?: string;
+    /** Custom port for web server: `--port 8080` */
+    webPort?: number;
+    /** Additional allowed origins for CORS: `--allowed-origins http://192.168.1.10:8080` */
+    webAllowedOrigins?: string[];
     help?: boolean;
     version?: boolean;
 }

package/dist/cli-web-branch.js

@@ -29,6 +29,20 @@ export function parseCliArgs(argv) {
                 flags.webPath = args[++i];
             }
         }
+        else if (arg === '--host' && i + 1 < args.length) {
+            flags.webHost = args[++i];
+        }
+        else if (arg === '--port' && i + 1 < args.length) {
+            const portStr = args[++i];
+            const port = parseInt(portStr, 10);
+            if (Number.isFinite(port) && port > 0 && port < 65536) {
+                flags.webPort = port;
+            }
+        }
+        else if (arg === '--allowed-origins' && i + 1 < args.length) {
+            const origins = args[++i].split(',').map(o => o.trim()).filter(Boolean);
+            flags.webAllowedOrigins = (flags.webAllowedOrigins ?? []).concat(origins);
+        }
         else if (arg === '--model' && i + 1 < args.length) {
             flags.model = args[++i];
         }
@@ -216,6 +230,9 @@ export async function runWebCliBranch(flags, deps = {}) {
         cwd: currentCwd,
         projectSessionsDir,
         agentDir,
+        host: flags.webHost,
+        port: flags.webPort,
+        allowedOrigins: flags.webAllowedOrigins,
     });
     if (!status.ok) {
         emitWebModeFailure(stderr, status);

package/dist/onboarding.js

@@ -94,7 +94,8 @@ async function loadPico() {
 /** Open a URL in the system browser (best-effort, non-blocking) */
 function openBrowser(url) {
     if (process.platform === 'win32') {
-        execFile('cmd', ['/c', 'start', '', url], () => { });
+        // PowerShell's Start-Process handles URLs with '&' safely; cmd /c start does not.
+        execFile('powershell', ['-c', `Start-Process '${url.replace(/'/g, "''")}'`], () => { });
     }
     else {
         const cmd = process.platform === 'darwin' ? 'open' : 'xdg-open';

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

@@ -6,11 +6,13 @@
  *
  * Imports from: auto/types, auto/resolve, auto/phases
  */
+import { randomUUID } from "node:crypto";
 import { MAX_LOOP_ITERATIONS, } from "./types.js";
 import { _clearCurrentResolve } from "./resolve.js";
 import { runPreDispatch, runDispatch, runGuards, runUnitPhase, runFinalize, } from "./phases.js";
 import { debugLog } from "../debug-logger.js";
 import { isInfrastructureError } from "./infra-errors.js";
+import { resolveEngine } from "../engine-resolver.js";
 /**
  * Main auto-mode execution loop. Iterates: derive → dispatch → guards →
  * runUnit → finalize → repeat. Exits when s.active becomes false or a
@@ -27,6 +29,10 @@ export async function autoLoop(ctx, pi, s, deps) {
     while (s.active) {
         iteration++;
         debugLog("autoLoop", { phase: "loop-top", iteration });
+        // ── Journal: per-iteration flow grouping ──
+        const flowId = randomUUID();
+        let seqCounter = 0;
+        const nextSeq = () => ++seqCounter;
         if (iteration > MAX_LOOP_ITERATIONS) {
             debugLog("autoLoop", {
                 phase: "exit",
@@ -53,6 +59,7 @@ export async function autoLoop(ctx, pi, s, deps) {
                     unitType: sidecarItem.unitType,
                     unitId: sidecarItem.unitId,
                 });
+                deps.emitJournalEvent({ ts: new Date().toISOString(), flowId, seq: nextSeq(), eventType: "sidecar-dequeue", data: { kind: sidecarItem.kind, unitType: sidecarItem.unitType, unitId: sidecarItem.unitId } });
             }
             const sessionLockBase = deps.lockBase();
             if (sessionLockBase) {
@@ -73,8 +80,88 @@ export async function autoLoop(ctx, pi, s, deps) {
                     break;
                 }
             }
-            const ic = { ctx, pi, s, deps, prefs, iteration };
+            const ic = { ctx, pi, s, deps, prefs, iteration, flowId, nextSeq };
+            deps.emitJournalEvent({ ts: new Date().toISOString(), flowId, seq: nextSeq(), eventType: "iteration-start", data: { iteration } });
             let iterData;
+            // ── Custom engine path ──────────────────────────────────────────────
+            // When activeEngineId is a non-dev value, bypass runPreDispatch and
+            // runDispatch entirely — the custom engine drives its own state via
+            // GRAPH.yaml. Shares runGuards and runUnitPhase with the dev path.
+            // After unit execution, verifies then reconciles via the engine layer.
+            //
+            // GSD_ENGINE_BYPASS=1 skips the engine layer entirely — falls through
+            // to the dev path below.
+            if (s.activeEngineId != null && s.activeEngineId !== "dev" && !sidecarItem && process.env.GSD_ENGINE_BYPASS !== "1") {
+                debugLog("autoLoop", { phase: "custom-engine-derive", iteration, engineId: s.activeEngineId });
+                const { engine, policy } = resolveEngine({
+                    activeEngineId: s.activeEngineId,
+                    activeRunDir: s.activeRunDir,
+                });
+                const engineState = await engine.deriveState(s.basePath);
+                if (engineState.isComplete) {
+                    await deps.stopAuto(ctx, pi, "Workflow complete");
+                    break;
+                }
+                debugLog("autoLoop", { phase: "custom-engine-dispatch", iteration });
+                const dispatch = await engine.resolveDispatch(engineState, { basePath: s.basePath });
+                if (dispatch.action === "stop") {
+                    await deps.stopAuto(ctx, pi, dispatch.reason ?? "Engine stopped");
+                    break;
+                }
+                if (dispatch.action === "skip") {
+                    continue;
+                }
+                // dispatch.action === "dispatch"
+                const step = dispatch.step;
+                const gsdState = await deps.deriveState(s.basePath);
+                iterData = {
+                    unitType: step.unitType,
+                    unitId: step.unitId,
+                    prompt: step.prompt,
+                    finalPrompt: step.prompt,
+                    pauseAfterUatDispatch: false,
+                    observabilityIssues: [],
+                    state: gsdState,
+                    mid: s.currentMilestoneId ?? "workflow",
+                    midTitle: "Workflow",
+                    isRetry: false,
+                    previousTier: undefined,
+                };
+                // ── 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")
+                    break;
+                // ── Unit execution (shared with dev path) ──
+                const unitPhaseResult = await runUnitPhase(ic, iterData, loopState);
+                if (unitPhaseResult.action === "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);
+                    break;
+                }
+                if (verifyResult === "retry") {
+                    debugLog("autoLoop", { phase: "custom-engine-verify-retry", iteration, unitId: iterData.unitId });
+                    continue;
+                }
+                // Verification passed — mark step complete
+                debugLog("autoLoop", { phase: "custom-engine-reconcile", iteration, unitId: iterData.unitId });
+                await engine.reconcile(engineState, {
+                    unitType: iterData.unitType,
+                    unitId: iterData.unitId,
+                    startedAt: s.currentUnit?.startedAt ?? Date.now(),
+                    finishedAt: Date.now(),
+                });
+                deps.clearUnitTimeout();
+                consecutiveErrors = 0;
+                deps.emitJournalEvent({ ts: new Date().toISOString(), flowId, seq: nextSeq(), eventType: "iteration-end", data: { iteration } });
+                debugLog("autoLoop", { phase: "iteration-complete", iteration });
+                continue;
+            }
             if (!sidecarItem) {
                 // ── Phase 1: Pre-dispatch ─────────────────────────────────────────
                 const preDispatchResult = await runPreDispatch(ic, loopState);
@@ -121,6 +208,7 @@ export async function autoLoop(ctx, pi, s, deps) {
             if (finalizeResult.action === "continue")
                 continue;
             consecutiveErrors = 0; // Iteration completed successfully
+            deps.emitJournalEvent({ ts: new Date().toISOString(), flowId, seq: nextSeq(), eventType: "iteration-end", data: { iteration } });
             debugLog("autoLoop", { phase: "iteration-complete", iteration });
         }
         catch (loopErr) {

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

@@ -13,6 +13,7 @@ import { runUnit } from "./run-unit.js";
 import { debugLog } from "../debug-logger.js";
 import { gsdRoot } from "../paths.js";
 import { atomicWriteSync } from "../atomic-write.js";
+import { PROJECT_FILES } from "../detection.js";
 import { join } from "node:path";
 // ─── generateMilestoneReport ──────────────────────────────────────────────────
 /**
@@ -121,6 +122,7 @@ export async function runPreDispatch(ic, loopState) {
     });
     // ── Milestone transition ────────────────────────────────────────────
     if (mid && s.currentMilestoneId && mid !== s.currentMilestoneId) {
+        deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "milestone-transition", data: { from: s.currentMilestoneId, to: mid } });
         ctx.ui.notify(`Milestone ${s.currentMilestoneId} complete. Advancing to ${mid}: ${midTitle}.`, "info");
         deps.sendDesktopNotification("GSD", `Milestone ${s.currentMilestoneId} complete!`, "success", "milestone");
         deps.logCmuxEvent(prefs, `Milestone ${s.currentMilestoneId} complete. Advancing to ${mid}.`, "success");
@@ -248,6 +250,7 @@ export async function runPreDispatch(ic, loopState) {
             await deps.stopAuto(ctx, pi, `No active milestone — ${incomplete.length} incomplete (${ids}), see diagnostic above`);
         }
         debugLog("autoLoop", { phase: "exit", reason: "no-active-milestone" });
+        deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "terminal", data: { reason: "no-active-milestone" } });
         return { action: "break", reason: "no-active-milestone" };
     }
     if (!midTitle) {
@@ -295,6 +298,7 @@ export async function runPreDispatch(ic, loopState) {
         deps.logCmuxEvent(prefs, `Milestone ${mid} complete.`, "success");
         await closeoutAndStop(ctx, pi, s, deps, `Milestone ${mid} complete`);
         debugLog("autoLoop", { phase: "exit", reason: "milestone-complete" });
+        deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "terminal", data: { reason: "milestone-complete", milestoneId: mid } });
         return { action: "break", reason: "milestone-complete" };
     }
     // Terminal: blocked
@@ -305,6 +309,7 @@ export async function runPreDispatch(ic, loopState) {
         deps.sendDesktopNotification("GSD", blockerMsg, "error", "attention");
         deps.logCmuxEvent(prefs, blockerMsg, "error");
         debugLog("autoLoop", { phase: "exit", reason: "blocked" });
+        deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "terminal", data: { reason: "blocked", blockers: state.blockers } });
         return { action: "break", reason: "blocked" };
     }
     return { action: "next", data: { state, mid, midTitle } };
@@ -328,6 +333,7 @@ export async function runDispatch(ic, preData, loopState) {
         session: s,
     });
     if (dispatchResult.action === "stop") {
+        deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "dispatch-stop", rule: dispatchResult.matchedRule, data: { reason: dispatchResult.reason } });
         await closeoutAndStop(ctx, pi, s, deps, dispatchResult.reason);
         debugLog("autoLoop", { phase: "exit", reason: "dispatch-stop" });
         return { action: "break", reason: "dispatch-stop" };
@@ -337,6 +343,7 @@ export async function runDispatch(ic, preData, loopState) {
         await new Promise((r) => setImmediate(r));
         return { action: "continue" };
     }
+    deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "dispatch-match", rule: dispatchResult.matchedRule, data: { unitType: dispatchResult.unitType, unitId: dispatchResult.unitId } });
     let unitType = dispatchResult.unitType;
     let unitId = dispatchResult.unitId;
     let prompt = dispatchResult.prompt;
@@ -402,6 +409,7 @@ export async function runDispatch(ic, preData, loopState) {
     const preDispatchResult = deps.runPreDispatchHooks(unitType, unitId, prompt, s.basePath);
     if (preDispatchResult.firedHooks.length > 0) {
         ctx.ui.notify(`Pre-dispatch hook${preDispatchResult.firedHooks.length > 1 ? "s" : ""}: ${preDispatchResult.firedHooks.join(", ")}`, "info");
+        deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "pre-dispatch-hook", data: { firedHooks: preDispatchResult.firedHooks, action: preDispatchResult.action } });
     }
     if (preDispatchResult.action === "skip") {
         ctx.ui.notify(`Skipping ${unitType} ${unitId} (pre-dispatch hook).`, "info");
@@ -544,25 +552,27 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         unitType,
         unitId,
     });
-    // ── Worktree health check (#1833) ───────────────────────────────────
+    // ── Worktree health check (#1833, #1843) ────────────────────────────
     // Verify the working directory is a valid git checkout with project
     // files before dispatching work. A broken worktree causes agents to
     // hallucinate summaries since they cannot read or write any files.
+    // Uses the shared PROJECT_FILES list from detection.ts to support all
+    // ecosystems (Rust, Go, Python, Java, etc.), not just JS.
     if (s.basePath && unitType === "execute-task") {
         const gitMarker = join(s.basePath, ".git");
         const hasGit = deps.existsSync(gitMarker);
-        const hasPackageJson = deps.existsSync(join(s.basePath, "package.json"));
-        const hasSrcDir = deps.existsSync(join(s.basePath, "src"));
         if (!hasGit) {
             const msg = `Worktree health check failed: ${s.basePath} has no .git — refusing to dispatch ${unitType} ${unitId}`;
-            debugLog("runUnitPhase", { phase: "worktree-health-fail", basePath: s.basePath, hasGit, hasPackageJson, hasSrcDir });
+            debugLog("runUnitPhase", { phase: "worktree-health-fail", basePath: s.basePath, hasGit });
             ctx.ui.notify(msg, "error");
             await deps.stopAuto(ctx, pi, msg);
             return { action: "break", reason: "worktree-invalid" };
         }
-        if (!hasPackageJson && !hasSrcDir) {
-            const msg = `Worktree health check failed: ${s.basePath} has no package.json or src/ — refusing to dispatch ${unitType} ${unitId}`;
-            debugLog("runUnitPhase", { phase: "worktree-health-fail", basePath: s.basePath, hasGit, hasPackageJson, hasSrcDir });
+        const hasProjectFile = PROJECT_FILES.some((f) => deps.existsSync(join(s.basePath, f)));
+        const hasSrcDir = deps.existsSync(join(s.basePath, "src"));
+        if (!hasProjectFile && !hasSrcDir) {
+            const msg = `Worktree health check failed: ${s.basePath} has no recognized project files — refusing to dispatch ${unitType} ${unitId}`;
+            debugLog("runUnitPhase", { phase: "worktree-health-fail", basePath: s.basePath, hasProjectFile, hasSrcDir });
             ctx.ui.notify(msg, "error");
             await deps.stopAuto(ctx, pi, msg);
             return { action: "break", reason: "worktree-invalid" };
@@ -574,6 +584,8 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         s.currentUnit.id === unitId);
     const previousTier = s.currentUnitRouting?.tier;
     s.currentUnit = { type: unitType, id: unitId, startedAt: Date.now() };
+    const unitStartSeq = ic.nextSeq();
+    deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: unitStartSeq, eventType: "unit-start", data: { unitType, unitId } });
     deps.captureAvailableSkills();
     deps.writeUnitRuntimeRecord(s.basePath, unitType, unitId, s.currentUnit.startedAt, {
         phase: "dispatched",
@@ -683,7 +695,12 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         unitId,
         prefs,
         buildSnapshotOpts: () => deps.buildSnapshotOpts(unitType, unitId),
-        buildRecoveryContext: () => ({}),
+        buildRecoveryContext: () => ({
+            basePath: s.basePath,
+            verbose: s.verbose,
+            currentUnitStartedAt: s.currentUnit?.startedAt ?? Date.now(),
+            unitRecoveryCount: s.unitRecoveryCount,
+        }),
         pauseAuto: deps.pauseAuto,
     });
     // Write preliminary lock (no session path yet — runUnit creates a new session).
@@ -759,8 +776,8 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
     if (s.currentUnitRouting) {
         deps.recordOutcome(unitType, s.currentUnitRouting.tier, true);
     }
-    const isHookUnit = unitType.startsWith("hook/");
-    const artifactVerified = isHookUnit ||
+    const skipArtifactVerification = unitType.startsWith("hook/") || unitType === "custom-step";
+    const artifactVerified = skipArtifactVerification ||
         deps.verifyExpectedArtifact(unitType, unitId, s.basePath);
     if (artifactVerified) {
         s.completedUnits.push({
@@ -783,6 +800,7 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         s.unitDispatchCount.delete(`${unitType}/${unitId}`);
         s.unitRecoveryCount.delete(`${unitType}/${unitId}`);
     }
+    deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "unit-end", data: { unitType, unitId, status: unitResult.status, artifactVerified }, causedBy: { flowId: ic.flowId, seq: unitStartSeq } });
     return { action: "next", data: { unitStartedAt: s.currentUnit.startedAt } };
 }
 // ─── runFinalize ──────────────────────────────────────────────────────────────

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

@@ -27,6 +27,8 @@ export class AutoSession {
     paused = false;
     stepMode = false;
     verbose = false;
+    activeEngineId = null;
+    activeRunDir = null;
     cmdCtx = null;
     // ── Paths ────────────────────────────────────────────────────────────────
     basePath = "";
@@ -113,6 +115,8 @@ export class AutoSession {
         this.paused = false;
         this.stepMode = false;
         this.verbose = false;
+        this.activeEngineId = null;
+        this.activeRunDir = null;
         this.cmdCtx = null;
         // Paths
         this.basePath = "";
@@ -156,6 +160,8 @@ export class AutoSession {
             paused: this.paused,
             stepMode: this.stepMode,
             basePath: this.basePath,
+            activeEngineId: this.activeEngineId,
+            activeRunDir: this.activeRunDir,
             currentMilestoneId: this.currentMilestoneId,
             currentUnit: this.currentUnit,
             completedUnits: this.completedUnits.length,

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

@@ -18,6 +18,7 @@ import { GLYPH, INDENT } from "../shared/mod.js";
 import { computeProgressScore } from "./progress-score.js";
 import { getActiveWorktreeName } from "./worktree-command.js";
 import { loadEffectiveGSDPreferences, getGlobalGSDPreferencesPath } from "./preferences.js";
+import { resolveServiceTierIcon, getEffectiveServiceTier } from "./service-tier.js";
 // ─── UAT Slice Extraction ─────────────────────────────────────────────────────
 /**
  * Extract the target slice ID from a run-uat unit ID (e.g. "M001/S01" → "S01").
@@ -45,6 +46,7 @@ export function unitVerb(unitType) {
         case "rewrite-docs": return "rewriting";
         case "reassess-roadmap": return "reassessing";
         case "run-uat": return "running UAT";
+        case "custom-step": return "executing workflow step";
         default: return unitType;
     }
 }
@@ -63,6 +65,7 @@ export function unitPhaseLabel(unitType) {
         case "rewrite-docs": return "REWRITE";
         case "reassess-roadmap": return "REASSESS";
         case "run-uat": return "UAT";
+        case "custom-step": return "WORKFLOW";
         default: return unitType.toUpperCase();
     }
 }
@@ -370,6 +373,8 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
     }
     // Pre-fetch last commit for display
     refreshLastCommit(accessors.getBasePath());
+    // Cache the effective service tier at widget creation time (reads preferences)
+    const effectiveServiceTier = getEffectiveServiceTier();
     ctx.ui.setWidget("gsd-progress", (tui, theme) => {
         let pulseBright = true;
         let cachedLines;
@@ -471,9 +476,10 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                 // Model display — shown in context section, not stats
                 const modelId = cmdCtx?.model?.id ?? "";
                 const modelProvider = cmdCtx?.model?.provider ?? "";
-                const modelDisplay = modelProvider && modelId
+                const tierIcon = resolveServiceTierIcon(effectiveServiceTier, modelId);
+                const modelDisplay = (modelProvider && modelId
                     ? `${modelProvider}/${modelId}`
-                    : modelId;
+                    : modelId) + (tierIcon ? ` ${tierIcon}` : "");
                 // ── Mode: off — return empty ──────────────────────────────────
                 if (widgetMode === "off") {
                     cachedLines = [];

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

@@ -24,7 +24,7 @@ function missingSliceStop(mid, phase) {
 // ─── Rewrite Circuit Breaker ──────────────────────────────────────────────
 const MAX_REWRITE_ATTEMPTS = 3;
 // ─── Rules ────────────────────────────────────────────────────────────────
-const DISPATCH_RULES = [
+export const DISPATCH_RULES = [
     {
         name: "rewrite-docs (override gate)",
         match: async ({ mid, midTitle, state, basePath, session }) => {
@@ -480,22 +480,39 @@ const DISPATCH_RULES = [
         },
     },
 ];
+import { getRegistry } from "./rule-registry.js";
 // ─── Resolver ─────────────────────────────────────────────────────────────
 /**
  * Evaluate dispatch rules in order. Returns the first matching action,
  * or a "stop" action if no rule matches (unhandled phase).
+ *
+ * Delegates to the RuleRegistry when initialized; falls back to inline
+ * loop over DISPATCH_RULES for backward compatibility (tests that import
+ * resolveDispatch directly without registry initialization).
  */
 export async function resolveDispatch(ctx) {
+    // Delegate to registry when available
+    try {
+        const registry = getRegistry();
+        return await registry.evaluateDispatch(ctx);
+    }
+    catch {
+        // Registry not initialized — fall back to inline loop
+    }
     for (const rule of DISPATCH_RULES) {
         const result = await rule.match(ctx);
-        if (result)
+        if (result) {
+            if (result.action !== "skip")
+                result.matchedRule = rule.name;
             return result;
+        }
     }
     // No rule matched — unhandled phase
     return {
         action: "stop",
         reason: `Unhandled phase "${ctx.state.phase}" — run /gsd doctor to diagnose.`,
         level: "info",
+        matchedRule: "<no-match>",
     };
 }
 /** Exposed for testing — returns the rule names in evaluation order. */

package/dist/resources/extensions/gsd/auto-post-unit.js

@@ -31,6 +31,7 @@ import { existsSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { uncheckTaskInPlan } from "./undo.js";
 import { atomicWriteSync } from "./atomic-write.js";
+import { _resetHasChangesCache } from "./native-git-bridge.js";
 /** Throttle STATE.md rebuilds — at most once per 30 seconds */
 const STATE_REBUILD_MIN_INTERVAL_MS = 30_000;
 /**
@@ -103,6 +104,12 @@ export async function postUnitPreVerification(pctx, opts) {
                     }
                 }
             }
+            // Invalidate the nativeHasChanges cache before auto-commit (#1853).
+            // The cache has a 10-second TTL and is keyed by basePath.  A stale
+            // `false` result causes autoCommit to skip staging entirely, leaving
+            // code files only in the working tree where they are destroyed by
+            // `git worktree remove --force` during teardown.
+            _resetHasChangesCache();
             const commitMsg = autoCommitCurrentBranch(s.basePath, s.currentUnit.type, s.currentUnit.id, taskContext);
             if (commitMsg) {
                 ctx.ui.notify(`Committed: ${commitMsg.split("\n")[0]}`, "info");

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

@@ -263,10 +263,15 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
     // plan has no tasks, creating an infinite skip loop (#699).
     if (unitType === "plan-slice") {
         const planContent = readFileSync(absPath, "utf-8");
-        if (!/^- \[[xX ]\] \*\*T\d+:/m.test(planContent))
+        // Accept checkbox-style (- [x] **T01: ...) or heading-style (### T01 -- / ### T01: / ### T01 —)
+        const hasCheckboxTask = /^- \[[xX ]\] \*\*T\d+:/m.test(planContent);
+        const hasHeadingTask = /^#{2,4}\s+T\d+\s*(?:--|—|:)/m.test(planContent);
+        if (!hasCheckboxTask && !hasHeadingTask)
             return false;
     }
-    // execute-task must also have its checkbox marked [x] in the slice plan
+    // execute-task must also have its checkbox marked [x] in the slice plan.
+    // Heading-style plans (### T01 -- Title) have no checkbox — the task summary
+    // file existence (checked above via resolveExpectedArtifactPath) is sufficient.
     if (unitType === "execute-task") {
         const parts = unitId.split("/");
         const mid = parts[0];
@@ -277,8 +282,11 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
             if (planAbs && existsSync(planAbs)) {
                 const planContent = readFileSync(planAbs, "utf-8");
                 const escapedTid = tid.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-                const re = new RegExp(`^- \\[[xX]\\] \\*\\*${escapedTid}:`, "m");
-                if (!re.test(planContent))
+                const cbRe = new RegExp(`^- \\[[xX]\\] \\*\\*${escapedTid}:`, "m");
+                const hdRe = new RegExp(`^#{2,4}\\s+${escapedTid}\\s*(?:--|—|:)`, "m");
+                // Heading-style entries count as verified (no checkbox to toggle);
+                // checkbox-style entries require [x].
+                if (!cbRe.test(planContent) && !hdRe.test(planContent))
                     return false;
             }
         }

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

@@ -11,7 +11,7 @@
 import { deriveState } from "./state.js";
 import { loadFile, getManifestStatus } from "./files.js";
 import { loadEffectiveGSDPreferences, resolveSkillDiscoveryMode, getIsolationMode, } from "./preferences.js";
-import { ensureGsdSymlink, validateProjectId } from "./repo-identity.js";
+import { ensureGsdSymlink, isInheritedRepo, validateProjectId } from "./repo-identity.js";
 import { migrateToExternalState, recoverFailedMigration } from "./migrate-external.js";
 import { collectSecretsFromManifest } from "../get-secrets-from-user.js";
 import { gsdRoot, resolveMilestoneFile } from "./paths.js";
@@ -69,8 +69,13 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
             ctx.ui.notify(`GSD_PROJECT_ID must contain only alphanumeric characters, hyphens, and underscores. Got: "${customProjectId}"`, "error");
             return releaseLockAndReturn();
         }
-        // Ensure git repo exists
-        if (!nativeIsRepo(base)) {
+        // Ensure git repo exists.
+        // Guard against inherited repos: if `base` is a subdirectory of another
+        // git repo that has no .gsd (i.e. the parent project was never initialised
+        // with GSD), create a fresh git repo at `base` so it gets its own identity
+        // hash. Without this, repoIdentity() resolves to the parent repo's hash
+        // and loads milestones from an unrelated project (#1639).
+        if (!nativeIsRepo(base) || isInheritedRepo(base)) {
             const mainBranch = loadEffectiveGSDPreferences()?.preferences?.git?.main_branch || "main";
             nativeInit(base, mainBranch);
         }