gsd-pi 2.76.0-dev.fe143342a → 2.77.0-dev.1d17f366c

package/dist/resources/extensions/gsd/worktree-resolver.js

@@ -16,8 +16,30 @@ import { existsSync, unlinkSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { join } from "node:path";
 import { debugLog } from "./debug-logger.js";
-import { MergeConflictError } from "./git-service.js";
 import { emitJournalEvent } from "./journal.js";
+// ─── Path Helpers ──────────────────────────────────────────────────────────
+/**
+ * Worktree marker segment — present in any path produced by worktreePath().
+ * Used to strip the worktree suffix and recover the project root (#3729).
+ */
+const WORKTREE_MARKER = "/.gsd/worktrees/";
+/**
+ * Resolve the project root from session path state.
+ *
+ * Prefers `originalBasePath` (always the project root when set), but falls
+ * back to `basePath` when `originalBasePath` is falsy (e.g. fresh AutoSession
+ * with default empty string). If `basePath` itself is inside a worktree
+ * directory (contains `/.gsd/worktrees/`), strip that suffix to recover the
+ * actual project root — preventing double-nested worktree paths (#3729).
+ */
+export function resolveProjectRoot(originalBasePath, basePath) {
+    let resolved = originalBasePath || basePath;
+    const markerIdx = resolved.indexOf(WORKTREE_MARKER);
+    if (markerIdx !== -1) {
+        resolved = resolved.slice(0, markerIdx);
+    }
+    return resolved;
+}
 // ─── WorktreeResolver ──────────────────────────────────────────────────────
 export class WorktreeResolver {
     s;
@@ -33,11 +55,11 @@ export class WorktreeResolver {
     }
     /** Original project root — always the non-worktree path. */
     get projectRoot() {
-        return this.s.originalBasePath || this.s.basePath;
+        return resolveProjectRoot(this.s.originalBasePath, this.s.basePath);
     }
     /** Path for auto.lock file — same as the old lockBase(). */
     get lockPath() {
-        return this.s.originalBasePath || this.s.basePath;
+        return resolveProjectRoot(this.s.originalBasePath, this.s.basePath);
     }
     // ── Private Helpers ────────────────────────────────────────────────────
     rebuildGitService() {
@@ -99,7 +121,10 @@ export class WorktreeResolver {
             });
             return;
         }
-        const basePath = this.s.originalBasePath || this.s.basePath;
+        // Resolve the project root for worktree operations via shared helper.
+        // Handles the case where originalBasePath is falsy and basePath is itself
+        // a worktree path — prevents double-nested worktree paths (#3729).
+        const basePath = resolveProjectRoot(this.s.originalBasePath, this.s.basePath);
         debugLog("WorktreeResolver", {
             action: "enterMilestone",
             milestoneId,
@@ -429,11 +454,13 @@ export class WorktreeResolver {
                     /* best-effort */
                 }
             }
-            // Re-throw MergeConflictError so the auto loop can detect real code
-            // conflicts and stop instead of retrying forever (#2330).
-            if (err instanceof MergeConflictError) {
-                throw err;
-            }
+            // Restore state before re-throwing so callers always get a consistent
+            // session (#4380).
+            this.restoreToProjectRoot();
+            // Re-throw: MergeConflictError stops the auto loop (#2330); non-conflict
+            // errors (permission denied, filesystem failures) must also propagate so
+            // broken states are diagnosable (#4380).
+            throw err;
         }
         // Always restore basePath and rebuild — whether merge succeeded or failed
         this.restoreToProjectRoot();
@@ -500,6 +527,8 @@ export class WorktreeResolver {
                 error: msg,
             });
             ctx.notify(`Milestone merge failed (branch mode): ${msg}`, "warning");
+            // Re-throw all errors so callers can apply their own recovery logic (#4380).
+            throw err;
         }
     }
     // ── Merge and Enter Next ───────────────────────────────────────────────
@@ -516,7 +545,18 @@ export class WorktreeResolver {
             currentMilestoneId,
             nextMilestoneId,
         });
-        this.mergeAndExit(currentMilestoneId, ctx);
+        try {
+            this.mergeAndExit(currentMilestoneId, ctx);
+        }
+        catch (err) {
+            // mergeAndExit emits a warning and restores state when it fails during
+            // merge/cleanup. But if it throws before recovery runs (e.g., in
+            // validateMilestoneId or emitJournalEvent), basePath won't be restored
+            // to projectRoot — re-throw so we don't enter the next milestone with
+            // the current one unmerged.
+            if (this.s.basePath !== this.projectRoot)
+                throw err;
+        }
         this.enterMilestone(nextMilestoneId, ctx);
     }
 }

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

@@ -10,7 +10,16 @@
 // ─── Env resolution ───────────────────────────────────────────────────────────
 /** Resolve `${VAR}` references in a string against `process.env`. */
 function resolveEnvValue(value) {
-    return value.replace(/\$\{([^}]+)\}/g, (_match, varName) => process.env[varName] ?? "");
+    return value.replace(/\$\{([^}]+)\}/g, (_match, varName) => {
+        const resolved = process.env[varName];
+        if (resolved === undefined || resolved === "") {
+            // eslint-disable-next-line no-console
+            console.warn(`[mcp-client auth] Environment variable "${varName}" referenced in MCP server config is unset. ` +
+                `Requests will go out with a malformed header and the remote server will likely reject them with 401.`);
+            return "";
+        }
+        return resolved;
+    });
 }
 function resolveHeaders(raw) {
     const resolved = {};

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;

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/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/resources/skills/verify-before-complete/SKILL.md

@@ -1,6 +1,7 @@
 ---
 name: verify-before-complete
-description: Block completion claims until verification evidence has been produced in the current message. Use before marking a task/slice/milestone complete, before creating a commit or PR, before saying "it works" or "tests pass", and any time you are about to claim work is done. The rule is: evidence before claims, always — running the verification must happen now, not "earlier in the session". Fresh output or no claim.
+description: >-
+  Block completion claims until verification evidence has been produced in the current message. Use before marking a task/slice/milestone complete, before creating a commit or PR, before saying "it works" or "tests pass", and any time you are about to claim work is done. The rule is: evidence before claims, always — running the verification must happen now, not "earlier in the session". Fresh output or no claim.
 ---
 
 <objective>

package/dist/resources/skills/write-docs/SKILL.md

@@ -1,6 +1,7 @@
 ---
 name: write-docs
-description: Collaborative document authoring workflow for proposals, technical specs, decision docs, README sections, ADRs, and long-form prose that must work for fresh readers. Use when asked to "write the docs", "draft a proposal", "write a spec", "write an RFC", "write the README", or when a document needs to be understandable by someone without this session's context. Three stages: gather context, iterate on structure, reader-test for a stranger.
+description: >-
+  Collaborative document authoring workflow for proposals, technical specs, decision docs, README sections, ADRs, and long-form prose that must work for fresh readers. Use when asked to "write the docs", "draft a proposal", "write a spec", "write an RFC", "write the README", or when a document needs to be understandable by someone without this session's context. Three stages: gather context, iterate on structure, reader-test for a stranger.
 ---
 
 <objective>