gsd-pi 2.34.0 → 2.35.0-dev.30eec3f

package/src/resources/extensions/async-jobs/await-tool.ts

@@ -60,7 +60,6 @@ export function createAwaitTool(getManager: () => AsyncJobManager): ToolDefiniti
 			const running = watched.filter((j) => j.status === "running");
 			if (running.length === 0) {
 				const result = formatResults(watched);
-				manager.acknowledgeDeliveries(watched.map((j) => j.id));
 				return { content: [{ type: "text", text: result }], details: undefined };
 			}
 
@@ -69,7 +68,6 @@ export function createAwaitTool(getManager: () => AsyncJobManager): ToolDefiniti
 
 			// Collect all completed results (more may have finished while waiting)
 			const completed = watched.filter((j) => j.status !== "running");
-			manager.acknowledgeDeliveries(completed.map((j) => j.id));
 
 			const stillRunning = watched.filter((j) => j.status === "running");
 			let result = formatResults(completed);

package/src/resources/extensions/async-jobs/job-manager.ts

@@ -148,13 +148,6 @@ export class AsyncJobManager {
 		return [...this.jobs.values()];
 	}
 
-	/**
-	 * No-op. Retained for API compatibility with await_job tool.
-	 */
-	acknowledgeDeliveries(_jobIds: string[]): void {
-		// Delivery is fire-once; no retries to cancel.
-	}
-
 	/**
 	 * Cleanup all timers and resources.
 	 */

package/src/resources/extensions/bg-shell/output-formatter.ts

@@ -22,7 +22,6 @@ import {
 	READINESS_PATTERNS,
 	BUILD_COMPLETE_PATTERNS,
 	TEST_RESULT_PATTERNS,
-	LINE_DEDUP_MAX,
 } from "./types.js";
 import { addEvent, pushAlert } from "./process-manager.js";
 import { transitionToReady } from "./readiness-detector.js";
@@ -106,22 +105,6 @@ export function analyzeLine(bg: BgProcess, line: string, stream: "stdout" | "std
 		}
 	}
 
-	// Dedup tracking — evict oldest entry when map exceeds LINE_DEDUP_MAX (LRU via Map insertion order)
-	bg.totalRawLines++;
-	const lineHash = line.trim().slice(0, 100);
-	const existing = bg.lineDedup.get(lineHash);
-	if (existing !== undefined) {
-		// Re-insert to update insertion order (move to tail = most recent)
-		bg.lineDedup.delete(lineHash);
-		bg.lineDedup.set(lineHash, existing + 1);
-	} else {
-		if (bg.lineDedup.size >= LINE_DEDUP_MAX) {
-			// Evict oldest entry (Map iteration order = insertion order = LRU at head)
-			const oldest = bg.lineDedup.keys().next().value;
-			if (oldest !== undefined) bg.lineDedup.delete(oldest);
-		}
-		bg.lineDedup.set(lineHash, 1);
-	}
 }
 
 // ── Digest Generation ──────────────────────────────────────────────────────

package/src/resources/extensions/bg-shell/process-manager.ts

@@ -162,12 +162,8 @@ export function startProcess(opts: StartOptions): BgProcess {
 		group: opts.group || null,
 		lastErrorCount: 0,
 		lastWarningCount: 0,
-		commandHistory: [],
-		lineDedup: new Map(),
-		totalRawLines: 0,
 		stdoutLineCount: 0,
 		stderrLineCount: 0,
-		envKeys: Object.keys(opts.env || {}),
 		restartCount: 0,
 		startConfig: {
 			command,

package/src/resources/extensions/bg-shell/types.ts

@@ -21,9 +21,7 @@ export interface ProcessEvent {
 		| "recovered"
 		| "exited"
 		| "crashed"
-		| "output"
 		| "port_open"
-		| "pattern_match"
 		| "port_timeout";
 	timestamp: number;
 	detail: string;
@@ -92,18 +90,10 @@ export interface BgProcess {
 	lastErrorCount: number;
 	/** Last warning count snapshot for diff detection */
 	lastWarningCount: number;
-	/** Command history for shell-type sessions */
-	commandHistory: string[];
-	/** Dedup tracker: hash → count of repeated lines (capped at LINE_DEDUP_MAX entries) */
-	lineDedup: Map<string, number>;
-	/** Total raw lines (before dedup) for token savings calc */
-	totalRawLines: number;
 	/** Tracked stdout line count (incremented in addOutputLine, avoids O(n) filter) */
 	stdoutLineCount: number;
 	/** Tracked stderr line count (incremented in addOutputLine, avoids O(n) filter) */
 	stderrLineCount: number;
-	/** Env snapshot (keys only, no values for security) */
-	envKeys: string[];
 	/** Restart count */
 	restartCount: number;
 	/** Original start config for restart */
@@ -187,8 +177,6 @@ export interface ProcessManifest {
 export const MAX_BUFFER_LINES = 5000;
 export const MAX_EVENTS = 200;
 export const DEAD_PROCESS_TTL = 10 * 60 * 1000;
-/** Maximum unique entries in the per-process lineDedup Map before LRU eviction. */
-export const LINE_DEDUP_MAX = 500;
 export const PORT_PROBE_TIMEOUT = 500;
 export const READY_POLL_INTERVAL = 250;
 export const DEFAULT_READY_TIMEOUT = 30000;

package/src/resources/extensions/context7/index.ts

@@ -414,6 +414,13 @@ export default function (pi: ExtensionAPI) {
 		},
 	});
 
+	// ── Session cleanup ─────────────────────────────────────────────────────
+
+	pi.on("session_shutdown", async () => {
+		searchCache.clear();
+		docCache.clear();
+	});
+
 	// ── Startup notification ─────────────────────────────────────────────────
 
 	pi.on("session_start", async (_event, ctx) => {

package/src/resources/extensions/get-secrets-from-user.ts

@@ -11,9 +11,9 @@ import { existsSync, statSync } from "node:fs";
 import { resolve } from "node:path";
 
 import type { ExtensionAPI, Theme } from "@gsd/pi-coding-agent";
-import { CURSOR_MARKER, Editor, type EditorTheme, Key, matchesKey, Text, truncateToWidth, wrapTextWithAnsi } from "@gsd/pi-tui";
+import { Editor, type EditorTheme, Key, matchesKey, Text, truncateToWidth, wrapTextWithAnsi } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
-import { makeUI, type ProgressStatus } from "./shared/mod.js";
+import { makeUI, maskEditorLine, type ProgressStatus } from "./shared/mod.js";
 import { parseSecretsManifest, formatSecretsManifest } from "./gsd/files.js";
 import { resolveMilestoneFile } from "./gsd/paths.js";
 import type { SecretsManifestEntry } from "./gsd/types.js";
@@ -42,39 +42,6 @@ function maskPreview(value: string): string {
 	return `${value.slice(0, 4)}${"*".repeat(Math.max(4, value.length - 8))}${value.slice(-4)}`;
 }
 
-/**
- * Replace editor visible text with masked characters while preserving ANSI cursor/sequencer codes.
- */
-function maskEditorLine(line: string): string {
-	// Keep border / metadata lines readable.
-	if (line.startsWith("─")) {
-		return line;
-	}
-
-	let output = "";
-	let i = 0;
-	while (i < line.length) {
-		if (line.startsWith(CURSOR_MARKER, i)) {
-			output += CURSOR_MARKER;
-			i += CURSOR_MARKER.length;
-			continue;
-		}
-
-		const ansiMatch = /^\x1b\[[0-9;]*m/.exec(line.slice(i));
-		if (ansiMatch) {
-			output += ansiMatch[0];
-			i += ansiMatch[0].length;
-			continue;
-		}
-
-		const ch = line[i] as string;
-		output += ch === " " ? " " : "*";
-		i += 1;
-	}
-
-	return output;
-}
-
 function shellEscapeSingle(value: string): string {
 	return `'${value.replace(/'/g, `'\\''`)}'`;
 }

package/src/resources/extensions/google-search/index.ts

@@ -411,6 +411,13 @@ export default function (pi: ExtensionAPI) {
 		},
 	});
 
+	// ── Session cleanup ─────────────────────────────────────────────────────
+
+	pi.on("session_shutdown", async () => {
+		resultCache.clear();
+		client = null;
+	});
+
 	// ── Startup notification ─────────────────────────────────────────────────
 
 	pi.on("session_start", async (_event, ctx) => {

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

@@ -12,14 +12,16 @@
 import type { GSDState } from "./types.js";
 import type { GSDPreferences } from "./preferences.js";
 import type { UatType } from "./files.js";
-import { loadFile, extractUatType, loadActiveOverrides } from "./files.js";
+import { loadFile, extractUatType, loadActiveOverrides, parseRoadmap } from "./files.js";
 import {
   resolveMilestoneFile,
   resolveMilestonePath,
   resolveSliceFile,
+  resolveSlicePath,
   resolveTaskFile,
   relSliceFile,
   buildMilestoneFileName,
+  buildSliceFileName,
 } from "./paths.js";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
@@ -369,6 +371,30 @@ const DISPATCH_RULES: DispatchRule[] = [
     name: "validating-milestone → validate-milestone",
     match: async ({ state, mid, midTitle, basePath, prefs }) => {
       if (state.phase !== "validating-milestone") return null;
+
+      // Safety guard (#1368): verify all roadmap slices have SUMMARY files before
+      // allowing milestone validation. If any slice lacks a summary, the milestone
+      // is not genuinely complete — something skipped earlier slices.
+      const roadmapFile = resolveMilestoneFile(basePath, mid, "ROADMAP");
+      const roadmapContent = roadmapFile ? await loadFile(roadmapFile) : null;
+      if (roadmapContent) {
+        const roadmap = parseRoadmap(roadmapContent);
+        const missingSlices: string[] = [];
+        for (const slice of roadmap.slices) {
+          const summaryPath = resolveSliceFile(basePath, mid, slice.id, "SUMMARY");
+          if (!summaryPath || !existsSync(summaryPath)) {
+            missingSlices.push(slice.id);
+          }
+        }
+        if (missingSlices.length > 0) {
+          return {
+            action: "stop",
+            reason: `Cannot validate milestone ${mid}: slices ${missingSlices.join(", ")} are missing SUMMARY files. These slices may have been skipped.`,
+            level: "error",
+          };
+        }
+      }
+
       // Skip preference: write a minimal pass-through VALIDATION file
       if (prefs?.phases?.skip_milestone_validation) {
         const mDir = resolveMilestonePath(basePath, mid);
@@ -404,6 +430,28 @@ const DISPATCH_RULES: DispatchRule[] = [
     name: "completing-milestone → complete-milestone",
     match: async ({ state, mid, midTitle, basePath }) => {
       if (state.phase !== "completing-milestone") return null;
+
+      // Safety guard (#1368): verify all roadmap slices have SUMMARY files.
+      const roadmapFile = resolveMilestoneFile(basePath, mid, "ROADMAP");
+      const roadmapContent = roadmapFile ? await loadFile(roadmapFile) : null;
+      if (roadmapContent) {
+        const roadmap = parseRoadmap(roadmapContent);
+        const missingSlices: string[] = [];
+        for (const slice of roadmap.slices) {
+          const summaryPath = resolveSliceFile(basePath, mid, slice.id, "SUMMARY");
+          if (!summaryPath || !existsSync(summaryPath)) {
+            missingSlices.push(slice.id);
+          }
+        }
+        if (missingSlices.length > 0) {
+          return {
+            action: "stop",
+            reason: `Cannot complete milestone ${mid}: slices ${missingSlices.join(", ")} are missing SUMMARY files. Run /gsd doctor to diagnose.`,
+            level: "error",
+          };
+        }
+      }
+
       return {
         action: "dispatch",
         unitType: "complete-milestone",

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

@@ -221,6 +221,15 @@ export async function runUnit(
     s.pendingResolve = resolve;
   });
 
+  // Ensure cwd matches basePath before dispatch (#1389).
+  // async_bash and background jobs can drift cwd away from the worktree.
+  // Realigning here prevents commits from landing on the wrong branch.
+  try {
+    if (process.cwd() !== s.basePath) {
+      process.chdir(s.basePath);
+    }
+  } catch { /* non-fatal — chdir may fail if dir was removed */ }
+
   // ── Send the prompt ──
   debugLog("runUnit", { phase: "send-message", unitType, unitId });
 
@@ -344,6 +353,7 @@ export interface LoopDeps {
   getManifestStatus: (
     basePath: string,
     mid: string | undefined,
+    projectRoot?: string,
   ) => Promise<{ pending: unknown[] } | null>;
   collectSecretsFromManifest: (
     basePath: string,
@@ -983,7 +993,7 @@ export async function autoLoop(
 
       // Secrets re-check gate
       try {
-        const manifestStatus = await deps.getManifestStatus(s.basePath, mid);
+        const manifestStatus = await deps.getManifestStatus(s.basePath, mid, s.originalBasePath);
         if (manifestStatus && manifestStatus.pending.length > 0) {
           const result = await deps.collectSecretsFromManifest(
             s.basePath,

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

@@ -8,6 +8,8 @@
  */
 
 import type { ExtensionContext } from "@gsd/pi-coding-agent";
+import { parseUnitId } from "./unit-id.js";
+import { atomicWriteSync } from "./atomic-write.js";
 import { clearUnitRuntimeRecord } from "./unit-runtime.js";
 import { clearParseCache, parseRoadmap, parsePlan } from "./files.js";
 import { isValidationTerminal } from "./state.js";
@@ -35,6 +37,7 @@ import {
   clearPathCache,
   resolveGsdRootFile,
 } from "./paths.js";
+import { markSliceDoneInRoadmap } from "./roadmap-mutations.js";
 import {
   existsSync,
   mkdirSync,
@@ -499,6 +502,42 @@ export async function selfHealRuntimeRecords(
     for (const record of records) {
       const { unitType, unitId } = record;
 
+      // Case 0: complete-slice with SUMMARY + UAT but unchecked roadmap (#1350).
+      // If a complete-slice was interrupted after writing artifacts but before
+      // flipping the roadmap checkbox, the verification fails and the dispatch
+      // loop relaunches the same unit forever. Auto-fix the checkbox.
+      if (unitType === "complete-slice") {
+        const { milestone: mid, slice: sid } = parseUnitId(unitId);
+        if (mid && sid) {
+          const dir = resolveSlicePath(base, mid, sid);
+          if (dir) {
+            const summaryPath = join(dir, buildSliceFileName(sid, "SUMMARY"));
+            const uatPath = join(dir, buildSliceFileName(sid, "UAT"));
+            if (existsSync(summaryPath) && existsSync(uatPath)) {
+              const roadmapFile = resolveMilestoneFile(base, mid, "ROADMAP");
+              if (roadmapFile && existsSync(roadmapFile)) {
+                try {
+                  const roadmapContent = readFileSync(roadmapFile, "utf-8");
+                  const roadmap = parseRoadmap(roadmapContent);
+                  const slice = (roadmap.slices ?? []).find(s => s.id === sid);
+                  if (slice && !slice.done) {
+                    // Auto-fix: flip the checkbox using shared utility
+                    if (markSliceDoneInRoadmap(base, mid, sid)) {
+                      ctx.ui.notify(
+                        `Self-heal: marked ${sid} done in roadmap (SUMMARY + UAT exist but checkbox was stale).`,
+                        "info",
+                      );
+                    }
+                  }
+                } catch {
+                  // Roadmap parse failure — don't block self-heal
+                }
+              }
+            }
+          }
+        }
+      }
+
       // Clear stale dispatched records (dispatched > 1h ago, process crashed)
       const age = now - (record.startedAt ?? 0);
       if (record.phase === "dispatched" && age > STALE_THRESHOLD_MS) {

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

@@ -20,6 +20,8 @@ import {
   resolveSkillDiscoveryMode,
   getIsolationMode,
 } from "./preferences.js";
+import { ensureGsdSymlink } from "./repo-identity.js";
+import { migrateToExternalState, recoverFailedMigration } from "./migrate-external.js";
 import { collectSecretsFromManifest } from "../get-secrets-from-user.js";
 import { gsdRoot, resolveMilestoneFile, milestonesDir } from "./paths.js";
 import { invalidateAllCaches } from "./cache.js";
@@ -92,6 +94,13 @@ export interface BootstrapDeps {
  * Returns false if the bootstrap aborted (e.g., guided flow returned,
  * concurrent session detected). Returns true when ready to dispatch.
  */
+
+/** Guard: tracks consecutive bootstrap attempts that found phase === "complete".
+ *  Prevents the recursive dialog loop described in #1348 where
+ *  bootstrapAutoSession → showSmartEntry → checkAutoStartAfterDiscuss → startAuto
+ *  cycles indefinitely when the discuss workflow doesn't produce a milestone. */
+let _consecutiveCompleteBootstraps = 0;
+const MAX_CONSECUTIVE_COMPLETE_BOOTSTRAPS = 2;
 export async function bootstrapAutoSession(
   s: AutoSession,
   ctx: ExtensionCommandContext,
@@ -128,7 +137,20 @@ export async function bootstrapAutoSession(
       nativeInit(base, mainBranch);
     }
 
-    // Ensure .gitignore has baseline patterns
+    // Migrate legacy in-project .gsd/ to external state directory.
+    // Migration MUST run before ensureGitignore to avoid adding ".gsd" to
+    // .gitignore when .gsd/ is git-tracked (data-loss bug #1364).
+    recoverFailedMigration(base);
+    const migration = migrateToExternalState(base);
+    if (migration.error) {
+      ctx.ui.notify(`External state migration warning: ${migration.error}`, "warning");
+    }
+    // Ensure symlink exists (handles fresh projects and post-migration)
+    ensureGsdSymlink(base);
+
+    // Ensure .gitignore has baseline patterns.
+    // ensureGitignore checks for git-tracked .gsd/ files and skips the
+    // ".gsd" pattern if the project intentionally tracks .gsd/ in git.
     const gitPrefs = loadEffectiveGSDPreferences()?.preferences?.git;
     const commitDocs = gitPrefs?.commit_docs;
     const manageGitignore = gitPrefs?.manage_gitignore;
@@ -286,6 +308,20 @@ export async function bootstrapAutoSession(
     if (!hasSurvivorBranch) {
       // No active work — start a new milestone via discuss flow
       if (!state.activeMilestone || state.phase === "complete") {
+        // Guard against recursive dialog loop (#1348):
+        // If we've entered this branch multiple times in quick succession,
+        // the discuss workflow isn't producing a milestone. Break the cycle.
+        _consecutiveCompleteBootstraps++;
+        if (_consecutiveCompleteBootstraps > MAX_CONSECUTIVE_COMPLETE_BOOTSTRAPS) {
+          _consecutiveCompleteBootstraps = 0;
+          ctx.ui.notify(
+            "All milestones are complete and the discussion didn't produce a new one. " +
+            "Run /gsd to start a new milestone manually.",
+            "warning",
+          );
+          return releaseLockAndReturn();
+        }
+
         const { showSmartEntry } = await import("./guided-flow.js");
         await showSmartEntry(ctx, pi, base, { step: requestedStepMode });
 
@@ -296,6 +332,7 @@ export async function bootstrapAutoSession(
           postState.phase !== "complete" &&
           postState.phase !== "pre-planning"
         ) {
+          _consecutiveCompleteBootstraps = 0; // Successfully advanced past "complete"
           state = postState;
         } else if (
           postState.activeMilestone &&
@@ -352,6 +389,9 @@ export async function bootstrapAutoSession(
       return releaseLockAndReturn();
     }
 
+    // Successfully resolved an active milestone — reset the re-entry guard
+    _consecutiveCompleteBootstraps = 0;
+
     // ── Initialize session state ──
     s.active = true;
     s.stepMode = requestedStepMode;
@@ -484,7 +524,7 @@ export async function bootstrapAutoSession(
     // Secrets collection gate
     const mid = state.activeMilestone!.id;
     try {
-      const manifestStatus = await getManifestStatus(base, mid);
+      const manifestStatus = await getManifestStatus(base, mid, s.originalBasePath || base);
       if (manifestStatus && manifestStatus.pending.length > 0) {
         const result = await collectSecretsFromManifest(base, mid, ctx);
         if (

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

@@ -127,7 +127,7 @@ import {
   formatTokenCount,
 } from "./metrics.js";
 import { join } from "node:path";
-import { readFileSync, existsSync, mkdirSync } from "node:fs";
+import { readFileSync, existsSync, mkdirSync, writeFileSync, unlinkSync } from "node:fs";
 import { atomicWriteSync } from "./atomic-write.js";
 import {
   autoCommitCurrentBranch,
@@ -554,6 +554,13 @@ export async function stopAuto(
   resetRoutingHistory();
   resetHookState();
   if (s.basePath) clearPersistedHookState(s.basePath);
+
+  // Remove paused-session metadata if present (#1383)
+  try {
+    const pausedPath = join(gsdRoot(s.originalBasePath || s.basePath), "runtime", "paused-session.json");
+    if (existsSync(pausedPath)) unlinkSync(pausedPath);
+  } catch { /* non-fatal */ }
+
   s.active = false;
   s.paused = false;
   s.stepMode = false;
@@ -607,8 +614,32 @@ export async function pauseAuto(
 
   s.pausedSessionFile = ctx?.sessionManager?.getSessionFile() ?? null;
 
-  if (lockBase()) clearLock(lockBase());
-  if (lockBase()) releaseSessionLock(lockBase());
+  // Persist paused-session metadata so resume survives /exit (#1383).
+  // The fresh-start bootstrap checks for this file and restores worktree context.
+  try {
+    const pausedMeta = {
+      milestoneId: s.currentMilestoneId,
+      worktreePath: isInAutoWorktree(s.basePath) ? s.basePath : null,
+      originalBasePath: s.originalBasePath,
+      stepMode: s.stepMode,
+      pausedAt: new Date().toISOString(),
+      sessionFile: s.pausedSessionFile,
+    };
+    const runtimeDir = join(gsdRoot(s.originalBasePath || s.basePath), "runtime");
+    mkdirSync(runtimeDir, { recursive: true });
+    writeFileSync(
+      join(runtimeDir, "paused-session.json"),
+      JSON.stringify(pausedMeta, null, 2),
+      "utf-8",
+    );
+  } catch {
+    // Non-fatal — resume will still work via full bootstrap, just without worktree context
+  }
+
+  if (lockBase()) {
+    releaseSessionLock(lockBase());
+    clearLock(lockBase());
+  }
 
   deregisterSigtermHandler();
 
@@ -792,6 +823,30 @@ export async function startAuto(
   base = escapeStaleWorktree(base);
 
   // If resuming from paused state, just re-activate and dispatch next unit.
+  // Check persisted paused-session first (#1383) — survives /exit.
+  if (!s.paused) {
+    try {
+      const pausedPath = join(gsdRoot(base), "runtime", "paused-session.json");
+      if (existsSync(pausedPath)) {
+        const meta = JSON.parse(readFileSync(pausedPath, "utf-8"));
+        if (meta.milestoneId) {
+          s.currentMilestoneId = meta.milestoneId;
+          s.originalBasePath = meta.originalBasePath || base;
+          s.stepMode = meta.stepMode ?? requestedStepMode;
+          s.paused = true;
+          // Clean up the persisted file — we're consuming it
+          try { unlinkSync(pausedPath); } catch { /* non-fatal */ }
+          ctx.ui.notify(
+            `Resuming paused session for ${meta.milestoneId}${meta.worktreePath ? ` (worktree)` : ""}.`,
+            "info",
+          );
+        }
+      }
+    } catch {
+      // Malformed or missing — proceed with fresh bootstrap
+    }
+  }
+
   if (s.paused) {
     const resumeLock = acquireSessionLock(base);
     if (!resumeLock.acquired) {
@@ -1145,6 +1200,9 @@ export async function dispatchHookUnit(
   ctx.ui.setStatus("gsd-auto", s.stepMode ? "next" : "auto");
   ctx.ui.notify(`Running post-unit hook: ${hookName}`, "info");
 
+  // Ensure cwd matches basePath before hook dispatch (#1389)
+  try { if (process.cwd() !== s.basePath) process.chdir(s.basePath); } catch {}
+
   debugLog("dispatchHookUnit", {
     phase: "send-message",
     promptLength: hookPrompt.length,