@opengsd/gsd-pi 1.1.1-dev.b2556262 → 1.2.0-dev.844675c9

package/dist/project-sessions.js

@@ -1,6 +1,8 @@
-import { join } from "node:path";
+import { join, normalize } from "node:path";
 import { sessionsDir as defaultSessionsDir } from "./app-paths.js";
 export function getProjectSessionsDir(cwd, baseSessionsDir = defaultSessionsDir) {
-    const safePath = `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
+    // Normalize the cwd path to prevent directory traversal
+    const normalizedCwd = normalize(cwd).replace(/^[/\\]/, "").replace(/[/\\:]/g, "-");
+    const safePath = `--${normalizedCwd}--`;
     return join(baseSessionsDir, safePath);
 }

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

@@ -1 +1 @@
-fc4ebdcd3723ade9
+83d1de3e3261d473

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

@@ -18,7 +18,7 @@ import { PartialMessageBuilder, ZERO_USAGE, mapUsage } from "./partial-builder.j
 import { buildWorkflowMcpServers, getRequiredWorkflowToolsForAutoUnit, resolveWorkflowMcpProjectRoot, } from "../gsd/workflow-mcp.js";
 import { buildProjectGsdMcpServers, ensureProjectWorkflowMcpConfig } from "../gsd/mcp-project-config.js";
 import { loadProjectGSDPreferences } from "../gsd/preferences.js";
-import { discoverBrowserMcpServerName, discoverMcpServers, discoverMcpServerNames, discoverWorkflowMcpServerName, computeMcpDisallowedTools, } from "../gsd/mcp-filter.js";
+import { discoverBrowserMcpServerName, discoverMcpServers, discoverMcpServerNames, discoverUserMcpServerNames, discoverWorkflowMcpServerName, computeMcpDisallowedTools, } from "../gsd/mcp-filter.js";
 import { RUN_UAT_CLAUDE_NATIVE_TOOL_NAMES, RUN_UAT_FORBIDDEN_TOOL_NAMES, RUN_UAT_WORKFLOW_TOOL_NAMES, resolveToolPresentationPlan } from "../gsd/tool-presentation-plan.js";
 import { showInterviewRound } from "../shared/tui.js";
 export function serverToolUseToToolCallLike(block) {
@@ -1341,14 +1341,22 @@ export function buildSdkOptions(modelId, prompt, overrides, extraOptions = {}) {
     const projectBrowserServerName = discoverBrowserMcpServerName(projectRoot);
     const workflowServerName = projectWorkflowServerName ?? injectedWorkflowServerName;
     const browserServerName = projectBrowserServerName ?? injectedBrowserServerName;
-    // If a default GSD MCP server 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).
+    // Non-strict (non-phase) sessions load ~/.claude/settings.json via settingSources
+    // including "user". If the user declared the same server names there, injecting them
+    // again via mcpServers causes duplicate registration and leaves MCP tools unavailable.
+    // Strict (gsdPhase) sessions set settingSources=[] so user settings are not loaded.
+    const userDiscovered = !gsdPhase ? discoverUserMcpServerNames() : [];
+    const allDiscovered = discovered.length > 0 || userDiscovered.length > 0
+        ? [...discovered, ...userDiscovered]
+        : discovered;
+    // If a default GSD MCP server is already declared in project config or in the user's
+    // ~/.claude/settings.json (when that file will be loaded), 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 = projectWorkflowServerName !== undefined
-        || (injectedWorkflowServerName !== undefined && discovered.includes(injectedWorkflowServerName));
+        || (injectedWorkflowServerName !== undefined && allDiscovered.includes(injectedWorkflowServerName));
     const browserAlreadyInProject = projectBrowserServerName !== undefined
-        || (injectedBrowserServerName !== undefined && discovered.includes(injectedBrowserServerName));
+        || (injectedBrowserServerName !== undefined && allDiscovered.includes(injectedBrowserServerName));
     const mcpServersToInject = { ...defaultMcpServers.servers };
     if (workflowAlreadyInProject && injectedWorkflowServerName)
         delete mcpServersToInject[injectedWorkflowServerName];
@@ -1405,9 +1413,9 @@ export function buildSdkOptions(modelId, prompt, overrides, extraOptions = {}) {
     const sdkMcpServers = inlinePhaseMcpServers ?? filteredMcpServers;
     const strictMcpConfig = !!inlinePhaseMcpServers;
     // Strict phase configs inline the exact MCP servers GSD needs. Loading
-    // project/local settings at the same time can duplicate those servers and
+    // Claude Code settings at the same time can duplicate those servers and
     // leave allowed mcp__... tools with no registered backing tool.
-    const settingSources = strictMcpConfig ? [] : ["project", "local"];
+    const settingSources = strictMcpConfig ? [] : ["user", "project", "local"];
     const exactWorkflowMcpTools = resolveExactWorkflowMcpToolsForPhase(gsdPhase, workflowServerName, workflowExplicitlyBlocked);
     const runUatDisallowedTools = gsdPhase === "run-uat" && workflowServerName
         ? [

package/dist/resources/extensions/gsd/auto/contracts.js

@@ -1,3 +1,10 @@
 // Project/App: gsd-pi
-// File Purpose: Auto Orchestration module interfaces and ADR-015 invariant adapter contracts.
+// File Purpose: Auto Orchestration module public contract types.
+//
+// Phase 2 of #442 collapsed the nine single-implementation adapter interfaces
+// (DispatchAdapter, RecoveryAdapter, StateReconciliationAdapter,
+// ToolContractAdapter, WorktreeAdapter, HealthAdapter, UokGateAdapter,
+// RuntimePersistenceAdapter, NotificationAdapter) and AutoOrchestratorDeps
+// into AutoOrchestrator itself (auto/orchestrator.ts). Only the public result
+// and lifecycle-interface types remain here.
 export {};