gsd-pi 2.78.1-dev.0fdacd524 → 2.78.1-dev.42ef05fbe

package/dist/resources/extensions/gsd/uok/plan-v2.js

@@ -48,6 +48,9 @@ export function hasFinalizedMilestoneContext(basePath, milestoneId) {
 export function isMissingFinalizedContextResult(result) {
     return !result.ok && result.finalizedContextIncluded === false;
 }
+export function isEmptyPlanV2GraphResult(result) {
+    return !result.ok && result.emptyGraph === true;
+}
 function countSliceResearchArtifacts(basePath, milestoneId, slices) {
     let count = 0;
     for (const slice of slices) {
@@ -138,6 +141,7 @@ export function compileUnitGraphFromState(basePath, state) {
         ok: true,
         graphPath: outPath,
         nodeCount: nodes.length,
+        sliceCount: slices.length,
         clarifyRoundLimit,
         researchSynthesized: output.pipeline.researchSynthesized,
         draftContextIncluded: output.pipeline.draftContextIncluded,
@@ -149,7 +153,16 @@ export function ensurePlanV2Graph(basePath, state) {
     if (!compiled.ok)
         return compiled;
     if ((compiled.nodeCount ?? 0) <= 0) {
-        return { ok: false, reason: "compiled graph is empty" };
+        if ((state.phase === "validating-milestone" || state.phase === "completing-milestone") &&
+            (compiled.sliceCount ?? 0) > 0) {
+            return compiled;
+        }
+        return {
+            ...compiled,
+            ok: false,
+            reason: "compiled graph is empty",
+            emptyGraph: true,
+        };
     }
     return compiled;
 }

package/dist/resources/extensions/gsd/user-input-boundary.js

@@ -0,0 +1,157 @@
+const USER_APPROVAL_UNIT_TYPES = new Set([
+    "discuss-project",
+    "discuss-requirements",
+    "discuss-milestone",
+    "research-decision",
+]);
+const REMOTE_QUESTION_FAILURE_RE = /(?:Remote (?:auth failed|questions failed|channel configured but returned no result|questions timed out|questions timed out or failed)|Failed to send questions via)/i;
+const APPROVAL_WAIT_RE = /\bwait(?:ing)?\s+for\s+(?:your\s+)?(?:confirmation|approval|input|response|answer)\b/i;
+const APPROVAL_QUESTION_RE = /\b(?:confirm|confirmation|approve|approval|approved|captured|correct|correctly|happy\s+with|ready\s+to\s+(?:write|save|proceed|ship)|(?:want|need)\s+to\s+adjust|should\s+I\s+(?:write|save|proceed)|do\s+you\s+want\s+me\s+to\s+(?:write|save|proceed)|ship\s+it)\b/i;
+const APPROVAL_RIGHT_QUESTION_RE = /\b(?:does|do|is|are|was|were|did)\b[^\n?]{0,120}\bright\b/i;
+const APPROVAL_CHANGE_QUESTION_RE = /\b(?:anything\s+else|anything|something)\s+to\s+(?:adjust|add|remove|reclassify)\b/i;
+const RESEARCH_DECISION_QUESTION_RE = /\b(?:research|skip)\b/i;
+function extractTextFromMessage(msg) {
+    if (!msg || typeof msg !== "object")
+        return "";
+    const content = msg.content;
+    if (typeof content === "string")
+        return content;
+    if (!Array.isArray(content))
+        return "";
+    const parts = [];
+    for (const block of content) {
+        if (!block || typeof block !== "object")
+            continue;
+        const typed = block;
+        if (typed.type === "text" && typeof typed.text === "string") {
+            parts.push(typed.text);
+        }
+    }
+    return parts.join("\n");
+}
+function lastAssistantText(messages) {
+    if (!Array.isArray(messages))
+        return "";
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const msg = messages[i];
+        if (!msg || typeof msg !== "object")
+            continue;
+        if (msg.role !== "assistant")
+            continue;
+        const text = extractTextFromMessage(msg).trim();
+        if (text)
+            return text;
+    }
+    return "";
+}
+function anyMessageMatches(messages, pattern) {
+    if (!Array.isArray(messages))
+        return false;
+    return messages.some((msg) => {
+        if (!msg || typeof msg !== "object")
+            return false;
+        if (msg.role === "user")
+            return false;
+        return pattern.test(extractTextFromMessage(msg));
+    });
+}
+function hasApprovalQuestion(text) {
+    for (let i = 0; i < text.length; i++) {
+        if (text[i] !== "?")
+            continue;
+        const previousBreak = Math.max(text.lastIndexOf("\n", i), text.lastIndexOf(".", i), text.lastIndexOf("!", i), text.lastIndexOf("?", i - 1));
+        const fragment = text.slice(previousBreak + 1, i + 1);
+        if (APPROVAL_QUESTION_RE.test(fragment))
+            return true;
+        if (APPROVAL_RIGHT_QUESTION_RE.test(fragment))
+            return true;
+        if (APPROVAL_CHANGE_QUESTION_RE.test(fragment))
+            return true;
+    }
+    return false;
+}
+function hasResearchDecisionQuestion(text) {
+    for (let i = 0; i < text.length; i++) {
+        if (text[i] !== "?")
+            continue;
+        const previousBreak = Math.max(text.lastIndexOf("\n", i), text.lastIndexOf(".", i), text.lastIndexOf("!", i), text.lastIndexOf("?", i - 1));
+        const fragment = text.slice(previousBreak + 1, i + 1);
+        if (RESEARCH_DECISION_QUESTION_RE.test(fragment))
+            return true;
+    }
+    return false;
+}
+export function approvalGateIdForUnit(unitType, unitId) {
+    if (!unitType)
+        return null;
+    if (unitType === "discuss-project")
+        return "depth_verification_project_confirm";
+    if (unitType === "discuss-requirements")
+        return "depth_verification_requirements_confirm";
+    if (unitType === "research-decision")
+        return "depth_verification_research_decision_confirm";
+    if (unitType === "discuss-milestone") {
+        const safeUnitId = typeof unitId === "string" && /^[A-Za-z0-9_-]+$/.test(unitId)
+            ? unitId
+            : "milestone";
+        return `depth_verification_${safeUnitId}_confirm`;
+    }
+    return null;
+}
+const CHANGE_REQUEST_RESPONSE_RE = /\b(?:no|nope|nah|not\s+yet|don't|do\s+not|change|add|remove|reclassify|adjust|clarify|missing|instead|but|however|wait|hold)\b/i;
+const APPROVAL_RESPONSE_RE = /^(?:y|yes|yeah|yep|approve|approved|confirm|confirmed|correct|right|looks\s+(?:good|right)|sounds\s+good|all\s+good|ok|okay|go\s+ahead|proceed|write\s+it|save\s+it|do\s+it)\b/i;
+const RESEARCH_DECISION_RESPONSE_RE = /^(?:research|run\s+research|do\s+research|skip|skip\s+research|no\s+research)\b/i;
+export function isExplicitApprovalResponse(input, pendingGateId) {
+    const text = input?.trim() ?? "";
+    if (!text)
+        return false;
+    if (pendingGateId?.includes("research_decision")) {
+        return RESEARCH_DECISION_RESPONSE_RE.test(text);
+    }
+    if (CHANGE_REQUEST_RESPONSE_RE.test(text))
+        return false;
+    return APPROVAL_RESPONSE_RE.test(text);
+}
+export function isAwaitingUserInput(messages) {
+    if (anyMessageMatches(messages, /ask_user_questions was cancelled before receiving a response/i))
+        return true;
+    if (anyMessageMatches(messages, REMOTE_QUESTION_FAILURE_RE))
+        return true;
+    const text = lastAssistantText(messages);
+    if (!text)
+        return false;
+    if (APPROVAL_WAIT_RE.test(text))
+        return true;
+    const lines = text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+    if (lines.some((line) => line.endsWith("?")))
+        return true;
+    return hasApprovalQuestion(text);
+}
+export function isAwaitingApprovalBoundary(messages) {
+    if (anyMessageMatches(messages, /ask_user_questions was cancelled before receiving a response/i))
+        return true;
+    if (anyMessageMatches(messages, REMOTE_QUESTION_FAILURE_RE))
+        return true;
+    const text = lastAssistantText(messages);
+    if (!text)
+        return false;
+    if (APPROVAL_WAIT_RE.test(text))
+        return true;
+    return hasApprovalQuestion(text);
+}
+export function shouldPauseForUserApprovalQuestion(unitType, messages) {
+    if (!unitType || !USER_APPROVAL_UNIT_TYPES.has(unitType))
+        return false;
+    if (anyMessageMatches(messages, /ask_user_questions was cancelled before receiving a response/i))
+        return true;
+    if (anyMessageMatches(messages, REMOTE_QUESTION_FAILURE_RE))
+        return true;
+    const text = lastAssistantText(messages);
+    if (!text)
+        return false;
+    if (APPROVAL_WAIT_RE.test(text))
+        return true;
+    if (unitType === "research-decision")
+        return hasResearchDecisionQuestion(text);
+    return hasApprovalQuestion(text);
+}

package/dist/resources/extensions/gsd/watch/header-renderer.js

@@ -6,6 +6,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { visibleWidth, truncateToWidth } from "@gsd/pi-tui";
 import { loadEffectiveGSDPreferences } from "../preferences.js";
+import { gsdHome } from "../gsd-home.js";
 // ─── Constants ────────────────────────────────────────────────────────────────
 /**
  * GSD ASCII logo — inlined here because the canonical src/logo.ts is outside
@@ -104,7 +105,7 @@ export function readMcpServerNames(projectRoot) {
     const configPaths = [
         join(projectRoot, ".mcp.json"),
         join(projectRoot, ".gsd", "mcp.json"),
-        join(process.env.GSD_HOME || join(homedir(), ".gsd"), "mcp.json"),
+        join(gsdHome(), "mcp.json"),
     ];
     const names = [];
     const seen = new Set();

package/dist/resources/extensions/gsd/workflow-install.js

@@ -14,11 +14,11 @@
  * clean up and future `/gsd workflow update` can refresh.
  */
 import { existsSync, mkdirSync, readFileSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
-import { homedir } from "node:os";
 import { extname, join, resolve, sep as pathSep } from "node:path";
 import { createHash } from "node:crypto";
 import { parse as parseYaml } from "yaml";
 import { validateDefinition } from "./definition-loader.js";
+import { gsdHome } from "./gsd-home.js";
 // ─── Constants ───────────────────────────────────────────────────────────
 const MAX_RESPONSE_BYTES = 256 * 1024;
 const FETCH_TIMEOUT_MS = 15_000;
@@ -42,8 +42,7 @@ function writeProvenance(dir, data) {
     writeFileSync(provenancePath(dir), JSON.stringify(data, null, 2) + "\n", "utf-8");
 }
 export function globalInstallDir() {
-    const gsdHome = process.env.GSD_HOME || join(homedir(), ".gsd");
-    return join(gsdHome, "workflows");
+    return join(gsdHome(), "workflows");
 }
 export function projectInstallDir(basePath) {
     return join(basePath, ".gsd", "workflows");

package/dist/resources/extensions/gsd/workflow-mcp.js

@@ -167,7 +167,7 @@ function buildWorkflowLaunchEnv(projectRoot, gsdCliPath, explicitEnv, workflowCl
         : explicitEnv?.NODE_OPTIONS;
     return {
         ...(explicitEnv ?? {}),
-        ...(gsdCliPath ? { GSD_CLI_PATH: gsdCliPath } : {}),
+        ...(gsdCliPath ? { GSD_CLI_PATH: gsdCliPath, GSD_BIN_PATH: gsdCliPath } : {}),
         ...(executorModulePath ? { GSD_WORKFLOW_EXECUTORS_MODULE: executorModulePath } : {}),
         ...(writeGateModulePath ? { GSD_WORKFLOW_WRITE_GATE_MODULE: writeGateModulePath } : {}),
         ...(nodeOptions ? { NODE_OPTIONS: nodeOptions } : {}),
@@ -181,7 +181,10 @@ export function detectWorkflowMcpLaunchConfig(projectRoot = process.cwd(), env =
     const explicitArgs = parseJsonEnv(env, "GSD_WORKFLOW_MCP_ARGS");
     const explicitEnv = parseJsonEnv(env, "GSD_WORKFLOW_MCP_ENV");
     const explicitCwd = env.GSD_WORKFLOW_MCP_CWD?.trim();
-    const gsdCliPath = env.GSD_CLI_PATH?.trim() || env.GSD_BIN_PATH?.trim();
+    const gsdCliPath = explicitEnv?.GSD_CLI_PATH?.trim()
+        || explicitEnv?.GSD_BIN_PATH?.trim()
+        || env.GSD_CLI_PATH?.trim()
+        || env.GSD_BIN_PATH?.trim();
     const workflowProjectRoot = explicitEnv?.GSD_WORKFLOW_PROJECT_ROOT?.trim() ||
         env.GSD_WORKFLOW_PROJECT_ROOT?.trim() ||
         env.GSD_PROJECT_ROOT?.trim() ||
@@ -243,6 +246,12 @@ export function buildWorkflowMcpServers(projectRoot = process.cwd(), env = proce
 }
 export function getRequiredWorkflowToolsForGuidedUnit(unitType) {
     switch (unitType) {
+        case "discuss-project":
+            return ["ask_user_questions", "gsd_summary_save"];
+        case "discuss-requirements":
+            return ["ask_user_questions", "gsd_requirement_save", "gsd_summary_save"];
+        case "research-decision":
+            return ["ask_user_questions"];
         case "discuss-milestone":
             return ["gsd_summary_save", "gsd_plan_milestone"];
         case "discuss-slice":
@@ -264,6 +273,12 @@ export function getRequiredWorkflowToolsForGuidedUnit(unitType) {
 }
 export function getRequiredWorkflowToolsForAutoUnit(unitType) {
     switch (unitType) {
+        case "discuss-project":
+            return ["ask_user_questions", "gsd_summary_save"];
+        case "discuss-requirements":
+            return ["ask_user_questions", "gsd_requirement_save", "gsd_summary_save"];
+        case "research-decision":
+            return ["ask_user_questions"];
         case "discuss-milestone":
             return ["gsd_summary_save", "gsd_plan_milestone"];
         case "research-milestone":
@@ -297,9 +312,30 @@ export function getRequiredWorkflowToolsForAutoUnit(unitType) {
 export function usesWorkflowMcpTransport(authMode, baseUrl) {
     return authMode === "externalCli" && typeof baseUrl === "string" && baseUrl.startsWith("local://");
 }
+function hasAskUserQuestionsTool(activeTools) {
+    return activeTools.some((toolName) => {
+        if (toolName === "ask_user_questions")
+            return true;
+        if (!toolName.startsWith("mcp__"))
+            return false;
+        const toolSeparator = toolName.indexOf("__", "mcp__".length);
+        return toolSeparator >= 0 && toolName.slice(toolSeparator + 2) === "ask_user_questions";
+    });
+}
+function workflowMcpStructuredQuestionsOptIn(env = process.env) {
+    const value = env.GSD_WORKFLOW_MCP_STRUCTURED_QUESTIONS;
+    return value === "1" || value === "true";
+}
 export function supportsStructuredQuestions(activeTools, options = {}) {
-    if (!activeTools.includes("ask_user_questions"))
+    if (!hasAskUserQuestionsTool(activeTools))
         return false;
+    if (usesWorkflowMcpTransport(options.authMode, options.baseUrl)) {
+        // Claude Code local workflow-MCP exposes ask_user_questions, but form
+        // elicitation can return an immediate cancel outside GSD's chat turn. Keep
+        // checkpoints in plain chat unless a caller deliberately opts into testing
+        // that transport.
+        return workflowMcpStructuredQuestionsOptIn(options.env);
+    }
     return true;
 }
 export function getWorkflowTransportSupportError(provider, requiredTools, options = {}) {

package/dist/resources/extensions/gsd/workflow-plugins.js

@@ -15,24 +15,22 @@
 import { readFileSync, readdirSync, existsSync, statSync, } from "node:fs";
 import { join, dirname, extname, basename } from "node:path";
 import { fileURLToPath } from "node:url";
-import { homedir } from "node:os";
 import { parse as parseYaml } from "yaml";
 import { loadRegistry } from "./workflow-templates.js";
+import { gsdHome } from "./gsd-home.js";
 // ─── Path resolution ─────────────────────────────────────────────────────
 function resolveBundledDir() {
     const moduleDir = dirname(fileURLToPath(import.meta.url));
     const local = join(moduleDir, "workflow-templates");
     if (existsSync(local))
         return local;
-    const gsdHome = process.env.GSD_HOME || join(homedir(), ".gsd");
-    const agentGsdDir = join(gsdHome, "agent", "extensions", "gsd", "workflow-templates");
+    const agentGsdDir = join(gsdHome(), "agent", "extensions", "gsd", "workflow-templates");
     if (existsSync(agentGsdDir))
         return agentGsdDir;
     return local;
 }
 function globalPluginsDir() {
-    const gsdHome = process.env.GSD_HOME || join(homedir(), ".gsd");
-    return join(gsdHome, "workflows");
+    return join(gsdHome(), "workflows");
 }
 function projectPluginsDir(basePath) {
     return join(basePath, ".gsd", "workflows");

package/dist/resources/extensions/gsd/workflow-templates.js

@@ -7,7 +7,7 @@
 import { readFileSync, existsSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { homedir } from "node:os";
+import { gsdHome } from "./gsd-home.js";
 const __extensionDir = resolveGsdExtensionDir();
 const registryPath = join(__extensionDir, "workflow-templates", "registry.json");
 /** Resolve the GSD extension dir with fallback to ~/.gsd/agent/extensions/gsd/. */
@@ -15,8 +15,7 @@ function resolveGsdExtensionDir() {
     const moduleDir = dirname(fileURLToPath(import.meta.url));
     if (existsSync(join(moduleDir, "workflow-templates")))
         return moduleDir;
-    const gsdHome = process.env.GSD_HOME || join(homedir(), ".gsd");
-    const agentGsdDir = join(gsdHome, "agent", "extensions", "gsd");
+    const agentGsdDir = join(gsdHome(), "agent", "extensions", "gsd");
     if (existsSync(join(agentGsdDir, "workflow-templates")))
         return agentGsdDir;
     return moduleDir;

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

@@ -98,7 +98,11 @@ export class WorktreeResolver {
             });
             return;
         }
-        const mode = this.deps.getIsolationMode();
+        // 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);
+        const mode = this.deps.getIsolationMode(basePath);
         if (mode === "none") {
             debugLog("WorktreeResolver", {
                 action: "enterMilestone",
@@ -115,10 +119,6 @@ export class WorktreeResolver {
             });
             return;
         }
-        // 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,
@@ -297,6 +297,30 @@ export class WorktreeResolver {
      */
     mergeAndExit(milestoneId, ctx) {
         this.validateMilestoneId(milestoneId);
+        // Anchor cwd at the project root before any merge work. Some merge code
+        // paths (mergeMilestoneToMain, slice-cadence) chdir explicitly; others
+        // (branch-mode, isolation-degraded skip, missing-original-base skip)
+        // do not. If the worktree dir is later torn down while cwd still points
+        // into it, every subsequent process.cwd() throws ENOENT — and after
+        // de73fb43d that surfaces as a session-failed cancel and (in headless
+        // mode) terminates the whole gsd process. Best-effort: silent on
+        // failure so existing test fixtures that use synthetic paths still pass.
+        if (this.s.originalBasePath) {
+            try {
+                // process.cwd() can throw ENOENT when cwd was removed, so attempt
+                // recovery directly.
+                process.chdir(this.s.originalBasePath);
+            }
+            catch (err) {
+                debugLog("WorktreeResolver", {
+                    action: "mergeAndExit",
+                    phase: "pre-merge-chdir-failed",
+                    milestoneId,
+                    originalBasePath: this.s.originalBasePath,
+                    error: err instanceof Error ? err.message : String(err),
+                });
+            }
+        }
         // #4764 — telemetry: record start timestamp so we can emit merge duration.
         const mergeStartedAt = new Date().toISOString();
         const mergeStartMs = Date.now();
@@ -311,7 +335,7 @@ export class WorktreeResolver {
             ctx.notify(`Skipping worktree merge for ${milestoneId} — isolation was degraded (worktree creation failed earlier). Work is on the current branch.`, "info");
             return;
         }
-        const mode = this.deps.getIsolationMode();
+        const mode = this.deps.getIsolationMode(this.s.originalBasePath || this.s.basePath);
         debugLog("WorktreeResolver", {
             action: "mergeAndExit",
             milestoneId,

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

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
-import { homedir } from "node:os";
 import { join, resolve } from "node:path";
+import { gsdHome } from "./gsd-home.js";
 export function normalizeWorktreePathForCompare(path) {
     let normalized;
     try {
@@ -53,22 +53,51 @@ export function resolveWorktreeProjectRoot(basePath, originalBasePath) {
 function resolveProjectRootFromPath(path) {
     const normalizedPath = path.replaceAll("\\", "/");
     const segment = findWorktreeSegment(normalizedPath);
-    if (!segment)
-        return resolveGitWorkingTreeRoot(path) ?? path;
+    if (!segment) {
+        return resolveNearestBootstrappedGsdRoot(path) ?? resolveGitWorkingTreeRoot(path) ?? path;
+    }
     const sepChar = path.includes("\\") ? "\\" : "/";
     const gsdMarker = `${sepChar}.gsd${sepChar}`;
     const markerIdx = path.indexOf(gsdMarker);
     const candidate = markerIdx !== -1
         ? path.slice(0, markerIdx)
         : path.slice(0, segment.gsdIdx);
-    const gsdHome = normalizeWorktreePathForCompare(process.env.GSD_HOME || join(homedir(), ".gsd"));
+    const gsdHomeNorm = normalizeWorktreePathForCompare(gsdHome());
     const candidateGsdPath = normalizeWorktreePathForCompare(join(candidate, ".gsd"));
-    if (candidateGsdPath === gsdHome || candidateGsdPath.startsWith(`${gsdHome}/`)) {
+    if (candidateGsdPath === gsdHomeNorm || candidateGsdPath.startsWith(`${gsdHomeNorm}/`)) {
         const realRoot = resolveProjectRootFromGitFile(path);
         return realRoot ?? path;
     }
     return candidate;
 }
+function resolveNearestBootstrappedGsdRoot(path) {
+    try {
+        let dir = existsSync(path) && !statSync(path).isDirectory()
+            ? resolve(path, "..")
+            : path;
+        for (let i = 0; i < 30; i++) {
+            if (hasGsdBootstrapArtifacts(join(dir, ".gsd")))
+                return dir;
+            const gitPath = join(dir, ".git");
+            if (existsSync(gitPath))
+                return null;
+            const parent = resolve(dir, "..");
+            if (parent === dir)
+                break;
+            dir = parent;
+        }
+    }
+    catch {
+        // Non-fatal: callers fall back to git root resolution.
+    }
+    return null;
+}
+function hasGsdBootstrapArtifacts(gsdPath) {
+    return existsSync(gsdPath) &&
+        (existsSync(join(gsdPath, "PREFERENCES.md")) ||
+            existsSync(join(gsdPath, "preferences.md")) ||
+            existsSync(join(gsdPath, "milestones")));
+}
 function resolveGitWorkingTreeRoot(path) {
     try {
         let dir = existsSync(path) && !statSync(path).isDirectory()

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

@@ -18,9 +18,9 @@ import { Client } from "@modelcontextprotocol/sdk/client";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { readFileSync, existsSync } from "node:fs";
-import { homedir } from "node:os";
 import { join } from "node:path";
 import { buildHttpTransportOpts } from "./auth.js";
+import { gsdHome } from "../gsd/gsd-home.js";
 // ─── Connection Manager ───────────────────────────────────────────────────────
 const connections = new Map();
 const pendingConnections = new Map();
@@ -63,7 +63,7 @@ function readConfigs() {
     const configPaths = [
         join(process.cwd(), ".mcp.json"),
         join(process.cwd(), ".gsd", "mcp.json"),
-        join(process.env.GSD_HOME || join(homedir(), ".gsd"), "mcp.json"),
+        join(gsdHome(), "mcp.json"),
     ];
     for (const configPath of configPaths) {
         try {

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

@@ -9,6 +9,7 @@ import { getGlobalGSDPreferencesPath, loadEffectiveGSDPreferences } from "../gsd
 import { getRemoteConfigStatus, isValidChannelId, resolveRemoteConfig } from "./config.js";
 import { maskEditorLine, sanitizeError } from "../shared/mod.js";
 import { getLatestPromptSummary } from "./status.js";
+import { gsdHome } from "../gsd/gsd-home.js";
 export async function handleRemote(subcommand, ctx, _pi) {
     const trimmed = subcommand.trim();
     if (trimmed === "slack")
@@ -291,7 +292,7 @@ async function promptSlackChannelId(ctx) {
     return channelId;
 }
 function getAuthStorage() {
-    const authPath = join(process.env.HOME ?? "", ".gsd", "agent", "auth.json");
+    const authPath = join(gsdHome(), "agent", "auth.json");
     mkdirSync(dirname(authPath), { recursive: true });
     return AuthStorage.create(authPath);
 }

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

@@ -3,13 +3,10 @@
  */
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
 import { readPromptRecord } from "./store.js";
-function getGsdHome() {
-    return process.env.GSD_HOME || join(homedir(), ".gsd");
-}
+import { gsdHome } from "../gsd/gsd-home.js";
 export function getLatestPromptSummary() {
-    const runtimeDir = join(getGsdHome(), "runtime", "remote-questions");
+    const runtimeDir = join(gsdHome(), "runtime", "remote-questions");
     if (!existsSync(runtimeDir))
         return null;
     const files = readdirSync(runtimeDir).filter((f) => f.endsWith(".json"));

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

@@ -3,12 +3,9 @@
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
-function getGsdHome() {
-    return process.env.GSD_HOME || join(homedir(), ".gsd");
-}
+import { gsdHome } from "../gsd/gsd-home.js";
 function runtimeDir() {
-    return join(getGsdHome(), "runtime", "remote-questions");
+    return join(gsdHome(), "runtime", "remote-questions");
 }
 function recordPath(id) {
     return join(runtimeDir(), `${id}.json`);

package/dist/resources/extensions/search-the-web/provider.js

@@ -9,14 +9,15 @@
  * @see S01-RESEARCH.md for the storage decision rationale (D002).
  */
 import { AuthStorage } from '@gsd/pi-coding-agent';
-import { homedir } from 'os';
 import { join } from 'path';
 import { resolveSearchProviderFromPreferences } from '../gsd/preferences.js';
-// Compute authFilePath locally instead of importing from app-paths.ts,
-// because extensions are copied to ~/.gsd/agent/extensions/ at runtime
-// where the relative import '../../../app-paths.ts' doesn't resolve.
-const gsdHome = process.env.GSD_HOME || join(homedir(), '.gsd');
-const authFilePath = join(gsdHome, 'agent', 'auth.json');
+import { gsdHome } from "../gsd/gsd-home.js";
+// Compute authFilePath lazily so GSD_HOME overrides (e.g. in tests) take effect.
+// Imported locally instead of from app-paths.ts because extensions are copied to
+// ~/.gsd/agent/extensions/ at runtime where '../../../app-paths.ts' doesn't resolve.
+function authFilePath() {
+    return join(gsdHome(), 'agent', 'auth.json');
+}
 const VALID_PREFERENCES = new Set(['tavily', 'brave', 'ollama', 'auto']);
 const PREFERENCE_KEY = 'search_provider';
 /** Returns the Tavily API key from the environment, or empty string if not set. */
@@ -46,7 +47,7 @@ export function getOllamaApiKey() {
  * @param authPath — Override auth.json path (for testing).
  */
 export function getSearchProviderPreference(authPath) {
-    const auth = AuthStorage.create(authPath ?? authFilePath);
+    const auth = AuthStorage.create(authPath ?? authFilePath());
     const cred = auth.get(PREFERENCE_KEY);
     if (cred?.type === 'api_key' && typeof cred.key === 'string' && VALID_PREFERENCES.has(cred.key)) {
         return cred.key;
@@ -61,7 +62,7 @@ export function getSearchProviderPreference(authPath) {
  * @param authPath — Override auth.json path (for testing).
  */
 export function setSearchProviderPreference(pref, authPath) {
-    const auth = AuthStorage.create(authPath ?? authFilePath);
+    const auth = AuthStorage.create(authPath ?? authFilePath());
     auth.remove(PREFERENCE_KEY);
     auth.set(PREFERENCE_KEY, { type: 'api_key', key: pref });
 }