@opengsd/gsd-pi 1.2.0-dev.844675c9 → 1.2.0-dev.8e6112e9

package/dist/resources/extensions/gsd/guided-unit-completion.js

@@ -0,0 +1,225 @@
+// Project/App: gsd-pi
+// File Purpose: Recover guided-unit completion signals that did not produce expected tool/file evidence.
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import { clearPathCache, relMilestoneFile, resolveMilestoneFile, resolveMilestonePath, } from "./paths.js";
+import { _getPendingAutoStart, deletePendingAutoStart, hasPendingAutoStart, } from "./pending-auto-start.js";
+import { logWarning } from "./workflow-logger.js";
+// #4573: cap for how many times we nudge the LLM after a premature ready
+// phrase before giving up and asking the user to re-run /gsd.
+const MAX_READY_REJECTS = 2;
+// #4573: matches the canonical ready phrase the discuss prompt asks the LLM
+// to emit. Accepts any M-prefixed milestone ID (three digits + optional
+// suffix) with optional trailing punctuation.
+const READY_PHRASE_RE = /\bMilestone\s+M\d{3}[A-Z0-9-]*\s+ready\.?/i;
+const emptyTurnCounterByBase = new Map();
+const MAX_EMPTY_TURN_RETRIES = 2;
+// Phrases that indicate the LLM is about to do something but has not yet.
+// Kept tight to avoid flagging legitimate narration like "I'll wait for your answer."
+//
+// "make" was previously in the verb list but matches conversational meta phrases
+// like "Let me make sure I understand…" which are NOT action announcements —
+// removed to prevent the empty-turn nudge from auto-replying to user questions
+// in discuss flows.
+const COMMIT_INTENT_RE = /\b(?:I['’]ll|I will|Next,? I['’]ll|Now I['’]ll|Let me|I['’]m going to|I am going to)\s+(?:now\s+)?(?:write|create|call|invoke|update|add|run|execute|generate|produce|emit|compose|implement|save|apply|commit)\b/i;
+/**
+ * Extract the concatenated text content from an assistant message, whether it
+ * stores content as a string or as an array of text blocks.
+ */
+function extractAssistantText(msg) {
+    if (!msg)
+        return "";
+    const content = msg.content;
+    if (typeof content === "string")
+        return content;
+    if (!Array.isArray(content))
+        return "";
+    const parts = [];
+    for (const block of content) {
+        if (!block || typeof block !== "object")
+            continue;
+        if (block.type === "text" && typeof block.text === "string")
+            parts.push(block.text);
+    }
+    return parts.join("\n");
+}
+/**
+ * Return true if the assistant message contains any tool-use block.
+ *
+ * The canonical pi-ai `AssistantMessage.content` (see packages/pi-ai/src/types.ts)
+ * uses `type: "toolCall"` and `type: "serverToolUse"` for tool invocations —
+ * every provider (anthropic-direct, claude-code-cli, openai, etc.) normalizes
+ * incoming tool blocks into these two shapes before they reach guided-flow.
+ *
+ * The Anthropic API wire shape `"tool_use"` / `"server_tool_use"` does NOT appear
+ * in the internal AssistantMessage — those literals are only used when sending
+ * messages back out to the Anthropic API. Matching them here was a latent bug:
+ * `hasToolUse` returned `false` for every real tool call, which let the
+ * empty-turn nudge fire and pre-empt MCP tools that block on the user
+ * (e.g. `ask_user_questions`). See investigation in PR for #4658.
+ */
+function hasToolUse(msg) {
+    if (!msg)
+        return false;
+    const content = msg.content;
+    if (!Array.isArray(content))
+        return false;
+    return content.some((b) => b &&
+        typeof b === "object" &&
+        (b.type === "toolCall" || b.type === "serverToolUse"));
+}
+/**
+ * #4573 — Detect and recover from the "ready phrase without files" failure mode.
+ *
+ * When the LLM emits "Milestone {{id}} ready." but has not written the
+ * milestone CONTEXT/ROADMAP artifacts, `checkAutoStartAfterDiscuss()` silently
+ * returns false and the next /gsd invocation loops into the "All milestones
+ * complete" warning.
+ *
+ * This function, called from `handleAgentEnd` after `checkAutoStartAfterDiscuss`
+ * returns false, pattern-matches the ready phrase on the last assistant message.
+ * If it fired AND neither the canonical M###-CONTEXT.md/M###-ROADMAP.md nor
+ * legacy CONTEXT.md/ROADMAP.md files exist, it:
+ *   1. Notifies the user that the signal was rejected.
+ *   2. Injects a system message via `pi.sendMessage(..., {triggerTurn:true})`
+ *      telling the LLM the signal was premature and to emit the writes now.
+ *   3. Caps at `MAX_READY_REJECTS` per-entry; beyond that, gives up and asks
+ *      the user to re-run /gsd.
+ *
+ * Returns true when a nudge (or give-up) was emitted, signaling the caller to
+ * skip `resolveAgentEnd`.
+ */
+export function maybeHandleReadyPhraseWithoutFiles(event, lookupBasePath) {
+    const entry = _getPendingAutoStart(lookupBasePath);
+    if (!entry)
+        return false;
+    const { ctx, pi, basePath, milestoneId } = entry;
+    // Gate: last assistant message must contain the ready phrase
+    const lastMsg = event.messages[event.messages.length - 1];
+    const text = extractAssistantText(lastMsg);
+    if (!READY_PHRASE_RE.test(text))
+        return false;
+    // Bust paths.ts cached dir listings before checking for fresh writes. The
+    // LLM's Write tool calls do not invalidate paths.ts caches, so a stale
+    // listing taken before the milestone dir or its CONTEXT/ROADMAP files
+    // existed would falsely report the artifacts as missing and trigger the
+    // 3-strike "ready without files" abort even though the writes succeeded.
+    clearPathCache();
+    // Gate: artifacts must still be missing — if they exist, the happy path
+    // already fired and we have nothing to do.
+    const contextFile = resolveMilestoneFile(basePath, milestoneId, "CONTEXT");
+    const roadmapFile = resolveMilestoneFile(basePath, milestoneId, "ROADMAP");
+    if (contextFile || roadmapFile)
+        return false;
+    // Diagnostic: when the cached resolver reports both files missing, also probe
+    // the canonical paths with uncached existsSync so we can tell whether the
+    // recovery is firing on real-missing files or a path-resolution miss
+    // (basePath/symlink mismatch, stale cache despite agent-end-recovery flush,
+    // legacy descriptor dir not matching, etc.).
+    try {
+        const mDir = resolveMilestonePath(basePath, milestoneId);
+        const canonicalCtx = mDir ? join(mDir, `${milestoneId}-CONTEXT.md`) : null;
+        const canonicalRoadmap = mDir ? join(mDir, `${milestoneId}-ROADMAP.md`) : null;
+        logWarning("guided", `ready-phrase-reject diagnostic mid=${milestoneId} basePath=${basePath} ` +
+            `mDir=${mDir ?? "null"} ` +
+            `canonical-ctx=${canonicalCtx ?? "null"} ctx-exists=${canonicalCtx ? existsSync(canonicalCtx) : "n/a"} ` +
+            `canonical-roadmap=${canonicalRoadmap ?? "null"} roadmap-exists=${canonicalRoadmap ? existsSync(canonicalRoadmap) : "n/a"}`);
+    }
+    catch (e) {
+        logWarning("guided", `ready-phrase-reject diagnostic failed: ${e.message}`);
+    }
+    entry.readyRejectCount = (entry.readyRejectCount ?? 0) + 1;
+    if (entry.readyRejectCount > MAX_READY_REJECTS) {
+        // Give up: clear state and tell the user to re-run /gsd. Avoids an
+        // infinite nudge loop when the LLM never produces the writes.
+        deletePendingAutoStart(basePath);
+        ctx.ui.notify(`Milestone ${milestoneId}: LLM signaled "ready" ${entry.readyRejectCount} times without writing files. ` +
+            `Stopping auto-nudge. Run /gsd to try again.`, "error");
+        return true;
+    }
+    const contextRel = relMilestoneFile(basePath, milestoneId, "CONTEXT");
+    const roadmapRel = relMilestoneFile(basePath, milestoneId, "ROADMAP");
+    ctx.ui.notify(`Milestone ${milestoneId}: "ready" signal rejected — ${contextRel} and ${roadmapRel} are missing. Asking the LLM to complete the writes.`, "warning");
+    const nudge = `You emitted "Milestone ${milestoneId} ready." but neither ` +
+        `${contextRel} nor ${roadmapRel} exists on disk. ` +
+        `The ready phrase is a POST-WRITE signal and has been rejected. ` +
+        `In this turn: (1) write PROJECT.md, REQUIREMENTS.md, and the milestone ` +
+        `CONTEXT.md, (2) call gsd_plan_milestone, then (3) emit the ready phrase. ` +
+        `Do not describe these steps — execute them as tool calls. ` +
+        `This is retry ${entry.readyRejectCount}/${MAX_READY_REJECTS}; further ` +
+        `premature signals will clear the session.`;
+    try {
+        pi.sendMessage({ customType: "gsd-ready-no-files", content: nudge, display: false }, { triggerTurn: true });
+    }
+    catch (e) {
+        logWarning("guided", `ready-phrase nudge sendMessage failed: ${e.message}`);
+        return false;
+    }
+    return true;
+}
+/**
+ * Reset the empty-turn counter for a basePath after a successful tool-use turn.
+ * Called from handleAgentEnd when the last message contains tool_use blocks.
+ */
+export function resetEmptyTurnCounter(basePath) {
+    if (basePath)
+        emptyTurnCounterByBase.delete(basePath);
+    else
+        emptyTurnCounterByBase.clear();
+}
+export function maybeHandleEmptyIntentTurn(event, isAuto, lookupBasePath) {
+    // Gate: only fire when there is system-driven work in flight. Interactive
+    // /gsd discuss (user-driven) produces legitimate text-only turns.
+    if (!isAuto && !hasPendingAutoStart(lookupBasePath))
+        return false;
+    const lastMsg = event.messages[event.messages.length - 1];
+    if (!lastMsg)
+        return false;
+    if (hasToolUse(lastMsg))
+        return false;
+    const text = extractAssistantText(lastMsg).trim();
+    if (!text)
+        return false;
+    // Skip if the LLM is emitting the ready phrase — that is the ready-no-files
+    // path, handled by maybeHandleReadyPhraseWithoutFiles.
+    if (READY_PHRASE_RE.test(text))
+        return false;
+    // Skip if the LLM is clearly handing back to the user. Discuss flows
+    // often pose a question and follow it with a conditional intent on the
+    // same line ("Did I capture that correctly? If so, I'll write the
+    // requirements."). A line-trailing `?` check misses these because the
+    // line ends in `.`. Match any sentence-terminating `?` (followed by
+    // whitespace or end-of-text) — false negatives here auto-reply to the
+    // user, which is a much worse failure mode than a missed nudge.
+    if (/\?(?:\s|$)/.test(text))
+        return false;
+    // Must contain a commit-intent phrase — this is the stall we care about.
+    if (!COMMIT_INTENT_RE.test(text))
+        return false;
+    // Resolve the target basePath + pi for injection. Prefer the pending
+    // autostart entry (discuss flow); otherwise we cannot inject.
+    const entry = _getPendingAutoStart(lookupBasePath);
+    if (!entry)
+        return false;
+    const { ctx, pi, basePath } = entry;
+    const count = (emptyTurnCounterByBase.get(basePath) ?? 0) + 1;
+    emptyTurnCounterByBase.set(basePath, count);
+    if (count > MAX_EMPTY_TURN_RETRIES) {
+        ctx.ui.notify(`Empty-turn recovery: LLM announced intent ${count} times without calling any tool. ` +
+            `Stopping auto-nudge.`, "error");
+        return false; // let the normal flow resolve/pause the unit
+    }
+    ctx.ui.notify(`Empty-turn detected: LLM announced intent but called no tool. Prompting it to execute.`, "info");
+    const nudge = `Your last turn announced an action (e.g. "I'll write…" or "Let me call…") ` +
+        `but contained no tool call. The system records zero tool-use blocks for ` +
+        `that turn. Execute the announced action NOW as a tool call in this turn. ` +
+        `Do not describe it again. Retry ${count}/${MAX_EMPTY_TURN_RETRIES}.`;
+    try {
+        pi.sendMessage({ customType: "gsd-empty-turn-recovery", content: nudge, display: false }, { triggerTurn: true });
+    }
+    catch (e) {
+        logWarning("guided", `empty-turn nudge sendMessage failed: ${e.message}`);
+        return false;
+    }
+    return true;
+}

package/dist/resources/extensions/gsd/health-widget.js

@@ -1,7 +1,7 @@
 // Project/App: gsd-pi
 // File Purpose: Always-on ambient health signal rendered below the editor.
 import { runProviderChecks, summariseProviderIssues } from "./doctor-providers.js";
-import { runEnvironmentChecks } from "./doctor-environment.js";
+import { runEnvironmentChecks, runEnvironmentChecksAsync } from "./doctor-environment.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { nativeIsRepo, nativeLastCommitEpoch, nativeGetCurrentBranch, nativeCommitSubject } from "./native-git-bridge.js";
 import { loadLedgerFromDisk, getProjectTotals } from "./metrics.js";
@@ -9,7 +9,28 @@ import { projectRoot } from "./commands/context.js";
 import { buildHealthLines, detectHealthWidgetProjectState, } from "./health-widget-core.js";
 export const HEALTH_WIDGET_ACTIVE_HINTS = "  /gsd auto to run  ·  /gsd status to inspect  ·  /gsd report for snapshots  ·  /gsd notifications for history  ·  /gsd help";
 // ── Data loader ────────────────────────────────────────────────────────────────
-function loadHealthWidgetData(basePath) {
+// Last-commit lookup is subprocess-backed (native-git-bridge → git spawns),
+// so it is treated like the other expensive checks: skipped on first paint,
+// run only by the background refresh.
+function loadLastCommitInfo(basePath) {
+    try {
+        if (nativeIsRepo(basePath)) {
+            const branch = nativeGetCurrentBranch(basePath);
+            const epoch = nativeLastCommitEpoch(basePath, branch || "HEAD");
+            if (epoch > 0) {
+                return { epoch, message: nativeCommitSubject(basePath, branch || "HEAD") || null };
+            }
+        }
+    }
+    catch { /* non-fatal */ }
+    return { epoch: null, message: null };
+}
+function loadHealthWidgetData(basePath, options) {
+    // `includeChecks` gates the expensive subprocess-backed checks (provider +
+    // environment doctor: `lsof`, `docker`, `node --version`, ...). The initial
+    // synchronous render passes `false` so first paint is never blocked on them;
+    // the async refresh (off the first-paint path) runs the full suite.
+    const includeChecks = options?.includeChecks ?? true;
     let budgetCeiling;
     let budgetSpent = 0;
     let providerIssue = null;
@@ -28,13 +49,57 @@ function loadHealthWidgetData(basePath) {
         }
     }
     catch { /* non-fatal */ }
+    if (includeChecks) {
+        try {
+            const providerResults = runProviderChecks();
+            providerIssue = summariseProviderIssues(providerResults);
+        }
+        catch { /* non-fatal */ }
+        try {
+            const envResults = runEnvironmentChecks(basePath);
+            for (const r of envResults) {
+                if (r.status === "error")
+                    environmentErrorCount++;
+                else if (r.status === "warning")
+                    environmentWarningCount++;
+            }
+        }
+        catch { /* non-fatal */ }
+    }
+    // ── Last commit info ── (git spawns — gated like the other expensive checks)
+    if (includeChecks) {
+        const commit = loadLastCommitInfo(basePath);
+        lastCommitEpoch = commit.epoch;
+        lastCommitMessage = commit.message;
+    }
+    return {
+        projectState,
+        budgetCeiling,
+        budgetSpent,
+        providerIssue,
+        environmentErrorCount,
+        environmentWarningCount,
+        lastCommitEpoch,
+        lastCommitMessage,
+        lastRefreshed: Date.now(),
+    };
+}
+// Non-blocking variant used by the widget's background refresh: the cheap fields
+// come from the synchronous snapshot, then provider + environment checks are
+// layered in off the event-loop critical path (env checks run concurrently via
+// runEnvironmentChecksAsync). Keeps the always-on widget from stalling the UI on
+// its initial enrichment or its 60s refresh.
+async function loadHealthWidgetDataAsync(basePath) {
+    const data = loadHealthWidgetData(basePath, { includeChecks: false });
+    let providerIssue = data.providerIssue;
+    let environmentErrorCount = 0;
+    let environmentWarningCount = 0;
     try {
-        const providerResults = runProviderChecks();
-        providerIssue = summariseProviderIssues(providerResults);
+        providerIssue = summariseProviderIssues(runProviderChecks());
     }
     catch { /* non-fatal */ }
     try {
-        const envResults = runEnvironmentChecks(basePath);
+        const envResults = await runEnvironmentChecksAsync(basePath);
         for (const r of envResults) {
             if (r.status === "error")
                 environmentErrorCount++;
@@ -43,27 +108,14 @@ function loadHealthWidgetData(basePath) {
         }
     }
     catch { /* non-fatal */ }
-    // ── Last commit info ──
-    try {
-        if (nativeIsRepo(basePath)) {
-            const branch = nativeGetCurrentBranch(basePath);
-            const epoch = nativeLastCommitEpoch(basePath, branch || "HEAD");
-            if (epoch > 0) {
-                lastCommitEpoch = epoch;
-                lastCommitMessage = nativeCommitSubject(basePath, branch || "HEAD") || null;
-            }
-        }
-    }
-    catch { /* non-fatal */ }
+    const commit = loadLastCommitInfo(basePath);
     return {
-        projectState,
-        budgetCeiling,
-        budgetSpent,
+        ...data,
         providerIssue,
         environmentErrorCount,
         environmentWarningCount,
-        lastCommitEpoch,
-        lastCommitMessage,
+        lastCommitEpoch: commit.epoch,
+        lastCommitMessage: commit.message,
         lastRefreshed: Date.now(),
     };
 }
@@ -77,8 +129,13 @@ export function initHealthWidget(ctx) {
     if (!ctx.hasUI)
         return;
     const basePath = projectRoot();
-    // String-array fallback — used in RPC mode (factory is a no-op there)
-    const initialData = loadHealthWidgetData(basePath);
+    // String-array fallback — used in RPC mode (factory is a no-op there).
+    // Skip the expensive provider/environment doctor checks here: this runs
+    // synchronously on the interactive-startup path, where running them would
+    // block first paint by ~0.9s (lsof/docker probes, otherwise run again
+    // immediately by the factory below). The factory's async refresh fills in
+    // real health once the screen is up.
+    const initialData = loadHealthWidgetData(basePath, { includeChecks: false });
     ctx.ui.setWidget("gsd-health", buildHealthLines(initialData), { placement: "belowEditor" });
     // Factory-based widget for TUI mode — replaces the string-array above
     ctx.ui.setWidget("gsd-health", (_tui, _theme) => {
@@ -91,7 +148,7 @@ export function initHealthWidget(ctx) {
                 return;
             refreshInFlight = true;
             try {
-                data = loadHealthWidgetData(basePath);
+                data = await loadHealthWidgetDataAsync(basePath);
                 cachedLines = undefined;
                 if (!isDisposed)
                     _tui.requestRender();
@@ -101,9 +158,11 @@ export function initHealthWidget(ctx) {
                 refreshInFlight = false;
             }
         };
-        // Fire first enrichment immediately. requestRender() inside is a no-op
-        // if the widget has not yet rendered, so this is safe before factory return.
-        void refresh();
+        // Fire the first full enrichment off the first-paint path. setTimeout(0)
+        // yields to the initial render + input loop, so the expensive doctor checks
+        // (provider + environment) never delay the moment the user sees the UI.
+        // requestRender() inside refresh repaints the widget once data is ready.
+        setTimeout(() => { void refresh(); }, 0);
         const refreshTimer = setInterval(() => {
             void refresh();
         }, REFRESH_INTERVAL_MS);

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

@@ -125,7 +125,8 @@ function renderRoadmapMarkdown(milestone, slices) {
     lines.push("");
     for (const slice of slices) {
         const done = isClosedStatus(slice.status) ? "x" : " ";
-        const depends = `[${(slice.depends ?? []).join(",")}]`;
+        const cleanDepends = (slice.depends ?? []).map(d => d.replace(/^\[|\]$/g, '')).filter(d => /^[A-Za-z0-9][A-Za-z0-9-]*$/.test(d));
+        const depends = `[${cleanDepends.join(",")}]`;
         const safeTitle = sanitizeInlineRoadmapText(slice.title || slice.id) || slice.id;
         const safeRisk = normalizeRiskLevel(slice.risk);
         // ADR-011: sketch slices get a `[sketch]` badge so the roadmap shows at a
@@ -716,6 +717,16 @@ export function detectStaleRenders(basePath) {
     }
     return stale;
 }
+/**
+ * Render-verification helper: does the rendered ROADMAP markdown mark a slice
+ * as done? Used by completion code to verify/repair the *projection* after a
+ * DB write — never as a source of truth for dispatch or completion decisions
+ * (ADR-017). Lives here so decision-path modules need not import
+ * parsers-legacy directly.
+ */
+export function roadmapRenderMarksSliceDone(roadmapContent, sliceId) {
+    return parseRoadmap(roadmapContent).slices.some((slice) => slice.id === sliceId && slice.done);
+}
 export async function renderReplanFromDb(basePath, milestoneId, sliceId, replanData) {
     const slicePath = resolveSlicePath(basePath, milestoneId, sliceId)
         ?? join(gsdRoot(basePath), "milestones", milestoneId, "slices", sliceId);

package/dist/resources/extensions/gsd/mcp-bridge.js

@@ -0,0 +1,10 @@
+// mcp-bridge.ts — stable runtime seam for MCP server consumption (phase 1).
+export { loadWriteGateSnapshot, shouldBlockPendingGateInSnapshot, shouldBlockQueueExecutionInSnapshot, } from "./bootstrap/write-gate.js";
+export { ensureDbOpen } from "./bootstrap/dynamic-tools.js";
+export { _getAdapter, checkpointDatabase, closeDatabase, getAllMilestones, getDb, getGateResults, getMilestoneSlices, getPendingGates, getSliceTasks, insertDecision, insertMilestone, insertSlice, openDatabase, upsertMilestonePlanning, } from "./gsd-db.js";
+export { invalidateStateCache, isReusableGhostMilestone } from "./state.js";
+export { loadEffectiveGSDPreferences } from "./preferences.js";
+export { saveDecisionToDb, saveRequirementToDb, updateRequirementInDb, } from "./db-writer.js";
+export { rebuildState } from "./doctor.js";
+export { queryJournal } from "./journal.js";
+export { claimReservedId, findMilestoneIds, getReservedMilestoneIds, milestoneIdSort, nextMilestoneId, } from "./milestone-ids.js";

package/dist/resources/extensions/gsd/mcp-filter.js

@@ -1,6 +1,8 @@
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { resolve } from "node:path";
+import { isGsdBrowserMcpServerConfig } from "../shared/gsd-browser-cli.js";
+import { toMcpWildcardToolName } from "./mcp-tool-name.js";
 import { resolveModelMcpConfig } from "./preferences-mcp.js";
 function isRecord(value) {
     return !!value && typeof value === "object" && !Array.isArray(value);
@@ -62,29 +64,11 @@ function isWorkflowMcpServerConfig(config) {
     const args = Array.isArray(config.args) ? config.args.filter((arg) => typeof arg === "string") : [];
     return args.some((arg) => arg.includes("gsd-mcp-server") || arg.includes("packages/mcp-server"));
 }
-function isBrowserMcpServerConfig(config) {
-    if (!isRecord(config))
-        return false;
-    const command = typeof config.command === "string" ? config.command : "";
-    if (command.includes("gsd-browser") || command.includes("@opengsd/gsd-browser")) {
-        return true;
-    }
-    const env = config.env;
-    if (isRecord(env)) {
-        if (typeof env.GSD_BROWSER_CLI_PATH === "string"
-            || typeof env.GSD_BROWSER_BIN_PATH === "string"
-            || typeof env.GSD_BROWSER_MCP_COMMAND === "string") {
-            return true;
-        }
-    }
-    const args = Array.isArray(config.args) ? config.args.filter((arg) => typeof arg === "string") : [];
-    return args.some((arg) => arg.includes("gsd-browser") || arg.includes("@opengsd/gsd-browser"));
-}
 export function discoverWorkflowMcpServerName(projectDir) {
     return discoverMcpServers(projectDir).find((server) => isWorkflowMcpServerConfig(server.config))?.name;
 }
 export function discoverBrowserMcpServerName(projectDir) {
-    return discoverMcpServers(projectDir).find((server) => isBrowserMcpServerConfig(server.config))?.name;
+    return discoverMcpServers(projectDir).find((server) => isGsdBrowserMcpServerConfig(server.config))?.name;
 }
 export function discoverMcpServerNames(projectDir) {
     return discoverMcpServers(projectDir).map((server) => server.name);
@@ -123,5 +107,5 @@ export function computeMcpDisallowedTools(modelId, mcpConfig, discoveredServers,
     if (workflowServerName && !(entry.blocked_servers ?? []).includes(workflowServerName)) {
         blocked.delete(workflowServerName);
     }
-    return [...blocked].map((name) => `mcp__${name}__*`);
+    return [...blocked].map(toMcpWildcardToolName);
 }

package/dist/resources/extensions/gsd/mcp-tool-name.js

@@ -0,0 +1,18 @@
+// Project/App: gsd-pi
+// File Purpose: GSD-facing face over the shared @gsd/pi-ai MCP tool-name helpers.
+import { parseMcpToolName as parsePiAiMcpToolName, stripMcpToolPrefix } from "@gsd/pi-ai";
+const MCP_TOOL_PREFIX = "mcp__";
+export function parseMcpToolName(toolName) {
+    const parsed = parsePiAiMcpToolName(toolName);
+    return parsed ? { serverName: parsed.server, toolName: parsed.tool } : null;
+}
+export { stripMcpToolPrefix };
+export function toMcpToolName(serverName, toolName) {
+    return `${MCP_TOOL_PREFIX}${serverName}__${toolName}`;
+}
+export function toMcpWildcardToolName(serverName) {
+    return toMcpToolName(serverName, "*");
+}
+export function mcpToolMatchesBaseName(toolName, baseName) {
+    return parseMcpToolName(toolName)?.toolName === baseName;
+}

package/dist/resources/extensions/gsd/md-importer.js

@@ -5,7 +5,8 @@
 // Exports: parseDecisionsTable, parseRequirementsSections, migrateFromMarkdown
 import { readFileSync, readdirSync, existsSync, statSync } from 'node:fs';
 import { join } from 'node:path';
-import { upsertDecision, upsertRequirement, insertArtifact, insertMilestone, insertSlice, insertTask, openDatabase, transaction, updateMilestoneStatus, updateSliceStatus, _getAdapter, } from './gsd-db.js';
+import { upsertDecision, upsertRequirement, insertArtifact, insertMilestone, insertSlice, insertTask, transaction, updateMilestoneStatus, updateSliceStatus, _getAdapter, } from './gsd-db.js';
+import { openWorkflowDatabasePath } from './db-workspace.js';
 import { resolveGsdRootFile, resolveMilestoneFile, resolveSliceFile, resolveTasksDir, milestonesDir, gsdRoot, resolveTaskFiles, } from './paths.js';
 import { findMilestoneIds } from './guided-flow.js';
 import { parseRoadmap, parsePlan } from './parsers-legacy.js';
@@ -542,7 +543,7 @@ export function migrateHierarchyToDb(basePath) {
                 title: sliceEntry.title,
                 status: sliceStatus,
                 risk: sliceEntry.risk,
-                depends: sliceEntry.depends,
+                depends: (sliceEntry.depends ?? []).map(d => d.replace(/^\[|\]$/g, '')).filter(d => /^[A-Za-z0-9][A-Za-z0-9-]*$/.test(d)),
                 demo: sliceEntry.demo,
                 sequence: si + 1, // Preserve roadmap parse order (#3356)
                 isSketch: sliceEntry.isSketch ?? false, // ADR-011: preserve the `[sketch]` flag on re-import
@@ -628,7 +629,7 @@ export function migrateFromMarkdown(gsdDir) {
     const dbPath = join(gsdRoot(gsdDir), 'gsd.db');
     // Open DB if not already open
     if (!_getAdapter()) {
-        openDatabase(dbPath);
+        openWorkflowDatabasePath(dbPath);
     }
     let decisions = 0;
     let requirements = 0;

package/dist/resources/extensions/gsd/memory-consolidation-scanner.js

@@ -211,7 +211,7 @@ export function reportConsolidationGaps(basePath) {
         const report = scanConsolidationGaps(basePath);
         if (report.totalGaps === 0)
             return report;
-        appendNotification(report.summary, "warning", "workflow-logger");
+        appendNotification(report.summary, "warning", "workflow-logger", { kind: "memory-consolidation" });
         logWarning("memory-consolidation", report.summary);
         return report;
     }

package/dist/resources/extensions/gsd/memory-relations.js

@@ -3,7 +3,7 @@
 // Phase 4 companion to memory-store.ts. Edges live in the `memory_relations`
 // table and are created by (a) explicit LINK actions emitted by the memory
 // extractor, or (b) future `/gsd memory link` CLI commands. All writes go
-// through the single-writer gate in `gsd-db.ts`.
+// through typed writer wrappers re-exported by `gsd-db.ts`.
 import { _getAdapter, deleteMemoryRelationsFor, insertMemoryRelationRow, isDbAvailable, } from "./gsd-db.js";
 export const VALID_RELATIONS = [
     "related_to",

package/dist/resources/extensions/gsd/migrate/safety.js

@@ -5,9 +5,10 @@ import { basename, dirname, join, resolve } from "node:path";
 import { homedir } from "node:os";
 import { ensureDbOpen } from "../bootstrap/dynamic-tools.js";
 import { readCrashLock, isLockProcessAlive } from "../crash-recovery.js";
-import { closeDatabase } from "../gsd-db.js";
+import { closeWorkflowDatabase } from "../db-workspace.js";
 import { readPausedSessionMetadata } from "../interrupted-session.js";
 import { gsdRoot } from "../paths.js";
+import { canonicalWorktreesDir } from "../worktree-placement.js";
 export class MigrationBlockedError extends Error {
     constructor(message) {
         super(message);
@@ -78,16 +79,26 @@ export function assertMigrationHasSlices(preview) {
     throw new MigrationBlockedError("Migration blocked - the legacy project would produce zero slices. Add a ROADMAP.md or phases/ content before migrating.");
 }
 function hasWorktreeState(targetRoot) {
-    const worktreesDir = join(gsdRoot(targetRoot), "worktrees");
-    if (!existsSync(worktreesDir))
-        return false;
-    try {
-        return readdirSync(worktreesDir, { withFileTypes: true })
-            .some((entry) => entry.isDirectory() || entry.isFile());
-    }
-    catch {
-        return true;
+    // Legacy container is probed via gsdRoot() (symlink-resolved) on purpose —
+    // migration targets may have .gsd in the external-state layout.
+    const containers = [
+        canonicalWorktreesDir(targetRoot),
+        join(gsdRoot(targetRoot), "worktrees"),
+    ];
+    for (const worktreesDir of containers) {
+        if (!existsSync(worktreesDir))
+            continue;
+        try {
+            if (readdirSync(worktreesDir, { withFileTypes: true })
+                .some((entry) => entry.isDirectory() || entry.isFile())) {
+                return true;
+            }
+        }
+        catch {
+            return true;
+        }
     }
+    return false;
 }
 export async function assertMigrationTargetAvailable(targetRoot) {
     const targetGsdPath = gsdRoot(targetRoot);
@@ -110,6 +121,6 @@ export async function assertMigrationTargetAvailable(targetRoot) {
         }
     }
     finally {
-        closeDatabase();
+        closeWorkflowDatabase();
     }
 }