gsd-pi 2.82.0 → 3.0.0-dev.04f5ccf82

package/dist/resources/extensions/gsd/native-git-bridge.js

@@ -14,6 +14,8 @@ import { isInfrastructureError } from "./auto/infra-errors.js";
 // Issue #453: keep auto-mode bookkeeping on the stable git CLI path unless a
 // caller explicitly opts into the native helper.
 const NATIVE_GSD_GIT_ENABLED = process.env.GSD_ENABLE_NATIVE_GSD_GIT === "1";
+const TRANSIENT_GIT_RETRY_CODES = new Set(["ENOBUFS", "EAGAIN"]);
+const GIT_RETRY_DELAY_MS = 200;
 // ─── Native Module Loading ──────────────────────────────────────────────────
 let nativeModule = null;
 let loadAttempted = false;
@@ -46,10 +48,42 @@ function gitExec(basePath, args, allowFailure = false) {
             env: GIT_NO_PROMPT_ENV,
         }).trim();
     }
-    catch {
+    catch (err) {
         if (allowFailure)
             return "";
-        throw new GSDError(GSD_GIT_ERROR, `git ${args.join(" ")} failed in ${basePath}`);
+        throw new GSDError(GSD_GIT_ERROR, `git ${args.join(" ")} failed in ${basePath}: ${getErrorMessage(err)}`);
+    }
+}
+/** sleepSync uses Atomics.wait for a blocking pause without busy-waiting; it blocks the current thread and requires Atomics.wait support. */
+function sleepSync(ms) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function isRetryableGitError(err) {
+    const code = isInfrastructureError(err)
+        ?? isInfrastructureError(err?.stderr ?? "");
+    return code !== null && TRANSIENT_GIT_RETRY_CODES.has(code);
+}
+function execGitFileSyncWithRetry(basePath, args, options) {
+    try {
+        return execFileSync("git", args, {
+            cwd: basePath,
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+            env: GIT_NO_PROMPT_ENV,
+            ...options,
+        }).trim();
+    }
+    catch (err) {
+        if (!isRetryableGitError(err))
+            throw err;
+        sleepSync(GIT_RETRY_DELAY_MS);
+        return execFileSync("git", args, {
+            cwd: basePath,
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+            env: GIT_NO_PROMPT_ENV,
+            ...options,
+        }).trim();
     }
 }
 /** Run a git command via execFileSync. Returns trimmed stdout. */
@@ -62,10 +96,10 @@ function gitFileExec(basePath, args, allowFailure = false) {
             env: GIT_NO_PROMPT_ENV,
         }).trim();
     }
-    catch {
+    catch (err) {
         if (allowFailure)
             return "";
-        throw new GSDError(GSD_GIT_ERROR, `git ${args.join(" ")} failed in ${basePath}`);
+        throw new GSDError(GSD_GIT_ERROR, `git ${args.join(" ")} failed in ${basePath}: ${getErrorMessage(err)}`);
     }
 }
 // ─── Existing Read Functions ──────────────────────────────────────────────
@@ -303,15 +337,20 @@ export function nativeDiffNameStatus(basePath, fromRef, toRef, pathspec, useMerg
 }
 /**
  * Get numstat diff between two refs.
+ * useMergeBase: if true, uses three-dot semantics.
  * Native: libgit2 patch line stats.
  * Fallback: `git diff --numstat`.
  */
-export function nativeDiffNumstat(basePath, fromRef, toRef) {
+export function nativeDiffNumstat(basePath, fromRef, toRef, useMergeBase) {
     const native = loadNative();
-    if (native) {
+    if (native && !useMergeBase) {
         return native.gitDiffNumstat(basePath, fromRef, toRef);
     }
-    const result = gitExec(basePath, ["diff", "--numstat", fromRef, toRef], true);
+    const refspec = useMergeBase ? `${fromRef}...${toRef}` : undefined;
+    const args = refspec
+        ? ["diff", "--numstat", refspec]
+        : ["diff", "--numstat", fromRef, toRef];
+    const result = gitExec(basePath, args, true);
     if (!result)
         return [];
     return result.split("\n").filter(Boolean).map(line => {
@@ -409,7 +448,10 @@ export function nativeBranchList(basePath, pattern) {
     const result = gitFileExec(basePath, args, true);
     if (!result)
         return [];
-    return result.split("\n").map(b => b.trim().replace(/^\* /, "")).filter(Boolean);
+    return result
+        .split("\n")
+        .map(b => b.trim().replace(/^[*+]\s+/, ""))
+        .filter(Boolean);
 }
 /**
  * List branches merged into target.
@@ -777,13 +819,10 @@ export function nativeCommit(basePath, message, options) {
         const args = ["commit", "-F", "-"];
         if (options?.allowEmpty)
             args.push("--allow-empty");
-        const result = execFileSync("git", args, {
-            cwd: basePath,
+        const result = execGitFileSyncWithRetry(basePath, args, {
             stdio: ["pipe", "pipe", "pipe"],
-            encoding: "utf-8",
-            env: GIT_NO_PROMPT_ENV,
             input: message,
-        }).trim();
+        });
         return result;
     }
     catch (err) {
@@ -792,7 +831,11 @@ export function nativeCommit(basePath, message, options) {
         if (combined.includes("nothing to commit") || combined.includes("nothing added to commit") || combined.includes("no changes added")) {
             return null;
         }
-        throw err;
+        const commitDetail = errObj.stderr?.trim() || errObj.message || "git commit failed";
+        const wrapped = new Error(`git commit failed: ${commitDetail}`);
+        wrapped.stdout = errObj.stdout;
+        wrapped.stderr = errObj.stderr;
+        throw wrapped;
     }
 }
 /**

package/dist/resources/extensions/gsd/parallel-orchestrator.js

@@ -849,6 +849,9 @@ export function refreshWorkerStatuses(basePath, options = {}) {
     for (const [mid, worker] of state.workers) {
         const diskStatus = statusMap.get(mid);
         if (!diskStatus) {
+            if (worker.state === "stopped" || worker.state === "error") {
+                continue;
+            }
             if (!isPidAlive(worker.pid)) {
                 worker.cleanup?.();
                 worker.cleanup = undefined;

package/dist/resources/extensions/gsd/paths.js

@@ -320,6 +320,10 @@ export function resolveGsdPathContract(workRoot, originalProjectRoot) {
         isWorktree,
     };
 }
+export function gsdProjectionRoot(basePath) {
+    const contract = resolveGsdPathContract(basePath);
+    return normalizeRealPath(contract.worktreeGsd ?? contract.projectGsd);
+}
 /**
  * Invalidate the gsdRoot cache.
  * Use ONLY at session-reset boundaries: workspace switch, process exit, or

package/dist/resources/extensions/gsd/pending-auto-start.js

@@ -0,0 +1,52 @@
+// GSD-2 — Pending auto-start handoff state.
+// Stores discuss-to-auto handoff entries keyed by project root.
+import { createWorkspace, scopeMilestone } from "./workspace.js";
+const pendingAutoStartMap = new Map();
+export function getPendingAutoStart(basePath) {
+    if (basePath)
+        return pendingAutoStartMap.get(basePath) ?? null;
+    if (pendingAutoStartMap.size === 1)
+        return pendingAutoStartMap.values().next().value;
+    return null;
+}
+export const _getPendingAutoStart = getPendingAutoStart;
+export function hasPendingAutoStart(basePath) {
+    if (basePath)
+        return pendingAutoStartMap.has(basePath);
+    return pendingAutoStartMap.size > 0;
+}
+export function setPendingAutoStart(basePath, entry) {
+    if (!entry.ctx || !entry.pi) {
+        throw new Error("setPendingAutoStart requires ctx and pi");
+    }
+    const ws = createWorkspace(entry.basePath);
+    const scope = scopeMilestone(ws, entry.milestoneId);
+    pendingAutoStartMap.set(basePath, {
+        createdAt: Date.now(),
+        planBlockedRecoveryCount: 0,
+        ...entry,
+        scope,
+        ctx: entry.ctx,
+        pi: entry.pi,
+    });
+}
+export function deletePendingAutoStart(basePath) {
+    pendingAutoStartMap.delete(basePath);
+}
+export function clearPendingAutoStart(basePath) {
+    if (basePath) {
+        pendingAutoStartMap.delete(basePath);
+    }
+    else {
+        pendingAutoStartMap.clear();
+    }
+}
+export function getDiscussionMilestoneId(basePath) {
+    if (basePath) {
+        return pendingAutoStartMap.get(basePath)?.milestoneId ?? null;
+    }
+    if (pendingAutoStartMap.size === 1) {
+        return pendingAutoStartMap.values().next().value.milestoneId;
+    }
+    return null;
+}

package/dist/resources/extensions/gsd/planning-path-scope.js

@@ -6,20 +6,26 @@ function isInsideBase(basePath, candidate) {
     const rel = relative(base, abs);
     return rel === "" || (!!rel && !rel.startsWith("..") && !isAbsolute(rel));
 }
+function isInsideAnyBase(bases, candidate) {
+    return bases.some((base) => isInsideBase(base, candidate));
+}
 /**
  * Planning IO fields are execution contracts. Absolute paths are only safe when
  * they stay inside the active working directory; in worktree mode, an absolute
  * path to the original checkout makes executors edit the wrong tree.
  */
-export function validatePlanningPathScope(basePath, fields) {
+export function validatePlanningPathScope(basePath, fields, allowedAbsoluteRoots) {
+    const absoluteRoots = (allowedAbsoluteRoots && allowedAbsoluteRoots.length > 0)
+        ? allowedAbsoluteRoots
+        : [basePath];
     for (const { field, values } of fields) {
         for (const raw of values) {
             const candidate = normalizePlannedFileReference(raw);
             if (!isAbsolute(candidate))
                 continue;
-            if (isInsideBase(basePath, candidate))
+            if (isInsideAnyBase(absoluteRoots, candidate))
                 continue;
-            return `${field} contains absolute path outside working directory: ${candidate}. Use a path relative to ${basePath}.`;
+            return `${field} contains absolute path outside allowed repository roots: ${candidate}. Use a path relative to one of: ${absoluteRoots.join(", ")}.`;
         }
     }
     return null;

package/dist/resources/extensions/gsd/post-execution-checks.js

@@ -17,6 +17,43 @@
 import { existsSync, readFileSync } from "node:fs";
 import { resolve, dirname, extname } from "node:path";
 // ─── Import Resolution Check ─────────────────────────────────────────────────
+/**
+ * Replace the contents of single- and double-quoted string literals on a single
+ * source line with spaces so import patterns do not match text inside strings.
+ * Template-literal spans are handled separately via the inTemplateLiteral flag.
+ */
+function stripStringLiterals(line) {
+    let result = "";
+    let i = 0;
+    while (i < line.length) {
+        const ch = line[i];
+        if (ch === '"' || ch === "'") {
+            result += ch;
+            i++;
+            while (i < line.length) {
+                const c = line[i];
+                if (c === "\\" && i + 1 < line.length) {
+                    result += "  ";
+                    i += 2;
+                }
+                else if (c === ch) {
+                    result += ch;
+                    i++;
+                    break;
+                }
+                else {
+                    result += " ";
+                    i++;
+                }
+            }
+        }
+        else {
+            result += ch;
+            i++;
+        }
+    }
+    return result;
+}
 /**
  * Extract relative import paths from TypeScript/JavaScript source code.
  * Returns array of { importPath, lineNum } for relative imports.
@@ -30,11 +67,19 @@ export function extractRelativeImports(source) {
     //   import './path'
     //   require('./path')
     //   require("../path")
-    const importPattern = /(?:import\s+(?:.*?\s+from\s+)?|require\s*\(\s*)(['"])(\.\.?\/[^'"]+)\1/g;
+    const importPattern = /(?:^|[;{}]\s*)import\s+(?:.*?\s+from\s+)?(['"])(\.\.?\/[^'"]+)\1/g;
+    const requirePattern = /require\s*\(\s*(['"])(\.\.?\/[^'"]+)\1/g;
     // Track if we're inside a block comment
     let inBlockComment = false;
+    let inTemplateLiteral = false;
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
+        if (inTemplateLiteral) {
+            if ((line.match(/(?<!\\)`/g) ?? []).length % 2 === 1) {
+                inTemplateLiteral = false;
+            }
+            continue;
+        }
         // Handle block comment boundaries
         if (inBlockComment) {
             if (line.includes("*/")) {
@@ -61,9 +106,17 @@ export function extractRelativeImports(source) {
         let match;
         // Reset lastIndex for each line
         importPattern.lastIndex = 0;
+        requirePattern.lastIndex = 0;
+        const strippedLine = stripStringLiterals(line);
         while ((match = importPattern.exec(line)) !== null) {
+            const importOffset = match[0].indexOf("import");
+            const importStart = match.index + importOffset;
+            if (strippedLine.slice(importStart, importStart + "import".length) !==
+                "import") {
+                continue;
+            }
             // Check if this match is after a // comment marker on the same line
-            const beforeMatch = line.substring(0, match.index);
+            const beforeMatch = strippedLine.substring(0, match.index);
             if (beforeMatch.includes("//")) {
                 continue;
             }
@@ -72,6 +125,24 @@ export function extractRelativeImports(source) {
                 lineNum: i + 1,
             });
         }
+        while ((match = requirePattern.exec(line)) !== null) {
+            if (strippedLine.slice(match.index, match.index + "require".length) !==
+                "require") {
+                continue;
+            }
+            // Check if this match is after a // comment marker on the same line
+            const beforeMatch = strippedLine.substring(0, match.index);
+            if (beforeMatch.includes("//")) {
+                continue;
+            }
+            imports.push({
+                importPath: match[2],
+                lineNum: i + 1,
+            });
+        }
+        if ((strippedLine.match(/(?<!\\)`/g) ?? []).length % 2 === 1) {
+            inTemplateLiteral = true;
+        }
     }
     return imports;
 }
@@ -109,13 +180,6 @@ export function resolveImportPath(importPath, sourceFile, basePath) {
             ".woff", ".woff2", ".ttf", ".otf", ".eot",
         ]);
         const runtimeFallbackExtensions = new Set([".js", ".jsx", ".mjs", ".cjs"]);
-        const dottedStemFallbackExtensions = new Set([".server", ".client", ".webhook"]);
-        if (explicitExt !== "" &&
-            !runtimeFallbackExtensions.has(explicitExt) &&
-            !nonFallbackExtensions.has(explicitExt) &&
-            !dottedStemFallbackExtensions.has(explicitExt)) {
-            return { exists: false, resolvedPath: null };
-        }
         if (nonFallbackExtensions.has(explicitExt) && !runtimeFallbackExtensions.has(explicitExt)) {
             return { exists: false, resolvedPath: null };
         }

package/dist/resources/extensions/gsd/pre-execution-checks.js

@@ -18,8 +18,34 @@
 import { existsSync } from "node:fs";
 import { spawn } from "node:child_process";
 import { homedir } from "node:os";
-import { resolve } from "node:path";
+import { isAbsolute, relative, resolve } from "node:path";
+import { validateVerificationCommand } from "./verification-gate.js";
 const NPM_COMMAND = process.platform === "win32" ? "npm.cmd" : "npm";
+export function checkVerificationCommands(tasks) {
+    const results = [];
+    for (const task of tasks) {
+        const verify = task.verify.trim();
+        if (!verify)
+            continue;
+        const commands = verify
+            .split("&&")
+            .map((command) => command.trim())
+            .filter(Boolean);
+        for (const command of commands) {
+            const validation = validateVerificationCommand(command);
+            if (!validation.ok) {
+                results.push({
+                    category: "tool",
+                    target: `${task.id} Verify`,
+                    passed: false,
+                    message: `Unsafe or non-runnable Verify command: ${command} (${validation.reason})`,
+                    blocking: true,
+                });
+            }
+        }
+    }
+    return results;
+}
 // ─── Package Existence Check ─────────────────────────────────────────────────
 /**
  * Extract npm package names from task descriptions.
@@ -81,7 +107,7 @@ export function extractPackageReferences(description) {
     while ((importMatch = importPattern.exec(description)) !== null) {
         // Skip relative imports and node builtins
         const pkg = importMatch[1];
-        if (!pkg.startsWith(".") && !pkg.startsWith("node:")) {
+        if (!pkg.startsWith(".") && !pkg.startsWith("node:") && !pkg.startsWith("@/")) {
             packages.add(normalizePackageName(pkg));
         }
     }
@@ -292,7 +318,7 @@ function extractPathFromAnnotation(raw) {
     if (quoteMatch) {
         return quoteMatch[2].trim();
     }
-    const annotatedMatch = trimmed.match(/^(.+?)\s+[—–-]\s+.+$/);
+    const annotatedMatch = trimmed.match(/^(.+?)(?:\s+[—–-]\s+.+|\s+\([^()]+\))$/);
     if (annotatedMatch) {
         const prefix = annotatedMatch[1].trim();
         const prefixBacktickMatch = prefix.match(/`([^`]+)`/);
@@ -357,6 +383,14 @@ function isRuntimeOnlyInput(raw) {
 function containsGlobPattern(candidate) {
     return ["*", "?", "[", "]", "{", "}"].some((char) => candidate.includes(char));
 }
+function toComparisonPath(filePath, basePath) {
+    const normalized = normalizeFilePath(filePath);
+    if (!isAbsolute(normalized))
+        return normalized;
+    const normalizedBasePath = normalizeFilePath(basePath);
+    const rel = normalizeFilePath(relative(normalizedBasePath, normalized));
+    return rel && !rel.startsWith("..") && rel !== "." ? rel : normalized;
+}
 /**
  * Build a set of files that will be created by tasks up to (but not including) taskIndex.
  * Also includes outputs of completed tasks at any position — a completed task has already
@@ -389,21 +423,22 @@ function getExpectedOutputsUpTo(tasks, taskIndex) {
  *
  * All paths are normalized before comparison to ensure ./src/a.ts matches src/a.ts.
  */
-export function checkFilePathConsistency(tasks, basePath) {
+export function checkFilePathConsistency(tasks, basePath, context) {
     const results = [];
+    const resolutionRoots = [basePath, ...(context?.additionalRoots ?? [])];
     // Build a set of all files created by any task at any position (normalized).
     // Used to suppress consistency errors for files that will be caught with a
     // more precise message by checkTaskOrdering (sequence violation).
     const allTaskOutputs = new Set();
     for (const t of tasks) {
         for (const f of t.expected_output) {
-            allTaskOutputs.add(normalizeFilePath(f));
+            allTaskOutputs.add(toComparisonPath(f, basePath));
         }
     }
     for (let i = 0; i < tasks.length; i++) {
         const task = tasks[i];
-        const priorOutputs = getExpectedOutputsUpTo(tasks, i);
-        const ownOutputs = new Set(task.expected_output.map(normalizeFilePath));
+        const priorOutputs = new Set(Array.from(getExpectedOutputsUpTo(tasks, i), (filePath) => toComparisonPath(filePath, basePath)));
+        const ownOutputs = new Set(task.expected_output.map((filePath) => toComparisonPath(filePath, basePath)));
         const filesToCheck = [...task.inputs];
         for (const file of filesToCheck) {
             // Skip empty strings
@@ -412,12 +447,11 @@ export function checkFilePathConsistency(tasks, basePath) {
             if (!shouldValidateInputAsPath(file))
                 continue;
             // Normalize path for consistent comparison
-            const normalizedFile = normalizeFilePath(file);
+            const normalizedFile = toComparisonPath(file, basePath);
             if (containsGlobPattern(normalizedFile))
                 continue;
             // Check if file exists on disk
-            const absolutePath = resolve(basePath, normalizedFile);
-            const existsOnDisk = existsSync(absolutePath);
+            const existsOnDisk = resolutionRoots.some((root) => existsSync(resolve(root, normalizedFile)));
             // Check if file is in prior expected outputs (priorOutputs already normalized)
             const inPriorOutputs = priorOutputs.has(normalizedFile);
             const inOwnOutputs = ownOutputs.has(normalizedFile);
@@ -455,14 +489,15 @@ export function checkFilePathConsistency(tasks, basePath) {
  *
  * All paths are normalized before comparison to ensure ./src/a.ts matches src/a.ts.
  */
-export function checkTaskOrdering(tasks, basePath) {
+export function checkTaskOrdering(tasks, basePath, context) {
     const results = [];
+    const resolutionRoots = [basePath, ...(context?.additionalRoots ?? [])];
     // Build map: normalized file → task index that creates it
     const fileCreators = new Map();
     for (let i = 0; i < tasks.length; i++) {
         const task = tasks[i];
         for (const file of task.expected_output) {
-            const normalizedFile = normalizeFilePath(file);
+            const normalizedFile = toComparisonPath(file, basePath);
             const existing = fileCreators.get(normalizedFile);
             if (!existing || (!existing.completed && task.status === "completed")) {
                 fileCreators.set(normalizedFile, {
@@ -485,7 +520,7 @@ export function checkTaskOrdering(tasks, basePath) {
                 continue;
             if (!shouldValidateInputAsPath(file))
                 continue;
-            const normalizedFile = normalizeFilePath(file);
+            const normalizedFile = toComparisonPath(file, basePath);
             if (containsGlobPattern(normalizedFile))
                 continue;
             // A directory reference like `artifacts/M009-S03/` is never a concrete
@@ -494,8 +529,7 @@ export function checkTaskOrdering(tasks, basePath) {
             if (isDirectoryReference(file))
                 continue;
             const creator = fileCreators.get(normalizedFile);
-            const absolutePath = resolve(basePath, normalizedFile);
-            const existsOnDisk = existsSync(absolutePath);
+            const existsOnDisk = resolutionRoots.some((root) => existsSync(resolve(root, normalizedFile)));
             // Skip if the creating task has already completed — its output is available
             // regardless of disk state (e.g. file was a temp artifact cleaned up after
             // the task ran, or a replan introduced a new earlier-sequence task that
@@ -640,14 +674,15 @@ export function checkInterfaceContracts(tasks, _basePath) {
  * @param basePath - Base path for resolving file references
  * @returns PreExecutionResult with status, checks, and duration
  */
-export async function runPreExecutionChecks(tasks, basePath) {
+export async function runPreExecutionChecks(tasks, basePath, context) {
     const startTime = Date.now();
     const allChecks = [];
     // Run sync checks first
-    const fileChecks = checkFilePathConsistency(tasks, basePath);
-    const orderingChecks = checkTaskOrdering(tasks, basePath);
+    const fileChecks = checkFilePathConsistency(tasks, basePath, context);
+    const orderingChecks = checkTaskOrdering(tasks, basePath, context);
     const contractChecks = checkInterfaceContracts(tasks, basePath);
-    allChecks.push(...fileChecks, ...orderingChecks, ...contractChecks);
+    const verificationChecks = checkVerificationCommands(tasks);
+    allChecks.push(...fileChecks, ...orderingChecks, ...contractChecks, ...verificationChecks);
     // Run async package checks
     const packageChecks = await checkPackageExistence(tasks, basePath);
     allChecks.push(...packageChecks);

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

@@ -0,0 +1,19 @@
+/**
+ * Resolve MCP server config for a given model ID using longest-prefix-wins matching.
+ *
+ * Keys in config.per_model are model-ID prefixes. When modelId.startsWith(key),
+ * the key is a candidate; the longest matching key wins. Returns undefined when
+ * no key matches or per_model is empty.
+ */
+export function resolveModelMcpConfig(modelId, config) {
+    let bestKey;
+    const perModel = config.per_model ?? {};
+    for (const key of Object.keys(perModel)) {
+        if (modelId.startsWith(key)) {
+            if (bestKey === undefined || key.length > bestKey.length) {
+                bestKey = key;
+            }
+        }
+    }
+    return bestKey !== undefined ? perModel[bestKey] : undefined;
+}

package/dist/resources/extensions/gsd/preferences-models.js

@@ -29,9 +29,10 @@ export function resolveModelForUnit(unitType) {
  */
 export function resolveModelWithFallbacksForUnit(unitType) {
     const prefs = loadEffectiveGSDPreferences(undefined, { availableModelIds: [] });
-    if (!prefs?.preferences.models)
+    const models = prefs?.preferences?.models;
+    if (!models)
         return undefined;
-    const m = prefs.preferences.models;
+    const m = models;
     let phaseConfig;
     switch (unitType) {
         case "research-milestone":
@@ -128,9 +129,10 @@ export function resolveModelWithFallbacksForUnit(unitType) {
  */
 export function resolveDefaultSessionModel(sessionProvider) {
     const prefs = loadEffectiveGSDPreferences(undefined, { availableModelIds: [] });
-    if (!prefs?.preferences.models)
+    const models = prefs?.preferences?.models;
+    if (!models)
         return undefined;
-    const m = prefs.preferences.models;
+    const m = models;
     // Priority: execution → planning → first configured value
     const candidates = [
         m.execution,

package/dist/resources/extensions/gsd/preferences-types.js

@@ -71,6 +71,7 @@ export const KNOWN_PREFERENCE_KEYS = new Set([
     "verification_commands",
     "verification_auto_fix",
     "verification_max_retries",
+    "per_unit_cost_cap_usd",
     "search_provider",
     "context_selection",
     "widget_mode",
@@ -99,6 +100,8 @@ export const KNOWN_PREFERENCE_KEYS = new Set([
     "context_window_override",
     "context_mode",
     "planning_depth",
+    "claude_code_mcp",
+    "workspace",
 ]);
 /**
  * Broad union of every recognized unit-type *label* used across the codebase.