@opengsd/gsd-pi 1.3.0-dev.65546769 → 1.3.0-dev.738160b9

package/dist/resources/extensions/gsd/orphan-stash-audit.js

@@ -26,16 +26,78 @@ function _isAlreadyRestoredApplyError(err) {
     return /already exists, no checkout/i.test(message);
 }
 export { _isAlreadyRestoredApplyError };
+function gitOutput(basePath, args) {
+    return execFileSync("git", args, {
+        cwd: basePath,
+        stdio: ["ignore", "pipe", "pipe"],
+        encoding: "utf-8",
+        env: GIT_NO_PROMPT_ENV,
+    });
+}
+function listStashUntrackedPaths(basePath, stashRef) {
+    try {
+        return gitOutput(basePath, ["ls-tree", "-r", "-z", "--name-only", `${stashRef}^3`]).split("\0").filter(Boolean);
+    }
+    catch {
+        return null;
+    }
+}
+function listStashTrackedPaths(basePath, stashRef) {
+    try {
+        return gitOutput(basePath, ["diff", "--name-only", "-z", `${stashRef}^1`, stashRef]).split("\0").filter(Boolean);
+    }
+    catch {
+        return null;
+    }
+}
+function readWorkingTreeStatus(basePath) {
+    try {
+        return gitOutput(basePath, ["status", "--porcelain", "-z", "--untracked-files=all"])
+            .split("\0")
+            .filter(Boolean)
+            .map((entry) => ({ code: entry.slice(0, 2), path: entry.slice(3) }));
+    }
+    catch {
+        return null;
+    }
+}
+function isAlreadyRestoredUntrackedStatus(basePath, stashRef, statusEntries) {
+    if (statusEntries.length === 0 || statusEntries.some((entry) => entry.code !== "??"))
+        return false;
+    const stashTrackedPaths = listStashTrackedPaths(basePath, stashRef);
+    if (!stashTrackedPaths || stashTrackedPaths.length > 0)
+        return false;
+    const stashUntrackedPaths = listStashUntrackedPaths(basePath, stashRef);
+    if (!stashUntrackedPaths || stashUntrackedPaths.length === 0)
+        return false;
+    const stashUntrackedPathSet = new Set(stashUntrackedPaths);
+    const workingTreeUntrackedPathSet = new Set(statusEntries.map((entry) => entry.path));
+    // "Already restored" requires the working tree's untracked paths to match the
+    // stash's untracked paths exactly, in BOTH directions:
+    //   1. every current untracked path comes from the stash (no unexplained user
+    //      work that an apply would clobber), AND
+    //   2. every stash untracked path is already present in the working tree.
+    // Without (2), a partial restore (where only some stash files were recovered)
+    // would be misread as fully restored: the audit would no-op without applying
+    // or warning, leaving the remaining pre-merge files missing.
+    return (statusEntries.every((entry) => stashUntrackedPathSet.has(entry.path)) &&
+        stashUntrackedPaths.every((path) => workingTreeUntrackedPathSet.has(path)));
+}
+function manualApplyWarning(stashRef, milestoneId, reason) {
+    return (`Pre-merge stash ${stashRef} for milestone ${milestoneId} not auto-applied: ${reason}; ` +
+        `run \`git stash apply ${stashRef}\` manually to restore your pre-merge changes.`);
+}
 /**
  * Audit `git stash list` for orphaned `gsd-preflight-stash:M00x:*` entries.
  *
  * The matching merge code in `phases.ts` previously skipped the postflight
  * pop whenever `mergeAndExit` threw, leaking the user's pre-merge working
- * tree into the stash list. For every preflight-stash entry whose milestone
- * is now complete (per the supplied callback), `git stash apply` is invoked —
+ * tree into the stash list. Completed-milestone stashes are only auto-applied
+ * when the working tree is clean and the stash does not modify tracked files.
+ * Dirty trees and tracked-file stashes are left untouched with a manual
+ * recovery warning. When auto-apply is safe, `git stash apply` is invoked —
  * NOT `pop`. The stash entry stays in the list so the user retains a backup
- * if the apply produces unexpected merge results. Idempotent across repeated
- * startup runs.
+ * if the apply produces unexpected merge results.
  *
  * Failures are best-effort: a list error (no repo, git unavailable) returns
  * an empty result. An apply error becomes a warning the user sees alongside
@@ -45,12 +107,7 @@ export function auditOrphanedPreflightStashes(basePath, isMilestoneComplete) {
     const result = { applied: [], warnings: [] };
     let listOutput;
     try {
-        listOutput = execFileSync("git", ["stash", "list", "--format=%gd%x00%s"], {
-            cwd: basePath,
-            stdio: ["ignore", "pipe", "pipe"],
-            encoding: "utf-8",
-            env: GIT_NO_PROMPT_ENV,
-        });
+        listOutput = gitOutput(basePath, ["stash", "list", "--format=%gd%x00%s"]);
     }
     catch {
         return result;
@@ -78,13 +135,32 @@ export function auditOrphanedPreflightStashes(basePath, isMilestoneComplete) {
         }
         if (!complete)
             continue;
+        const statusEntries = readWorkingTreeStatus(basePath);
+        if (!statusEntries) {
+            result.warnings.push(manualApplyWarning(ref, milestoneId, "could not verify working tree status"));
+            continue;
+        }
+        if (statusEntries.length > 0) {
+            if (isAlreadyRestoredUntrackedStatus(basePath, ref, statusEntries))
+                continue;
+            result.warnings.push(manualApplyWarning(ref, milestoneId, "working tree not clean"));
+            continue;
+        }
+        const trackedPaths = listStashTrackedPaths(basePath, ref);
+        if (trackedPaths === null) {
+            result.warnings.push(manualApplyWarning(ref, milestoneId, "could not inspect tracked paths in stash"));
+            continue;
+        }
+        if (trackedPaths.length > 0) {
+            // A retained tracked-file stash has no durable marker showing whether a
+            // clean tree needs first recovery or would be re-mutated by an old backup.
+            const preview = trackedPaths.slice(0, 5).join(", ");
+            const suffix = trackedPaths.length > 5 ? `, and ${trackedPaths.length - 5} more` : "";
+            result.warnings.push(manualApplyWarning(ref, milestoneId, `stash modifies tracked files (${preview}${suffix})`));
+            continue;
+        }
         try {
-            execFileSync("git", ["stash", "apply", "--quiet", ref], {
-                cwd: basePath,
-                stdio: ["ignore", "pipe", "pipe"],
-                encoding: "utf-8",
-                env: GIT_NO_PROMPT_ENV,
-            });
+            gitOutput(basePath, ["stash", "apply", "--quiet", ref]);
             result.applied.push({ milestoneId, stashRef: ref });
         }
         catch (err) {

package/dist/resources/extensions/gsd/prompts/code-review.md

@@ -16,18 +16,20 @@ You are running the GSD **code-review** workflow — review source files changed
 
 1. **Determine the file set.** Use the explicit `--files` list if provided. Otherwise derive the changed source files from the active slice's recent commits / SUMMARY, or fall back to the git diff against the base branch. Exclude `.gsd/`, lockfiles, generated/vendored code, and docs unless `--files` names them.
 
-2. **Review each file** at the requested depth:
+2. **Gather diff-first context.** Run `git diff` for the file set (or the relevant commit range) and use that as the primary review evidence. Use `read` only when the diff is insufficient — new/untracked files, truncated hunks, or missing surrounding context needed for a finding. Do **not** read every changed file when the diff already covers the edits. If the Tool Call Loop Guard blocks a tool, stop calling tools for the rest of this turn and continue in text.
+
+3. **Review at the requested depth:**
    - **quick** — bugs, security, and correctness only.
    - **standard** (default) — quick + maintainability, error handling, edge cases.
    - **deep** — standard + performance, concurrency, API design, test coverage gaps.
 
    Ground every finding in the actual code with file path + line reference. Categorize each by severity (critical / warning / nit) and type (bug, security, quality, performance).
 
-3. **Write the review.** Produce `.gsd/reviews/{{reviewId}}-REVIEW.md` with the findings table and per-finding detail (location, issue, suggested fix).
+4. **Write the review.** Produce `.gsd/reviews/{{reviewId}}-REVIEW.md` with the findings table and per-finding detail (location, issue, suggested fix).
 
-4. **Present results.** Summarize counts by severity and list the critical findings first.
+5. **Present results.** Summarize counts by severity and list the critical findings first.
 
-5. **Fix mode** (only when `--fix` is set): for each finding that is safely auto-fixable (deterministic, no behavior change beyond the fix), apply it. After each fix batch, run the project's tests. Commit atomically with the finding IDs referenced in the message. Do not auto-apply findings that are ambiguous or that change public behavior — surface those for a human decision instead.
+6. **Fix mode** (only when `--fix` is set): for each finding that is safely auto-fixable (deterministic, no behavior change beyond the fix), apply it. After each fix batch, run the project's tests. Commit atomically with the finding IDs referenced in the message. Do not auto-apply findings that are ambiguous or that change public behavior — surface those for a human decision instead.
 
 ## Success criteria
 

package/dist/resources/extensions/gsd/prompts/plan-milestone.md

@@ -104,8 +104,8 @@ If the preference is off, ignore this section and plan every slice fully.
 
 If the roadmap has one slice, also plan S01 and its tasks inline:
 
-1. After `gsd_plan_milestone` returns, call `gsd_plan_slice` for S01 with full task breakdown.
-2. Use inlined **Slice Plan** and **Task Plan** templates for tool parameters.
+1. After `gsd_plan_milestone` returns, call `gsd_plan_slice` for S01 with slice metadata only; omit `tasks`.
+2. Then call `gsd_plan_task` once per S01 task. Use inlined **Slice Plan** and **Task Plan** templates for tool parameters.
 3. Keep simple slices lean. Omit Proof Level, Integration Closure, and Observability if all would be "none"; executable verification commands are enough.
 
 Do **not** write plan files manually; use DB-backed tools so state stays consistent.

package/dist/resources/extensions/gsd/prompts/plan-slice.md

@@ -45,8 +45,8 @@ If slice research is inlined, trust its architectural findings, but verify every
 6. Include Threat Surface (Q3), Requirement Impact (Q4), proof level, observability, integration closure, Failure Modes (Q5), Load Profile (Q6), and Negative Tests (Q7) only where applicable.
 7. Right-size tasks. Simple slices can be one task; split only when context, ownership, or verification boundaries justify it.
 8. Task `verify` commands must be safe, simple commands. Do not use shell pipes, redirects, semicolons, backticks, command substitution, output trimming, or grep regex alternation with `|`. If multiple checks are needed, create a small test file and run it with `node --test` or a package test script, or use separate simple commands joined only with `&&`. For absence checks, verify a pattern does not exist with `! grep -q 'pattern' file` or `! rg -q 'pattern' file`; do not use `grep -c` or `rg -c` to assert zero matches because count commands exit 1 when they find zero matches, and the verification gate treats that as failure.
-9. Each task needs the exact `gsd_plan_slice.tasks[]` shape: `taskId`, `title`, `description`, `estimate`, `files`, `verify`, `inputs`, `expectedOutput`, and optional `observabilityImpact`. `description` should contain the Why / Do / Done-when narrative. `files`, `inputs`, and `expectedOutput` must be JSON arrays of strings, even when there is only one path (for example, `"inputs": ["src/index.ts"]`, never `"inputs": "src/index.ts"`). Use paths relative to `{{workingDirectory}}`; do not put absolute paths to the original checkout or any directory outside `{{workingDirectory}}` in `files`, `inputs`, `expectedOutput`, or verification commands. **`expectedOutput` must only list files the task actually creates or overwrites on disk.** Do NOT include files the task merely reads, verifies, tests, or describes — those belong in `inputs`, `verify`, `description`, or slice success criteria. If a task is a pure verification or test task that produces no new files, `expectedOutput` must be `[]`; if it writes a test-result log or assertion output file, list only that concrete file path. A file that does not yet exist on disk and is needed as an `input` must be produced by an earlier task's `expectedOutput` — if no prior task creates it, add a task before this one that does. Never list GSD planning artifacts — anything under `.gsd/`, `.planning/`, or `.audits/`, or artifact names like `M001-CONTEXT.md` / `S01-PLAN.md` — in `inputs`, `files`, or `expectedOutput`: their content is preloaded as context, and they are written by workflow tools, not by tasks.
-10. Persist with `gsd_plan_slice` using `milestoneId`, `sliceId`, `goal`, optional `successCriteria`/`proofLevel`/`integrationClosure`/`observabilityImpact`, and `tasks`. `gsd_plan_slice` handles task persistence transactionally and renders `{{outputPath}}` plus task plans; do not call `gsd_plan_task`. The DB-backed tool is the canonical write path. Do **not** rely on direct `PLAN.md` writes as the source of truth.
+9. Each task persisted with `gsd_plan_task` needs the exact shape: `milestoneId`, `sliceId`, `taskId`, `title`, `description`, `estimate`, `files`, `verify`, `inputs`, `expectedOutput`, and optional `observabilityImpact`. `description` should contain the Why / Do / Done-when narrative. Any npm package name in a task description's install/add instructions (`npm install`, `yarn add`, `pnpm add`) or in `require('...')` or `import ... from '...'` code examples is subject to pre-execution registry validation; reference only packages that exist on the public npm registry, and remove or correct any package name that is not real. `files`, `inputs`, and `expectedOutput` must be JSON arrays of strings, even when there is only one path (for example, `"inputs": ["src/index.ts"]`, never `"inputs": "src/index.ts"`). Use paths relative to `{{workingDirectory}}`; do not put absolute paths to the original checkout or any directory outside `{{workingDirectory}}` in `files`, `inputs`, `expectedOutput`, or verification commands. **`expectedOutput` must only list files the task actually creates or overwrites on disk.** Do NOT include files the task merely reads, verifies, tests, or describes — those belong in `inputs`, `verify`, `description`, or slice success criteria. If a task is a pure verification or test task that produces no new files, `expectedOutput` must be `[]`; if it writes a test-result log or assertion output file, list only that concrete file path. A file that does not yet exist on disk and is needed as an `input` must be produced by an earlier task's `expectedOutput` — if no prior task creates it, add a task before this one that does. Never list GSD planning artifacts — anything under `.gsd/`, `.planning/`, or `.audits/`, or artifact names like `M001-CONTEXT.md` / `S01-PLAN.md` — in `inputs`, `files`, or `expectedOutput`: their content is preloaded as context, and they are written by workflow tools, not by tasks.
+10. Persist incrementally through DB-backed tools. First call `gsd_plan_slice` with `milestoneId`, `sliceId`, `goal`, and optional `successCriteria`/`proofLevel`/`integrationClosure`/`observabilityImpact`; omit `tasks` for this metadata call. Then call `gsd_plan_task` once per task, using the task shape above. Each successful tool call saves progress and re-renders `{{outputPath}}` from DB. The DB-backed tools are the canonical write path. Do **not** rely on direct `PLAN.md` writes as the source of truth.
 11. Self-audit before finishing: goal/demo closure, requirement coverage, deliverable coverage audit (cross-check every file listed in CONTEXT.md `## Scope` / `### In Scope` against task `files` or `expectedOutput`), locked decisions, concrete paths, dependency order, wiring, scope size, proof truthfulness, feature completeness, and quality gates. Quality gates: non-trivial slices/tasks include specific Q3-Q7 coverage where applicable.
 12. If planning creates structural decisions, call `gsd_decision_save` for each; the tool persists the decision and regenerates `.gsd/DECISIONS.md`.
 13. {{commitInstruction}}
@@ -55,6 +55,6 @@ The slice directory already exists. Do not mkdir.
 
 **Autonomous execution:** no human is available. Do not call `ask_user_questions` or `secure_env_collect`; make reasonable assumptions and document them.
 
-**You MUST call `gsd_plan_slice` to persist planning state before finishing, unless the stale-path safety rule above stops the unit before safe planning can occur.**
+**You MUST call `gsd_plan_slice` and then `gsd_plan_task` once for each planned task before finishing, unless the stale-path safety rule above stops the unit before safe planning can occur.**
 
 When done, say: "Slice {{sliceId}} planned." Say this exactly once — if you already said it in a prior message, do not repeat it.

package/dist/resources/extensions/gsd/quick.js

@@ -8,8 +8,8 @@
  * Quick tasks live in `.gsd/quick/` and are tracked in STATE.md's
  * "Quick Tasks Completed" table.
  */
-import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
-import { isAbsolute, join, relative } from "node:path";
+import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { isAbsolute, join, relative, resolve } from "node:path";
 import { QUICK_BRANCH_RE } from "./branch-patterns.js";
 import { loadPrompt } from "./prompt-loader.js";
 import { gsdRoot } from "./paths.js";
@@ -19,6 +19,7 @@ import { nativeBranchExists, nativeDetectMainBranch, nativeDiffNumstat } from ".
 import { nativeHasStagedChanges } from "./native-git-bridge.js";
 import { resolveUokFlags } from "./uok/flags.js";
 let pendingQuickReturn = null;
+const pendingQuickReturnMisses = new Map();
 // ─── Quick Task Helpers ───────────────────────────────────────────────────────
 /**
  * Generate a URL-friendly slug from a description.
@@ -169,11 +170,36 @@ export function buildQuickCommitInstruction(basePath, root) {
         "   - Quick tasks run outside the auto-mode lifecycle — there is no system auto-commit, so commit directly here.",
     ].join("\n");
 }
+function readHeadBranchName(basePath) {
+    try {
+        const gitPath = join(basePath, ".git");
+        if (!existsSync(gitPath))
+            return null;
+        let headPath;
+        if (lstatSync(gitPath).isDirectory()) {
+            headPath = join(gitPath, "HEAD");
+        }
+        else {
+            const gitFile = readFileSync(gitPath, "utf-8").trim();
+            if (!gitFile.startsWith("gitdir: "))
+                return null;
+            headPath = join(resolve(basePath, gitFile.slice("gitdir: ".length)), "HEAD");
+        }
+        const head = readFileSync(headPath, "utf-8").trim();
+        if (!head.startsWith("ref: refs/heads/"))
+            return null;
+        return head.slice("ref: refs/heads/".length);
+    }
+    catch {
+        return null;
+    }
+}
 function quickReturnStatePath(basePath) {
     return join(gsdRoot(basePath), "runtime", "quick-return.json");
 }
 function persistPendingReturn(state) {
     pendingQuickReturn = state;
+    pendingQuickReturnMisses.delete(state.basePath);
     mkdirSync(join(gsdRoot(state.basePath), "runtime"), { recursive: true });
     writeFileSync(quickReturnStatePath(state.basePath), JSON.stringify(state) + "\n", "utf-8");
 }
@@ -181,6 +207,13 @@ function readPendingReturn(basePath) {
     if (pendingQuickReturn && pendingQuickReturn.basePath === basePath) {
         return pendingQuickReturn;
     }
+    if (pendingQuickReturnMisses.has(basePath)) {
+        const statePath = quickReturnStatePath(basePath);
+        if (!existsSync(statePath) && readHeadBranchName(basePath) === pendingQuickReturnMisses.get(basePath)) {
+            return null;
+        }
+        pendingQuickReturnMisses.delete(basePath);
+    }
     try {
         const raw = readFileSync(quickReturnStatePath(basePath), "utf-8");
         const parsed = JSON.parse(raw);
@@ -191,6 +224,7 @@ function readPendingReturn(basePath) {
             && typeof parsed.slug === "string"
             && typeof parsed.description === "string") {
             pendingQuickReturn = parsed;
+            pendingQuickReturnMisses.delete(basePath);
             return pendingQuickReturn;
         }
     }
@@ -200,14 +234,23 @@ function readPendingReturn(basePath) {
     const inferred = inferQuickReturnFromBranch(basePath);
     if (inferred) {
         pendingQuickReturn = inferred;
+        pendingQuickReturnMisses.delete(basePath);
         return inferred;
     }
+    const branchAtMiss = readHeadBranchName(basePath);
+    if (branchAtMiss) {
+        pendingQuickReturnMisses.set(basePath, branchAtMiss);
+    }
     return null;
 }
 function clearPendingReturn(basePath) {
     if (pendingQuickReturn?.basePath === basePath) {
         pendingQuickReturn = null;
     }
+    const branchAtMiss = readHeadBranchName(basePath);
+    if (branchAtMiss) {
+        pendingQuickReturnMisses.set(basePath, branchAtMiss);
+    }
     rmSync(quickReturnStatePath(basePath), { force: true });
 }
 function hasStagedChanges(basePath) {

package/dist/resources/extensions/gsd/root-write-leak-guard.js

@@ -4,9 +4,15 @@ import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
+import { GSD_RUNTIME_PATTERNS } from "./gitignore.js";
 const MAX_SYNC_FINGERPRINT_BYTES = 1_500_000_000;
+const ROOT_RUNTIME_PATH_PREFIXES = Array.from(new Set(GSD_RUNTIME_PATTERNS.map((pattern) => {
+    const path = pattern.replace(/\/+$/, "");
+    const slash = path.indexOf("/");
+    return slash === -1 ? path : path.slice(0, slash);
+})));
 function isRootRuntimePath(path) {
-    return path === ".gsd" || path.startsWith(".gsd/");
+    return ROOT_RUNTIME_PATH_PREFIXES.some((prefix) => path === prefix || path.startsWith(`${prefix}/`));
 }
 function fileFingerprint(rootPath, relPath) {
     const absPath = join(rootPath, relPath);

package/dist/resources/extensions/gsd/safety/destructive-guard.js

@@ -20,14 +20,21 @@ const DESTRUCTIVE_PATTERNS = [
     { pattern: /\baws\s+\w+\s+(delete|create|put|remove|terminate)\b/i, label: "AWS mutation" },
     { pattern: /\bkubectl\s+(delete|apply)\b/i, label: "kubectl mutation" },
 ];
+function stripQuotedAndComments(command) {
+    return command
+        .replace(/"(?:[^"\\]|\\.)*"/g, '""')
+        .replace(/'(?:[^'\\]|\\.)*'/g, "''")
+        .replace(/(^|\s)#.*$/g, "$1");
+}
 /**
  * Classify a bash command for destructive operations.
  * Returns the list of matched destructive pattern labels.
  */
 export function classifyCommand(command) {
+    const commandToClassify = stripQuotedAndComments(command);
     const labels = [];
     for (const { pattern, label } of DESTRUCTIVE_PATTERNS) {
-        if (pattern.test(command)) {
+        if (pattern.test(commandToClassify)) {
             // Deduplicate labels (e.g., two force-push patterns)
             if (!labels.includes(label))
                 labels.push(label);

package/dist/resources/extensions/gsd/safety/evidence-collector.js

@@ -27,10 +27,14 @@ const EXECUTION_TOOL_NAMES = new Set([
 const MCP_EXECUTION_TOOL_RE = /^mcp__.+__gsd_(?:uat_)?exec(?:_search)?$/;
 // ─── Module State ───────────────────────────────────────────────────────────
 let unitEvidence = [];
+let lastWritePath = null;
+let lastWriteSig = null;
 // ─── Public API ─────────────────────────────────────────────────────────────
 /** Reset all evidence for a new unit. Call at unit start. */
 export function resetEvidence() {
     unitEvidence = [];
+    lastWritePath = null;
+    lastWriteSig = null;
 }
 /** Get a read-only view of all evidence collected for the current unit. */
 export function getEvidence() {
@@ -95,10 +99,15 @@ function isEvidenceArray(data) {
 export function saveEvidenceToDisk(basePath, milestoneId, sliceId, taskId) {
     try {
         const path = evidencePath(basePath, milestoneId, sliceId, taskId);
+        const body = JSON.stringify(unitEvidence, null, 2) + "\n";
+        if (path === lastWritePath && body === lastWriteSig)
+            return;
         mkdirSync(dirname(path), { recursive: true });
         const tmp = `${path}.tmp.${randomBytes(4).toString("hex")}`;
-        writeFileSync(tmp, JSON.stringify(unitEvidence, null, 2) + "\n", "utf-8");
+        writeFileSync(tmp, body, "utf-8");
         renameSync(tmp, path);
+        lastWritePath = path;
+        lastWriteSig = body;
     }
     catch {
         // Non-fatal — don't let persistence failures break unit execution
@@ -112,6 +121,8 @@ export function saveEvidenceToDisk(basePath, milestoneId, sliceId, taskId) {
  */
 export function loadEvidenceFromDisk(basePath, milestoneId, sliceId, taskId) {
     try {
+        lastWritePath = null;
+        lastWriteSig = null;
         const path = evidencePath(basePath, milestoneId, sliceId, taskId);
         if (!existsSync(path))
             return;
@@ -136,6 +147,10 @@ export function clearEvidenceFromDisk(basePath, milestoneId, sliceId, taskId) {
         if (existsSync(path)) {
             unlinkSync(path);
         }
+        if (path === lastWritePath) {
+            lastWritePath = null;
+            lastWriteSig = null;
+        }
     }
     catch {
         // Non-fatal

package/dist/resources/extensions/gsd/safety/file-change-validator.js

@@ -44,8 +44,11 @@ export function validateFileChanges(basePath, expectedOutput, plannedFiles, file
     const actualFiles = getChangedFilesFromLastCommit(basePath);
     if (!actualFiles)
         return null;
-    // Filter out .gsd/ internal files — only validate project source files
-    const projectFiles = actualFiles.filter(f => !f.startsWith(".gsd/") && !f.startsWith(".gsd\\"));
+    // Filter out GSD-internal paths — only validate project source files.
+    const projectFiles = actualFiles.filter((f) => !f.startsWith(".gsd/") &&
+        !f.startsWith(".gsd\\") &&
+        !f.startsWith(".gsd-backups/") &&
+        !f.startsWith(".gsd-backups\\"));
     // Normalize expected paths (strip leading ./ or /)
     const normalizedExpected = new Set([...allExpected].map((f) => normalizePlannedFileReference(f).replace(/^\.\//, "").replace(/^\//, "")));
     // Build allowlist matchers once (dot: true so patterns like `**/.hidden` work).

package/dist/resources/extensions/gsd/session-forensics.js

@@ -176,11 +176,21 @@ export function extractTrace(entries) {
     }
     // Flush any pending tool calls that never got results (crash mid-tool)
     for (const [, pending] of pendingTools) {
+        const missingResultError = `Tool call ${pending.name} started but no toolResult was recorded`;
         toolCalls.push({
             name: pending.name,
             input: redactInput(pending.name, pending.input),
-            isError: false,
+            result: "missing tool result (stream/tool-call abort before execution)",
+            isError: true,
         });
+        errors.push(missingResultError);
+        // Mark the matching commandsRun entry as failed so it is consistent with
+        // the isError: true on the tool call above (bash/bg_shell only).
+        if (pending.name === "bash" || pending.name === "bg_shell") {
+            const lastCmd = findLast(commandsRun, c => c.command === String(pending.input.command));
+            if (lastCmd)
+                lastCmd.failed = true;
+        }
     }
     return {
         toolCalls,

package/dist/resources/extensions/gsd/skills/gsd-headless/references/commands.md

@@ -66,7 +66,7 @@ These commands dispatch native GSD prompts adapted to the milestone, slice, and
 | `progress` | Summarize recent work; can route `--next` or `--do "..."` |
 | `health` | Check `.gsd/` integrity (`--repair`, `--context`) |
 | `surface` | Manage surfaced skills and extensions |
-| `code-review` | Review changed source for bugs, security, and quality |
+| `code-review` | Review changed source diff-first for bugs, security, and quality |
 | `review` | Peer-review recent work across reviewer perspectives |
 | `audit-milestone` | Verify a milestone met its definition of done |
 | `audit-uat` | Audit outstanding UAT/verification items |

package/dist/resources/extensions/gsd/state/derive/cache.js

@@ -0,0 +1,28 @@
+// Project/App: gsd-pi
+// File Purpose: deriveState memoization cache and telemetry.
+const CACHE_TTL_MS = 100;
+let _stateCache = null;
+let _telemetry = { dbDeriveCount: 0 };
+export function getDeriveTelemetry() {
+    return { ..._telemetry };
+}
+export function resetDeriveTelemetry() {
+    _telemetry = { dbDeriveCount: 0 };
+}
+export function incrementDbDeriveCount() {
+    _telemetry.dbDeriveCount++;
+}
+export function invalidateStateCache() {
+    _stateCache = null;
+}
+export function readCachedDeriveState(cacheKey) {
+    if (_stateCache &&
+        _stateCache.basePath === cacheKey &&
+        Date.now() - _stateCache.timestamp < CACHE_TTL_MS) {
+        return _stateCache.result;
+    }
+    return null;
+}
+export function writeCachedDeriveState(cacheKey, result) {
+    _stateCache = { basePath: cacheKey, result, timestamp: Date.now() };
+}

package/dist/resources/extensions/gsd/state/derive/db-open.js

@@ -0,0 +1,39 @@
+// Project/App: gsd-pi
+// File Purpose: Workflow DB open helpers for state derivation.
+import { getAllMilestones, isDbAvailable, setMilestoneQueueOrder } from '../../gsd-db.js';
+import { openExistingWorkflowDatabase } from '../../db-workspace.js';
+import { loadQueueOrder, sortByQueueOrder } from '../../queue-order.js';
+export function syncQueueOrderProjectionToDb(basePath) {
+    const queueOrder = loadQueueOrder(basePath);
+    if (!queueOrder)
+        return;
+    const currentIds = getAllMilestones().map((m) => m.id);
+    const desiredIds = sortByQueueOrder(currentIds, queueOrder);
+    if (currentIds.length === desiredIds.length && currentIds.every((id, i) => id === desiredIds[i]))
+        return;
+    setMilestoneQueueOrder(desiredIds);
+}
+export function ensureExistingWorkflowDbOpen(basePath) {
+    const opened = isDbAvailable() || openExistingWorkflowDatabase(basePath).ok;
+    if (opened)
+        syncQueueOrderProjectionToDb(basePath);
+    return opened;
+}
+export function buildDbUnavailableState() {
+    return {
+        activeMilestone: null,
+        activeSlice: null,
+        activeTask: null,
+        phase: "pre-planning",
+        recentDecisions: [],
+        blockers: ["DB unavailable — runtime markdown state derivation is disabled"],
+        nextAction: "Open or create the canonical GSD database before deriving workflow state. If this project only has markdown state, run /gsd migrate explicitly.",
+        registry: [],
+        requirements: { active: 0, validated: 0, deferred: 0, outOfScope: 0, blocked: 0, total: 0 },
+        progress: { milestones: { done: 0, total: 0 } },
+    };
+}
+export function getRequestedMilestoneLock() {
+    const lock = process.env.GSD_MILESTONE_LOCK?.trim();
+    return lock || undefined;
+}