gsd-pi 2.77.0-dev.538325aea → 2.77.0

package/src/resources/extensions/claude-code-cli/partial-builder.ts

@@ -8,116 +8,17 @@
 import type {
 	AssistantMessage,
 	AssistantMessageEvent,
+	ServerToolUseContent,
 	StopReason,
 	TextContent,
 	ThinkingContent,
 	ToolCall,
 	Usage,
+	WebSearchResultContent,
 } from "@gsd/pi-ai";
+import { hasXmlParameterTags, repairToolJson } from "@gsd/pi-ai";
 import type { BetaContentBlock, BetaRawMessageStreamEvent, NonNullableUsage } from "./sdk-types.js";
 
-// ---------------------------------------------------------------------------
-// XML parameter tag utilities (inline replacements for removed pi-ai symbols)
-// ---------------------------------------------------------------------------
-
-/**
- * Detects XML parameter tags (inline <parameter name="...">...</parameter> form)
- * or XML wrapper (<parameters>...</parameters>) in streaming tool call JSON.
- * Replaces removed pi-ai utility (removed in pi 0.67.2).
- * T-10-05: regex only detects tag presence; does not evaluate content.
- */
-function hasXmlParameterTags(s: string): boolean {
-	return /<parameter[s\s>]/i.test(s);
-}
-
-/**
- * Repairs malformed LLM-generated tool JSON using three strategies:
- *
- * 1. XML parameter extraction: When inline <parameter name="key">value</parameter>
- *    tags appear inside a JSON string value, extract each as a top-level key and
- *    clean the containing string value by truncating at the closing tag boundary.
- *
- * 2. YAML bullet repair: When bare "- item" patterns appear as JSON values (not
- *    quoted), convert each bullet sequence into a JSON array.
- *
- * 3. XML wrapper extraction: Extract content from <parameters>...</parameters> wrapper.
- *
- * Replaces removed pi-ai utility (removed in pi 0.67.2).
- * T-10-05: extracts text content only, no evaluation.
- */
-function repairToolJson(s: string): string {
-	// Strategy 1: XML parameter tags inside JSON string values (#3751)
-	// The raw JSON string may have escaped quotes: <parameter name=\"key\">val</parameter>
-	// or unescaped: <parameter name="key">val</parameter>
-	// We match both forms.
-	if (/<parameter\s+name=/i.test(s)) {
-		try {
-			// Match <parameter name="key"> or <parameter name=\"key\"> in raw JSON text
-			const paramPattern = /<parameter\s+name=(?:\\"|")([^"\\]+)(?:\\"|")>([\s\S]*?)<\/parameter>/gi;
-			const extracted: Record<string, unknown> = {};
-			let match: RegExpExecArray | null;
-			while ((match = paramPattern.exec(s)) !== null) {
-				const key = match[1];
-				// rawVal may contain JSON-escaped characters; unescape for parsing
-				const rawVal = match[2].trim().replace(/\\"/g, '"').replace(/\\n/g, "\n");
-				// Attempt to parse value as JSON; fall back to string
-				try {
-					extracted[key] = JSON.parse(rawVal);
-				} catch {
-					extracted[key] = rawVal;
-				}
-			}
-
-			if (Object.keys(extracted).length > 0) {
-				// Remove the XML parameter block and preceding closing tag from the raw string.
-				// The block looks like: </tagName>\n<parameter ...>...</parameter>...\n (with escaped chars)
-				// We remove from the first </...> closing tag through the last </parameter> tag.
-				const cleaned = s
-					.replace(/<\/[^>]+>(?:\\n|\n)*(?:<parameter[\s\S]*?<\/parameter>(?:\\n|\n)*)+/gi, "")
-					.trim();
-
-				// Parse cleaned base JSON and merge extracted params
-				const base = JSON.parse(cleaned) as Record<string, unknown>;
-				return JSON.stringify({ ...base, ...extracted });
-			}
-		} catch {
-			// Fall through to next strategy
-		}
-	}
-
-	// Strategy 2: YAML bullet lists as unquoted JSON values (#2660)
-	// Pattern: "key": - item1, "key2": - item2
-	if (/:\s*-\s+/.test(s)) {
-		try {
-			// Replace bare YAML bullet sequences with JSON arrays.
-			// Match: "key": - val1, - val2, "nextKey" or end
-			// We need to handle: "key": - item, "nextKey" where - item is the unquoted value
-			const repaired = s.replace(
-				// Match a quoted key followed by colon, then one or more "- item" bullets
-				// terminated by either a comma+quote (next key) or closing brace
-				/"([^"]+)":\s*((?:-\s+[^,\n\-"{}[\]]+(?:,\s*(?![-"\s*{]))?)+)/g,
-				(fullMatch: string, key: string, bulletBlock: string) => {
-					// Extract individual bullet items
-					const items = bulletBlock
-						.split(/,?\s*-\s+/)
-						.map((item: string) => item.trim().replace(/,\s*$/, "").trim())
-						.filter((item: string) => item.length > 0);
-					if (items.length === 0) return fullMatch;
-					return `"${key}": ${JSON.stringify(items)}`;
-				},
-			);
-			const parsed = JSON.parse(repaired);
-			return JSON.stringify(parsed);
-		} catch {
-			// Fall through to next strategy
-		}
-	}
-
-	// Strategy 3: XML wrapper extraction (<parameters>...</parameters>)
-	const m = /<parameters[^>]*>([\s\S]*?)<\/parameters>/i.exec(s);
-	return m ? m[1].trim() : s;
-}
-
 // ---------------------------------------------------------------------------
 // MCP tool name parsing
 // ---------------------------------------------------------------------------
@@ -170,7 +71,7 @@ function toolCallFromBlock(
  */
 export function mapContentBlock(
 	block: BetaContentBlock,
-): TextContent | ThinkingContent | ToolCall {
+): TextContent | ThinkingContent | ToolCall | ServerToolUseContent | WebSearchResultContent {
 	switch (block.type) {
 		case "text":
 			return { type: "text", text: block.text } satisfies TextContent;
@@ -186,18 +87,19 @@ export function mapContentBlock(
 			return toolCallFromBlock(block.id, block.name, block.input);
 
 		case "server_tool_use":
-			// ServerToolUseContent removed from pi-ai in pi 0.67.2 — represent as text
 			return {
-				type: "text",
-				text: `[server tool use: ${(block as Record<string, unknown>).name ?? "unknown"}]`,
-			} satisfies TextContent;
+				type: "serverToolUse",
+				id: block.id,
+				name: block.name,
+				input: block.input,
+			} satisfies ServerToolUseContent;
 
 		case "web_search_tool_result":
-			// WebSearchResultContent removed from pi-ai in pi 0.67.2 — represent as text
 			return {
-				type: "text",
-				text: `[web search result]`,
-			} satisfies TextContent;
+				type: "webSearchResult",
+				toolUseId: block.tool_use_id,
+				content: block.content,
+			} satisfies WebSearchResultContent;
 
 		default: {
 			const unknown = block as Record<string, unknown>;
@@ -322,7 +224,15 @@ export class PartialMessageBuilder {
 					this.partial.content.push(toolCallFromBlock(block.id, block.name, {}));
 					return { type: "toolcall_start", contentIndex, partial: this.partial };
 				}
-				// server_tool_use removed from pi-ai content types in pi 0.67.2 — skip
+				if (block.type === "server_tool_use") {
+					this.partial.content.push({
+						type: "serverToolUse",
+						id: block.id,
+						name: block.name,
+						input: block.input,
+					});
+					return { type: "server_tool_use", contentIndex, partial: this.partial };
+				}
 				return null;
 			}
 
@@ -379,9 +289,7 @@ export class PartialMessageBuilder {
 							// malformation explicitly so downstream consumers can
 							// distinguish this from a healthy tool completion (#2574).
 							block.arguments = { _raw: jsonStr };
-							// malformedArguments removed from the toolcall_end type in pi 0.67.2;
-							// cast to any to preserve the runtime signal for downstream consumers (#2574)
-							return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial, malformedArguments: true } as any;
+							return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial, malformedArguments: true };
 						}
 					}
 					return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial };

package/src/resources/extensions/claude-code-cli/stream-adapter.ts

@@ -548,9 +548,8 @@ async function promptElicitationWithDialogs(
 		const title = buildElicitationPromptTitle(request, question);
 
 		if (question.allowMultiple) {
-			// allowMultiple removed from ExtensionUIDialogOptions in pi 0.67.2;
-			// fall back to single-select (result is wrapped in array below)
 			const selected = await ui.select(title, question.options.map((option) => option.label), {
+				allowMultiple: true,
 				signal,
 			});
 			if (Array.isArray(selected)) {
@@ -703,12 +702,6 @@ export function makeAbortedMessage(model: string, lastTextContent: string): Assi
  * Set `GSD_CLAUDE_CODE_PERMISSION_MODE` to `bypassPermissions` to restore
  * the old always-approve behaviour, or to `default` / `plan` for stricter
  * modes.
- *
- * When `GSD_HEADLESS=1` is set (auto-mode / non-interactive runs), the
- * default flips to `bypassPermissions` because there is no UI to approve
- * permission dialogs — `acceptEdits` would hang verification commands like
- * `npx tsc --noEmit` or `npx vitest run` indefinitely (#4657). Explicit
- * overrides still win, so users can opt back into `acceptEdits` in headless.
  */
 export async function resolveClaudePermissionMode(
 	env: NodeJS.ProcessEnv = process.env,
@@ -717,12 +710,6 @@ export async function resolveClaudePermissionMode(
 	if (override === "bypassPermissions" || override === "acceptEdits" || override === "default" || override === "plan") {
 		return override;
 	}
-	if (env.GSD_HEADLESS === "1") {
-		console.warn(
-			"[claude-code-cli] Headless mode detected (GSD_HEADLESS=1): defaulting permissionMode to 'bypassPermissions' so verification Bash commands can run. Set GSD_CLAUDE_CODE_PERMISSION_MODE=acceptEdits to opt out.",
-		);
-		return "bypassPermissions";
-	}
 	return "acceptEdits";
 }
 
@@ -998,8 +985,7 @@ function attachExternalResultsToToolBlocks(
 	toolResultsById: ReadonlyMap<string, ExternalToolResultPayload>,
 ): void {
 	for (const block of toolBlocks) {
-		// serverToolUse removed from AssistantMessage content in pi 0.67.2
-		if (block.type !== "toolCall") continue;
+		if (block.type !== "toolCall" && block.type !== "serverToolUse") continue;
 		const externalResult = toolResultsById.get(block.id);
 		if (!externalResult) continue;
 		(block as ToolCallWithExternalResult & { id: string }).externalResult = externalResult;
@@ -1190,9 +1176,8 @@ async function pumpSdkMessages(
 								lastTextContent = block.text;
 							} else if (block.type === "thinking" && block.thinking) {
 								lastThinkingContent = block.thinking;
-							} else if (block.type === "toolCall") {
+							} else if (block.type === "toolCall" || block.type === "serverToolUse") {
 								// Collect tool blocks for externalToolExecution rendering
-								// (serverToolUse removed from pi-ai content types in pi 0.67.2)
 								intermediateToolBlocks.push(block);
 							}
 						}
@@ -1223,8 +1208,13 @@ async function pumpSdkMessages(
 									toolCall: block,
 									partial: builder.message,
 								});
+							} else if (block.type === "serverToolUse") {
+								stream.push({
+									type: "server_tool_use",
+									contentIndex,
+									partial: builder.message,
+								});
 							}
-							// serverToolUse/server_tool_use removed from pi-ai in pi 0.67.2
 						}
 					}
 

package/src/resources/extensions/claude-code-cli/tests/stream-adapter.test.ts

@@ -988,12 +988,10 @@ describe("stream-adapter — MCP elicitation bridge", () => {
 	});
 
 	test("createClaudeCodeElicitationHandler falls back to dialog prompts when custom UI is unavailable", async () => {
-		// pi 0.67.2: allowMultiple removed from ExtensionUIDialogOptions.
-		// Multi-select falls back to single-select; result is wrapped in an array.
-		// The select mock no longer receives opts.allowMultiple=true, so it returns options[0].
 		const ui = {
 			custom: async () => undefined,
-			select: async (_title: string, options: string[], _opts?: Record<string, unknown>) => {
+			select: async (_title: string, options: string[], opts?: { allowMultiple?: boolean }) => {
+				if (opts?.allowMultiple) return ["Desktop", "Mobile"];
 				return options.includes("None of the above") ? "None of the above" : options[0];
 			},
 			input: async () => "CLI-only deployment target",
@@ -1007,8 +1005,7 @@ describe("stream-adapter — MCP elicitation bridge", () => {
 			content: {
 				storage_scope: "None of the above",
 				storage_scope__note: "CLI-only deployment target",
-				// Single-select fallback: first option "Web" wrapped in array
-				platform: ["Web"],
+				platform: ["Desktop", "Mobile"],
 			},
 		});
 	});
@@ -1261,27 +1258,6 @@ describe("stream-adapter — permission mode (F10)", () => {
 			`expected bypass or acceptEdits, got ${mode}`,
 		);
 	});
-
-	test("resolveClaudePermissionMode flips to bypassPermissions when GSD_HEADLESS=1 (#4657)", async () => {
-		const originalWarn = console.warn;
-		console.warn = () => {};
-		try {
-			const env = { GSD_HEADLESS: "1" } as NodeJS.ProcessEnv;
-			const mode = await resolveClaudePermissionMode(env);
-			assert.equal(mode, "bypassPermissions");
-		} finally {
-			console.warn = originalWarn;
-		}
-	});
-
-	test("resolveClaudePermissionMode: explicit override wins over GSD_HEADLESS=1", async () => {
-		const env = {
-			GSD_HEADLESS: "1",
-			GSD_CLAUDE_CODE_PERMISSION_MODE: "acceptEdits",
-		} as NodeJS.ProcessEnv;
-		const mode = await resolveClaudePermissionMode(env);
-		assert.equal(mode, "acceptEdits");
-	});
 });
 
 describe("stream-adapter — Windows Claude path lookup (#3770)", () => {

package/src/resources/extensions/gsd/auto-dispatch.ts

@@ -33,7 +33,7 @@ import { parseRoadmap } from "./parsers-legacy.js";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { logWarning, logError } from "./workflow-logger.js";
 import { join } from "node:path";
-import { hasImplementationArtifacts, classifyMilestoneSummaryContent } from "./auto-recovery.js";
+import { hasImplementationArtifacts } from "./auto-recovery.js";
 import {
   buildDiscussMilestonePrompt,
   buildResearchMilestonePrompt,
@@ -883,13 +883,21 @@ export const DISPATCH_RULES: DispatchRule[] = [
         }
       }
 
+      // Reconciliation guard (#4324): when the SUMMARY file already exists
+      // on disk but the DB says the milestone is not complete, the DB is
+      // out of sync (e.g. journal reset, partial merge, crash recovery).
+      // Reconcile the DB status directly instead of re-dispatching the
+      // tool, which would overwrite the richer on-disk SUMMARY with a
+      // thinner regenerated version — causing silent data loss.
       const existingSummary = resolveMilestoneFile(basePath, mid, "SUMMARY");
-      let summaryOutcome: "success" | "failure" | "unknown" = "unknown";
       if (existingSummary && isDbAvailable()) {
-        const summaryContent = await loadFile(existingSummary);
-        if (summaryContent) {
-          summaryOutcome = classifyMilestoneSummaryContent(summaryContent);
+        try {
+          updateMilestoneStatus(mid, "complete", new Date().toISOString());
+          logWarning("dispatch", `Milestone ${mid} has SUMMARY on disk but DB status was not complete — reconciled DB to complete (#4324)`);
+        } catch (err) {
+          logWarning("dispatch", `Failed to reconcile milestone ${mid} status: ${err instanceof Error ? err.message : String(err)}`);
         }
+        return { action: "skip" };
       }
 
       // Safety guard (#2675): block completion when VALIDATION verdict is
@@ -974,44 +982,6 @@ export const DISPATCH_RULES: DispatchRule[] = [
         logWarning("dispatch", `verification class check failed: ${err instanceof Error ? err.message : String(err)}`);
       }
 
-      // Disk/DB mismatch handling (#4658): SUMMARY presence alone is not enough.
-      // Apply post-gate policy:
-      // - success summary: reconcile DB and skip re-dispatch
-      // - failure summary: pause/fail-closed
-      // - unknown summary: pause/fail-closed
-      if (existingSummary && isDbAvailable()) {
-        const milestone = getMilestone(mid);
-        const status = milestone?.status ?? "missing";
-
-        if (summaryOutcome === "success") {
-          try {
-            updateMilestoneStatus(mid, "complete", new Date().toISOString());
-            logWarning("dispatch", `Milestone ${mid} SUMMARY indicates completion while DB status was "${status}" — reconciled DB to complete (#4658)`);
-            return { action: "skip" };
-          } catch (err) {
-            return {
-              action: "stop",
-              level: "warning",
-              reason: `Milestone ${mid} SUMMARY indicates completion but DB reconciliation failed (${err instanceof Error ? err.message : String(err)}). Auto-mode paused for manual review.`,
-            };
-          }
-        }
-
-        if (summaryOutcome === "failure") {
-          return {
-            action: "stop",
-            level: "warning",
-            reason: `Milestone ${mid} has a failure-path SUMMARY while DB status is "${status}". Auto-mode will not promote completion from failure artifacts. Re-run complete-milestone only after blockers are resolved and verification passes.`,
-          };
-        }
-
-        return {
-          action: "stop",
-          level: "warning",
-          reason: `Milestone ${mid} has an ambiguous SUMMARY while DB status is "${status}". Auto-mode paused instead of promoting completion from file presence alone.`,
-        };
-      }
-
       return {
         action: "dispatch",
         unitType: "complete-milestone",

package/src/resources/extensions/gsd/auto-post-unit.ts

@@ -70,23 +70,9 @@ import { ensureCodebaseMapFresh } from "./codebase-generator.js";
 import { resolveUokFlags } from "./uok/flags.js";
 import { UokGateRunner } from "./uok/gate-runner.js";
 import { writeTurnGitTransaction } from "./uok/gitops.js";
-import { isClosedStatus } from "./status-guards.js";
 
 /** Maximum verification retry attempts before escalating to blocker placeholder (#2653). */
 const MAX_VERIFICATION_RETRIES = 3;
-const COMPLETE_MILESTONE_DB_SETTLE_MS = 1500;
-const COMPLETE_MILESTONE_DB_SETTLE_POLL_MS = 100;
-
-async function waitForMilestoneDbClose(mid: string): Promise<boolean> {
-  const deadline = Date.now() + COMPLETE_MILESTONE_DB_SETTLE_MS;
-  while (Date.now() < deadline) {
-    if (!isDbAvailable()) return false;
-    const milestone = getMilestone(mid);
-    if (milestone && isClosedStatus(milestone.status)) return true;
-    await new Promise((resolve) => setTimeout(resolve, COMPLETE_MILESTONE_DB_SETTLE_POLL_MS));
-  }
-  return false;
-}
 
 
 /** Enqueue a sidecar item (hook, triage, or quick-task) for the main loop to
@@ -754,25 +740,6 @@ export async function postUnitPreVerification(pctx: PostUnitContext, opts?: PreV
 
       // If verification failed, attempt to regenerate missing projection files
       // from DB data before giving up (e.g. research-slice produces PLAN from engine).
-      if (!triggerArtifactVerified) {
-        if (s.currentUnit.type === "complete-milestone") {
-          try {
-            const { milestone: mid } = parseUnitId(s.currentUnit.id);
-            if (mid) {
-              const settled = await waitForMilestoneDbClose(mid);
-              if (settled) {
-                triggerArtifactVerified = verifyExpectedArtifact(s.currentUnit.type, s.currentUnit.id, s.basePath);
-                if (triggerArtifactVerified) {
-                  invalidateAllCaches();
-                }
-              }
-            }
-          } catch (e) {
-            debugLog("postUnit", { phase: "artifact-verify-settle-db", error: String(e) });
-          }
-        }
-      }
-
       if (!triggerArtifactVerified) {
         try {
           const { milestone: mid, slice: sid } = parseUnitId(s.currentUnit.id);

package/src/resources/extensions/gsd/auto-recovery.ts

@@ -13,12 +13,10 @@ import { appendEvent } from "./workflow-events.js";
 import { atomicWriteSync } from "./atomic-write.js";
 import { clearParseCache } from "./files.js";
 import { parseRoadmap as parseLegacyRoadmap, parsePlan as parseLegacyPlan } from "./parsers-legacy.js";
-import { isDbAvailable, getTask, getSlice, getSliceTasks, getPendingGates, updateTaskStatus, updateSliceStatus, insertSlice, getMilestone } from "./gsd-db.js";
+import { isDbAvailable, getTask, getSlice, getSliceTasks, getPendingGates, updateTaskStatus, updateSliceStatus, insertSlice } from "./gsd-db.js";
 import { isValidationTerminal } from "./state.js";
 import { getErrorMessage } from "./error-utils.js";
 import { logWarning, logError } from "./workflow-logger.js";
-import { splitFrontmatter, parseFrontmatterMap } from "./files.js";
-import { isClosedStatus } from "./status-guards.js";
 import {
   nativeConflictFiles,
   nativeCommit,
@@ -56,32 +54,6 @@ import {
 // Re-export so existing consumers of auto-recovery.ts keep working.
 export { resolveExpectedArtifactPath, diagnoseExpectedArtifact };
 
-export type MilestoneSummaryOutcome = "success" | "failure" | "unknown";
-
-/**
- * Classify milestone summary content for recovery/dispatch decisions.
- * - success: canonical completion summary (frontmatter status is closed)
- * - failure: explicit blocker/failure markers
- * - unknown: ambiguous content
- */
-export function classifyMilestoneSummaryContent(content: string): MilestoneSummaryOutcome {
-  const [fmLines] = splitFrontmatter(content);
-  const fm = fmLines ? parseFrontmatterMap(fmLines) : null;
-  const rawStatus = typeof fm?.status === "string" ? fm.status.trim().toLowerCase() : "";
-  if (rawStatus) {
-    if (isClosedStatus(rawStatus)) return "success";
-    if (["active", "pending", "blocked", "failed", "incomplete"].includes(rawStatus)) return "failure";
-  }
-
-  const failureSignal =
-    /(?:^|\n)\s*#\s*BLOCKER\b/i.test(content)
-    || /auto-mode recovery failed/i.test(content)
-    || /verification\s+failed/i.test(content)
-    || /\bnot complete\b/i.test(content);
-  if (failureSignal) return "failure";
-  return "unknown";
-}
-
 // ─── Artifact Resolution & Verification ───────────────────────────────────────
 
 /**
@@ -505,14 +477,6 @@ export function verifyExpectedArtifact(
   // A milestone with only .gsd/ plan files and zero implementation code is
   // not genuinely complete — the LLM wrote plan files but skipped actual work.
   if (unitType === "complete-milestone") {
-    const summaryOutcome = classifyMilestoneSummaryContent(readFileSync(absPath, "utf-8"));
-    if (summaryOutcome === "failure") return false;
-    const { milestone: mid } = parseUnitId(unitId);
-    if (mid && isDbAvailable()) {
-      const dbMilestone = getMilestone(mid);
-      if (!dbMilestone) return false;
-      if (!isClosedStatus(dbMilestone.status) && summaryOutcome !== "success") return false;
-    }
     if (hasImplementationArtifacts(base) === "absent") return false;
   }
 

package/src/resources/extensions/gsd/auto-start.ts

@@ -61,7 +61,6 @@ import { restoreHookState, resetHookState } from "./post-unit-hooks.js";
 import { resetProactiveHealing, setLevelChangeCallback } from "./doctor-proactive.js";
 import { snapshotSkills } from "./skill-discovery.js";
 import { isDbAvailable, getMilestone, openDatabase, getDbStatus } from "./gsd-db.js";
-import { isClosedStatus } from "./status-guards.js";
 
 import {
   debugLog,
@@ -420,29 +419,16 @@ export async function bootstrapAutoSession(
     // Invalidate caches before initial state derivation
     invalidateAllCaches();
 
-    // Open the project-root DB before deriveState so DB-backed state
-    // derivation (queue-order, task status) works on a cold start (#2841).
-    // Must happen before cleanStaleRuntimeUnits so the cleanup predicate can
-    // consult DB status and avoid clearing runtime units for milestones that
-    // only have a failure-path SUMMARY on disk (#4663).
-    await openProjectDbIfPresent(base);
-
-    // Clean stale runtime unit files for completed milestones (#887).
-    // DB-authoritative: when DB is available, require DB status to be closed
-    // before clearing runtime units. A SUMMARY file alone is no longer
-    // trusted as proof of completion (#4663). Fall back to SUMMARY-file
-    // presence only when DB is unavailable (legacy/pre-migration).
+    // Clean stale runtime unit files for completed milestones (#887)
     cleanStaleRuntimeUnits(
       gsdRoot(base),
-      (mid) => {
-        if (isDbAvailable()) {
-          const row = getMilestone(mid);
-          return !!row && isClosedStatus(row.status);
-        }
-        return !!resolveMilestoneFile(base, mid, "SUMMARY");
-      },
+      (mid) => !!resolveMilestoneFile(base, mid, "SUMMARY"),
     );
 
+    // Open the project-root DB before deriveState so DB-backed state
+    // derivation (queue-order, task status) works on a cold start (#2841).
+    await openProjectDbIfPresent(base);
+
     // ── Orphaned milestone branch audit ──
     // Catches completed milestones whose teardown (merge + branch delete)
     // was lost due to session ending between completion and teardown.

package/src/resources/extensions/gsd/dispatch-guard.ts

@@ -3,30 +3,11 @@
 import { resolveMilestoneFile } from "./paths.js";
 import { findMilestoneIds } from "./guided-flow.js";
 import { parseUnitId } from "./unit-id.js";
-import { isDbAvailable, getMilestoneSlices, getMilestone } from "./gsd-db.js";
+import { isDbAvailable, getMilestoneSlices } from "./gsd-db.js";
 import { parseRoadmap } from "./parsers-legacy.js";
 import { isClosedStatus } from "./status-guards.js";
 import { readFileSync } from "node:fs";
 
-/**
- * Detect failure-path milestone SUMMARY content (#4663 sibling to #4658).
- * A failure SUMMARY must not let the dispatch guard treat an active
- * milestone as complete. The markers mirror those produced by
- * writeBlockerPlaceholder and the "verification FAILED" retry path.
- *
- * This is intentionally a minimal local detector so this fix does not
- * depend on PR #4660's `classifyMilestoneSummaryContent`. It can migrate
- * to the shared classifier once that lands.
- */
-function isFailureMilestoneSummary(content: string): boolean {
-  return (
-    /(?:^|\n)\s*#\s*BLOCKER\b/i.test(content) ||
-    /auto-mode recovery failed/i.test(content) ||
-    /verification\s+failed/i.test(content) ||
-    /\bnot complete\b/i.test(content)
-  );
-}
-
 const SLICE_DISPATCH_TYPES = new Set([
   "research-slice",
   "plan-slice",
@@ -66,30 +47,7 @@ export function getPriorSliceCompletionBlocker(
 
   for (const mid of milestoneIds) {
     if (resolveMilestoneFile(base, mid, "PARKED")) continue;
-
-    // DB/SUMMARY completion check (#4663 sibling to #4658).
-    // Prior behavior treated any SUMMARY file on disk as proof of milestone
-    // completion, which is wrong when the SUMMARY is a failure-path report
-    // (verification FAILED, blocker placeholder, etc.). Resolve as follows:
-    //   1. When DB is available and status is closed → skip (authoritative).
-    //   2. When SUMMARY exists but looks like a failure/blocker report →
-    //      do not short-circuit; fall through to the slice-level check so
-    //      the guard can still block dependents of an active milestone.
-    //   3. Otherwise (SUMMARY without failure markers) → skip. Preserves
-    //      the #1716 contract where a completed milestone with unchecked
-    //      remediation slices is still treated as done.
-    const summaryPath = resolveMilestoneFile(base, mid, "SUMMARY");
-    if (isDbAvailable()) {
-      const milestoneRow = getMilestone(mid);
-      if (milestoneRow && isClosedStatus(milestoneRow.status)) continue;
-    }
-    if (summaryPath) {
-      let summaryContent: string | null = null;
-      try { summaryContent = readFileSync(summaryPath, "utf-8"); } catch { /* ignore */ }
-      if (!summaryContent || !isFailureMilestoneSummary(summaryContent)) {
-        continue;
-      }
-    }
+    if (resolveMilestoneFile(base, mid, "SUMMARY")) continue;
 
     // Normalised slice list from DB or file fallback
     type NormSlice = { id: string; done: boolean; depends: string[] };

package/src/resources/extensions/gsd/guided-flow.ts

@@ -286,7 +286,7 @@ export function checkAutoStartAfterDiscuss(): boolean {
   }
 
   pendingAutoStartMap.delete(basePath);
-  ctx.ui.notify(`Milestone ${milestoneId} ready.`, "info");
+  ctx.ui.notify(`Milestone ${milestoneId} ready.`, "success");
   startAutoDetached(ctx, pi, basePath, false, { step });
   return true;
 }

package/src/resources/extensions/gsd/prompts/system.md

@@ -213,7 +213,6 @@ Fix the root cause, not symptoms. When applying a temporary mitigation, label it
 - State uncertainty plainly: "Not sure this handles X - testing it." No performed confidence, no hedging paragraphs.
 - All user-visible narration must be grammatical English. Do not emit compressed planner notes like "Need inspect X" or "Maybe read Y first". If it would look acceptable in a commit comment or standup note, it's acceptable here.
 - When debugging, stay curious. Problems are puzzles. Say what's interesting about the failure before reaching for fixes.
-- After completing a task, give a brief completion summary and present 2-4 contextual next-step options as a numbered list (the last option is always "Other"). This reduces cognitive load by letting the user pick rather than formulate what's next. Omit the numbered list when the response must follow a strict output format (JSON, patches, commit messages, structured data).
 
 Good narration: "Three existing handlers follow a middleware pattern - using that instead of a custom wrapper."
 Good narration: "Tests pass. Running slice-level verification."