gsd-pi 2.70.0 → 2.70.1

package/dist/loader.js

@@ -93,6 +93,10 @@ if (!existsSync(appRoot)) {
 }
 // GSD_CODING_AGENT_DIR — tells pi's getAgentDir() to return ~/.gsd/agent/ instead of ~/.gsd/agent/
 process.env.GSD_CODING_AGENT_DIR = agentDir;
+// GSD_PKG_ROOT — absolute path to gsd-pi package root. Used by deployed extensions
+// (e.g. auto.ts resume path) to import modules like resource-loader.js that live
+// in the package tree, not in the deployed ~/.gsd/agent/ tree.
+process.env.GSD_PKG_ROOT = gsdRoot;
 // RTK environment — make ~/.gsd/agent/bin visible to all child-process paths,
 // not just the bash tool, and force-disable RTK telemetry for GSD-managed use.
 applyRtkProcessEnv(process.env);

package/dist/resources/extensions/claude-code-cli/stream-adapter.js

@@ -10,6 +10,8 @@ import { EventStream } from "@gsd/pi-ai";
 import { execSync } from "node:child_process";
 import { PartialMessageBuilder, ZERO_USAGE, mapUsage } from "./partial-builder.js";
 import { buildWorkflowMcpServers } from "../gsd/workflow-mcp.js";
+import { showInterviewRound } from "../shared/tui.js";
+const OTHER_OPTION_LABEL = "None of the above";
 // ---------------------------------------------------------------------------
 // Stream factory
 // ---------------------------------------------------------------------------
@@ -124,6 +126,147 @@ export function makeStreamExhaustedErrorMessage(model, lastTextContent) {
     }
     return message;
 }
+function readElicitationChoices(options) {
+    if (!Array.isArray(options))
+        return [];
+    return options
+        .map((option) => (typeof option?.const === "string" ? option.const : typeof option?.title === "string" ? option.title : ""))
+        .filter((option) => option.length > 0);
+}
+export function parseAskUserQuestionsElicitation(request) {
+    if (request.mode && request.mode !== "form")
+        return null;
+    const properties = request.requestedSchema?.properties;
+    if (!properties || typeof properties !== "object")
+        return null;
+    const questions = [];
+    for (const [fieldId, rawField] of Object.entries(properties)) {
+        if (fieldId.endsWith("__note"))
+            continue;
+        if (!rawField || typeof rawField !== "object")
+            return null;
+        const header = typeof rawField.title === "string" && rawField.title.length > 0 ? rawField.title : fieldId;
+        const question = typeof rawField.description === "string" ? rawField.description : "";
+        if (rawField.type === "array") {
+            const options = readElicitationChoices(rawField.items?.anyOf).map((label) => ({ label, description: "" }));
+            if (options.length === 0)
+                return null;
+            questions.push({
+                id: fieldId,
+                header,
+                question,
+                options,
+                allowMultiple: true,
+            });
+            continue;
+        }
+        if (rawField.type === "string") {
+            const noteFieldId = Object.prototype.hasOwnProperty.call(properties, `${fieldId}__note`)
+                ? `${fieldId}__note`
+                : undefined;
+            const options = readElicitationChoices(rawField.oneOf)
+                .filter((label) => label !== OTHER_OPTION_LABEL)
+                .map((label) => ({ label, description: "" }));
+            if (options.length === 0)
+                return null;
+            questions.push({
+                id: fieldId,
+                header,
+                question,
+                options,
+                noteFieldId,
+            });
+            continue;
+        }
+        return null;
+    }
+    return questions.length > 0 ? questions : null;
+}
+export function roundResultToElicitationContent(questions, result) {
+    const content = {};
+    for (const question of questions) {
+        const answer = result.answers[question.id];
+        if (!answer)
+            continue;
+        if (question.allowMultiple) {
+            const selected = Array.isArray(answer.selected) ? answer.selected : [answer.selected];
+            content[question.id] = selected;
+            continue;
+        }
+        const selected = Array.isArray(answer.selected) ? answer.selected[0] ?? "" : answer.selected;
+        content[question.id] = selected;
+        if (question.noteFieldId && selected === OTHER_OPTION_LABEL && answer.notes.trim().length > 0) {
+            content[question.noteFieldId] = answer.notes.trim();
+        }
+    }
+    return content;
+}
+function buildElicitationPromptTitle(request, question) {
+    const parts = [
+        request.serverName ? `[${request.serverName}]` : "",
+        question.header,
+        question.question,
+    ].filter((part) => part && part.trim().length > 0);
+    return parts.join("\n\n");
+}
+async function promptElicitationWithDialogs(request, questions, ui, signal) {
+    const content = {};
+    for (const question of questions) {
+        const title = buildElicitationPromptTitle(request, question);
+        if (question.allowMultiple) {
+            const selected = await ui.select(title, question.options.map((option) => option.label), {
+                allowMultiple: true,
+                signal,
+            });
+            if (Array.isArray(selected)) {
+                if (selected.length === 0)
+                    return { action: "cancel" };
+                content[question.id] = selected;
+                continue;
+            }
+            if (typeof selected === "string" && selected.length > 0) {
+                content[question.id] = [selected];
+                continue;
+            }
+            return { action: "cancel" };
+        }
+        const selected = await ui.select(title, [...question.options.map((option) => option.label), OTHER_OPTION_LABEL], { signal });
+        if (typeof selected !== "string" || selected.length === 0) {
+            return { action: "cancel" };
+        }
+        content[question.id] = selected;
+        if (question.noteFieldId && selected === OTHER_OPTION_LABEL) {
+            const note = await ui.input(`${question.header} note`, "Explain your answer", { signal });
+            if (note === undefined)
+                return { action: "cancel" };
+            if (note.trim().length > 0) {
+                content[question.noteFieldId] = note.trim();
+            }
+        }
+    }
+    return { action: "accept", content };
+}
+export function createClaudeCodeElicitationHandler(ui) {
+    if (!ui)
+        return undefined;
+    return async (request, { signal }) => {
+        if (request.mode === "url") {
+            return { action: "decline" };
+        }
+        const questions = parseAskUserQuestionsElicitation(request);
+        if (!questions) {
+            return { action: "decline" };
+        }
+        const interviewResult = await showInterviewRound(questions, { signal }, { ui }).catch(() => undefined);
+        if (interviewResult && Object.keys(interviewResult.answers).length > 0) {
+            return {
+                action: "accept",
+                content: roundResultToElicitationContent(questions, interviewResult),
+            };
+        }
+        return promptElicitationWithDialogs(request, questions, ui, signal);
+    };
+}
 // ---------------------------------------------------------------------------
 // SDK options builder
 // ---------------------------------------------------------------------------
@@ -133,7 +276,7 @@ export function makeStreamExhaustedErrorMessage(model, lastTextContent) {
  * Extracted for testability — callers can verify session persistence,
  * beta flags, and other configuration without mocking the full SDK.
  */
-export function buildSdkOptions(modelId, prompt) {
+export function buildSdkOptions(modelId, prompt, extraOptions = {}) {
     const mcpServers = buildWorkflowMcpServers();
     return {
         pathToClaudeCodeExecutable: getClaudePath(),
@@ -147,6 +290,7 @@ export function buildSdkOptions(modelId, prompt) {
         systemPrompt: { type: "preset", preset: "claude_code" },
         ...(mcpServers ? { mcpServers } : {}),
         betas: modelId.includes("sonnet") ? ["context-1m-2025-08-07"] : [],
+        ...extraOptions,
     };
 }
 function normalizeToolResultContent(content) {
@@ -272,7 +416,11 @@ async function pumpSdkMessages(model, context, options, stream) {
             options.signal.addEventListener("abort", () => controller.abort(), { once: true });
         }
         const prompt = buildPromptFromContext(context);
-        const sdkOpts = buildSdkOptions(modelId, prompt);
+        const sdkOpts = buildSdkOptions(modelId, prompt, typeof options?.extensionUIContext === "object"
+            ? {
+                onElicitation: createClaudeCodeElicitationHandler(options?.extensionUIContext),
+            }
+            : {});
         const queryResult = sdk.query({
             prompt,
             options: {

package/dist/resources/extensions/gsd/auto-model-selection.js

@@ -8,10 +8,17 @@ import { classifyUnitComplexity, tierLabel } from "./complexity-classifier.js";
 import { resolveModelForComplexity, escalateTier, getEligibleModels, loadCapabilityOverrides, adjustToolSet } from "./model-router.js";
 import { getLedger, getProjectTotals } from "./metrics.js";
 import { unitPhaseLabel } from "./auto-dashboard.js";
-export function resolvePreferredModelConfig(unitType, autoModeStartModel) {
+export function resolvePreferredModelConfig(unitType, autoModeStartModel, 
+/** When false, only return explicit per-phase model configs — do not
+ *  synthesize a routing ceiling from dynamic_routing.tier_models (#3962). */
+isAutoMode = true) {
     const explicitConfig = resolveModelWithFallbacksForUnit(unitType);
     if (explicitConfig)
         return explicitConfig;
+    // In interactive mode, don't synthesize a routing-based model config.
+    // The user's session model (/model) should be used as-is (#3962).
+    if (!isAutoMode)
+        return undefined;
     const routingConfig = resolveDynamicRoutingConfig();
     if (!routingConfig.enabled || !routingConfig.tier_models)
         return undefined;
@@ -34,14 +41,23 @@ export function resolvePreferredModelConfig(unitType, autoModeStartModel) {
  *
  * Returns routing metadata for metrics tracking.
  */
-export async function selectAndApplyModel(ctx, pi, unitType, unitId, basePath, prefs, verbose, autoModeStartModel, retryContext) {
-    const modelConfig = resolvePreferredModelConfig(unitType, autoModeStartModel);
+export async function selectAndApplyModel(ctx, pi, unitType, unitId, basePath, prefs, verbose, autoModeStartModel, retryContext, 
+/** When false (interactive/guided-flow), skip dynamic routing and use the session model.
+ *  Dynamic routing only applies in auto-mode where cost optimization is expected. (#3962) */
+isAutoMode = true) {
+    const modelConfig = resolvePreferredModelConfig(unitType, autoModeStartModel, isAutoMode);
     let routing = null;
     let appliedModel = null;
     if (modelConfig) {
         const availableModels = ctx.modelRegistry.getAvailable();
         // ─── Dynamic Model Routing ─────────────────────────────────────────
+        // Dynamic routing (complexity-based downgrading) only applies in auto-mode.
+        // Interactive/guided-flow dispatches use the user's session model directly,
+        // respecting their /model selection without silent downgrades (#3962).
         const routingConfig = resolveDynamicRoutingConfig();
+        if (!isAutoMode) {
+            routingConfig.enabled = false;
+        }
         let effectiveModelConfig = modelConfig;
         let routingTierLabel = "";
         // Disable routing for flat-rate providers like GitHub Copilot (#3453).
@@ -85,9 +101,8 @@ export async function selectAndApplyModel(ctx, pi, unitType, unitId, basePath, p
                     const escalated = escalateTier(retryContext.previousTier);
                     if (escalated) {
                         classification = { ...classification, tier: escalated, reason: "escalated after failure" };
-                        if (verbose) {
-                            ctx.ui.notify(`Tier escalation: ${retryContext.previousTier} → ${escalated} (retry after failure)`, "info");
-                        }
+                        // Always notify on tier escalation — model changes should be visible (#3962)
+                        ctx.ui.notify(`Tier escalation: ${retryContext.previousTier} → ${escalated} (retry after failure)`, "info");
                     }
                 }
                 // Load user capability overrides from preferences (D-17: deep-merged with built-in profiles)
@@ -139,19 +154,18 @@ export async function selectAndApplyModel(ctx, pi, unitType, unitId, basePath, p
                         primary: routingResult.modelId,
                         fallbacks: routingResult.fallbacks,
                     };
-                    if (verbose) {
-                        if (routingResult.selectionMethod === "capability-scored" && routingResult.capabilityScores) {
-                            // Verbose scoring breakdown for capability-scored decisions (D-20)
-                            const tierLbl = tierLabel(classification.tier);
-                            const scores = Object.entries(routingResult.capabilityScores)
-                                .sort(([, a], [, b]) => b - a)
-                                .map(([id, score]) => `${id}: ${score.toFixed(1)}`)
-                                .join(", ");
-                            ctx.ui.notify(`Dynamic routing [${tierLbl}]: ${routingResult.modelId} (capability-scored) — ${scores}`, "info");
-                        }
-                        else {
-                            ctx.ui.notify(`Dynamic routing [${tierLabel(classification.tier)}]: ${routingResult.modelId} (${classification.reason})`, "info");
-                        }
+                    // Always notify on model downgrade — users should see when their
+                    // model selection is overridden, not just in verbose mode (#3962).
+                    if (routingResult.selectionMethod === "capability-scored" && routingResult.capabilityScores) {
+                        const tierLbl = tierLabel(classification.tier);
+                        const scores = Object.entries(routingResult.capabilityScores)
+                            .sort(([, a], [, b]) => b - a)
+                            .map(([id, score]) => `${id}: ${score.toFixed(1)}`)
+                            .join(", ");
+                        ctx.ui.notify(`Dynamic routing [${tierLbl}]: ${routingResult.modelId} (capability-scored) — ${scores}`, "info");
+                    }
+                    else {
+                        ctx.ui.notify(`Dynamic routing [${tierLabel(classification.tier)}]: ${routingResult.modelId} (${classification.reason})`, "info");
                     }
                 }
                 routingTierLabel = ` [${tierLabel(classification.tier)}]`;

package/dist/resources/extensions/gsd/auto-prompts.js

@@ -876,7 +876,7 @@ export async function buildDiscussMilestonePrompt(mid, midTitle, base) {
         milestoneId: mid,
         milestoneTitle: midTitle,
         inlinedTemplates: discussTemplates,
-        structuredQuestionsAvailable: "true",
+        structuredQuestionsAvailable: "false",
         commitInstruction: "Do not commit planning artifacts — .gsd/ is managed externally.",
         fastPathInstruction: "",
     });
@@ -1319,7 +1319,9 @@ export async function buildCompleteMilestonePrompt(mid, midTitle, base, level) {
     try {
         const { isDbAvailable, getMilestoneSlices } = await import("./gsd-db.js");
         if (isDbAvailable()) {
-            sliceIds = getMilestoneSlices(mid).map(s => s.id);
+            sliceIds = getMilestoneSlices(mid)
+                .filter(s => s.status !== "skipped")
+                .map(s => s.id);
         }
     }
     catch (err) {
@@ -1415,7 +1417,9 @@ export async function buildValidateMilestonePrompt(mid, midTitle, base, level) {
     try {
         const { isDbAvailable, getMilestoneSlices } = await import("./gsd-db.js");
         if (isDbAvailable()) {
-            valSliceIds = getMilestoneSlices(mid).map(s => s.id);
+            valSliceIds = getMilestoneSlices(mid)
+                .filter(s => s.status !== "skipped")
+                .map(s => s.id);
         }
     }
     catch (err) {

package/dist/resources/extensions/gsd/auto-start.js

@@ -38,7 +38,7 @@ import { existsSync, mkdirSync, readdirSync, rmSync, statSync, unlinkSync, } fro
 import { join } from "node:path";
 import { sep as pathSep } from "node:path";
 import { resolveProjectRootDbPath } from "./bootstrap/dynamic-tools.js";
-import { resolveDefaultSessionModel } from "./preferences-models.js";
+import { resolveDefaultSessionModel, resolveDynamicRoutingConfig } from "./preferences-models.js";
 /**
  * Bootstrap a fresh auto-mode session. Handles everything from git init
  * through secrets collection, returning when ready for the first
@@ -609,6 +609,30 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
             ? `Will loop through ${pendingCount} milestones.`
             : "Will loop until milestone complete.";
         ctx.ui.notify(`${modeLabel} started. ${scopeMsg}`, "info");
+        // Show dynamic routing status so users know upfront if models will be
+        // downgraded for simple tasks (#3962).
+        // Use the same effective logic as selectAndApplyModel: check flat-rate
+        // provider suppression and resolve the actual ceiling model.
+        const routingConfig = resolveDynamicRoutingConfig();
+        const startModelLabel = s.autoModeStartModel
+            ? `${s.autoModeStartModel.provider}/${s.autoModeStartModel.id}`
+            : ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : "default";
+        // Flat-rate providers (e.g. GitHub Copilot, claude-code) suppress routing
+        // at dispatch time (#3453) — reflect that in the banner.
+        const { isFlatRateProvider } = await import("./auto-model-selection.js");
+        const effectiveProvider = s.autoModeStartModel?.provider ?? ctx.model?.provider;
+        const effectivelyEnabled = routingConfig.enabled
+            && !(effectiveProvider && isFlatRateProvider(effectiveProvider));
+        // The actual ceiling may come from tier_models.heavy, not the start model.
+        const effectiveCeiling = (routingConfig.enabled && routingConfig.tier_models?.heavy)
+            ? routingConfig.tier_models.heavy
+            : startModelLabel;
+        if (effectivelyEnabled) {
+            ctx.ui.notify(`Dynamic routing: enabled — simple tasks may use cheaper models (ceiling: ${effectiveCeiling})`, "info");
+        }
+        else {
+            ctx.ui.notify(`Dynamic routing: disabled — all tasks will use ${startModelLabel}`, "info");
+        }
         updateSessionLock(lockBase(), "starting", s.currentMilestoneId ?? "unknown");
         writeLock(lockBase(), "starting", s.currentMilestoneId ?? "unknown");
         // Secrets collection gate

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

@@ -37,9 +37,9 @@ import { getRtkSessionSavings } from "../shared/rtk-session-stats.js";
 import { initMetrics, resetMetrics, getLedger, getProjectTotals, formatCost, formatTokenCount, } from "./metrics.js";
 import { logWarning } from "./workflow-logger.js";
 import { homedir } from "node:os";
-import { join, dirname } from "node:path";
+import { join } from "node:path";
+import { pathToFileURL } from "node:url";
 import { readFileSync, existsSync, mkdirSync, writeFileSync, unlinkSync } from "node:fs";
-import { createRequire } from "node:module";
 import { atomicWriteSync } from "./atomic-write.js";
 import { autoCommitCurrentBranch, captureIntegrationBranch, detectWorktreeName, getCurrentBranch, getMainBranch, setActiveMilestoneId, } from "./worktree.js";
 import { GitServiceImpl } from "./git-service.js";
@@ -1021,13 +1021,17 @@ export async function startAuto(ctx, pi, base, verboseMode, options) {
         restoreHookState(s.basePath);
         // Re-sync managed resources on resume so long-lived auto sessions pick up
         // bundled extension updates before resume-time verification/state logic runs.
+        // GSD_PKG_ROOT is set by loader.ts and points to the gsd-pi package root.
+        // The relative import ("../../../resource-loader.js") only works from the source
+        // tree; deployed extensions live at ~/.gsd/agent/extensions/gsd/ where the
+        // relative path resolves to ~/.gsd/agent/resource-loader.js which doesn't exist.
+        // Using GSD_PKG_ROOT constructs a correct absolute path in both contexts (#3949).
         const agentDir = process.env.GSD_CODING_AGENT_DIR || join(process.env.GSD_HOME || homedir(), ".gsd", "agent");
-        // Resolve resource-loader from the gsd-pi package root — the relative
-        // "../../../resource-loader.js" path only works from the source tree but
-        // breaks when extensions are deployed to ~/.gsd/agent/extensions/gsd/.
-        const _req = createRequire(import.meta.url);
-        const pkgRoot = dirname(_req.resolve("gsd-pi/package.json"));
-        const { initResources } = await import(join(pkgRoot, "dist", "resource-loader.js"));
+        const pkgRoot = process.env.GSD_PKG_ROOT;
+        const resourceLoaderPath = pkgRoot
+            ? pathToFileURL(join(pkgRoot, "dist", "resource-loader.js")).href
+            : new URL("../../../resource-loader.js", import.meta.url).href;
+        const { initResources } = await import(resourceLoaderPath);
         initResources(agentDir);
         // Open the project DB before rebuild/derive so resume uses DB-backed
         // state instead of falling back to stale markdown parsing (#2940).

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

@@ -15,6 +15,26 @@ import { isAutoActive, checkRemoteAutoSession } from "./auto.js";
 import { getAutoWorktreePath } from "./auto-worktree.js";
 import { projectRoot } from "./commands/context.js";
 import { loadPrompt } from "./prompt-loader.js";
+const UPDATE_REGISTRY_URL = "https://registry.npmjs.org/gsd-pi/latest";
+const UPDATE_FETCH_TIMEOUT_MS = 5000;
+async function fetchLatestVersionForCommand() {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), UPDATE_FETCH_TIMEOUT_MS);
+    try {
+        const res = await fetch(UPDATE_REGISTRY_URL, { signal: controller.signal });
+        if (!res.ok)
+            return null;
+        const data = (await res.json());
+        const latest = typeof data.version === "string" ? data.version.trim().replace(/^v/, "") : "";
+        return latest.length > 0 ? latest : null;
+    }
+    catch {
+        return null;
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
 export function dispatchDoctorHeal(pi, scope, reportText, structuredIssues) {
     const workflowPath = process.env.GSD_WORKFLOW_PATH ?? join(process.env.HOME ?? "~", ".gsd", "agent", "GSD-WORKFLOW.md");
     const workflow = readFileSync(workflowPath, "utf-8");
@@ -311,14 +331,8 @@ export async function handleUpdate(ctx) {
     const NPM_PACKAGE = "gsd-pi";
     const current = process.env.GSD_VERSION || "0.0.0";
     ctx.ui.notify(`Current version: v${current}\nChecking npm registry...`, "info");
-    let latest;
-    try {
-        latest = execSync(`npm view ${NPM_PACKAGE} version`, {
-            encoding: "utf-8",
-            stdio: ["ignore", "pipe", "ignore"],
-        }).trim();
-    }
-    catch {
+    const latest = await fetchLatestVersionForCommand();
+    if (!latest) {
         ctx.ui.notify("Failed to reach npm registry. Check your network connection.", "error");
         return;
     }

package/dist/resources/extensions/gsd/doctor-engine-checks.js

@@ -6,6 +6,18 @@ import { deriveState } from "./state.js";
 import { readEvents } from "./workflow-events.js";
 import { renderAllProjections } from "./workflow-projections.js";
 export async function checkEngineHealth(basePath, issues, fixesApplied) {
+    const dbPath = join(basePath, ".gsd", "gsd.db");
+    if (!isDbAvailable() && existsSync(dbPath)) {
+        issues.push({
+            severity: "warning",
+            code: "db_unavailable",
+            scope: "project",
+            unitId: "project",
+            message: "Database unavailable — using filesystem state derivation (degraded mode). State queries may be slower and less reliable.",
+            file: ".gsd/gsd.db",
+            fixable: false,
+        });
+    }
     // ── DB constraint violation detection (full doctor only, not pre-dispatch per D-10) ──
     try {
         if (isDbAvailable()) {

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

@@ -1,6 +1,8 @@
 function matchesScope(unitId, scope) {
     if (!scope)
         return true;
+    if (unitId === "project" || unitId === "environment")
+        return true;
     return unitId === scope || unitId.startsWith(`${scope}/`) || unitId.startsWith(`${scope}`);
 }
 export function summarizeDoctorIssues(issues) {

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

@@ -35,7 +35,7 @@ import { findMilestoneIds, nextMilestoneId, reserveMilestoneId, getReservedMiles
 import { parkMilestone, discardMilestone } from "./milestone-actions.js";
 import { selectAndApplyModel } from "./auto-model-selection.js";
 import { DISCUSS_TOOLS_ALLOWLIST } from "./constants.js";
-import { getWorkflowTransportSupportError, getRequiredWorkflowToolsForGuidedUnit, } from "./workflow-mcp.js";
+import { getWorkflowTransportSupportError, getRequiredWorkflowToolsForGuidedUnit, supportsStructuredQuestions, } from "./workflow-mcp.js";
 import { runPreparation, formatCodebaseBrief, formatPriorContextBrief, } from "./preparation.js";
 // ─── Re-exports (preserve public API for existing importers) ────────────────
 export { MILESTONE_ID_RE, generateMilestoneSuffix, nextMilestoneId, extractMilestoneSeq, parseMilestoneId, milestoneIdSort, maxMilestoneNum, findMilestoneIds, reserveMilestoneId, claimReservedId, getReservedMilestoneIds, clearReservedMilestoneIds, } from "./milestone-ids.js";
@@ -236,7 +236,8 @@ async function dispatchWorkflow(pi, note, customType = "gsd-run", ctx, unitType)
     // tier downgrade, fallback chains) — same path as auto-mode dispatches (#2958).
     if (ctx && unitType) {
         const prefs = loadEffectiveGSDPreferences()?.preferences;
-        const result = await selectAndApplyModel(ctx, pi, unitType, /* unitId */ "", /* basePath */ process.cwd(), prefs, /* verbose */ false, /* autoModeStartModel */ null);
+        const result = await selectAndApplyModel(ctx, pi, unitType, /* unitId */ "", /* basePath */ process.cwd(), prefs, /* verbose */ false, /* autoModeStartModel */ null, 
+        /* retryContext */ undefined, /* isAutoMode */ false);
         if (result.appliedModel) {
             debugLog("guided-flow-model-applied", {
                 unitType,
@@ -294,6 +295,16 @@ async function dispatchWorkflow(pi, note, customType = "gsd-run", ctx, unitType)
         pi.setActiveTools(savedTools);
     }
 }
+function getStructuredQuestionsAvailability(pi, ctx) {
+    if (!ctx)
+        return "false";
+    const provider = ctx.model?.provider;
+    const authMode = provider ? ctx.modelRegistry.getProviderAuthMode(provider) : undefined;
+    return supportsStructuredQuestions(pi.getActiveTools(), {
+        authMode,
+        baseUrl: ctx.model?.baseUrl,
+    }) ? "true" : "false";
+}
 /**
  * Resolve a model ID string to a model object from available models.
  * Handles "provider/model" and bare ID formats.
@@ -600,7 +611,7 @@ export async function showDiscuss(ctx, pi, basePath) {
         });
         if (choice === "discuss_draft") {
             const discussMilestoneTemplates = inlineTemplate("context", "Context");
-            const structuredQuestionsAvailable = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
+            const structuredQuestionsAvailable = getStructuredQuestionsAvailability(pi, ctx);
             const basePrompt = loadPrompt("guided-discuss-milestone", {
                 milestoneId: mid, milestoneTitle, inlinedTemplates: discussMilestoneTemplates, structuredQuestionsAvailable,
                 commitInstruction: buildDocsCommitInstruction(`docs(${mid}): milestone context from discuss`),
@@ -614,7 +625,7 @@ export async function showDiscuss(ctx, pi, basePath) {
         }
         else if (choice === "discuss_fresh") {
             const discussMilestoneTemplates = inlineTemplate("context", "Context");
-            const structuredQuestionsAvailable = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
+            const structuredQuestionsAvailable = getStructuredQuestionsAvailability(pi, ctx);
             pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: mid, step: false, createdAt: Date.now() });
             await dispatchWorkflow(pi, loadPrompt("guided-discuss-milestone", {
                 milestoneId: mid, milestoneTitle, inlinedTemplates: discussMilestoneTemplates, structuredQuestionsAvailable,
@@ -757,7 +768,7 @@ export async function showDiscuss(ctx, pi, basePath) {
             if (confirm !== "rediscuss")
                 continue;
         }
-        const sqAvail = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
+        const sqAvail = getStructuredQuestionsAvailability(pi, ctx);
         const prompt = await buildDiscussSlicePrompt(mid, chosen.id, chosen.title, basePath, { rediscuss: isRediscuss, structuredQuestionsAvailable: sqAvail });
         await dispatchWorkflow(pi, prompt, "gsd-discuss", ctx, "discuss-slice");
         // Wait for the discuss session to finish, then loop back to the picker
@@ -848,7 +859,7 @@ async function dispatchDiscussForMilestone(ctx, pi, basePath, mid, milestoneTitl
         ].join("\n")
         : "";
     const discussMilestoneTemplates = inlineTemplate("context", "Context");
-    const structuredQuestionsAvailable = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
+    const structuredQuestionsAvailable = getStructuredQuestionsAvailability(pi, ctx);
     const basePrompt = loadPrompt("guided-discuss-milestone", {
         milestoneId: mid,
         milestoneTitle,
@@ -1237,7 +1248,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
         });
         if (choice === "discuss_draft") {
             const discussMilestoneTemplates = inlineTemplate("context", "Context");
-            const structuredQuestionsAvailable = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
+            const structuredQuestionsAvailable = getStructuredQuestionsAvailability(pi, ctx);
             const basePrompt = loadPrompt("guided-discuss-milestone", {
                 milestoneId, milestoneTitle, inlinedTemplates: discussMilestoneTemplates, structuredQuestionsAvailable,
                 commitInstruction: buildDocsCommitInstruction(`docs(${milestoneId}): milestone context from discuss`),
@@ -1251,7 +1262,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
         }
         else if (choice === "discuss_fresh") {
             const discussMilestoneTemplates = inlineTemplate("context", "Context");
-            const structuredQuestionsAvailable = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
+            const structuredQuestionsAvailable = getStructuredQuestionsAvailability(pi, ctx);
             pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId, step: stepMode, createdAt: Date.now() });
             await dispatchWorkflow(pi, loadPrompt("guided-discuss-milestone", {
                 milestoneId, milestoneTitle, inlinedTemplates: discussMilestoneTemplates, structuredQuestionsAvailable,
@@ -1342,7 +1353,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             }
             else if (choice === "discuss") {
                 const discussMilestoneTemplates = inlineTemplate("context", "Context");
-                const structuredQuestionsAvailable = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
+                const structuredQuestionsAvailable = getStructuredQuestionsAvailability(pi, ctx);
                 await dispatchWorkflow(pi, loadPrompt("guided-discuss-milestone", {
                     milestoneId, milestoneTitle, inlinedTemplates: discussMilestoneTemplates, structuredQuestionsAvailable,
                     commitInstruction: buildDocsCommitInstruction(`docs(${milestoneId}): milestone context from discuss`),
@@ -1480,7 +1491,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             }), "gsd-run", ctx, "plan-slice");
         }
         else if (choice === "discuss") {
-            const sqAvail = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
+            const sqAvail = getStructuredQuestionsAvailability(pi, ctx);
             await dispatchWorkflow(pi, await buildDiscussSlicePrompt(milestoneId, sliceId, sliceTitle, basePath, { rediscuss: hasContext, structuredQuestionsAvailable: sqAvail }), "gsd-run", ctx, "discuss-slice");
         }
         else if (choice === "research") {

package/dist/resources/extensions/gsd/pre-execution-checks.js

@@ -16,6 +16,7 @@
 import { existsSync } from "node:fs";
 import { spawn } from "node:child_process";
 import { resolve } from "node:path";
+const NPM_COMMAND = process.platform === "win32" ? "npm.cmd" : "npm";
 // ─── Package Existence Check ─────────────────────────────────────────────────
 /**
  * Extract npm package names from task descriptions.
@@ -98,9 +99,10 @@ function normalizePackageName(raw) {
  */
 async function checkPackageOnNpm(packageName, timeoutMs = 5000) {
     return new Promise((resolve) => {
-        const child = spawn("npm", ["view", packageName, "name"], {
+        const child = spawn(NPM_COMMAND, ["view", packageName, "name"], {
             stdio: ["ignore", "pipe", "pipe"],
             timeout: timeoutMs,
+            shell: process.platform === "win32",
         });
         let stdout = "";
         let stderr = "";
@@ -216,9 +218,9 @@ function extractPathFromAnnotation(raw) {
     const trimmed = raw.trim();
     if (!trimmed)
         return trimmed;
-    const backtickMatch = trimmed.match(/^`([^`]+)`(?:\s+[—–-]\s+.*)?$/);
+    const backtickMatch = trimmed.match(/^(`+)([^`]+)\1(?:(?:\s+[—–-]\s+.+)|(?:\s+\([^()]+\)))?$/);
     if (backtickMatch) {
-        return backtickMatch[1].trim();
+        return backtickMatch[2].trim();
     }
     const annotatedMatch = trimmed.match(/^(.+?)\s+[—–-]\s+.+$/);
     if (annotatedMatch) {