gsd-pi 2.66.1-dev.ed243f2 → 2.67.0-dev.43b0159

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/execute-task.md

@@ -69,14 +69,14 @@ Then:
 16. If you made an architectural, pattern, library, or observability decision during this task that downstream work should know about, append it to `.gsd/DECISIONS.md` (read the template at `~/.gsd/agent/extensions/gsd/templates/decisions.md` if the file doesn't exist yet). Not every task produces decisions — only append when a meaningful choice was made.
 17. If you discover a non-obvious rule, recurring gotcha, or useful pattern during execution, append it to `.gsd/KNOWLEDGE.md`. Only add entries that would save future agents from repeating your investigation. Don't add obvious things.
 18. Read the template at `~/.gsd/agent/extensions/gsd/templates/task-summary.md`
-19. Write `{{taskSummaryPath}}`
-20. Call `gsd_complete_task` with milestoneId, sliceId, taskId, and a summary of what was accomplished. This is your final required step — do NOT manually edit PLAN.md checkboxes. The tool marks the task complete, updates the DB, and renders PLAN.md automatically.
+19. Use that template to prepare the completion content you will pass to `gsd_complete_task` using the camelCase fields `milestoneId`, `sliceId`, `taskId`, `oneLiner`, `narrative`, `verification`, and `verificationEvidence`. Do **not** manually write `{{taskSummaryPath}}` — the DB-backed tool is the canonical write path and renders the summary file for you.
+20. Call `gsd_complete_task` with milestoneId, sliceId, taskId, and the completion fields derived from the template. This is your final required step — do NOT manually edit PLAN.md checkboxes. The tool marks the task complete, updates the DB, renders `{{taskSummaryPath}}`, and updates PLAN.md automatically.
 21. Do not run git commands — the system reads your task summary after completion and creates a meaningful commit from it (type inferred from title, message from your one-liner, key files from frontmatter). Write a clear, specific one-liner in the summary — it becomes the commit message.
 
 All work stays in your working directory: `{{workingDirectory}}`.
 
 **Autonomous execution:** Do not call `ask_user_questions` or `secure_env_collect`. You are running in auto-mode — there is no human available to answer questions. Make reasonable assumptions and document them in the task summary. If a decision genuinely requires human input, note it in the summary and proceed with the best available option.
 
-**You MUST call `gsd_complete_task` AND write `{{taskSummaryPath}}` before finishing.**
+**You MUST call `gsd_complete_task` before finishing. Do not manually write `{{taskSummaryPath}}`.**
 
 When done, say: "Task {{taskId}} complete."

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
 
@@ -40,9 +40,9 @@ After all reviewers complete, aggregate their verdicts:
 - If any reviewer says NEEDS-ATTENTION → overall verdict: `needs-attention`
 - If any reviewer says FAIL → overall verdict: `needs-remediation`
 
-### Step 3 — Write VALIDATION File
+### Step 3 — Persist Validation
 
-Write to `{{validationPath}}`:
+Prepare the validation content you will pass to `gsd_validate_milestone`. Do **not** manually write `{{validationPath}}` — the DB-backed tool is the canonical write path and renders the validation file for you.
 
 ```markdown
 ---
@@ -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
@@ -69,13 +69,15 @@ reviewers: 3
 <if verdict is not pass: specific actions required>
 ```
 
+Call `gsd_validate_milestone` with the camelCase fields `milestoneId`, `verdict`, `remediationRound`, `successCriteriaChecklist`, `sliceDeliveryAudit`, `crossSliceIntegration`, `requirementCoverage`, `verdictRationale`, and `remediationPlan` when needed. If you include verification-class analysis, pass it in `verificationClasses`.
+
 **DB access safety:** Do NOT query `.gsd/gsd.db` directly via `sqlite3` or `node -e require('better-sqlite3')` — the engine owns the WAL connection. Use `gsd_milestone_status` to read milestone and slice state. All data you need is already inlined in the context above or accessible via the `gsd_*` tools. Direct DB access corrupts the WAL and bypasses tool-level validation.
 
 If verdict is `needs-remediation`:
-- Add new slices to `{{roadmapPath}}` with unchecked `[ ]` status
-- These slices will be planned and executed before validation re-runs
+- Use `gsd_reassess_roadmap` to add the remediation slices instead of editing `{{roadmapPath}}` manually
+- Those slices will be planned and executed before validation re-runs
 
-**You MUST write `{{validationPath}}` before finishing.**
+**You MUST call `gsd_validate_milestone` before finishing. Do not manually write `{{validationPath}}`.**
 
 **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/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',

package/dist/resources/extensions/gsd/visualizer-overlay.js

@@ -19,6 +19,21 @@ const TAB_LABELS = [
     "9 Captures",
     "0 Export",
 ];
+function buildTabBarEntries(activeTab, filterText, capturesPendingCount) {
+    return TAB_LABELS.map((label, i) => {
+        let displayLabel = label;
+        if (i === activeTab && filterText) {
+            displayLabel += " \u2731";
+        }
+        if (i === 8 && capturesPendingCount) {
+            displayLabel += ` (${capturesPendingCount})`;
+        }
+        return {
+            label: displayLabel,
+            width: visibleWidth(displayLabel) + 2,
+        };
+    });
+}
 export class GSDVisualizerOverlay {
     tui;
     theme;
@@ -89,15 +104,13 @@ export class GSDVisualizerOverlay {
         };
     }
     handleInput(data) {
+        if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c"))) {
+            this.dispose();
+            this.onClose();
+            return;
+        }
         // Filter mode input routing
         if (this.filterMode) {
-            if (matchesKey(data, Key.escape)) {
-                this.filterMode = false;
-                this.filterText = "";
-                this.invalidate();
-                this.tui.requestRender();
-                return;
-            }
             if (matchesKey(data, Key.enter)) {
                 this.filterMode = false;
                 this.invalidate();
@@ -150,8 +163,9 @@ export class GSDVisualizerOverlay {
                 // Left click — check if on tab bar row
                 if (mouse.y === 2) {
                     let xPos = 3;
-                    for (let i = 0; i < TAB_LABELS.length; i++) {
-                        const tabWidth = TAB_LABELS[i].length + 2;
+                    const tabs = buildTabBarEntries(this.activeTab, this.filterText, this.data?.captures?.pendingCount);
+                    for (let i = 0; i < tabs.length; i++) {
+                        const tabWidth = tabs[i].width;
                         if (mouse.x >= xPos && mouse.x < xPos + tabWidth) {
                             this.activeTab = i;
                             this.invalidate();
@@ -164,11 +178,6 @@ export class GSDVisualizerOverlay {
             }
             return;
         }
-        if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c"))) {
-            this.dispose();
-            this.onClose();
-            return;
-        }
         if (matchesKey(data, Key.shift("tab"))) {
             this.activeTab = (this.activeTab - 1 + TAB_COUNT) % TAB_COUNT;
             this.invalidate();
@@ -391,20 +400,12 @@ export class GSDVisualizerOverlay {
         const innerWidth = width - 4;
         const content = [];
         // Tab bar
-        const tabs = TAB_LABELS.map((label, i) => {
-            let displayLabel = label;
-            // Show filter indicator on active tab with filter
-            if (i === this.activeTab && this.filterText) {
-                displayLabel += " \u2731";
-            }
-            // Show captures badge
-            if (i === 8 && this.data?.captures?.pendingCount) {
-                displayLabel += ` (${this.data.captures.pendingCount})`;
-            }
+        const tabEntries = buildTabBarEntries(this.activeTab, this.filterText, this.data?.captures?.pendingCount);
+        const tabs = tabEntries.map((entry, i) => {
             if (i === this.activeTab) {
-                return th.fg("accent", `[${displayLabel}]`);
+                return th.fg("accent", `[${entry.label}]`);
             }
-            return th.fg("dim", `[${displayLabel}]`);
+            return th.fg("dim", `[${entry.label}]`);
         });
         content.push(" " + tabs.join(" "));
         content.push("");

package/dist/resources/extensions/gsd/workflow-reconcile.js

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { mkdirSync, existsSync, readFileSync, unlinkSync } from "node:fs";
 import { logWarning, logError } from "./workflow-logger.js";
-import { readEvents, findForkPoint, appendEvent, getSessionId } from "./workflow-events.js";
+import { readEvents, findForkPoint, getSessionId } from "./workflow-events.js";
 import { transaction, updateTaskStatus, updateSliceStatus, updateMilestoneStatus, getSliceTasks, insertMilestone, _getAdapter, getMilestoneSlices, insertVerificationEvidence, upsertDecision, openDatabase, setTaskBlockerDiscovered, } from "./gsd-db.js";
 import { isClosedStatus } from "./status-guards.js";
 import { invalidateStateCache } from "./state.js";
@@ -275,6 +275,31 @@ export function detectConflicts(mainDiverged, wtDiverged) {
     }
     return conflicts;
 }
+function rewriteDivergedEventsForEntity(divergedEvents, entityType, entityId, replacementEvents) {
+    const rewritten = [];
+    let inserted = false;
+    for (const event of divergedEvents) {
+        const key = extractEntityKey(event);
+        if (key?.type === entityType && key.id === entityId) {
+            if (!inserted) {
+                rewritten.push(...replacementEvents);
+                inserted = true;
+            }
+            continue;
+        }
+        rewritten.push(event);
+    }
+    if (!inserted) {
+        rewritten.push(...replacementEvents);
+    }
+    return rewritten;
+}
+function writeEventLog(basePath, events) {
+    const dir = join(basePath, ".gsd");
+    mkdirSync(dir, { recursive: true });
+    const content = events.map((e) => JSON.stringify(e)).join("\n") + (events.length > 0 ? "\n" : "");
+    atomicWriteSync(join(dir, "event-log.jsonl"), content);
+}
 // ─── writeConflictsFile ───────────────────────────────────────────────────────
 /**
  * Write a human-readable CONFLICTS.md to basePath/.gsd/CONFLICTS.md.
@@ -483,8 +508,8 @@ function parseEventBlock(block) {
 }
 /**
  * Resolve a single conflict by picking one side's events.
- * Replays the picked events through the DB helpers, appends them to the event log,
- * and updates or removes CONFLICTS.md.
+ * Replays the picked events through the DB helpers, rewrites the chosen side's
+ * event log so the conflict is durable, and updates or removes CONFLICTS.md.
  *
  * When the last conflict is resolved, non-conflicting events from both sides
  * are also replayed (they were blocked by the all-or-nothing D-04 rule).
@@ -500,13 +525,27 @@ pick) {
         throw new Error(`No conflict found for entity ${entityKey}`);
     const conflict = conflicts[idx];
     const eventsToReplay = pick === "main" ? conflict.mainSideEvents : conflict.worktreeSideEvents;
+    const mainLogPath = join(basePath, ".gsd", "event-log.jsonl");
+    const wtLogPath = join(worktreeBasePath, ".gsd", "event-log.jsonl");
+    const mainEvents = readEvents(mainLogPath);
+    const wtEvents = readEvents(wtLogPath);
+    const forkPoint = findForkPoint(mainEvents, wtEvents);
+    const mainBaseEvents = mainEvents.slice(0, forkPoint + 1);
+    const wtBaseEvents = wtEvents.slice(0, forkPoint + 1);
+    const mainDiverged = mainEvents.slice(forkPoint + 1);
+    const wtDiverged = wtEvents.slice(forkPoint + 1);
+    const rewrittenTargetEvents = pick === "main"
+        ? rewriteDivergedEventsForEntity(wtDiverged, entityType, entityId, eventsToReplay)
+        : rewriteDivergedEventsForEntity(mainDiverged, entityType, entityId, eventsToReplay);
+    const targetBasePath = pick === "main" ? worktreeBasePath : basePath;
+    const targetBaseEvents = pick === "main" ? wtBaseEvents : mainBaseEvents;
+    writeEventLog(targetBasePath, targetBaseEvents.concat(rewrittenTargetEvents));
     // Replay resolved events through the DB (updates DB state)
     openDatabase(join(basePath, ".gsd", "gsd.db"));
     replayEvents(eventsToReplay);
-    // Append resolved events to the event log
-    for (const event of eventsToReplay) {
-        appendEvent(basePath, { cmd: event.cmd, params: event.params, ts: event.ts, actor: event.actor });
-    }
+    invalidateStateCache();
+    clearPathCache();
+    clearParseCache();
     // Remove resolved conflict from list
     conflicts.splice(idx, 1);
     if (conflicts.length === 0) {

package/dist/resources/extensions/remote-questions/manager.js

@@ -8,6 +8,14 @@ import { SlackAdapter } from "./slack-adapter.js";
 import { TelegramAdapter } from "./telegram-adapter.js";
 import { createPromptRecord, writePromptRecord, markPromptAnswered, markPromptDispatched, markPromptStatus, updatePromptRecord } from "./store.js";
 import { sanitizeError } from "../shared/sanitize.js";
+/**
+ * Check whether a remote channel is configured without triggering any
+ * side effects (no HTTP requests, no prompt records). Used by the race
+ * logic to decide routing before committing to a remote dispatch.
+ */
+export function isRemoteConfigured() {
+    return resolveRemoteConfig() !== null;
+}
 export async function tryRemoteQuestions(questions, signal) {
     const config = resolveRemoteConfig();
     if (!config)

package/dist/resources/extensions/shared/interview-ui.js

@@ -119,6 +119,16 @@ export async function showInterviewRound(questions, opts, ctx) {
         let showingExitConfirm = false;
         let exitCursor = 0; // 0 = keep going (default), 1 = end interview
         let cachedLines;
+        // External cancellation (e.g. remote channel won the race)
+        if (opts.signal) {
+            const onAbort = () => done({ endInterview: false, answers: {} });
+            if (opts.signal.aborted) {
+                onAbort();
+            }
+            else {
+                opts.signal.addEventListener("abort", onAbort, { once: true });
+            }
+        }
         // Editor is created once; editorTheme comes from the design system
         const editorRef = { current: null };
         function getEditor() {

package/dist/web/standalone/.next/BUILD_ID

@@ -1 +1 @@
-HAq0VE4k68rhRvJbQL1VW
+CrKrzIIxk55witDF1eS0L

package/dist/web/standalone/.next/app-path-routes-manifest.json

@@ -1,47 +1,47 @@
 {
   "/_not-found/page": "/_not-found",
   "/_global-error/page": "/_global-error",
+  "/api/boot/route": "/api/boot",
   "/api/bridge-terminal/input/route": "/api/bridge-terminal/input",
-  "/api/bridge-terminal/stream/route": "/api/bridge-terminal/stream",
-  "/api/captures/route": "/api/captures",
-  "/api/browse-directories/route": "/api/browse-directories",
+  "/api/bridge-terminal/resize/route": "/api/bridge-terminal/resize",
   "/api/dev-mode/route": "/api/dev-mode",
   "/api/cleanup/route": "/api/cleanup",
   "/api/doctor/route": "/api/doctor",
+  "/api/browse-directories/route": "/api/browse-directories",
   "/api/export-data/route": "/api/export-data",
   "/api/forensics/route": "/api/forensics",
-  "/api/experimental/route": "/api/experimental",
+  "/api/captures/route": "/api/captures",
   "/api/git/route": "/api/git",
   "/api/history/route": "/api/history",
   "/api/hooks/route": "/api/hooks",
-  "/api/knowledge/route": "/api/knowledge",
   "/api/inspect/route": "/api/inspect",
+  "/api/knowledge/route": "/api/knowledge",
   "/api/live-state/route": "/api/live-state",
+  "/api/experimental/route": "/api/experimental",
+  "/api/bridge-terminal/stream/route": "/api/bridge-terminal/stream",
   "/api/notifications/route": "/api/notifications",
-  "/api/preferences/route": "/api/preferences",
-  "/api/files/route": "/api/files",
-  "/api/onboarding/route": "/api/onboarding",
   "/api/recovery/route": "/api/recovery",
-  "/api/projects/route": "/api/projects",
+  "/api/preferences/route": "/api/preferences",
   "/api/session/browser/route": "/api/session/browser",
+  "/api/projects/route": "/api/projects",
   "/api/session/command/route": "/api/session/command",
+  "/api/onboarding/route": "/api/onboarding",
   "/api/session/events/route": "/api/session/events",
   "/api/session/manage/route": "/api/session/manage",
-  "/api/settings-data/route": "/api/settings-data",
-  "/api/skill-health/route": "/api/skill-health",
   "/api/shutdown/route": "/api/shutdown",
+  "/api/settings-data/route": "/api/settings-data",
+  "/api/terminal/input/route": "/api/terminal/input",
   "/api/steer/route": "/api/steer",
-  "/api/remote-questions/route": "/api/remote-questions",
   "/api/switch-root/route": "/api/switch-root",
-  "/api/terminal/input/route": "/api/terminal/input",
   "/api/terminal/resize/route": "/api/terminal/resize",
-  "/api/boot/route": "/api/boot",
+  "/api/skill-health/route": "/api/skill-health",
   "/api/terminal/sessions/route": "/api/terminal/sessions",
-  "/api/visualizer/route": "/api/visualizer",
   "/api/terminal/upload/route": "/api/terminal/upload",
-  "/api/bridge-terminal/resize/route": "/api/bridge-terminal/resize",
-  "/api/update/route": "/api/update",
   "/api/terminal/stream/route": "/api/terminal/stream",
+  "/api/visualizer/route": "/api/visualizer",
+  "/api/update/route": "/api/update",
   "/api/undo/route": "/api/undo",
+  "/api/remote-questions/route": "/api/remote-questions",
+  "/api/files/route": "/api/files",
   "/page": "/"
 }

package/dist/web/standalone/.next/build-manifest.json

@@ -4,11 +4,11 @@
   ],
   "devFiles": [],
   "lowPriorityFiles": [
-    "static/HAq0VE4k68rhRvJbQL1VW/_buildManifest.js",
-    "static/HAq0VE4k68rhRvJbQL1VW/_ssgManifest.js"
+    "static/CrKrzIIxk55witDF1eS0L/_buildManifest.js",
+    "static/CrKrzIIxk55witDF1eS0L/_ssgManifest.js"
   ],
   "rootMainFiles": [
-    "static/chunks/webpack-9fed74684e1c5bb1.js",
+    "static/chunks/webpack-65f0501b197d1c49.js",
     "static/chunks/4bd1b696-e5d7c65570c947b7.js",
     "static/chunks/3794-337d1ca25ad99a89.js",
     "static/chunks/main-app-fdab67f7802d7832.js"

package/dist/web/standalone/.next/prerender-manifest.json

@@ -78,8 +78,8 @@
   "dynamicRoutes": {},
   "notFoundRoutes": [],
   "preview": {
-    "previewModeId": "ce48015740464b9e2e1987391f47c7f4",
-    "previewModeSigningKey": "31b62dba2887e28d8c5efe8e8e2e9f763c29b02dae4a089bdb78310f21a86190",
-    "previewModeEncryptionKey": "d04a49997cd1feb2deef0d42d88ad445791d55ef9234a7c51ce9d770c7317d3e"
+    "previewModeId": "a1f1a3b82739c8573081cf79eb9b55b9",
+    "previewModeSigningKey": "45cb31c58e849530252dabd187be0cc92f253cb3e7ca4c9a39222d41e8d6efb1",
+    "previewModeEncryptionKey": "c6731bbad9a37e7296023fa699e941d252ac6a8b4cce4f4e1f313f5cd517740e"
   }
 }