gsd-pi 2.80.0-dev.3065f7bfa → 2.80.0-dev.488219eb6

package/dist/resources/extensions/gsd/db/unit-dispatches.js

@@ -26,6 +26,58 @@ function isAlreadyActiveConstraintError(err) {
     }
     return /\bUNIQUE\b|\bconstraint failed\b/i.test(msg);
 }
+function settleStaleActiveDispatchForUnit(input, now) {
+    const db = _getAdapter();
+    const active = db.prepare(`SELECT id, status, worker_id, milestone_lease_token
+     FROM unit_dispatches
+     WHERE unit_id = :unit_id
+       AND status IN ('claimed','running')
+     ORDER BY id DESC
+     LIMIT 1`).get({ ":unit_id": input.unitId });
+    if (!active)
+        return;
+    if (active.worker_id === input.workerId &&
+        active.milestone_lease_token === input.milestoneLeaseToken) {
+        return;
+    }
+    const reason = "stale-dispatch-lease-takeover";
+    const result = db.prepare(`UPDATE unit_dispatches
+     SET status = 'canceled',
+         ended_at = :ended_at,
+         exit_reason = :reason
+     WHERE id = :id
+       AND status IN ('claimed','running')
+       AND (worker_id != :worker_id OR milestone_lease_token != :token)`).run({
+        ":id": active.id,
+        ":ended_at": now,
+        ":reason": reason,
+        ":worker_id": input.workerId,
+        ":token": input.milestoneLeaseToken,
+    });
+    const changes = typeof result.changes === "number"
+        ? result.changes
+        : 0;
+    if (changes < 1)
+        return;
+    insertAuditEvent({
+        eventId: randomUUID(),
+        traceId: input.traceId,
+        turnId: input.turnId ?? undefined,
+        category: "orchestration",
+        type: "dispatch-stale-canceled",
+        ts: now,
+        payload: {
+            dispatchId: active.id,
+            unitId: input.unitId,
+            priorStatus: active.status,
+            priorWorkerId: active.worker_id,
+            priorMilestoneLeaseToken: active.milestone_lease_token,
+            takeoverWorkerId: input.workerId,
+            takeoverMilestoneLeaseToken: input.milestoneLeaseToken,
+            reason,
+        },
+    });
+}
 /**
  * Insert a new dispatch row in `claimed` state. Atomic guard against
  * double-claim (B2): the partial unique index
@@ -58,6 +110,7 @@ export function recordDispatchClaim(input) {
                 milestoneLeaseToken: input.milestoneLeaseToken,
             };
         }
+        settleStaleActiveDispatchForUnit(input, now);
         try {
             const result = db.prepare(`INSERT INTO unit_dispatches (
           trace_id, turn_id, worker_id, milestone_lease_token,

package/dist/resources/extensions/gsd/git-service.js

@@ -1,3 +1,5 @@
+// Project/App: GSD-2
+// File Purpose: Git operations, commit-message formatting, and turn git actions.
 /**
  * GSD Git Service
  *
@@ -49,6 +51,10 @@ export function buildTaskCommitMessage(ctx) {
             .join("\n");
         bodyParts.push(fileLines);
     }
+    const contextLines = buildTaskCommitContextLines(ctx);
+    if (contextLines.length > 0) {
+        bodyParts.push(`GSD context:\n${contextLines.join("\n")}`);
+    }
     // Trailers: GSD-Task first, then Resolves
     bodyParts.push(`GSD-Task: ${ctx.taskId}`);
     if (ctx.issueNumber) {
@@ -56,6 +62,31 @@ export function buildTaskCommitMessage(ctx) {
     }
     return `${subject}\n\n${bodyParts.join("\n\n")}`;
 }
+function buildTaskCommitContextLines(ctx) {
+    const lines = [];
+    const milestone = formatNamedContext(ctx.milestoneId, ctx.milestoneTitle);
+    const slice = formatNamedContext(ctx.sliceId, ctx.sliceTitle);
+    const taskId = ctx.taskDisplayId ?? ctx.taskId.split("/").pop();
+    const task = formatNamedContext(taskId, ctx.taskTitle);
+    if (milestone)
+        lines.push(`- Milestone: ${milestone}`);
+    if (slice)
+        lines.push(`- Slice: ${slice}`);
+    if (task)
+        lines.push(`- Task: ${task}`);
+    return lines;
+}
+function formatNamedContext(id, title) {
+    const cleanId = id?.trim();
+    const cleanTitle = title?.trim();
+    if (!cleanId && !cleanTitle)
+        return null;
+    if (!cleanId)
+        return cleanTitle ?? null;
+    if (!cleanTitle || cleanTitle === cleanId)
+        return cleanId;
+    return `${cleanId} - ${cleanTitle}`;
+}
 function sanitizeCommitSubjectDescription(value) {
     const cleaned = value
         .replace(/[\x00-\x1F\x7F]+/g, " ")
@@ -855,7 +886,12 @@ export function createDraftPR(basePath, milestoneId, title, body, opts) {
             args.push("--head", opts.head);
         if (opts?.base)
             args.push("--base", opts.base);
-        const result = execFileSync("gh", args, { cwd: basePath, encoding: "utf8", timeout: 30000, env: GIT_NO_PROMPT_ENV });
+        const result = execFileSync("gh", args, {
+            cwd: basePath,
+            encoding: "utf8",
+            timeout: 30000,
+            env: opts?.env ?? GIT_NO_PROMPT_ENV,
+        });
         return result.trim();
     }
     catch {

package/dist/resources/extensions/gsd/guided-flow.js

@@ -45,6 +45,9 @@ import { runPreparation, formatCodebaseBrief, formatPriorContextBrief, } from ".
 import { verifyExpectedArtifact } from "./auto-recovery.js";
 import { createWorkspace, scopeMilestone } from "./workspace.js";
 import { getPendingGate, extractDepthVerificationMilestoneId } from "./bootstrap/write-gate.js";
+export function shouldSkipGitBootstrapAfterInit(result) {
+    return result.gitEnabled === false;
+}
 // ─── Re-exports (preserve public API for existing importers) ────────────────
 export { MILESTONE_ID_RE, generateMilestoneSuffix, nextMilestoneId, extractMilestoneSeq, parseMilestoneId, milestoneIdSort, maxMilestoneNum, findMilestoneIds, reserveMilestoneId, claimReservedId, getReservedMilestoneIds, clearReservedMilestoneIds, } from "./milestone-ids.js";
 export { showQueue, handleQueueReorder, showQueueAdd, buildExistingMilestonesContext, } from "./guided-flow-queue.js";
@@ -131,6 +134,13 @@ function runPlanV2Gate(ctx, basePath, state) {
     }
     return "pass";
 }
+export const _needsPlanV2GateForTest = needsPlanV2Gate;
+export const _runPlanV2GateForTest = runPlanV2Gate;
+export function _roadmapHasParseableSlicesForTest(roadmapContent) {
+    if (!roadmapContent)
+        return false;
+    return parseRoadmapSlices(roadmapContent).length > 0;
+}
 // ─── Commit Instruction Helpers ──────────────────────────────────────────────
 /** Build commit instruction for planning prompts. .gsd/ is managed externally and always gitignored. */
 function buildDocsCommitInstruction(_message) {
@@ -154,7 +164,7 @@ const USER_DRIVEN_DEEP_SETUP_UNITS = new Set([
     "discuss-requirements",
     "research-decision",
 ]);
-const FOREGROUND_DEEP_SETUP_RULE_NAMES = new Set([
+export const FOREGROUND_DEEP_SETUP_RULE_NAMES = new Set([
     "deep: pre-planning (no workflow prefs) → workflow-preferences",
     "deep: pre-planning (no PROJECT) → discuss-project",
     "deep: pre-planning (no REQUIREMENTS) → discuss-requirements",
@@ -898,6 +908,7 @@ async function dispatchWorkflow(pi, note, customType = "gsd-run", ctx, unitType)
         restoreGsdWorkflowTools(pi, savedTools);
     }
 }
+export const _dispatchWorkflowForTest = dispatchWorkflow;
 function getStructuredQuestionsAvailability(pi, ctx) {
     if (!ctx)
         return "false";
@@ -1666,7 +1677,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
         const result = await showProjectInit(ctx, pi, basePath, detection);
         if (!result.completed)
             return; // User cancelled
-        skipGitBootstrap = result.gitEnabled === false;
+        skipGitBootstrap = shouldSkipGitBootstrapAfterInit(result);
         // Init wizard bootstrapped .gsd/ — fall through to the normal flow below
         // which will detect "no milestones" and start the discuss prompt
     }
@@ -1984,8 +1995,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
         if (hasRoadmap) {
             const roadmapContent = await loadFile(roadmapFile);
             if (roadmapContent) {
-                const parsed = parseRoadmapSlices(roadmapContent);
-                roadmapHasSlices = parsed.length > 0;
+                roadmapHasSlices = _roadmapHasParseableSlicesForTest(roadmapContent);
             }
         }
         if (!hasRoadmap || !roadmapHasSlices) {

package/dist/resources/extensions/gsd/init-wizard.js

@@ -15,6 +15,9 @@ import { assertSafeDirectory } from "./validate-directory.js";
 import { runSkillInstallStep } from "./skill-catalog.js";
 import { generateCodebaseMap, writeCodebaseMap } from "./codebase-generator.js";
 import { handlePrefsWizard, writePreferencesFile } from "./commands-prefs-wizard.js";
+export function shouldWriteGitFiles(gitEnabled) {
+    return gitEnabled;
+}
 // ─── Defaults ───────────────────────────────────────────────────────────────────
 const DEFAULT_PREFS = {
     mode: "solo",
@@ -247,7 +250,7 @@ export async function showProjectInit(ctx, pi, basePath, detection) {
     }
     // Ensure .gitignore only when git is active. A user who selected "Skip"
     // should not have git initialized or git-related files mutated later.
-    if (gitEnabled) {
+    if (shouldWriteGitFiles(gitEnabled)) {
         ensureGitignore(basePath);
         untrackRuntimeFiles(basePath);
     }

package/dist/resources/extensions/gsd/prompts/complete-milestone.md

@@ -16,7 +16,7 @@ Preloaded context includes roadmap, requirements, decisions, project context, an
 
 Start with what the excerpts give you. Read full files when the section heads signal richer context you need.
 
-**On-demand Read ordering:** Complete all slice SUMMARY Reads you need for cross-slice synthesis, the Decision Re-evaluation table, and LEARNINGS **before** calling `gsd_complete_milestone` (step 12). Once that tool runs, the milestone is marked complete in the DB, so it must be the final persistent milestone-closeout write.
+**On-demand Read ordering:** Complete all slice SUMMARY Reads you need for cross-slice synthesis, the Decision Re-evaluation table, and LEARNINGS **before** calling `gsd_complete_milestone` (step 13). Once that tool runs, the milestone is marked complete in the DB, so it must be the final persistent milestone-closeout write.
 
 ### Closeout Review Mode
 
@@ -45,7 +45,7 @@ Subagents report only; they do not write user source. Fold any findings into Dec
 
 ### Verification Gate — STOP if verification failed
 
-**If ANY verification failure was recorded in steps 3, 4, or 5, you MUST follow the failure path below. Do NOT proceed with steps 9–13.**
+**If ANY verification failure was recorded in steps 4, 5, or 6, you MUST follow the failure path below. Do NOT proceed with steps 10–14.**
 
 **Failure path** (verification failed):
 - Do NOT call `gsd_complete_milestone`.
@@ -69,13 +69,15 @@ Subagents report only; they do not write user source. Fold any findings into Dec
    - `title` (string) — Milestone title
    - `oneLiner` (string) — One-sentence summary of what the milestone achieved
    - `narrative` (string) — Detailed narrative of what happened during the milestone
+   - `verificationPassed` (boolean) — Must be `true`; confirms code-change verification, success criteria, and definition-of-done checks all passed
+
+   **Recommended parameters** (the schema accepts these as optional, but always fill them in — omitted values render as placeholders such as "Not provided.", "None.", or "(none)"):
    - `successCriteriaResults` (string) — Markdown detailing how each success criterion was met or not met
    - `definitionOfDoneResults` (string) — Markdown detailing how each definition-of-done item was met
    - `requirementOutcomes` (string) — Markdown detailing requirement status transitions with evidence
    - `keyDecisions` (array of strings) — Key architectural/pattern decisions made during the milestone
    - `keyFiles` (array of strings) — Key files created or modified during the milestone
    - `lessonsLearned` (array of strings) — Lessons learned during the milestone
-   - `verificationPassed` (boolean) — Must be `true`; confirms code-change verification, success criteria, and definition-of-done checks all passed
 
    **Optional parameters:**
    - `followUps` (string) — Follow-up items for future milestones
@@ -84,6 +86,6 @@ Subagents report only; they do not write user source. Fold any findings into Dec
 14. Do not commit manually — the system auto-commits your changes after this unit completes.
 - Say: "Milestone {{milestoneId}} complete."
 
-**Important:** Do NOT skip code-change, success-criteria, or definition-of-done verification (steps 3-5). The summary must reflect verified outcomes. Verification failures block completion; there is no override. If a verification tool fails, errors, or returns unexpected output, treat it as failure.
+**Important:** Do NOT skip code-change, success-criteria, or definition-of-done verification (steps 4-6). The summary must reflect verified outcomes. Verification failures block completion; there is no override. If a verification tool fails, errors, or returns unexpected output, treat it as failure.
 
 **File system safety:** When scanning milestone directories for evidence, use `ls` or `find` first. Never pass a directory path (e.g. `tasks/`, `slices/`) to `read`; it only accepts file paths.

package/dist/resources/extensions/gsd/slice-cadence.js

@@ -1,3 +1,5 @@
+// Project/App: GSD-2
+// File Purpose: Slice-cadence merge and milestone resquash git operations.
 /**
  * Slice-cadence collapse — #4765.
  *
@@ -29,6 +31,7 @@ import { logWarning } from "./workflow-logger.js";
 import { emitSliceMerged, emitMilestoneResquash } from "./worktree-telemetry.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
+import { getMilestone, getSlice, isDbAvailable } from "./gsd-db.js";
 /**
  * Auto-worktree milestone branch name. Must match autoWorktreeBranch() in
  * auto-worktree.ts; duplicated here to avoid a cyclic import.
@@ -59,6 +62,46 @@ function cleanupMergeArtifacts(projectRoot) {
         logWarning("worktree", `merge artifact cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
+function stripKnownIdPrefix(value, id) {
+    const raw = String(value ?? "").trim();
+    if (!raw)
+        return undefined;
+    const lower = raw.toLowerCase();
+    const idLower = id.toLowerCase();
+    if (lower.startsWith(`${idLower}:`))
+        return raw.slice(id.length + 1).trim() || undefined;
+    return raw;
+}
+function getSliceMergeNames(milestoneId, sliceId) {
+    if (!isDbAvailable())
+        return {};
+    return {
+        milestoneTitle: stripKnownIdPrefix(getMilestone(milestoneId)?.title, milestoneId),
+        sliceTitle: stripKnownIdPrefix(getSlice(milestoneId, sliceId)?.title, sliceId),
+    };
+}
+function buildSliceMergeCommitMessage(milestoneId, sliceId, milestoneBranch) {
+    const names = getSliceMergeNames(milestoneId, sliceId);
+    const sliceLabel = names.sliceTitle ?? sliceId;
+    const subject = `feat: ${sliceLabel} - ${sliceId} of ${milestoneId} (slice-cadence)`;
+    const body = [
+        `Slice: ${sliceId}${names.sliceTitle ? ` - ${names.sliceTitle}` : ""}`,
+        `Milestone: ${milestoneId}${names.milestoneTitle ? ` - ${names.milestoneTitle}` : ""}`,
+        `GSD-Slice: ${sliceId}`,
+        `GSD-Milestone: ${milestoneId}`,
+        `Branch: ${milestoneBranch}`,
+    ];
+    return `${subject}\n\n${body.join("\n")}`;
+}
+function buildMilestoneResquashCommitMessage(milestoneId, sliceCount) {
+    const milestoneTitle = isDbAvailable()
+        ? stripKnownIdPrefix(getMilestone(milestoneId)?.title, milestoneId)
+        : undefined;
+    const subject = milestoneTitle
+        ? `feat: ${milestoneTitle} (${milestoneId}, ${sliceCount} slices re-squashed)`
+        : `feat: ${milestoneId} (${sliceCount} slices re-squashed)`;
+    return `${subject}\n\nMilestone: ${milestoneId}${milestoneTitle ? ` - ${milestoneTitle}` : ""}\nGSD-Milestone: ${milestoneId}`;
+}
 function advanceMilestoneBranch(projectRoot, worktreeCwd, milestoneBranch, mainBranch) {
     let worktreeBranch = null;
     try {
@@ -173,7 +216,7 @@ export function mergeSliceToMain(projectRoot, milestoneId, sliceId) {
             throw new MergeConflictError(conflictedFiles, "squash", milestoneBranch, mainBranch);
         }
         // Commit the squash with a slice-scoped message
-        const commitSha = nativeCommit(projectRoot, `gsd: merge ${sliceId} of ${milestoneId} (slice-cadence)`);
+        const commitSha = nativeCommit(projectRoot, buildSliceMergeCommitMessage(milestoneId, sliceId, milestoneBranch));
         // Advance the milestone branch to main so the next slice's commits start
         // from a clean base. When the milestone branch is checked out in an auto
         // worktree, Git refuses a project-root branch -f; reset from inside the
@@ -255,7 +298,7 @@ export function resquashMilestoneOnMain(projectRoot, milestoneId, startSha) {
             stdio: ["ignore", "pipe", "pipe"],
             encoding: "utf-8",
         });
-        const newSha = nativeCommit(projectRoot, `gsd: complete milestone ${milestoneId} (${sliceCount} slices re-squashed)`, { allowEmpty: true });
+        const newSha = nativeCommit(projectRoot, buildMilestoneResquashCommitMessage(milestoneId, sliceCount), { allowEmpty: true });
         try {
             emitMilestoneResquash(projectRoot, milestoneId, {
                 sliceCount,

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

@@ -33,6 +33,19 @@ let sliceState = null;
 const SLICE_ORCHESTRATOR_STATE_FILE = "slice-orchestrator.json";
 const TMP_SUFFIX = ".tmp";
 export const SLICE_WORKER_AUTO_ARGS = ["headless", "--json", "auto"];
+export function _resolveSliceParallelMaxWorkersForTest(maxWorkers) {
+    return maxWorkers ?? 2;
+}
+export function _buildSliceWorkerEnvForTest(basePath, milestoneId, sliceId, workerToken, sourceEnv = process.env) {
+    return {
+        ...sourceEnv,
+        GSD_SLICE_LOCK: sliceId,
+        GSD_MILESTONE_LOCK: milestoneId,
+        GSD_PROJECT_ROOT: basePath,
+        GSD_PARALLEL_WORKER: "1",
+        GSD_SLICE_WORKER_TOKEN: workerToken,
+    };
+}
 function sliceStateFilePath(basePath) {
     return join(gsdRoot(basePath), SLICE_ORCHESTRATOR_STATE_FILE);
 }
@@ -281,7 +294,7 @@ export async function startSliceParallel(basePath, milestoneId, eligibleSlices,
     if (process.env.GSD_PARALLEL_WORKER) {
         return { started: [], errors: [{ sid: "all", error: "Cannot start slice-parallel from within a parallel worker" }] };
     }
-    const maxWorkers = opts.maxWorkers ?? 2;
+    const maxWorkers = _resolveSliceParallelMaxWorkersForTest(opts.maxWorkers);
     const budgetCeiling = opts.budgetCeiling;
     // Initialize orchestrator state
     sliceState = {
@@ -506,14 +519,7 @@ function spawnSliceWorker(basePath, milestoneId, sliceId) {
     try {
         child = spawn(process.execPath, [binPath, ...SLICE_WORKER_AUTO_ARGS], {
             cwd: worker.worktreePath,
-            env: {
-                ...process.env,
-                GSD_SLICE_LOCK: sliceId,
-                GSD_MILESTONE_LOCK: milestoneId,
-                GSD_PROJECT_ROOT: basePath,
-                GSD_PARALLEL_WORKER: "1",
-                GSD_SLICE_WORKER_TOKEN: worker.workerToken,
-            },
+            env: _buildSliceWorkerEnvForTest(basePath, milestoneId, sliceId, worker.workerToken),
             stdio: ["ignore", "pipe", "pipe"],
             detached: false,
         });

package/dist/resources/extensions/gsd/tools/complete-milestone.js

@@ -17,8 +17,7 @@ import { renderAllProjections, stripIdPrefix } from "../workflow-projections.js"
 import { writeManifest } from "../workflow-manifest.js";
 import { appendEvent } from "../workflow-events.js";
 import { logWarning, logError } from "../workflow-logger.js";
-function renderMilestoneSummaryMarkdown(params) {
-    const now = new Date().toISOString();
+function renderMilestoneSummaryMarkdown(params, completedAt) {
     const displayTitle = stripIdPrefix(params.title, params.milestoneId);
     // Apply defaults for optional enrichment fields (#2771)
     const keyDecisions = params.keyDecisions ?? [];
@@ -37,7 +36,7 @@ function renderMilestoneSummaryMarkdown(params) {
 id: ${params.milestoneId}
 title: "${displayTitle}"
 status: complete
-completed_at: ${now}
+completed_at: ${completedAt}
 key_decisions:
 ${keyDecisionsYaml}
 key_files:
@@ -56,15 +55,15 @@ ${params.narrative}
 
 ## Success Criteria Results
 
-${params.successCriteriaResults ?? "Not provided."}
+${params.successCriteriaResults || "Not provided."}
 
 ## Definition of Done Results
 
-${params.definitionOfDoneResults ?? "Not provided."}
+${params.definitionOfDoneResults || "Not provided."}
 
 ## Requirement Outcomes
 
-${params.requirementOutcomes ?? "Not provided."}
+${params.requirementOutcomes || "Not provided."}
 
 ## Deviations
 
@@ -131,7 +130,7 @@ export async function handleCompleteMilestone(params, basePath) {
         return { error: guardError };
     }
     // ── Filesystem operations (outside transaction) ─────────────────────────
-    const summaryMd = renderMilestoneSummaryMarkdown(params);
+    const summaryMd = renderMilestoneSummaryMarkdown(params, completedAt);
     let summaryPath;
     const milestoneDir = resolveMilestonePath(basePath, params.milestoneId);
     if (milestoneDir) {

package/dist/resources/extensions/gsd/tools/complete-task.js

@@ -46,7 +46,7 @@ function taskGateFieldForId(id, params) {
  * Normalize a list parameter that may arrive as a string (newline-delimited
  * bullet list from the LLM) into a string array (#3361).
  */
-function normalizeListParam(value) {
+export function normalizeListParam(value) {
     if (Array.isArray(value))
         return value.map(String);
     if (typeof value === "string" && value.trim()) {

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

@@ -360,19 +360,38 @@ export class WorktreeResolver {
                 phase: "auto-commit-failed",
                 error: err instanceof Error ? err.message : String(err),
             });
+            ctx.notify(`Auto-commit before exiting ${milestoneId} failed: ${err instanceof Error ? err.message : String(err)}. Branch ${this.deps.autoWorktreeBranch(milestoneId)} is preserved for recovery.`, "warning");
         }
+        if (this.s.originalBasePath) {
+            try {
+                process.chdir(this.s.originalBasePath);
+            }
+            catch (err) {
+                debugLog("WorktreeResolver", {
+                    action: "exitMilestone",
+                    milestoneId,
+                    phase: "pre-teardown-chdir-failed",
+                    originalBasePath: this.s.originalBasePath,
+                    error: err instanceof Error ? err.message : String(err),
+                });
+                ctx.notify(`Could not leave milestone worktree before cleanup: ${err instanceof Error ? err.message : String(err)}. Branch ${this.deps.autoWorktreeBranch(milestoneId)} is preserved for recovery.`, "warning");
+            }
+        }
+        let teardownFailed = false;
         try {
             this.deps.teardownAutoWorktree(this.s.originalBasePath, milestoneId, {
                 preserveBranch: opts?.preserveBranch ?? false,
             });
         }
         catch (err) {
+            teardownFailed = true;
             debugLog("WorktreeResolver", {
                 action: "exitMilestone",
                 milestoneId,
                 phase: "teardown-failed",
                 error: err instanceof Error ? err.message : String(err),
             });
+            ctx.notify(`Worktree cleanup failed for ${milestoneId}: ${err instanceof Error ? err.message : String(err)}. Branch ${this.deps.autoWorktreeBranch(milestoneId)} is preserved for recovery.`, "warning");
         }
         this.restoreToProjectRoot();
         debugLog("WorktreeResolver", {
@@ -381,7 +400,9 @@ export class WorktreeResolver {
             result: "done",
             basePath: this.s.basePath,
         });
-        ctx.notify(`Exited worktree for ${milestoneId}`, "info");
+        ctx.notify(teardownFailed
+            ? `Worktree exit for ${milestoneId} needs manual cleanup.`
+            : `Exited worktree for ${milestoneId}`, teardownFailed ? "warning" : "info");
     }
     // ── Merge and Exit ─────────────────────────────────────────────────────
     /**