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

package/packages/pi-coding-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gsd/pi-coding-agent",
-  "version": "1.1.1-dev.154fd443",
+  "version": "1.1.1-dev.1854a79a",
   "description": "Coding agent CLI (vendored from earendil-works/pi)",
   "type": "module",
   "gsd": {
@@ -33,7 +33,7 @@
     "copy-assets": "node scripts/copy-assets.cjs"
   },
   "dependencies": {
-    "@opengsd/contracts": "^1.1.1-dev.154fd443",
+    "@opengsd/contracts": "^1.1.1-dev.1854a79a",
     "@mariozechner/jiti": "^2.6.2",
     "@silvia-odwyer/photon-node": "0.3.4",
     "chalk": "5.6.2",
@@ -53,11 +53,11 @@
     "typebox": "1.1.38",
     "undici": "7.26.0",
     "yaml": "2.9.0",
-    "@gsd/agent-core": "^1.1.1-dev.154fd443",
-    "@gsd/native": "^1.1.1-dev.154fd443",
-    "@gsd/pi-agent-core": "^1.1.1-dev.154fd443",
-    "@gsd/pi-ai": "^1.1.1-dev.154fd443",
-    "@gsd/pi-tui": "^1.1.1-dev.154fd443",
+    "@gsd/agent-core": "^1.1.1-dev.1854a79a",
+    "@gsd/native": "^1.1.1-dev.1854a79a",
+    "@gsd/pi-agent-core": "^1.1.1-dev.1854a79a",
+    "@gsd/pi-ai": "^1.1.1-dev.1854a79a",
+    "@gsd/pi-tui": "^1.1.1-dev.1854a79a",
     "@sinclair/typebox": "^0.34.41"
   },
   "devDependencies": {

package/packages/pi-tui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gsd/pi-tui",
-  "version": "1.1.1-dev.154fd443",
+  "version": "1.1.1-dev.1854a79a",
   "description": "Terminal UI library (vendored from earendil-works/pi)",
   "type": "module",
   "gsd": {
@@ -21,7 +21,7 @@
     "build": "node ../../scripts/clean-package-dist.cjs && tsc -p tsconfig.json --incremental false"
   },
   "dependencies": {
-    "@gsd/native": "^1.1.1-dev.154fd443",
+    "@gsd/native": "^1.1.1-dev.1854a79a",
     "get-east-asian-width": "1.6.0",
     "marked": "15.0.12",
     "@sinclair/typebox": "^0.34.41"

package/packages/rpc-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengsd/rpc-client",
-  "version": "1.1.1-dev.154fd443",
+  "version": "1.1.1-dev.1854a79a",
   "description": "Standalone RPC client SDK for GSD — zero internal dependencies",
   "license": "MIT",
   "gsd": {
@@ -34,7 +34,7 @@
     "test": "node --test dist/rpc-client.test.js"
   },
   "dependencies": {
-    "@opengsd/contracts": "^1.1.1-dev.154fd443"
+    "@opengsd/contracts": "^1.1.1-dev.1854a79a"
   },
   "engines": {
     "node": ">=22.0.0"

package/pkg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glittercowboy/gsd",
-  "version": "1.1.1-dev.154fd443",
+  "version": "1.1.1-dev.1854a79a",
   "piConfig": {
     "name": "gsd",
     "configDir": ".gsd"

package/src/resources/extensions/browser-tools/index.ts

@@ -3,6 +3,7 @@ import { importExtensionModule, type ExtensionAPI, type ExtensionContext } from
 
 import { closeManagedGsdBrowser, registerManagedGsdBrowserTools, warmUpManagedGsdBrowser } from "./engine/managed-gsd-browser.js";
 import { resolveBrowserEngineMode, type BrowserEngineMode } from "./engine/selection.js";
+import { setArtifactRootForCwd } from "./state.js";
 import { detectWebApp } from "./web-app-detect.js";
 
 let legacyRegistrationPromise: Promise<void> | null = null;
@@ -119,28 +120,29 @@ async function registerLegacyBrowserTools(pi: ExtensionAPI): Promise<void> {
         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;
@@ -150,6 +152,21 @@ async function registerLegacyBrowserTools(pi: ExtensionAPI): Promise<void> {
   return legacyRegistrationPromise;
 }
 
+function withBrowserArtifactCwdScope(pi: ExtensionAPI): ExtensionAPI {
+  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: ExtensionAPI): Promise<void> {
   const engine = resolveBrowserEngineMode();
   if (engine === "off") return;

package/src/resources/extensions/browser-tools/state.ts

@@ -186,6 +186,18 @@ export interface BrowserAssertionCheckInput {
 // Mutable state variables — accessed only via get/set functions
 // ---------------------------------------------------------------------------
 
+// 0. artifactRoot
+let _artifactRoot = ARTIFACT_ROOT;
+export function getArtifactRoot(): string { return _artifactRoot; }
+export function setArtifactRootForCwd(cwd: string): string {
+	const newRoot = path.resolve(cwd, ".artifacts", "browser");
+	if (newRoot !== _artifactRoot) {
+		_artifactRoot = newRoot;
+		_sessionArtifactDir = null;
+	}
+	return _artifactRoot;
+}
+
 // 1. browser
 let _browser: Browser | null = null;
 export function getBrowser(): Browser | null { return _browser; }
@@ -290,6 +302,7 @@ export function setHarState(h: HarState): void { _harState = h; }
 // ---------------------------------------------------------------------------
 
 export function resetAllState(): void {
+	_artifactRoot = ARTIFACT_ROOT;
 	_browser = null;
 	_context = null;
 	pageRegistry.pages = [];

package/src/resources/extensions/browser-tools/tests/browser-tools-unit.test.cjs

@@ -10,6 +10,9 @@
 
 const { describe, it, beforeEach } = require("node:test");
 const assert = require("node:assert/strict");
+const { mkdtempSync, rmSync } = require("node:fs");
+const { tmpdir } = require("node:os");
+const { join } = require("node:path");
 const jiti = require("jiti")(__filename, { interopDefault: true, debug: false });
 
 // ---------------------------------------------------------------------------
@@ -28,9 +31,12 @@ const {
 	getUrlHash,
 	firstErrorLine,
 	formatArtifactTimestamp,
+	ensureSessionArtifactDir,
 } = jiti("../utils.ts");
 
 const {
+	getArtifactRoot,
+	setArtifactRootForCwd,
 	getBrowser,
 	setBrowser,
 	getContext,
@@ -469,6 +475,57 @@ describe("state accessors", () => {
 		assert.equal(getSessionArtifactDir(), "/tmp/artifacts");
 	});
 
+	it("uses the active tool context cwd for session artifact paths", async (t) => {
+		const processRoot = mkdtempSync(join(tmpdir(), "browser-tools-process-"));
+		const contextRoot = mkdtempSync(join(tmpdir(), "browser-tools-context-"));
+		const previousCwd = process.cwd();
+		t.after(() => {
+			process.chdir(previousCwd);
+			rmSync(processRoot, { recursive: true, force: true });
+			rmSync(contextRoot, { recursive: true, force: true });
+		});
+
+		process.chdir(processRoot);
+		resetAllState();
+		const expectedRoot = join(contextRoot, ".artifacts", "browser");
+		setArtifactRootForCwd(contextRoot);
+
+		const sessionDir = await ensureSessionArtifactDir();
+
+		assert.equal(getArtifactRoot(), expectedRoot);
+		assert.ok(
+			sessionDir.startsWith(`${expectedRoot}/`),
+			`session artifact dir should stay under context cwd: ${sessionDir}`,
+		);
+		assert.ok(
+			!sessionDir.startsWith(join(processRoot, ".artifacts", "browser")),
+			`session artifact dir must not use process cwd: ${sessionDir}`,
+		);
+	});
+
+	it("session artifact dir is recomputed when artifact root changes", async (t) => {
+		const root1 = mkdtempSync(join(tmpdir(), "browser-tools-root1-"));
+		const root2 = mkdtempSync(join(tmpdir(), "browser-tools-root2-"));
+		t.after(() => {
+			rmSync(root1, { recursive: true, force: true });
+			rmSync(root2, { recursive: true, force: true });
+		});
+
+		resetAllState();
+		setArtifactRootForCwd(root1);
+		const sessionDir1 = await ensureSessionArtifactDir();
+		assert.ok(sessionDir1.startsWith(join(root1, ".artifacts", "browser")));
+
+		// Change the root — cached session dir must be invalidated
+		setArtifactRootForCwd(root2);
+		const sessionDir2 = await ensureSessionArtifactDir();
+		assert.ok(
+			sessionDir2.startsWith(join(root2, ".artifacts", "browser")),
+			`session dir should be under new root after root change: ${sessionDir2}`,
+		);
+		assert.notEqual(sessionDir1, sessionDir2, "session dir must differ after root change");
+	});
+
 	it("setCurrentRefMap/getCurrentRefMap round-trip", () => {
 		assert.deepStrictEqual(getCurrentRefMap(), {});
 		const refMap = { e1: { ref: "e1", tag: "button" } };

package/src/resources/extensions/browser-tools/tools/session.ts

@@ -9,8 +9,8 @@ import {
 } from "../core.js";
 import type { ToolDeps } from "../state.js";
 import {
-	ARTIFACT_ROOT,
 	HAR_FILENAME,
+	getArtifactRoot,
 	getPageRegistry,
 	getActiveFrame,
 	getConsoleLogs,
@@ -315,7 +315,9 @@ export function registerSessionTools(pi: ExtensionAPI, deps: ToolDeps): void {
 				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/src/resources/extensions/browser-tools/utils.ts

@@ -21,8 +21,8 @@ import {
 	registryListPages,
 } from "./core.js";
 import {
-	ARTIFACT_ROOT,
 	getActiveFrame,
+	getArtifactRoot,
 	getActiveTraceSession,
 	getConsoleLogs,
 	getDialogLogs,
@@ -119,7 +119,7 @@ export async function ensureSessionArtifactDir(): Promise<string> {
 		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;
@@ -159,7 +159,7 @@ export function getActiveFrameMetadata() {
 
 export function getSessionArtifactMetadata() {
 	return {
-		artifactRoot: ARTIFACT_ROOT,
+		artifactRoot: getArtifactRoot(),
 		sessionStartedAt: getSessionStartedAt(),
 		sessionArtifactDir: getSessionArtifactDir(),
 		activeTraceSession: getActiveTraceSession(),

package/src/resources/extensions/claude-code-cli/stream-adapter.ts

@@ -38,6 +38,7 @@ import {
 	discoverBrowserMcpServerName,
 	discoverMcpServers,
 	discoverMcpServerNames,
+	discoverUserMcpServerNames,
 	discoverWorkflowMcpServerName,
 	computeMcpDisallowedTools,
 } from "../gsd/mcp-filter.js";
@@ -1658,14 +1659,23 @@ export function buildSdkOptions(
 	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];
 	if (browserAlreadyInProject && injectedBrowserServerName) delete mcpServersToInject[injectedBrowserServerName];
@@ -1725,9 +1735,9 @@ export function buildSdkOptions(
 	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,

package/src/resources/extensions/claude-code-cli/tests/stream-adapter.test.ts

@@ -796,9 +796,9 @@ describe("stream-adapter — session persistence (#2859)", () => {
 		assert.equal(options.persistSession, true, "persistSession must default to true");
 	});
 
-	test("buildSdkOptions loads project and local settings so approved .mcp.json servers are active", () => {
+	test("buildSdkOptions loads user, project, and local settings so approved Claude Code config is active", () => {
 		const options = buildSdkOptions("claude-sonnet-4-20250514", "test prompt");
-		assert.deepEqual(options.settingSources, ["project", "local"]);
+		assert.deepEqual(options.settingSources, ["user", "project", "local"]);
 	});
 
 	test("buildSdkOptions sets model and prompt correctly", () => {

package/src/resources/extensions/gsd/auto/contracts.ts

@@ -1,9 +1,14 @@
 // 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.
 
 import type { GSDState } from "../types.js";
-import type { MinimalModelRegistry } from "../context-budget.js";
-import type { AutoSession } from "./session.js";
 
 export interface AutoSessionContext {
   basePath: string;
@@ -41,119 +46,3 @@ export interface AutoOrchestrationModule {
   stop(reason: string): Promise<AutoAdvanceResult>;
   getStatus(): AutoStatus;
 }
-
-export interface DispatchAdapter {
-  decideNextUnit(input: {
-    stateSnapshot: GSDState;
-    /** Optional live session context, forwarded to dispatch rules that need session-derived state. */
-    session?: AutoSession;
-    /** Mirrors `DispatchContext.structuredQuestionsAvailable` — "true"/"false" string per the dispatch contract. */
-    structuredQuestionsAvailable?: "true" | "false";
-    /** Session model context window in tokens, forwarded to the budget engine. */
-    sessionContextWindow?: number;
-    /** Session model provider, used for provider-specific effective context windows. */
-    sessionProvider?: string;
-    /** Model registry for executor-model lookups inside the budget engine. */
-    modelRegistry?: MinimalModelRegistry;
-  }): Promise<
-    | {
-        kind: "blocked";
-        reason: string;
-        action: "pause" | "stop";
-      }
-    | {
-        kind: "skipped";
-        reason: string;
-      }
-    | {
-        unitType: string;
-        unitId: string;
-        reason: string;
-        preconditions: string[];
-      }
-    | null
-  >;
-}
-
-export interface RecoveryAdapter {
-  classifyAndRecover(input: {
-    error: unknown;
-    unitType?: string;
-    unitId?: string;
-  }): Promise<{
-    action: "retry" | "escalate" | "stop";
-    reason: string;
-  }>;
-}
-
-export type InvariantAdapterResult =
-  | { ok: true; reason?: string; stateSnapshot?: GSDState }
-  | { ok: false; reason: string; stateSnapshot?: GSDState };
-
-export interface StateReconciliationAdapter {
-  reconcileBeforeDispatch(): Promise<InvariantAdapterResult & { stateSnapshot?: GSDState }>;
-}
-
-export interface ToolContractAdapter {
-  compileUnitToolContract(unitType: string, unitId: string): Promise<InvariantAdapterResult>;
-}
-
-export interface WorktreeAdapter {
-  prepareForUnit(unitType: string, unitId: string): Promise<InvariantAdapterResult>;
-  syncAfterUnit(unitType: string, unitId: string): Promise<void>;
-  cleanupOnStop(reason: string): Promise<void>;
-}
-
-export type HealthGateResult =
-  | { kind: "pass"; fixesApplied?: readonly string[] }
-  | { kind: "fail"; reason: string; action?: "pause" | "stop" }
-  | { kind: "threw"; error: unknown };
-
-export interface HealthAdapter {
-  checkResourcesStale(): string | null;
-  preAdvanceGate(): Promise<HealthGateResult>;
-  postAdvanceRecord(result: AutoAdvanceResult): Promise<void>;
-}
-
-export interface UokGateInput {
-  gateId: string;
-  gateType: "policy" | "execution";
-  outcome: "pass" | "fail" | "manual-attention";
-  failureClass: "none" | "policy" | "manual-attention";
-  rationale: string;
-  findings?: string;
-  milestoneId?: string;
-}
-
-export interface UokGateAdapter {
-  emit(input: UokGateInput): Promise<void>;
-}
-
-export interface RuntimePersistenceAdapter {
-  ensureLockOwnership(): Promise<void>;
-  journalTransition(event: {
-    name: string;
-    reason?: string;
-    unitType?: string;
-    unitId?: string;
-  }): Promise<void>;
-}
-
-export interface NotificationAdapter {
-  notifyLifecycle(event: {
-    name: string;
-    detail?: string;
-  }): Promise<void>;
-}
-
-export interface AutoOrchestratorDeps {
-  stateReconciliation: StateReconciliationAdapter;
-  dispatch: DispatchAdapter;
-  toolContract: ToolContractAdapter;
-  recovery: RecoveryAdapter;
-  worktree: WorktreeAdapter;
-  health: HealthAdapter;
-  runtime: RuntimePersistenceAdapter;
-  notifications: NotificationAdapter;
-  uokGate: UokGateAdapter;
-}