gsd-pi 2.78.0-dev.aeeb2ca00 → 2.78.1-dev.0fdacd524

package/dist/headless.d.ts

@@ -32,6 +32,16 @@ export interface HeadlessOptions {
     resumeSession?: string;
     bare?: boolean;
 }
+/**
+ * Commands classified as multi-turn in headless mode: they involve multiple
+ * question rounds, codebase scanning, and artifact writing before the workflow
+ * completes (#3547). Multi-turn commands suppress single-execution-complete
+ * exit and disable the default 5-minute timeout.
+ *
+ * Exported so the regression test can exercise the real classifier rather
+ * than grepping the source for identifier names.
+ */
+export declare function isMultiTurnHeadlessCommand(command: string): boolean;
 export interface ResumeSessionResult {
     session?: SessionInfo;
     error?: string;

package/dist/headless.js

@@ -21,6 +21,21 @@ import { isTerminalNotification, isBlockedNotification, isMilestoneReadyNotifica
 import { VALID_OUTPUT_FORMATS } from './headless-types.js';
 import { handleExtensionUIRequest, formatProgress, formatThinkingLine, formatTextStart, formatTextEnd, formatThinkingStart, formatThinkingEnd, startSupervisedStdinReader, } from './headless-ui.js';
 import { loadContext, bootstrapGsdProject, } from './headless-context.js';
+/**
+ * Commands classified as multi-turn in headless mode: they involve multiple
+ * question rounds, codebase scanning, and artifact writing before the workflow
+ * completes (#3547). Multi-turn commands suppress single-execution-complete
+ * exit and disable the default 5-minute timeout.
+ *
+ * Exported so the regression test can exercise the real classifier rather
+ * than grepping the source for identifier names.
+ */
+export function isMultiTurnHeadlessCommand(command) {
+    return (command === 'auto' ||
+        command === 'next' ||
+        command === 'discuss' ||
+        command === 'plan');
+}
 /**
  * Resolve a session prefix to a single session.
  * Exact id match is preferred over prefix match.
@@ -186,7 +201,7 @@ async function runHeadlessOnce(options, restartCount) {
     const isAutoMode = options.command === 'auto';
     // discuss and plan are multi-turn: they involve multiple question rounds,
     // codebase scanning, and artifact writing before the workflow completes (#3547).
-    const isMultiTurnCommand = options.command === 'auto' || options.command === 'next' || options.command === 'discuss' || options.command === 'plan';
+    const isMultiTurnCommand = isMultiTurnHeadlessCommand(options.command);
     if (isAutoMode && options.timeout === 300_000) {
         options.timeout = 0;
     }

package/dist/loader.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 // GSD Startup Loader
-// Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
 import { fileURLToPath } from 'url';
 import { dirname, resolve, join, relative, delimiter } from 'path';
 import { existsSync, readFileSync, readdirSync, statSync, mkdirSync, symlinkSync, cpSync } from 'fs';
@@ -32,14 +31,14 @@ if (firstArg === '--help' || firstArg === '-h') {
 // package.json (already parsed above) and verifies git is available.
 // ---------------------------------------------------------------------------
 {
-    const MIN_NODE_MAJOR = 22;
+    const { MIN_NODE_MAJOR, checkNodeVersion, requireGit } = await import('./runtime-checks.js');
     const red = '\x1b[31m';
     const bold = '\x1b[1m';
     const dim = '\x1b[2m';
     const reset = '\x1b[0m';
     // -- Node version --
-    const nodeMajor = parseInt(process.versions.node.split('.')[0], 10);
-    if (nodeMajor < MIN_NODE_MAJOR) {
+    const nodeCheck = checkNodeVersion(process.versions.node, MIN_NODE_MAJOR);
+    if (!nodeCheck.ok) {
         process.stderr.write(`\n${red}${bold}Error:${reset} GSD requires Node.js >= ${MIN_NODE_MAJOR}.0.0\n` +
             `       You are running Node.js ${process.versions.node}\n\n` +
             `${dim}Install a supported version:${reset}\n` +
@@ -49,11 +48,9 @@ if (firstArg === '--help' || firstArg === '-h') {
         process.exit(1);
     }
     // -- git --
-    try {
-        const { execFileSync } = await import('child_process');
-        execFileSync('git', ['--version'], { stdio: 'ignore' });
-    }
-    catch {
+    const { execFileSync } = await import('child_process');
+    const gitOk = requireGit((cmd, args) => execFileSync(cmd, args, { stdio: 'ignore' }));
+    if (!gitOk) {
         process.stderr.write(`\n${red}${bold}Error:${reset} GSD requires git but it was not found on PATH.\n\n` +
             `${dim}Install git:${reset}\n` +
             `  https://git-scm.com/downloads\n\n`);
@@ -61,8 +58,9 @@ if (firstArg === '--help' || firstArg === '-h') {
     }
 }
 import { agentDir, appRoot } from './app-paths.js';
-import { applyRtkProcessEnv } from './rtk.js';
+import { applyRtkProcessEnv } from './rtk-shared.js';
 import { serializeBundledExtensionPaths } from './bundled-extension-paths.js';
+import { resolveBundledResourcesDirFromPackageRoot } from './bundled-resource-path.js';
 import { discoverExtensionEntryPaths } from './extension-discovery.js';
 import { loadRegistry, readManifestFromEntryPath, isExtensionEnabled } from './extension-registry.js';
 import { renderLogo } from './logo.js';
@@ -121,9 +119,7 @@ process.env.GSD_BIN_PATH = process.argv[1];
 // GSD_WORKFLOW_PATH — absolute path to bundled GSD-WORKFLOW.md, used by patched gsd extension
 // when dispatching workflow prompts. Prefers dist/resources/ (stable, set at build time)
 // over src/resources/ (live working tree) — see resource-loader.ts for rationale.
-const distRes = join(gsdRoot, 'dist', 'resources');
-const srcRes = join(gsdRoot, 'src', 'resources');
-const resourcesDir = existsSync(distRes) ? distRes : srcRes;
+const resourcesDir = resolveBundledResourcesDirFromPackageRoot(gsdRoot);
 process.env.GSD_WORKFLOW_PATH = join(resourcesDir, 'GSD-WORKFLOW.md');
 // GSD_BUNDLED_EXTENSION_PATHS — dynamically discovered bundled extension entry points.
 // Uses the shared discoverExtensionEntryPaths() to scan the bundled resources

package/dist/onboarding.d.ts

@@ -24,6 +24,16 @@ interface RunOnboardingOptions {
     /** Show logo + intro banner. Disable when onboarding is launched inside an active TUI session. */
     showIntro?: boolean;
 }
+export declare const OTHER_PROVIDERS: ({
+    value: string;
+    label: string;
+    hint: string;
+} | {
+    value: string;
+    label: string;
+    hint?: undefined;
+})[];
+export declare function detectNativeProviderFromBaseUrl(baseUrl: string): 'minimax' | 'minimax-cn' | null;
 /**
  * Determine if the onboarding wizard should run.
  *

package/dist/onboarding.js

@@ -54,7 +54,7 @@ const API_KEY_PREFIXES = {
     anthropic: ['sk-ant-'],
     openai: ['sk-'],
 };
-const OTHER_PROVIDERS = [
+export const OTHER_PROVIDERS = [
     { value: 'google', label: 'Google (Gemini)', hint: 'aistudio.google.com/app/apikey' },
     { value: 'groq', label: 'Groq', hint: 'console.groq.com/keys' },
     { value: 'xai', label: 'xAI (Grok)', hint: 'console.x.ai' },
@@ -148,7 +148,7 @@ function persistDefaultModel(modelId) {
         // Non-fatal: startup fallback logic will still run.
     }
 }
-function detectNativeProviderFromBaseUrl(baseUrl) {
+export function detectNativeProviderFromBaseUrl(baseUrl) {
     try {
         const hostname = new URL(baseUrl).hostname.toLowerCase();
         if (hostname === 'api.minimax.io' || hostname.endsWith('.minimax.io')) {

package/dist/provider-migrations.d.ts

@@ -1,7 +1,7 @@
 import type { AuthStorage } from "@gsd/pi-coding-agent";
 type AnthropicMigrationDeps = {
     authStorage: Pick<AuthStorage, "getCredentialsForProvider">;
-    isClaudeCodeReady: boolean;
+    isClaudeCodeReady: boolean | (() => boolean);
     defaultProvider: string | undefined;
     env?: NodeJS.ProcessEnv;
 };
@@ -11,7 +11,7 @@ type MigrationModel = {
 };
 type AnthropicDefaultMigrationDeps = {
     authStorage: Pick<AuthStorage, "getCredentialsForProvider">;
-    isClaudeCodeReady: boolean;
+    isClaudeCodeReady: boolean | (() => boolean);
     settingsManager: {
         getDefaultProvider(): string | undefined;
         getDefaultModel(): string | undefined;

package/dist/provider-migrations.js

@@ -5,10 +5,13 @@ export function hasDirectAnthropicApiKey(authStorage, env = process.env) {
     return authStorage.getCredentialsForProvider("anthropic").some((credential) => credential?.type === "api_key" && typeof credential?.key === "string" && credential.key.trim().length > 0);
 }
 export function shouldMigrateAnthropicToClaudeCode({ authStorage, isClaudeCodeReady, defaultProvider, env = process.env, }) {
-    if (!isClaudeCodeReady || defaultProvider !== "anthropic") {
+    if (defaultProvider !== "anthropic") {
         return false;
     }
-    return !hasDirectAnthropicApiKey(authStorage, env);
+    if (hasDirectAnthropicApiKey(authStorage, env)) {
+        return false;
+    }
+    return typeof isClaudeCodeReady === "function" ? isClaudeCodeReady() : isClaudeCodeReady;
 }
 export function migrateAnthropicDefaultToClaudeCode({ authStorage, isClaudeCodeReady, settingsManager, modelRegistry, env = process.env, }) {
     const defaultProvider = settingsManager.getDefaultProvider();

package/dist/resource-loader.d.ts

@@ -1,4 +1,4 @@
-import { DefaultResourceLoader } from '@gsd/pi-coding-agent';
+import type { DefaultResourceLoader as DefaultResourceLoaderType } from '@gsd/pi-coding-agent';
 export { discoverExtensionEntryPaths } from './extension-discovery.js';
 export declare function getExtensionKey(entryPath: string, extensionsDir: string): string;
 export declare function readManagedResourceVersion(agentDir: string): string | null;
@@ -63,4 +63,7 @@ export declare function mergedFingerprint(hoisted: string, internal: string): st
  */
 export declare function initResources(agentDir: string, skillsDir?: string): void;
 export declare function hasStaleCompiledExtensionSiblings(extensionsDir: string, sourceDir?: string): boolean;
-export declare function buildResourceLoader(agentDir: string): DefaultResourceLoader;
+interface BuildResourceLoaderOptions {
+    additionalExtensionPaths?: string[];
+}
+export declare function buildResourceLoader(agentDir: string, options?: BuildResourceLoaderOptions): Promise<DefaultResourceLoaderType>;

package/dist/resource-loader.js

@@ -1,4 +1,3 @@
-import { DefaultResourceLoader, sortExtensionPaths } from '@gsd/pi-coding-agent';
 import { createHash } from 'node:crypto';
 import { homedir } from 'node:os';
 import { chmodSync, copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, openSync, closeSync, readFileSync, readlinkSync, readdirSync, rmSync, statSync, symlinkSync, unlinkSync, writeFileSync } from 'node:fs';
@@ -7,6 +6,11 @@ import { fileURLToPath } from 'node:url';
 import { compareSemver } from './update-check.js';
 import { discoverExtensionEntryPaths } from './extension-discovery.js';
 import { loadRegistry, readManifestFromEntryPath, isExtensionEnabled, ensureRegistryEntries } from './extension-registry.js';
+import { resolveBundledResourcesDirFromPackageRoot } from './bundled-resource-path.js';
+let piCodingAgentModulePromise;
+function loadPiCodingAgentModule() {
+    return (piCodingAgentModulePromise ??= import('@gsd/pi-coding-agent'));
+}
 // Resolve resources directory — prefer dist/resources/ (stable, set at build time)
 // over src/resources/ (live working tree, changes with git branch).
 //
@@ -16,16 +20,10 @@ import { loadRegistry, readManifestFromEntryPath, isExtensionEnabled, ensureRegi
 // dist/resources/ is populated by the build step (`npm run copy-resources`) and
 // reflects the built state, not the currently checked-out branch.
 const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..');
-const distResources = join(packageRoot, 'dist', 'resources');
-const srcResources = join(packageRoot, 'src', 'resources');
-// Use dist/resources only if it has the full expected structure.
-// A partial build (tsc without copy-resources) creates dist/resources/extensions/
-// but not agents/ or skills/, causing initResources to sync from an incomplete source.
-const resourcesDir = (existsSync(distResources) && existsSync(join(distResources, 'agents')))
-    ? distResources
-    : srcResources;
+const resourcesDir = resolveBundledResourcesDirFromPackageRoot(packageRoot);
 const bundledExtensionsDir = join(resourcesDir, 'extensions');
 const resourceVersionManifestName = 'managed-resources.json';
+const resourceFingerprintFileName = '.managed-resources-content-hash';
 export { discoverExtensionEntryPaths } from './extension-discovery.js';
 export function getExtensionKey(entryPath, extensionsDir) {
     const relPath = relative(extensionsDir, entryPath);
@@ -77,7 +75,7 @@ function writeManagedResourceManifest(agentDir) {
     const manifest = {
         gsdVersion: getBundledGsdVersion(),
         syncedAt: Date.now(),
-        contentHash: computeResourceFingerprint(),
+        contentHash: getCurrentResourceFingerprint(),
         installedExtensionRootFiles,
         installedExtensionDirs,
     };
@@ -125,10 +123,24 @@ export function computeResourceFingerprint(rootDir = resourcesDir) {
     entries.sort();
     return createHash('sha256').update(entries.join('\n')).digest('hex').slice(0, 16);
 }
+function getCurrentResourceFingerprint() {
+    try {
+        const precomputed = readFileSync(join(resourcesDir, resourceFingerprintFileName), 'utf-8').trim();
+        if (/^[a-f0-9]{16}$/i.test(precomputed)) {
+            return precomputed;
+        }
+    }
+    catch {
+        // Source-tree and partial-build workflows may not have a precomputed hash.
+    }
+    return computeResourceFingerprint();
+}
 function collectFileEntries(dir, root, out) {
     if (!existsSync(dir))
         return;
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
+        if (entry.name === resourceFingerprintFileName)
+            continue;
         const fullPath = join(dir, entry.name);
         if (entry.isDirectory()) {
             collectFileEntries(fullPath, root, out);
@@ -548,7 +560,7 @@ export function initResources(agentDir, skillsDir = join(homedir(), '.agents', '
     // hotfixes within a release). The content hash catches those at ~1ms cost.
     if (manifest && manifest.gsdVersion === currentVersion) {
         // Version matches — check content fingerprint for same-version staleness.
-        const currentHash = computeResourceFingerprint();
+        const currentHash = getCurrentResourceFingerprint();
         const hasStaleExtensionFiles = hasStaleCompiledExtensionSiblings(extensionsDir, bundledExtensionsDir);
         if (manifest.contentHash && manifest.contentHash === currentHash && !hasStaleExtensionFiles) {
             return;
@@ -736,7 +748,8 @@ function getBundledExtensionKeys() {
     }
     return _bundledExtensionKeys;
 }
-export function buildResourceLoader(agentDir) {
+export async function buildResourceLoader(agentDir, options = {}) {
+    const { DefaultResourceLoader, sortExtensionPaths } = await loadPiCodingAgentModule();
     const registry = loadRegistry();
     const piAgentDir = join(homedir(), '.pi', 'agent');
     const piExtensionsDir = join(piAgentDir, 'extensions');
@@ -749,9 +762,13 @@ export function buildResourceLoader(agentDir) {
             return true;
         return isExtensionEnabled(registry, manifest.id);
     });
+    const additionalExtensionPaths = [
+        ...piExtensionPaths,
+        ...(options.additionalExtensionPaths ?? []),
+    ];
     return new DefaultResourceLoader({
         agentDir,
-        additionalExtensionPaths: piExtensionPaths,
+        additionalExtensionPaths,
         bundledExtensionKeys: bundledKeys,
         extensionPathsTransform: (paths) => {
             // 1. Filter community extensions through the GSD registry

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

@@ -0,0 +1 @@
+4ec0444c08b7f2ca

package/dist/resources/extensions/claude-code-cli/readiness.js

@@ -6,10 +6,29 @@
  * model-availability check.
  *
  * Auth verification runs `claude auth status --json` and inspects the
- * `loggedIn` field, falling back to a text heuristic when the JSON shape
- * is unavailable (older Claude CLI builds).
+ * `loggedIn` field, falling back to plain `claude auth status` and a text
+ * heuristic when the JSON shape is unavailable (older Claude CLI builds).
+ *
+ * Set GSD_CLAUDE_DEBUG=1 to print the probe's binary selection and auth
+ * outputs to stderr — useful when diagnosing platform-specific detection
+ * failures (Issue #4997).
  */
 import { execFileSync } from "node:child_process";
+/**
+ * Spawn the Claude CLI without triggering Node's DEP0190.
+ *
+ * Passing `args` together with `shell: true` is deprecated in Node 22+
+ * because the args are concatenated into the command string without
+ * escaping. On Windows we still need a shell to resolve `.cmd` shims, so
+ * we invoke `cmd /c <command> <args...>` explicitly. On POSIX we don't
+ * need a shell at all.
+ */
+function spawnClaude(command, args, opts) {
+    if (process.platform === "win32") {
+        return execFileSync("cmd", ["/c", command, ...args], opts);
+    }
+    return execFileSync(command, args, opts);
+}
 /**
  * Candidate executable names for the Claude Code CLI.
  *
@@ -24,42 +43,44 @@ const CLAUDE_COMMAND = process.platform === "win32" ? "claude.cmd" : "claude";
  * installed" results in readiness checks.
  */
 const CLAUDE_COMMAND_CANDIDATES = process.platform === "win32" ? [CLAUDE_COMMAND, "claude.exe", "claude"] : [CLAUDE_COMMAND];
-// Codes treated as "this candidate didn't run — try the next one" rather than
-// fatal failures. ENOENT/EINVAL cover the original Windows .cmd shim cases.
-// ETIMEDOUT and EAGAIN cover slow-spawn cases where cmd.exe wrapping plus
-// the Claude CLI startup path together exceed the per-attempt timeout
-// (Issue #4997 regression on Windows + Node 25).
-const SOFT_FAIL_CODES = new Set(["ENOENT", "EINVAL", "ETIMEDOUT", "EAGAIN"]);
 // Keep the version probe snappy — `claude --version` is a quick path.
 const VERSION_TIMEOUT_MS = 5_000;
 // Auth status can be much slower on Windows because the spawn goes through
 // cmd.exe → claude.cmd → node → Claude CLI. 15s leaves headroom on cold spawns
 // without making startup feel hung when the CLI is genuinely missing.
 const AUTH_TIMEOUT_MS = 15_000;
+function debugLog(...parts) {
+    if (process.env.GSD_CLAUDE_DEBUG) {
+        process.stderr.write(`[claude-readiness] ${parts.map((p) => (typeof p === "string" ? p : JSON.stringify(p))).join(" ")}\n`);
+    }
+}
 /**
- * Run the requested Claude CLI command against each supported executable name.
- * Returns the first successful output buffer and rethrows hard failures.
+ * Find the first candidate that responds to `--version`. Returns the
+ * candidate name on success, null if none worked.
+ *
+ * On Windows with `cmd /c`, a missing candidate surfaces as a
+ * non-zero exit from cmd.exe rather than ENOENT — so we cannot rely on
+ * the error code to decide "try next". Treat any failure as "try next"
+ * for the version probe; the only thing that matters for binary
+ * detection is whether *some* candidate produces a `claude --version`
+ * line.
  */
-function execClaude(args, timeoutMs) {
-    let lastError;
+function findWorkingCommand() {
     for (const command of CLAUDE_COMMAND_CANDIDATES) {
         try {
-            return execFileSync(command, args, {
-                timeout: timeoutMs,
+            spawnClaude(command, ["--version"], {
+                timeout: VERSION_TIMEOUT_MS,
                 stdio: "pipe",
-                shell: process.platform === "win32",
             });
+            debugLog("version probe ok via", command);
+            return command;
         }
         catch (error) {
-            lastError = error;
-            const code = error?.code;
-            if (code && SOFT_FAIL_CODES.has(code)) {
-                continue;
-            }
-            throw error;
+            debugLog("version probe failed for", command, "code=", error?.code);
+            continue;
         }
     }
-    throw lastError ?? new Error(`Claude CLI executable not found (tried: ${CLAUDE_COMMAND_CANDIDATES.join(", ")})`);
+    return null;
 }
 /**
  * Decide auth state from `claude auth status` output.
@@ -71,6 +92,8 @@ function execClaude(args, timeoutMs) {
  */
 function parseAuthStatus(output) {
     const trimmed = output.trim();
+    if (!trimmed)
+        return null;
     if (trimmed.startsWith("{")) {
         try {
             const parsed = JSON.parse(trimmed);
@@ -86,8 +109,39 @@ function parseAuthStatus(output) {
     if (/not logged in|no credentials|unauthenticated|not authenticated/.test(lower)) {
         return false;
     }
-    // Exit-0 with non-error output and no negative markers — treat as authed.
-    return true;
+    if (/logged in|authenticated|signed in|email|subscription/.test(lower)) {
+        return true;
+    }
+    return null;
+}
+function probeAuth(command) {
+    // Try --json first (newer CLIs).
+    try {
+        const out = spawnClaude(command, ["auth", "status", "--json"], {
+            timeout: AUTH_TIMEOUT_MS,
+            stdio: "pipe",
+        }).toString();
+        debugLog("auth status --json output:", out.slice(0, 200));
+        const parsed = parseAuthStatus(out);
+        if (parsed !== null)
+            return parsed;
+    }
+    catch (error) {
+        debugLog("auth status --json threw:", error.message?.slice(0, 200));
+    }
+    // Fallback: plain `auth status` (older CLIs that don't accept --json).
+    try {
+        const out = spawnClaude(command, ["auth", "status"], {
+            timeout: AUTH_TIMEOUT_MS,
+            stdio: "pipe",
+        }).toString();
+        debugLog("auth status output:", out.slice(0, 200));
+        return parseAuthStatus(out);
+    }
+    catch (error) {
+        debugLog("auth status threw:", error.message?.slice(0, 200));
+        return null;
+    }
 }
 let cachedBinaryPresent = null;
 let cachedAuthed = null;
@@ -104,33 +158,23 @@ function refreshCache() {
     }
     // Set timestamp first to prevent re-entrant checks during the same window
     lastCheckMs = now;
-    // Check binary presence
-    try {
-        execClaude(["--version"], VERSION_TIMEOUT_MS);
-        cachedBinaryPresent = true;
-    }
-    catch {
+    const command = findWorkingCommand();
+    if (!command) {
         cachedBinaryPresent = false;
         cachedAuthed = false;
         return;
     }
-    // Request JSON explicitly so older CLI builds that defaulted to text and
-    // newer builds that default to JSON produce a consistent shape.
-    try {
-        const output = execClaude(["auth", "status", "--json"], AUTH_TIMEOUT_MS).toString();
-        cachedAuthed = parseAuthStatus(output);
-    }
-    catch (error) {
-        const code = error?.code;
-        // Spawn-shape failures (timeout, transient) shouldn't be treated as
-        // "definitely not authed" — leave the previous value if we have one,
-        // otherwise default to false. The version probe already established
-        // the binary works, so a flaky auth probe is more likely transient.
-        if (code && SOFT_FAIL_CODES.has(code) && cachedAuthed !== null) {
-            return;
-        }
-        cachedAuthed = false;
+    cachedBinaryPresent = true;
+    const authed = probeAuth(command);
+    if (authed === null) {
+        // Couldn't determine auth state from CLI output. Don't clobber a
+        // previously known-good cache; otherwise default to false so we don't
+        // silently route requests to an unauthenticated CLI.
+        if (cachedAuthed === null)
+            cachedAuthed = false;
+        return;
     }
+    cachedAuthed = authed;
 }
 /**
  * Whether the `claude` binary is installed (regardless of auth state).

package/dist/resources/extensions/google-search/index.js

@@ -1,7 +1,3 @@
-export default function (pi) {
-    pi.on("session_start", async (_event, ctx) => {
-        ctx.ui.notify("google_search is being extracted to @gsd-extensions/google-search " +
-            "(not yet published to npm). This stub will be replaced once the " +
-            "package is available. No action needed for now.", "warning");
-    });
+export default function (_pi) {
+    // Deprecation notice intentionally suppressed until @gsd-extensions/google-search ships.
 }

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

@@ -163,6 +163,17 @@ function resolveDispatchNodeKind(unitType, sidecarItem) {
     }
     return "unit";
 }
+async function enforceMinRequestInterval(s, prefs) {
+    const minInterval = prefs?.min_request_interval_ms ?? 0;
+    if (minInterval > 0 && s.lastRequestTimestamp > 0) {
+        const elapsed = Date.now() - s.lastRequestTimestamp;
+        if (elapsed < minInterval) {
+            const waitMs = minInterval - elapsed;
+            debugLog("autoLoop", { phase: "rate-limit-wait", waitMs });
+            await new Promise(r => setTimeout(r, waitMs));
+        }
+    }
+}
 async function runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState, sidecarItem) {
     if (dispatchContract === "legacy-direct") {
         return runUnitPhase(ic, iterData, loopState, sidecarItem);
@@ -392,7 +403,13 @@ export async function autoLoop(ctx, pi, s, deps, options) {
                     break;
                 }
                 // ── Unit execution (shared with dev path) ──
+                await enforceMinRequestInterval(s, prefs);
                 const unitPhaseResult = await runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState);
+                if (unitPhaseResult.action === "next") {
+                    const requestTimestamp = unitPhaseResult.data.requestDispatchedAt ?? unitPhaseResult.data.unitStartedAt;
+                    if (typeof requestTimestamp === "number")
+                        s.lastRequestTimestamp = requestTimestamp;
+                }
                 deps.uokObserver?.onPhaseResult("unit", unitPhaseResult.action, {
                     unitType: iterData.unitType,
                     unitId: iterData.unitId,
@@ -555,7 +572,13 @@ export async function autoLoop(ctx, pi, s, deps, options) {
                     sidecarKind: sidecarItem.kind,
                 });
             }
+            await enforceMinRequestInterval(s, prefs);
             const unitPhaseResult = await runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState, sidecarItem);
+            if (unitPhaseResult.action === "next") {
+                const requestTimestamp = unitPhaseResult.data.requestDispatchedAt ?? unitPhaseResult.data.unitStartedAt;
+                if (typeof requestTimestamp === "number")
+                    s.lastRequestTimestamp = requestTimestamp;
+            }
             deps.uokObserver?.onPhaseResult("unit", unitPhaseResult.action, {
                 unitType: iterData.unitType,
                 unitId: iterData.unitId,

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

@@ -11,6 +11,7 @@ import { MAX_RECOVERY_CHARS, BUDGET_THRESHOLDS, MAX_FINALIZE_TIMEOUTS, } from ".
 import { detectStuck } from "./detect-stuck.js";
 import { runUnit } from "./run-unit.js";
 import { debugLog } from "../debug-logger.js";
+import { resolveWorktreeProjectRoot } from "../worktree-root.js";
 import { PROJECT_FILES, hasProjectFileInAncestor } from "../detection.js";
 import { MergeConflictError } from "../git-service.js";
 import { setCurrentPhase, clearCurrentPhase } from "../../shared/gsd-phase-state.js";
@@ -48,11 +49,7 @@ export function resetSessionTimeoutState() {
  * Exported for testing as _resolveReportBasePath.
  */
 export function _resolveReportBasePath(s) {
-    // Strip /.gsd/worktrees/ suffix when basePath is itself a worktree path and
-    // originalBasePath is falsy — prevents reports landing in the worktree (#3729).
-    const resolved = s.originalBasePath || s.basePath;
-    const markerIdx = resolved.indexOf("/.gsd/worktrees/");
-    return markerIdx !== -1 ? resolved.slice(0, markerIdx) : resolved;
+    return resolveWorktreeProjectRoot(s.basePath, s.originalBasePath);
 }
 /**
  * Resolve the authoritative project base for dispatch guards.
@@ -60,12 +57,7 @@ export function _resolveReportBasePath(s) {
  * unit is running inside an auto worktree.
  */
 export function _resolveDispatchGuardBasePath(s) {
-    // Strip /.gsd/worktrees/ suffix when basePath is itself a worktree path and
-    // originalBasePath is falsy — prevents guard checks running against the
-    // worktree instead of the project root (#3729).
-    const resolved = s.originalBasePath || s.basePath;
-    const markerIdx = resolved.indexOf("/.gsd/worktrees/");
-    return markerIdx !== -1 ? resolved.slice(0, markerIdx) : resolved;
+    return resolveWorktreeProjectRoot(s.basePath, s.originalBasePath);
 }
 const PLAN_V2_GATE_PHASES = new Set([
     "executing",
@@ -1365,7 +1357,7 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
                 ctx.ui.notify(`${unitType} ${unitId} completed with 0 tool calls — context exhaustion, will retry`, "warning");
                 // Fall through to next iteration where dispatch will re-derive
                 // and re-dispatch this unit.
-                return { action: "next", data: { unitStartedAt: s.currentUnit?.startedAt } };
+                return { action: "next", data: { unitStartedAt: s.currentUnit?.startedAt, requestDispatchedAt: unitResult.requestDispatchedAt } };
             }
         }
     }
@@ -1418,7 +1410,7 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         }
         s.checkpointSha = null;
     }
-    return { action: "next", data: { unitStartedAt: s.currentUnit?.startedAt } };
+    return { action: "next", data: { unitStartedAt: s.currentUnit?.startedAt, requestDispatchedAt: unitResult.requestDispatchedAt } };
 }
 // ─── runFinalize ──────────────────────────────────────────────────────────────
 /**