gsd-pi 2.44.0-dev.8894d5b → 2.44.0-dev.8dd0d8e

package/dist/resources/extensions/gsd/commands/handlers/core.js

@@ -32,6 +32,7 @@ export function showHelp(ctx) {
         "  /gsd triage         Classify and route pending captures",
         "  /gsd skip <unit>    Prevent a unit from auto-mode dispatch",
         "  /gsd undo           Revert last completed unit  [--force]",
+        "  /gsd rethink        Conversational project reorganization — reorder, park, discard, add milestones",
         "  /gsd park [id]      Park a milestone — skip without deleting  [reason]",
         "  /gsd unpark [id]    Reactivate a parked milestone",
         "",
@@ -49,6 +50,7 @@ export function showHelp(ctx) {
         "  /gsd hooks          Show post-unit hook configuration",
         "  /gsd extensions     Manage extensions  [list|enable|disable|info]",
         "  /gsd fast           Toggle OpenAI service tier  [on|off|flex|status]",
+        "  /gsd mcp            MCP server status and connectivity  [status|check <server>]",
         "",
         "MAINTENANCE",
         "  /gsd doctor         Diagnose and repair .gsd/ state  [audit|fix|heal] [scope]",

package/dist/resources/extensions/gsd/commands/handlers/ops.js

@@ -188,10 +188,20 @@ Examples:
         await handleFast(trimmed.replace(/^fast\s*/, "").trim(), ctx);
         return true;
     }
+    if (trimmed === "mcp" || trimmed.startsWith("mcp ")) {
+        const { handleMcpStatus } = await import("../../commands-mcp-status.js");
+        await handleMcpStatus(trimmed.replace(/^mcp\s*/, "").trim(), ctx);
+        return true;
+    }
     if (trimmed === "extensions" || trimmed.startsWith("extensions ")) {
         const { handleExtensions } = await import("../../commands-extensions.js");
         await handleExtensions(trimmed.replace(/^extensions\s*/, "").trim(), ctx);
         return true;
     }
+    if (trimmed === "rethink") {
+        const { handleRethink } = await import("../../rethink.js");
+        await handleRethink(trimmed, ctx, pi);
+        return true;
+    }
     return false;
 }

package/dist/resources/extensions/gsd/commands-mcp-status.js

@@ -0,0 +1,187 @@
+/**
+ * MCP Status — `/gsd mcp` command handler.
+ *
+ * Shows configured MCP servers, their connection status, and available tools.
+ *
+ * Subcommands:
+ *   /gsd mcp             — Overview of all servers (alias: /gsd mcp status)
+ *   /gsd mcp status      — Same as bare /gsd mcp
+ *   /gsd mcp check <srv> — Detailed status for a specific server
+ */
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+function readMcpConfigs() {
+    const servers = [];
+    const seen = new Set();
+    const configPaths = [
+        join(process.cwd(), ".mcp.json"),
+        join(process.cwd(), ".gsd", "mcp.json"),
+    ];
+    for (const configPath of configPaths) {
+        try {
+            if (!existsSync(configPath))
+                continue;
+            const raw = readFileSync(configPath, "utf-8");
+            const data = JSON.parse(raw);
+            const mcpServers = (data.mcpServers ?? data.servers);
+            if (!mcpServers || typeof mcpServers !== "object")
+                continue;
+            for (const [name, config] of Object.entries(mcpServers)) {
+                if (seen.has(name))
+                    continue;
+                seen.add(name);
+                const hasCommand = typeof config.command === "string";
+                const hasUrl = typeof config.url === "string";
+                const transport = hasCommand
+                    ? "stdio"
+                    : hasUrl
+                        ? "http"
+                        : "unknown";
+                servers.push({
+                    name,
+                    transport,
+                    ...(hasCommand && {
+                        command: config.command,
+                        args: Array.isArray(config.args) ? config.args : undefined,
+                    }),
+                    ...(hasUrl && { url: config.url }),
+                });
+            }
+        }
+        catch {
+            // Non-fatal — config file may not exist or be malformed
+        }
+    }
+    return servers;
+}
+// ─── Formatters (exported for testing) ──────────────────────────────────────
+export function formatMcpStatusReport(servers) {
+    if (servers.length === 0) {
+        return [
+            "No MCP servers configured.",
+            "",
+            "Add servers to .mcp.json or .gsd/mcp.json to enable MCP integrations.",
+            "See: https://modelcontextprotocol.io/quickstart",
+        ].join("\n");
+    }
+    const lines = [`MCP Server Status — ${servers.length} server(s)\n`];
+    for (const s of servers) {
+        const icon = s.error ? "✗" : s.connected ? "✓" : "○";
+        const status = s.error
+            ? `error: ${s.error}`
+            : s.connected
+                ? `connected — ${s.toolCount} tools`
+                : "disconnected";
+        lines.push(`  ${icon} ${s.name} (${s.transport}) — ${status}`);
+    }
+    lines.push("");
+    lines.push("Use /gsd mcp check <server> for details on a specific server.");
+    lines.push("Use mcp_discover to connect and list tools for a server.");
+    return lines.join("\n");
+}
+export function formatMcpServerDetail(server) {
+    const lines = [`MCP Server: ${server.name}\n`];
+    lines.push(`  Transport: ${server.transport}`);
+    if (server.error) {
+        lines.push(`  Status:    error`);
+        lines.push(`  Error:     ${server.error}`);
+    }
+    else if (server.connected) {
+        lines.push(`  Status:    connected`);
+        lines.push(`  Tools:     ${server.toolCount}`);
+        if (server.tools.length > 0) {
+            lines.push("");
+            lines.push("  Available tools:");
+            for (const tool of server.tools) {
+                lines.push(`    - ${tool}`);
+            }
+        }
+    }
+    else {
+        lines.push(`  Status:    disconnected`);
+        lines.push("");
+        lines.push(`  Run mcp_discover("${server.name}") to connect and list tools.`);
+    }
+    return lines.join("\n");
+}
+// ─── Command handler ────────────────────────────────────────────────────────
+/**
+ * Handle `/gsd mcp [status|check <server>]`.
+ */
+export async function handleMcpStatus(args, ctx) {
+    const trimmed = args.trim().toLowerCase();
+    const configs = readMcpConfigs();
+    // /gsd mcp check <server>
+    if (trimmed.startsWith("check ")) {
+        const serverName = args.trim().slice("check ".length).trim();
+        const config = configs.find((c) => c.name === serverName);
+        if (!config) {
+            const available = configs.map((c) => c.name).join(", ") || "(none)";
+            ctx.ui.notify(`Unknown MCP server: "${serverName}"\n\nAvailable: ${available}`, "warning");
+            return;
+        }
+        // Try to get connection/tool info from the mcp-client module if available
+        let connected = false;
+        let toolNames = [];
+        let error;
+        try {
+            const mcpClient = await import("../mcp-client/index.js");
+            // Access the module's connection state if exported; fall back gracefully
+            const mod = mcpClient;
+            if (typeof mod.getConnectionStatus === "function") {
+                const status = mod.getConnectionStatus(serverName);
+                connected = status.connected;
+                toolNames = status.tools;
+                error = status.error;
+            }
+        }
+        catch {
+            // mcp-client may not expose status helpers — that's fine
+        }
+        ctx.ui.notify(formatMcpServerDetail({
+            name: config.name,
+            transport: config.transport,
+            connected,
+            toolCount: toolNames.length,
+            tools: toolNames,
+            error,
+        }), "info");
+        return;
+    }
+    // /gsd mcp or /gsd mcp status
+    if (!trimmed || trimmed === "status") {
+        // Build status for each server
+        const statuses = [];
+        for (const config of configs) {
+            let connected = false;
+            let toolCount = 0;
+            let error;
+            try {
+                const mcpClient = await import("../mcp-client/index.js");
+                const mod = mcpClient;
+                if (typeof mod.getConnectionStatus === "function") {
+                    const status = mod.getConnectionStatus(config.name);
+                    connected = status.connected;
+                    toolCount = status.tools.length;
+                    error = status.error;
+                }
+            }
+            catch {
+                // Fall back to unknown state
+            }
+            statuses.push({
+                name: config.name,
+                transport: config.transport,
+                connected,
+                toolCount,
+                error,
+            });
+        }
+        ctx.ui.notify(formatMcpStatusReport(statuses), "info");
+        return;
+    }
+    // Unknown subcommand
+    ctx.ui.notify("Usage: /gsd mcp [status|check <server>]\n\n" +
+        "  status           Show all MCP server statuses (default)\n" +
+        "  check <server>   Detailed status for a specific server", "warning");
+}

package/dist/resources/extensions/gsd/db-writer.js

@@ -8,7 +8,7 @@
 // Critical invariant: generated markdown must round-trip through
 // parseDecisionsTable() and parseRequirementsSections() with field fidelity.
 import { resolve } from 'node:path';
-import { readFileSync, existsSync } from 'node:fs';
+import { readFileSync, existsSync, statSync } from 'node:fs';
 import { resolveGsdRootFile } from './paths.js';
 import { saveFile } from './files.js';
 import { GSDError, GSD_STALE_STATE, GSD_IO_ERROR } from './errors.js';
@@ -356,28 +356,46 @@ export async function updateRequirementInDb(id, updates, basePath) {
 export async function saveArtifactToDb(opts, basePath) {
     try {
         const db = await import('./gsd-db.js');
+        // Guard against path traversal before any reads/writes
+        const gsdDir = resolve(basePath, '.gsd');
+        const fullPath = resolve(basePath, '.gsd', opts.path);
+        if (!fullPath.startsWith(gsdDir)) {
+            throw new GSDError(GSD_IO_ERROR, `saveArtifactToDb: path escapes .gsd/ directory: ${opts.path}`);
+        }
+        // Shrinkage guard: if the file already exists and the new content is
+        // significantly smaller (<50%), preserve the richer file on disk and
+        // store its content in the DB instead of the abbreviated version.
+        let dbContent = opts.content;
+        let skipDiskWrite = false;
+        if (existsSync(fullPath)) {
+            const existingSize = statSync(fullPath).size;
+            const newSize = Buffer.byteLength(opts.content, 'utf-8');
+            if (existingSize > 0 && newSize < existingSize * 0.5) {
+                process.stderr.write(`gsd-db: saveArtifactToDb — new content (${newSize}B) is <50% of existing file ` +
+                    `(${existingSize}B) at ${opts.path}. Preserving disk file to prevent data loss.\n`);
+                dbContent = readFileSync(fullPath, 'utf-8');
+                skipDiskWrite = true;
+            }
+        }
         db.insertArtifact({
             path: opts.path,
             artifact_type: opts.artifact_type,
             milestone_id: opts.milestone_id ?? null,
             slice_id: opts.slice_id ?? null,
             task_id: opts.task_id ?? null,
-            full_content: opts.content,
+            full_content: dbContent,
         });
-        // Write the file to disk (guard against path traversal)
-        const gsdDir = resolve(basePath, '.gsd');
-        const fullPath = resolve(basePath, '.gsd', opts.path);
-        if (!fullPath.startsWith(gsdDir)) {
-            throw new GSDError(GSD_IO_ERROR, `saveArtifactToDb: path escapes .gsd/ directory: ${opts.path}`);
-        }
-        try {
-            await saveFile(fullPath, opts.content);
-        }
-        catch (diskErr) {
-            process.stderr.write(`gsd-db: saveArtifactToDb — disk write failed, rolling back DB row: ${diskErr.message}\n`);
-            const rollbackAdapter = db._getAdapter();
-            rollbackAdapter?.prepare('DELETE FROM artifacts WHERE path = :path').run({ ':path': opts.path });
-            throw diskErr;
+        // Write the file to disk (only if we're not preserving a richer existing file)
+        if (!skipDiskWrite) {
+            try {
+                await saveFile(fullPath, opts.content);
+            }
+            catch (diskErr) {
+                process.stderr.write(`gsd-db: saveArtifactToDb — disk write failed, rolling back DB row: ${diskErr.message}\n`);
+                const rollbackAdapter = db._getAdapter();
+                rollbackAdapter?.prepare('DELETE FROM artifacts WHERE path = :path').run({ ':path': opts.path });
+                throw diskErr;
+            }
         }
         // Invalidate file-read caches so deriveState() sees the updated markdown.
         // Do NOT clear the artifacts table — we just wrote to it intentionally.

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

@@ -441,6 +441,7 @@ export async function runGSDDoctor(basePath, options) {
                 id: s.id,
                 title: s.title,
                 done: s.status === "complete",
+                pending: s.status === "pending",
                 risk: (s.risk || "medium"),
                 depends: s.depends,
                 demo: s.demo,
@@ -528,6 +529,10 @@ export async function runGSDDoctor(basePath, options) {
             }
             const slicePath = resolveSlicePath(basePath, milestoneId, slice.id);
             if (!slicePath) {
+                // Pending slices haven't been planned yet — directories are created
+                // lazily by ensurePreconditions() at dispatch time. Skip them.
+                if (slice.pending)
+                    continue;
                 const expectedPath = relSlicePath(basePath, milestoneId, slice.id);
                 issues.push({
                     severity: slice.done ? "warning" : "error",
@@ -549,6 +554,9 @@ export async function runGSDDoctor(basePath, options) {
             }
             const tasksDir = resolveTasksDir(basePath, milestoneId, slice.id);
             if (!tasksDir) {
+                // Pending slices haven't been planned yet — tasks/ is created on demand.
+                if (slice.pending)
+                    continue;
                 issues.push({
                     severity: slice.done ? "warning" : "error",
                     code: "missing_tasks_dir",

package/dist/resources/extensions/gsd/git-service.js

@@ -510,13 +510,18 @@ export class GitServiceImpl {
  * Returns the PR URL on success, or null on failure.
  * Non-fatal: callers should treat failure as best-effort.
  */
-export function createDraftPR(basePath, milestoneId, title, body) {
+export function createDraftPR(basePath, milestoneId, title, body, opts) {
     try {
-        const result = execFileSync("gh", [
+        const args = [
             "pr", "create", "--draft",
             "--title", title,
             "--body", body,
-        ], { cwd: basePath, encoding: "utf8", timeout: 30000, env: GIT_NO_PROMPT_ENV });
+        ];
+        if (opts?.head)
+            args.push("--head", opts.head);
+        if (opts?.base)
+            args.push("--base", opts.base);
+        const result = execFileSync("gh", args, { cwd: basePath, encoding: "utf8", timeout: 30000, env: GIT_NO_PROMPT_ENV });
         return result.trim();
     }
     catch {

package/dist/resources/extensions/gsd/gsd-db.js

@@ -253,6 +253,7 @@ function initSchema(db, fileBacked) {
         inputs TEXT NOT NULL DEFAULT '[]',
         expected_output TEXT NOT NULL DEFAULT '[]',
         observability_impact TEXT NOT NULL DEFAULT '',
+        full_plan_md TEXT NOT NULL DEFAULT '',
         sequence INTEGER DEFAULT 0, -- DEAD CODE: no tool exposes sequence — always 0
         PRIMARY KEY (milestone_id, slice_id, id),
         FOREIGN KEY (milestone_id, slice_id) REFERENCES slices(milestone_id, id)
@@ -542,6 +543,13 @@ function migrateSchema(db) {
                 ":applied_at": new Date().toISOString(),
             });
         }
+        if (currentVersion < 11) {
+            ensureColumn(db, "tasks", "full_plan_md", `ALTER TABLE tasks ADD COLUMN full_plan_md TEXT NOT NULL DEFAULT ''`);
+            db.prepare("INSERT INTO schema_version (version, applied_at) VALUES (:version, :applied_at)").run({
+                ":version": 11,
+                ":applied_at": new Date().toISOString(),
+            });
+        }
         db.exec("COMMIT");
     }
     catch (err) {
@@ -997,7 +1005,8 @@ export function upsertTaskPlanning(milestoneId, sliceId, taskId, planning) {
       verify = COALESCE(:verify, verify),
       inputs = COALESCE(:inputs, inputs),
       expected_output = COALESCE(:expected_output, expected_output),
-      observability_impact = COALESCE(:observability_impact, observability_impact)
+      observability_impact = COALESCE(:observability_impact, observability_impact),
+      full_plan_md = COALESCE(:full_plan_md, full_plan_md)
      WHERE milestone_id = :milestone_id AND slice_id = :slice_id AND id = :id`).run({
         ":milestone_id": milestoneId,
         ":slice_id": sliceId,
@@ -1010,6 +1019,7 @@ export function upsertTaskPlanning(milestoneId, sliceId, taskId, planning) {
         ":inputs": planning.inputs ? JSON.stringify(planning.inputs) : null,
         ":expected_output": planning.expectedOutput ? JSON.stringify(planning.expectedOutput) : null,
         ":observability_impact": planning.observabilityImpact ?? null,
+        ":full_plan_md": planning.fullPlanMd ?? null,
     });
 }
 function rowToSlice(row) {
@@ -1078,6 +1088,7 @@ function rowToTask(row) {
         inputs: JSON.parse(row["inputs"] || "[]"),
         expected_output: JSON.parse(row["expected_output"] || "[]"),
         observability_impact: row["observability_impact"] ?? "",
+        full_plan_md: row["full_plan_md"] ?? "",
         sequence: row["sequence"] ?? 0,
     };
 }

package/dist/resources/extensions/gsd/markdown-renderer.js

@@ -298,7 +298,7 @@ export async function renderTaskPlanFromDb(basePath, milestoneId, sliceId, taskI
     mkdirSync(tasksDir, { recursive: true });
     const absPath = join(tasksDir, buildTaskFileName(taskId, "PLAN"));
     const artifactPath = toArtifactPath(absPath, basePath);
-    const content = renderTaskPlanMarkdown(task);
+    const content = task.full_plan_md.trim() ? task.full_plan_md : renderTaskPlanMarkdown(task);
     await writeAndStore(absPath, artifactPath, content, {
         artifact_type: "PLAN",
         milestone_id: milestoneId,

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

@@ -21,8 +21,8 @@ Then:
 4. Verify each **success criterion** from the milestone definition in `{{roadmapPath}}`. For each criterion, confirm it was met with specific evidence from slice summaries, test results, or observable behavior. List any criterion that was NOT met.
 5. Verify the milestone's **definition of done** — all slices are `[x]`, all slice summaries exist, and any cross-slice integration points work correctly.
 6. Validate **requirement status transitions**. For each requirement that changed status during this milestone, confirm the transition is supported by evidence. Requirements can move between Active, Validated, Deferred, Blocked, or Out of Scope — but only with proof.
-7. Write `{{milestoneSummaryPath}}` using the milestone-summary template. Fill all frontmatter fields and narrative sections. The `requirement_outcomes` field must list every requirement that changed status with `from_status`, `to_status`, and `proof`.
-8. Update `.gsd/REQUIREMENTS.md` if any requirement status transitions were validated in step 5.
+7. **Persist completion through `gsd_complete_milestone`.** Call it with: `milestoneId`, `title`, `oneLiner`, `narrative`, `successCriteriaResults`, `definitionOfDoneResults`, `requirementOutcomes`, `keyDecisions`, `keyFiles`, `lessonsLearned`, `followUps`, `deviations`. The tool updates the milestone status in the DB, renders `{{milestoneSummaryPath}}`, and validates all slices are complete before proceeding.
+8. Update `.gsd/REQUIREMENTS.md` if any requirement status transitions were validated in step 6.
 9. Update `.gsd/PROJECT.md` to reflect milestone completion and current project state.
 10. Review all slice summaries for cross-cutting lessons, patterns, or gotchas that emerged during this milestone. Append any non-obvious, reusable insights to `.gsd/KNOWLEDGE.md`.
 11. Do not commit manually — the system auto-commits your changes after this unit completes.
@@ -31,6 +31,4 @@ Then:
 
 **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.
 
-**You MUST write `{{milestoneSummaryPath}}` AND update PROJECT.md before finishing.**
-
 When done, say: "Milestone {{milestoneId}} complete."

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

@@ -63,7 +63,7 @@ Then:
    - a matching task plan file with description, steps, must-haves, verification, inputs, and expected output
    - **Inputs and Expected Output must list concrete backtick-wrapped file paths** (e.g. `` `src/types.ts` ``). These are machine-parsed to derive task dependencies — vague prose without paths breaks parallel execution. Every task must have at least one output file path.
    - Observability Impact section **only if the task touches runtime boundaries, async flows, or error paths** — omit it otherwise
-6. **Persist planning state through DB-backed tools.** Call `gsd_plan_slice` with the full slice planning payload (goal, demo, must-haves, verification, tasks, and metadata). Then call `gsd_plan_task` for each task to persist its planning fields. These tools write to the DB and render `{{outputPath}}` and `{{slicePath}}/tasks/T##-PLAN.md` files automatically. Do **not** rely on direct `PLAN.md` writes as the source of truth; the DB-backed tools are the canonical write path for slice and task planning state.
+6. **Persist planning state through `gsd_plan_slice`.** Call it with the full slice planning payload (goal, demo, must-haves, verification, tasks, and metadata). The tool inserts all tasks in the same transaction, writes to the DB, and renders `{{outputPath}}` and `{{slicePath}}/tasks/T##-PLAN.md` files automatically. Do **not** call `gsd_plan_task` separately — `gsd_plan_slice` handles task persistence. Do **not** rely on direct `PLAN.md` writes as the source of truth; the DB-backed tool is the canonical write path for slice and task planning state.
 7. **Self-audit the plan.** Walk through each check — if any fail, fix the plan files before moving on:
     - **Completion semantics:** If every task were completed exactly as written, the slice goal/demo should actually be true.
     - **Requirement coverage:** Every must-have in the slice maps to at least one task. No must-have is orphaned. If `REQUIREMENTS.md` exists, every Active requirement this slice owns maps to at least one task.

package/dist/resources/extensions/gsd/prompts/reassess-roadmap.md

@@ -50,14 +50,14 @@ If all criteria have at least one remaining owning slice, the coverage check pas
 
 **If the roadmap is still good:**
 
-Write `{{assessmentPath}}` with a brief confirmation that roadmap coverage still holds after {{completedSliceId}}. If requirements exist, explicitly note whether requirement coverage remains sound. If `gsd_reassess_roadmap` is available, use it with `verdict: "roadmap-confirmed"`, an empty `sliceChanges` object, and the assessment text — the tool writes the assessment to the DB and renders ASSESSMENT.md.
+Use `gsd_reassess_roadmap` with `verdict: "roadmap-confirmed"`, an empty `sliceChanges` object, and the assessment text — the tool writes the assessment to the DB and renders `{{assessmentPath}}`. If requirements exist, explicitly note whether requirement coverage remains sound.
 
 **If changes are needed:**
 
-1. **Persist changes through `gsd_reassess_roadmap`.** Pass: `milestoneId`, `completedSliceId`, `verdict` (e.g. "roadmap-adjusted"), `assessment` (text explaining the decision), and `sliceChanges` with `modified` (array of sliceId, title, risk, depends, demo), `added` (same shape), `removed` (array of slice ID strings). The tool structurally enforces preservation of completed slices, writes the assessment to the DB, re-renders ROADMAP.md, and renders ASSESSMENT.md. Skip step 2 when this tool succeeds.
-2. **Degraded fallback — direct file writes:** If `gsd_reassess_roadmap` is not available, rewrite the remaining (unchecked) slices in `{{roadmapPath}}` directly. Keep completed slices exactly as they are (`[x]`). Update the boundary map for changed slices. Update the proof strategy if risks changed. Update requirement coverage if ownership or scope changed.
-3. Write `{{assessmentPath}}` explaining what changed and why — keep it brief and concrete.
-4. If `.gsd/REQUIREMENTS.md` exists and requirement ownership or status changed, update it.
-5. {{commitInstruction}}
+**Persist changes through `gsd_reassess_roadmap`.** Pass: `milestoneId`, `completedSliceId`, `verdict` (e.g. "roadmap-adjusted"), `assessment` (text explaining the decision), and `sliceChanges` with `modified` (array of sliceId, title, risk, depends, demo), `added` (same shape), `removed` (array of slice ID strings). The tool structurally enforces preservation of completed slices, writes the assessment to the DB, re-renders `{{roadmapPath}}`, and renders `{{assessmentPath}}`.
+
+If `.gsd/REQUIREMENTS.md` exists and requirement ownership or status changed, update it.
+
+{{commitInstruction}}
 
 When done, say: "Roadmap reassessed."

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

@@ -32,19 +32,8 @@ Consider these captures when rewriting the remaining tasks — they represent th
 
 1. Read the blocker task summary carefully. Understand exactly what was discovered and why it blocks the current plan.
 2. Analyze the remaining `[ ]` tasks in the slice plan. Determine which are still valid, which need modification, and which should be replaced.
-3. **Persist replan state through `gsd_replan_slice`.** Call it with the following parameters: `milestoneId`, `sliceId`, `blockerTaskId`, `blockerDescription`, `whatChanged`, `updatedTasks` (array of task objects with taskId, title, description, estimate, files, verify, inputs, expectedOutput), `removedTaskIds` (array of task ID strings). The tool structurally enforces preservation of completed tasks, writes replan history to the DB, re-renders PLAN.md, and renders REPLAN.md. Skip steps 4–5 when this tool succeeds.
-4. **Degraded fallback — direct file writes:** If `gsd_replan_slice` is not available, fall back to writing files directly. Write `{{replanPath}}` documenting:
-   - What blocker was discovered and in which task
-   - What changed in the plan and why
-   - Which incomplete tasks were modified, added, or removed
-   - Any new risks or considerations introduced by the replan
-5. If using the degraded fallback, rewrite `{{planPath}}` with the updated slice plan:
-   - Keep all `[x]` tasks exactly as they were (same IDs, same descriptions, same checkmarks)
-   - Update the `[ ]` tasks to address the blocker
-   - Ensure the slice Goal and Demo sections are still achievable with the new tasks, or update them if the blocker fundamentally changes what the slice can deliver
-   - Update the Files Likely Touched section if the replan changes which files are affected
-   - If a DB-backed planning tool exists for this phase, use it as the source of truth and make any rewritten `PLAN.md` reflect that persisted state rather than bypassing it
-6. If any incomplete task had a `T0x-PLAN.md`, remove or rewrite it to match the new task description.
-7. Do not commit manually — the system auto-commits your changes after this unit completes.
+3. **Persist replan state through `gsd_replan_slice`.** Call it with: `milestoneId`, `sliceId`, `blockerTaskId`, `blockerDescription`, `whatChanged`, `updatedTasks` (array of task objects with taskId, title, description, estimate, files, verify, inputs, expectedOutput), `removedTaskIds` (array of task ID strings). The tool structurally enforces preservation of completed tasks, writes replan history to the DB, re-renders `{{planPath}}`, and renders `{{replanPath}}`.
+4. If any incomplete task had a `T0x-PLAN.md`, remove or rewrite it to match the new task description.
+5. Do not commit manually — the system auto-commits your changes after this unit completes.
 
 When done, say: "Slice {{sliceId}} replanned."

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

@@ -0,0 +1,78 @@
+You are a project reorganization assistant for a GSD (Get Shit Done) project. The user wants to rethink their milestone plan — reorder priorities, remove work that's no longer needed, add new milestones, or restructure dependencies.
+
+## Current Milestone Landscape
+
+{{rethinkData}}
+
+## Detailed Milestone Context
+
+{{existingMilestonesContext}}
+
+## Your Role
+
+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
+
+## Supported Operations
+
+### Reorder milestones
+Change execution order of pending/active milestones. Write `.gsd/QUEUE-ORDER.json`:
+```json
+{ "order": ["M003", "M001", "M002"], "updatedAt": "<ISO timestamp>" }
+```
+Only include non-complete milestone IDs. Validate dependency constraints before saving.
+
+### Park a milestone
+Temporarily shelve a milestone (reversible). Create a `{ID}-PARKED.md` file in the milestone directory:
+```markdown
+---
+parked_at: <ISO timestamp>
+reason: "<reason>"
+---
+
+# {ID} — Parked
+
+> <reason>
+```
+**Bias toward parking over discarding** when a milestone has any completed slices or tasks.
+
+### Unpark a milestone
+Remove the `{ID}-PARKED.md` file from the milestone directory to reactivate it.
+
+### 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.
+
+### Add a new milestone
+Use the `gsd_milestone_generate_id` tool to get the next ID, then write a `{ID}-CONTEXT.md` file in `.gsd/milestones/{ID}/` with scope, goals, and success criteria. Update QUEUE-ORDER.json to place it at the desired position.
+
+### Update dependencies
+Edit `depends_on` in the YAML frontmatter of a milestone's `{ID}-CONTEXT.md` file. For example:
+```yaml
+depends_on: [M001, M003]
+```
+
+## Dependency Validation Rules
+
+Before applying any reorder, verify:
+- A milestone **cannot** be scheduled before any milestone in its `depends_on` list (would_block)
+- Circular dependencies are forbidden
+- Dependencies on non-existent milestones are invalid (missing_dep)
+- Completed milestones always satisfy dependencies regardless of position
+
+If a proposed order would violate constraints, explain the issue and suggest alternatives (e.g. removing the dependency, reordering differently, or parking the blocker).
+
+## After Each Change
+
+1. Execute the change (write/delete files, update QUEUE-ORDER.json)
+2. Show the updated milestone order
+3. Note if the active milestone changed as a result
+4. Ask if there's anything else to adjust
+
+## Important Constraints
+
+- Do NOT modify completed milestones — they're done
+- Do NOT park completed milestones — it would corrupt dependency satisfaction
+- Park is preferred over discard when a milestone has any completed work
+- Always persist queue order changes to `.gsd/QUEUE-ORDER.json`
+- After changes, run `git add .gsd/ && git commit -m "docs: rethink milestone order"` to persist

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

@@ -16,6 +16,8 @@ All relevant context has been preloaded below — the roadmap, all slice summari
 
 {{inlinedContext}}
 
+{{skillActivation}}
+
 ## Validation Steps
 
 1. For each **success criterion** in `{{roadmapPath}}`, check whether slice summaries and UAT results provide evidence that it was met. Record pass/fail per criterion.
@@ -25,47 +27,15 @@ All relevant context has been preloaded below — the roadmap, all slice summari
 5. Determine a verdict:
    - `pass` — all criteria met, all slices delivered, no gaps
    - `needs-attention` — minor gaps that do not block completion (document them)
-   - `needs-remediation` — material gaps found; add remediation slices to the roadmap
-
-## Output
-
-Write `{{validationPath}}` with this structure:
-
-```markdown
----
-verdict: <pass|needs-attention|needs-remediation>
-remediation_round: {{remediationRound}}
----
-
-# Milestone Validation: {{milestoneId}}
+   - `needs-remediation` — material gaps found; remediation slices must be added to the roadmap
 
-## Success Criteria Checklist
-- [x] Criterion 1 — evidence: ...
-- [ ] Criterion 2 — gap: ...
+## Persist Validation
 
-## Slice Delivery Audit
-| Slice | Claimed | Delivered | Status |
-|-------|---------|-----------|--------|
-| S01   | ...     | ...       | pass   |
-
-## Cross-Slice Integration
-(any boundary mismatches)
-
-## Requirement Coverage
-(any unaddressed requirements)
-
-## Verdict Rationale
-(why this verdict was chosen)
-
-## Remediation Plan
-(only if verdict is needs-remediation — list new slices to add to the roadmap)
-```
+**Persist validation results through `gsd_validate_milestone`.** Call it with: `milestoneId`, `verdict`, `remediationRound`, `successCriteriaChecklist`, `sliceDeliveryAudit`, `crossSliceIntegration`, `requirementCoverage`, `verdictRationale`, and `remediationPlan` (if verdict is `needs-remediation`). The tool writes the validation to the DB and renders VALIDATION.md to disk.
 
 If verdict is `needs-remediation`:
-- Add new slices to `{{roadmapPath}}` with unchecked `[ ]` status
-- These slices will be planned and executed before validation re-runs
-
-**You MUST write `{{validationPath}}` before finishing.**
+- After calling `gsd_validate_milestone`, use `gsd_reassess_roadmap` to add remediation slices. Pass `milestoneId`, a synthetic `completedSliceId` (e.g. "VALIDATION"), `verdict: "roadmap-adjusted"`, `assessment` text, and `sliceChanges` with the new slices in the `added` array. The tool persists the changes to the DB and re-renders ROADMAP.md.
+- These remediation slices will be planned and executed before validation re-runs.
 
 **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.