gsd-pi 2.77.0-dev.58d3d4d6c → 2.77.0-dev.cfd69e714

package/dist/resources/extensions/gsd/auto-worktree.js

@@ -45,6 +45,67 @@ const ROOT_STATE_FILES = [
     // Back-sync (worktree → main) must NEVER overwrite the project root's copy
     // because the project root is authoritative for preferences (#2684).
 ];
+/**
+ * Pop a stash entry by tracking the unique marker embedded in its message so
+ * concurrent stash operations against the same project root cannot cause us to
+ * pop the wrong entry.
+ *
+ * If `stashMarker` is null or no longer present in the stash list (e.g. a
+ * concurrent process popped/dropped it), leaves the stash list untouched and
+ * returns null.
+ *
+ * Throws on pop failure so callers can handle conflict cases the same way
+ * they would with the prior `git stash pop` form. When throwing after a
+ * targeted pop attempt, the error is annotated with the targeted stash ref.
+ *
+ * (Issue #4980 HIGH-6)
+ */
+function popStashByRef(basePath, stashMarker) {
+    let popArg = null;
+    if (stashMarker) {
+        try {
+            const list = execFileSync("git", ["stash", "list", "--format=%gd%x00%s"], {
+                cwd: basePath,
+                stdio: ["ignore", "pipe", "pipe"],
+                encoding: "utf-8",
+            }).trim().split("\n").filter(Boolean);
+            for (const entry of list) {
+                const [ref, subject] = entry.split("\0");
+                if (ref && subject?.includes(stashMarker)) {
+                    popArg = ref;
+                    break;
+                }
+            }
+        }
+        catch (err) {
+            logWarning("worktree", `stash list lookup failed; leaving stash untouched: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    if (!popArg) {
+        logWarning("worktree", "recorded stash entry could not be resolved; skipping automatic pop");
+        return null;
+    }
+    try {
+        execFileSync("git", ["stash", "pop", popArg], {
+            cwd: basePath,
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+        });
+    }
+    catch (err) {
+        if (err && typeof err === "object") {
+            err.stashRef = popArg;
+        }
+        throw err;
+    }
+    return popArg;
+}
+function stashRefFromError(err) {
+    if (!err || typeof err !== "object")
+        return null;
+    const stashRef = err.stashRef;
+    return typeof stashRef === "string" && stashRef.length > 0 ? stashRef : null;
+}
 /**
  * Check if two filesystem paths resolve to the same real location.
  * Returns false if either path cannot be resolved (e.g. doesn't exist).
@@ -828,6 +889,27 @@ export function enterBranchModeForMilestone(basePath, milestoneId) {
         const startPoint = integrationBranch ??
             validatedPrefBranch ??
             nativeDetectMainBranch(basePath);
+        // TOCTOU ancestry guard (Issue #4980 HIGH-3).
+        //
+        // The outer `branchExists` check at line 1012 is racy: a concurrent
+        // process (parallel-orchestrator worker, side-by-side `gsd` instance,
+        // or manual `git branch` invocation) may have created the branch with
+        // real commits between that check and this point. `nativeBranchForceReset`
+        // does `git branch -f`, which silently overwrites the branch ref —
+        // orphaning any commits not reachable from `startPoint`. Re-check
+        // immediately before the destructive call and refuse if the branch
+        // suddenly exists with non-ancestor commits.
+        //
+        // Note: under single-threaded execution this is rarely reached, but it
+        // is NOT dead code — it is the only barrier against a TOCTOU-induced
+        // commit loss in this code path.
+        const concurrentlyCreated = nativeBranchExists(basePath, branch);
+        if (concurrentlyCreated &&
+            !nativeIsAncestor(basePath, branch, startPoint)) {
+            throw new GSDError(GSD_GIT_ERROR, `Branch "${branch}" was created concurrently with commits not reachable from "${startPoint}". ` +
+                `Refusing to force-reset — would orphan prior work. ` +
+                `Resume the existing milestone or run \`git branch -D ${branch}\` to discard.`);
+        }
         // nativeBranchForceReset creates (or resets) branch at startPoint,
         // then checkout switches HEAD to it.
         nativeBranchForceReset(basePath, branch, startPoint);
@@ -1345,7 +1427,17 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
     clearProjectRootStateFiles(originalBasePath_, milestoneId);
     // 5. Checkout integration branch (skip if already current — avoids git error
     //    when main is already checked out in the project-root worktree, #757)
+    //
+    // Refuse to proceed if the project root is in detached HEAD state. Silently
+    // running `nativeCheckoutBranch(mainBranch)` on a detached HEAD would
+    // abandon the user's deliberately-checked-out commit (mid-bisect, reviewing
+    // a tag, CI checkout-sha) without warning. (Issue #4980 HIGH-10)
     const currentBranchAtBase = nativeGetCurrentBranch(originalBasePath_);
+    if (!currentBranchAtBase || currentBranchAtBase.length === 0) {
+        process.chdir(previousCwd);
+        throw new GSDError(GSD_GIT_ERROR, `Project root is in detached HEAD state — cannot perform milestone merge. ` +
+            `Checkout an integration branch (e.g. \`git checkout ${mainBranch}\`) before resuming.`);
+    }
     if (currentBranchAtBase !== mainBranch) {
         nativeCheckoutBranch(originalBasePath_, mainBranch);
     }
@@ -1534,6 +1626,11 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
         }
     }
     let stashed = false;
+    // Embed a unique marker in the stash message so subsequent pop/drop targets
+    // the entry we created, not whatever happens to be at stash@{0} (concurrent
+    // milestone merges share the project-root stash list and can shift positions).
+    // (Issue #4980 HIGH-6)
+    let stashMarker = null;
     try {
         const status = execFileSync("git", ["status", "--porcelain"], {
             cwd: originalBasePath_,
@@ -1541,7 +1638,8 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             encoding: "utf-8",
         }).trim();
         if (status) {
-            execFileSync("git", ["stash", "push", "--include-untracked", "-m", `gsd: pre-merge stash for ${milestoneId}`], { cwd: originalBasePath_, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
+            stashMarker = `gsd-pre-merge:${milestoneId}:${process.pid}:${Date.now()}:${process.hrtime.bigint().toString(36)}`;
+            execFileSync("git", ["stash", "push", "--include-untracked", "-m", `gsd: pre-merge stash for ${milestoneId} [${stashMarker}]`], { cwd: originalBasePath_, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
             stashed = true;
         }
     }
@@ -1597,11 +1695,7 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             // Pop stash before throwing so local work is not lost.
             if (stashed) {
                 try {
-                    execFileSync("git", ["stash", "pop"], {
-                        cwd: originalBasePath_,
-                        stdio: ["ignore", "pipe", "pipe"],
-                        encoding: "utf-8",
-                    });
+                    popStashByRef(originalBasePath_, stashMarker);
                 }
                 catch (err) { /* stash pop conflict is non-fatal */
                     logWarning("worktree", `git stash pop failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -1669,11 +1763,7 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                 // Pop stash before throwing so local work is not lost (#2151).
                 if (stashed) {
                     try {
-                        execFileSync("git", ["stash", "pop"], {
-                            cwd: originalBasePath_,
-                            stdio: ["ignore", "pipe", "pipe"],
-                            encoding: "utf-8",
-                        });
+                        popStashByRef(originalBasePath_, stashMarker);
                     }
                     catch (err) { /* stash pop conflict is non-fatal */
                         logWarning("worktree", `git stash pop failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -1716,14 +1806,12 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
     // or the commit content.  Conflict on pop is non-fatal — the stash entry is
     // preserved and the user can resolve manually with `git stash pop`.
     if (stashed) {
+        let stashRefForDrop = null;
         try {
-            execFileSync("git", ["stash", "pop"], {
-                cwd: originalBasePath_,
-                stdio: ["ignore", "pipe", "pipe"],
-                encoding: "utf-8",
-            });
+            stashRefForDrop = popStashByRef(originalBasePath_, stashMarker);
         }
         catch (e) {
+            stashRefForDrop = stashRefFromError(e);
             logWarning("worktree", `git stash pop failed, attempting conflict resolution: ${e.message}`);
             // Stash pop after squash merge can conflict on .gsd/ state files that
             // diverged between branches.  Left unresolved, these UU entries block
@@ -1751,25 +1839,33 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                     }
                 }
             }
-            if (nonGsdUU.length === 0) {
+            if (gsdUU.length > 0 && nonGsdUU.length === 0) {
                 // All conflicts were .gsd/ files — safe to drop the stash
-                try {
-                    execFileSync("git", ["stash", "drop"], {
-                        cwd: originalBasePath_,
-                        stdio: ["ignore", "pipe", "pipe"],
-                        encoding: "utf-8",
-                    });
+                if (stashRefForDrop) {
+                    try {
+                        execFileSync("git", ["stash", "drop", stashRefForDrop], {
+                            cwd: originalBasePath_,
+                            stdio: ["ignore", "pipe", "pipe"],
+                            encoding: "utf-8",
+                        });
+                    }
+                    catch (err) { /* stash may already be consumed */
+                        logWarning("worktree", `git stash drop failed: ${err instanceof Error ? err.message : String(err)}`);
+                    }
                 }
-                catch (err) { /* stash may already be consumed */
-                    logWarning("worktree", `git stash drop failed: ${err instanceof Error ? err.message : String(err)}`);
+                else {
+                    logWarning("worktree", "recorded stash entry could not be resolved; skipping automatic drop");
                 }
             }
-            else {
+            else if (nonGsdUU.length > 0) {
                 // Non-.gsd conflicts remain — leave stash for manual resolution
                 logWarning("reconcile", "Stash pop conflict on non-.gsd files after merge", {
                     files: nonGsdUU.join(", "),
                 });
             }
+            else {
+                logWarning("worktree", "git stash pop failed without resolvable conflict files; leaving stash for manual recovery");
+            }
         }
     }
     // 9a-iii. Restore sheltered queued milestone directories (#2505).

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

@@ -24,9 +24,9 @@ import { acquireSessionLock, getSessionLockStatus, releaseSessionLock, updateSes
 import { resolveAutoSupervisorConfig, loadEffectiveGSDPreferences, getIsolationMode, } from "./preferences.js";
 import { sendDesktopNotification } from "./notifications.js";
 import { getBudgetAlertLevel, getNewBudgetAlertLevel, getBudgetEnforcementAction, } from "./auto-budget.js";
-import { markToolStart as _markToolStart, markToolEnd as _markToolEnd, getOldestInFlightToolAgeMs as _getOldestInFlightToolAgeMs, clearInFlightTools, isToolInvocationError, isQueuedUserMessageSkip, } from "./auto-tool-tracking.js";
+import { markToolStart as _markToolStart, markToolEnd as _markToolEnd, getOldestInFlightToolAgeMs as _getOldestInFlightToolAgeMs, clearInFlightTools, isToolInvocationError, isQueuedUserMessageSkip, isDeterministicPolicyError, } from "./auto-tool-tracking.js";
 import { closeoutUnit } from "./auto-unit-closeout.js";
-import { selectAndApplyModel, resolveModelId } from "./auto-model-selection.js";
+import { selectAndApplyModel, resolveModelId, clearToolBaseline } from "./auto-model-selection.js";
 import { resetRoutingHistory, recordOutcome } from "./routing-history.js";
 import { resetHookState, runPreDispatchHooks, restoreHookState, clearPersistedHookState, } from "./post-unit-hooks.js";
 import { runGSDDoctor, rebuildState } from "./doctor.js";
@@ -82,7 +82,7 @@ import { WorktreeResolver, } from "./worktree-resolver.js";
 import { reorderForCaching } from "./prompt-ordering.js";
 // ─── Session State ─────────────────────────────────────────────────────────
 import { AutoSession, } from "./auto/session.js";
-export { MAX_UNIT_DISPATCHES, STUB_RECOVERY_THRESHOLD, MAX_LIFETIME_DISPATCHES, NEW_SESSION_TIMEOUT_MS, } from "./auto/session.js";
+export { STUB_RECOVERY_THRESHOLD, NEW_SESSION_TIMEOUT_MS, } from "./auto/session.js";
 // ── ENCAPSULATION INVARIANT ─────────────────────────────────────────────────
 // ALL mutable auto-mode state lives in the AutoSession class (auto/session.ts).
 // This file must NOT declare module-level `let` or `var` variables for state.
@@ -163,6 +163,13 @@ function normalizeSessionFilePath(raw) {
         return null;
     return candidate;
 }
+function synthesizePausedSessionRecovery(basePath, unitType, unitId, sessionFile) {
+    const activityDir = join(gsdRoot(basePath), "activity");
+    return synthesizeCrashRecovery(basePath, unitType, unitId, sessionFile, activityDir);
+}
+export function _synthesizePausedSessionRecoveryForTest(basePath, unitType, unitId, sessionFile) {
+    return synthesizePausedSessionRecovery(basePath, unitType, unitId, sessionFile);
+}
 export function startAutoDetached(ctx, pi, base, verboseMode, options) {
     void startAuto(ctx, pi, base, verboseMode, options).catch((err) => {
         const message = getErrorMessage(err);
@@ -320,13 +327,15 @@ export function markToolEnd(toolCallId) {
 /**
  * Record a tool invocation error on the current session (#2883).
  * Called from tool_execution_end when a GSD tool fails with isError.
- * Only stores the error if it matches the tool-invocation-error pattern
- * (malformed/truncated JSON), not normal business-logic errors.
+ * Stores the error if it matches:
+ *   - tool-invocation-error pattern (malformed/truncated JSON)
+ *   - queued-user-message skip pattern
+ *   - deterministic policy rejection (#4973, e.g. context_write_blocked)
  */
 export function recordToolInvocationError(toolName, errorMsg) {
     if (!s.active)
         return;
-    if (isToolInvocationError(errorMsg) || isQueuedUserMessageSkip(errorMsg)) {
+    if (isToolInvocationError(errorMsg) || isQueuedUserMessageSkip(errorMsg) || isDeterministicPolicyError(errorMsg)) {
         s.lastToolInvocationError = `${toolName}: ${errorMsg}`;
     }
 }
@@ -813,6 +822,12 @@ export async function stopAuto(ctx, pi, reason) {
             initHealthWidget(ctx);
         restoreProjectRootEnv();
         restoreMilestoneLockEnv();
+        // Drop the active-tool baseline so a subsequent /gsd auto run on the
+        // same `pi` instance recaptures from the live tool set rather than
+        // restoring this session's snapshot and silently undoing any tool
+        // changes the user made between sessions (#4959 / CodeRabbit).
+        if (pi)
+            clearToolBaseline(pi);
         // Reset all session state in one call
         s.reset();
     }
@@ -1060,6 +1075,15 @@ export async function startAuto(ctx, pi, base, verboseMode, options) {
         debugLog("startAuto", { phase: "already-active", skipping: true });
         return;
     }
+    // On a *fresh* start, drop any stale active-tool baseline left by a prior
+    // auto session that didn't run stopAuto cleanly.  Skip on resume: pauseAuto
+    // leaves the last provider-trimmed active tools in place, so clearing here
+    // would let the next selectAndApplyModel recapture that already-narrowed
+    // set as the new baseline — exactly the cross-unit poisoning this PR is
+    // fixing (#4959 / CodeRabbit Major).  The pre-pause baseline survives in
+    // the WeakMap keyed by `pi`.
+    if (!s.paused)
+        clearToolBaseline(pi);
     const requestedStepMode = options?.step ?? false;
     const interruptedAssessment = options?.interrupted ?? null;
     if (options?.milestoneLock !== undefined) {
@@ -1217,18 +1241,6 @@ export async function startAuto(ctx, pi, base, verboseMode, options) {
             ctx.ui.notify(`Cannot resume: ${resumeLock.reason}`, "error");
             return;
         }
-        // Lock acquired — now safe to delete the pause file
-        if (s.pausedSessionFile) {
-            try {
-                unlinkSync(s.pausedSessionFile);
-            }
-            catch (err) {
-                if (err.code !== "ENOENT") {
-                    logWarning("session", `pause file cleanup failed: ${err instanceof Error ? err.message : String(err)}`, { file: "auto.ts" });
-                }
-            }
-            s.pausedSessionFile = null;
-        }
         s.paused = false;
         s.active = true;
         s.verbose = verboseMode;
@@ -1317,8 +1329,7 @@ export async function startAuto(ctx, pi, base, verboseMode, options) {
         }
         invalidateAllCaches();
         if (s.pausedSessionFile) {
-            const activityDir = join(gsdRoot(s.basePath), "activity");
-            const recovery = synthesizeCrashRecovery(s.basePath, s.currentUnit?.type ?? s.pausedUnitType ?? "unknown", s.currentUnit?.id ?? s.pausedUnitId ?? "unknown", s.pausedSessionFile ?? undefined, activityDir);
+            const recovery = synthesizePausedSessionRecovery(s.basePath, s.currentUnit?.type ?? s.pausedUnitType ?? "unknown", s.currentUnit?.id ?? s.pausedUnitId ?? "unknown", s.pausedSessionFile);
             if (recovery && recovery.trace.toolCallCount > 0) {
                 s.pendingCrashRecovery = recovery.prompt;
                 ctx.ui.notify(`Recovered ${recovery.trace.toolCallCount} tool calls from paused session. Resuming with context.`, "info");

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

@@ -12,7 +12,15 @@ import { classifyError, createRetryState, resetRetryState, isTransient, } from "
 import { blockModel, isModelBlocked } from "../blocked-models.js";
 const retryState = createRetryState();
 const MAX_NETWORK_RETRIES = 2;
-const MAX_TRANSIENT_AUTO_RESUMES = 8;
+/**
+ * Cap on auto-resume attempts for sustained transient-provider errors.
+ *
+ * Exported so tests assert against the shared constant instead of
+ * regex-scraping the source literal (see #4837). Raising this value to
+ * handle longer provider overloads should update the single constant; the
+ * test in provider-errors.test.ts consumes it directly.
+ */
+export const MAX_TRANSIENT_AUTO_RESUMES = 8;
 /**
  * Reset the module-level retry state so a resumed auto-session starts fresh.
  * Called by provider-error-resume.ts before startAuto() — without this, the

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

@@ -462,6 +462,9 @@ export function registerDbTools(pi) {
             definitionOfDone: Type.Optional(Type.Array(Type.String(), { description: "Definition of done bullets" })),
             requirementCoverage: Type.Optional(Type.String({ description: "Requirement coverage text" })),
             boundaryMapMarkdown: Type.Optional(Type.String({ description: "Boundary map markdown block" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'plan-phase complete')" })),
         }),
         execute: planMilestoneExecute,
     };
@@ -503,6 +506,9 @@ export function registerDbTools(pi) {
             proofLevel: Type.Optional(Type.String({ description: "Slice proof level" })),
             integrationClosure: Type.Optional(Type.String({ description: "Slice integration closure" })),
             observabilityImpact: Type.Optional(Type.String({ description: "Slice observability impact" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'plan-phase complete')" })),
         }),
         execute: planSliceExecute,
     };
@@ -569,6 +575,9 @@ export function registerDbTools(pi) {
             inputs: Type.Array(Type.String(), { description: "Input files or references" }),
             expectedOutput: Type.Array(Type.String(), { description: "Expected output files or artifacts" }),
             observabilityImpact: Type.Optional(Type.String({ description: "Task observability impact" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'plan-phase complete')" })),
         }),
         execute: planTaskExecute,
     };
@@ -628,6 +637,9 @@ export function registerDbTools(pi) {
                 }),
                 Type.String({ description: "Fallback: verification summary string" }),
             ]), { description: "Array of verification evidence entries" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'task verified after retry')" })),
         }),
         execute: taskCompleteExecute,
     };
@@ -705,6 +717,9 @@ export function registerDbTools(pi) {
                 }),
                 Type.String({ description: "Fallback: slice ID string" }),
             ]), { description: "Upstream slice dependencies consumed" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'all tasks verified')" })),
         }),
         execute: sliceCompleteExecute,
     };
@@ -826,6 +841,9 @@ export function registerDbTools(pi) {
             lessonsLearned: Type.Optional(Type.Array(Type.String(), { description: "Lessons learned during the milestone" })),
             followUps: Type.Optional(Type.String({ description: "Follow-up items for future milestones" })),
             deviations: Type.Optional(Type.String({ description: "Deviations from the original plan" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'milestone validation passed')" })),
         }),
         execute: milestoneCompleteExecute,
     };
@@ -897,6 +915,9 @@ export function registerDbTools(pi) {
                 expectedOutput: Type.Array(Type.String(), { description: "Expected output files or artifacts" }),
             }), { description: "Tasks to upsert (update existing or insert new)" }),
             removedTaskIds: Type.Array(Type.String(), { description: "Task IDs to remove from the slice" }),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'blocker discovered during execution')" })),
         }),
         execute: replanSliceExecute,
     };
@@ -941,11 +962,199 @@ export function registerDbTools(pi) {
                 }), { description: "New slices to add" }),
                 removed: Type.Array(Type.String(), { description: "Slice IDs to remove" }),
             }, { description: "Slice changes to apply" }),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'slice S01 completed, reassessing remaining roadmap')" })),
         }),
         execute: reassessRoadmapExecute,
     };
     pi.registerTool(reassessRoadmapTool);
     registerAlias(pi, reassessRoadmapTool, "gsd_roadmap_reassess", "gsd_reassess_roadmap");
+    // ─── 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) => {
+        const dbAvailable = await ensureDbOpen();
+        if (!dbAvailable) {
+            return {
+                content: [{ type: "text", text: "Error: GSD database is not available. Cannot reopen task." }],
+                details: { operation: "reopen_task", error: "db_unavailable" },
+            };
+        }
+        try {
+            const { handleReopenTask } = await import("../tools/reopen-task.js");
+            const result = await handleReopenTask(params, process.cwd());
+            if ("error" in result) {
+                return {
+                    content: [{ type: "text", text: `Error reopening task: ${result.error}` }],
+                    details: { operation: "reopen_task", error: result.error },
+                };
+            }
+            return {
+                content: [{ type: "text", text: `Reopened task ${result.taskId} (${result.sliceId}/${result.milestoneId})` }],
+                details: {
+                    operation: "reopen_task",
+                    milestoneId: result.milestoneId,
+                    sliceId: result.sliceId,
+                    taskId: result.taskId,
+                },
+            };
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            logError("tool", `reopen_task tool failed: ${msg}`, { tool: "gsd_task_reopen", error: String(err) });
+            return {
+                content: [{ type: "text", text: `Error reopening task: ${msg}` }],
+                details: { operation: "reopen_task", error: msg },
+            };
+        }
+    };
+    const reopenTaskTool = {
+        name: "gsd_task_reopen",
+        label: "Reopen Task",
+        description: "Reset a completed task back to 'pending' so it can be re-done. Cleans up SUMMARY.md so the DB-filesystem reconciler does not auto-correct the task back to complete. " +
+            "Both the parent slice and milestone must still be open — use gsd_slice_reopen first if the slice has been closed.",
+        promptSnippet: "Reopen a completed GSD task (resets status to pending, removes SUMMARY.md)",
+        promptGuidelines: [
+            "Use gsd_task_reopen when a completed task needs to be re-done (e.g. verification missed a regression, requirements changed).",
+            "Will fail if the parent slice or milestone is already closed — reopen those first.",
+            "Will fail if the task is not currently 'complete' — there is nothing to reopen.",
+            "Use the canonical name gsd_task_reopen; gsd_reopen_task is only an alias.",
+        ],
+        parameters: Type.Object({
+            milestoneId: Type.String({ description: "Milestone ID (e.g. M001)" }),
+            sliceId: Type.String({ description: "Slice ID (e.g. S01)" }),
+            taskId: Type.String({ description: "Task ID (e.g. T01)" }),
+            reason: Type.Optional(Type.String({ description: "Why the task is being reopened (recorded in the audit trail)" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'regression discovered post-completion')" })),
+        }),
+        execute: reopenTaskExecute,
+    };
+    pi.registerTool(reopenTaskTool);
+    registerAlias(pi, reopenTaskTool, "gsd_reopen_task", "gsd_task_reopen");
+    // ─── gsd_slice_reopen (gsd_reopen_slice alias) ─────────────────────────
+    const reopenSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
+        const dbAvailable = await ensureDbOpen();
+        if (!dbAvailable) {
+            return {
+                content: [{ type: "text", text: "Error: GSD database is not available. Cannot reopen slice." }],
+                details: { operation: "reopen_slice", error: "db_unavailable" },
+            };
+        }
+        try {
+            const { handleReopenSlice } = await import("../tools/reopen-slice.js");
+            const result = await handleReopenSlice(params, process.cwd());
+            if ("error" in result) {
+                return {
+                    content: [{ type: "text", text: `Error reopening slice: ${result.error}` }],
+                    details: { operation: "reopen_slice", error: result.error },
+                };
+            }
+            return {
+                content: [{ type: "text", text: `Reopened slice ${result.sliceId} (${result.milestoneId}); reset ${result.tasksReset} task(s) to pending.` }],
+                details: {
+                    operation: "reopen_slice",
+                    milestoneId: result.milestoneId,
+                    sliceId: result.sliceId,
+                    tasksReset: result.tasksReset,
+                },
+            };
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            logError("tool", `reopen_slice tool failed: ${msg}`, { tool: "gsd_slice_reopen", error: String(err) });
+            return {
+                content: [{ type: "text", text: `Error reopening slice: ${msg}` }],
+                details: { operation: "reopen_slice", error: msg },
+            };
+        }
+    };
+    const reopenSliceTool = {
+        name: "gsd_slice_reopen",
+        label: "Reopen Slice",
+        description: "Reset a completed slice back to 'in_progress' and reset ALL of its tasks back to 'pending'. Cleans up SUMMARY.md / UAT.md and per-task summaries. " +
+            "Reopening a slice means re-doing the work — partial resets create ambiguous state, so all tasks are reset.",
+        promptSnippet: "Reopen a completed GSD slice (resets all tasks to pending, removes summaries)",
+        promptGuidelines: [
+            "Use gsd_slice_reopen when a completed slice needs to be re-done (e.g. integration issue surfaced, requirements changed).",
+            "All tasks within the slice are reset to 'pending' — there is no partial-reopen.",
+            "Will fail if the parent milestone is already closed — reopen the milestone first.",
+            "Will fail if the slice is not currently 'complete' — there is nothing to reopen.",
+            "Use the canonical name gsd_slice_reopen; gsd_reopen_slice is only an alias.",
+        ],
+        parameters: Type.Object({
+            milestoneId: Type.String({ description: "Milestone ID (e.g. M001)" }),
+            sliceId: Type.String({ description: "Slice ID (e.g. S01)" }),
+            reason: Type.Optional(Type.String({ description: "Why the slice is being reopened (recorded in the audit trail)" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'cross-slice regression discovered')" })),
+        }),
+        execute: reopenSliceExecute,
+    };
+    pi.registerTool(reopenSliceTool);
+    registerAlias(pi, reopenSliceTool, "gsd_reopen_slice", "gsd_slice_reopen");
+    // ─── gsd_milestone_reopen (gsd_reopen_milestone alias) ─────────────────
+    const reopenMilestoneExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
+        const dbAvailable = await ensureDbOpen();
+        if (!dbAvailable) {
+            return {
+                content: [{ type: "text", text: "Error: GSD database is not available. Cannot reopen milestone." }],
+                details: { operation: "reopen_milestone", error: "db_unavailable" },
+            };
+        }
+        try {
+            const { handleReopenMilestone } = await import("../tools/reopen-milestone.js");
+            const result = await handleReopenMilestone(params, process.cwd());
+            if ("error" in result) {
+                return {
+                    content: [{ type: "text", text: `Error reopening milestone: ${result.error}` }],
+                    details: { operation: "reopen_milestone", error: result.error },
+                };
+            }
+            return {
+                content: [{ type: "text", text: `Reopened milestone ${result.milestoneId}; reset ${result.slicesReset} slice(s) and ${result.tasksReset} task(s).` }],
+                details: {
+                    operation: "reopen_milestone",
+                    milestoneId: result.milestoneId,
+                    slicesReset: result.slicesReset,
+                    tasksReset: result.tasksReset,
+                },
+            };
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            logError("tool", `reopen_milestone tool failed: ${msg}`, { tool: "gsd_milestone_reopen", error: String(err) });
+            return {
+                content: [{ type: "text", text: `Error reopening milestone: ${msg}` }],
+                details: { operation: "reopen_milestone", error: msg },
+            };
+        }
+    };
+    const reopenMilestoneTool = {
+        name: "gsd_milestone_reopen",
+        label: "Reopen Milestone",
+        description: "Reset a closed milestone back to 'active', all of its slices to 'in_progress', and all tasks to 'pending'. " +
+            "Cleans up MILESTONE-SUMMARY.md, slice summaries, and task summaries so the DB-filesystem reconciler does not auto-correct status back to complete.",
+        promptSnippet: "Reopen a closed GSD milestone (resets slices and tasks, removes summaries)",
+        promptGuidelines: [
+            "Use gsd_milestone_reopen when a closed milestone needs to be re-done (e.g. validation failure surfaced after closure).",
+            "All slices reset to 'in_progress' and all tasks reset to 'pending' — no partial reopen.",
+            "Will fail if the milestone is not currently closed — there is nothing to reopen.",
+            "Use the canonical name gsd_milestone_reopen; gsd_reopen_milestone is only an alias.",
+        ],
+        parameters: Type.Object({
+            milestoneId: Type.String({ description: "Milestone ID (e.g. M001)" }),
+            reason: Type.Optional(Type.String({ description: "Why the milestone is being reopened (recorded in the audit trail)" })),
+            // Single-writer v3 audit trail (Stream 2): caller-provided actor identity + causation.
+            actorName: Type.Optional(Type.String({ description: "Caller-provided actor identity for the audit trail (e.g. 'executor-01', 'gsd-orchestrator')" })),
+            triggerReason: Type.Optional(Type.String({ description: "Caller-provided reason this action was triggered (e.g. 'post-closure validation failure')" })),
+        }),
+        execute: reopenMilestoneExecute,
+    };
+    pi.registerTool(reopenMilestoneTool);
+    registerAlias(pi, reopenMilestoneTool, "gsd_reopen_milestone", "gsd_milestone_reopen");
     // ─── gsd_save_gate_result ──────────────────────────────────────────────
     const saveGateResultExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         return executeSaveGateResult(params, process.cwd());

package/dist/resources/extensions/gsd/bootstrap/provider-error-resume.js

@@ -1,10 +1,8 @@
 import { getAutoDashboardData, startAuto } from "../auto.js";
 import { resetTransientRetryState } from "./agent-end-recovery.js";
-import { resetSessionTimeoutState } from "../auto/phases.js";
 const defaultDeps = {
     getSnapshot: () => getAutoDashboardData(),
     resetTransientRetryState,
-    resetSessionTimeoutState,
     startAuto,
 };
 export async function resumeAutoAfterProviderDelay(pi, ctx, deps = defaultDeps) {
@@ -17,11 +15,10 @@ export async function resumeAutoAfterProviderDelay(pi, ctx, deps = defaultDeps)
         ctx.ui.notify("Provider error recovery delay elapsed, but no paused auto-mode base path was available. Leaving auto-mode paused.", "warning");
         return "missing-base";
     }
-    // Reset retry counters before restarting — without this, counters
-    // accumulate across pause/resume cycles and permanently lock out
-    // auto-resume after their respective MAX thresholds.
+    // Reset provider-error retry state before restarting. Session-creation
+    // timeout state intentionally survives delayed resumes so the bounded
+    // auto-resume limit cannot be reset into an infinite pause/resume loop.
     deps.resetTransientRetryState();
-    deps.resetSessionTimeoutState();
     await deps.startAuto(ctx, pi, snapshot.basePath, false, { step: snapshot.stepMode });
     return "resumed";
 }