gsd-pi 2.38.0-dev.96dc7fb → 2.38.0-dev.98b44dc

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

@@ -11,12 +11,10 @@ import { runProviderChecks, summariseProviderIssues } from "./doctor-providers.j
 import { runEnvironmentChecks } from "./doctor-environment.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { loadLedgerFromDisk, getProjectTotals } from "./metrics.js";
-import { describeNextUnit, estimateTimeRemaining, updateSliceProgressCache } from "./auto-dashboard.js";
 import { projectRoot } from "./commands.js";
-import { deriveState, invalidateStateCache } from "./state.js";
 import { buildHealthLines, detectHealthWidgetProjectState, } from "./health-widget-core.js";
 // ── Data loader ────────────────────────────────────────────────────────────────
-function loadBaseHealthWidgetData(basePath) {
+function loadHealthWidgetData(basePath) {
     let budgetCeiling;
     let budgetSpent = 0;
     let providerIssue = null;
@@ -58,86 +56,6 @@ function loadBaseHealthWidgetData(basePath) {
         lastRefreshed: Date.now(),
     };
 }
-function compactText(text, max = 64) {
-    const trimmed = text.replace(/\s+/g, " ").trim();
-    if (trimmed.length <= max)
-        return trimmed;
-    return `${trimmed.slice(0, max - 1).trimEnd()}…`;
-}
-function summarizeExecutionStatus(state) {
-    switch (state.phase) {
-        case "blocked": return "Blocked";
-        case "paused": return "Paused";
-        case "complete": return "Complete";
-        case "executing": return "Executing";
-        case "planning": return "Planning";
-        case "pre-planning": return "Pre-planning";
-        case "summarizing": return "Summarizing";
-        case "validating-milestone": return "Validating";
-        case "completing-milestone": return "Completing";
-        case "needs-discussion": return "Needs discussion";
-        case "replanning-slice": return "Replanning";
-        default: return "Active";
-    }
-}
-function summarizeExecutionTarget(state) {
-    switch (state.phase) {
-        case "needs-discussion":
-            return state.activeMilestone ? `Discuss ${state.activeMilestone.id}` : "Discuss milestone draft";
-        case "pre-planning":
-            return state.activeMilestone ? `Plan ${state.activeMilestone.id}` : "Research & plan milestone";
-        case "planning":
-            return state.activeSlice ? `Plan ${state.activeSlice.id}` : "Plan next slice";
-        case "executing":
-            return state.activeTask ? `Execute ${state.activeTask.id}` : "Execute next task";
-        case "summarizing":
-            return state.activeSlice ? `Complete ${state.activeSlice.id}` : "Complete current slice";
-        case "validating-milestone":
-            return state.activeMilestone ? `Validate ${state.activeMilestone.id}` : "Validate milestone";
-        case "completing-milestone":
-            return state.activeMilestone ? `Complete ${state.activeMilestone.id}` : "Complete milestone";
-        case "replanning-slice":
-            return state.activeSlice ? `Replan ${state.activeSlice.id}` : "Replan current slice";
-        case "blocked":
-            return `waiting on ${compactText(state.blockers[0] ?? state.nextAction, 56)}`;
-        case "paused":
-            return compactText(state.nextAction || "waiting to resume", 56);
-        case "complete":
-            return "All milestones complete";
-        default:
-            return compactText(describeNextUnit(state).label, 56);
-    }
-}
-async function enrichHealthWidgetData(basePath, baseData) {
-    if (baseData.projectState !== "active")
-        return baseData;
-    try {
-        invalidateStateCache();
-        const state = await deriveState(basePath);
-        if (state.activeMilestone) {
-            // Warm the slice-progress cache so estimateTimeRemaining() has data
-            updateSliceProgressCache(basePath, state.activeMilestone.id, state.activeSlice?.id);
-        }
-        return {
-            ...baseData,
-            executionPhase: state.phase,
-            executionStatus: summarizeExecutionStatus(state),
-            executionTarget: summarizeExecutionTarget(state),
-            nextAction: state.nextAction,
-            blocker: state.blockers[0] ?? null,
-            activeMilestoneId: state.activeMilestone?.id,
-            activeSliceId: state.activeSlice?.id,
-            activeTaskId: state.activeTask?.id,
-            progress: state.progress,
-            eta: state.phase === "blocked" || state.phase === "paused" || state.phase === "complete"
-                ? null
-                : estimateTimeRemaining(),
-        };
-    }
-    catch {
-        return baseData;
-    }
-}
 // ── Widget init ────────────────────────────────────────────────────────────────
 const REFRESH_INTERVAL_MS = 60_000;
 /**
@@ -149,7 +67,7 @@ export function initHealthWidget(ctx) {
         return;
     const basePath = projectRoot();
     // String-array fallback — used in RPC mode (factory is a no-op there)
-    const initialData = loadBaseHealthWidgetData(basePath);
+    const initialData = loadHealthWidgetData(basePath);
     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) => {
@@ -161,8 +79,7 @@ export function initHealthWidget(ctx) {
                 return;
             refreshInFlight = true;
             try {
-                const baseData = loadBaseHealthWidgetData(basePath);
-                data = await enrichHealthWidgetData(basePath, baseData);
+                data = loadHealthWidgetData(basePath);
                 cachedLines = undefined;
                 _tui.requestRender();
             }

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

@@ -41,6 +41,7 @@ import { join } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { shortcutDesc } from "../shared/mod.js";
+const gsdHome = process.env.GSD_HOME || join(homedir(), ".gsd");
 import { Text } from "@gsd/pi-tui";
 import { pauseAutoForProviderError, classifyProviderError } from "./provider-error-pause.js";
 import { toPosixPath } from "../shared/mod.js";
@@ -52,7 +53,7 @@ import { markCmuxPromptShown, shouldPromptToEnableCmux } from "../cmux/index.js"
 // Pi core natively supports AGENTS.md (with CLAUDE.md fallback) per directory.
 function warnDeprecatedAgentInstructions() {
     const paths = [
-        join(homedir(), ".gsd", "agent-instructions.md"),
+        join(gsdHome, "agent-instructions.md"),
         join(process.cwd(), ".gsd", "agent-instructions.md"),
     ];
     for (const p of paths) {
@@ -65,6 +66,24 @@ function warnDeprecatedAgentInstructions() {
 }
 // ── Depth verification state ──────────────────────────────────────────────
 let depthVerificationDone = false;
+// ── DB lazy-open helper ───────────────────────────────────────────────────
+// In manual sessions (no auto-mode), the DB is never opened by bootstrapAutoSession.
+// This helper ensures the DB is lazily opened on first tool call that needs it.
+async function ensureDbOpen() {
+    try {
+        const db = await import("./gsd-db.js");
+        if (db.isDbAvailable())
+            return true;
+        const dbPath = join(process.cwd(), ".gsd", "gsd.db");
+        if (existsSync(dbPath)) {
+            return db.openDatabase(dbPath);
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
 // ── Queue phase tracking ──────────────────────────────────────────────────
 // When true, the LLM is in a queue flow writing CONTEXT.md files.
 // The write-gate applies during queue flows just like discussion flows.
@@ -227,13 +246,8 @@ export default function (pi) {
             when_context: Type.Optional(Type.String({ description: "When/context for the decision (e.g. milestone ID)" })),
         }),
         async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-            // Check DB availability
-            let dbAvailable = false;
-            try {
-                const db = await import("./gsd-db.js");
-                dbAvailable = db.isDbAvailable();
-            }
-            catch { /* dynamic import failed */ }
+            // Ensure DB is open (lazy-open on first tool call in manual sessions)
+            const dbAvailable = await ensureDbOpen();
             if (!dbAvailable) {
                 return {
                     content: [{ type: "text", text: "Error: GSD database is not available. Cannot save decision." }],
@@ -289,12 +303,7 @@ export default function (pi) {
             supporting_slices: Type.Optional(Type.String({ description: "Supporting slices" })),
         }),
         async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-            let dbAvailable = false;
-            try {
-                const db = await import("./gsd-db.js");
-                dbAvailable = db.isDbAvailable();
-            }
-            catch { /* dynamic import failed */ }
+            const dbAvailable = await ensureDbOpen();
             if (!dbAvailable) {
                 return {
                     content: [{ type: "text", text: "Error: GSD database is not available. Cannot update requirement." }],
@@ -364,12 +373,7 @@ export default function (pi) {
             content: Type.String({ description: "The full markdown content of the artifact" }),
         }),
         async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-            let dbAvailable = false;
-            try {
-                const db = await import("./gsd-db.js");
-                dbAvailable = db.isDbAvailable();
-            }
-            catch { /* dynamic import failed */ }
+            const dbAvailable = await ensureDbOpen();
             if (!dbAvailable) {
                 return {
                     content: [{ type: "text", text: "Error: GSD database is not available. Cannot save artifact." }],

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

@@ -2,7 +2,7 @@
 // Pure functions that take file content (string) and return typed data.
 // Zero Pi dependencies — uses only exported helpers from files.ts.
 import { splitFrontmatter, parseFrontmatterMap, extractBoldField } from '../files.js';
-import { normalizeStringArray } from '../../shared/mod.js';
+import { normalizeStringArray } from '../../shared/format-utils.js';
 // Re-export PlanningProjectMeta — not in types.ts yet, use string for project field
 // Actually PlanningProjectMeta isn't in types.ts — project is stored as string | null.
 // We'll keep parseOldProject returning a simple shape.

package/dist/resources/extensions/gsd/migrate-external.js

@@ -5,11 +5,13 @@
  * `~/.gsd/projects/<hash>/` state directory. After migration, a
  * symlink replaces the original directory so all paths remain valid.
  */
+import { execFileSync } from "node:child_process";
 import { existsSync, lstatSync, mkdirSync, readdirSync, realpathSync, renameSync, cpSync, rmSync, symlinkSync } from "node:fs";
 import { join } from "node:path";
 import { externalGsdRoot } from "./repo-identity.js";
 import { getErrorMessage } from "./error-utils.js";
 import { hasGitTrackedGsdFiles } from "./gitignore.js";
+import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
 /**
  * Migrate a legacy in-project `.gsd/` directory to external storage.
  *
@@ -142,7 +144,22 @@ export function migrateToExternalState(basePath) {
             catch { /* best-effort restore */ }
             return { migrated: false, error: `Migration verification failed: ${getErrorMessage(verifyErr)}` };
         }
-        // Remove .gsd.migrating only after symlink is verified
+        // Clean the git index — any .gsd/* files tracked before migration now
+        // sit behind the symlink and git can't follow it, causing them to show
+        // as deleted. Remove them from the index so the working tree stays clean.
+        // --ignore-unmatch makes this a no-op on fresh projects with no tracked .gsd/.
+        try {
+            execFileSync("git", ["rm", "-r", "--cached", "--ignore-unmatch", ".gsd"], {
+                cwd: basePath,
+                stdio: ["ignore", "pipe", "ignore"],
+                env: GIT_NO_PROMPT_ENV,
+                timeout: 10_000,
+            });
+        }
+        catch {
+            // Non-fatal — git may be unavailable or nothing was tracked
+        }
+        // Remove .gsd.migrating only after symlink is verified and index is clean
         rmSync(migratingPath, { recursive: true, force: true });
         return { migrated: true };
     }

package/dist/resources/extensions/gsd/native-git-bridge.js

@@ -518,6 +518,43 @@ export function nativeAddAll(basePath) {
     }
     gitFileExec(basePath, ["add", "-A"]);
 }
+/**
+ * Stage all files with pathspec exclusions (git add -A -- ':!pattern' ...).
+ * Excluded paths are never hashed by git, preventing hangs on large
+ * untracked artifact trees (57GB+, 11K+ files). See #1605.
+ *
+ * Falls back to plain `git add -A` when no exclusions are provided.
+ * Always uses the CLI path (not libgit2) because libgit2's add_all
+ * does not support pathspec exclusion syntax.
+ *
+ * When excluded paths are already covered by .gitignore, git may exit
+ * with code 1 and an "ignored by .gitignore" warning. This is harmless
+ * (the staging succeeds for all non-ignored files) and is suppressed.
+ */
+export function nativeAddAllWithExclusions(basePath, exclusions) {
+    if (exclusions.length === 0) {
+        nativeAddAll(basePath);
+        return;
+    }
+    const pathspecs = exclusions.map(e => `:!${e}`);
+    try {
+        execFileSync("git", ["add", "-A", "--", ...pathspecs], {
+            cwd: basePath,
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+            env: GIT_NO_PROMPT_ENV,
+        });
+    }
+    catch (err) {
+        // git exits 1 when pathspec exclusions reference paths already covered
+        // by .gitignore. The staging itself succeeds — only suppress that case.
+        const stderr = err?.stderr ?? "";
+        if (stderr.includes("ignored by one of your .gitignore files")) {
+            return;
+        }
+        throw new GSDError(GSD_GIT_ERROR, `git add -A with exclusions failed in ${basePath}: ${getErrorMessage(err)}`);
+    }
+}
 /**
  * Stage specific files.
  * Native: libgit2 index add.

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

@@ -343,6 +343,9 @@ function probeGsdRoot(rawBasePath) {
 export function milestonesDir(basePath) {
     return join(gsdRoot(basePath), "milestones");
 }
+export function resolveRuntimeFile(basePath) {
+    return join(gsdRoot(basePath), "RUNTIME.md");
+}
 export function resolveGsdRootFile(basePath, key) {
     const root = gsdRoot(basePath);
     const canonical = join(root, GSD_ROOT_FILES[key]);

package/dist/resources/extensions/gsd/preferences-models.js

@@ -260,18 +260,6 @@ export function resolveInlineLevel() {
         case "quality": return "full";
     }
 }
-/**
- * Resolve the compression strategy from the active token profile.
- * budget/balanced -> "compress", quality -> "truncate".
- * Explicit preference always wins.
- */
-export function resolveCompressionStrategy() {
-    const prefs = loadEffectiveGSDPreferences();
-    if (prefs?.preferences.compression_strategy)
-        return prefs.preferences.compression_strategy;
-    const profile = resolveEffectiveProfile();
-    return profile === "quality" ? "truncate" : "compress";
-}
 /**
  * Resolve the context selection mode from the active token profile.
  * budget -> "smart", balanced/quality -> "full".

package/dist/resources/extensions/gsd/preferences-types.js

@@ -62,10 +62,10 @@ export const KNOWN_PREFERENCE_KEYS = new Set([
     "verification_auto_fix",
     "verification_max_retries",
     "search_provider",
-    "compression_strategy",
     "context_selection",
     "widget_mode",
     "reactive_execution",
+    "github",
 ]);
 /** Canonical list of all dispatch unit types. */
 export const KNOWN_UNIT_TYPES = [

package/dist/resources/extensions/gsd/preferences-validation.js

@@ -6,7 +6,7 @@
  * together with any errors and warnings.
  */
 import { VALID_BRANCH_NAME } from "./git-service.js";
-import { normalizeStringArray } from "../shared/mod.js";
+import { normalizeStringArray } from "../shared/format-utils.js";
 import { KNOWN_PREFERENCE_KEYS, KNOWN_UNIT_TYPES, SKILL_ACTIONS, } from "./preferences-types.js";
 const VALID_TOKEN_PROFILES = new Set(["budget", "balanced", "quality"]);
 export function validatePreferences(preferences) {
@@ -707,16 +707,6 @@ export function validatePreferences(preferences) {
             errors.push("auto_report must be a boolean");
         }
     }
-    // ─── Compression Strategy ───────────────────────────────────────────
-    if (preferences.compression_strategy !== undefined) {
-        const validStrategies = new Set(["truncate", "compress"]);
-        if (typeof preferences.compression_strategy === "string" && validStrategies.has(preferences.compression_strategy)) {
-            validated.compression_strategy = preferences.compression_strategy;
-        }
-        else {
-            errors.push(`compression_strategy must be one of: truncate, compress`);
-        }
-    }
     // ─── Context Selection ──────────────────────────────────────────────
     if (preferences.context_selection !== undefined) {
         const validModes = new Set(["full", "smart"]);
@@ -727,5 +717,63 @@ export function validatePreferences(preferences) {
             errors.push(`context_selection must be one of: full, smart`);
         }
     }
+    // ─── GitHub Sync ────────────────────────────────────────────────────────
+    if (preferences.github !== undefined) {
+        if (typeof preferences.github === "object" && preferences.github !== null) {
+            const gh = preferences.github;
+            const validGh = {};
+            if (gh.enabled !== undefined) {
+                if (typeof gh.enabled === "boolean")
+                    validGh.enabled = gh.enabled;
+                else
+                    errors.push("github.enabled must be a boolean");
+            }
+            if (gh.repo !== undefined) {
+                if (typeof gh.repo === "string" && gh.repo.includes("/"))
+                    validGh.repo = gh.repo;
+                else
+                    errors.push('github.repo must be a string in "owner/repo" format');
+            }
+            if (gh.project !== undefined) {
+                const p = typeof gh.project === "number" ? gh.project : Number(gh.project);
+                if (Number.isFinite(p) && p > 0)
+                    validGh.project = Math.floor(p);
+                else
+                    errors.push("github.project must be a positive number");
+            }
+            if (gh.labels !== undefined) {
+                if (Array.isArray(gh.labels) && gh.labels.every((l) => typeof l === "string")) {
+                    validGh.labels = gh.labels;
+                }
+                else {
+                    errors.push("github.labels must be an array of strings");
+                }
+            }
+            if (gh.auto_link_commits !== undefined) {
+                if (typeof gh.auto_link_commits === "boolean")
+                    validGh.auto_link_commits = gh.auto_link_commits;
+                else
+                    errors.push("github.auto_link_commits must be a boolean");
+            }
+            if (gh.slice_prs !== undefined) {
+                if (typeof gh.slice_prs === "boolean")
+                    validGh.slice_prs = gh.slice_prs;
+                else
+                    errors.push("github.slice_prs must be a boolean");
+            }
+            const knownGhKeys = new Set(["enabled", "repo", "project", "labels", "auto_link_commits", "slice_prs"]);
+            for (const key of Object.keys(gh)) {
+                if (!knownGhKeys.has(key)) {
+                    warnings.push(`unknown github key "${key}" — ignored`);
+                }
+            }
+            if (Object.keys(validGh).length > 0) {
+                validated.github = validGh;
+            }
+        }
+        else {
+            errors.push("github must be an object");
+        }
+    }
     return { preferences: validated, errors, warnings };
 }

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

@@ -14,7 +14,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { gsdRoot } from "./paths.js";
 import { parse as parseYaml } from "yaml";
-import { normalizeStringArray } from "../shared/mod.js";
+import { normalizeStringArray } from "../shared/format-utils.js";
 import { resolveProfileDefaults as _resolveProfileDefaults } from "./preferences-models.js";
 import { MODE_DEFAULTS, } from "./preferences-types.js";
 import { validatePreferences } from "./preferences-validation.js";
@@ -24,33 +24,42 @@ export { validatePreferences } from "./preferences-validation.js";
 // ─── Re-exports: skills ─────────────────────────────────────────────────────
 export { resolveAllSkillReferences, resolveSkillDiscoveryMode, resolveSkillStalenessDays, } from "./preferences-skills.js";
 // ─── Re-exports: models ─────────────────────────────────────────────────────
-export { resolveModelForUnit, resolveModelWithFallbacksForUnit, getNextFallbackModel, isTransientNetworkError, validateModelId, updatePreferencesModels, resolveDynamicRoutingConfig, resolveAutoSupervisorConfig, resolveProfileDefaults, resolveEffectiveProfile, resolveInlineLevel, resolveCompressionStrategy, resolveContextSelection, resolveSearchProviderFromPreferences, } from "./preferences-models.js";
+export { resolveModelForUnit, resolveModelWithFallbacksForUnit, getNextFallbackModel, isTransientNetworkError, validateModelId, updatePreferencesModels, resolveDynamicRoutingConfig, resolveAutoSupervisorConfig, resolveProfileDefaults, resolveEffectiveProfile, resolveInlineLevel, resolveContextSelection, resolveSearchProviderFromPreferences, } from "./preferences-models.js";
 // ─── Path Constants & Getters ───────────────────────────────────────────────
-const GLOBAL_PREFERENCES_PATH = join(homedir(), ".gsd", "preferences.md");
-const LEGACY_GLOBAL_PREFERENCES_PATH = join(homedir(), ".pi", "agent", "gsd-preferences.md");
+function gsdHome() {
+    return process.env.GSD_HOME || join(homedir(), ".gsd");
+}
+function globalPreferencesPath() {
+    return join(gsdHome(), "preferences.md");
+}
+function legacyGlobalPreferencesPath() {
+    return join(homedir(), ".pi", "agent", "gsd-preferences.md");
+}
 function projectPreferencesPath() {
     return join(gsdRoot(process.cwd()), "preferences.md");
 }
 // Bootstrap in gitignore.ts historically created PREFERENCES.md (uppercase) by mistake.
 // Check uppercase as a fallback so those files aren't silently ignored.
-const GLOBAL_PREFERENCES_PATH_UPPERCASE = join(homedir(), ".gsd", "PREFERENCES.md");
+function globalPreferencesPathUppercase() {
+    return join(gsdHome(), "PREFERENCES.md");
+}
 function projectPreferencesPathUppercase() {
     return join(gsdRoot(process.cwd()), "PREFERENCES.md");
 }
 export function getGlobalGSDPreferencesPath() {
-    return GLOBAL_PREFERENCES_PATH;
+    return globalPreferencesPath();
 }
 export function getLegacyGlobalGSDPreferencesPath() {
-    return LEGACY_GLOBAL_PREFERENCES_PATH;
+    return legacyGlobalPreferencesPath();
 }
 export function getProjectGSDPreferencesPath() {
     return projectPreferencesPath();
 }
 // ─── Loading ────────────────────────────────────────────────────────────────
 export function loadGlobalGSDPreferences() {
-    return loadPreferencesFile(GLOBAL_PREFERENCES_PATH, "global")
-        ?? loadPreferencesFile(GLOBAL_PREFERENCES_PATH_UPPERCASE, "global")
-        ?? loadPreferencesFile(LEGACY_GLOBAL_PREFERENCES_PATH, "global");
+    return loadPreferencesFile(globalPreferencesPath(), "global")
+        ?? loadPreferencesFile(globalPreferencesPathUppercase(), "global")
+        ?? loadPreferencesFile(legacyGlobalPreferencesPath(), "global");
 }
 export function loadProjectGSDPreferences() {
     return loadPreferencesFile(projectPreferencesPath(), "project")
@@ -199,10 +208,12 @@ function mergePreferences(base, override) {
         verification_auto_fix: override.verification_auto_fix ?? base.verification_auto_fix,
         verification_max_retries: override.verification_max_retries ?? base.verification_max_retries,
         search_provider: override.search_provider ?? base.search_provider,
-        compression_strategy: override.compression_strategy ?? base.compression_strategy,
         context_selection: override.context_selection ?? base.context_selection,
         auto_visualize: override.auto_visualize ?? base.auto_visualize,
         auto_report: override.auto_report ?? base.auto_report,
+        github: (base.github || override.github)
+            ? { ...(base.github ?? {}), ...(override.github ?? {}) }
+            : undefined,
     };
 }
 function mergeStringLists(base, override) {

package/dist/resources/extensions/gsd/prompt-loader.js

@@ -74,6 +74,10 @@ export function loadPrompt(name, vars = {}) {
         content = readFileSync(path, "utf-8");
         templateCache.set(name, content);
     }
+    const effectiveVars = {
+        skillActivation: "If a `GSD Skill Preferences` block is present in system context, use it and the `<available_skills>` catalog in your system prompt to decide which skills to load and follow for this unit, without relaxing required verification or artifact rules.",
+        ...vars,
+    };
     // Check BEFORE substitution: find all {{varName}} placeholders the template
     // declares and verify every one has a value in vars. Checking after substitution
     // would also flag {{...}} patterns injected by inlined content (e.g. template
@@ -82,14 +86,14 @@ export function loadPrompt(name, vars = {}) {
     if (declared) {
         const missing = [...new Set(declared)]
             .map(m => m.slice(2, -2))
-            .filter(key => !(key in vars));
+            .filter(key => !(key in effectiveVars));
         if (missing.length > 0) {
             throw new GSDError(GSD_PARSE_ERROR, `loadPrompt("${name}"): template declares {{${missing.join("}}, {{")}}}} but no value was provided. ` +
                 `This usually means the extension code in memory is older than the template on disk. ` +
                 `Restart pi to reload the extension.`);
         }
     }
-    for (const [key, value] of Object.entries(vars)) {
+    for (const [key, value] of Object.entries(effectiveVars)) {
         content = content.replaceAll(`{{${key}}}`, value);
     }
     return content.trim();

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

@@ -16,7 +16,7 @@ All relevant context has been preloaded below — the roadmap, all slice summari
 
 Then:
 1. Use the **Milestone Summary** output template from the inlined context above
-2. If a `GSD Skill Preferences` block is present in system context, use it to decide which skills to load and follow during completion, without relaxing required verification or artifact rules
+2. {{skillActivation}}
 3. 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.
 4. Verify the milestone's **definition of done** — all slices are `[x]`, all slice summaries exist, and any cross-slice integration points work correctly.
 5. 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.

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

@@ -20,7 +20,7 @@ All relevant context has been preloaded below — the slice plan, all task summa
 
 Then:
 1. Use the **Slice Summary** and **UAT** output templates from the inlined context above
-2. If a `GSD Skill Preferences` block is present in system context, use it to decide which skills to load and follow during completion, without relaxing required verification or artifact rules
+2. {{skillActivation}}
 3. Run all slice-level verification checks defined in the slice plan. All must pass before marking the slice done. If any fail, fix them first.
 4. If the slice plan includes observability/diagnostic surfaces, confirm they work. Skip this for simple slices that don't have observability sections.
 5. If `.gsd/REQUIREMENTS.md` exists, update it based on what this slice actually proved. Move requirements between Active, Validated, Deferred, Blocked, or Out of Scope only when the evidence from execution supports that change.

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

@@ -11,7 +11,7 @@ After the user describes their idea, **do not ask questions yet**. First, prove
 1. Summarize what you understood in your own words — concretely, not abstractly.
 2. Give an honest size read: roughly how many milestones, roughly how many slices in the first one. Base this on the actual work involved, not a classification label. A config change might be 1 milestone with 1 slice. A social network might be 5 milestones with 8+ slices each. Use your judgment.
 3. Include scope honesty — a bullet list of the major capabilities you're hearing: "Here's what I'm hearing: [bullet list of major capabilities]."
-4. Ask: "Does that capture it? If not, tell me what I missed." — plain text, not `ask_user_questions`. Let them correct freely.
+4. Invite correction in one plain sentence: "Here's my read. Correct anything important I missed." — plain text, not `ask_user_questions`.
 
 This prevents runaway questioning by forcing comprehension proof before anything else. Do not skip this step. Do not combine it with the first question round.
 
@@ -21,7 +21,7 @@ After reflection is confirmed, decide the approach based on the actual scope —
 
 **If the work spans multiple milestones:** Before drilling into details, map the full landscape:
 1. Propose a milestone sequence — names, one-line intents, rough dependencies
-2. Present this to the user for confirmation or adjustment
+2. Present this as the working milestone sequence. Adjust it if the user objects, sharpens it, or adds constraints; otherwise keep moving.
 3. Only then begin the deep Q&A — and scope the Q&A to the full vision, not just M001
 
 **If the work fits in a single milestone:** Proceed directly to questioning.
@@ -48,7 +48,7 @@ You are a thinking partner, not an interviewer.
 
 **Challenge vagueness, make abstract concrete.** When the user says something abstract ("it should be smart" / "it needs to handle edge cases" / "good UX"), push for specifics. What does "smart" mean in practice? Which edge cases? What does good UX look like for this specific interaction?
 
-**Questions must be about the experience, not the implementation.** Never ask "what auth provider?" — ask "when someone logs in, what should that feel like?" Never ask "what database?" — ask "when they come back tomorrow, what should they see?" Implementation is your job. Understanding what they want to experience is the discussion's job.
+**Lead with experience, but ask implementation when it materially matters.** Default questions should target the experience and outcome. But when implementation choices materially change scope, proof, compliance, integration, deployment, or irreversible architecture, ask them directly instead of forcing a fake UX phrasing.
 
 **Freeform rule:** When the user selects "Other" or clearly wants to explain something freely, stop using `ask_user_questions` and switch to plain text follow-ups. Let them talk. Resume structured questions when appropriate.
 
@@ -105,16 +105,13 @@ Example flow:
 
 If they clarify, absorb the correction and re-verify.
 
-## Wrap-up Gate
-
-Only after the depth checklist is fully satisfied and you genuinely understand the work, offer to proceed.
+The depth verification is the required write-gate. Do **not** add another meta "ready to proceed?" checkpoint immediately after it unless there is still material ambiguity.
 
-The wrap-up gate must include a scope reflection:
-"Here's what I'm planning to build: [list of capabilities with rough complexity]. Does this match your vision, or did I miss something?"
+## Wrap-up Gate
 
-Then offer options: "Ready to confirm requirements and milestone plan (Recommended)", "I have more to discuss"
+Once the depth checklist is fully satisfied, move directly into requirements and roadmap preview. Do not insert a separate "are you ready to continue?" gate unless the user explicitly wants to keep brainstorming or you still see material ambiguity.
 
-If the user wants to keep going, keep asking. If they're ready, proceed.
+If you need a final scope reflection, fold it into the depth summary or roadmap preview rather than asking for permission twice.
 
 ## Focused Research
 
@@ -165,9 +162,9 @@ Rules:
 
 For multi-milestone projects, requirements should span the full vision. Requirements owned by later milestones get provisional ownership. The full requirement set captures the user's complete vision — milestones are the sequencing strategy, not the scope boundary.
 
-If the project is new or has no `REQUIREMENTS.md`, confirm candidate requirements with the user before writing the roadmap.
+If the project is new or has no `REQUIREMENTS.md`, surface candidate requirements in chat before writing the roadmap. Ask for correction only on material omissions, wrong ownership, or wrong scope. If the user has already been specific and raises no substantive objection, treat the requirement set as confirmed and continue.
 
-**Print the requirements in chat before asking for confirmation.** Do not say "here are the requirements" and then only write them to a file. The user must see them in the terminal. Print a markdown table with columns: ID, Title, Status, Owner, Source. Group by status (Active, Deferred, Out of Scope). After the table, ask: "Confirm, adjust, or add?"
+**Print the requirements in chat before writing the roadmap.** Do not say "here are the requirements" and then only write them to a file. The user must see them in the terminal. Print a markdown table with columns: ID, Title, Status, Owner, Source. Group by status (Active, Deferred, Out of Scope). After the table, ask: "Confirm, adjust, or add?"
 
 ## Scope Assessment
 
@@ -179,7 +176,7 @@ Before moving to output, confirm the size estimate from your reflection still ho
 
 Before writing any files, **print the planned roadmap in chat** so the user can see and approve it. Print a markdown table with columns: Slice, Title, Risk, Depends, Demo. One row per slice. Below the table, print the milestone definition of done as a bullet list.
 
-Ask: "Ready to write the plan, or want to adjust?" Only proceed to writing files after the user confirms.
+If the user raises a substantive objection, adjust the roadmap. Otherwise, present the roadmap and ask: "Ready to write, or want to adjust?" — one gate, not two.
 
 ### Naming Convention
 
@@ -236,7 +233,7 @@ If a milestone has no dependencies, omit the frontmatter. The dependency chain f
 
 #### Phase 3: Sequential readiness gate for remaining milestones
 
-For each remaining milestone **one at a time, in sequence**, use `ask_user_questions` to assess readiness. Present three options:
+For each remaining milestone **one at a time, in sequence**, decide the most likely readiness mode from the evidence you already have, then use `ask_user_questions` to let the user correct that recommendation. Present three options:
 
 - **"Discuss now"** — The user wants to conduct a focused discussion for this milestone in the current session, while the context from the broader discussion is still fresh. Proceed with a focused discussion for this milestone (reflection → investigation → questioning → depth verification). When the discussion concludes, write a full `CONTEXT.md`. Then move to the gate for the next milestone.
 - **"Write draft for later"** — This milestone has seed material from the current conversation but needs its own dedicated discussion in a future session. Write a `CONTEXT-DRAFT.md` capturing the seed material (what was discussed, key ideas, provisional scope, open questions). Mark it clearly as a draft, not a finalized context. **What happens downstream:** When auto-mode reaches this milestone, it pauses and notifies the user: "M00x has draft context — needs discussion. Run /gsd." The `/gsd` wizard shows a "Discuss from draft" option that seeds the new discussion with this draft, so nothing from the current conversation is lost. After the dedicated discussion produces a full CONTEXT.md, the draft file is automatically deleted.