@opengsd/gsd-pi 1.0.2-dev.867e002 → 1.0.2-dev.cce3612

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

@@ -15,16 +15,15 @@ import { delimiter, join } from "node:path";
 import { AuthStorage } from "@gsd/pi-coding-agent";
 import { getEnvApiKey } from "@gsd/pi-ai";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
-import { getAuthPath, PROVIDER_REGISTRY } from "./key-manager.js";
+import { getAuthPath, PROVIDER_REGISTRY, supportsBrowserOAuth } from "./key-manager.js";
 import { homedir } from "node:os";
 // ── Provider routing constants ────────────────────────────────────────────────
 /**
  * Providers that use external CLI authentication (not API keys).
- * These are always considered "found" — the host CLI handles auth.
+ * When explicitly selected, the provider's own CLI/session owns auth.
  */
 const CLI_AUTH_PROVIDERS = new Set([
     "claude-code",
-    "openai-codex",
     "google-gemini-cli",
     "google-antigravity",
 ]);
@@ -126,23 +125,26 @@ function collectConfiguredModelProviders() {
  * Used for lightweight binary-presence checks (PATH scan, no subprocess).
  */
 const CLI_BINARY_MAP = {
-    "claude-code": "claude",
-    "openai-codex": "codex",
-    "google-gemini-cli": "gemini",
-    "google-antigravity": "antigravity",
+    "claude-code": ["claude", "claude-code"],
+    "google-gemini-cli": ["gemini"],
+    "google-antigravity": ["agy"],
 };
+const CLI_AUTH_PATH_CHECK_PROVIDERS = new Set([
+    "google-gemini-cli",
+    "google-antigravity",
+]);
 /**
  * Check if a CLI provider's binary exists anywhere in PATH.
  * Fast filesystem scan — no subprocess, no network, sub-1ms.
  */
 function isCliBinaryInPath(providerId) {
-    const binary = CLI_BINARY_MAP[providerId];
-    if (!binary)
+    const binaries = CLI_BINARY_MAP[providerId];
+    if (!binaries)
         return false;
     const pathDirs = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
     // On Windows, command shims are commonly installed as .cmd/.exe/.bat/.com.
     // Scan PATHEXT candidates in addition to the bare binary name.
-    const executableNames = [binary];
+    const executableNames = [...binaries];
     if (process.platform === "win32") {
         const rawPathExt = process.env.PATHEXT
             ?.split(";")
@@ -150,10 +152,12 @@ function isCliBinaryInPath(providerId) {
             .filter(Boolean) ?? [];
         const normalizedPathExt = rawPathExt.map(ext => ext.startsWith(".") ? ext.toLowerCase() : `.${ext.toLowerCase()}`);
         const defaultExt = [".exe", ".cmd", ".bat", ".com"];
-        for (const ext of [...normalizedPathExt, ...defaultExt]) {
-            const candidate = `${binary}${ext}`;
-            if (!executableNames.includes(candidate))
-                executableNames.push(candidate);
+        for (const binary of binaries) {
+            for (const ext of [...normalizedPathExt, ...defaultExt]) {
+                const candidate = `${binary}${ext}`;
+                if (!executableNames.includes(candidate))
+                    executableNames.push(candidate);
+            }
         }
     }
     return pathDirs.some(dir => executableNames.some(name => existsSync(join(dir, name))));
@@ -185,11 +189,6 @@ function hasModelsJsonApiKey(providerId) {
 }
 function resolveKey(providerId) {
     const info = PROVIDER_REGISTRY.find(p => p.id === providerId);
-    // claude-code never stores credentials in auth.json — GSD delegates entirely to
-    // the local CLI binary. Presence of the binary in PATH is the only signal.
-    if (providerId === "claude-code") {
-        return { found: isCliBinaryInPath("claude-code"), source: "env", backedOff: false };
-    }
     if (providerId === "anthropic-vertex" && process.env.ANTHROPIC_VERTEX_PROJECT_ID) {
         return { found: true, source: "env", backedOff: false };
     }
@@ -201,7 +200,16 @@ function resolveKey(providerId) {
             const creds = auth.getCredentialsForProvider(providerId);
             if (creds.length > 0) {
                 // Filter out empty placeholder keys (from skipped onboarding)
-                const hasRealKey = creds.some(c => c.type === "oauth" || (c.type === "api_key" && c.key));
+                const hasRealKey = creds.some(c => {
+                    if (c.type === "oauth")
+                        return true;
+                    if (c.type !== "api_key")
+                        return false;
+                    const key = c.key?.trim();
+                    if (!key)
+                        return false;
+                    return !(CLI_AUTH_PROVIDERS.has(providerId) && key === "cli");
+                });
                 if (hasRealKey) {
                     return {
                         found: true,
@@ -229,6 +237,11 @@ function resolveKey(providerId) {
     if (hasModelsJsonApiKey(providerId)) {
         return { found: true, source: "models.json", backedOff: false };
     }
+    // Cross-provider routes can use a local CLI when it is installed. Explicit
+    // external CLI provider selections are handled in checkLlmProviders() below.
+    if (CLI_AUTH_PROVIDERS.has(providerId) && isCliBinaryInPath(providerId)) {
+        return { found: true, source: "env", backedOff: false };
+    }
     return { found: false, source: "none", backedOff: false };
 }
 // ── Individual check groups ────────────────────────────────────────────────────
@@ -236,15 +249,32 @@ function checkLlmProviders() {
     const required = collectConfiguredModelProviders();
     const results = [];
     for (const providerId of required) {
-        // CLI-authenticated providers don't need API keys — skip key check
+        // CLI-authenticated providers don't need API keys. The provider's own
+        // request path validates CLI sessions when it is used.
         if (CLI_AUTH_PROVIDERS.has(providerId)) {
             const info = PROVIDER_REGISTRY.find(p => p.id === providerId);
+            const label = info?.label ?? providerId;
+            if (CLI_AUTH_PATH_CHECK_PROVIDERS.has(providerId) && !isCliBinaryInPath(providerId)) {
+                const binaries = CLI_BINARY_MAP[providerId]?.map(binary => `\`${binary}\``).join(" or ");
+                results.push({
+                    name: providerId,
+                    label,
+                    category: "llm",
+                    status: "error",
+                    message: `${label} — CLI not found`,
+                    detail: binaries
+                        ? `Install ${label} and ensure ${binaries} is on PATH`
+                        : `Install ${label} and ensure its CLI is on PATH`,
+                    required: true,
+                });
+                continue;
+            }
             results.push({
                 name: providerId,
-                label: info?.label ?? providerId,
+                label,
                 category: "llm",
                 status: "ok",
-                message: `${info?.label ?? providerId} — CLI auth (no key needed)`,
+                message: `${label} — CLI auth (no key needed)`,
                 required: true,
             });
             continue;
@@ -282,7 +312,7 @@ function checkLlmProviders() {
                 message: `${label} — not configured`,
                 detail: providerId === "anthropic-vertex"
                     ? "Set ANTHROPIC_VERTEX_PROJECT_ID and authenticate with Google ADC"
-                    : info?.hasOAuth
+                    : info && supportsBrowserOAuth(info)
                         ? `Run /gsd keys to authenticate`
                         : `Set ${envVar} or run /gsd keys`,
                 required: true,

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

@@ -480,13 +480,18 @@ export async function runGSDDoctor(basePath, options) {
                     catch {
                         continue;
                     }
+                    if (entry === "parallel-research")
+                        continue;
                     if (!knownSliceIds.has(entry)) {
+                        const quarantineExample = `.gsd/quarantine/milestones/${milestoneId}/slices/${entry}-manual-review`;
                         issues.push({
                             severity: "warning",
                             code: "orphaned_slice_directory",
                             scope: "milestone",
                             unitId: milestoneId,
-                            message: `Directory "${entry}" exists in ${milestoneId}/slices/ but is not referenced in the roadmap`,
+                            message: `Directory "${entry}" exists in ${milestoneId}/slices/ but is not referenced in the roadmap or DB. ` +
+                                `Review it; if stale, move or delete it. To preserve it, move it under ${quarantineExample}. ` +
+                                "If it contains work to keep, copy or merge that content into a DB-backed slice before resuming.",
                             file: `${relMilestonePath(basePath, milestoneId)}/slices/${entry}`,
                             fixable: false,
                         });

package/dist/resources/extensions/gsd/git-conflict-state.js

@@ -2,7 +2,7 @@
 // File Purpose: Detect and reconcile unresolved Git conflict state before automation runs.
 import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { join } from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { autoResolveSafeConflictPaths } from "./git-conflict-resolve.js";
 import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
 import { abortAndReset } from "./git-self-heal.js";
@@ -10,6 +10,23 @@ import { logWarning } from "./workflow-logger.js";
 function splitZeroDelimited(output) {
     return output.split("\0").filter(Boolean);
 }
+function hasGitMarker(basePath) {
+    try {
+        let dir = resolve(basePath);
+        for (let i = 0; i < 30; i++) {
+            if (existsSync(join(dir, ".git")))
+                return true;
+            const parent = dirname(dir);
+            if (parent === dir)
+                break;
+            dir = parent;
+        }
+    }
+    catch {
+        // Fall through to the git probes, which will report unknown on failure.
+    }
+    return false;
+}
 export function listUnmergedGitPaths(basePath) {
     try {
         const output = spawnSync("git", ["diff", "--name-only", "--diff-filter=U", "-z"], {
@@ -57,6 +74,14 @@ export function listMergeStateBlockers(basePath) {
     return MERGE_STATE_MARKERS.filter((marker) => existsSync(join(gitDir, marker)));
 }
 export function probeGitConflictState(basePath) {
+    if (!hasGitMarker(basePath)) {
+        return {
+            status: "clean",
+            unmerged: [],
+            checkFailures: [],
+            mergeStateBlockers: [],
+        };
+    }
     const unmerged = listUnmergedGitPaths(basePath);
     if (unmerged === null) {
         return {

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

@@ -934,7 +934,7 @@ async function dispatchWorkflow(pi, note, customType = "gsd-run", ctx, unitType,
         if (unitType)
             setGuidedUnitContext(projectRoot, unitType);
         try {
-            pi.sendMessage({
+            await pi.sendMessage({
                 customType,
                 content: buildWorkflowDispatchContent({ workflow, workflowPath, task: note }),
                 display: false,
@@ -946,10 +946,9 @@ async function dispatchWorkflow(pi, note, customType = "gsd-run", ctx, unitType,
         }
     }
     finally {
-        // Restore full tool set after the message is queued. The LLM turn has
-        // already captured the scoped set — restoring prevents the narrowed
-        // tools from leaking into subsequent dispatches (#3628). The finally
-        // block ensures restoration even if sendMessage throws.
+        // Restore full tool/skill surface after the turn completes. Awaiting
+        // sendMessage ensures scoped skills stay in _baseSystemPrompt through
+        // before_agent_start (#3628, skill token savings).
         restoreGsdWorkflowTools(pi, savedTools);
     }
 }
@@ -1045,7 +1044,7 @@ function buildHeadlessDiscussPrompt(nextId, seedContext, _basePath) {
  * Run preparation phase if enabled, then build the discuss prompt.
  * Preparation analyzes the codebase and prior context, injecting the results
  * as supplementary context into the standard discuss template. The discuss
- * template drives the conversation (asks "What's the vision?" first), while
+ * template drives the conversation with a variable vision opener, while
  * the preparation briefs give the agent grounding in the existing codebase.
  *
  * @param ctx - Extension command context with UI for progress notifications

package/dist/resources/extensions/gsd/key-manager.js

@@ -12,18 +12,18 @@ import { getErrorMessage } from "./error-utils.js";
 import { gsdHome } from "./gsd-home.js";
 export const PROVIDER_REGISTRY = [
     // LLM Providers
-    { id: "anthropic", label: "Anthropic (Claude)", category: "llm", envVar: "ANTHROPIC_API_KEY", prefixes: ["sk-ant-"], hasOAuth: true, dashboardUrl: "console.anthropic.com" },
+    { id: "anthropic", label: "Anthropic (Claude)", category: "llm", envVar: "ANTHROPIC_API_KEY", prefixes: ["sk-ant-"], authMode: "apiKey", dashboardUrl: "console.anthropic.com" },
     // Claude Code CLI: routes through the local `claude` binary — no API key,
     // authentication is handled by the CLI's own OAuth flow.
     // Referenced by doctor-providers.ts, auto-model-selection.ts, and others;
     // must be in the canonical registry so all consumers see the same catalog.
     // See: https://github.com/open-gsd/gsd-pi/issues/4541
-    { id: "claude-code", label: "Claude Code CLI", category: "llm", hasOAuth: true },
+    { id: "claude-code", label: "Claude Code CLI", category: "llm", authMode: "externalCli" },
     { id: "openai", label: "OpenAI", category: "llm", envVar: "OPENAI_API_KEY", prefixes: ["sk-"], dashboardUrl: "platform.openai.com/api-keys" },
-    { id: "github-copilot", label: "GitHub Copilot", category: "llm", envVar: "GITHUB_TOKEN", hasOAuth: true },
-    { id: "openai-codex", label: "ChatGPT Plus/Pro (Codex)", category: "llm", hasOAuth: true },
-    { id: "google-gemini-cli", label: "Google Gemini CLI", category: "llm", hasOAuth: true },
-    { id: "google-antigravity", label: "Antigravity", category: "llm", hasOAuth: true },
+    { id: "github-copilot", label: "GitHub Copilot", category: "llm", envVar: "GITHUB_TOKEN", authMode: "browserOAuth" },
+    { id: "openai-codex", label: "ChatGPT Plus/Pro (Codex)", category: "llm", authMode: "browserOAuth" },
+    { id: "google-gemini-cli", label: "Google Gemini CLI", category: "llm", authMode: "externalCli" },
+    { id: "google-antigravity", label: "Antigravity", category: "llm", authMode: "externalCli" },
     { id: "google", label: "Google (Gemini)", category: "llm", envVar: "GEMINI_API_KEY", dashboardUrl: "aistudio.google.com/apikey" },
     { id: "groq", label: "Groq", category: "llm", envVar: "GROQ_API_KEY", dashboardUrl: "console.groq.com" },
     { id: "xai", label: "xAI (Grok)", category: "llm", envVar: "XAI_API_KEY", dashboardUrl: "console.x.ai" },
@@ -49,6 +49,20 @@ export const PROVIDER_REGISTRY = [
     { id: "telegram_bot", label: "Telegram Bot", category: "remote", envVar: "TELEGRAM_BOT_TOKEN" },
 ];
 // ─── Utilities ──────────────────────────────────────────────────────────────────
+export function getProviderAuthMode(provider) {
+    return provider.authMode ?? "apiKey";
+}
+export function supportsBrowserOAuth(provider) {
+    return getProviderAuthMode(provider) === "browserOAuth";
+}
+export function supportsStoredApiKey(provider) {
+    const mode = getProviderAuthMode(provider);
+    if (mode === "externalCli" || mode === "cloudIdentity" || mode === "none")
+        return false;
+    if (mode === "browserOAuth")
+        return Boolean(provider.envVar || provider.prefixes?.length);
+    return true;
+}
 /**
  * Mask an API key for display: show first 4 + last 4 chars.
  * Keys shorter than 12 chars show only first 2 + last 2.
@@ -79,11 +93,14 @@ export function formatDuration(ms) {
 /**
  * Describe a credential's type and status.
  */
-export function describeCredential(cred) {
+export function describeCredential(cred, provider) {
     if (cred.type === "api_key") {
         const apiCred = cred;
         if (!apiCred.key)
             return "empty key";
+        if (apiCred.key === "cli" && provider && getProviderAuthMode(provider) === "externalCli") {
+            return "external CLI";
+        }
         return `API key (${maskKey(apiCred.key)})`;
     }
     if (cred.type === "oauth") {
@@ -129,7 +146,7 @@ export function getAllKeyStatuses(auth) {
             const firstCred = creds[0];
             const desc = creds.length > 1
                 ? `${creds.length} keys (round-robin)`
-                : describeCredential(firstCred);
+                : describeCredential(firstCred, provider);
             return {
                 provider,
                 configured: true,
@@ -236,9 +253,20 @@ export async function handleAddKey(providerArg, ctx, auth) {
             return false;
         provider = PROVIDER_REGISTRY[idx];
     }
-    // If OAuth is available, offer choice
-    if (provider.hasOAuth) {
-        const methods = ["API key", "Browser login (OAuth)"];
+    const authMode = getProviderAuthMode(provider);
+    if (authMode === "externalCli") {
+        ctx.ui.notify(`${provider.label} is authenticated by its own local CLI. ` +
+            `Sign in with that CLI first, then run /login to activate it in GSD.`, "info");
+        return false;
+    }
+    if (authMode === "cloudIdentity") {
+        ctx.ui.notify(`${provider.label} uses cloud identity credentials. Configure the provider's cloud CLI or environment, then restart GSD.`, "info");
+        return false;
+    }
+    if (supportsBrowserOAuth(provider)) {
+        const methods = supportsStoredApiKey(provider)
+            ? ["API token/key", "Browser login (OAuth)"]
+            : ["Browser login (OAuth)"];
         const method = await ctx.ui.select(`${provider.label} — how do you want to authenticate?`, methods);
         if (!method || typeof method !== "string")
             return false;
@@ -248,6 +276,10 @@ export async function handleAddKey(providerArg, ctx, auth) {
             return false;
         }
     }
+    if (!supportsStoredApiKey(provider)) {
+        ctx.ui.notify(`${provider.label} does not accept a GSD-stored API key. Use /login.`, "info");
+        return false;
+    }
     // API key input
     const input = await ctx.ui.input(`API key for ${provider.label}:`, provider.envVar ? `or set ${provider.envVar} env var` : "paste your key here");
     if (input === null || input === undefined)
@@ -309,7 +341,7 @@ export async function handleRemoveKey(providerArg, ctx, auth) {
     }
     // Multi-key handling
     if (creds.length > 1) {
-        const options = creds.map((c, i) => `[${i + 1}] ${describeCredential(c)}`);
+        const options = creds.map((c, i) => `[${i + 1}] ${describeCredential(c, provider)}`);
         options.push("Remove all");
         const choice = await ctx.ui.select(`${provider.label} has ${creds.length} keys. Remove which?`, options);
         if (!choice || typeof choice !== "string")
@@ -330,7 +362,7 @@ export async function handleRemoveKey(providerArg, ctx, auth) {
         }
     }
     else {
-        const confirmed = await ctx.ui.confirm("Remove key?", `Remove ${describeCredential(creds[0])} for ${provider.label}?`);
+        const confirmed = await ctx.ui.confirm("Remove key?", `Remove ${describeCredential(creds[0], provider)} for ${provider.label}?`);
         if (!confirmed)
             return false;
         auth.remove(provider.id);

package/dist/resources/extensions/gsd/milestone-reopen-events.js

@@ -0,0 +1,28 @@
+import { join } from "node:path";
+import { gsdRoot } from "./paths.js";
+import { readEvents } from "./workflow-events.js";
+export function latestExplicitReopenAt(basePath, milestoneId) {
+    const root = gsdRoot(basePath);
+    const candidates = [
+        join(root, "event-log.jsonl"),
+        join(root, `event-log-${milestoneId}.jsonl.archived`),
+    ];
+    let latest = null;
+    for (const file of candidates) {
+        for (const event of readEvents(file)) {
+            const eventMilestoneId = event.params.milestoneId;
+            if (event.cmd !== "reopen-milestone" || eventMilestoneId !== milestoneId)
+                continue;
+            if (!latest || event.ts > latest)
+                latest = event.ts;
+        }
+    }
+    return latest;
+}
+export function isAfter(value, cutoff) {
+    if (!cutoff)
+        return true;
+    if (!value)
+        return true;
+    return Date.parse(value) > Date.parse(cutoff);
+}

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

@@ -3,7 +3,7 @@
 import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
 import { readNotifications, markAllRead, clearNotifications, onNotificationStoreChange, } from "./notification-store.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
-import { padRightVisible, renderFrame, renderKeyHints, rightAlign, wrapVisibleText, } from "./tui/render-kit.js";
+import { padRightVisible, renderDialogFrame, renderKeyHints, rightAlign, wrapVisibleText, } from "./tui/render-kit.js";
 const FILTER_CYCLE = ["all", "error", "warning", "success", "info"];
 const OVERLAY_WIDTH = "58%";
 const OVERLAY_MIN_WIDTH = 68;
@@ -163,12 +163,16 @@ export class GSDNotificationOverlay {
         const terminalRows = process.stdout.rows || 32;
         const availableRows = Math.max(1, terminalRows - OVERLAY_MARGIN.top - OVERLAY_MARGIN.bottom);
         const overlayRows = Math.min(availableRows, Math.max(1, Math.floor((terminalRows * OVERLAY_MAX_HEIGHT_PERCENT) / 100)));
-        const maxVisibleRows = Math.max(5, overlayRows - 2);
+        const maxVisibleRows = Math.max(5, overlayRows - 4);
         const visibleContentRows = Math.min(content.length, maxVisibleRows);
         const maxScroll = Math.max(0, content.length - visibleContentRows);
         this.scrollOffset = Math.min(this.scrollOffset, maxScroll);
         const visibleContent = content.slice(this.scrollOffset, this.scrollOffset + visibleContentRows);
-        const lines = renderFrame(this.theme, visibleContent, width);
+        const footer = renderKeyHints(this.theme, ["↑/↓ scroll", "f filter", "c clear", `Esc/${formattedShortcutPair("notifications")} close`], Math.max(1, width - 4));
+        const lines = renderDialogFrame(this.theme, "Notifications", visibleContent, width, {
+            footer,
+            scroll: { offset: this.scrollOffset, visibleRows: visibleContentRows, totalRows: content.length },
+        });
         this.cachedWidth = width;
         this.cachedLines = lines;
         return lines;
@@ -211,8 +215,6 @@ export class GSDNotificationOverlay {
         };
         const blank = () => row("");
         const hr = () => row(th.fg("dim", "─".repeat(contentWidth)));
-        // Header
-        const title = th.fg("accent", th.bold("Notifications"));
         const filterLabel = this.filter === "all"
             ? th.fg("dim", "all")
             : th.fg(this.filter === "error" ? "error"
@@ -220,11 +222,8 @@ export class GSDNotificationOverlay {
                     : this.filter === "success" ? "success"
                         : "dim", this.filter);
         const count = `${this.filteredEntries.length} entries`;
-        lines.push(row(rightAlign(`${title}  ${th.fg("dim", "filter:")} ${filterLabel}`, th.fg("dim", count), contentWidth)));
+        lines.push(row(rightAlign(`${th.fg("dim", "filter:")} ${filterLabel}`, th.fg("dim", count), contentWidth)));
         lines.push(hr());
-        // Controls
-        const closeShortcut = formattedShortcutPair("notifications");
-        lines.push(row(renderKeyHints(th, ["↑/↓ scroll", "f filter", "c clear", `Esc/${closeShortcut} close`], contentWidth)));
         lines.push(blank());
         // Entries
         const filtered = this.filteredEntries;

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

@@ -7,7 +7,7 @@ import { matchesKey, Key } from "@gsd/pi-tui";
 import { formatDuration } from "../shared/mod.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
 import { resolveGsdPathContract } from "./paths.js";
-import { renderBar, renderKeyHints, renderProgressBar, safeLine, statusGlyph, } from "./tui/render-kit.js";
+import { renderBar, renderDialogFrame, renderKeyHints, renderProgressBar, safeLine, statusGlyph, } from "./tui/render-kit.js";
 // ─── Data Helpers ─────────────────────────────────────────────────────────
 function readJsonSafe(filePath) {
     try {
@@ -306,15 +306,14 @@ export class ParallelMonitorOverlay {
         const t = this.theme;
         const lines = [];
         const w = Math.max(1, width);
-        // Header
+        const contentWidth = Math.max(1, w - 4);
         const totalCost = this.workers.reduce((s, wk) => s + wk.cost, 0);
         const aliveCount = this.workers.filter((wk) => wk.alive).length;
         const now = new Date().toLocaleTimeString();
-        lines.push(t.bold(t.fg("accent", " GSD Parallel Monitor ")));
         lines.push(t.fg("muted", `  ${now}  │  ${aliveCount}/${this.workers.length} alive  │  Total: `) +
             t.bold(`$${totalCost.toFixed(2)}`) +
             t.fg("muted", "  │  5s refresh"));
-        lines.push(renderBar(t, w));
+        lines.push(renderBar(t, contentWidth));
         if (this.workers.length === 0) {
             lines.push("");
             lines.push(t.fg("warning", "  No parallel workers found."));
@@ -360,7 +359,7 @@ export class ParallelMonitorOverlay {
                     });
                     lines.push(`     ${t.fg("muted", "slices")}  ${chips.join("  ")}`);
                     // Task progress bar
-                    const barWidth = Math.max(6, Math.min(25, w - 32));
+                    const barWidth = Math.max(6, Math.min(25, contentWidth - 32));
                     const bar = renderProgressBar(t, wk.doneTasks, wk.totalTasks, barWidth, {
                         filledChar: "█",
                         emptyChar: "░",
@@ -378,7 +377,7 @@ export class ParallelMonitorOverlay {
         }
         // Event feed
         lines.push("");
-        lines.push(renderBar(t, w));
+        lines.push(renderBar(t, contentWidth));
         lines.push(`  ${t.bold("Recent Events")}`);
         if (this.events.length === 0) {
             lines.push(t.fg("muted", "  No events yet..."));
@@ -389,7 +388,6 @@ export class ParallelMonitorOverlay {
                 lines.push(`  ${t.fg("muted", "│")} ${t.fg("accent", mid)} ${evt.replace(/^✓ M\d+\//, "")}`);
             }
         }
-        // Footer
         lines.push("");
         const allDone = this.workers.length > 0 && this.workers.every((wk) => !wk.alive);
         if (allDone) {
@@ -400,16 +398,20 @@ export class ParallelMonitorOverlay {
             }
             lines.push(`  ${t.bold("Total: $" + this.workers.reduce((s, wk) => s + wk.cost, 0).toFixed(2))}`);
         }
-        lines.push(renderKeyHints(t, [`ESC/q/${formattedShortcutPair("parallel")} close`, "↑↓ scroll"], w));
         // Apply scroll — use terminal rows as height estimate
         const termHeight = process.stdout.rows || 40;
-        const maxScroll = Math.max(0, lines.length - termHeight);
+        const maxBodyRows = Math.max(1, Math.min(lines.length, termHeight - 12));
+        const maxScroll = Math.max(0, lines.length - maxBodyRows);
         this.scrollOffset = Math.min(Math.max(this.scrollOffset, 0), maxScroll);
         const visible = lines
-            .slice(this.scrollOffset, this.scrollOffset + termHeight)
-            .map((line) => safeLine(line, w));
-        this.cachedLines = visible;
+            .slice(this.scrollOffset, this.scrollOffset + maxBodyRows)
+            .map((line) => safeLine(line, contentWidth));
+        const footer = renderKeyHints(t, [`ESC/q/${formattedShortcutPair("parallel")} close`, "↑↓ scroll"], contentWidth);
+        this.cachedLines = renderDialogFrame(t, "GSD Parallel Monitor", visible, w, {
+            footer,
+            scroll: { offset: this.scrollOffset, visibleRows: maxBodyRows, totalRows: lines.length },
+        });
         this.cachedWidth = width;
-        return visible;
+        return this.cachedLines;
     }
 }

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

@@ -11,10 +11,17 @@ import { gsdHome } from "./gsd-home.js";
 import { statSync } from "node:fs";
 import { validatePreferences } from "./preferences-validation.js";
 /**
- * Known skill directories, in priority order.
- * GSD bundled skills live in ~/.gsd/agent/skills/ and win name collisions.
- * User-global and project-local ecosystem directories remain available as
- * read-only discovery sources, followed by Claude Code compatibility paths.
+ * Known skill directories for **preference reference resolution** (bare skill names).
+ *
+ * Search order (first match wins):
+ * 1. ~/.gsd/agent/skills/ (GSD bundled)
+ * 2. ~/.agents/skills/ (ecosystem global)
+ * 3. .agents/skills/ (project ecosystem)
+ * 4. ~/.claude/skills/ and .claude/skills/ (Claude Code compatibility)
+ *
+ * Note: the ResourceLoader catalog uses PackageManager precedence instead —
+ * project `.gsd/skills` and `.agents/skills` can override bundled GSD skills
+ * on name collision. See docs/dev/what-is-pi/09-the-customization-stack.md.
  */
 export function getSkillSearchDirs(cwd) {
     const dirs = [

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

@@ -455,9 +455,10 @@ function mergePreDispatchHooks(base, override) {
     return merged.length > 0 ? merged : undefined;
 }
 // ─── System Prompt Rendering ──────────────────────────────────────────────────
-export function renderPreferencesForSystemPrompt(preferences, resolutions) {
+export function renderPreferencesForSystemPrompt(preferences, resolutions, options) {
     const validated = validatePreferences(preferences);
     const lines = ["## GSD Skill Preferences"];
+    const includeResolvedPaths = options?.includeResolvedPaths ?? true;
     if (validated.errors.length > 0) {
         lines.push("- Validation: some preference values were ignored because they were invalid.");
     }
@@ -466,7 +467,18 @@ export function renderPreferencesForSystemPrompt(preferences, resolutions) {
     }
     preferences = validated.preferences;
     lines.push("- Treat these as explicit skill-selection policy for GSD work.", "- If a listed skill exists and is relevant, load and follow it instead of treating it as a vague suggestion.", "- Current user instructions still override these defaults.");
-    const fmt = (ref) => resolutions ? formatSkillRef(ref, resolutions) : ref;
+    const fmt = (ref) => {
+        if (!resolutions)
+            return ref;
+        if (!includeResolvedPaths) {
+            const resolution = resolutions.get(ref);
+            if (!resolution || resolution.method === "unresolved") {
+                return `${ref} (⚠ not found — check skill name or path)`;
+            }
+            return ref;
+        }
+        return formatSkillRef(ref, resolutions);
+    };
     if (preferences.always_use_skills && preferences.always_use_skills.length > 0) {
         lines.push("- Always use these skills when relevant:");
         for (const skill of preferences.always_use_skills) {

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

@@ -21,6 +21,7 @@ import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { logWarning } from "./workflow-logger.js";
 import { gsdHome } from "./gsd-home.js";
+import { chooseVisionAskVariant } from "./vision-ask.js";
 function hasRequiredExtensionAssets(rootDir, exists = existsSync) {
     return (exists(join(rootDir, "prompts")) &&
         exists(join(rootDir, "templates", "task-summary.md")));
@@ -168,6 +169,7 @@ export function loadPrompt(name, vars = {}) {
         planTemplatePath: join(getTemplatesDir(), "plan.md"),
         taskPlanTemplatePath: join(getTemplatesDir(), "task-plan.md"),
         taskSummaryTemplatePath: join(getTemplatesDir(), "task-summary.md"),
+        visionAsk: chooseVisionAskVariant(),
         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,
     };

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

@@ -1,8 +1,10 @@
 {{preamble}}
 
-Ask: "What's the vision?" once, then use the reply as vision input.
+Ask exactly this once: "{{visionAsk}}" Then use the user's reply as vision input.
 
-**Special handling:** If the **user's** message is status, branch state, clarification, or any other non-project-description, treat it as vision input and proceed instead of repeating "What's the vision?" Do **not** treat the system preamble above (e.g. "New milestone M00X.") as vision input — wait for the user.
+The opener is intentionally variable so GSD feels alive across project starts. Keep it natural, easy to answer, and assistant/developer shaped: plain language, light guidance, no corporate wording, no roleplay.
+
+**Special handling:** If the **user's** message is status, branch state, clarification, or any other non-project-description, treat it as vision input and proceed instead of repeating the opener. Do **not** treat the system preamble above (e.g. "New milestone M00X.") as vision input — wait for the user.
 
 ## Reflection Step
 

package/dist/resources/extensions/gsd/prompts/guided-discuss-milestone.md

@@ -4,6 +4,8 @@ Discuss milestone {{milestoneId}} ("{{milestoneTitle}}"). Identify real gray are
 
 **Structured questions available: {{structuredQuestionsAvailable}}**
 
+**Conversation opener:** For the first user-facing question round, if you need a broad starting question, use: "{{visionAsk}}" Pair it with investigation-shaped follow-ups. Keep the tone natural and easy to answer, like an assistant/developer helping the user shape the next piece of work.
+
 {{inlinedTemplates}}
 
 ---