gsd-pi 2.81.0 → 2.82.0-dev.c22380fc3

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

@@ -1,11 +1,25 @@
-// GSD Extension — Notification History Overlay
-// Scrollable panel showing all persisted notifications with severity filtering.
-// Toggled with Ctrl+Alt+N (⌃⌥N on macOS), Ctrl+Shift+N fallback, or /gsd notifications.
-import { truncateToWidth, visibleWidth, wrapTextWithAnsi, matchesKey, Key } from "@gsd/pi-tui";
+// Project/App: GSD-2
+// File Purpose: Notification history overlay with severity filtering and width-safe TUI rendering.
+import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
 import { readNotifications, markAllRead, clearNotifications, onNotificationStoreChange, } from "./notification-store.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
-import { padRight, joinColumns } from "../shared/mod.js";
-const FILTER_CYCLE = ["all", "error", "warning", "info"];
+import { padRightVisible, renderFrame, renderKeyHints, rightAlign, wrapVisibleText, } from "./tui/render-kit.js";
+const FILTER_CYCLE = ["all", "error", "warning", "success", "info"];
+const OVERLAY_WIDTH = "58%";
+const OVERLAY_MIN_WIDTH = 68;
+const OVERLAY_MAX_HEIGHT_PERCENT = 52;
+const OVERLAY_MARGIN = { top: 2, right: 2, bottom: 6, left: 2 };
+export function notificationOverlayOptions() {
+    return {
+        width: OVERLAY_WIDTH,
+        minWidth: OVERLAY_MIN_WIDTH,
+        maxHeight: `${OVERLAY_MAX_HEIGHT_PERCENT}%`,
+        anchor: "top-center",
+        row: "24%",
+        margin: OVERLAY_MARGIN,
+        backdrop: true,
+    };
+}
 function severityIcon(severity) {
     switch (severity) {
         case "error": return "✗";
@@ -15,15 +29,6 @@ function severityIcon(severity) {
         default: return "●";
     }
 }
-/** Column-aware word wrap using pi-tui's native wrapper (handles unicode/ANSI). */
-function wrapText(text, maxWidth) {
-    if (maxWidth <= 0)
-        return [text];
-    const lines = wrapTextWithAnsi(text, maxWidth);
-    // Safety clamp: if any line still exceeds maxWidth (e.g. unbreakable long token),
-    // truncate it with an ellipsis so it cannot bleed past the box border.
-    return lines.map((l) => visibleWidth(l) > maxWidth ? truncateToWidth(l, maxWidth, "…") : l);
-}
 function formatTimestamp(ts) {
     try {
         const d = new Date(ts);
@@ -155,12 +160,15 @@ export class GSDNotificationOverlay {
             return this.cachedLines;
         }
         const content = this.buildContentLines(width);
-        const maxVisibleRows = Math.max(5, process.stdout.rows ? process.stdout.rows - 8 : 24) - 2;
+        const terminalRows = process.stdout.rows || 32;
+        const availableRows = Math.max(1, terminalRows - OVERLAY_MARGIN.top - OVERLAY_MARGIN.bottom);
+        const overlayRows = Math.min(availableRows, Math.max(1, Math.floor((terminalRows * OVERLAY_MAX_HEIGHT_PERCENT) / 100)));
+        const maxVisibleRows = Math.max(5, overlayRows - 2);
         const visibleContentRows = Math.min(content.length, maxVisibleRows);
         const maxScroll = Math.max(0, content.length - visibleContentRows);
         this.scrollOffset = Math.min(this.scrollOffset, maxScroll);
         const visibleContent = content.slice(this.scrollOffset, this.scrollOffset + visibleContentRows);
-        const lines = this.wrapInBox(visibleContent, width);
+        const lines = renderFrame(this.theme, visibleContent, width);
         this.cachedWidth = width;
         this.cachedLines = lines;
         return lines;
@@ -192,30 +200,14 @@ export class GSDNotificationOverlay {
             this.tui.requestRender();
         }
     }
-    wrapInBox(inner, width) {
-        const th = this.theme;
-        const border = (s) => th.fg("borderAccent", s);
-        const innerWidth = width - 4;
-        const lines = [];
-        lines.push(border("╭" + "─".repeat(width - 2) + "╮"));
-        for (const line of inner) {
-            const truncated = truncateToWidth(line, innerWidth);
-            const padWidth = Math.max(0, innerWidth - visibleWidth(truncated));
-            lines.push(border("│") + " " + truncated + " ".repeat(padWidth) + " " + border("│"));
-        }
-        lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
-        return lines;
-    }
     buildContentLines(width) {
         const th = this.theme;
-        const shellWidth = width - 4;
-        const contentWidth = Math.min(shellWidth, 128);
-        const sidePad = Math.max(0, Math.floor((shellWidth - contentWidth) / 2));
-        const leftMargin = " ".repeat(sidePad);
+        const shellWidth = Math.max(1, width - 4);
+        const contentWidth = shellWidth;
         const lines = [];
         const row = (content = "") => {
             const truncated = truncateToWidth(content, contentWidth);
-            return leftMargin + padRight(truncated, contentWidth);
+            return padRightVisible(truncated, contentWidth);
         };
         const blank = () => row("");
         const hr = () => row(th.fg("dim", "─".repeat(contentWidth)));
@@ -223,13 +215,16 @@ export class GSDNotificationOverlay {
         const title = th.fg("accent", th.bold("Notifications"));
         const filterLabel = this.filter === "all"
             ? th.fg("dim", "all")
-            : th.fg(this.filter === "error" ? "error" : this.filter === "warning" ? "warning" : "dim", this.filter);
+            : th.fg(this.filter === "error" ? "error"
+                : this.filter === "warning" ? "warning"
+                    : this.filter === "success" ? "success"
+                        : "dim", this.filter);
         const count = `${this.filteredEntries.length} entries`;
-        lines.push(row(joinColumns(`${title}  ${th.fg("dim", "filter:")} ${filterLabel}`, th.fg("dim", count), contentWidth)));
+        lines.push(row(rightAlign(`${title}  ${th.fg("dim", "filter:")} ${filterLabel}`, th.fg("dim", count), contentWidth)));
         lines.push(hr());
         // Controls
         const closeShortcut = formattedShortcutPair("notifications");
-        lines.push(row(th.fg("dim", `↑/↓ scroll  f filter  c clear  Esc close  (${closeShortcut})`)));
+        lines.push(row(renderKeyHints(th, ["↑/↓ scroll", "f filter", "c clear", `Esc/${closeShortcut} close`], contentWidth)));
         lines.push(blank());
         // Entries
         const filtered = this.filteredEntries;
@@ -254,7 +249,7 @@ export class GSDNotificationOverlay {
             const prefixWidth = visibleWidth(prefix);
             const msgMaxWidth = Math.max(10, contentWidth - prefixWidth);
             // Wrap long messages onto continuation lines indented to align with message start
-            const msgLines = wrapText(entry.message, msgMaxWidth);
+            const msgLines = wrapVisibleText(entry.message, msgMaxWidth);
             const indent = " ".repeat(prefixWidth);
             for (let i = 0; i < msgLines.length; i++) {
                 if (i === 0) {

package/dist/resources/extensions/gsd/parallel-merge.js

@@ -7,9 +7,10 @@
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { spawnSync } from "node:child_process";
-import { loadFile } from "./files.js";
-import { resolveGsdPathContract, resolveMilestoneFile } from "./paths.js";
-import { mergeMilestoneToMain } from "./auto-worktree.js";
+import { resolveGsdPathContract } from "./paths.js";
+import { getAutoWorktreePath } from "./auto-worktree.js";
+import { buildWorktreeLifecycleDeps } from "./auto.js";
+import { mergeMilestoneStandalone, } from "./worktree-lifecycle.js";
 import { MergeConflictError } from "./git-service.js";
 import { removeSessionStatus } from "./session-status-io.js";
 import { getErrorMessage } from "./error-utils.js";
@@ -105,37 +106,42 @@ export function determineMergeOrder(workers, order = "sequential", basePath) {
 }
 /**
  * Attempt to merge a single milestone's worktree back to main.
- * Wraps mergeMilestoneToMain with error handling for parallel context.
+ *
+ * Routes through `WorktreeLifecycle.mergeMilestoneStandalone` so parallel
+ * callers get the same projection-finalize / roadmap-fallback / secondary-
+ * teardown invariants as the single-loop path. Closes the parallel-merge
+ * bypass that ADR-016 names (issue #5618).
  */
 export async function mergeCompletedMilestone(basePath, milestoneId) {
+    // Resolve the worktree path explicitly; parallel-merge has no AutoSession
+    // to read it from. Only use the worktree path when git actually knows
+    // about it (`getAutoWorktreePath` returns non-null). When the directory
+    // exists on disk but isn't a registered git worktree (e.g. a stale
+    // session-status marker dir), fall back to the project root and let the
+    // standalone's mode detection pick branch-mode or skipped — using the
+    // un-registered dir as `worktreeBasePath` would cause `getCurrentBranch`
+    // to fail with a "Worktree HEAD diverged" error.
+    const registeredWtPath = getAutoWorktreePath(basePath, milestoneId);
+    const worktreeBasePath = registeredWtPath ?? basePath;
+    let result;
     try {
-        // Load the roadmap content (needed by mergeMilestoneToMain)
-        const roadmapPath = resolveMilestoneFile(basePath, milestoneId, "ROADMAP");
-        if (!roadmapPath) {
-            return {
-                milestoneId,
-                success: false,
-                error: `No roadmap found for ${milestoneId}`,
-            };
-        }
-        const roadmapContent = await loadFile(roadmapPath);
-        if (!roadmapContent) {
-            return {
-                milestoneId,
-                success: false,
-                error: `Could not read roadmap for ${milestoneId}`,
-            };
-        }
-        // Attempt the merge
-        const result = mergeMilestoneToMain(basePath, milestoneId, roadmapContent);
-        // Clean up parallel session status
-        removeSessionStatus(basePath, milestoneId);
-        return {
+        result = mergeMilestoneStandalone(buildWorktreeLifecycleDeps(), {
+            originalBasePath: basePath,
+            worktreeBasePath,
             milestoneId,
-            success: true,
-            commitMessage: result.commitMessage,
-            pushed: result.pushed,
-        };
+            // Parallel context never runs with degraded isolation — workers only
+            // exist when isolation succeeded. Pass `false` explicitly so the
+            // standalone's degraded-skip branch is not reached.
+            isolationDegraded: false,
+            notify: (msg, level) => {
+                // Surface user-visible messages from the standalone through the
+                // workflow logger so the parallel merge's progress is visible in
+                // the same channel as the rest of the parallel orchestration.
+                if (level === "error" || level === "warning") {
+                    logWarning("parallel", `${milestoneId}: ${msg}`);
+                }
+            },
+        });
     }
     catch (err) {
         if (err instanceof MergeConflictError) {
@@ -152,6 +158,23 @@ export async function mergeCompletedMilestone(basePath, milestoneId) {
             error: getErrorMessage(err),
         };
     }
+    if (!result.merged) {
+        return {
+            milestoneId,
+            success: false,
+            error: result.mode === "skipped"
+                ? `Merge skipped for ${milestoneId} (mode=none or isolation degraded).`
+                : `No roadmap for ${milestoneId} — milestone branch preserved for manual merge.`,
+        };
+    }
+    // Clean up parallel session status — only on a real merge.
+    removeSessionStatus(basePath, milestoneId);
+    return {
+        milestoneId,
+        success: true,
+        commitMessage: result.commitMessage,
+        pushed: result.pushed,
+    };
 }
 /**
  * Merge all completed milestones in sequence.

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

@@ -1,12 +1,5 @@
-/**
- * GSD Parallel Monitor Overlay
- *
- * Full-screen TUI overlay showing real-time parallel worker progress.
- * Opened via `/gsd parallel watch`, Ctrl+Alt+P (⌃⌥P on macOS),
- * or Ctrl+Shift+P fallback.
- * Reads the same data sources as `scripts/parallel-monitor.mjs` but
- * renders as a native pi-tui overlay with theme integration.
- */
+// Project/App: GSD-2
+// File Purpose: Parallel worker monitor overlay with width-safe operations-console rendering.
 import { existsSync, statSync, readFileSync, openSync, readSync, closeSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { spawnSync } from "node:child_process";
@@ -14,6 +7,7 @@ import { matchesKey, Key } from "@gsd/pi-tui";
 import { formatDuration } from "../shared/mod.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
 import { resolveGsdPathContract } from "./paths.js";
+import { renderBar, renderKeyHints, renderProgressBar, safeLine, statusGlyph, } from "./tui/render-kit.js";
 // ─── Data Helpers ─────────────────────────────────────────────────────────
 function readJsonSafe(filePath) {
     try {
@@ -226,17 +220,6 @@ function unitTypeLabel(unitType) {
     };
     return labels[unitType || ""] || (unitType || "---").toUpperCase().slice(0, 5);
 }
-function progressBar(done, total, width) {
-    if (total === 0)
-        return "░".repeat(width);
-    const filled = Math.round((done / total) * width);
-    return "█".repeat(filled) + "░".repeat(width - filled);
-}
-function healthGlyph(alive, heartbeatAge) {
-    if (!alive)
-        return "○";
-    return "●";
-}
 // ─── Overlay Class ────────────────────────────────────────────────────────
 export class ParallelMonitorOverlay {
     tui;
@@ -247,6 +230,7 @@ export class ParallelMonitorOverlay {
     workers = [];
     events = [];
     cachedLines;
+    cachedWidth;
     scrollOffset = 0;
     disposed = false;
     resizeHandler = null;
@@ -279,6 +263,7 @@ export class ParallelMonitorOverlay {
         }
         this.events = this.events.slice(-10);
         this.cachedLines = undefined;
+        this.cachedWidth = undefined;
         this.tui.requestRender();
     }
     dispose() {
@@ -313,13 +298,14 @@ export class ParallelMonitorOverlay {
     }
     invalidate() {
         this.cachedLines = undefined;
+        this.cachedWidth = undefined;
     }
     render(width) {
-        if (this.cachedLines)
+        if (this.cachedLines && this.cachedWidth === width)
             return this.cachedLines;
         const t = this.theme;
         const lines = [];
-        const w = Math.max(width, 60);
+        const w = Math.max(1, width);
         // Header
         const totalCost = this.workers.reduce((s, wk) => s + wk.cost, 0);
         const aliveCount = this.workers.filter((wk) => wk.alive).length;
@@ -328,7 +314,7 @@ export class ParallelMonitorOverlay {
         lines.push(t.fg("muted", `  ${now}  │  ${aliveCount}/${this.workers.length} alive  │  Total: `) +
             t.bold(`$${totalCost.toFixed(2)}`) +
             t.fg("muted", "  │  5s refresh"));
-        lines.push(t.fg("muted", "─".repeat(w)));
+        lines.push(renderBar(t, w));
         if (this.workers.length === 0) {
             lines.push("");
             lines.push(t.fg("warning", "  No parallel workers found."));
@@ -339,7 +325,7 @@ export class ParallelMonitorOverlay {
                 lines.push("");
                 // Health + ID + state
                 const healthColor = wk.alive ? "success" : "error";
-                const glyph = healthGlyph(wk.alive, wk.heartbeatAge);
+                const glyph = statusGlyph(t, wk.alive ? "active" : "idle");
                 const stateText = wk.alive
                     ? t.fg("success", "RUNNING")
                     : t.fg("error", t.bold("DEAD"));
@@ -374,21 +360,25 @@ export class ParallelMonitorOverlay {
                     });
                     lines.push(`     ${t.fg("muted", "slices")}  ${chips.join("  ")}`);
                     // Task progress bar
-                    const bar = progressBar(wk.doneTasks, wk.totalTasks, 25);
+                    const barWidth = Math.max(6, Math.min(25, w - 32));
+                    const bar = renderProgressBar(t, wk.doneTasks, wk.totalTasks, barWidth, {
+                        filledChar: "█",
+                        emptyChar: "░",
+                        emptyColor: "dim",
+                    });
                     const pct = wk.totalTasks > 0 ? Math.round((wk.doneTasks / wk.totalTasks) * 100) : 0;
-                    lines.push(`     ${t.fg("muted", "tasks")}   ${t.fg("success", bar)}  ${wk.doneTasks}/${wk.totalTasks} ` +
+                    lines.push(`     ${t.fg("muted", "tasks")}   ${bar}  ${wk.doneTasks}/${wk.totalTasks} ` +
                         t.fg("muted", `(${pct}%)  │  slices done ${wk.doneSlices}/${wk.totalSlices}`));
                 }
                 // Errors
                 for (const err of wk.errors.slice(-2)) {
-                    const truncated = err.length > w - 10 ? err.slice(0, w - 11) + "…" : err;
-                    lines.push(`     ${t.fg("error", "⚠ " + truncated)}`);
+                    lines.push(`     ${t.fg("error", "! " + err)}`);
                 }
             }
         }
         // Event feed
         lines.push("");
-        lines.push(t.fg("muted", "─".repeat(w)));
+        lines.push(renderBar(t, w));
         lines.push(`  ${t.bold("Recent Events")}`);
         if (this.events.length === 0) {
             lines.push(t.fg("muted", "  No events yet..."));
@@ -396,8 +386,7 @@ export class ParallelMonitorOverlay {
         else {
             for (const evt of this.events.slice(-8)) {
                 const mid = evt.match(/^✓ (M\d+)\//)?.[1] || "";
-                const truncated = evt.length > w - 10 ? evt.slice(0, w - 11) + "…" : evt;
-                lines.push(`  ${t.fg("muted", "│")} ${t.fg("accent", mid)} ${truncated.replace(/^✓ M\d+\//, "")}`);
+                lines.push(`  ${t.fg("muted", "│")} ${t.fg("accent", mid)} ${evt.replace(/^✓ M\d+\//, "")}`);
             }
         }
         // Footer
@@ -411,13 +400,16 @@ export class ParallelMonitorOverlay {
             }
             lines.push(`  ${t.bold("Total: $" + this.workers.reduce((s, wk) => s + wk.cost, 0).toFixed(2))}`);
         }
-        lines.push(t.fg("muted", `  ESC/q/${formattedShortcutPair("parallel")} close  │  ↑↓ scroll`));
+        lines.push(renderKeyHints(t, [`ESC/q/${formattedShortcutPair("parallel")} close`, "↑↓ scroll"], w));
         // 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);
+        const visible = lines
+            .slice(this.scrollOffset, this.scrollOffset + termHeight)
+            .map((line) => safeLine(line, w));
         this.cachedLines = visible;
+        this.cachedWidth = width;
         return visible;
     }
 }

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

@@ -22,22 +22,24 @@ Use `subagent` only for fresh-context review when useful: reviewer for cross-cut
 
 1. Use the inlined Slice Summary and UAT templates.
 2. {{skillActivation}}
-3. Run all slice-level verification checks from the slice plan. Fix failures before marking done; refresh current state if needed.
-4. Task summaries use a flat file layout under `tasks/` such as `T01-SUMMARY.md`, not inside per-task subdirectories like `tasks/T01/SUMMARY.md`. Never use `tasks/*/SUMMARY.md`.
-5. If observability/diagnostics were planned, verify them unless the slice is simple.
-6. Address every gate in Gates to Close. Q8 maps to **Operational Readiness**: health signal, failure signal, recovery procedure, monitoring gaps. Empty sections are recorded as omitted.
-7. If requirement status changed, call `gsd_requirement_update`; do not write `.gsd/REQUIREMENTS.md` directly.
-8. Prepare `gsd_slice_complete` content with camelCase fields `milestoneId`, `sliceId`, `sliceTitle`, `oneLiner`, `narrative`, `verification`, and `uatContent`.
-9. Draft concrete UAT with preconditions, numbered steps, expected outcomes, edge cases, UAT Type, and Not Proven By This UAT.
-10. Review the inlined task-summary excerpts for DECISIONS.md and KNOWLEDGE.md-worthy decisions, patterns, and gotchas. Read full `*-SUMMARY.md` files only when an excerpt is absent, truncated, or lacks the specific evidence needed for the slice narrative. Capture significant items with `capture_thought`; do not append knowledge files directly.
-11. Call `gsd_slice_complete`. The DB-backed tool is the canonical write path. Do **not** manually write `{{sliceSummaryPath}}`. Do **not** manually write `{{sliceUatPath}}`. Do not edit roadmap checkboxes; the tool renders files and updates projections.
-12. Do not run git commands.
-13. Update `.gsd/PROJECT.md` with a full `write` only if the current project state needs refresh.
+3. Run all slice-level verification checks from the slice plan through the closeout-safe verification surface (`gsd_exec` / Context Mode verification evidence); refresh current state if needed. Do not use direct `bash` for verification commands.
+4. Complete the slice only when every required verification check passes. If verification fails or the fix requires source changes, do **not** edit source files in this unit and do **not** call `gsd_slice_complete`.
+5. For task-specific failures, call `gsd_task_reopen` with the failing completed task and a concrete reason so execution can redo the work. For plan-invalidating failures, call `gsd_replan_slice` with the blocker and updated execution tasks. Then stop with: "Slice {{sliceId}} needs execution follow-up."
+6. Task summaries use a flat file layout under `tasks/` such as `T01-SUMMARY.md`, not inside per-task subdirectories like `tasks/T01/SUMMARY.md`. Never use `tasks/*/SUMMARY.md`.
+7. If observability/diagnostics were planned, verify them unless the slice is simple.
+8. Address every gate in Gates to Close. Q8 maps to **Operational Readiness**: health signal, failure signal, recovery procedure, monitoring gaps. Empty sections are recorded as omitted.
+9. If requirement status changed, call `gsd_requirement_update`; do not write `.gsd/REQUIREMENTS.md` directly.
+10. Prepare `gsd_slice_complete` content with camelCase fields `milestoneId`, `sliceId`, `sliceTitle`, `oneLiner`, `narrative`, `verification`, and `uatContent`.
+11. Draft concrete UAT with preconditions, numbered steps, expected outcomes, edge cases, UAT Type, and Not Proven By This UAT.
+12. Review the inlined task-summary excerpts for DECISIONS.md and KNOWLEDGE.md-worthy decisions, patterns, and gotchas. Read full `*-SUMMARY.md` files only when an excerpt is absent, truncated, or lacks the specific evidence needed for the slice narrative. Capture significant items with `capture_thought`; do not append knowledge files directly.
+13. When verification passes, call `gsd_slice_complete`. The DB-backed tool is the canonical write path. Do **not** manually write `{{sliceSummaryPath}}`. Do **not** manually write `{{sliceUatPath}}`. Do not edit roadmap checkboxes; the tool renders files and updates projections.
+14. Do not run git commands.
+15. Update `.gsd/PROJECT.md` with a full `write` only if the current project state needs refresh.
 
 **Autonomous execution:** no human is available. Do not call `ask_user_questions` or `secure_env_collect`; make reasonable assumptions and document them.
 
 **File system safety:** if re-reading task summaries, use `find .gsd/milestones/{{milestoneId}}/slices/{{sliceId}}/tasks -name "*-SUMMARY.md"` or `ls .gsd/milestones/{{milestoneId}}/slices/{{sliceId}}/tasks/*-SUMMARY.md`. Never pass `{{slicePath}}` or any directory path directly to the `read` tool.
 
-**You MUST call `gsd_slice_complete` with summary and UAT content before finishing.**
+**You MUST call `gsd_slice_complete` with summary and UAT content before finishing only after verification passes.**
 
 When done, say: "Slice {{sliceId}} complete."

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

@@ -129,7 +129,16 @@ If ANY box is unchecked, **STOP**. Do NOT emit the ready phrase. Emit the missin
 
 Do not announce the ready phrase as something you are "about to" do. The ready phrase is a post-write signal, not an intent signal.
 
-After completing steps 1–7 above, say exactly: "Milestone {{milestoneId}} ready." — nothing else. Auto-mode will start automatically.
+After completing steps 1–7 above, end with this concise user-facing handoff:
+
+```
+Milestone {{milestoneId}} ready.
+
+Next steps:
+- Run `/gsd auto` to start execution if it does not begin automatically.
+- Use `/gsd status` or `/gsd visualize` to inspect the roadmap.
+- Use `/gsd notifications` to review or configure delivery alerts.
+```
 
 ### Multi-Milestone
 
@@ -215,7 +224,16 @@ If ANY box is unchecked, **STOP**. Do NOT emit the ready phrase. Emit the missin
 
 Do not announce the ready phrase as something you are "about to" do. The ready phrase is a post-write signal, not an intent signal.
 
-After completing every step above, say exactly: "Milestone {{milestoneId}} ready." — nothing else. Auto-mode will start automatically.
+After completing every step above, end with this concise user-facing handoff:
+
+```
+Milestone {{milestoneId}} ready.
+
+Next steps:
+- Run `/gsd auto` to start execution if it does not begin automatically.
+- Use `/gsd status` or `/gsd visualize` to inspect the roadmap.
+- Use `/gsd notifications` to review or configure delivery alerts.
+```
 
 ## Critical Rules
 

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

@@ -252,7 +252,16 @@ If ANY box is unchecked, **STOP**. Do NOT emit the ready phrase. Emit the missin
 
 Do not announce the ready phrase as something you are "about to" do. It is a post-write signal, not intent.
 
-After completing steps 1–7 above, say exactly: "Milestone {{milestoneId}} ready." — nothing else. Auto-mode will start automatically.
+After completing steps 1–7 above, end with this concise user-facing handoff:
+
+```
+Milestone {{milestoneId}} ready.
+
+Next steps:
+- Run `/gsd auto` to start execution if it does not begin automatically.
+- Use `/gsd status` or `/gsd visualize` to inspect the roadmap.
+- Use `/gsd notifications` to review or configure delivery alerts.
+```
 
 ### Multi-Milestone
 
@@ -345,6 +354,15 @@ If ANY box is unchecked, **STOP**. Do NOT emit the ready phrase. Emit the missin
 
 Do not announce the ready phrase as something you are "about to" do. It is a post-write signal, not intent.
 
-After completing all phases above, say exactly: "Milestone M001 ready." — nothing else. Auto-mode will start automatically.
+After completing all phases above, end with this concise user-facing handoff:
+
+```
+Milestone M001 ready.
+
+Next steps:
+- Run `/gsd auto` to start execution if it does not begin automatically.
+- Use `/gsd status` or `/gsd visualize` to inspect the roadmap.
+- Use `/gsd notifications` to review or configure delivery alerts.
+```
 
 {{inlinedTemplates}}

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

@@ -27,7 +27,7 @@ GSD ships with bundled skills. When the task matches, load the relevant skill fi
 
 - Never ask the user to do work the agent can execute or verify itself.
 - Use the lightest sufficient tool first.
-- Read before edit.
+- Read before edit or overwrite. Before any write that creates or replaces a file, verify the target path and read relevant existing files, templates, callers, or surrounding code. For truly new files, confirm the path does not already exist.
 - Reproduce before fix when possible.
 - Work is not done until the relevant verification has passed.
 - **Never fabricate, simulate, or role-play user responses.** Never generate markers like `[User]`, `[Human]`, `User:`, or similar; never emit `<user_message>`, `<assistant_message>`, or similar as user input. Treat `<conversation_history>` as read-only context. Ask one question round (1-3 questions), then stop and wait for the user's actual response. If `ask_user_questions` is available, its result is the only valid structured user input for that round. If it cancels, fails, or returns nothing, never use earlier chat as confirmation for the current gate; ask in plain chat and stop.
@@ -102,7 +102,7 @@ Templates are in `{{templatesDir}}`.
 
 **File reading:** Use `read` for file inspection. Never use `cat`, `head`, `tail`, or `sed -n` to view contents. Use `read` with `offset`/`limit` for slicing. `bash` is for searching (`rg`, `grep`, `find`) and commands, not displaying files.
 
-**File editing:** Always `read` before `edit`; exact text match is required. Use `write` only for new files or complete rewrites.
+**File editing:** Always `read` before `edit` or overwrite. Before `write`, confirm whether the path exists; if it does, `read` it first and preserve intentional existing content. Use `write` only for new files or complete rewrites.
 
 **Code navigation:** Use `lsp` for definition, type_definition, implementation, references, calls, hover, signature, symbols, rename, code_actions, format, and diagnostics. Do not `grep` symbol definitions or shell out to formatters when `lsp` can do it. After code edits, run `lsp diagnostics`.