gsd-pi 2.33.1-dev.ee47f1b → 2.34.0-dev.bbb5216

package/packages/pi-coding-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gsd/pi-coding-agent",
-  "version": "2.33.1",
+  "version": "2.34.0",
   "description": "Coding agent CLI (vendored from pi-mono)",
   "type": "module",
   "piConfig": {

package/pkg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glittercowboy/gsd",
-  "version": "2.33.1",
+  "version": "2.34.0",
   "piConfig": {
     "name": "gsd",
     "configDir": ".gsd"

package/src/resources/extensions/gsd/auto/session.ts

@@ -52,16 +52,28 @@ export interface PendingVerificationRetry {
   attempt: number;
 }
 
+/**
+ * A typed item enqueued by postUnitPostVerification for the main loop to
+ * drain via the standard runUnit path. Replaces inline dispatch
+ * (pi.sendMessage / s.cmdCtx.newSession()) for hooks, triage, and quick-tasks.
+ */
+export interface SidecarItem {
+  kind: "hook" | "triage" | "quick-task";
+  unitType: string;
+  unitId: string;
+  prompt: string;
+  /** Model override for hook units (e.g. "anthropic/claude-3-5-sonnet"). */
+  model?: string;
+  /** Capture ID for quick-task items (already marked executed at enqueue time). */
+  captureId?: string;
+}
+
 // ─── Constants ───────────────────────────────────────────────────────────────
 
 export const MAX_UNIT_DISPATCHES = 3;
 export const STUB_RECOVERY_THRESHOLD = 2;
 export const MAX_LIFETIME_DISPATCHES = 6;
-export const MAX_CONSECUTIVE_SKIPS = 3;
-export const DISPATCH_GAP_TIMEOUT_MS = 5_000;
-export const MAX_SKIP_DEPTH = 20;
 export const NEW_SESSION_TIMEOUT_MS = 30_000;
-export const DISPATCH_HANG_TIMEOUT_MS = 60_000;
 
 // ─── AutoSession ─────────────────────────────────────────────────────────────
 
@@ -69,7 +81,6 @@ export class AutoSession {
   // ── Lifecycle ────────────────────────────────────────────────────────────
   active = false;
   paused = false;
-  pausedForSecrets = false;
   stepMode = false;
   verbose = false;
   cmdCtx: ExtensionCommandContext | null = null;
@@ -83,15 +94,12 @@ export class AutoSession {
   readonly unitDispatchCount = new Map<string, number>();
   readonly unitLifetimeDispatches = new Map<string, number>();
   readonly unitRecoveryCount = new Map<string, number>();
-  readonly unitConsecutiveSkips = new Map<string, number>();
-  readonly completedKeySet = new Set<string>();
 
   // ── Timers ───────────────────────────────────────────────────────────────
   unitTimeoutHandle: ReturnType<typeof setTimeout> | null = null;
   wrapupWarningHandle: ReturnType<typeof setTimeout> | null = null;
   idleWatchdogHandle: ReturnType<typeof setInterval> | null = null;
   continueHereHandle: ReturnType<typeof setInterval> | null = null;
-  dispatchGapHandle: ReturnType<typeof setTimeout> | null = null;
 
   // ── Current unit ─────────────────────────────────────────────────────────
   currentUnit: CurrentUnit | null = null;
@@ -113,12 +121,8 @@ export class AutoSession {
   resourceVersionOnStart: string | null = null;
   lastStateRebuildAt = 0;
 
-  // ── Guards ───────────────────────────────────────────────────────────────
-  handlingAgentEnd = false;
-  pendingAgentEndRetry = false;
-  dispatching = false;
-  skipDepth = 0;
-  readonly recentlyEvictedKeys = new Set<string>();
+  // ── Sidecar queue ─────────────────────────────────────────────────────
+  sidecarQueue: SidecarItem[] = [];
 
   // ── Metrics ──────────────────────────────────────────────────────────────
   autoStartTime = 0;
@@ -129,6 +133,29 @@ export class AutoSession {
   // ── Signal handler ───────────────────────────────────────────────────────
   sigtermHandler: (() => void) | null = null;
 
+  // ── Loop promise state ──────────────────────────────────────────────────
+  /**
+   * True only while runUnit is rotating into a fresh session. agent_end events
+   * emitted from the previous session's abort during this window must be
+   * ignored; they do not belong to the new unit.
+   */
+  sessionSwitchInFlight = false;
+
+  /**
+   * One-shot resolver for the current unit's agent_end promise.
+   * Non-null only while a unit is in-flight (between sendMessage and agent_end).
+   * Scoped to the session to prevent concurrent session corruption.
+   */
+  pendingResolve: ((result: { status: "completed" | "cancelled" | "error"; event?: { messages: unknown[] } }) => void) | null = null;
+
+  /**
+   * Queue for agent_end events that arrive when no pendingResolve exists.
+   * This happens when error-recovery sendMessage retries produce agent_end
+   * events between loop iterations. The next runUnit drains this queue
+   * instead of waiting for a new event.
+   */
+  pendingAgentEndQueue: Array<{ messages: unknown[] }> = [];
+
   // ── Methods ──────────────────────────────────────────────────────────────
 
   clearTimers(): void {
@@ -136,13 +163,11 @@ export class AutoSession {
     if (this.wrapupWarningHandle) { clearTimeout(this.wrapupWarningHandle); this.wrapupWarningHandle = null; }
     if (this.idleWatchdogHandle) { clearInterval(this.idleWatchdogHandle); this.idleWatchdogHandle = null; }
     if (this.continueHereHandle) { clearInterval(this.continueHereHandle); this.continueHereHandle = null; }
-    if (this.dispatchGapHandle) { clearTimeout(this.dispatchGapHandle); this.dispatchGapHandle = null; }
   }
 
   resetDispatchCounters(): void {
     this.unitDispatchCount.clear();
     this.unitLifetimeDispatches.clear();
-    this.unitConsecutiveSkips.clear();
   }
 
   get lockBasePath(): string {
@@ -163,7 +188,6 @@ export class AutoSession {
     // Lifecycle
     this.active = false;
     this.paused = false;
-    this.pausedForSecrets = false;
     this.stepMode = false;
     this.verbose = false;
     this.cmdCtx = null;
@@ -177,9 +201,6 @@ export class AutoSession {
     this.unitDispatchCount.clear();
     this.unitLifetimeDispatches.clear();
     this.unitRecoveryCount.clear();
-    this.unitConsecutiveSkips.clear();
-    // Note: completedKeySet is intentionally NOT cleared — it persists
-    // across restarts to prevent re-dispatching completed units.
 
     // Unit
     this.currentUnit = null;
@@ -201,21 +222,20 @@ export class AutoSession {
     this.resourceVersionOnStart = null;
     this.lastStateRebuildAt = 0;
 
-    // Guards
-    this.handlingAgentEnd = false;
-    this.pendingAgentEndRetry = false;
-    this.dispatching = false;
-    this.skipDepth = 0;
-    this.recentlyEvictedKeys.clear();
-
     // Metrics
     this.autoStartTime = 0;
     this.lastPromptCharCount = undefined;
     this.lastBaselineCharCount = undefined;
     this.pendingQuickTasks = [];
+    this.sidecarQueue = [];
 
     // Signal handler
     this.sigtermHandler = null;
+
+    // Loop promise state
+    this.sessionSwitchInFlight = false;
+    this.pendingResolve = null;
+    this.pendingAgentEndQueue = [];
   }
 
   toJSON(): Record<string, unknown> {
@@ -227,10 +247,7 @@ export class AutoSession {
       currentMilestoneId: this.currentMilestoneId,
       currentUnit: this.currentUnit,
       completedUnits: this.completedUnits.length,
-      completedKeySet: this.completedKeySet.size,
       unitDispatchCount: Object.fromEntries(this.unitDispatchCount),
-      dispatching: this.dispatching,
-      skipDepth: this.skipDepth,
     };
   }
 }

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

@@ -11,7 +11,6 @@ import type { GSDState } from "./types.js";
 import { getCurrentBranch } from "./worktree.js";
 import { getActiveHook } from "./post-unit-hooks.js";
 import { getLedger, getProjectTotals, formatCost, formatTokenCount, formatTierSavings } from "./metrics.js";
-import { getHealthTrend, getConsecutiveErrorUnits } from "./doctor-proactive.js";
 import {
   resolveMilestoneFile,
   resolveSliceFile,
@@ -20,7 +19,6 @@ import { parseRoadmap, parsePlan } from "./files.js";
 import { readFileSync, existsSync } from "node:fs";
 import { truncateToWidth, visibleWidth } from "@gsd/pi-tui";
 import { makeUI, GLYPH, INDENT } from "../shared/mod.js";
-import { parseUnitId } from "./unit-id.js";
 
 // ─── Dashboard Data ───────────────────────────────────────────────────────────
 
@@ -49,34 +47,40 @@ export interface AutoDashboardData {
 
 // ─── Unit Description Helpers ─────────────────────────────────────────────────
 
-/** Canonical verb and phase label for each known unit type. */
-const UNIT_TYPE_INFO: Record<string, { verb: string; phaseLabel: string }> = {
-  "research-milestone": { verb: "researching",  phaseLabel: "RESEARCH" },
-  "research-slice":     { verb: "researching",  phaseLabel: "RESEARCH" },
-  "plan-milestone":     { verb: "planning",     phaseLabel: "PLAN" },
-  "plan-slice":         { verb: "planning",     phaseLabel: "PLAN" },
-  "execute-task":       { verb: "executing",    phaseLabel: "EXECUTE" },
-  "complete-slice":     { verb: "completing",   phaseLabel: "COMPLETE" },
-  "replan-slice":       { verb: "replanning",   phaseLabel: "REPLAN" },
-  "rewrite-docs":       { verb: "rewriting",    phaseLabel: "REWRITE" },
-  "reassess-roadmap":   { verb: "reassessing",  phaseLabel: "REASSESS" },
-  "run-uat":            { verb: "running UAT",  phaseLabel: "UAT" },
-};
-
 export function unitVerb(unitType: string): string {
   if (unitType.startsWith("hook/")) return `hook: ${unitType.slice(5)}`;
-  return UNIT_TYPE_INFO[unitType]?.verb ?? unitType;
+  switch (unitType) {
+    case "research-milestone":
+    case "research-slice": return "researching";
+    case "plan-milestone":
+    case "plan-slice": return "planning";
+    case "execute-task": return "executing";
+    case "complete-slice": return "completing";
+    case "replan-slice": return "replanning";
+    case "rewrite-docs": return "rewriting";
+    case "reassess-roadmap": return "reassessing";
+    case "run-uat": return "running UAT";
+    default: return unitType;
+  }
 }
 
 export function unitPhaseLabel(unitType: string): string {
   if (unitType.startsWith("hook/")) return "HOOK";
-  return UNIT_TYPE_INFO[unitType]?.phaseLabel ?? unitType.toUpperCase();
+  switch (unitType) {
+    case "research-milestone": return "RESEARCH";
+    case "research-slice": return "RESEARCH";
+    case "plan-milestone": return "PLAN";
+    case "plan-slice": return "PLAN";
+    case "execute-task": return "EXECUTE";
+    case "complete-slice": return "COMPLETE";
+    case "replan-slice": return "REPLAN";
+    case "rewrite-docs": return "REWRITE";
+    case "reassess-roadmap": return "REASSESS";
+    case "run-uat": return "UAT";
+    default: return unitType.toUpperCase();
+  }
 }
 
-/**
- * Describe the expected next step after the current unit completes.
- * Unit types here mirror the keys in UNIT_TYPE_INFO above.
- */
 function peekNext(unitType: string, state: GSDState): string {
   // Show active hook info in progress display
   const activeHookState = getActiveHook();
@@ -305,16 +309,6 @@ export function updateProgressWidget(
   }
   if (cachedBranch) widgetPwd = `${widgetPwd} (${cachedBranch})`;
 
-  // Set a string-array fallback first — this is the only version RPC mode will
-  // see, since the factory widget set below is not supported in RPC mode.
-  const progressText = buildProgressTextLines(
-    verb, phaseLabel, unitId, mid, slice, task, next,
-    accessors, tierBadge, widgetPwd,
-  );
-  ctx.ui.setWidget("gsd-progress", progressText);
-
-  // Set the factory-based widget — in TUI mode this replaces the string-array
-  // version with a dynamic, animated widget. In RPC mode this call is a no-op.
   ctx.ui.setWidget("gsd-progress", (tui, theme) => {
     let pulseBright = true;
     let cachedLines: string[] | undefined;
@@ -372,11 +366,7 @@ export function updateProgressWidget(
 
         lines.push("");
 
-        const isHook = unitType.startsWith("hook/");
-        const hookParsed = isHook ? parseUnitId(unitId) : undefined;
-        const target = isHook
-          ? (hookParsed!.task ?? hookParsed!.slice ?? unitId)
-          : (task ? `${task.id}: ${task.title}` : unitId);
+        const target = task ? `${task.id}: ${task.title}` : unitId;
         const actionLeft = `${pad}${theme.fg("accent", "▸")} ${theme.fg("accent", verb)}  ${theme.fg("text", target)}`;
         const tierTag = tierBadge ? theme.fg("dim", `[${tierBadge}] `) : "";
         const phaseBadge = `${tierTag}${theme.fg("dim", phaseLabel)}`;
@@ -396,10 +386,7 @@ export function updateProgressWidget(
             let meta = theme.fg("dim", `${done}/${total} slices`);
 
             if (activeSliceTasks && activeSliceTasks.total > 0) {
-              // For hooks, show the trigger task number (done), not the next task (done + 1)
-              const taskNum = isHook
-                ? Math.max(activeSliceTasks.done, 1)
-                : Math.min(activeSliceTasks.done + 1, activeSliceTasks.total);
+              const taskNum = Math.min(activeSliceTasks.done + 1, activeSliceTasks.total);
               meta += theme.fg("dim", `  ·  task ${taskNum}/${activeSliceTasks.total}`);
             }
 
@@ -467,7 +454,6 @@ export function updateProgressWidget(
             sp.push(`\u26A1${hitRate}%`);
           }
           if (cumulativeCost) sp.push(`$${cumulativeCost.toFixed(3)}`);
-          else if (autoTotals?.apiRequests) sp.push(`${autoTotals.apiRequests} reqs`);
 
           const cxDisplay = cxPct === "?"
             ? `?/${formatWidgetTokens(cxWindow)}`
@@ -526,95 +512,6 @@ export function updateProgressWidget(
   });
 }
 
-// ─── Text Fallback for RPC Mode ───────────────────────────────────────────
-
-/**
- * Build a compact string-array representation of the progress widget.
- * Used as a fallback when the factory-based widget cannot render (RPC mode).
- */
-// ─── Model Health Indicator ───────────────────────────────────────────────────
-
-/**
- * Compute a traffic-light health indicator from observable signals.
- * 🟢 progressing well — no errors, trend stable/improving
- * 🟡 struggling — some errors or degrading trend
- * 🔴 stuck — consecutive errors, likely needs attention
- */
-export function getModelHealthIndicator(): { emoji: string; label: string } {
-  const trend = getHealthTrend();
-  const consecutiveErrors = getConsecutiveErrorUnits();
-
-  if (consecutiveErrors >= 3) {
-    return { emoji: "🔴", label: "stuck" };
-  }
-  if (consecutiveErrors >= 1 || trend === "degrading") {
-    return { emoji: "🟡", label: "struggling" };
-  }
-  if (trend === "improving") {
-    return { emoji: "🟢", label: "progressing well" };
-  }
-  // stable or unknown
-  return { emoji: "🟢", label: "progressing" };
-}
-
-function buildProgressTextLines(
-  verb: string,
-  phaseLabel: string,
-  unitId: string,
-  mid: { id: string; title: string } | null,
-  slice: { id: string; title: string } | null,
-  task: { id: string; title: string } | null,
-  next: string,
-  accessors: WidgetStateAccessors,
-  tierBadge: string | undefined,
-  widgetPwd: string,
-): string[] {
-  const mode = accessors.isStepMode() ? "step" : "auto";
-  const elapsed = formatAutoElapsed(accessors.getAutoStartTime());
-  const tierStr = tierBadge ? ` [${tierBadge}]` : "";
-
-  const lines: string[] = [];
-  lines.push(`[GSD ${mode}] ${verb} ${unitId}${tierStr}${elapsed ? ` — ${elapsed}` : ""}`);
-
-  if (mid) lines.push(`  Milestone: ${mid.id} — ${mid.title}`);
-  if (slice) lines.push(`  Slice: ${slice.id} — ${slice.title}`);
-  if (task) lines.push(`  Task: ${task.id} — ${task.title}`);
-
-  // Progress bar
-  const sp = cachedSliceProgress;
-  if (sp && sp.total > 0) {
-    const pct = Math.round((sp.done / sp.total) * 100);
-    const taskInfo = sp.activeSliceTasks
-      ? ` (tasks: ${sp.activeSliceTasks.done}/${sp.activeSliceTasks.total})`
-      : "";
-    lines.push(`  Progress: ${sp.done}/${sp.total} slices (${pct}%)${taskInfo}`);
-  }
-
-  // Cost / tokens
-  const ledger = getLedger();
-  const totals = ledger ? getProjectTotals(ledger.units) : null;
-  if (totals) {
-    const parts: string[] = [];
-    if (totals.tokens.input || totals.tokens.output) {
-      parts.push(`tokens: ${formatWidgetTokens(totals.tokens.input)}↑ ${formatWidgetTokens(totals.tokens.output)}↓`);
-    }
-    if (totals.cost > 0) {
-      parts.push(`cost: ${formatCost(totals.cost)}`);
-    }
-    if (parts.length > 0) lines.push(`  ${parts.join(" — ")}`);
-  }
-
-  if (next) lines.push(`  Next: ${next}`);
-
-  // Model health indicator
-  const health = getModelHealthIndicator();
-  lines.push(`  Health: ${health.emoji} ${health.label}`);
-
-  lines.push(`  ${widgetPwd}`);
-
-  return lines;
-}
-
 // ─── Right-align Helper ───────────────────────────────────────────────────────
 
 /** Right-align helper: build a line with left content and right content. */

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

@@ -182,10 +182,15 @@ export async function dispatchDirectPhase(
         ctx.ui.notify("Cannot dispatch run-uat: no UAT file found.", "warning");
         return;
       }
+      const uatContent = await loadFile(uatFile);
+      if (!uatContent) {
+        ctx.ui.notify("Cannot dispatch run-uat: UAT file is empty.", "warning");
+        return;
+      }
       const uatPath = relSliceFile(base, mid, sid, "UAT");
       unitType = "run-uat";
       unitId = `${mid}/${sid}`;
-      prompt = await buildRunUatPrompt(mid, sid, uatPath, base);
+      prompt = await buildRunUatPrompt(mid, sid, uatPath, uatContent, base);
       break;
     }