gsd-pi 2.77.0-dev.538325aea → 2.77.0-dev.eaa4973bc

package/dist/resources/extensions/mcp-client/index.js

@@ -21,8 +21,38 @@ import { join } from "node:path";
 import { buildHttpTransportOpts } from "./auth.js";
 // ─── Connection Manager ───────────────────────────────────────────────────────
 const connections = new Map();
+const pendingConnections = new Map();
 let configCache = null;
 const toolCache = new Map();
+const trustedStdioServers = new Set();
+const CHILD_ENV_ALLOWLIST = new Set([
+    "PATH",
+    "Path",
+    "HOME",
+    "USER",
+    "USERNAME",
+    "USERPROFILE",
+    "SHELL",
+    "TMPDIR",
+    "TEMP",
+    "TMP",
+    "SystemRoot",
+    "WINDIR",
+    "APPDATA",
+    "LOCALAPPDATA",
+    "XDG_CONFIG_HOME",
+    "XDG_CACHE_HOME",
+]);
+function stdioTrustKey(config) {
+    return JSON.stringify({
+        name: config.name,
+        sourcePath: config.sourcePath,
+        command: config.command,
+        args: config.args ?? [],
+        cwd: config.cwd,
+        env: config.env ?? {},
+    });
+}
 function readConfigs() {
     if (configCache)
         return configCache;
@@ -57,6 +87,7 @@ function readConfigs() {
                 servers.push({
                     name,
                     transport,
+                    sourcePath: configPath,
                     ...(hasCommand && {
                         command: config.command,
                         args: Array.isArray(config.args) ? config.args : undefined,
@@ -78,6 +109,42 @@ function readConfigs() {
     configCache = servers;
     return servers;
 }
+export function _buildMcpChildEnvForTest(configEnv) {
+    const childEnv = {};
+    for (const key of CHILD_ENV_ALLOWLIST) {
+        const value = process.env[key];
+        if (typeof value === "string")
+            childEnv[key] = value;
+    }
+    return {
+        ...childEnv,
+        ...(configEnv ? resolveEnv(configEnv) : {}),
+    };
+}
+export function _buildMcpTrustConfirmOptionsForTest(signal) {
+    return signal ? { timeout: 120_000, signal } : { timeout: 120_000 };
+}
+async function assertTrustedStdioServer(config, ctx, signal) {
+    if (config.transport !== "stdio")
+        return undefined;
+    const trustKey = stdioTrustKey(config);
+    if (trustedStdioServers.has(trustKey))
+        return undefined;
+    if (!ctx?.hasUI) {
+        throw new Error(`MCP server "${config.name}" is a project-local stdio command from ${config.sourcePath}. ` +
+            "Run this from an interactive GSD session and approve the server before use.");
+    }
+    const commandLine = [config.command, ...(config.args ?? [])].filter(Boolean).join(" ");
+    const envKeys = Object.keys(config.env ?? {});
+    const envSummary = envKeys.length > 0
+        ? `\n\nConfigured environment keys: ${envKeys.join(", ")}`
+        : "\n\nNo explicit environment keys configured.";
+    const approved = await ctx.ui.confirm(`Trust MCP server "${config.name}"?`, `Project config ${config.sourcePath} wants to start:\n\n${commandLine}${envSummary}\n\nOnly approve MCP servers you trust.`, _buildMcpTrustConfirmOptionsForTest(signal));
+    if (!approved) {
+        throw new Error(`MCP server "${config.name}" was not approved by the user.`);
+    }
+    return trustKey;
+}
 function getServerConfig(name) {
     const trimmed = name.trim();
     return readConfigs().find((s) => s.name === trimmed ||
@@ -96,7 +163,7 @@ function resolveEnv(env) {
     }
     return resolved;
 }
-async function getOrConnect(name, signal) {
+async function getOrConnect(name, signal, ctx) {
     const config = getServerConfig(name);
     if (!config)
         throw new Error(`Unknown MCP server: "${name}". Use mcp_servers to list available servers.`);
@@ -105,13 +172,28 @@ async function getOrConnect(name, signal) {
     const existing = connections.get(config.name);
     if (existing)
         return existing.client;
+    const pending = pendingConnections.get(config.name);
+    if (pending)
+        return pending;
+    const connectionPromise = connectServer(config, signal, ctx);
+    pendingConnections.set(config.name, connectionPromise);
+    try {
+        return await connectionPromise;
+    }
+    finally {
+        pendingConnections.delete(config.name);
+    }
+}
+async function connectServer(config, signal, ctx) {
     const client = new Client({ name: "gsd", version: "1.0.0" });
     let transport;
+    let approvedTrustKey;
     if (config.transport === "stdio" && config.command) {
+        approvedTrustKey = await assertTrustedStdioServer(config, ctx, signal);
         transport = new StdioClientTransport({
             command: config.command,
             args: config.args,
-            env: config.env ? { ...process.env, ...resolveEnv(config.env) } : undefined,
+            env: _buildMcpChildEnvForTest(config.env),
             cwd: config.cwd,
             stderr: "pipe",
         });
@@ -127,9 +209,28 @@ async function getOrConnect(name, signal) {
     else {
         throw new Error(`Server "${config.name}" has unsupported transport: ${config.transport}`);
     }
-    await client.connect(transport, { signal, timeout: 30000 });
-    connections.set(config.name, { client, transport });
-    return client;
+    try {
+        await client.connect(transport, { signal, timeout: 30000 });
+        if (approvedTrustKey)
+            trustedStdioServers.add(approvedTrustKey);
+        connections.set(config.name, { client, transport });
+        return client;
+    }
+    catch (err) {
+        try {
+            await transport.close();
+        }
+        catch {
+            // Best-effort cleanup after a failed or aborted connection attempt.
+        }
+        try {
+            await client.close();
+        }
+        catch {
+            // Best-effort cleanup after a failed or aborted connection attempt.
+        }
+        throw err;
+    }
 }
 async function closeAll() {
     const closing = Array.from(connections.entries()).map(async ([name, conn]) => {
@@ -139,9 +240,17 @@ async function closeAll() {
         catch {
             // Best-effort cleanup
         }
+        try {
+            await conn.transport.close();
+        }
+        catch {
+            // Best-effort cleanup
+        }
         connections.delete(name);
     });
     await Promise.allSettled(closing);
+    pendingConnections.clear();
+    trustedStdioServers.clear();
     toolCache.clear();
 }
 // ─── Formatters ───────────────────────────────────────────────────────────────
@@ -249,7 +358,7 @@ export default function (pi) {
                 description: "MCP server name (from mcp_servers output), e.g. 'railway', 'twitter-mcp', 'linear'",
             }),
         }),
-        async execute(_id, params, signal) {
+        async execute(_id, params, signal, _onUpdate, ctx) {
             try {
                 // Return cached tools if available
                 const cached = toolCache.get(params.server);
@@ -265,7 +374,7 @@ export default function (pi) {
                         details: { server: params.server, toolCount: cached.length, cached: true },
                     };
                 }
-                const client = await getOrConnect(params.server, signal);
+                const client = await getOrConnect(params.server, signal, ctx);
                 const result = await client.listTools(undefined, { signal, timeout: 30000 });
                 const tools = (result.tools ?? []).map((t) => ({
                     name: t.name,
@@ -326,9 +435,9 @@ export default function (pi) {
                 description: "Tool arguments as key-value pairs matching the tool's input schema",
             })),
         }),
-        async execute(_id, params, signal) {
+        async execute(_id, params, signal, _onUpdate, ctx) {
             try {
-                const client = await getOrConnect(params.server, signal);
+                const client = await getOrConnect(params.server, signal, ctx);
                 const result = await client.callTool({ name: params.tool, arguments: params.args ?? {} }, undefined, { signal, timeout: 60000 });
                 // Serialize result content to text
                 const contentItems = result.content;
@@ -398,7 +507,7 @@ export default function (pi) {
     pi.on("session_shutdown", async () => {
         await closeAll();
     });
-    pi.on("session_before_switch", async () => {
+    pi.on("session_switch", async () => {
         await closeAll();
         configCache = null;
     });

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

@@ -63,11 +63,12 @@ async function probeAndRegister(pi) {
     // so the "ollama" fallback is harmless. For cloud endpoints (OLLAMA_HOST pointing
     // to ollama.com or a remote instance), OLLAMA_API_KEY is picked up here.
     pi.registerProvider("ollama", {
-        // authMode and isReady removed from ProviderConfig in pi 0.67.2
+        authMode: "apiKey",
         apiKey: process.env.OLLAMA_API_KEY ?? "ollama",
         baseUrl,
         api: "ollama-chat",
         streamSimple: streamOllamaChat,
+        isReady: () => true,
         models: models.map((m) => ({
             id: m.id,
             name: m.name,

package/dist/resources/extensions/ollama/ollama-chat-provider.js

@@ -126,7 +126,7 @@ export function streamOllamaChat(model, context, options) {
                         processChunks(thinkParser.flush());
                     endBlock();
                     output.usage = buildUsage(chunk);
-                    // inferenceMetrics removed from AssistantMessage in pi 0.67.2
+                    output.inferenceMetrics = extractMetrics(chunk);
                     // Preserve "toolUse" if tool calls were processed
                     if (output.stopReason !== "toolUse") {
                         output.stopReason = mapStopReason(chunk.done_reason);
@@ -145,7 +145,6 @@ export function streamOllamaChat(model, context, options) {
 }
 // ─── Request building ───────────────────────────────────────────────────────
 function buildRequest(model, context, options) {
-    // providerOptions removed from Model in pi 0.67.2; cast via unknown for extension data
     const ollamaOpts = (model.providerOptions ?? {});
     const request = {
         model: model.id,
@@ -320,9 +319,20 @@ function buildUsage(chunk) {
         cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
     };
 }
-// extractMetrics removed: InferenceMetrics was removed from pi-ai in pi 0.67.2
-// and inferenceMetrics was removed from AssistantMessage. Ollama perf metrics
-// (tokensPerSecond, evalDurationMs, etc.) are no longer surfaced via this path.
+function extractMetrics(chunk) {
+    if (!chunk.eval_duration && !chunk.total_duration)
+        return undefined;
+    const evalCount = chunk.eval_count ?? 0;
+    const evalDurationNs = chunk.eval_duration ?? 0;
+    const evalDurationMs = evalDurationNs / 1e6;
+    const tokensPerSecond = evalDurationNs > 0 ? evalCount / (evalDurationNs / 1e9) : 0;
+    return {
+        tokensPerSecond,
+        totalDurationMs: (chunk.total_duration ?? 0) / 1e6,
+        evalDurationMs,
+        promptEvalDurationMs: (chunk.prompt_eval_duration ?? 0) / 1e6,
+    };
+}
 // ─── Stream lifecycle helpers ───────────────────────────────────────────────
 // Replicated from openai-shared.ts (not exported from @gsd/pi-ai)
 function buildInitialOutput(model) {

package/dist/resources/extensions/remote-questions/config.js

@@ -40,20 +40,9 @@ function hydrateRemoteTokensFromAuth() {
         return;
     try {
         const auth = AuthStorage.create();
-        const authData = auth.data ?? {};
         for (const [providerId, envVar] of needed) {
             try {
-                const raw = authData[providerId];
-                const creds = Array.isArray(raw)
-                    ? raw
-                    : raw
-                        ? [raw]
-                        : [];
-                if (creds.length === 0) {
-                    const fallbackCred = auth.get(providerId);
-                    if (fallbackCred)
-                        creds.push(fallbackCred);
-                }
+                const creds = auth.getCredentialsForProvider(providerId);
                 const apiKeyCred = creds.find((c) => c.type === "api_key" && !!c.key);
                 if (apiKeyCred?.key) {
                     process.env[envVar] = apiKeyCred.key;

package/dist/resources/extensions/shared/cmux-events.js

@@ -0,0 +1,12 @@
+// GSD-2 — Shared cmux event channel contracts
+// Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
+/**
+ * Neutral event channel module for gsd<->cmux IPC.
+ * Both gsd and cmux import from here — neither imports the other directly.
+ * Per ADR-006 Phase 0: event-based decoupling.
+ */
+export const CMUX_CHANNELS = {
+    SIDEBAR: "cmux:sidebar",
+    LOG: "cmux:log",
+    LIFECYCLE: "cmux:lifecycle",
+};

package/dist/resources/extensions/shared/rtk-session-stats.js

@@ -1,7 +1,6 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { gsdRoot } from "../gsd/paths.js";
 import { formatTokenCount } from "./format-utils.js";
 import { buildRtkEnv, isRtkEnabled, resolveRtkBinaryPath } from "./rtk.js";
 const SESSION_BASELINES_FILE = "rtk-session-baselines.json";
@@ -10,7 +9,7 @@ const CURRENT_SUMMARY_TIMEOUT_MS = 5_000;
 const MAX_BASELINE_SESSIONS = 200;
 let cachedSummary = null;
 function getRuntimeDir(basePath) {
-    return join(gsdRoot(basePath), "runtime");
+    return join(basePath, ".gsd", "runtime");
 }
 function getBaselinesPath(basePath) {
     return join(getRuntimeDir(basePath), SESSION_BASELINES_FILE);

package/dist/resources/extensions/universal-config/index.js

@@ -93,7 +93,7 @@ export default function universalConfig(pi) {
         },
     });
     // ── Invalidate cache on session switch ──────────────────────────────────
-    pi.on("session_before_switch", () => {
+    pi.on("session_switch", () => {
         cachedResult = null;
     });
 }

package/dist/resources/skills/create-skill/SKILL.md

@@ -88,8 +88,8 @@ Then proceed directly to the workflow.
 ## Skill Structure Quick Reference
 
 **Skill directories:**
-- Global: `~/.gsd/agent/skills/{skill-name}/`
-- Project-local: `.pi/agent/skills/{skill-name}/`
+- Global: `~/.agents/skills/{skill-name}/`
+- Project-local: `.agents/skills/{skill-name}/`
 
 **Simple skill (single file):**
 ```yaml

package/dist/resources/skills/create-skill/references/gsd-skill-ecosystem.md

@@ -5,13 +5,13 @@ GSD-specific skill ecosystem details: directory conventions, discovery mechanics
 <skill_directories>
 GSD supports two skill directories, checked in order:
 
-**User-scope (global):** `~/.gsd/agent/skills/`
+**User-scope (global):** `~/.agents/skills/`
 - Available in every GSD session regardless of working directory
-- Installed by default or by the user
+- Installed via [skills.sh](https://skills.sh) or manually
 
-**Project-scope (local):** `.pi/agent/skills/`
+**Project-scope (local):** `.agents/skills/`
 - Available only when GSD runs inside the project directory
-- The project-local directory uses `.pi` (inherited from the pi base), **not** `.gsd`
+- Committable to version control so team members share the same skill set
 - Ideal for project-specific workflows, deploy scripts, or conventions
 
 Skills in both directories follow the same SKILL.md format and router pattern conventions.

package/dist/resources/skills/create-skill/workflows/audit-skill.md

@@ -16,22 +16,22 @@
 Enumerate skills from both directories:
 ```bash
 echo "=== Global skills ==="
-ls ~/.gsd/agent/skills/ 2>/dev/null || echo "(none)"
+ls ~/.agents/skills/ 2>/dev/null || echo "(none)"
 
 echo "=== Project-local skills ==="
-ls .pi/agent/skills/ 2>/dev/null || echo "(none)"
+ls .agents/skills/ 2>/dev/null || echo "(none)"
 ```
 
 Present as:
 ```
 Available skills:
 
-Global (~/.gsd/agent/skills/):
+Global (~/.agents/skills/):
 1. create-skill
 2. manage-stripe
 ...
 
-Project-local (.pi/agent/skills/):
+Project-local (.agents/skills/):
 3. project-deploy
 ...
 ```

package/dist/resources/skills/create-skill/workflows/create-new-skill.md

@@ -15,8 +15,8 @@
 **Ask the user:**
 "Should this skill be global or project-local?"
 
-1. **Global** (`~/.gsd/agent/skills/`) — Available in all GSD sessions
-2. **Project-local** (`.pi/agent/skills/`) — Available only in this project
+1. **Global** (`~/.agents/skills/`) — Available in all GSD sessions
+2. **Project-local** (`.agents/skills/`) — Available only in this project
 
 ## Step 2: Adaptive Requirements Gathering
 
@@ -99,11 +99,11 @@ See references/recommended-structure.md for templates.
 ## Step 5: Create Directory
 
 Use the scope selected in Step 1 to determine the base path:
-- **Global:** `~/.gsd/agent/skills/{skill-name}`
-- **Project-local:** `.pi/agent/skills/{skill-name}`
+- **Global:** `~/.agents/skills/{skill-name}`
+- **Project-local:** `.agents/skills/{skill-name}`
 
 ```bash
-BASE_PATH="{selected-base}/agent/skills/{skill-name}"
+BASE_PATH="{selected-base}/skills/{skill-name}"
 mkdir -p $BASE_PATH
 # If complex:
 mkdir -p $BASE_PATH/workflows

package/dist/security-overrides.d.ts

@@ -7,8 +7,5 @@
  *
  * Precedence: env var > settings.json > built-in defaults
  */
-import type { SettingsManager } from '@gsd/pi-coding-agent';
-export declare const SAFE_COMMAND_PREFIXES: readonly string[];
-export declare function setAllowedCommandPrefixes(prefixes: string[]): void;
-export declare function getAllowedCommandPrefixes(): readonly string[];
+import { type SettingsManager } from '@gsd/pi-coding-agent';
 export declare function applySecurityOverrides(settingsManager: SettingsManager): void;

package/dist/security-overrides.js

@@ -7,22 +7,9 @@
  *
  * Precedence: env var > settings.json > built-in defaults
  */
+import { setAllowedCommandPrefixes } from '@gsd/pi-coding-agent';
 import { setFetchAllowedUrls } from './resources/extensions/search-the-web/url-utils.js';
-// ---------------------------------------------------------------------------
-// GSD-owned command prefix allowlist state
-// (setAllowedCommandPrefixes / getAllowedCommandPrefixes were removed from
-//  pi-coding-agent's SettingsManager in 0.67.2 — GSD owns this state now)
-// ---------------------------------------------------------------------------
-export const SAFE_COMMAND_PREFIXES = ['npm', 'npx', 'yarn', 'pnpm', 'node'];
-let _allowedCommandPrefixes = [...SAFE_COMMAND_PREFIXES];
-export function setAllowedCommandPrefixes(prefixes) {
-    _allowedCommandPrefixes = prefixes;
-}
-export function getAllowedCommandPrefixes() {
-    return _allowedCommandPrefixes;
-}
 export function applySecurityOverrides(settingsManager) {
-    const sm = settingsManager;
     // --- Command prefix allowlist ---
     const envPrefixes = process.env.GSD_ALLOWED_COMMAND_PREFIXES;
     if (envPrefixes) {
@@ -32,7 +19,7 @@ export function applySecurityOverrides(settingsManager) {
         }
     }
     else {
-        const settingsPrefixes = sm.getAllowedCommandPrefixes?.();
+        const settingsPrefixes = settingsManager.getAllowedCommandPrefixes();
         if (settingsPrefixes && settingsPrefixes.length > 0) {
             setAllowedCommandPrefixes(settingsPrefixes);
         }
@@ -46,7 +33,7 @@ export function applySecurityOverrides(settingsManager) {
         }
     }
     else {
-        const settingsUrls = sm.getFetchAllowedUrls?.();
+        const settingsUrls = settingsManager.getFetchAllowedUrls();
         if (settingsUrls && settingsUrls.length > 0) {
             setFetchAllowedUrls(settingsUrls);
         }