gsd-pi 2.75.0-dev.063e5a3 → 2.75.0-dev.96d4bb599

package/dist/welcome-screen.js

@@ -5,11 +5,38 @@
  * auto-mode progress widget style), logo left (fixed width), info right.
  * Falls back to simple text on narrow terminals (<70 cols) or non-TTY.
  */
-import { execFileSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import os from 'node:os';
 import chalk from 'chalk';
 import stripAnsi from 'strip-ansi';
 import { GSD_LOGO } from './logo.js';
+function readGsdState() {
+    try {
+        const raw = readFileSync(join(process.cwd(), '.gsd', 'STATE.md'), 'utf-8');
+        const state = {};
+        const milestone = raw.match(/^\*\*Active Milestone:\*\*\s*(.+)$/m);
+        if (milestone)
+            state.milestone = milestone[1].trim();
+        const slice = raw.match(/^\*\*Active Slice:\*\*\s*(.+)$/m);
+        if (slice)
+            state.slice = slice[1].trim();
+        const phase = raw.match(/^\*\*Phase:\*\*\s*(.+)$/m);
+        if (phase)
+            state.phase = phase[1].trim();
+        // Accept both template shapes: inline "**Next Action:** ..." and the
+        // "## Next Action\n<line>" heading format. Prefer the inline match.
+        const nextInline = raw.match(/^\*\*Next Action:\*\*\s*(.+)$/m);
+        const nextHeading = raw.match(/^##\s*Next Action\s*\n+([^\n]+)/m);
+        const nextMatch = nextInline ?? nextHeading;
+        if (nextMatch)
+            state.nextAction = nextMatch[1].trim();
+        return state;
+    }
+    catch {
+        return undefined;
+    }
+}
 function getShortCwd() {
     const cwd = process.cwd();
     const home = os.homedir();
@@ -23,25 +50,11 @@ function visLen(s) {
 function rpad(s, w) {
     return s + ' '.repeat(Math.max(0, w - visLen(s)));
 }
-/** Read the current git branch name. Returns undefined on failure. */
-function getGitBranch() {
-    try {
-        return execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
-            encoding: 'utf-8',
-            timeout: 2000,
-            stdio: ['ignore', 'pipe', 'ignore'],
-        }).trim() || undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
 export function printWelcomeScreen(opts) {
     if (!process.stderr.isTTY)
         return;
-    const { version, modelName, provider, remoteChannel } = opts;
+    const { version, remoteChannel } = opts;
     const shortCwd = getShortCwd();
-    const branch = getGitBranch();
     const termWidth = (process.stderr.columns || 80) - 1;
     // Narrow terminal fallback
     if (termWidth < 70) {
@@ -80,14 +93,25 @@ export function printWelcomeScreen(opts) {
     const hintRight = chalk.dim('/gsd to begin  ·  /gsd help');
     const footerFill = RIGHT_INNER - visLen(toolsLeft) - visLen(hintRight);
     const footerRow = toolsLeft + ' '.repeat(Math.max(1, footerFill)) + hintRight;
-    // Combined session line: "provider / model" or just model or just provider
-    const sessionParts = [provider, modelName].filter(Boolean);
-    const sessionLine = sessionParts.length > 0
-        ? `  Session    ${chalk.dim(sessionParts.join(' / '))}`
-        : '';
-    // Combined project line: "~/path [branch]"
-    const branchSuffix = branch ? ` [${branch}]` : '';
-    const projectLine = `  Project    ${chalk.dim(shortCwd + branchSuffix)}`;
+    // "Welcome back" context lines — GSD state if available, else hint.
+    // Intentionally avoids data already shown in the footer (model, provider,
+    // pwd, branch).
+    const state = readGsdState();
+    let line1 = '';
+    let line2 = '';
+    if (state?.milestone) {
+        const statusParts = [state.milestone, state.phase, state.slice].filter(Boolean);
+        line1 = `  Active     ${chalk.dim(statusParts.join(' · '))}`;
+        line2 = state.nextAction
+            ? `  Next       ${chalk.dim(state.nextAction)}`
+            : '';
+    }
+    else {
+        line1 = `  Status     ${chalk.dim('No active GSD project')}`;
+        line2 = `             ${chalk.dim('/gsd to begin')}`;
+    }
+    const sessionLine = line1;
+    const projectLine = line2;
     const DIVIDER = null;
     const rightRows = [
         titleRow,

package/dist/wizard.js

@@ -23,8 +23,8 @@ export function loadStoredEnvKeys(authStorage) {
             // Use getCredentialsForProvider to skip empty-key entries at index 0
             // (left by legacy removeProviderToken which used set() with empty key)
             const creds = authStorage.getCredentialsForProvider(provider);
-            const cred = creds.find((c) => c.type === 'api_key' && c.key);
-            if (cred?.type === 'api_key' && cred.key) {
+            const cred = creds.find((c) => c.type === 'api_key' && typeof c.key === 'string' && c.key.length > 0);
+            if (cred?.type === 'api_key' && typeof cred.key === 'string') {
                 process.env[envVar] = cred.key;
             }
         }

package/dist/worktree-cli.d.ts

@@ -31,11 +31,7 @@ interface ExtensionModules {
         deleteBranch?: boolean;
     }) => void;
     mergeWorktreeToMain: (basePath: string, name: string, commitMessage: string) => void;
-    diffWorktreeAll: (basePath: string, name: string) => {
-        added: any[];
-        modified: any[];
-        removed: any[];
-    };
+    diffWorktreeAll: (basePath: string, name: string) => WorktreeDiff;
     diffWorktreeNumstat: (basePath: string, name: string) => Array<{
         added: number;
         removed: number;
@@ -49,6 +45,11 @@ interface ExtensionModules {
     inferCommitType: (name: string) => string;
     autoCommitCurrentBranch: (wtPath: string, reason: string, name: string) => void;
 }
+interface WorktreeDiff {
+    added: string[];
+    modified: string[];
+    removed: string[];
+}
 interface WorktreeStatus {
     name: string;
     path: string;

package/dist/worktree-cli.js

@@ -27,6 +27,14 @@ const jiti = createJiti(fileURLToPath(import.meta.url), { interopDefault: true,
 const gsdExtensionPath = (...segments) => resolveBundledSourceResource(import.meta.url, 'extensions', 'gsd', ...segments);
 // Lazily-loaded extension modules (loaded once on first use via jiti)
 let _ext = null;
+function toErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function logDebugFailure(scope, error) {
+    if (process.env.GSD_DEBUG === '1') {
+        process.stderr.write(chalk.dim(`[gsd] ${scope} failed: ${toErrorMessage(error)}\n`));
+    }
+}
 async function loadExtensionModules() {
     if (_ext)
         return _ext;
@@ -70,13 +78,17 @@ function getWorktreeStatus(ext, basePath, name, wtPath) {
     try {
         uncommitted = existsSync(wtPath) && ext.nativeHasChanges(wtPath);
     }
-    catch { /* */ }
+    catch (error) {
+        logDebugFailure('native worktree dirty check', error);
+    }
     let commits = 0;
     try {
         const mainBranch = ext.nativeDetectMainBranch(basePath);
         commits = ext.nativeCommitCountBetween(basePath, mainBranch, ext.worktreeBranchName(name));
     }
-    catch { /* */ }
+    catch (error) {
+        logDebugFailure('native commit count', error);
+    }
     return {
         name,
         path: wtPath,
@@ -157,7 +169,9 @@ async function doMerge(ext, basePath, name) {
             ext.autoCommitCurrentBranch(wt.path, 'worktree-merge', name);
             process.stderr.write(chalk.dim('  Auto-committed dirty work before merge.\n'));
         }
-        catch { /* best-effort */ }
+        catch (error) {
+            process.stderr.write(chalk.yellow(`  Auto-commit before merge failed: ${toErrorMessage(error)}\n`));
+        }
     }
     const commitType = ext.inferCommitType(name);
     const commitMessage = `${commitType}: merge worktree ${name}\n\nGSD-Worktree: ${name}`;
@@ -193,8 +207,8 @@ async function handleClean(basePath) {
                 process.stderr.write(chalk.green(`  ✓ Removed ${chalk.bold(wt.name)} (clean)\n`));
                 cleaned++;
             }
-            catch {
-                process.stderr.write(chalk.yellow(`  ✗ Failed to remove ${wt.name}\n`));
+            catch (error) {
+                process.stderr.write(chalk.yellow(`  ✗ Failed to remove ${wt.name}: ${toErrorMessage(error)}\n`));
             }
         }
         else {
@@ -239,7 +253,8 @@ async function handleStatusBanner(basePath) {
             const diff = ext.diffWorktreeAll(basePath, wt.name);
             return diff.added.length + diff.modified.length + diff.removed.length > 0;
         }
-        catch {
+        catch (error) {
+            logDebugFailure(`status scan for ${wt.name}`, error);
             return false;
         }
     });
@@ -264,7 +279,8 @@ async function handleWorktreeFlag(worktreeFlag) {
                 const diff = ext.diffWorktreeAll(basePath, wt.name);
                 return diff.added.length + diff.modified.length + diff.removed.length > 0;
             }
-            catch {
+            catch (error) {
+                logDebugFailure(`worktree -w scan for ${wt.name}`, error);
                 return false;
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gsd-pi",
-  "version": "2.75.0-dev.063e5a3",
+  "version": "2.75.0-dev.96d4bb599",
   "description": "GSD — Get Shit Done coding agent",
   "license": "MIT",
   "repository": {
@@ -57,7 +57,7 @@
     "copy-themes": "node scripts/copy-themes.cjs",
     "copy-export-html": "node scripts/copy-export-html.cjs",
     "test:compile": "node scripts/compile-tests.mjs",
-    "test:unit": "npm run test:compile && node --import ./scripts/dist-test-resolve.mjs --experimental-test-isolation=process --test-reporter=./scripts/test-reporter-compact.mjs --test \"dist-test/src/tests/*.test.js\" \"dist-test/src/resources/extensions/gsd/tests/*.test.js\" \"dist-test/src/resources/extensions/gsd/tests/*.test.mjs\" \"dist-test/src/resources/extensions/shared/tests/*.test.js\" \"dist-test/src/resources/extensions/claude-code-cli/tests/*.test.js\" \"dist-test/src/resources/extensions/github-sync/tests/*.test.js\" \"dist-test/src/resources/extensions/universal-config/tests/*.test.js\" \"dist-test/src/resources/extensions/voice/tests/*.test.js\" \"dist-test/src/resources/extensions/mcp-client/tests/*.test.js\"",
+    "test:unit": "npm run test:compile && node --import ./scripts/dist-test-resolve.mjs --experimental-test-isolation=process --test-reporter=./scripts/test-reporter-compact.mjs --test \"dist-test/src/tests/*.test.js\" \"dist-test/src/resources/extensions/gsd/tests/*.test.js\" \"dist-test/src/resources/extensions/gsd/tests/*.test.mjs\" \"dist-test/src/resources/extensions/shared/tests/*.test.js\" \"dist-test/src/resources/extensions/claude-code-cli/tests/*.test.js\" \"dist-test/src/resources/extensions/github-sync/tests/*.test.js\" \"dist-test/src/resources/extensions/universal-config/tests/*.test.js\" \"dist-test/src/resources/extensions/voice/tests/*.test.js\" \"dist-test/src/resources/extensions/mcp-client/tests/*.test.js\" \"dist-test/src/resources/extensions/remote-questions/tests/*.test.js\"",
     "test:packages": "node --test packages/pi-coding-agent/dist/core/*.test.js packages/pi-coding-agent/dist/core/tools/spawn-shell-windows.test.js",
     "test:marketplace": "node scripts/with-env.mjs GSD_TEST_CLONE_MARKETPLACES=1 -- node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/claude-import-tui.test.ts src/resources/extensions/gsd/tests/plugin-importer-live.test.ts src/tests/marketplace-discovery.test.ts",
     "test:coverage": "c8 --reporter=text --reporter=lcov --exclude=\"src/resources/extensions/gsd/tests/**\" --exclude=\"src/tests/**\" --exclude=\"scripts/**\" --exclude=\"native/**\" --exclude=\"node_modules/**\" --check-coverage --statements=40 --lines=40 --branches=20 --functions=20 node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --experimental-test-isolation=process --test src/resources/extensions/gsd/tests/*.test.ts src/resources/extensions/gsd/tests/*.test.mjs src/tests/*.test.ts src/resources/extensions/shared/tests/*.test.ts",
@@ -97,7 +97,7 @@
     "test:live-regression": "node --experimental-strip-types tests/live-regression/run.ts"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.73.0",
+    "@anthropic-ai/sdk": "^0.90.0",
     "@anthropic-ai/vertex-sdk": "^0.14.4",
     "@aws-sdk/client-bedrock-runtime": "^3.983.0",
     "@clack/prompts": "^1.1.0",

package/packages/mcp-server/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA4I3D,UAAU,uBAAuB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAED,UAAU,iBAAiB;IACzB,IAAI,CACF,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,CAAC,GACjF,OAAO,CAAC;IACX,MAAM,EAAE;QACN,WAAW,CACT,MAAM,EAAE,6BAA6B,GAAG,uBAAuB,EAC/D,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,4BAA4B,CAAC,CAAC;KAC1C,CAAC;IACF,OAAO,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,UAAU,qBAAqB;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,eAAe;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAMD,KAAK,4BAA4B,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC;AAEzE,UAAU,4BAA4B;IACpC,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;CACxD;AAED,UAAU,6BAA6B;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAiCD,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,6BAA6B,CAiD9G;AAED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,eAAe,EAAE,EAC5B,MAAM,EAAE,4BAA4B,GACnC,MAAM,CAkBR;AAMD;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC;IAC7E,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC,CA8hBD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA4I3D,UAAU,uBAAuB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAED,UAAU,iBAAiB;IACzB,IAAI,CACF,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,CAAC,GACjF,OAAO,CAAC;IACX,MAAM,EAAE;QACN,WAAW,CACT,MAAM,EAAE,6BAA6B,GAAG,uBAAuB,EAC/D,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,4BAA4B,CAAC,CAAC;KAC1C,CAAC;IACF,OAAO,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,UAAU,qBAAqB;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,eAAe;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAMD,KAAK,4BAA4B,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC;AAEzE,UAAU,4BAA4B;IACpC,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;CACxD;AAED,UAAU,6BAA6B;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAiCD,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,6BAA6B,CAiD9G;AAED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,eAAe,EAAE,EAC5B,MAAM,EAAE,4BAA4B,GACnC,MAAM,CAkBR;AAMD;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC;IAC7E,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC,CAgiBD"}

package/packages/mcp-server/dist/server.js

@@ -21,7 +21,7 @@ import { readKnowledge } from './readers/knowledge.js';
 import { buildGraph, writeGraph, writeSnapshot, graphStatus, graphQuery, graphDiff } from './readers/graph.js';
 import { resolveGsdRoot } from './readers/paths.js';
 import { runDoctorLite } from './readers/doctor-lite.js';
-import { registerWorkflowTools } from './workflow-tools.js';
+import { registerWorkflowTools, validateProjectDir } from './workflow-tools.js';
 import { applySecrets, checkExistingEnvKeys, detectDestination } from './env-writer.js';
 // ---------------------------------------------------------------------------
 // Constants
@@ -337,7 +337,8 @@ export async function createMcpServer(sessionManager) {
     }, async (args) => {
         const { projectDir, query } = args;
         try {
-            const state = await readProjectState(projectDir, query);
+            const validated = validateProjectDir(projectDir);
+            const state = await readProjectState(validated, query);
             return jsonContent(state);
         }
         catch (err) {
@@ -406,7 +407,7 @@ export async function createMcpServer(sessionManager) {
     }, async (args) => {
         const { projectDir, keys, destination, envFilePath, environment } = args;
         try {
-            const resolvedProjectDir = resolve(projectDir);
+            const resolvedProjectDir = validateProjectDir(projectDir);
             const resolvedEnvPath = resolve(resolvedProjectDir, envFilePath ?? '.env');
             // (1) Check which keys already exist
             const allKeyNames = keys.map((k) => k.key);
@@ -500,7 +501,7 @@ export async function createMcpServer(sessionManager) {
     }, async (args) => {
         const { projectDir } = args;
         try {
-            return jsonContent(readProgress(projectDir));
+            return jsonContent(readProgress(validateProjectDir(projectDir)));
         }
         catch (err) {
             return errorContent(err instanceof Error ? err.message : String(err));
@@ -515,7 +516,7 @@ export async function createMcpServer(sessionManager) {
     }, async (args) => {
         const { projectDir, milestoneId } = args;
         try {
-            return jsonContent(readRoadmap(projectDir, milestoneId));
+            return jsonContent(readRoadmap(validateProjectDir(projectDir), milestoneId));
         }
         catch (err) {
             return errorContent(err instanceof Error ? err.message : String(err));
@@ -530,7 +531,7 @@ export async function createMcpServer(sessionManager) {
     }, async (args) => {
         const { projectDir, limit } = args;
         try {
-            return jsonContent(readHistory(projectDir, limit));
+            return jsonContent(readHistory(validateProjectDir(projectDir), limit));
         }
         catch (err) {
             return errorContent(err instanceof Error ? err.message : String(err));
@@ -545,7 +546,7 @@ export async function createMcpServer(sessionManager) {
     }, async (args) => {
         const { projectDir, scope } = args;
         try {
-            return jsonContent(runDoctorLite(projectDir, scope));
+            return jsonContent(runDoctorLite(validateProjectDir(projectDir), scope));
         }
         catch (err) {
             return errorContent(err instanceof Error ? err.message : String(err));
@@ -560,7 +561,7 @@ export async function createMcpServer(sessionManager) {
     }, async (args) => {
         const { projectDir, filter } = args;
         try {
-            return jsonContent(readCaptures(projectDir, filter ?? 'all'));
+            return jsonContent(readCaptures(validateProjectDir(projectDir), filter ?? 'all'));
         }
         catch (err) {
             return errorContent(err instanceof Error ? err.message : String(err));
@@ -574,7 +575,7 @@ export async function createMcpServer(sessionManager) {
     }, async (args) => {
         const { projectDir } = args;
         try {
-            return jsonContent(readKnowledge(projectDir));
+            return jsonContent(readKnowledge(validateProjectDir(projectDir)));
         }
         catch (err) {
             return errorContent(err instanceof Error ? err.message : String(err));
@@ -608,8 +609,9 @@ export async function createMcpServer(sessionManager) {
         budget: z.number().optional().describe('Token budget for query mode (default: 4000)'),
         snapshot: z.boolean().optional().describe('Write snapshot before build (for future diff)'),
     }, async (args) => {
-        const { projectDir, mode, term, budget, snapshot } = args;
+        const { projectDir: rawProjectDir, mode, term, budget, snapshot } = args;
         try {
+            const projectDir = validateProjectDir(rawProjectDir);
             const gsdRoot = resolveGsdRoot(projectDir);
             switch (mode) {
                 case 'build': {