@opengsd/gsd-pi 1.2.0 → 1.3.0-dev.65546769

package/dist/resources/extensions/gsd/bootstrap/agent-end-recovery.js

@@ -2,7 +2,7 @@
 import { logWarning } from "../workflow-logger.js";
 import { checkDeepProjectSetupAfterTurn, checkAutoStartAfterDiscuss, maybeHandleReadyPhraseWithoutFiles, maybeHandleEmptyIntentTurn, resetEmptyTurnCounter, } from "../guided-flow.js";
 import { clearPathCache } from "../paths.js";
-import { getAutoDashboardData, getAutoModeStartModel, isAutoActive, isAutoCompletionStopInProgress, pauseAuto, setCurrentDispatchedModelId, } from "../auto.js";
+import { getAutoDashboardData, getAutoModeStartModel, isAutoActive, isAutoCompletionStopInProgress, pauseAuto, setCurrentDispatchedModelId, setCurrentUnitModelForRecovery, } from "../auto.js";
 import { getNextFallbackModel, resolveModelWithFallbacksForUnit } from "../preferences.js";
 import { pauseAutoForProviderError } from "../provider-error-pause.js";
 import { isSessionSwitchAbortGraceActive, isSessionSwitchInFlight, resolveAgentEnd, resolveAgentEndCancelled, } from "../auto/resolve.js";
@@ -10,12 +10,14 @@ import { shouldIgnoreAgentEndForActiveUnit } from "../auto/unit-runner-events.js
 import { resolveModelId } from "../auto-model-selection.js";
 import { resolveProjectRoot } from "../worktree.js";
 import { clearDiscussionFlowState } from "./write-gate.js";
+import { scheduleFallbackContinuation } from "./fallback-continuation.js";
 import { clearGuidedUnitContext } from "../guided-unit-context.js";
 import { resumeAutoAfterProviderDelay } from "./provider-error-resume.js";
 import { classifyError, createRetryState, resetRetryState, isTransient, } from "../error-classifier.js";
-import { blockModel, isModelBlocked } from "../blocked-models.js";
+import { blockModel, blockModelUntil, isModelBlocked, isModelTemporarilyUnavailable } from "../blocked-models.js";
 import { getProjectGSDPreferencesPath } from "../preferences.js";
-import { formatProviderErrorGuidance, resolveProviderErrorGuidance, } from "../provider-error-guidance.js";
+import { resolveProviderErrorGuidance } from "../provider-error-guidance.js";
+import { formatGuidance } from "../guidance.js";
 const retryState = createRetryState();
 const MAX_NETWORK_RETRIES = 2;
 function isObjectRecord(value) {
@@ -95,12 +97,15 @@ async function tryProviderModelFallback(params) {
             if (!nextModelId)
                 break;
             const candidate = resolveModelId(nextModelId, availableModels, rejectedProvider);
-            if (candidate && !isModelBlocked(basePath, candidate.provider, candidate.id)) {
+            if (candidate &&
+                !isModelBlocked(basePath, candidate.provider, candidate.id) &&
+                !isModelTemporarilyUnavailable(basePath, candidate.provider, candidate.id)) {
                 const ok = await pi.setModel(candidate, { persist: false });
                 if (ok) {
+                    setCurrentUnitModelForRecovery(candidate);
                     setCurrentDispatchedModelId({ provider: candidate.provider, id: candidate.id });
                     switchedNotify(`${candidate.provider}/${candidate.id}`);
-                    pi.sendMessage({ customType: "gsd-auto-timeout-recovery", content: "Continue execution.", display: false }, { triggerTurn: true });
+                    scheduleFallbackContinuation(pi);
                     return true;
                 }
             }
@@ -110,14 +115,16 @@ async function tryProviderModelFallback(params) {
     const sessionModel = getAutoModeStartModel();
     if (sessionModel &&
         !(sessionModel.provider === rejectedProvider && sessionModel.id === rejectedId) &&
-        !isModelBlocked(basePath, sessionModel.provider, sessionModel.id)) {
+        !isModelBlocked(basePath, sessionModel.provider, sessionModel.id) &&
+        !isModelTemporarilyUnavailable(basePath, sessionModel.provider, sessionModel.id)) {
         const startModel = availableModels.find((m) => m.provider === sessionModel.provider && m.id === sessionModel.id);
         if (startModel) {
             const ok = await pi.setModel(startModel, { persist: false });
             if (ok) {
+                setCurrentUnitModelForRecovery(startModel);
                 setCurrentDispatchedModelId({ provider: startModel.provider, id: startModel.id });
                 switchedNotify(`${startModel.provider}/${startModel.id}`);
-                pi.sendMessage({ customType: "gsd-auto-timeout-recovery", content: "Continue execution.", display: false }, { triggerTurn: true });
+                scheduleFallbackContinuation(pi);
                 return true;
             }
         }
@@ -486,7 +493,7 @@ export async function handleAgentEnd(pi, event, ctx) {
                 preferencesPath: dash.basePath ? getProjectGSDPreferencesPath(dash.basePath) : undefined,
                 hasConfiguredFallbacks: (modelConfig?.fallbacks.length ?? 0) > 0,
             });
-            const guidanceText = formatProviderErrorGuidance(guidance);
+            const guidanceText = formatGuidance(guidance);
             await pauseForProviderModelRejection(ctx, pi, {
                 errorDetail,
                 rawErrorMsg,
@@ -513,7 +520,27 @@ export async function handleAgentEnd(pi, event, ctx) {
         if (shouldDeferTransientErrorToCoreRetry(cls, rawErrorMsg)) {
             return;
         }
+        // ── Tool-schema overload: the active model repeatedly emitted tool-call
+        //    arguments that fail schema validation (e.g. a model whose tool-call
+        //    grammar can't satisfy GSD's schemas). Before hard-pausing, try the
+        //    unit's configured fallbacks and the auto-mode start model — the model
+        //    the user actually selected. This lets auto-mode recover by switching
+        //    back to a schema-capable model instead of aborting outright (#813).
+        //    Do not persistently block the model: schema-overload is request-shape
+        //    specific, mirroring the model-error path above.
         if (cls.kind === "tool-schema") {
+            const dash = getAutoDashboardData();
+            const switched = await tryProviderModelFallback({
+                ctx,
+                pi,
+                rejectedProvider: ctx.model?.provider,
+                rejectedId: ctx.model?.id,
+                basePath: dash.basePath,
+                unitType: dash.currentUnit?.type,
+                switchedNotify: (label) => ctx.ui.notify(`Switched to ${label} after repeated tool schema validation failures.`, "warning"),
+            });
+            if (switched)
+                return;
             await pauseAutoForProviderError(ctx.ui, errorDetail, () => pauseAuto(ctx, pi, {
                 message: `Tool schema error${errorDetail}`,
                 category: "tool-schema",
@@ -525,13 +552,19 @@ export async function handleAgentEnd(pi, event, ctx) {
             });
             return;
         }
-        // Cap rate-limit backoff for CLI-style providers (openai-codex, google-gemini-cli)
+        // Cap rate-limit backoff for CLI-style providers (openai-codex, google-gemini-cli, google-antigravity)
         // which use per-user quotas with shorter windows (#2922).
         if (cls.kind === "rate-limit") {
             const currentProvider = ctx.model?.provider;
-            if (currentProvider === "openai-codex" || currentProvider === "google-gemini-cli") {
+            if (currentProvider === "openai-codex"
+                || currentProvider === "google-gemini-cli"
+                || currentProvider === "google-antigravity") {
                 cls.retryAfterMs = Math.min(cls.retryAfterMs, 30_000);
             }
+            const dash = getAutoDashboardData();
+            if (dash.basePath && ctx.model?.provider && ctx.model?.id) {
+                blockModelUntil(dash.basePath, ctx.model.provider, ctx.model.id, Date.now() + cls.retryAfterMs, rawErrorMsg || displayMsg || "rate limit");
+            }
         }
         // ── 2. Decide & Act ──────────────────────────────────────────────────
         // --- Network errors: same-model retry with backoff ---
@@ -560,46 +593,22 @@ export async function handleAgentEnd(pi, event, ctx) {
         // --- Transient errors: try model fallback first, then pause ---
         // Rate limits are often per-model, so switching models can bypass them.
         if (cls.kind === "rate-limit" || cls.kind === "network" || cls.kind === "server" || cls.kind === "connection" || cls.kind === "stream") {
-            // Try model fallback
             const dash = getAutoDashboardData();
-            if (dash.currentUnit) {
-                const modelConfig = resolveModelWithFallbacksForUnit(dash.currentUnit.type);
-                if (modelConfig && modelConfig.fallbacks.length > 0) {
-                    const availableModels = ctx.modelRegistry.getAvailable();
-                    const nextModelId = getNextFallbackModel(ctx.model?.id, modelConfig);
-                    if (nextModelId) {
-                        retryState.networkRetryCount = 0;
-                        retryState.currentRetryModelId = undefined;
-                        const modelToSet = resolveModelId(nextModelId, availableModels, ctx.model?.provider);
-                        if (modelToSet) {
-                            const ok = await pi.setModel(modelToSet, { persist: false });
-                            if (ok) {
-                                setCurrentDispatchedModelId({ provider: modelToSet.provider, id: modelToSet.id });
-                                ctx.ui.notify(`Model error${errorDetail}. Switched to fallback: ${nextModelId} and resuming.`, "warning");
-                                pi.sendMessage({ customType: "gsd-auto-timeout-recovery", content: "Continue execution.", display: false }, { triggerTurn: true });
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-            // Try restoring session model
-            const sessionModel = getAutoModeStartModel();
-            if (sessionModel) {
-                if (ctx.model?.id !== sessionModel.id || ctx.model?.provider !== sessionModel.provider) {
-                    const startModel = ctx.modelRegistry.getAvailable().find((m) => m.provider === sessionModel.provider && m.id === sessionModel.id);
-                    if (startModel) {
-                        const ok = await pi.setModel(startModel, { persist: false });
-                        if (ok) {
-                            setCurrentDispatchedModelId({ provider: startModel.provider, id: startModel.id });
-                            retryState.networkRetryCount = 0;
-                            retryState.currentRetryModelId = undefined;
-                            ctx.ui.notify(`Model error${errorDetail}. Restored session model: ${sessionModel.provider}/${sessionModel.id} and resuming.`, "warning");
-                            pi.sendMessage({ customType: "gsd-auto-timeout-recovery", content: "Continue execution.", display: false }, { triggerTurn: true });
-                            return;
-                        }
-                    }
-                }
+            const switched = await tryProviderModelFallback({
+                ctx,
+                pi,
+                rejectedProvider: ctx.model?.provider,
+                rejectedId: ctx.model?.id,
+                basePath: dash.basePath,
+                unitType: dash.currentUnit?.type,
+                switchedNotify: (label) => {
+                    retryState.networkRetryCount = 0;
+                    retryState.currentRetryModelId = undefined;
+                    ctx.ui.notify(`Model error${errorDetail}. Switched to fallback: ${label} and resuming.`, "warning");
+                },
+            });
+            if (switched) {
+                return;
             }
         }
         // --- Transient fallback: pause with auto-resume ---

package/dist/resources/extensions/gsd/bootstrap/db-tools.js

@@ -10,6 +10,7 @@ import { logError } from "../workflow-logger.js";
 import { getErrorMessage } from "../error-utils.js";
 import { incrementLegacyTelemetry } from "../legacy-telemetry.js";
 import { prepareSaveGateResultArguments } from "../tools/save-gate-result-args.js";
+import { aliasesForWorkflowTool } from "../workflow-tool-surface.js";
 async function loadWorkflowExecutors() {
     return importWorkflowExecutorsModule();
 }
@@ -41,6 +42,13 @@ function registerAlias(pi, toolDef, aliasName, canonicalName) {
         execute,
     });
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- toolDef shape matches ToolDefinition but varies by schema
+function registerWorkflowTool(pi, toolDef) {
+    pi.registerTool(toolDef);
+    for (const alias of aliasesForWorkflowTool(toolDef.name)) {
+        registerAlias(pi, toolDef, alias, toolDef.name);
+    }
+}
 function requirementRootWriteGuard(operation, basePath) {
     const guard = shouldBlockRootArtifactSaveInSnapshot(loadWriteGateSnapshot(basePath), "REQUIREMENTS");
     if (!guard.block)
@@ -155,8 +163,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(decisionSaveTool);
-    registerAlias(pi, decisionSaveTool, "gsd_save_decision", "gsd_decision_save");
+    registerWorkflowTool(pi, decisionSaveTool);
     // ─── gsd_requirement_update (formerly gsd_update_requirement) ───────────
     const requirementUpdateExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -241,8 +248,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(requirementUpdateTool);
-    registerAlias(pi, requirementUpdateTool, "gsd_update_requirement", "gsd_requirement_update");
+    registerWorkflowTool(pi, requirementUpdateTool);
     // ─── gsd_requirement_save ─────────────────────────────────────────────
     const requirementSaveExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -340,8 +346,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(requirementSaveTool);
-    registerAlias(pi, requirementSaveTool, "gsd_save_requirement", "gsd_requirement_save");
+    registerWorkflowTool(pi, requirementSaveTool);
     // ─── gsd_summary_save (formerly gsd_save_summary) ──────────────────────
     const summarySaveExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         try {
@@ -397,8 +402,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(summarySaveTool);
-    registerAlias(pi, summarySaveTool, "gsd_save_summary", "gsd_summary_save");
+    registerWorkflowTool(pi, summarySaveTool);
     // ─── gsd_uat_result_save ─────────────────────────────────────────────────
     const uatResultSaveExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeUatResultSave } = await loadWorkflowExecutors();
@@ -480,7 +484,7 @@ export function registerDbTools(pi) {
             return new Text(theme.fg("success", `UAT ${d?.sliceId ?? ""}: ${d?.verdict ?? "saved"}`), 0, 0);
         },
     };
-    pi.registerTool(uatResultSaveTool);
+    registerWorkflowTool(pi, uatResultSaveTool);
     // ─── gsd_milestone_generate_id (formerly gsd_generate_milestone_id) ────
     const milestoneGenerateIdExecute = async (_toolCallId, _params, _signal, _onUpdate, _ctx) => {
         try {
@@ -566,8 +570,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(milestoneGenerateIdTool);
-    registerAlias(pi, milestoneGenerateIdTool, "gsd_generate_milestone_id", "gsd_milestone_generate_id");
+    registerWorkflowTool(pi, milestoneGenerateIdTool);
     // ─── gsd_plan_milestone (gsd_milestone_plan alias) ─────────────────────
     const planMilestoneExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executePlanMilestone } = await loadWorkflowExecutors();
@@ -633,8 +636,7 @@ export function registerDbTools(pi) {
         }),
         execute: planMilestoneExecute,
     };
-    pi.registerTool(planMilestoneTool);
-    registerAlias(pi, planMilestoneTool, "gsd_milestone_plan", "gsd_plan_milestone");
+    registerWorkflowTool(pi, planMilestoneTool);
     // ─── gsd_plan_slice (gsd_slice_plan alias) ─────────────────────────────
     const planSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executePlanSlice } = await loadWorkflowExecutors();
@@ -678,8 +680,7 @@ export function registerDbTools(pi) {
         }),
         execute: planSliceExecute,
     };
-    pi.registerTool(planSliceTool);
-    registerAlias(pi, planSliceTool, "gsd_slice_plan", "gsd_plan_slice");
+    registerWorkflowTool(pi, planSliceTool);
     // ─── gsd_plan_task (gsd_task_plan alias) ───────────────────────────────
     const planTaskExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -748,8 +749,7 @@ export function registerDbTools(pi) {
         }),
         execute: planTaskExecute,
     };
-    pi.registerTool(planTaskTool);
-    registerAlias(pi, planTaskTool, "gsd_task_plan", "gsd_plan_task");
+    registerWorkflowTool(pi, planTaskTool);
     // ─── gsd_task_complete (gsd_complete_task alias) ────────────────────────
     const taskCompleteExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeTaskComplete } = await loadWorkflowExecutors();
@@ -809,8 +809,7 @@ export function registerDbTools(pi) {
         }),
         execute: taskCompleteExecute,
     };
-    pi.registerTool(taskCompleteTool);
-    registerAlias(pi, taskCompleteTool, "gsd_complete_task", "gsd_task_complete");
+    registerWorkflowTool(pi, taskCompleteTool);
     // ─── gsd_slice_complete (gsd_complete_slice alias) ─────────────────────
     const sliceCompleteExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeSliceComplete } = await loadWorkflowExecutors();
@@ -875,8 +874,7 @@ export function registerDbTools(pi) {
         }),
         execute: sliceCompleteExecute,
     };
-    pi.registerTool(sliceCompleteTool);
-    registerAlias(pi, sliceCompleteTool, "gsd_complete_slice", "gsd_slice_complete");
+    registerWorkflowTool(pi, sliceCompleteTool);
     // ─── gsd_skip_slice (#3477 / #3487) ───────────────────────────────────
     const skipSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -941,7 +939,7 @@ export function registerDbTools(pi) {
             };
         }
     };
-    pi.registerTool({
+    registerWorkflowTool(pi, {
         name: "gsd_skip_slice",
         label: "Skip Slice",
         description: "Mark a slice as skipped so auto-mode advances past it without executing. " +
@@ -1000,8 +998,7 @@ export function registerDbTools(pi) {
         }),
         execute: milestoneCompleteExecute,
     };
-    pi.registerTool(milestoneCompleteTool);
-    registerAlias(pi, milestoneCompleteTool, "gsd_milestone_complete", "gsd_complete_milestone");
+    registerWorkflowTool(pi, milestoneCompleteTool);
     // ─── gsd_validate_milestone (gsd_milestone_validate alias) ─────────────
     const milestoneValidateExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeValidateMilestone } = await loadWorkflowExecutors();
@@ -1035,8 +1032,7 @@ export function registerDbTools(pi) {
         }),
         execute: milestoneValidateExecute,
     };
-    pi.registerTool(milestoneValidateTool);
-    registerAlias(pi, milestoneValidateTool, "gsd_milestone_validate", "gsd_validate_milestone");
+    registerWorkflowTool(pi, milestoneValidateTool);
     // ─── gsd_replan_slice (gsd_slice_replan alias) ─────────────────────────
     const replanSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeReplanSlice } = await loadWorkflowExecutors();
@@ -1078,8 +1074,7 @@ export function registerDbTools(pi) {
         }),
         execute: replanSliceExecute,
     };
-    pi.registerTool(replanSliceTool);
-    registerAlias(pi, replanSliceTool, "gsd_slice_replan", "gsd_replan_slice");
+    registerWorkflowTool(pi, replanSliceTool);
     // ─── gsd_reassess_roadmap (gsd_roadmap_reassess alias) ─────────────────
     const reassessRoadmapExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeReassessRoadmap } = await loadWorkflowExecutors();
@@ -1126,8 +1121,7 @@ export function registerDbTools(pi) {
         }),
         execute: reassessRoadmapExecute,
     };
-    pi.registerTool(reassessRoadmapTool);
-    registerAlias(pi, reassessRoadmapTool, "gsd_roadmap_reassess", "gsd_reassess_roadmap");
+    registerWorkflowTool(pi, reassessRoadmapTool);
     // ─── gsd_task_reopen (gsd_reopen_task alias) ───────────────────────────
     // Single-writer v3, Stream 3: reversibility tools for closed units.
     const reopenTaskExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
@@ -1190,8 +1184,7 @@ export function registerDbTools(pi) {
         }),
         execute: reopenTaskExecute,
     };
-    pi.registerTool(reopenTaskTool);
-    registerAlias(pi, reopenTaskTool, "gsd_reopen_task", "gsd_task_reopen");
+    registerWorkflowTool(pi, reopenTaskTool);
     // ─── gsd_slice_reopen (gsd_reopen_slice alias) ─────────────────────────
     const reopenSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -1253,8 +1246,7 @@ export function registerDbTools(pi) {
         }),
         execute: reopenSliceExecute,
     };
-    pi.registerTool(reopenSliceTool);
-    registerAlias(pi, reopenSliceTool, "gsd_reopen_slice", "gsd_slice_reopen");
+    registerWorkflowTool(pi, reopenSliceTool);
     // ─── gsd_milestone_reopen (gsd_reopen_milestone alias) ─────────────────
     const reopenMilestoneExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -1314,8 +1306,7 @@ export function registerDbTools(pi) {
         }),
         execute: reopenMilestoneExecute,
     };
-    pi.registerTool(reopenMilestoneTool);
-    registerAlias(pi, reopenMilestoneTool, "gsd_reopen_milestone", "gsd_milestone_reopen");
+    registerWorkflowTool(pi, reopenMilestoneTool);
     // ─── gsd_save_gate_result ──────────────────────────────────────────────
     const saveGateResultExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeSaveGateResult } = await loadWorkflowExecutors();
@@ -1378,5 +1369,5 @@ export function registerDbTools(pi) {
             return new Text(theme.fg(color, `${d.gateId}: ${d.verdict}`), 0, 0);
         },
     };
-    pi.registerTool(saveGateResultTool);
+    registerWorkflowTool(pi, saveGateResultTool);
 }

package/dist/resources/extensions/gsd/bootstrap/dynamic-tools.js

@@ -2,13 +2,13 @@
 // File Purpose: Registers workspace-aware dynamic filesystem and shell tools.
 import { existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import { createBashTool, createEditTool, createReadTool, createWriteTool } from "@gsd/pi-coding-agent";
-import { DEFAULT_BASH_TIMEOUT_SECS } from "../constants.js";
-import { setLogBasePath, logWarning } from "../workflow-logger.js";
-import { resolveGsdPathContract } from "../paths.js";
+import { logWarning } from "../workflow-logger.js";
+import { getWorkflowDatabaseStatus, openWorkflowDatabase, } from "../db-workspace.js";
 import { getAutoWorktreePath } from "../auto-worktree.js";
 import { resolveWorktreeProjectRoot } from "../worktree-root.js";
+import { worktreesDirs } from "../worktree-placement.js";
 export function safeWorkspaceCwd() {
     try {
         return process.cwd();
@@ -42,78 +42,102 @@ export function resolveWorkflowToolBasePath(ctx, scope) {
             return worktree;
     }
     else {
-        const worktreesDir = join(projectRoot, ".gsd", "worktrees");
-        if (existsSync(worktreesDir)) {
+        const live = [];
+        for (const worktreesDir of worktreesDirs(projectRoot)) {
+            if (!existsSync(worktreesDir))
+                continue;
             try {
-                const live = readdirSync(worktreesDir)
+                live.push(...readdirSync(worktreesDir)
                     .map((name) => join(worktreesDir, name))
-                    .filter((p) => existsSync(join(p, ".git")));
-                if (live.length === 1)
-                    return live[0];
+                    .filter((p) => existsSync(join(p, ".git"))));
             }
             catch (err) {
                 logWarning("bootstrap", `resolveWorkflowToolBasePath: failed to scan worktrees: ${err instanceof Error ? err.message : String(err)}`);
             }
         }
+        if (live.length === 1)
+            return live[0];
     }
     return cwd;
 }
-/**
- * Resolve the correct DB path for the current working directory.
- * If `basePath` is inside a `.gsd/worktrees/<MID>/` directory, returns
- * the project root's `.gsd/gsd.db` (shared WAL — R012). Otherwise
- * returns `<basePath>/.gsd/gsd.db`.
- */
-export function resolveProjectRootDbPath(basePath) {
-    return resolveGsdPathContract(basePath).projectDb;
+export { resolveProjectRootDbPath } from "../db-workspace.js";
+function sqliteProviderHint(status, nodeVersion) {
+    if (status.provider)
+        return `Provider: ${status.provider}.`;
+    const major = Number.parseInt(nodeVersion.split(".")[0] ?? "", 10);
+    if (Number.isFinite(major) && major < 22) {
+        return (`No SQLite provider available. Upgrade Node to >= 22.0.0 (current: v${nodeVersion}), ` +
+            "use the packaged GSD runtime, or install/restore better-sqlite3 in this runtime.");
+    }
+    return ("No SQLite provider available. Use a Node build with node:sqlite enabled, " +
+        "run the packaged GSD runtime, or install/restore better-sqlite3 in this runtime.");
 }
-export async function ensureDbOpen(basePath = safeWorkspaceCwd()) {
-    try {
-        const db = await import("../gsd-db.js");
-        const contract = resolveGsdPathContract(basePath);
-        const dbPath = contract.projectDb;
-        const gsdDir = contract.projectGsd;
-        const projectRoot = dirname(dirname(dbPath));
-        // Open existing DB file (may be at project root for worktrees)
-        if (existsSync(dbPath)) {
-            const opened = db.openDatabase(dbPath);
-            if (opened)
-                setLogBasePath(projectRoot);
-            return opened;
-        }
-        // No DB file — create an empty authoritative DB. Markdown migration is
-        // explicit-only; runtime startup must not import projections into state.
-        if (existsSync(gsdDir)) {
-            const opened = db.openDatabase(dbPath);
-            if (opened)
-                setLogBasePath(projectRoot);
-            return opened;
-        }
-        logWarning("bootstrap", "ensureDbOpen failed — no .gsd directory found");
-        return false;
+function dbOpenPhaseHint(status) {
+    if (status.lastPhase === "open")
+        return "The database file could not be opened";
+    if (status.lastPhase === "initSchema")
+        return "The database schema could not be initialized";
+    if (status.lastPhase === "vacuum-recovery")
+        return "Corruption recovery (VACUUM) failed";
+    if (status.attempted)
+        return "The database could not be opened";
+    return "The database provider could not be loaded";
+}
+export function formatWorkflowDatabaseOpenFailure(result, status, nodeVersion = process.versions.node) {
+    if (result.reason === "missing-gsd-dir") {
+        return `ensureDbOpen failed — no .gsd directory found at ${result.location.projectGsd}`;
     }
-    catch (err) {
-        logWarning("bootstrap", `ensureDbOpen failed: ${err.message ?? String(err)}`);
-        return false;
+    if (result.reason === "missing-database") {
+        return `ensureDbOpen failed — no GSD database found at ${result.location.projectDb}`;
     }
+    const resolvedStatus = status ?? getWorkflowDatabaseStatus();
+    const detail = result.error?.message ?? resolvedStatus.lastError?.message ?? "";
+    const detailSuffix = detail ? ` (${detail})` : "";
+    return (`ensureDbOpen failed for ${result.location.projectDb}: ` +
+        `${dbOpenPhaseHint(resolvedStatus)}${detailSuffix}. ${sqliteProviderHint(resolvedStatus, nodeVersion)}`);
+}
+export async function ensureDbOpen(basePath = safeWorkspaceCwd()) {
+    const result = openWorkflowDatabase(basePath);
+    if (result.ok)
+        return true;
+    logWarning("bootstrap", formatWorkflowDatabaseOpenFailure(result));
+    return false;
 }
 export function registerDynamicTools(pi) {
     const fallbackRoot = safeWorkspaceCwd();
     const baseBash = createBashTool(fallbackRoot, {
         spawnHook: (ctx) => ctx,
     });
+    // The auto-mode stalled-tool watchdog only exists in GSD/auto-mode, so the
+    // watchdog verbiage is injected here (the GSD-registered tool) rather than in
+    // core bash.ts, which is reused by non-GSD embeddings that have no watchdog.
+    const WATCHDOG_DETAIL = "Genuine hangs are caught by the auto-mode stalled-tool watchdog (stalled: 5m / idle: 10m / soft: 20m / hard: 30m).";
+    const gsdBashDescription = `${baseBash.description} ${WATCHDOG_DETAIL}`;
+    const gsdBashParameters = (() => {
+        const params = baseBash.parameters;
+        if (!params?.properties?.timeout)
+            return params;
+        return {
+            ...params,
+            properties: {
+                ...params.properties,
+                timeout: {
+                    ...params.properties.timeout,
+                    description: `${params.properties.timeout.description} ${WATCHDOG_DETAIL}`,
+                },
+            },
+        };
+    })();
     const dynamicBash = {
         ...baseBash,
+        description: gsdBashDescription,
+        parameters: gsdBashParameters,
         execute: async (toolCallId, params, signal, onUpdate, ctx) => {
             const basePath = resolveCtxCwd(ctx);
             const fresh = createBashTool(basePath, {
                 spawnHook: (spawnCtx) => ({ ...spawnCtx, cwd: basePath }),
             });
-            const paramsWithTimeout = {
-                ...params,
-                timeout: params.timeout ?? DEFAULT_BASH_TIMEOUT_SECS,
-            };
-            return fresh.execute(toolCallId, paramsWithTimeout, signal, onUpdate, ctx);
+            return fresh.execute(toolCallId, params, signal, onUpdate, ctx);
         },
     };
     pi.registerTool(dynamicBash);

package/dist/resources/extensions/gsd/bootstrap/exec-tools.js

@@ -114,8 +114,8 @@ export function registerExecTools(pi) {
         ],
         parameters: Type.Object({
             query: Type.Optional(Type.String({ description: "Substring matched against id and purpose (case-insensitive)." })),
-            runtime: Type.Optional(Type.Union([Type.Literal("bash"), Type.Literal("node"), Type.Literal("python")], {
-                description: "Restrict to one runtime.",
+            runtime: Type.Optional(Type.String({
+                description: "Restrict to one runtime: bash, node, or python.",
             })),
             failing_only: Type.Optional(Type.Boolean({ description: "Only non-zero exit codes and timeouts." })),
             limit: Type.Optional(Type.Number({ description: "Max results (default 20, cap 200)", minimum: 1, maximum: 200 })),

package/dist/resources/extensions/gsd/bootstrap/fallback-continuation.js

@@ -0,0 +1,25 @@
+// gsd-pi + src/resources/extensions/gsd/bootstrap/fallback-continuation.ts - Dispatches the post-fallback-switch continuation on a fresh turn.
+// Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
+/**
+ * Dispatch the post-fallback continuation on a *fresh* turn after the current
+ * run settles.
+ *
+ * #804: At `agent_end` time the agent's run is still tearing down — its
+ * `isStreaming` flag stays `true` until `finishRun()` clears it in the `finally`
+ * block that fires *after* the awaited `agent_end` listeners return (see
+ * pi-agent-core/src/agent.ts processEvents comment). A synchronous
+ * `sendMessage({ triggerTurn: true, deliverAs: "steer" })` from inside that
+ * listener is therefore routed down the `isStreaming` branch and queued as a
+ * steering message against the turn that just errored out — which is never
+ * consumed, so the fallback model is selected but no new turn ever starts (the
+ * reported symptom: "switched but work stays stopped").
+ *
+ * Deferring to a macrotask lets `finishRun()` flip `isStreaming` to `false`
+ * first; the plain `triggerTurn` (no `deliverAs`) then dispatches a fresh turn
+ * on the freshly-selected fallback model, mirroring the network-retry path.
+ */
+export function scheduleFallbackContinuation(pi) {
+    setTimeout(() => {
+        pi.sendMessage({ customType: "gsd-auto-timeout-recovery", content: "Continue execution.", display: false }, { triggerTurn: true });
+    }, 0);
+}

package/dist/resources/extensions/gsd/bootstrap/query-tools.js

@@ -3,6 +3,7 @@
 // gsd-pi — Read-only query tools exposing DB state to the LLM via the WAL connection
 import { Type } from "@sinclair/typebox";
 import { ensureDbOpen, resolveCtxCwd } from "./dynamic-tools.js";
+import { checkpointWorkflowDatabase } from "../db-workspace.js";
 export function registerQueryTools(pi) {
     pi.registerTool({
         name: "gsd_milestone_status",
@@ -50,8 +51,7 @@ export function registerQueryTools(pi) {
                     details: { operation: "checkpoint_db", error: "db_unavailable" },
                 };
             }
-            const { checkpointDatabase } = await import("../gsd-db.js");
-            checkpointDatabase();
+            checkpointWorkflowDatabase();
             return {
                 content: [{ type: "text", text: "WAL checkpoint complete. gsd.db is now up to date and safe to stage with git add." }],
                 details: { operation: "checkpoint_db", status: "ok" },