gsd-pi 2.66.1 → 2.67.0

package/dist/resources/extensions/gsd/context-store.js

@@ -49,7 +49,8 @@ export function queryDecisions(opts) {
 }
 /**
  * Query active (non-superseded) requirements with optional filters.
- * - sliceId: filters where primary_owner LIKE '%sliceId%' OR supporting_slices LIKE '%sliceId%'
+ * - milestoneId: combined with sliceId for precise filtering (e.g. %M005/S01%)
+ * - sliceId: filters where primary_owner LIKE '%pattern%' OR supporting_slices LIKE '%pattern%'
  * - status: filters where status = :status (exact match)
  *
  * Returns [] if DB is not available. Never throws.
@@ -63,10 +64,22 @@ export function queryRequirements(opts) {
     try {
         const clauses = ['superseded_by IS NULL'];
         const params = {};
-        if (opts?.sliceId) {
+        // Combined milestone+slice filtering for precise scoping
+        if (opts?.milestoneId && opts?.sliceId) {
+            // Use combined pattern like %M005/S01% to avoid cross-milestone contamination
+            clauses.push('(primary_owner LIKE :combined_pattern OR supporting_slices LIKE :combined_pattern)');
+            params[':combined_pattern'] = `%${opts.milestoneId}/${opts.sliceId}%`;
+        }
+        else if (opts?.sliceId) {
+            // Slice-only filtering (legacy behavior)
             clauses.push('(primary_owner LIKE :slice_pattern OR supporting_slices LIKE :slice_pattern)');
             params[':slice_pattern'] = `%${opts.sliceId}%`;
         }
+        else if (opts?.milestoneId) {
+            // Milestone-only filtering
+            clauses.push('(primary_owner LIKE :milestone_pattern OR supporting_slices LIKE :milestone_pattern)');
+            params[':milestone_pattern'] = `%${opts.milestoneId}%`;
+        }
         if (opts?.status) {
             clauses.push('status = :status');
             params[':status'] = opts.status;
@@ -164,3 +177,122 @@ export function queryArtifact(path) {
 export function queryProject() {
     return queryArtifact('PROJECT.md');
 }
+// ─── Knowledge Query ───────────────────────────────────────────────────────
+/**
+ * Filter KNOWLEDGE.md sections by keyword matching.
+ * Uses H2 sections, matches keywords case-insensitively against:
+ * 1. Section header text
+ * 2. First paragraph of section content (up to first blank line or next heading)
+ *
+ * Per D020, returns empty string (not null) when no matches found.
+ * This signals "no relevant knowledge" vs "file not found".
+ *
+ * @param content - Full KNOWLEDGE.md content
+ * @param keywords - Keywords to match (case-insensitive)
+ * @returns Concatenated matching sections with H2 headers, or empty string
+ */
+export async function queryKnowledge(content, keywords) {
+    if (!content || keywords.length === 0)
+        return '';
+    // Lazy import to avoid circular dependency
+    const { extractAllSections } = await import('./files.js');
+    const sections = extractAllSections(content, 2);
+    if (sections.size === 0)
+        return '';
+    // Normalize keywords for case-insensitive matching
+    const normalizedKeywords = keywords.map(k => k.toLowerCase());
+    const matchingSections = [];
+    for (const [header, body] of sections) {
+        // Extract first paragraph: everything up to first blank line or next heading
+        const firstParagraph = body.split(/\n\s*\n|\n#/)[0] || '';
+        // Check if any keyword matches header or first paragraph
+        const headerLower = header.toLowerCase();
+        const paragraphLower = firstParagraph.toLowerCase();
+        const matches = normalizedKeywords.some(kw => headerLower.includes(kw) || paragraphLower.includes(kw));
+        if (matches) {
+            matchingSections.push(`## ${header}\n\n${body}`);
+        }
+    }
+    return matchingSections.join('\n\n');
+}
+// ─── Roadmap Excerpt Formatter ─────────────────────────────────────────────
+/**
+ * Format a minimal roadmap excerpt for prompt injection.
+ * Parses the slice table from roadmap content, extracts:
+ * 1. Header row + separator
+ * 2. Predecessor row (if sliceId depends on one via the Depends column)
+ * 3. Target slice row
+ * 4. Reference directive pointing to full roadmap path
+ *
+ * Per D021, this minimizes injected content while preserving dependency awareness.
+ * Returns empty string if sliceId is not found in the table.
+ * Never throws.
+ *
+ * @param roadmapContent - Full content of the M###-ROADMAP.md file
+ * @param sliceId - Target slice ID (e.g. 'S02')
+ * @param roadmapPath - Optional path for reference directive (defaults to generic)
+ */
+export function formatRoadmapExcerpt(roadmapContent, sliceId, roadmapPath = 'ROADMAP.md') {
+    if (!roadmapContent || !sliceId)
+        return '';
+    const lines = roadmapContent.split('\n');
+    // Find the slice table header: | ID | Slice | ... (case insensitive)
+    let headerIndex = -1;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line && /^\s*\|\s*ID\s*\|\s*Slice\s*\|/i.test(line)) {
+            headerIndex = i;
+            break;
+        }
+    }
+    if (headerIndex === -1)
+        return '';
+    // The separator should be the next line (|---|---|...)
+    const separatorIndex = headerIndex + 1;
+    if (separatorIndex >= lines.length)
+        return '';
+    const headerLine = lines[headerIndex];
+    const separatorLine = lines[separatorIndex];
+    // Validate separator line looks like |---|---|... (may include : for alignment)
+    if (!separatorLine || !/^\s*\|[\s:\-|]+\|/.test(separatorLine))
+        return '';
+    const sliceRows = [];
+    for (let i = separatorIndex + 1; i < lines.length; i++) {
+        const line = lines[i];
+        if (!line || !line.trim().startsWith('|'))
+            break; // End of table
+        // Parse row: | ID | Slice | Risk | Depends | Done | After this |
+        const cells = line.split('|').map(c => c.trim());
+        // cells[0] is empty (before first |), cells[1] is ID, etc.
+        if (cells.length < 5)
+            continue;
+        const id = cells[1] || '';
+        const depends = cells[4] || ''; // Depends column (0-indexed: empty, ID, Slice, Risk, Depends, ...)
+        sliceRows.push({ line, id, depends });
+    }
+    // Find target slice row
+    const targetRow = sliceRows.find(r => r.id === sliceId);
+    if (!targetRow)
+        return '';
+    // Find predecessor if target depends on one
+    // Depends column may contain: '—', 'S01', 'S01, S02', etc.
+    let predecessorRow;
+    const dependsRaw = targetRow.depends;
+    if (dependsRaw && dependsRaw !== '—' && dependsRaw !== '-') {
+        // Extract first dependency (e.g. 'S01' from 'S01, S02')
+        const depMatch = dependsRaw.match(/S\d+/);
+        if (depMatch) {
+            predecessorRow = sliceRows.find(r => r.id === depMatch[0]);
+        }
+    }
+    // Build excerpt
+    const excerptLines = [headerLine, separatorLine];
+    if (predecessorRow) {
+        excerptLines.push(predecessorRow.line);
+    }
+    excerptLines.push(targetRow.line);
+    // Add reference directive
+    excerptLines.push('');
+    excerptLines.push(`> See full roadmap: ${roadmapPath}`);
+    return excerptLines.join('\n');
+}

package/dist/resources/extensions/gsd/custom-workflow-engine.js

@@ -135,7 +135,9 @@ export class CustomWorkflowEngine {
      * Returns "milestone-complete" when all steps are now done, "continue" otherwise.
      */
     async reconcile(state, completedStep) {
-        const graph = state.raw;
+        // Re-read the graph from disk so we do not overwrite concurrent
+        // workflow edits with a stale in-memory snapshot from deriveState().
+        const graph = readGraph(this.runDir);
         // Extract stepId from "<workflowName>/<stepId>"
         const { milestone, slice, task } = parseUnitId(completedStep.unitId);
         const stepId = task ?? slice ?? milestone;

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

@@ -170,6 +170,12 @@ const TEST_MARKERS = [
 /** Directories skipped during bounded recursive project scans. */
 const RECURSIVE_SCAN_IGNORED_DIRS = new Set([
     ".git",
+    ".gsd",
+    ".planning",
+    ".plans",
+    ".claude",
+    ".cursor",
+    ".vscode",
     "node_modules",
     ".venv",
     "venv",

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

@@ -104,6 +104,23 @@ export function extractAllSections(body, level = 2) {
 function escapeRegex(s) {
     return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
+/**
+ * Normalize a task-plan file reference that may include inline description text
+ * after the path, for example:
+ *   "docs/file.md — explanation"
+ *   "docs/file.md - explanation"
+ */
+export function normalizePlannedFileReference(value) {
+    const trimmed = value.trim().replace(/`/g, "");
+    const match = /^(.*?)(?:\s+(?:—|-)\s+)(.+)$/.exec(trimmed);
+    if (!match)
+        return trimmed;
+    const pathCandidate = match[1].trim();
+    if (pathCandidate.includes("/") || pathCandidate.includes("\\") || pathCandidate.includes(".")) {
+        return pathCandidate;
+    }
+    return trimmed;
+}
 /** Parse bullet list items from a text block. */
 export function parseBullets(text) {
     return text.split('\n')
@@ -540,11 +557,11 @@ export function parseTaskPlanIO(content) {
             let match;
             backtickPathRegex.lastIndex = 0;
             while ((match = backtickPathRegex.exec(trimmed)) !== null) {
-                const candidate = match[1];
+                const candidate = normalizePlannedFileReference(match[1]);
                 // Filter out things that look like code tokens rather than file paths
                 // (e.g. `true`, `false`, `npm run test`). A file path has at least one
                 // dot or slash.
-                if (candidate.includes("/") || candidate.includes(".")) {
+                if (candidate.includes("/") || candidate.includes("\\") || candidate.includes(".")) {
                     paths.push(candidate);
                 }
             }

package/dist/resources/extensions/gsd/guided-flow.js

@@ -142,12 +142,13 @@ export function checkAutoStartAfterDiscuss() {
     // Parse PROJECT.md for milestone sequence, warn if any are missing context.
     // Don't block — milestones can be intentionally queued without context.
     const projectFile = resolveGsdRootFile(basePath, "PROJECT");
+    let projectIds = [];
     if (projectFile) {
         try {
             const projectContent = readFileSync(projectFile, "utf-8");
-            const milestoneIds = parseMilestoneSequenceFromProject(projectContent);
-            if (milestoneIds.length > 1) {
-                const missing = milestoneIds.filter(id => {
+            projectIds = parseMilestoneSequenceFromProject(projectContent);
+            if (projectIds.length > 1) {
+                const missing = projectIds.filter(id => {
                     const hasContext = !!resolveMilestoneFile(basePath, id, "CONTEXT");
                     const hasDraft = !!resolveMilestoneFile(basePath, id, "CONTEXT-DRAFT");
                     const hasDir = existsSync(join(gsdRoot(basePath), "milestones", id));
@@ -165,9 +166,14 @@ export function checkAutoStartAfterDiscuss() {
     }
     // Gate 4: Discussion manifest process verification (multi-milestone only)
     // The LLM writes DISCUSSION-MANIFEST.json after each Phase 3 gate decision.
-    // If the manifest exists but gates_completed < total, the LLM hasn't finished
-    // presenting all readiness gates to the user — block auto-start.
+    // If the project is multi-milestone, the manifest is required. When it is
+    // missing, fail closed instead of assuming the discussion finished.
     const manifestPath = join(gsdRoot(basePath), "DISCUSSION-MANIFEST.json");
+    const requiresManifest = projectIds.length > 1 || findMilestoneIds(basePath).length > 1;
+    if (requiresManifest && !existsSync(manifestPath)) {
+        ctx.ui.notify("Multi-milestone discussion manifest is missing. Auto-start will remain paused until the manifest is written.", "warning");
+        return false;
+    }
     if (existsSync(manifestPath)) {
         try {
             const manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
@@ -178,9 +184,7 @@ export function checkAutoStartAfterDiscuss() {
                 return false;
             }
             // Cross-check manifest milestones against PROJECT.md if available
-            if (projectFile) {
-                const projectContent = readFileSync(projectFile, "utf-8");
-                const projectIds = parseMilestoneSequenceFromProject(projectContent);
+            if (projectIds.length > 0) {
                 const manifestIds = Object.keys(manifest.milestones ?? {});
                 const untracked = projectIds.filter(id => !manifestIds.includes(id));
                 if (untracked.length > 0) {

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

@@ -1,4 +1,4 @@
-export { isDepthConfirmationAnswer, isDepthVerified, isQueuePhaseActive, setQueuePhaseActive, shouldBlockContextWrite, shouldBlockQueueExecution, } from "./bootstrap/write-gate.js";
+export { isDepthConfirmationAnswer, isDepthVerified, isGateQuestionId, isQueuePhaseActive, setQueuePhaseActive, shouldBlockContextWrite, shouldBlockPendingGate, shouldBlockPendingGateBash, shouldBlockQueueExecution, setPendingGate, clearPendingGate, getPendingGate, } from "./bootstrap/write-gate.js";
 export default async function registerExtension(pi) {
     const { registerGsdExtension } = await import("./bootstrap/register-extension.js");
     registerGsdExtension(pi);

package/dist/resources/extensions/gsd/parallel-monitor-overlay.js

@@ -406,6 +406,8 @@ export class ParallelMonitorOverlay {
         lines.push(t.fg("muted", "  ESC/q to close  │  ↑↓ scroll"));
         // Apply scroll — use terminal rows as height estimate
         const termHeight = process.stdout.rows || 40;
+        const maxScroll = Math.max(0, lines.length - termHeight);
+        this.scrollOffset = Math.min(Math.max(this.scrollOffset, 0), maxScroll);
         const visible = lines.slice(this.scrollOffset, this.scrollOffset + termHeight);
         this.cachedLines = visible;
         return visible;

package/dist/resources/extensions/gsd/parsers-legacy.js

@@ -177,7 +177,9 @@ function _parsePlanImpl(content) {
         for (const line of lines) {
             const cbMatch = line.match(/^-\s+\[([ xX])\]\s+\*\*([\w.]+):\s+(.+?)\*\*\s*(.*)/);
             // Heading-style: ### T01 -- Title, ### T01: Title, ### T01 — Title
-            const hdMatch = !cbMatch ? line.match(/^#{2,4}\s+([\w.]+)\s*(?:--|—|:)\s*(.+)/) : null;
+            const hdMatch = !cbMatch
+                ? line.match(/^#{2,4}\s+([A-Z]+\d+(?:\.[A-Z]+\d+)*)\s*(?:--|—|:)\s*(.+)/)
+                : null;
             if (cbMatch || hdMatch) {
                 const taskId = cbMatch ? cbMatch[2] : hdMatch[1];
                 // Skip tasks already found in the Tasks section

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

@@ -127,10 +127,12 @@ function loadPreferencesFile(path, scope) {
     };
 }
 let _warnedUnrecognizedFormat = false;
+let _warnedSectionParse = false;
 /** @internal Reset the warn-once flags — exported for testing only. */
 export function _resetParseWarningFlag() {
     _warnedUnrecognizedFormat = false;
     _warnedFrontmatterParse = false;
+    _warnedSectionParse = false;
 }
 /** @internal Exported for testing only */
 export function parsePreferencesMarkdown(content) {
@@ -227,7 +229,10 @@ function parseHeadingListFormat(content) {
             typed[targetSection] = value;
         }
         catch (e) {
-            logWarning("guided", `preferences section parse failed: ${e.message}`);
+            if (!_warnedSectionParse) {
+                _warnedSectionParse = true;
+                logWarning("guided", `preferences section parse failed: ${e.message}`);
+            }
         }
     }
     return typed;

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

@@ -63,6 +63,6 @@ Then:
 13. Do not commit manually — the system auto-commits your changes after this unit completes.
 - Say: "Milestone {{milestoneId}} complete."
 
-**Important:** Do NOT skip the code change verification, success criteria, or definition of done verification (steps 3-5). The milestone summary must reflect actual verified outcomes, not assumed success. Verification failures BLOCK completion — there is no override. The milestone stays in its current state until issues are resolved and verification is re-run.
+**Important:** Do NOT skip the code change verification, success criteria, or definition of done verification (steps 3-5). The milestone summary must reflect actual verified outcomes, not assumed success. Verification failures BLOCK completion — there is no override. The milestone stays in its current state until issues are resolved and verification is re-run. **If a verification tool itself fails, errors, or returns unexpected output, treat it as a verification failure** — never rationalize past a tool error ("tool didn't respond, assuming success" is forbidden). A tool that cannot verify is a tool that did not verify.
 
 **File system safety:** When scanning milestone directories for evidence, use `ls` or `find` to list directory contents first — never pass a directory path (e.g. `tasks/`, `slices/`) directly to the `read` tool. The `read` tool only accepts file paths, not directories.

package/dist/resources/extensions/gsd/prompts/discuss-prepared.md

@@ -109,7 +109,7 @@ Options:
   - "Needs adjustment" — user will clarify, then re-present scope
 ```
 
-**Do NOT proceed to Layer 2 until the user explicitly approves the scope.**
+**CRITICAL — Non-bypassable gate:** Do NOT proceed to Layer 2 until the user explicitly approves the scope. If `ask_user_questions` fails, errors, returns no response, or the user's response does not match a provided option, you MUST re-ask — never rationalize past the block. "Tool not responding, I'll proceed," "auth issues," or "I'll use my recommended scope" are all **forbidden**. The gate exists to protect the user's work; treat a block as an instruction to wait, not an obstacle to work around.
 
 ---
 
@@ -120,7 +120,7 @@ Before presenting Layer 2 findings, use your available web search tools to resea
 1. Search for "[technology] [version] best practices [current year]"
 2. Search for "[technology] [version] known issues"
 
-Summarize findings concisely. If no search tools are available, note this and proceed using your training knowledge — don't block the discussion on missing search results.
+Summarize findings concisely. If search tools fail or are unavailable, note this and proceed using your training knowledge — but do NOT use a search failure as justification to skip any gate.
 
 Present ecosystem findings at the start of Layer 2 alongside your architecture recommendation.
 
@@ -180,7 +180,7 @@ Options:
   - "Want to adjust" — user will clarify, then re-present architecture
 ```
 
-**Do NOT proceed to Layer 3 until the user explicitly approves the architecture.**
+**CRITICAL — Non-bypassable gate:** Do NOT proceed to Layer 3 until the user explicitly approves the architecture. If `ask_user_questions` fails, errors, returns no response, or the user's response does not match a provided option, you MUST re-ask — never rationalize past the block. The gate exists to protect the user's work; treat a block as an instruction to wait, not an obstacle to work around.
 
 ---
 
@@ -243,7 +243,7 @@ Options:
   - "Want to adjust error handling" — user will clarify, then re-present errors
 ```
 
-**Do NOT proceed to Layer 4 until the user explicitly approves error handling.**
+**CRITICAL — Non-bypassable gate:** Do NOT proceed to Layer 4 until the user explicitly approves error handling. If `ask_user_questions` fails, errors, returns no response, or the user's response does not match a provided option, you MUST re-ask — never rationalize past the block. The gate exists to protect the user's work; treat a block as an instruction to wait, not an obstacle to work around.
 
 ---
 
@@ -297,7 +297,7 @@ Options:
   - "Want to adjust the quality bar" — user will clarify, then re-present quality
 ```
 
-**Do NOT proceed to Output Phase until the user explicitly approves the quality bar.**
+**CRITICAL — Non-bypassable gate:** Do NOT proceed to Output Phase until the user explicitly approves the quality bar. If `ask_user_questions` fails, errors, returns no response, or the user's response does not match a provided option, you MUST re-ask — never rationalize past the block. The gate exists to protect the user's work; treat a block as an instruction to wait, not an obstacle to work around.
 
 ---
 
@@ -315,13 +315,13 @@ Before writing a roadmap, produce or update `.gsd/REQUIREMENTS.md`.
 
 Use it as the project's explicit capability contract. Requirements discovered during the 4-layer discussion should be captured here with source `user` or `inferred` as appropriate.
 
-**Print the requirements in chat before writing the roadmap.** Print a markdown table with columns: ID, Title, Status, Owner, Source. Group by status (Active, Deferred, Out of Scope). After the table, ask: "Confirm, adjust, or add?"
+**Print the requirements in chat before writing the roadmap.** Print a markdown table with columns: ID, Title, Status, Owner, Source. Group by status (Active, Deferred, Out of Scope). After the table, ask: "Confirm, adjust, or add?" **Non-bypassable:** If the user does not respond or gives an ambiguous answer, you MUST re-ask — never proceed to roadmap creation without explicit requirement confirmation.
 
 ### Roadmap Preview
 
 Before writing any files, **print the planned roadmap in chat** so the user can see and approve it. Print a markdown table with columns: Slice, Title, Risk, Depends, Demo. One row per slice. Below the table, print the milestone definition of done as a bullet list.
 
-If the user raises a substantive objection, adjust the roadmap. Otherwise, present the roadmap and ask: "Ready to write, or want to adjust?" — one gate, not two.
+If the user raises a substantive objection, adjust the roadmap. Otherwise, present the roadmap and ask: "Ready to write, or want to adjust?" — one gate, not two. **Non-bypassable:** If the user does not respond or gives an ambiguous answer, you MUST re-ask — never write files without explicit approval. A missing response is not a "yes."
 
 ### Naming Convention
 

package/dist/resources/extensions/gsd/prompts/discuss.md

@@ -173,7 +173,7 @@ For multi-milestone projects, requirements should span the full vision. Requirem
 
 If the project is new or has no `REQUIREMENTS.md`, surface candidate requirements in chat before writing the roadmap. Ask for correction only on material omissions, wrong ownership, or wrong scope. If the user has already been specific and raises no substantive objection, treat the requirement set as confirmed and continue.
 
-**Print the requirements in chat before writing the roadmap.** Do not say "here are the requirements" and then only write them to a file. The user must see them in the terminal. Print a markdown table with columns: ID, Title, Status, Owner, Source. Group by status (Active, Deferred, Out of Scope). After the table, ask: "Confirm, adjust, or add?"
+**Print the requirements in chat before writing the roadmap.** Do not say "here are the requirements" and then only write them to a file. The user must see them in the terminal. Print a markdown table with columns: ID, Title, Status, Owner, Source. Group by status (Active, Deferred, Out of Scope). After the table, ask: "Confirm, adjust, or add?" **Non-bypassable:** If the user does not respond or gives an ambiguous answer, you MUST re-ask — never proceed to roadmap creation without explicit requirement confirmation.
 
 ## Scope Assessment
 
@@ -185,7 +185,7 @@ Before moving to output, confirm the size estimate from your reflection still ho
 
 Before writing any files, **print the planned roadmap in chat** so the user can see and approve it. Print a markdown table with columns: Slice, Title, Risk, Depends, Demo. One row per slice. Below the table, print the milestone definition of done as a bullet list.
 
-If the user raises a substantive objection, adjust the roadmap. Otherwise, present the roadmap and ask: "Ready to write, or want to adjust?" — one gate, not two.
+If the user raises a substantive objection, adjust the roadmap. Otherwise, present the roadmap and ask: "Ready to write, or want to adjust?" — one gate, not two. **Non-bypassable:** If the user does not respond or gives an ambiguous answer, you MUST re-ask — never write files without explicit approval. A missing response is not a "yes."
 
 ### Naming Convention
 
@@ -242,7 +242,7 @@ If a milestone has no dependencies, omit the frontmatter. The dependency chain f
 
 #### Phase 3: Sequential readiness gate for remaining milestones
 
-For each remaining milestone **one at a time, in sequence**, decide the most likely readiness mode from the evidence you already have, then use `ask_user_questions` to let the user correct that recommendation. Present three options:
+For each remaining milestone **one at a time, in sequence**, decide the most likely readiness mode from the evidence you already have, then use `ask_user_questions` to let the user correct that recommendation. **Non-bypassable:** If `ask_user_questions` fails, errors, returns no response, or the user's response does not match a provided option, you MUST re-ask — never rationalize past the block or auto-select a readiness mode. Present three options:
 
 - **"Discuss now"** — The user wants to conduct a focused discussion for this milestone in the current session, while the context from the broader discussion is still fresh. Proceed with a focused discussion for this milestone (reflection → investigation → questioning → depth verification). When the discussion concludes, write a full `CONTEXT.md`. Then move to the gate for the next milestone.
 - **"Write draft for later"** — This milestone has seed material from the current conversation but needs its own dedicated discussion in a future session. Write a `CONTEXT-DRAFT.md` capturing the seed material (what was discussed, key ideas, provisional scope, open questions). Mark it clearly as a draft, not a finalized context. **What happens downstream:** When auto-mode reaches this milestone, it pauses and notifies the user: "M00x has draft context — needs discussion. Run /gsd." The `/gsd` wizard shows a "Discuss from draft" option that seeds the new discussion with this draft, so nothing from the current conversation is lost. After the dedicated discussion produces a full CONTEXT.md, the draft file is automatically deleted.

package/dist/resources/extensions/gsd/prompts/guided-discuss-milestone.md

@@ -92,15 +92,15 @@ Before moving to the wrap-up gate, verify you have covered:
 - header: "Depth Check"
 - question: "Did I capture the depth right?"
 - options: "Yes, you got it (Recommended)", "Not quite — let me clarify"
-- **The question ID must contain `depth_verification`** (e.g. `depth_verification_confirm`) — this enables the write-gate downstream.
+- **The question ID must contain `depth_verification` and the milestone id** (e.g. `depth_verification_{{milestoneId}}_confirm`) — this enables the write-gate downstream and keeps verification scoped to the milestone being discussed.
 
-**If `{{structuredQuestionsAvailable}}` is `false`:** ask in plain text: "Did I capture that correctly? If not, tell me what I missed." Wait for confirmation before proceeding.
+**If `{{structuredQuestionsAvailable}}` is `false`:** ask in plain text: "Did I capture that correctly? If not, tell me what I missed." Wait for explicit confirmation before proceeding. **The same non-bypassable gate applies to the plain-text path** — if the user does not respond, gives an ambiguous answer, or does not explicitly confirm, you MUST re-ask. Never rationalize past a missing confirmation.
 
 If they clarify, absorb the correction and re-verify.
 
 The depth verification is the only required confirmation gate. Do not add a second "ready to proceed?" gate after it.
 
-**CRITICAL — Non-bypassable gate:** The system mechanically blocks CONTEXT.md writes until the user selects the "(Recommended)" option. If the user declines, cancels, or the tool fails, you MUST re-ask — never rationalize past the block ("tool not responding, I'll proceed" is forbidden). The gate exists to protect the user's work; treat a block as an instruction, not an obstacle to work around.
+**CRITICAL — Non-bypassable gate:** The system mechanically blocks CONTEXT.md writes until the user selects the "(Recommended)" option (structured path) or explicitly confirms (plain-text path). If the user declines, cancels, does not respond, or the tool fails, you MUST re-ask — never rationalize past the block ("tool not responding, I'll proceed" is forbidden). The gate exists to protect the user's work; treat a block as an instruction, not an obstacle to work around.
 
 ---
 

package/dist/resources/extensions/gsd/prompts/guided-discuss-slice.md

@@ -41,11 +41,13 @@ After each round of answers, decide whether you already have enough signal to wr
 - Ask a single wrap-up question only when you genuinely believe the slice is well understood or the user signals they want to stop.
 - When you do ask it, offer two choices: "Write the context file" *(recommended when the slice is well understood)* or "One more pass". Use `ask_user_questions` if available, otherwise ask in plain text.
 
+**CRITICAL — Non-bypassable gate:** Do NOT write the context file until the user explicitly selects "Write the context file." If `ask_user_questions` fails, errors, returns no response, or the user's response does not match a provided option, you MUST re-ask — never rationalize past the block. "Tool not responding, I'll proceed," "auth issues," or "the slice seems well understood, I'll write it" are all **forbidden**. The gate exists to protect the user's work; treat a block as an instruction to wait, not an obstacle to work around.
+
 ---
 
 ## Output
 
-Once the user is ready to wrap up:
+Once the user has explicitly confirmed they are ready to write the context file:
 
 1. Use the **Slice Context** output template below
 2. `mkdir -p {{sliceDirPath}}`

package/dist/resources/extensions/gsd/prompts/rethink.md

@@ -12,7 +12,7 @@ You are a project reorganization assistant for a GSD (Get Shit Done) project. Th
 
 1. Present the current milestone order as a clear numbered list with status indicators (e.g. ✅ complete, ▶ active, ⏳ pending, ⏸ parked)
 2. Ask: **"What would you like to change?"**
-3. Execute changes conversationally, confirming destructive operations before proceeding
+3. Execute changes conversationally, confirming destructive operations before proceeding. **Non-bypassable:** For any destructive operation (discard, skip, reorder that breaks dependencies), you MUST get explicit user confirmation before executing. If the user does not respond, gives an ambiguous answer, or `ask_user_questions` fails, you MUST re-ask — never rationalize past the block. A missing confirmation is a "do not proceed."
 
 ## Supported Operations
 
@@ -53,8 +53,12 @@ gsd_skip_slice({ milestoneId: "M003", sliceId: "S02", reason: "Descoped — feat
 Skipped slices are treated as closed by the state machine (like "complete" but distinct). Use when a slice is no longer needed or has been superseded. The slice data is preserved for reference.
 **Do NOT** just check the slice checkbox in the roadmap — this does not update the DB and auto-mode will resume the slice.
 
+**CRITICAL — Non-bypassable gate:** Skipping a slice is a permanent DB operation. You MUST confirm with the user before calling `gsd_skip_slice`. If the user does not respond or gives an ambiguous answer, you MUST re-ask — never proceed without explicit approval.
+
 ### Discard a milestone
-**Permanently** delete a milestone directory and prune it from QUEUE-ORDER.json. **Always confirm with the user before discarding.** Warn explicitly if the milestone has completed work.
+**Permanently** delete a milestone directory and prune it from QUEUE-ORDER.json.
+
+**CRITICAL — Non-bypassable gate:** Discarding is irreversible. You MUST confirm with the user before discarding. Warn explicitly if the milestone has completed work. If the user does not respond or gives an ambiguous answer, you MUST re-ask — never rationalize past the block. A missing confirmation is a "do not discard."
 
 ### Add a new milestone
 Use the `gsd_milestone_generate_id` tool to get the next ID, then call `gsd_summary_save` with `milestone_id: {ID}`, `artifact_type: "CONTEXT"`, and the scope/goals/success criteria as `content` — the tool writes the context file to disk and persists to DB. Update QUEUE-ORDER.json to place it at the desired position.

package/dist/resources/extensions/gsd/prompts/system.md

@@ -38,7 +38,7 @@ GSD ships with bundled skills. Load the relevant skill file with the `read` tool
 - Never print, echo, log, or restate secrets or credentials. Report only key names and applied/skipped status.
 - Never ask the user to edit `.env` files or set secrets manually. Use `secure_env_collect`.
 - In enduring files, write current state only unless the file is explicitly historical.
-- **Never take outward-facing actions on GitHub (or any external service) without explicit user confirmation.** This includes: creating issues, closing issues, merging PRs, approving PRs, posting comments, pushing to remote branches, publishing packages, or any other action that affects state outside the local filesystem. Read-only operations (listing, viewing, diffing) are fine. Always present what you intend to do and get a clear "yes" before executing.
+- **Never take outward-facing actions on GitHub (or any external service) without explicit user confirmation.** This includes: creating issues, closing issues, merging PRs, approving PRs, posting comments, pushing to remote branches, publishing packages, or any other action that affects state outside the local filesystem. Read-only operations (listing, viewing, diffing) are fine. Always present what you intend to do and get a clear "yes" before executing. **Non-bypassable:** If the user does not respond, gives an ambiguous answer, or `ask_user_questions` fails, you MUST re-ask — never rationalize past the block ("tool not responding, I'll proceed" is forbidden). A missing "yes" is a "no."
 
 If a `GSD Skill Preferences` block is present below this contract, treat it as explicit durable guidance for which skills to use, prefer, or avoid during GSD work. Follow it where it does not conflict with required GSD artifact rules, verification requirements, or higher-priority system/developer instructions.
 

package/dist/resources/extensions/gsd/prompts/triage-captures.md

@@ -51,7 +51,7 @@ For each capture, classify it as one of:
    
    For captures classified as **note** or **defer**, auto-confirm without asking — these are low-impact.
    For captures classified as **stop** or **backtrack**, auto-confirm without asking — these are urgent user directives that must be honored immediately.
-   For captures classified as **quick-task**, **inject**, or **replan**, ask the user to confirm or choose a different classification.
+   For captures classified as **quick-task**, **inject**, or **replan**, ask the user to confirm or choose a different classification. **Non-bypassable:** If `ask_user_questions` fails, errors, or the user does not respond, you MUST re-ask — never auto-confirm these classifications without explicit user approval.
 
 3. **Update** `.gsd/CAPTURES.md` — for each capture, update its section with the confirmed classification:
    - Change `**Status:** pending` to `**Status:** resolved`

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

@@ -14,7 +14,7 @@ This is remediation round {{remediationRound}}. If this is round 0, this is the
 
 ## Context
 
-All relevant context has been preloaded below — the roadmap, all slice summaries, UAT results, requirements, decisions, and project context are inlined. Start working immediately without re-reading these files.
+All relevant context has been preloaded below — the roadmap, all slice summaries, assessment results, requirements, decisions, and project context are inlined. Start working immediately without re-reading these files.
 
 {{inlinedContext}}
 
@@ -30,8 +30,8 @@ Prompt: "Review milestone {{milestoneId}} requirements coverage. Working directo
 **Reviewer B — Cross-Slice Integration**
 Prompt: "Review milestone {{milestoneId}} cross-slice integration. Working directory: {{workingDirectory}}. Read `{{roadmapPath}}` and find the boundary map (produces/consumes contracts). For each boundary, check that the producing slice's SUMMARY confirms it produced the artifact, and the consuming slice's SUMMARY confirms it consumed it. Output a markdown table: Boundary | Producer Summary | Consumer Summary | Status. End with a one-line verdict: PASS if all boundaries honored, NEEDS-ATTENTION if any gaps."
 
-**Reviewer C — UAT & Acceptance Criteria**
-Prompt: "Review milestone {{milestoneId}} UAT and acceptance criteria. Working directory: {{workingDirectory}}. Read `.gsd/{{milestoneId}}/CONTEXT.md` for acceptance criteria. Check for UAT-RESULT files in each slice directory. Verify each acceptance criterion maps to either a passing UAT result or clear SUMMARY evidence. Output a checklist: [ ] Criterion | Evidence. End with a one-line verdict: PASS if all criteria met, NEEDS-ATTENTION if gaps exist."
+**Reviewer C — Assessment & Acceptance Criteria**
+Prompt: "Review milestone {{milestoneId}} assessment evidence and acceptance criteria. Working directory: {{workingDirectory}}. Read `.gsd/{{milestoneId}}/CONTEXT.md` for acceptance criteria. Check for ASSESSMENT files in each slice directory. Verify each acceptance criterion maps to either a passing assessment result or clear SUMMARY evidence. Output a checklist: [ ] Criterion | Evidence. End with a one-line verdict: PASS if all criteria met, NEEDS-ATTENTION if gaps exist."
 
 ### Step 2 — Synthesize Findings
 
@@ -59,7 +59,7 @@ reviewers: 3
 ## Reviewer B — Cross-Slice Integration
 <paste Reviewer B output>
 
-## Reviewer C — UAT & Acceptance Criteria
+## Reviewer C — Assessment & Acceptance Criteria
 <paste Reviewer C output>
 
 ## Synthesis

package/dist/resources/extensions/gsd/prompts/worktree-merge.md

@@ -90,9 +90,11 @@ Present a merge plan to the user:
 
 Ask the user to confirm the merge plan before proceeding.
 
+**CRITICAL — Non-bypassable gate:** Do NOT execute any merge commands until the user explicitly approves the merge plan. If `ask_user_questions` fails, errors, returns no response, or the user's response is ambiguous, you MUST re-ask — never rationalize past the block. "No response, I'll proceed with the clean merges," "the plan looks safe, merging," or any other self-authorization is **forbidden**. The gate exists to protect the user's branches; treat a block as an instruction to wait, not an obstacle to work around.
+
 ### Step 4: Execute Merge
 
-Once confirmed, run all commands from `{{mainTreePath}}` (your CWD):
+Once the user has explicitly confirmed, run all commands from `{{mainTreePath}}` (your CWD):
 
 1. Ensure you are on the target branch: `git checkout {{mainBranch}}`
 2. If there are conflicts requiring manual reconciliation, apply the reconciled versions first

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

@@ -9,6 +9,7 @@
  * Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
  */
 import { execFileSync } from "node:child_process";
+import { normalizePlannedFileReference } from "../files.js";
 import { logWarning } from "../workflow-logger.js";
 // ─── Public API ─────────────────────────────────────────────────────────────
 /**
@@ -31,7 +32,7 @@ export function validateFileChanges(basePath, expectedOutput, plannedFiles) {
     // Filter out .gsd/ internal files — only validate project source files
     const projectFiles = actualFiles.filter(f => !f.startsWith(".gsd/") && !f.startsWith(".gsd\\"));
     // Normalize expected paths (strip leading ./ or /)
-    const normalizedExpected = new Set([...allExpected].map(f => f.replace(/^\.\//, "").replace(/^\//, "")));
+    const normalizedExpected = new Set([...allExpected].map((f) => normalizePlannedFileReference(f).replace(/^\.\//, "").replace(/^\//, "")));
     // Compute symmetric difference
     const unexpectedFiles = projectFiles.filter(f => !normalizedExpected.has(f));
     const missingFiles = [...normalizedExpected].filter(f => !projectFiles.includes(f));

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

@@ -1194,7 +1194,8 @@ export async function _deriveStateImpl(basePath) {
             ? `All milestones complete. ${activeReqs} active requirement${activeReqs === 1 ? '' : 's'} in REQUIREMENTS.md ${activeReqs === 1 ? 'has' : 'have'} not been mapped to a milestone.`
             : 'All milestones complete.';
         return {
-            activeMilestone: lastEntry ? { id: lastEntry.id, title: lastEntry.title } : null,
+            activeMilestone: null,
+            lastCompletedMilestone: lastEntry ? { id: lastEntry.id, title: lastEntry.title } : null,
             activeSlice: null,
             activeTask: null,
             phase: 'complete',