@opengsd/gsd-pi 1.0.2-dev.e9a1b49 → 1.0.2-dev.fb7ddf1

package/README.md

@@ -13,6 +13,28 @@ GSD Pi is a local-first coding agent for planning, implementing, verifying, and
 
 It combines a terminal agent, project workflow tools, worktree-aware Git automation, and optional UI integrations so a project can move from idea to reviewed implementation with less manual coordination.
 
+## Screenshots
+
+GSD runs as a terminal-first TUI with optional browser dashboard controls.
+
+![GSD TUI running an agent workflow](./docs/assets/screenshots/gsd-tui-agent-run.png)
+
+![GSD TUI progress dashboard](./docs/assets/screenshots/gsd-tui-progress-dashboard.png)
+
+![GSD TUI metrics dashboard](./docs/assets/screenshots/gsd-tui-metrics-dashboard.png)
+
+## Feature Roll-Up
+
+- **Guided terminal agent** — Start with `gsd`, configure providers, and run planned or quick coding sessions from your shell.
+- **Autonomous project workflow** — Break work into milestones, slices, and tasks, then let auto mode plan, implement, verify, and advance.
+- **Worktree-aware Git automation** — Keep implementation work isolated while preserving a reviewable main checkout.
+- **Local project memory** — Store project requirements, decisions, runtime notes, generated plans, summaries, and validation evidence under `.gsd/`.
+- **Multi-provider model routing** — Use the provider your team already has, with configurable defaults and per-phase model preferences.
+- **Extension surface** — Add project-specific commands, tools, skills, and UI integrations through bundled or community extensions.
+- **Terminal and web surfaces** — Use the TUI by default, or launch `gsd --web` when a visual control plane fits the work better than a terminal.
+
+See [CHANGELOG.md](./CHANGELOG.md) for release-by-release fixes and [Legacy Release History](./docs/archive/legacy-release-history.md) for archived history before the `open-gsd/gsd-pi` baseline.
+
 ## Status
 
 This repository is starting a new development baseline at version `1.0.0` under the `open-gsd/gsd-pi` project.
@@ -27,41 +49,63 @@ Recommended — guided installer:
 npx @opengsd/gsd-pi@latest
 ```
 
-Alternative — direct global install:
+For CI or scripted installs:
+
+```bash
+npx @opengsd/gsd-pi@latest --yes
+```
+
+Alternative — direct npm global install:
 
 ```bash
 npm install -g @opengsd/gsd-pi@latest
 ```
 
-For CI or scripted installs:
+If you want pnpm to own the global install, use pnpm's runner:
 
 ```bash
-npx @opengsd/gsd-pi@latest --yes
+pnpm setup
+exec $SHELL -l
+pnpm dlx @opengsd/gsd-pi@latest
 ```
 
 Source: [`open-gsd/gsd-pi`](https://github.com/open-gsd/gsd-pi).
 
 ## Migrate From Older Installs
 
-GSD Pi now installs from the scoped npm package `@opengsd/gsd-pi`. If you previously installed the older unscoped `gsd-pi` package, remove it first so the old global binary does not shadow the new package.
+GSD Pi now installs from the scoped package `@opengsd/gsd-pi`. If you previously installed the older unscoped `gsd-pi` package, remove it first so the old global binary does not shadow the new package.
 
-macOS / Linux:
+Recommended migration with the guided `npx` installer:
 
 ```bash
-npm uninstall -g gsd-pi
+npm uninstall -g gsd-pi @opengsd/gsd-pi
 rm -f ~/.gsd/.update-check ~/.gsd/agent/managed-resources.json
-npm install -g @opengsd/gsd-pi@latest
-which gsd
+npx @opengsd/gsd-pi@latest
+command -v gsd
 gsd --version
 ```
 
-Windows PowerShell:
+If the old package was installed with `sudo npm install -g`, use `sudo npm uninstall -g gsd-pi` for the old package removal.
+
+To migrate from old npm globals to a pnpm-owned global install:
+
+```bash
+npm uninstall -g gsd-pi @opengsd/gsd-pi
+rm -f ~/.gsd/.update-check ~/.gsd/agent/managed-resources.json
+pnpm setup
+exec $SHELL -l
+pnpm dlx @opengsd/gsd-pi@latest
+command -v gsd
+gsd --version
+```
+
+Windows PowerShell with the guided `npx` installer:
 
 ```powershell
-npm uninstall -g gsd-pi
+npm uninstall -g gsd-pi @opengsd/gsd-pi
 Remove-Item "$env:USERPROFILE\.gsd\.update-check" -Force -ErrorAction SilentlyContinue
 Remove-Item "$env:USERPROFILE\.gsd\agent\managed-resources.json" -Force -ErrorAction SilentlyContinue
-npm install -g @opengsd/gsd-pi@latest
+npx @opengsd/gsd-pi@latest
 where.exe gsd
 gsd --version
 ```
@@ -85,6 +129,14 @@ npm uninstall -g @opengsd/gsd-pi gsd-pi
 rm -rf ~/.gsd
 ```
 
+If you installed GSD with pnpm, use pnpm for the pnpm-owned package. If pnpm reports that its global bin directory is not on `PATH`, run `pnpm setup`, restart your shell, then retry.
+
+```bash
+pnpm remove -g @opengsd/gsd-pi
+npm uninstall -g gsd-pi
+rm -rf ~/.gsd
+```
+
 Windows PowerShell:
 
 ```powershell
@@ -139,7 +191,6 @@ Then use slash commands inside the GSD session:
 | `native/` | Native engine packaging and platform binaries |
 | `studio/` | Desktop studio app |
 | `web/` | Web UI and API surface |
-| `vscode-extension/` | VS Code integration |
 | `docs/` | User and developer documentation |
 | `scripts/` | Build, release, migration, and maintenance scripts |
 

package/dist/headless-answers.js

@@ -7,6 +7,7 @@
  */
 import { readFileSync } from 'node:fs';
 import { serializeJsonLine } from '@gsd/agent-modes';
+import { canonicalHeadlessToolName } from './headless-events.js';
 export function normalizeQuestionId(id) {
     return id.trim().toLowerCase().replace(/[-\s]+/g, '_').replace(/_confirm$/, '');
 }
@@ -98,7 +99,7 @@ export class AnswerInjector {
      * Observe every event for question metadata (tool_execution_start of ask_user_questions).
      */
     observeEvent(event) {
-        if (event.type !== 'tool_execution_start' || event.toolName !== 'ask_user_questions')
+        if (event.type !== 'tool_execution_start' || canonicalHeadlessToolName(String(event.toolName ?? '')) !== 'ask_user_questions')
             return;
         // Extract questions from event.input.questions or event.args?.questions
         const input = (event.input ?? event.args);

package/dist/headless-events.d.ts

@@ -46,6 +46,7 @@ export declare const PAUSED_PREFIXES: string[];
 export declare const TERMINAL_PREFIXES: string[];
 export declare const IDLE_TIMEOUT_MS = 15000;
 export declare const NEW_MILESTONE_IDLE_TIMEOUT_MS = 120000;
+export declare function canonicalHeadlessToolName(toolName: string | undefined): string;
 export declare function isTerminalNotification(event: Record<string, unknown>): boolean;
 export declare function isBlockedNotification(event: Record<string, unknown>): boolean;
 export declare function isMilestoneReadyNotification(event: Record<string, unknown>): boolean;

package/dist/headless-events.js

@@ -79,6 +79,13 @@ export const IDLE_TIMEOUT_MS = 15_000;
 // longer idle timeout to avoid killing the session prematurely (#808).
 export const NEW_MILESTONE_IDLE_TIMEOUT_MS = 120_000;
 const INTERACTIVE_HEADLESS_TOOLS = new Set(['ask_user_questions', 'secure_env_collect']);
+export function canonicalHeadlessToolName(toolName) {
+    const name = String(toolName ?? '');
+    if (!name.startsWith('mcp__'))
+        return name;
+    const toolSeparator = name.indexOf('__', 'mcp__'.length);
+    return toolSeparator >= 0 ? name.slice(toolSeparator + 2) : name;
+}
 function isManualResolutionNotification(message) {
     return (message.includes('resolve manually and re-run /gsd auto') ||
         message.includes('resolve conflicts manually and run /gsd auto to resume') ||
@@ -136,7 +143,7 @@ export function isMilestoneReadyNotification(event) {
     return /milestone\s+m\d+.*ready/i.test(String(event.message ?? ''));
 }
 export function isInteractiveHeadlessTool(toolName) {
-    return INTERACTIVE_HEADLESS_TOOLS.has(String(toolName ?? ''));
+    return INTERACTIVE_HEADLESS_TOOLS.has(canonicalHeadlessToolName(toolName));
 }
 export function shouldArmHeadlessIdleTimeout(toolCallCount, interactiveToolCount) {
     return toolCallCount > 0 && interactiveToolCount === 0;

package/dist/onboarding.js

@@ -15,6 +15,7 @@ import { dirname, join } from 'node:path';
 import { renderGsdPiLogo, GSD_PI_BRAND, GSD_WEBSITE } from './logo.js';
 import { agentDir } from './app-paths.js';
 import { isClaudeCliReady } from './claude-cli-check.js';
+import { isAntigravityCliReady, isGeminiCliReady } from './resources/extensions/google-cli/readiness.js';
 import { markOnboardingComplete, markStepCompleted, markStepSkipped, isOnboardingComplete, } from './resources/extensions/gsd/onboarding-state.js';
 import { getLlmProviderIds } from './resources/extensions/gsd/setup-catalog.js';
 // ─── Constants ────────────────────────────────────────────────────────────────
@@ -358,7 +359,13 @@ export async function runLlmStep(p, pc, authStorage) {
     if (isClaudeCliReady()) {
         authOptions.push({ value: 'claude-cli', label: 'Use Claude Code CLI', hint: 'recommended — uses your existing Claude subscription' });
     }
-    authOptions.push({ value: 'browser', label: 'Sign in with your browser', hint: 'GitHub Copilot, ChatGPT, Google, etc.' }, { value: 'api-key', label: 'Paste an API key', hint: 'from your provider dashboard' }, { value: 'skip', label: 'Skip for now', hint: 'use /login inside GSD later' });
+    if (isGeminiCliReady()) {
+        authOptions.push({ value: 'gemini-cli', label: 'Use Google Gemini CLI', hint: 'uses your existing Gemini CLI session' });
+    }
+    if (isAntigravityCliReady()) {
+        authOptions.push({ value: 'antigravity-cli', label: 'Use Antigravity CLI', hint: 'uses your existing Antigravity session' });
+    }
+    authOptions.push({ value: 'browser', label: 'Sign in with your browser', hint: 'GitHub Copilot or ChatGPT/Codex' }, { value: 'api-key', label: 'Paste an API key', hint: 'from your provider dashboard' }, { value: 'skip', label: 'Skip for now', hint: 'use /login inside GSD later' });
     const method = await p.select({
         message: existingAuth ? `LLM provider: ${existingAuth} — change it?` : 'How do you want to sign in?',
         options: authOptions,
@@ -377,6 +384,20 @@ export async function runLlmStep(p, pc, authStorage) {
         persistDefaultProvider('claude-code');
         return true;
     }
+    if (method === 'gemini-cli') {
+        p.log.success('Google Gemini CLI detected — routing through local CLI');
+        p.log.info('Your Gemini CLI session will be used for inference. No API key needed.');
+        authStorage.set('google-gemini-cli', { type: 'api_key', key: 'cli' });
+        persistDefaultProvider('google-gemini-cli');
+        return true;
+    }
+    if (method === 'antigravity-cli') {
+        p.log.success('Antigravity CLI detected — routing through local CLI');
+        p.log.info('Your Antigravity session will be used for inference. No API key needed.');
+        authStorage.set('google-antigravity', { type: 'api_key', key: 'cli' });
+        persistDefaultProvider('google-antigravity');
+        return true;
+    }
     // ── Step 2: Which provider? ──────────────────────────────────────────────
     if (method === 'browser') {
         // Anthropic OAuth is removed from browser auth — it violates Anthropic TOS for
@@ -387,8 +408,6 @@ export async function runLlmStep(p, pc, authStorage) {
             options: [
                 { value: 'github-copilot', label: 'GitHub Copilot' },
                 { value: 'openai-codex', label: 'ChatGPT Plus/Pro (Codex)' },
-                { value: 'google-gemini-cli', label: 'Google Gemini CLI' },
-                { value: 'google-antigravity', label: 'Antigravity (Gemini 3, Claude, GPT-OSS)' },
             ],
         });
         if (p.isCancel(provider))

package/dist/resource-loader.d.ts

@@ -33,6 +33,11 @@ export declare function getNewerManagedResourceVersion(agentDir: string, current
  * 4. Makes the result writable for the next upgrade cycle.
  */
 export declare function syncResourceDir(srcDir: string, destDir: string): void;
+export declare function resolvePackageNodeModulesLayout(root: string): {
+    internalNodeModules: string;
+    hoistedNodeModules: string | null;
+};
+export declare function findNearestNodeModulesAncestor(startPath: string): string | null;
 /** Check if any GSD workspace scopes exist in internal but not in hoisted node_modules */
 export declare function hasMissingWorkspaceScopes(hoisted: string, internal: string): boolean;
 /**
@@ -47,6 +52,7 @@ export declare function mergedFingerprint(hoisted: string, internal: string): st
  * Syncs all bundled resources to agentDir (~/.gsd/agent/) on every launch.
  *
  * - extensions/ → ~/.gsd/agent/extensions/   (overwrite when version changes)
+ * - shared/     → ~/.gsd/agent/shared/       (overwrite when version changes)
  * - agents/     → ~/.gsd/agent/agents/        (overwrite when version changes)
  * - skills/     → ~/.gsd/agent/skills/        (overwrite when version changes)
  * - GSD-WORKFLOW.md → ~/.gsd/agent/GSD-WORKFLOW.md (fallback for env var miss)
@@ -60,6 +66,7 @@ export declare function mergedFingerprint(hoisted: string, internal: string): st
  */
 export declare function initResources(agentDir: string, skillsDir?: string): void;
 export declare function hasStaleCompiledExtensionSiblings(extensionsDir: string, sourceDir?: string): boolean;
+export declare function hasMissingBundledResourceFiles(destDir: string, sourceDir: string): boolean;
 interface BuildResourceLoaderOptions {
     additionalExtensionPaths?: string[];
 }

package/dist/resource-loader.js

@@ -311,16 +311,15 @@ function copyDirRecursive(src, dest) {
  * them without requiring every call site to use jiti.
  *
  * Layout differences by install method:
- * - Source/monorepo: packageRoot/node_modules has everything → simple symlink
- * - Global install (npm/bun/pnpm): merge hoisted dirname(packageRoot)/node_modules with
- *   packageRoot/node_modules so package-local deps like @sinclair/typebox resolve (#3529, #3564)
+ * - Source/monorepo: packageRoot/node_modules has everything -> simple symlink
+ * - Global install (npm/bun/pnpm): merge the nearest ancestor node_modules
+ *   with packageRoot/node_modules so both hoisted deps like yaml and
+ *   package-local deps like @sinclair/typebox resolve (#3529, #3564).
  */
 function ensureNodeModulesSymlink(agentDir) {
     const agentNodeModules = join(agentDir, 'node_modules');
-    const internalNodeModules = join(packageRoot, 'node_modules');
-    const hoistedNodeModules = dirname(packageRoot);
-    const isGlobalInstall = basename(hoistedNodeModules) === 'node_modules';
-    if (!isGlobalInstall) {
+    const { internalNodeModules, hoistedNodeModules } = resolvePackageNodeModulesLayout(packageRoot);
+    if (!hoistedNodeModules) {
         // Source/monorepo: internal node_modules has everything
         reconcileSymlink(agentNodeModules, internalNodeModules);
         return;
@@ -330,6 +329,23 @@ function ensureNodeModulesSymlink(agentDir) {
     // @gsd/* scopes are hoisted — a hoisted-only symlink breaks extension imports.
     reconcileMergedNodeModules(agentNodeModules, hoistedNodeModules, internalNodeModules);
 }
+export function resolvePackageNodeModulesLayout(root) {
+    return {
+        internalNodeModules: join(root, 'node_modules'),
+        hoistedNodeModules: findNearestNodeModulesAncestor(root),
+    };
+}
+export function findNearestNodeModulesAncestor(startPath) {
+    let current = resolve(startPath);
+    while (true) {
+        if (basename(current) === 'node_modules')
+            return current;
+        const parent = dirname(current);
+        if (parent === current)
+            return null;
+        current = parent;
+    }
+}
 /** Check if any GSD workspace scopes exist in internal but not in hoisted node_modules */
 export function hasMissingWorkspaceScopes(hoisted, internal) {
     if (!existsSync(internal))
@@ -544,6 +560,7 @@ function pruneRemovedBundledExtensions(manifest, agentDir) {
  * Syncs all bundled resources to agentDir (~/.gsd/agent/) on every launch.
  *
  * - extensions/ → ~/.gsd/agent/extensions/   (overwrite when version changes)
+ * - shared/     → ~/.gsd/agent/shared/       (overwrite when version changes)
  * - agents/     → ~/.gsd/agent/agents/        (overwrite when version changes)
  * - skills/     → ~/.gsd/agent/skills/        (overwrite when version changes)
  * - GSD-WORKFLOW.md → ~/.gsd/agent/GSD-WORKFLOW.md (fallback for env var miss)
@@ -584,12 +601,19 @@ export function initResources(agentDir, skillsDir = join(agentDir, 'skills')) {
         // Version matches — check content fingerprint for same-version staleness.
         const currentHash = getCurrentResourceFingerprint();
         const hasStaleExtensionFiles = hasStaleCompiledExtensionSiblings(extensionsDir, bundledExtensionsDir);
-        if (manifest.contentHash && manifest.contentHash === currentHash && !hasStaleExtensionFiles) {
+        const hasMissingSharedFiles = hasMissingBundledResourceFiles(join(agentDir, 'shared'), join(resourcesDir, 'shared'));
+        const hasMissingSkillFiles = hasMissingBundledResourceFiles(skillsDir, join(resourcesDir, 'skills'));
+        if (manifest.contentHash &&
+            manifest.contentHash === currentHash &&
+            !hasStaleExtensionFiles &&
+            !hasMissingSharedFiles &&
+            !hasMissingSkillFiles) {
             return;
         }
     }
     // Sync bundled resources — overwrite so updates land on next launch.
     syncResourceDir(bundledExtensionsDir, join(agentDir, 'extensions'));
+    syncResourceDir(join(resourcesDir, 'shared'), join(agentDir, 'shared'));
     syncResourceDir(join(resourcesDir, 'agents'), join(agentDir, 'agents'));
     syncResourceDir(join(resourcesDir, 'skills'), skillsDir);
     // Sync GSD-WORKFLOW.md to agentDir as a fallback for when GSD_WORKFLOW_PATH
@@ -627,7 +651,7 @@ function cleanupBundledSkillsFromEcosystemDir() {
                 makeTreeWritable(targetPath);
                 rmSync(targetPath, { recursive: true, force: true });
             }
-            else {
+            else if (process.env.GSD_RESOURCE_LOADER_DEBUG === '1') {
                 console.warn(`[GSD] Leaving ambiguous skill collision in ${targetPath}; ` +
                     `the bundled copy will be used from ~/.gsd/agent/skills/${entry.name}.`);
             }
@@ -675,6 +699,17 @@ export function hasStaleCompiledExtensionSiblings(extensionsDir, sourceDir = bun
     }
     return false;
 }
+export function hasMissingBundledResourceFiles(destDir, sourceDir) {
+    const sourceFiles = collectRelativeFiles(sourceDir);
+    if (sourceFiles.size === 0)
+        return false;
+    const installedFiles = collectRelativeFiles(destDir);
+    for (const relPath of sourceFiles) {
+        if (!installedFiles.has(relPath))
+            return true;
+    }
+    return false;
+}
 function collectRelativeFiles(rootDir) {
     const files = new Set();
     if (!existsSync(rootDir))

package/dist/resources/.managed-resources-content-hash

@@ -1 +1 @@
-f796c99ee5d78c73
+2fb7ab216cf81556

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

@@ -17,7 +17,7 @@ import { dirname, join } from "node:path";
 import { PartialMessageBuilder, ZERO_USAGE, mapUsage } from "./partial-builder.js";
 import { buildWorkflowMcpServers, resolveWorkflowMcpProjectRoot } from "../gsd/workflow-mcp.js";
 import { loadProjectGSDPreferences } from "../gsd/preferences.js";
-import { discoverMcpServerNames, computeMcpDisallowedTools } from "../gsd/mcp-filter.js";
+import { discoverMcpServerNames, discoverWorkflowMcpServerName, computeMcpDisallowedTools } from "../gsd/mcp-filter.js";
 import { showInterviewRound } from "../shared/tui.js";
 export function serverToolUseToToolCallLike(block) {
     const argumentsValue = block.input && typeof block.input === "object" && !Array.isArray(block.input)
@@ -177,7 +177,7 @@ function extractMessageText(msg) {
  * user turns in its own output. XML tags read as document structure and
  * don't get mirrored in free text.
  */
-export function buildPromptFromContext(context) {
+export function buildPromptFromContext(context, toolContext = {}) {
     const hasContent = Boolean(context.systemPrompt) || context.messages.some((m) => extractMessageText(m));
     if (!hasContent)
         return "";
@@ -185,6 +185,14 @@ export function buildPromptFromContext(context) {
         "Respond only to the final user message below. " +
             "Do not emit <user_message>, <assistant_message>, or <prior_system_context> tags in your response.",
     ];
+    const workflowToolLine = toolContext.workflowMcpServerName
+        ? "- GSD workflow tools (gsd_exec, gsd_slice_complete, gsd_task_complete, gsd_plan_slice, gsd_save_gate_result, etc.) " +
+            `are MCP tools — call them as mcp__${toolContext.workflowMcpServerName}__<tool_name> ` +
+            `(e.g. mcp__${toolContext.workflowMcpServerName}__gsd_exec, mcp__${toolContext.workflowMcpServerName}__gsd_save_gate_result)\n`
+        : "- GSD workflow MCP tools are unavailable in this Claude Code run.\n";
+    const toolSearchLine = toolContext.workflowMcpServerName
+        ? "- ToolSearch is NOT available — never use it to discover tools; invoke the MCP tool directly\n"
+        : "- ToolSearch is NOT available — never use it to discover tools\n";
     // The prior system context lists pi-native tool names (lowercase: bash, read, gsd_exec, etc.)
     // but this process runs inside Claude Code where tool names differ. Inject a remapping note
     // before the prior context so the model uses correct names regardless of what the prior
@@ -193,10 +201,8 @@ export function buildPromptFromContext(context) {
         "You are running inside Claude Code. Use these exact tool names — do not use lowercase or pi-native names:\n" +
         "- Shell commands: 'Bash' (not 'bash')\n" +
         "- File operations: 'Read', 'Write', 'Edit', 'Glob', 'Grep' (PascalCase, not lowercase)\n" +
-        "- GSD workflow tools (gsd_exec, gsd_slice_complete, gsd_task_complete, gsd_plan_slice, gsd_save_gate_result, etc.) " +
-        "are MCP tools — call them as mcp__gsd-workflow__<tool_name> " +
-        "(e.g. mcp__gsd-workflow__gsd_exec, mcp__gsd-workflow__gsd_save_gate_result)\n" +
-        "- ToolSearch is NOT available — never use it to discover tools; invoke the MCP tool directly\n" +
+        workflowToolLine +
+        toolSearchLine +
         "</tool_context>");
     if (context.systemPrompt) {
         parts.push(`<prior_system_context>\n${context.systemPrompt}\n</prior_system_context>`);
@@ -1160,6 +1166,18 @@ function mapThinkingLevelToAnthropicEffort(level, modelId) {
             return "high";
     }
 }
+function workflowMcpServerNameFromAllowedTools(allowedTools) {
+    if (!Array.isArray(allowedTools))
+        return undefined;
+    for (const toolName of allowedTools) {
+        if (typeof toolName !== "string")
+            continue;
+        const match = /^mcp__(.+)__\*$/.exec(toolName);
+        if (match?.[1])
+            return match[1];
+    }
+    return undefined;
+}
 /**
  * Build the options object passed to the Claude Agent SDK's `query()` call.
  *
@@ -1181,14 +1199,17 @@ export function buildSdkOptions(modelId, prompt, overrides, extraOptions = {}) {
     const permissionMode = overrides?.permissionMode ?? "bypassPermissions";
     const preferences = loadProjectGSDPreferences(projectRoot);
     const mcpConfig = preferences?.preferences.claude_code_mcp;
-    const workflowServerName = mcpServers ? Object.keys(mcpServers)[0] : undefined;
     // Always discover project MCPs — needed for both duplicate detection and filtering.
     const discovered = discoverMcpServerNames(projectRoot);
+    const injectedWorkflowServerName = mcpServers ? Object.keys(mcpServers)[0] : undefined;
+    const projectWorkflowServerName = discoverWorkflowMcpServerName(projectRoot);
+    const workflowServerName = projectWorkflowServerName ?? injectedWorkflowServerName;
     // If the workflow MCP is already declared in the project's .mcp.json or
     // .claude/settings.json, do not inject it again via mcpServers. Passing the
     // same server name from two sources causes a duplicate registration conflict
     // that prevents the MCP server from loading (tools become unavailable).
-    const workflowAlreadyInProject = workflowServerName !== undefined && discovered.includes(workflowServerName);
+    const workflowAlreadyInProject = projectWorkflowServerName !== undefined
+        || (injectedWorkflowServerName !== undefined && discovered.includes(injectedWorkflowServerName));
     let filteredMcpServers = workflowAlreadyInProject ? undefined : mcpServers;
     let extraDisallowedTools = [];
     let workflowExplicitlyBlocked = false;
@@ -1501,8 +1522,6 @@ async function pumpSdkMessages(model, context, options, stream) {
         if (options?.signal) {
             options.signal.addEventListener("abort", () => controller.abort(), { once: true });
         }
-        const prompt = buildPromptFromContext(context);
-        const queryPrompt = buildSdkQueryPrompt(context, prompt);
         const permissionMode = await resolveClaudePermissionMode();
         const uiContext = options?.extensionUIContext;
         const onExternalToolCall = options?.onExternalToolCall;
@@ -1513,7 +1532,7 @@ async function pumpSdkMessages(model, context, options, stream) {
         // tool requests. This replaces the old bypassPermissions workaround.
         const canUseToolFallback = canUseToolHandler
             ?? (async (_toolName, _input, opts) => ({ behavior: "allow", toolUseID: opts.toolUseID }));
-        const sdkOpts = buildSdkOptions(modelId, prompt, { permissionMode }, {
+        const sdkOpts = buildSdkOptions(modelId, "", { permissionMode }, {
             cwd,
             reasoning: options?.reasoning,
             canUseTool: canUseToolFallback,
@@ -1523,6 +1542,10 @@ async function pumpSdkMessages(model, context, options, stream) {
                 }
                 : {}),
         });
+        const prompt = buildPromptFromContext(context, {
+            workflowMcpServerName: workflowMcpServerNameFromAllowedTools(sdkOpts.allowedTools),
+        });
+        const queryPrompt = buildSdkQueryPrompt(context, prompt);
         const queryResult = sdk.query({
             prompt: queryPrompt,
             options: {

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

@@ -92,6 +92,16 @@ function formatLibraryList(libs, query) {
     lines.push("\nUse the ID (e.g. /websites/react_dev) with get_library_docs to fetch documentation.");
     return lines.join("\n");
 }
+function getFirstTextContent(result) {
+    const content = result.content;
+    if (!Array.isArray(content))
+        return undefined;
+    const textBlock = content.find((block) => typeof block === "object" &&
+        block !== null &&
+        block.type === "text" &&
+        typeof block.text === "string");
+    return textBlock?.text.trim() || undefined;
+}
 // ─── Extension ───────────────────────────────────────────────────────────────
 export default function (pi) {
     // ── resolve_library ──────────────────────────────────────────────────────
@@ -164,7 +174,7 @@ export default function (pi) {
             if (isPartial)
                 return new Text(theme.fg("warning", "Searching Context7..."), 0, 0);
             if (result.isError || d?.error) {
-                return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
+                return new Text(theme.fg("error", `Error: ${d?.error ?? getFirstTextContent(result) ?? "unknown"}`), 0, 0);
             }
             let text = theme.fg("success", `${d?.resultCount ?? 0} ${d?.resultCount === 1 ? "library" : "libraries"} found`);
             if (d?.cached)
@@ -303,7 +313,7 @@ export default function (pi) {
             if (isPartial)
                 return new Text(theme.fg("warning", "Fetching documentation..."), 0, 0);
             if (result.isError || d?.error) {
-                return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
+                return new Text(theme.fg("error", `Error: ${d?.error ?? getFirstTextContent(result) ?? "unknown"}`), 0, 0);
             }
             let text = theme.fg("success", `${(d?.charCount ?? 0).toLocaleString()} chars`);
             text += theme.fg("dim", ` · ${d?.tokens ?? 5000} token budget`);

package/dist/resources/extensions/get-secrets-from-user.js

@@ -10,6 +10,7 @@ import { existsSync, statSync } from "node:fs";
 import { resolve } from "node:path";
 import { Editor, Key, matchesKey, Text, truncateToWidth, wrapTextWithAnsi } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
+import { renderSharedDialogFrame } from "./shared/dialog-frame.js";
 import { makeUI } from "./shared/tui.js";
 import { maskEditorLine } from "./shared/mod.js";
 import { parseSecretsManifest, formatSecretsManifest } from "./gsd/files.js";
@@ -22,6 +23,9 @@ function maskPreview(value) {
         return "*".repeat(value.length);
     return `${value.slice(0, 4)}${"*".repeat(Math.max(4, value.length - 8))}${value.slice(-4)}`;
 }
+function dialogContentWidth(width) {
+    return width < 4 ? Math.max(1, width) : Math.max(1, width - 4);
+}
 function shellEscapeSingle(value) {
     return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -132,9 +136,9 @@ async function collectOneSecret(ctx, pageIndex, totalPages, keyName, hint, guida
         function render(width) {
             if (cachedLines)
                 return cachedLines;
+            const contentWidth = dialogContentWidth(width);
             const lines = [];
-            const add = (s) => lines.push(truncateToWidth(s, width));
-            add(theme.fg("accent", "─".repeat(width)));
+            const add = (s) => lines.push(truncateToWidth(s, contentWidth));
             add(theme.fg("dim", ` Page ${pageIndex + 1}/${totalPages} · Secure Env Setup`));
             lines.push("");
             // Key name as big header
@@ -148,7 +152,7 @@ async function collectOneSecret(ctx, pageIndex, totalPages, keyName, hint, guida
                 for (let g = 0; g < guidance.length; g++) {
                     const prefix = `  ${g + 1}. `;
                     const step = guidance[g];
-                    const wrappedLines = wrapTextWithAnsi(step, width - 4);
+                    const wrappedLines = wrapTextWithAnsi(step, Math.max(1, contentWidth - 4));
                     for (let w = 0; w < wrappedLines.length; w++) {
                         const indent = w === 0 ? prefix : " ".repeat(prefix.length);
                         lines.push(theme.fg("dim", `${indent}${wrappedLines[w]}`));
@@ -163,14 +167,13 @@ async function collectOneSecret(ctx, pageIndex, totalPages, keyName, hint, guida
             lines.push("");
             // Editor
             add(theme.fg("muted", " Enter value:"));
-            for (const line of editor.render(width - 2)) {
+            for (const line of editor.render(Math.max(1, contentWidth - 2))) {
                 add(theme.fg("text", maskEditorLine(line)));
             }
             lines.push("");
-            add(theme.fg("dim", ` enter to confirm  |  ctrl+s or esc to skip  |  esc cancels`));
-            add(theme.fg("accent", "─".repeat(width)));
-            cachedLines = lines;
-            return lines;
+            const footer = theme.fg("dim", " enter to confirm  |  ctrl+s or esc to skip  |  esc cancels");
+            cachedLines = renderSharedDialogFrame(theme, "Secure Env Setup", lines, width, { footer });
+            return cachedLines;
         }
         return {
             render,
@@ -224,13 +227,11 @@ export async function showSecretsSummary(ctx, entries, existingKeys) {
         function render(width) {
             if (cachedLines)
                 return cachedLines;
-            const ui = makeUI(theme, width);
+            const contentWidth = dialogContentWidth(width);
+            const ui = makeUI(theme, contentWidth);
             const lines = [];
             const push = (...rows) => { for (const r of rows)
                 lines.push(...r); };
-            push(ui.bar());
-            push(ui.blank());
-            push(ui.header("  Secrets Summary"));
             push(ui.blank());
             for (const entry of entries) {
                 let status;
@@ -251,10 +252,9 @@ export async function showSecretsSummary(ctx, entries, existingKeys) {
                 push(ui.progressItem(entry.key, status, { detail }));
             }
             push(ui.blank());
-            push(ui.hints(["any key to continue"]));
-            push(ui.bar());
-            cachedLines = lines;
-            return lines;
+            const footer = ui.hints(["any key to continue"])[0] ?? "";
+            cachedLines = renderSharedDialogFrame(theme, "Secrets Summary", lines, width, { footer });
+            return cachedLines;
         }
         return {
             render,

package/dist/resources/extensions/google-cli/index.js

@@ -0,0 +1,30 @@
+/**
+ * Google local CLI providers.
+ *
+ * These deliberately use authMode "externalCli": GSD never owns the browser
+ * OAuth flow or cached tokens. Users authenticate with the official CLI, then
+ * /login activates the provider once the local binary is available.
+ */
+import { GOOGLE_ANTIGRAVITY_MODELS, GOOGLE_GEMINI_CLI_MODELS } from "./models.js";
+import { isAntigravityCliReady, isGeminiCliReady } from "./readiness.js";
+import { streamViaGoogleCli } from "./stream-adapter.js";
+export default function googleCli(pi) {
+    pi.registerProvider("google-gemini-cli", {
+        name: "Google Gemini CLI",
+        authMode: "externalCli",
+        api: "google-gemini-cli",
+        baseUrl: "local://google-gemini-cli",
+        isReady: isGeminiCliReady,
+        streamSimple: streamViaGoogleCli,
+        models: GOOGLE_GEMINI_CLI_MODELS,
+    });
+    pi.registerProvider("google-antigravity", {
+        name: "Google Antigravity",
+        authMode: "externalCli",
+        api: "google-antigravity",
+        baseUrl: "local://google-antigravity",
+        isReady: isAntigravityCliReady,
+        streamSimple: streamViaGoogleCli,
+        models: GOOGLE_ANTIGRAVITY_MODELS,
+    });
+}