gsd-pi 2.57.0 → 2.58.0-dev.394cb18

package/dist/resources/extensions/claude-code-cli/partial-builder.js

@@ -4,6 +4,7 @@
  * Translates the Claude Agent SDK's `BetaRawMessageStreamEvent` sequence
  * into GSD's `AssistantMessageEvent` deltas for incremental TUI rendering.
  */
+import { repairToolJson } from "@gsd/pi-ai";
 // ---------------------------------------------------------------------------
 // Content-block mapping helpers
 // ---------------------------------------------------------------------------
@@ -210,12 +211,19 @@ export class PartialMessageBuilder {
                         block.arguments = JSON.parse(jsonStr);
                     }
                     catch {
-                        // Stream was truncated mid-tool-call — JSON is garbage.
-                        // Preserve the raw string for diagnostics but signal the
-                        // malformation explicitly so downstream consumers can
-                        // distinguish this from a healthy tool completion (#2574).
-                        block.arguments = { _raw: jsonStr };
-                        return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial, malformedArguments: true };
+                        // JSON.parse failed — attempt repair for YAML-style bullet
+                        // lists that LLMs copy from template formatting (#2660).
+                        try {
+                            block.arguments = JSON.parse(repairToolJson(jsonStr));
+                        }
+                        catch {
+                            // Repair also failed — stream was truncated or garbage.
+                            // Preserve the raw string for diagnostics but signal the
+                            // malformation explicitly so downstream consumers can
+                            // distinguish this from a healthy tool completion (#2574).
+                            block.arguments = { _raw: jsonStr };
+                            return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial, malformedArguments: true };
+                        }
                     }
                     return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial };
                 }

package/dist/resources/extensions/claude-code-cli/stream-adapter.js

@@ -48,30 +48,45 @@ function getClaudePath() {
     return cachedClaudePath;
 }
 // ---------------------------------------------------------------------------
-// Prompt extraction
+// Prompt construction
 // ---------------------------------------------------------------------------
 /**
- * Extract the last user prompt text from GSD's context messages.
- * The SDK manages its own conversation history — we only send
- * the latest user message as the prompt.
+ * Extract text content from a single message regardless of content shape.
  */
-function extractLastUserPrompt(context) {
-    for (let i = context.messages.length - 1; i >= 0; i--) {
-        const msg = context.messages[i];
-        if (msg.role === "user") {
-            if (typeof msg.content === "string")
-                return msg.content;
-            if (Array.isArray(msg.content)) {
-                const textParts = msg.content
-                    .filter((part) => part.type === "text")
-                    .map((part) => part.text);
-                if (textParts.length > 0)
-                    return textParts.join("\n");
-            }
-        }
+function extractMessageText(msg) {
+    if (typeof msg.content === "string")
+        return msg.content;
+    if (Array.isArray(msg.content)) {
+        const textParts = msg.content
+            .filter((part) => part.type === "text")
+            .map((part) => part.text ?? part.thinking ?? "");
+        if (textParts.length > 0)
+            return textParts.join("\n");
     }
     return "";
 }
+/**
+ * Build a full conversational prompt from GSD's context messages.
+ *
+ * Previous behaviour sent only the last user message, making every SDK
+ * call effectively stateless. This version serialises the complete
+ * conversation history (system prompt + all user/assistant turns) so
+ * Claude Code has full context for multi-turn continuity.
+ */
+export function buildPromptFromContext(context) {
+    const parts = [];
+    if (context.systemPrompt) {
+        parts.push(`[System]\n${context.systemPrompt}`);
+    }
+    for (const msg of context.messages) {
+        const text = extractMessageText(msg);
+        if (!text)
+            continue;
+        const label = msg.role === "user" ? "User" : msg.role === "assistant" ? "Assistant" : "System";
+        parts.push(`[${label}]\n${text}`);
+    }
+    return parts.join("\n\n");
+}
 // ---------------------------------------------------------------------------
 // Error helper
 // ---------------------------------------------------------------------------
@@ -102,6 +117,29 @@ export function makeStreamExhaustedErrorMessage(model, lastTextContent) {
     return message;
 }
 // ---------------------------------------------------------------------------
+// SDK options builder
+// ---------------------------------------------------------------------------
+/**
+ * Build the options object passed to the Claude Agent SDK's `query()` call.
+ *
+ * Extracted for testability — callers can verify session persistence,
+ * beta flags, and other configuration without mocking the full SDK.
+ */
+export function buildSdkOptions(modelId, prompt) {
+    return {
+        pathToClaudeCodeExecutable: getClaudePath(),
+        model: modelId,
+        includePartialMessages: true,
+        persistSession: true,
+        cwd: process.cwd(),
+        permissionMode: "bypassPermissions",
+        allowDangerouslySkipPermissions: true,
+        settingSources: ["project"],
+        systemPrompt: { type: "preset", preset: "claude_code" },
+        betas: modelId.includes("sonnet") ? ["context-1m-2025-08-07"] : [],
+    };
+}
+// ---------------------------------------------------------------------------
 // streamSimple implementation
 // ---------------------------------------------------------------------------
 /**
@@ -133,21 +171,13 @@ async function pumpSdkMessages(model, context, options, stream) {
         if (options?.signal) {
             options.signal.addEventListener("abort", () => controller.abort(), { once: true });
         }
-        const prompt = extractLastUserPrompt(context);
+        const prompt = buildPromptFromContext(context);
+        const sdkOpts = buildSdkOptions(modelId, prompt);
         const queryResult = sdk.query({
             prompt,
             options: {
-                pathToClaudeCodeExecutable: getClaudePath(),
-                model: modelId,
-                includePartialMessages: true,
-                persistSession: false,
+                ...sdkOpts,
                 abortController: controller,
-                cwd: process.cwd(),
-                permissionMode: "bypassPermissions",
-                allowDangerouslySkipPermissions: true,
-                settingSources: ["project"],
-                systemPrompt: { type: "preset", preset: "claude_code" },
-                betas: modelId.includes("sonnet") ? ["context-1m-2025-08-07"] : [],
             },
         });
         // Emit start with an empty partial
@@ -174,8 +204,6 @@ async function pumpSdkMessages(model, context, options, stream) {
                 // -- Streaming partial messages --
                 case "stream_event": {
                     const partial = msg;
-                    if (partial.parent_tool_use_id !== null)
-                        break; // skip subagent
                     const event = partial.event;
                     // New assistant turn starts with message_start
                     if (event.type === "message_start") {
@@ -200,8 +228,6 @@ async function pumpSdkMessages(model, context, options, stream) {
                 // -- Complete assistant message (non-streaming fallback) --
                 case "assistant": {
                     const sdkAssistant = msg;
-                    if (sdkAssistant.parent_tool_use_id !== null)
-                        break;
                     // Capture text content from complete messages
                     for (const block of sdkAssistant.message.content) {
                         if (block.type === "text") {
@@ -215,9 +241,6 @@ async function pumpSdkMessages(model, context, options, stream) {
                 }
                 // -- User message (synthetic tool result — signals turn boundary) --
                 case "user": {
-                    const userMsg = msg;
-                    if (userMsg.parent_tool_use_id !== null)
-                        break;
                     // Capture content from the completed turn before resetting
                     if (builder) {
                         for (const block of builder.message.content) {

package/dist/resources/extensions/context7/extension-manifest.json

@@ -7,6 +7,6 @@
   "requires": { "platform": ">=2.29.0" },
   "provides": {
     "tools": ["resolve_library", "get_library_docs"],
-    "hooks": ["session_start"]
+    "hooks": ["session_start", "session_shutdown"]
   }
 }

package/dist/resources/extensions/get-secrets-from-user.js

@@ -31,6 +31,9 @@ function hydrateProcessEnv(key, value) {
     process.env[key] = value;
 }
 async function writeEnvKey(filePath, key, value) {
+    if (typeof value !== "string") {
+        throw new TypeError(`writeEnvKey expects a string value for key "${key}", got ${typeof value}`);
+    }
     let content = "";
     try {
         content = await readFile(filePath, "utf8");
@@ -334,19 +337,19 @@ export async function collectSecretsFromManifest(base, milestoneId, ctx) {
     for (const { key, value } of collected) {
         const entry = manifest.entries.find((e) => e.key === key);
         if (entry) {
-            entry.status = value !== null ? "collected" : "skipped";
+            entry.status = value != null ? "collected" : "skipped";
         }
     }
     // (i) Write manifest back to disk
     await writeFile(manifestPath, formatSecretsManifest(manifest), "utf8");
     // (j) Apply collected values to destination
-    const provided = collected.filter((c) => c.value !== null);
+    const provided = collected.filter((c) => c.value != null);
     const { applied } = await applySecrets(provided, destination, {
         envFilePath: resolve(ctx.cwd, ".env"),
     });
     const skipped = [
         ...alreadySkipped,
-        ...collected.filter((c) => c.value === null).map((c) => c.key),
+        ...collected.filter((c) => c.value == null).map((c) => c.key),
     ];
     return { applied, skipped, existingSkipped };
 }
@@ -403,8 +406,8 @@ export default function secureEnv(pi) {
                 const value = await collectOneSecret(ctx, i, params.keys.length, item.key, item.hint, item.guidance);
                 collected.push({ key: item.key, value });
             }
-            const provided = collected.filter((c) => c.value !== null);
-            const skipped = collected.filter((c) => c.value === null).map((c) => c.key);
+            const provided = collected.filter((c) => c.value != null);
+            const skipped = collected.filter((c) => c.value == null).map((c) => c.key);
             // Apply to destination via shared helper
             const { applied, errors } = await applySecrets(provided, destination, {
                 envFilePath: resolve(ctx.cwd, params.envFilePath ?? ".env"),

package/dist/resources/extensions/google-search/extension-manifest.json

@@ -7,6 +7,6 @@
   "requires": { "platform": ">=2.29.0" },
   "provides": {
     "tools": ["google_search"],
-    "hooks": ["session_start"]
+    "hooks": ["session_start", "session_shutdown"]
   }
 }

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

@@ -26,7 +26,7 @@ async function getClient() {
  */
 async function searchWithOAuth(query, accessToken, projectId, signal) {
     const model = process.env.GEMINI_SEARCH_MODEL || "gemini-2.5-flash";
-    const url = `https://cloudcode-pa.googleapis.com/v1internal:streamGenerateContent`;
+    const url = `https://cloudcode-pa.googleapis.com/v1internal:streamGenerateContent?alt=sse`;
     const GEMINI_CLI_HEADERS = {
         ideType: "IDE_UNSPECIFIED",
         platform: "PLATFORM_UNSPECIFIED",
@@ -49,6 +49,7 @@ async function searchWithOAuth(query, accessToken, projectId, signal) {
                     contents: [{ parts: [{ text: query }] }],
                     tools: [{ googleSearch: {} }],
                 },
+                userAgent: "pi-coding-agent",
             }),
             signal,
         });

package/dist/resources/extensions/gsd/auto/infra-errors.js

@@ -41,5 +41,9 @@ export function isInfrastructureError(err) {
         if (msg.includes(code))
             return code;
     }
+    // SQLite WAL corruption is not transient — retrying burns LLM budget
+    // for guaranteed failures (#2823).
+    if (msg.includes("database disk image is malformed"))
+        return "SQLITE_CORRUPT";
     return null;
 }

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

@@ -13,7 +13,7 @@ import { runUnit } from "./run-unit.js";
 import { debugLog } from "../debug-logger.js";
 import { PROJECT_FILES } from "../detection.js";
 import { MergeConflictError } from "../git-service.js";
-import { join } from "node:path";
+import { join, basename } from "node:path";
 import { existsSync, cpSync } from "node:fs";
 import { logWarning, logError } from "../workflow-logger.js";
 import { gsdRoot } from "../paths.js";
@@ -146,7 +146,7 @@ export async function runPreDispatch(ic, loopState) {
     if (mid && s.currentMilestoneId && mid !== s.currentMilestoneId) {
         deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "milestone-transition", data: { from: s.currentMilestoneId, to: mid } });
         ctx.ui.notify(`Milestone ${s.currentMilestoneId} complete. Advancing to ${mid}: ${midTitle}.`, "info");
-        deps.sendDesktopNotification("GSD", `Milestone ${s.currentMilestoneId} complete!`, "success", "milestone");
+        deps.sendDesktopNotification("GSD", `Milestone ${s.currentMilestoneId} complete!`, "success", "milestone", basename(s.originalBasePath || s.basePath));
         deps.logCmuxEvent(prefs, `Milestone ${s.currentMilestoneId} complete. Advancing to ${mid}.`, "success");
         const vizPrefs = prefs;
         if (vizPrefs?.auto_visualize) {
@@ -255,7 +255,7 @@ export async function runPreDispatch(ic, loopState) {
                 }
                 // PR creation (auto_pr) is handled inside mergeMilestoneToMain (#2302)
             }
-            deps.sendDesktopNotification("GSD", "All milestones complete!", "success", "milestone");
+            deps.sendDesktopNotification("GSD", "All milestones complete!", "success", "milestone", basename(s.originalBasePath || s.basePath));
             deps.logCmuxEvent(prefs, "All milestones complete.", "success");
             await deps.stopAuto(ctx, pi, "All milestones complete");
         }
@@ -269,7 +269,7 @@ export async function runPreDispatch(ic, loopState) {
             const blockerMsg = `Blocked: ${state.blockers.join(", ")}`;
             await deps.stopAuto(ctx, pi, blockerMsg);
             ctx.ui.notify(`${blockerMsg}. Fix and run /gsd auto.`, "warning");
-            deps.sendDesktopNotification("GSD", blockerMsg, "error", "attention");
+            deps.sendDesktopNotification("GSD", blockerMsg, "error", "attention", basename(s.originalBasePath || s.basePath));
             deps.logCmuxEvent(prefs, blockerMsg, "error");
         }
         else {
@@ -326,7 +326,7 @@ export async function runPreDispatch(ic, loopState) {
             }
             // PR creation (auto_pr) is handled inside mergeMilestoneToMain (#2302)
         }
-        deps.sendDesktopNotification("GSD", `Milestone ${mid} complete!`, "success", "milestone");
+        deps.sendDesktopNotification("GSD", `Milestone ${mid} complete!`, "success", "milestone", basename(s.originalBasePath || s.basePath));
         deps.logCmuxEvent(prefs, `Milestone ${mid} complete.`, "success");
         await closeoutAndStop(ctx, pi, s, deps, `Milestone ${mid} complete`);
         debugLog("autoLoop", { phase: "exit", reason: "milestone-complete" });
@@ -338,7 +338,7 @@ export async function runPreDispatch(ic, loopState) {
         const blockerMsg = `Blocked: ${state.blockers.join(", ")}`;
         await closeoutAndStop(ctx, pi, s, deps, blockerMsg);
         ctx.ui.notify(`${blockerMsg}. Fix and run /gsd auto.`, "warning");
-        deps.sendDesktopNotification("GSD", blockerMsg, "error", "attention");
+        deps.sendDesktopNotification("GSD", blockerMsg, "error", "attention", basename(s.originalBasePath || s.basePath));
         deps.logCmuxEvent(prefs, blockerMsg, "error");
         debugLog("autoLoop", { phase: "exit", reason: "blocked" });
         deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "terminal", data: { reason: "blocked", blockers: state.blockers } });
@@ -520,28 +520,28 @@ export async function runGuards(ic, mid) {
                 // 100% — special enforcement logic (halt/pause/warn)
                 const msg = `Budget ceiling ${deps.formatCost(budgetCeiling)} reached (spent ${deps.formatCost(totalCost)}).`;
                 if (budgetEnforcementAction === "halt") {
-                    deps.sendDesktopNotification("GSD", msg, "error", "budget");
+                    deps.sendDesktopNotification("GSD", msg, "error", "budget", basename(s.originalBasePath || s.basePath));
                     await deps.stopAuto(ctx, pi, "Budget ceiling reached");
                     debugLog("autoLoop", { phase: "exit", reason: "budget-halt" });
                     return { action: "break", reason: "budget-halt" };
                 }
                 if (budgetEnforcementAction === "pause") {
                     ctx.ui.notify(`${msg} Pausing auto-mode — /gsd auto to override and continue.`, "warning");
-                    deps.sendDesktopNotification("GSD", msg, "warning", "budget");
+                    deps.sendDesktopNotification("GSD", msg, "warning", "budget", basename(s.originalBasePath || s.basePath));
                     deps.logCmuxEvent(prefs, msg, "warning");
                     await deps.pauseAuto(ctx, pi);
                     debugLog("autoLoop", { phase: "exit", reason: "budget-pause" });
                     return { action: "break", reason: "budget-pause" };
                 }
                 ctx.ui.notify(`${msg} Continuing (enforcement: warn).`, "warning");
-                deps.sendDesktopNotification("GSD", msg, "warning", "budget");
+                deps.sendDesktopNotification("GSD", msg, "warning", "budget", basename(s.originalBasePath || s.basePath));
                 deps.logCmuxEvent(prefs, msg, "warning");
             }
             else if (threshold.pct < 100) {
                 // Sub-100% — simple notification
                 const msg = `${threshold.label}: ${deps.formatCost(totalCost)} / ${deps.formatCost(budgetCeiling)}`;
                 ctx.ui.notify(msg, threshold.notifyLevel);
-                deps.sendDesktopNotification("GSD", msg, threshold.notifyLevel, "budget");
+                deps.sendDesktopNotification("GSD", msg, threshold.notifyLevel, "budget", basename(s.originalBasePath || s.basePath));
                 deps.logCmuxEvent(prefs, msg, threshold.cmuxLevel);
             }
         }
@@ -561,7 +561,7 @@ export async function runGuards(ic, mid) {
             contextUsage.percent >= contextThreshold) {
             const msg = `Context window at ${contextUsage.percent}% (threshold: ${contextThreshold}%). Pausing to prevent truncated output.`;
             ctx.ui.notify(`${msg} Run /gsd auto to continue (will start fresh session).`, "warning");
-            deps.sendDesktopNotification("GSD", `Context ${contextUsage.percent}% — paused`, "warning", "attention");
+            deps.sendDesktopNotification("GSD", `Context ${contextUsage.percent}% — paused`, "warning", "attention", basename(s.originalBasePath || s.basePath));
             await deps.pauseAuto(ctx, pi);
             debugLog("autoLoop", { phase: "exit", reason: "context-window" });
             return { action: "break", reason: "context-window" };
@@ -646,6 +646,12 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         lastProgressKind: "dispatch",
         recoveryAttempts: 0, // Reset so re-dispatched units get full recovery budget (#2322)
     });
+    // Select and apply model (with tier escalation on retry — normal units only)
+    const modelResult = await deps.selectAndApplyModel(ctx, pi, unitType, unitId, s.basePath, prefs, s.verbose, s.autoModeStartModel, sidecarItem ? undefined : { isRetry, previousTier });
+    s.currentUnitRouting =
+        modelResult.routing;
+    s.currentUnitModel =
+        modelResult.appliedModel;
     // Status bar + progress widget
     ctx.ui.setStatus("gsd-auto", "auto");
     if (mid)
@@ -709,12 +715,6 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         const msg = reorderErr instanceof Error ? reorderErr.message : String(reorderErr);
         logWarning("engine", "Prompt reorder failed", { error: msg });
     }
-    // Select and apply model (with tier escalation on retry — normal units only)
-    const modelResult = await deps.selectAndApplyModel(ctx, pi, unitType, unitId, s.basePath, prefs, s.verbose, s.autoModeStartModel, sidecarItem ? undefined : { isRetry, previousTier });
-    s.currentUnitRouting =
-        modelResult.routing;
-    s.currentUnitModel =
-        modelResult.appliedModel;
     // Apply sidecar/pre-dispatch hook model override (takes priority over standard model selection)
     const hookModelOverride = sidecarItem?.model ?? iterData.hookModelOverride;
     if (hookModelOverride) {
@@ -806,7 +806,11 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
     // ── Immediate unit closeout (metrics, activity log, memory) ────────
     // Run right after runUnit() returns so telemetry is never lost to a
     // crash between iterations.
-    await deps.closeoutUnit(ctx, s.basePath, unitType, unitId, s.currentUnit.startedAt, deps.buildSnapshotOpts(unitType, unitId));
+    // Guard: stopAuto() may have nulled s.currentUnit via s.reset() while
+    // this coroutine was suspended at `await runUnit(...)` (#2939).
+    if (s.currentUnit) {
+        await deps.closeoutUnit(ctx, s.basePath, unitType, unitId, s.currentUnit.startedAt, deps.buildSnapshotOpts(unitType, unitId));
+    }
     // ── Zero tool-call guard (#1833) ──────────────────────────────────
     // An execute-task agent that completes with 0 tool calls made no
     // real changes — its summary is hallucinated. Treat as failed so
@@ -814,7 +818,7 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
     if (unitType === "execute-task") {
         const currentLedger = deps.getLedger();
         if (currentLedger?.units) {
-            const lastUnit = [...currentLedger.units].reverse().find((u) => u.type === unitType && u.id === unitId && u.startedAt === s.currentUnit.startedAt);
+            const lastUnit = [...currentLedger.units].reverse().find((u) => u.type === unitType && u.id === unitId && u.startedAt === s.currentUnit?.startedAt);
             if (lastUnit && lastUnit.toolCalls === 0) {
                 debugLog("runUnitPhase", {
                     phase: "zero-tool-calls",
@@ -825,7 +829,7 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
                 ctx.ui.notify(`${unitType} ${unitId} completed with 0 tool calls — hallucinated summary, will retry`, "warning");
                 // Fall through to next iteration where dispatch will re-derive
                 // and re-dispatch this task.
-                return { action: "next", data: { unitStartedAt: s.currentUnit.startedAt } };
+                return { action: "next", data: { unitStartedAt: s.currentUnit?.startedAt } };
             }
         }
     }
@@ -840,7 +844,7 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         s.unitRecoveryCount.delete(`${unitType}/${unitId}`);
     }
     deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "unit-end", data: { unitType, unitId, status: unitResult.status, artifactVerified, ...(unitResult.errorContext ? { errorContext: unitResult.errorContext } : {}) }, causedBy: { flowId: ic.flowId, seq: unitStartSeq } });
-    return { action: "next", data: { unitStartedAt: s.currentUnit.startedAt } };
+    return { action: "next", data: { unitStartedAt: s.currentUnit?.startedAt } };
 }
 // ─── runFinalize ──────────────────────────────────────────────────────────────
 /**

package/dist/resources/extensions/gsd/auto-artifact-paths.js

@@ -42,7 +42,7 @@ export function resolveExpectedArtifactPath(unitType, unitId, base) {
         }
         case "run-uat": {
             const dir = resolveSlicePath(base, mid, sid);
-            return dir ? join(dir, buildSliceFileName(sid, "UAT")) : null;
+            return dir ? join(dir, buildSliceFileName(sid, "ASSESSMENT")) : null;
         }
         case "execute-task": {
             const dir = resolveSlicePath(base, mid, sid);
@@ -105,7 +105,7 @@ export function diagnoseExpectedArtifact(unitType, unitId, base) {
         case "reassess-roadmap":
             return `${relSliceFile(base, mid, sid, "ASSESSMENT")} (roadmap reassessment)`;
         case "run-uat":
-            return `${relSliceFile(base, mid, sid, "UAT")} (UAT result)`;
+            return `${relSliceFile(base, mid, sid, "ASSESSMENT")} (UAT assessment result)`;
         case "validate-milestone":
             return `${relMilestoneFile(base, mid, "VALIDATION")} (milestone validation report)`;
         case "complete-milestone":

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

@@ -458,6 +458,13 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                         : theme.fg("dim", elapsed))
                     : "";
                 lines.push(rightAlign(headerLeft, headerRight, width));
+                // Worktree/branch right-aligned below header
+                if (worktreeName && cachedBranch) {
+                    lines.push(rightAlign("", theme.fg("dim", `${worktreeName} (${cachedBranch})`), width));
+                }
+                else if (cachedBranch) {
+                    lines.push(rightAlign("", theme.fg("dim", cachedBranch), width));
+                }
                 // Show health signal details when degraded (yellow/red)
                 if (score.level !== "green" && score.signals.length > 0 && widgetMode !== "min") {
                     // Show up to 3 most relevant signals in compact form
@@ -564,10 +571,10 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                 const hasContext = !!(mid || (slice && unitType !== "research-milestone" && unitType !== "plan-milestone"));
                 if (mid) {
                     const modelTag = modelDisplay ? theme.fg("muted", `  ${modelDisplay}`) : "";
-                    lines.push(truncateToWidth(`${pad}${theme.fg("dim", mid.title)}${modelTag}`, width));
+                    lines.push(truncateToWidth(`${pad}${theme.fg("dim", mid.title)}${modelTag}`, width, "…"));
                 }
                 if (slice && unitType !== "research-milestone" && unitType !== "plan-milestone") {
-                    lines.push(truncateToWidth(`${pad}${theme.fg("text", theme.bold(`${slice.id}: ${slice.title}`))}`, width));
+                    lines.push(truncateToWidth(`${pad}${theme.fg("text", theme.bold(`${slice.id}: ${slice.title}`))}`, width, "…"));
                 }
                 if (hasContext)
                     lines.push("");
@@ -605,6 +612,11 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                 // Build right column: task checklist
                 const rightLines = [];
                 const maxVisibleTasks = 8;
+                // Max visible chars for task title text (before ANSI theming)
+                const maxTaskTitleLen = 45;
+                function truncTitle(s) {
+                    return s.length > maxTaskTitleLen ? s.slice(0, maxTaskTitleLen - 1) + "…" : s;
+                }
                 function formatTaskLine(t, isCurrent) {
                     const glyph = t.done
                         ? theme.fg("success", "*")
@@ -616,11 +628,12 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                         : t.done
                             ? theme.fg("muted", t.id)
                             : theme.fg("dim", t.id);
+                    const short = truncTitle(t.title);
                     const title = isCurrent
-                        ? theme.fg("text", t.title)
+                        ? theme.fg("text", short)
                         : t.done
-                            ? theme.fg("muted", t.title)
-                            : theme.fg("text", t.title);
+                            ? theme.fg("muted", short)
+                            : theme.fg("text", short);
                     return `${glyph} ${id}: ${title}`;
                 }
                 if (useTwoCol && taskDetailsCol) {
@@ -642,7 +655,7 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                     if (maxRows > 0) {
                         lines.push("");
                         for (let i = 0; i < maxRows; i++) {
-                            const left = padToWidth(truncateToWidth(leftLines[i] ?? "", leftColWidth), leftColWidth);
+                            const left = padToWidth(truncateToWidth(leftLines[i] ?? "", leftColWidth, "…"), leftColWidth);
                             const right = rightLines[i] ?? "";
                             lines.push(`${left}${right}`);
                         }
@@ -652,7 +665,7 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                     if (leftLines.length > 0) {
                         lines.push("");
                         for (const l of leftLines)
-                            lines.push(truncateToWidth(l, width));
+                            lines.push(truncateToWidth(l, width, "…"));
                     }
                 }
                 // ── Footer: simplified stats + pwd + last commit + hints ────────
@@ -682,24 +695,28 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                         lines.push(rightAlign("", theme.fg("dim", cachedRtkLabel), width));
                     }
                 }
-                // PWD line with last commit info right-aligned
+                // Last commit info
                 const lastCommit = getLastCommit(accessors.getBasePath());
-                const commitStr = lastCommit
-                    ? theme.fg("dim", `${lastCommit.timeAgo} ago: ${lastCommit.message}`)
+                const maxCommitLen = 65;
+                const commitMsg = lastCommit
+                    ? lastCommit.message.length > maxCommitLen
+                        ? lastCommit.message.slice(0, maxCommitLen - 1) + "…"
+                        : lastCommit.message
                     : "";
-                const pwdStr = theme.fg("dim", widgetPwd);
-                if (commitStr) {
-                    lines.push(rightAlign(`${pad}${pwdStr}`, truncateToWidth(commitStr, Math.floor(width * 0.45)), width));
-                }
-                else {
-                    lines.push(`${pad}${pwdStr}`);
-                }
                 // Hints line
                 const hintParts = [];
                 hintParts.push("esc pause");
                 hintParts.push(process.platform === "darwin" ? "⌃⌥G dashboard" : "Ctrl+Alt+G dashboard");
                 const hintStr = theme.fg("dim", hintParts.join(" | "));
-                lines.push(rightAlign("", hintStr, width));
+                const commitStr = lastCommit
+                    ? theme.fg("dim", `${lastCommit.timeAgo} ago: ${commitMsg}`)
+                    : "";
+                if (commitStr) {
+                    lines.push(rightAlign(`${pad}${commitStr}`, hintStr, width));
+                }
+                else {
+                    lines.push(rightAlign("", hintStr, width));
+                }
                 lines.push(...ui.bar());
                 cachedLines = lines;
                 cachedWidth = width;
@@ -723,12 +740,12 @@ function rightAlign(left, right, width) {
     const leftVis = visibleWidth(left);
     const rightVis = visibleWidth(right);
     const gap = Math.max(1, width - leftVis - rightVis);
-    return truncateToWidth(left + " ".repeat(gap) + right, width);
+    return truncateToWidth(left + " ".repeat(gap) + right, width, "…");
 }
 /** Pad a string with trailing spaces to fill exactly `colWidth` (ANSI-aware). */
 function padToWidth(s, colWidth) {
     const vis = visibleWidth(s);
     if (vis >= colWidth)
-        return truncateToWidth(s, colWidth);
+        return truncateToWidth(s, colWidth, "…");
     return s + " ".repeat(colWidth - vis);
 }

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

@@ -13,6 +13,7 @@ import { isDbAvailable, getMilestoneSlices, getPendingGates, markAllGatesOmitted
 import { extractVerdict, isAcceptableUatVerdict } from "./verdict-parser.js";
 import { gsdRoot, resolveMilestoneFile, resolveMilestonePath, resolveSliceFile, resolveTaskFile, relSliceFile, buildMilestoneFileName, } from "./paths.js";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { logError } from "./workflow-logger.js";
 import { join } from "node:path";
 import { hasImplementationArtifacts } from "./auto-recovery.js";
 import { buildDiscussMilestonePrompt, buildResearchMilestonePrompt, buildPlanMilestonePrompt, buildResearchSlicePrompt, buildPlanSlicePrompt, buildExecuteTaskPrompt, buildCompleteSlicePrompt, buildCompleteMilestonePrompt, buildValidateMilestonePrompt, buildReplanSlicePrompt, buildRunUatPrompt, buildReassessRoadmapPrompt, buildRewriteDocsPrompt, buildReactiveExecutePrompt, buildGateEvaluatePrompt, checkNeedsReassessment, checkNeedsRunUat, } from "./auto-prompts.js";
@@ -59,6 +60,20 @@ export function setRewriteCount(basePath, count) {
     mkdirSync(join(gsdRoot(basePath), "runtime"), { recursive: true });
     writeFileSync(filePath, JSON.stringify({ count, updatedAt: new Date().toISOString() }) + "\n");
 }
+// ─── Helpers ─────────────────────────────────────────────────────────────
+/**
+ * Returns true when the verification_operational value indicates that no
+ * operational verification is needed.  Covers common phrasings the planning
+ * agent may use: "None", "None required", "N/A", "Not applicable", etc.
+ *
+ * @see https://github.com/gsd-build/gsd-2/issues/2931
+ */
+export function isVerificationNotApplicable(value) {
+    const v = (value ?? "").toLowerCase().trim();
+    if (!v || v === "none")
+        return true;
+    return /^(?:none[\s._-]*(?:required|needed|planned)?|n\/?a|not[\s._-]+(?:applicable|required|needed)|no[\s._-]+operational[\s\S]*)$/i.test(v);
+}
 // ─── Rules ────────────────────────────────────────────────────────────────
 export const DISPATCH_RULES = [
     {
@@ -383,7 +398,7 @@ export const DISPATCH_RULES = [
             }
             catch (err) {
                 // Non-fatal — fall through to sequential execution
-                process.stderr.write(`gsd-reactive: graph derivation failed: ${err.message}\n`);
+                logError("dispatch", "reactive graph derivation failed", { error: err.message });
                 return null;
             }
         },
@@ -526,16 +541,16 @@ export const DISPATCH_RULES = [
                 if (isDbAvailable()) {
                     const milestone = getMilestone(mid);
                     if (milestone?.verification_operational &&
-                        milestone.verification_operational.toLowerCase() !== "none") {
+                        !isVerificationNotApplicable(milestone.verification_operational)) {
                         const validationPath = resolveMilestoneFile(basePath, mid, "VALIDATION");
                         if (validationPath) {
                             const validationContent = await loadFile(validationPath);
                             if (validationContent) {
-                                // Accept either the structured template format (table with MET/N/A)
+                                // Accept either the structured template format (table with MET/N/A/SATISFIED)
                                 // or prose evidence patterns the validation agent may emit.
                                 const structuredMatch = validationContent.includes("Operational") &&
-                                    (validationContent.includes("MET") || validationContent.includes("N/A"));
-                                const proseMatch = /[Oo]perational[\s:][^\n]*(?:pass|verified|confirmed|met|complete|true|yes|addressed|covered|n\/a|not\s+applicable)/i.test(validationContent);
+                                    (validationContent.includes("MET") || validationContent.includes("N/A") || validationContent.includes("SATISFIED"));
+                                const proseMatch = /[Oo]perational[\s\S]{0,500}?(?:✅|pass|verified|confirmed|met|complete|true|yes|addressed|covered|satisfied|partially|n\/a|not[\s-]+applicable)/i.test(validationContent);
                                 const hasOperationalCheck = structuredMatch || proseMatch;
                                 if (!hasOperationalCheck) {
                                     return {