@opengsd/gsd-pi 1.1.1-dev.154fd443 → 1.1.1-dev.1854a79a

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 @@
-1fd656139336d72d
+848de9262becc128

package/dist/resources/extensions/browser-tools/index.js

@@ -2,6 +2,7 @@
 import { importExtensionModule } from "@gsd/pi-coding-agent";
 import { closeManagedGsdBrowser, registerManagedGsdBrowserTools, warmUpManagedGsdBrowser } from "./engine/managed-gsd-browser.js";
 import { resolveBrowserEngineMode } from "./engine/selection.js";
+import { setArtifactRootForCwd } from "./state.js";
 import { detectWebApp } from "./web-app-detect.js";
 let legacyRegistrationPromise = null;
 let managedRegistrationPromise = null;
@@ -84,28 +85,29 @@ async function registerLegacyBrowserTools(pi) {
                 sanitizeArtifactName: utils.sanitizeArtifactName,
                 formatArtifactTimestamp: utils.formatArtifactTimestamp,
             };
-            navigation.registerNavigationTools(pi, deps);
-            screenshot.registerScreenshotTools(pi, deps);
-            interaction.registerInteractionTools(pi, deps);
-            inspection.registerInspectionTools(pi, deps);
-            session.registerSessionTools(pi, deps);
-            assertions.registerAssertionTools(pi, deps);
-            refTools.registerRefTools(pi, deps);
-            wait.registerWaitTools(pi, deps);
-            pages.registerPageTools(pi, deps);
-            forms.registerFormTools(pi, deps);
-            intent.registerIntentTools(pi, deps);
-            pdf.registerPdfTools(pi, deps);
-            statePersistence.registerStatePersistenceTools(pi, deps);
-            networkMock.registerNetworkMockTools(pi, deps);
-            device.registerDeviceTools(pi, deps);
-            extract.registerExtractTools(pi, deps);
-            visualDiff.registerVisualDiffTools(pi, deps);
-            zoom.registerZoomTools(pi, deps);
-            codegen.registerCodegenTools(pi, deps);
-            actionCache.registerActionCacheTools(pi, deps);
-            injectionDetection.registerInjectionDetectionTools(pi, deps);
-            verify.registerVerifyTools(pi, deps);
+            const cwdScopedPi = withBrowserArtifactCwdScope(pi);
+            navigation.registerNavigationTools(cwdScopedPi, deps);
+            screenshot.registerScreenshotTools(cwdScopedPi, deps);
+            interaction.registerInteractionTools(cwdScopedPi, deps);
+            inspection.registerInspectionTools(cwdScopedPi, deps);
+            session.registerSessionTools(cwdScopedPi, deps);
+            assertions.registerAssertionTools(cwdScopedPi, deps);
+            refTools.registerRefTools(cwdScopedPi, deps);
+            wait.registerWaitTools(cwdScopedPi, deps);
+            pages.registerPageTools(cwdScopedPi, deps);
+            forms.registerFormTools(cwdScopedPi, deps);
+            intent.registerIntentTools(cwdScopedPi, deps);
+            pdf.registerPdfTools(cwdScopedPi, deps);
+            statePersistence.registerStatePersistenceTools(cwdScopedPi, deps);
+            networkMock.registerNetworkMockTools(cwdScopedPi, deps);
+            device.registerDeviceTools(cwdScopedPi, deps);
+            extract.registerExtractTools(cwdScopedPi, deps);
+            visualDiff.registerVisualDiffTools(cwdScopedPi, deps);
+            zoom.registerZoomTools(cwdScopedPi, deps);
+            codegen.registerCodegenTools(cwdScopedPi, deps);
+            actionCache.registerActionCacheTools(cwdScopedPi, deps);
+            injectionDetection.registerInjectionDetectionTools(cwdScopedPi, deps);
+            verify.registerVerifyTools(cwdScopedPi, deps);
         })().catch((error) => {
             legacyRegistrationPromise = null;
             throw error;
@@ -113,6 +115,21 @@ async function registerLegacyBrowserTools(pi) {
     }
     return legacyRegistrationPromise;
 }
+function withBrowserArtifactCwdScope(pi) {
+    return {
+        ...pi,
+        registerTool(definition) {
+            pi.registerTool({
+                ...definition,
+                async execute(toolCallId, params, signal, onUpdate, ctx) {
+                    if (ctx?.cwd)
+                        setArtifactRootForCwd(ctx.cwd);
+                    return definition.execute(toolCallId, params, signal, onUpdate, ctx);
+                },
+            });
+        },
+    };
+}
 async function registerBrowserTools(pi) {
     const engine = resolveBrowserEngineMode();
     if (engine === "off")

package/dist/resources/extensions/browser-tools/state.js

@@ -18,6 +18,17 @@ export const HAR_FILENAME = "session.har";
 // ---------------------------------------------------------------------------
 // Mutable state variables — accessed only via get/set functions
 // ---------------------------------------------------------------------------
+// 0. artifactRoot
+let _artifactRoot = ARTIFACT_ROOT;
+export function getArtifactRoot() { return _artifactRoot; }
+export function setArtifactRootForCwd(cwd) {
+    const newRoot = path.resolve(cwd, ".artifacts", "browser");
+    if (newRoot !== _artifactRoot) {
+        _artifactRoot = newRoot;
+        _sessionArtifactDir = null;
+    }
+    return _artifactRoot;
+}
 // 1. browser
 let _browser = null;
 export function getBrowser() { return _browser; }
@@ -102,6 +113,7 @@ export function setHarState(h) { _harState = h; }
 // resetAllState — mirrors closeBrowser()'s reset logic
 // ---------------------------------------------------------------------------
 export function resetAllState() {
+    _artifactRoot = ARTIFACT_ROOT;
     _browser = null;
     _context = null;
     pageRegistry.pages = [];

package/dist/resources/extensions/browser-tools/tools/session.js

@@ -2,7 +2,7 @@ import { Type } from "@sinclair/typebox";
 import { stat } from "node:fs/promises";
 import path from "node:path";
 import { formatTimelineEntries, buildFailureHypothesis, summarizeBrowserSession, } from "../core.js";
-import { ARTIFACT_ROOT, HAR_FILENAME, getPageRegistry, getConsoleLogs, getNetworkLogs, getDialogLogs, getActionTimeline, getActiveTraceSession, setActiveTraceSession, getHarState, setHarState, getSessionStartedAt, getSessionArtifactDir, } from "../state.js";
+import { HAR_FILENAME, getArtifactRoot, getPageRegistry, getConsoleLogs, getNetworkLogs, getDialogLogs, getActionTimeline, getActiveTraceSession, setActiveTraceSession, getHarState, setHarState, getSessionStartedAt, getSessionArtifactDir, } from "../state.js";
 import { getActiveFrameMetadata, ensureDir, } from "../utils.js";
 export function registerSessionTools(pi, deps) {
     // -------------------------------------------------------------------------
@@ -289,7 +289,8 @@ export function registerSessionTools(pi, deps) {
                 const { page: p } = await deps.ensureBrowser();
                 const startedAt = Date.now();
                 const sessionDir = await deps.ensureSessionArtifactDir();
-                const bundleDir = path.join(ARTIFACT_ROOT, `${deps.formatArtifactTimestamp(startedAt)}-${deps.sanitizeArtifactName(params.name ?? "debug-bundle", "debug-bundle")}`);
+                const bundleName = `${deps.formatArtifactTimestamp(startedAt)}-${deps.sanitizeArtifactName(params.name ?? "debug-bundle", "debug-bundle")}`;
+                const bundleDir = path.join(getArtifactRoot(), bundleName);
                 await ensureDir(bundleDir);
                 const pages = await deps.getLivePagesSnapshot();
                 const actionTimeline = getActionTimeline();

package/dist/resources/extensions/browser-tools/utils.js

@@ -8,7 +8,7 @@ import { mkdir, stat, writeFile, copyFile } from "node:fs/promises";
 import path from "node:path";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, truncateHead, } from "@gsd/pi-coding-agent";
 import { beginAction, finishAction, findAction, toActionParamsSummary, registryListPages, } from "./core.js";
-import { ARTIFACT_ROOT, getActiveFrame, getActiveTraceSession, getConsoleLogs, getDialogLogs, getHarState, getNetworkLogs, getSessionArtifactDir, getSessionStartedAt, setSessionArtifactDir, setSessionStartedAt, pageRegistry, actionTimeline, getPendingCriticalRequestsByPage, } from "./state.js";
+import { getActiveFrame, getArtifactRoot, getActiveTraceSession, getConsoleLogs, getDialogLogs, getHarState, getNetworkLogs, getSessionArtifactDir, getSessionStartedAt, setSessionArtifactDir, setSessionStartedAt, pageRegistry, actionTimeline, getPendingCriticalRequestsByPage, } from "./state.js";
 // ---------------------------------------------------------------------------
 // Text truncation
 // ---------------------------------------------------------------------------
@@ -60,7 +60,7 @@ export async function ensureSessionArtifactDir() {
         return existing;
     }
     const startedAt = ensureSessionStartedAt();
-    const dir = path.join(ARTIFACT_ROOT, `${formatArtifactTimestamp(startedAt)}-session`);
+    const dir = path.join(getArtifactRoot(), `${formatArtifactTimestamp(startedAt)}-session`);
     setSessionArtifactDir(dir);
     await ensureDir(dir);
     return dir;
@@ -95,7 +95,7 @@ export function getActiveFrameMetadata() {
 }
 export function getSessionArtifactMetadata() {
     return {
-        artifactRoot: ARTIFACT_ROOT,
+        artifactRoot: getArtifactRoot(),
         sessionStartedAt: getSessionStartedAt(),
         sessionArtifactDir: getSessionArtifactDir(),
         activeTraceSession: getActiveTraceSession(),

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 {};