gsd-pi 2.33.1 → 2.34.0-dev.bbb5216

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

@@ -4,30 +4,45 @@
 
 // ─── Enums & Literal Unions ────────────────────────────────────────────────
 
-export type RiskLevel = 'low' | 'medium' | 'high';
-export type Phase = 'pre-planning' | 'needs-discussion' | 'discussing' | 'researching' | 'planning' | 'executing' | 'verifying' | 'summarizing' | 'advancing' | 'validating-milestone' | 'completing-milestone' | 'replanning-slice' | 'complete' | 'paused' | 'blocked';
-export type ContinueStatus = 'in_progress' | 'interrupted' | 'compacted';
+export type RiskLevel = "low" | "medium" | "high";
+export type Phase =
+  | "pre-planning"
+  | "needs-discussion"
+  | "discussing"
+  | "researching"
+  | "planning"
+  | "executing"
+  | "verifying"
+  | "summarizing"
+  | "advancing"
+  | "validating-milestone"
+  | "completing-milestone"
+  | "replanning-slice"
+  | "complete"
+  | "paused"
+  | "blocked";
+export type ContinueStatus = "in_progress" | "interrupted" | "compacted";
 
 // ─── Roadmap (Milestone-level) ─────────────────────────────────────────────
 
 export interface RoadmapSliceEntry {
-  id: string;          // e.g. "S01"
-  title: string;       // e.g. "Types + File I/O + Git Operations"
+  id: string; // e.g. "S01"
+  title: string; // e.g. "Types + File I/O + Git Operations"
   risk: RiskLevel;
-  depends: string[];   // e.g. ["S01", "S02"]
+  depends: string[]; // e.g. ["S01", "S02"]
   done: boolean;
-  demo: string;        // the "After this:" sentence
+  demo: string; // the "After this:" sentence
 }
 
 export interface BoundaryMapEntry {
-  fromSlice: string;   // e.g. "S01"
-  toSlice: string;     // e.g. "S02" or "terminal"
-  produces: string;    // raw text block of what this slice produces
-  consumes: string;    // raw text block of what it consumes (or "nothing")
+  fromSlice: string; // e.g. "S01"
+  toSlice: string; // e.g. "S02" or "terminal"
+  produces: string; // raw text block of what this slice produces
+  consumes: string; // raw text block of what it consumes (or "nothing")
 }
 
 export interface Roadmap {
-  title: string;       // e.g. "M001: GSD Extension — Hierarchical Planning with Auto Mode"
+  title: string; // e.g. "M001: GSD Extension — Hierarchical Planning with Auto Mode"
   vision: string;
   successCriteria: string[];
   slices: RoadmapSliceEntry[];
@@ -37,25 +52,24 @@ export interface Roadmap {
 // ─── Slice Plan ────────────────────────────────────────────────────────────
 
 export interface TaskPlanEntry {
-  id: string;          // e.g. "T01"
-  title: string;       // e.g. "Core Type Definitions"
+  id: string; // e.g. "T01"
+  title: string; // e.g. "Core Type Definitions"
   description: string;
   done: boolean;
-  estimate: string;    // e.g. "30m", "2h" — informational only
-  files?: string[];    // e.g. ["types.ts", "files.ts"] — extracted from "- Files:" subline
-  verify?: string;     // e.g. "run tests" — extracted from "- Verify:" subline
+  estimate: string; // e.g. "30m", "2h" — informational only
+  files?: string[]; // e.g. ["types.ts", "files.ts"] — extracted from "- Files:" subline
+  verify?: string; // e.g. "run tests" — extracted from "- Verify:" subline
 }
 
 // ─── Verification Gate ─────────────────────────────────────────────────────
 
 /** Result of a single verification command execution */
 export interface VerificationCheck {
-  command: string;       // e.g. "npm run lint"
-  exitCode: number;      // 0 = pass
+  command: string; // e.g. "npm run lint"
+  exitCode: number; // 0 = pass
   stdout: string;
   stderr: string;
   durationMs: number;
-  blocking: boolean;     // true for preference/task-plan sources, false for package-json (advisory only)
 }
 
 /** A runtime error captured from bg-shell processes or browser console */
@@ -77,17 +91,17 @@ export interface AuditWarning {
 
 /** Aggregate result from the verification gate */
 export interface VerificationResult {
-  passed: boolean;              // true if all checks passed (or no checks discovered)
-  checks: VerificationCheck[];  // per-command results
+  passed: boolean; // true if all checks passed (or no checks discovered)
+  checks: VerificationCheck[]; // per-command results
   discoverySource: "preference" | "task-plan" | "package-json" | "none";
-  timestamp: number;            // Date.now() at gate start
-  runtimeErrors?: RuntimeError[];  // optional — populated by captureRuntimeErrors()
-  auditWarnings?: AuditWarning[];  // optional — populated by runDependencyAudit()
+  timestamp: number; // Date.now() at gate start
+  runtimeErrors?: RuntimeError[]; // optional — populated by captureRuntimeErrors()
+  auditWarnings?: AuditWarning[]; // optional — populated by runDependencyAudit()
 }
 
 export interface SlicePlan {
-  id: string;          // e.g. "S01"
-  title: string;       // from the H1
+  id: string; // e.g. "S01"
+  title: string; // from the H1
   goal: string;
   demo: string;
   mustHaves: string[]; // top-level must-have bullet points
@@ -157,29 +171,29 @@ export interface Continue {
 
 // ─── Secrets Manifest ──────────────────────────────────────────────────────
 
-export type SecretsManifestEntryStatus = 'pending' | 'collected' | 'skipped';
+export type SecretsManifestEntryStatus = "pending" | "collected" | "skipped";
 
 export interface SecretsManifestEntry {
-  key: string;              // e.g. "OPENAI_API_KEY"
-  service: string;          // e.g. "OpenAI"
-  dashboardUrl: string;     // e.g. "https://platform.openai.com/api-keys" — empty if unknown
-  guidance: string[];       // numbered setup steps
-  formatHint: string;       // e.g. "starts with sk-" — empty if unknown
+  key: string; // e.g. "OPENAI_API_KEY"
+  service: string; // e.g. "OpenAI"
+  dashboardUrl: string; // e.g. "https://platform.openai.com/api-keys" — empty if unknown
+  guidance: string[]; // numbered setup steps
+  formatHint: string; // e.g. "starts with sk-" — empty if unknown
   status: SecretsManifestEntryStatus;
-  destination: string;      // e.g. "dotenv", "vercel", "convex"
+  destination: string; // e.g. "dotenv", "vercel", "convex"
 }
 
 export interface SecretsManifest {
-  milestone: string;        // e.g. "M001"
-  generatedAt: string;      // ISO 8601 timestamp
+  milestone: string; // e.g. "M001"
+  generatedAt: string; // ISO 8601 timestamp
   entries: SecretsManifestEntry[];
 }
 
 export interface ManifestStatus {
-  pending: string[];    // manifest status = pending AND not in env
-  collected: string[];  // manifest status = collected AND not in env
-  skipped: string[];    // manifest status = skipped
-  existing: string[];   // key present in .env or process.env (regardless of manifest status)
+  pending: string[]; // manifest status = pending AND not in env
+  collected: string[]; // manifest status = collected AND not in env
+  skipped: string[]; // manifest status = skipped
+  existing: string[]; // key present in .env or process.env (regardless of manifest status)
 }
 
 // ─── GSD State (Derived Dashboard) ────────────────────────────────────────
@@ -192,7 +206,7 @@ export interface ActiveRef {
 export interface MilestoneRegistryEntry {
   id: string;
   title: string;
-  status: 'complete' | 'active' | 'pending' | 'parked';
+  status: "complete" | "active" | "pending" | "parked";
   /** Milestone IDs that must be complete before this milestone becomes active. Populated from CONTEXT.md YAML frontmatter. */
   dependsOn?: string[];
 }
@@ -275,13 +289,13 @@ export interface HookDispatchResult {
 
 // ─── Budget & Notification Types ──────────────────────────────────────────
 
-export type BudgetEnforcementMode = 'warn' | 'pause' | 'halt';
+export type BudgetEnforcementMode = "warn" | "pause" | "halt";
 
-export type TokenProfile = 'budget' | 'balanced' | 'quality';
+export type TokenProfile = "budget" | "balanced" | "quality";
 
-export type InlineLevel = 'full' | 'standard' | 'minimal';
+export type InlineLevel = "full" | "standard" | "minimal";
 
-export type ComplexityTier = 'light' | 'standard' | 'heavy';
+export type ComplexityTier = "light" | "standard" | "heavy";
 
 export interface ClassificationResult {
   tier: ComplexityTier;
@@ -304,19 +318,18 @@ export interface PhaseSkipPreferences {
   skip_reassess?: boolean;
   skip_slice_research?: boolean;
   skip_milestone_validation?: boolean;
-  /** When true, reassess-roadmap fires after each slice completion. Opt-in. */
   reassess_after_slice?: boolean;
   /** When true, auto-mode pauses before each slice for discussion (#789). */
   require_slice_discussion?: boolean;
 }
 
 export interface NotificationPreferences {
-  enabled?: boolean;           // default true
-  on_complete?: boolean;       // notify on each unit completion
-  on_error?: boolean;          // notify on errors
-  on_budget?: boolean;         // notify on budget thresholds
-  on_milestone?: boolean;      // notify when milestone finishes
-  on_attention?: boolean;      // notify when manual attention needed
+  enabled?: boolean; // default true
+  on_complete?: boolean; // notify on each unit completion
+  on_error?: boolean; // notify on errors
+  on_budget?: boolean; // notify on budget thresholds
+  on_milestone?: boolean; // notify when milestone finishes
+  on_attention?: boolean; // notify when manual attention needed
 }
 
 // ─── Pre-Dispatch Hook Types ──────────────────────────────────────────────
@@ -327,7 +340,7 @@ export interface PreDispatchHookConfig {
   /** Unit types this hook intercepts before dispatch (e.g., ["execute-task"]). */
   before: string[];
   /** Action to take: "modify" mutates the prompt, "skip" skips the unit, "replace" swaps it. */
-  action: 'modify' | 'skip' | 'replace';
+  action: "modify" | "skip" | "replace";
   /** For "modify": text prepended to the unit prompt. Supports {milestoneId}, {sliceId}, {taskId}. */
   prepend?: string;
   /** For "modify": text appended to the unit prompt. Supports {milestoneId}, {sliceId}, {taskId}. */
@@ -346,7 +359,7 @@ export interface PreDispatchHookConfig {
 
 export interface PreDispatchResult {
   /** What happened: the unit proceeds with modifications, was skipped, or was replaced. */
-  action: 'proceed' | 'skip' | 'replace';
+  action: "proceed" | "skip" | "replace";
   /** Modified/replacement prompt (for "proceed" and "replace"). */
   prompt?: string;
   /** Override unit type (for "replace"). */
@@ -370,7 +383,7 @@ export interface HookStatusEntry {
   /** Hook name. */
   name: string;
   /** Hook type: "post" or "pre". */
-  type: 'post' | 'pre';
+  type: "post" | "pre";
   /** Whether hook is enabled. */
   enabled: boolean;
   /** What unit types it targets. */
@@ -382,36 +395,36 @@ export interface HookStatusEntry {
 // ─── Database Types (Decisions & Requirements) ────────────────────────────
 
 export interface Decision {
-  seq: number;              // auto-increment primary key
-  id: string;               // e.g. "D001"
-  when_context: string;     // when/context of the decision
-  scope: string;            // scope (milestone, slice, global, etc.)
-  decision: string;         // what was decided
-  choice: string;           // the specific choice made
-  rationale: string;        // why this choice
-  revisable: string;        // whether/when revisable
-  superseded_by: string | null;  // ID of superseding decision, or null
+  seq: number; // auto-increment primary key
+  id: string; // e.g. "D001"
+  when_context: string; // when/context of the decision
+  scope: string; // scope (milestone, slice, global, etc.)
+  decision: string; // what was decided
+  choice: string; // the specific choice made
+  rationale: string; // why this choice
+  revisable: string; // whether/when revisable
+  superseded_by: string | null; // ID of superseding decision, or null
 }
 
 export interface Requirement {
-  id: string;               // e.g. "R001"
-  class: string;            // requirement class (functional, non-functional, etc.)
-  status: string;           // active, validated, deferred, etc.
-  description: string;      // short description
-  why: string;              // rationale
-  source: string;           // origin (milestone, user, etc.)
-  primary_owner: string;    // owning slice/milestone
+  id: string; // e.g. "R001"
+  class: string; // requirement class (functional, non-functional, etc.)
+  status: string; // active, validated, deferred, etc.
+  description: string; // short description
+  why: string; // rationale
+  source: string; // origin (milestone, user, etc.)
+  primary_owner: string; // owning slice/milestone
   supporting_slices: string; // other slices that touch this
-  validation: string;       // how to validate
-  notes: string;            // additional notes
-  full_content: string;     // full requirement text
-  superseded_by: string | null;  // ID of superseding requirement, or null
+  validation: string; // how to validate
+  notes: string; // additional notes
+  full_content: string; // full requirement text
+  superseded_by: string | null; // ID of superseding requirement, or null
 }
 
 // ─── Parallel Orchestration Types ────────────────────────────────────────
 
-export type CompressionStrategy = 'truncate' | 'compress';
-export type ContextSelectionMode = 'full' | 'smart';
+export type CompressionStrategy = "truncate" | "compress";
+export type ContextSelectionMode = "full" | "smart";
 
 export type MergeStrategy = "per-slice" | "per-milestone";
 export type AutoMergeMode = "auto" | "confirm" | "manual";

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

@@ -9,46 +9,48 @@ import { deriveState } from "./state.js";
 import { invalidateAllCaches } from "./cache.js";
 import { gsdRoot, resolveTasksDir, resolveSlicePath, buildTaskFileName } from "./paths.js";
 import { sendDesktopNotification } from "./notifications.js";
-import { parseUnitId } from "./unit-id.js";
 
 /**
- * Undo the last completed unit: revert git commits, remove from completed-units,
+ * Undo the last completed unit: revert git commits,
  * delete summary artifacts, and uncheck the task in PLAN.
+ * deriveState() handles re-derivation after revert.
  */
 export async function handleUndo(args: string, ctx: ExtensionCommandContext, _pi: ExtensionAPI, basePath: string): Promise<void> {
   const force = args.includes("--force");
 
-  // 1. Load completed-units.json
-  const completedKeysFile = join(gsdRoot(basePath), "completed-units.json");
-  if (!existsSync(completedKeysFile)) {
-    ctx.ui.notify("Nothing to undo — no completed units found.", "info");
+  // Find the last GSD-related commit from git activity logs
+  const activityDir = join(gsdRoot(basePath), "activity");
+  if (!existsSync(activityDir)) {
+    ctx.ui.notify("Nothing to undo — no activity logs found.", "info");
     return;
   }
 
-  let keys: string[];
-  try {
-    keys = JSON.parse(readFileSync(completedKeysFile, "utf-8"));
-  } catch {
-    ctx.ui.notify("Nothing to undo — completed-units.json is corrupt.", "warning");
+  // Parse activity logs to find the most recent unit
+  const files = readdirSync(activityDir)
+    .filter(f => f.endsWith(".jsonl"))
+    .sort()
+    .reverse();
+
+  if (files.length === 0) {
+    ctx.ui.notify("Nothing to undo — no activity logs found.", "info");
     return;
   }
 
-  if (keys.length === 0) {
-    ctx.ui.notify("Nothing to undo — no completed units.", "info");
+  // Extract unit type and ID from the most recent activity log filename
+  // Format: <seq>-<unitType>-<unitId>.jsonl
+  const match = files[0].match(/^\d+-(.+?)-(.+)\.jsonl$/);
+  if (!match) {
+    ctx.ui.notify("Nothing to undo — could not parse latest activity log.", "warning");
     return;
   }
 
-  // Get the last completed unit
-  const lastKey = keys[keys.length - 1];
-  const sepIdx = lastKey.indexOf("/");
-  const unitType = sepIdx >= 0 ? lastKey.slice(0, sepIdx) : lastKey;
-  const unitId = sepIdx >= 0 ? lastKey.slice(sepIdx + 1) : lastKey;
+  const unitType = match[1];
+  const unitId = match[2].replace(/-/g, "/");
 
   if (!force) {
     ctx.ui.notify(
       `Will undo: ${unitType} (${unitId})\n` +
       `This will:\n` +
-      `  - Remove from completed-units.json\n` +
       `  - Delete summary artifacts\n` +
       `  - Uncheck task in PLAN (if execute-task)\n` +
       `  - Attempt to revert associated git commits\n\n` +
@@ -58,15 +60,12 @@ export async function handleUndo(args: string, ctx: ExtensionCommandContext, _pi
     return;
   }
 
-  // 2. Remove from completed-units.json
-  keys = keys.filter(k => k !== lastKey);
-  writeFileSync(completedKeysFile, JSON.stringify(keys), "utf-8");
-
-  // 3. Delete summary artifact
-  const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+  // 1. Delete summary artifact
+  const parts = unitId.split("/");
   let summaryRemoved = false;
-  if (mid && sid && tid) {
+  if (parts.length === 3) {
     // Task-level: M001/S01/T01
+    const [mid, sid, tid] = parts;
     const tasksDir = resolveTasksDir(basePath, mid, sid);
     if (tasksDir) {
       const summaryFile = join(tasksDir, buildTaskFileName(tid, "SUMMARY"));
@@ -75,11 +74,11 @@ export async function handleUndo(args: string, ctx: ExtensionCommandContext, _pi
         summaryRemoved = true;
       }
     }
-  } else if (mid && sid) {
+  } else if (parts.length === 2) {
     // Slice-level: M001/S01
+    const [mid, sid] = parts;
     const slicePath = resolveSlicePath(basePath, mid, sid);
     if (slicePath) {
-      // Try common summary filenames
       for (const suffix of ["SUMMARY", "COMPLETE"]) {
         const candidates = findFileWithPrefix(slicePath, sid, suffix);
         for (const f of candidates) {
@@ -90,40 +89,37 @@ export async function handleUndo(args: string, ctx: ExtensionCommandContext, _pi
     }
   }
 
-  // 4. Uncheck task in PLAN if execute-task
+  // 2. Uncheck task in PLAN if execute-task
   let planUpdated = false;
-  if (unitType === "execute-task" && mid && sid && tid) {
+  if (unitType === "execute-task" && parts.length === 3) {
+    const [mid, sid, tid] = parts;
     planUpdated = uncheckTaskInPlan(basePath, mid, sid, tid);
   }
 
-  // 5. Try to revert git commits from activity log
+  // 3. Try to revert git commits from activity log
   let commitsReverted = 0;
-  const activityDir = join(gsdRoot(basePath), "activity");
   try {
-    if (existsSync(activityDir)) {
-      const commits = findCommitsForUnit(activityDir, unitType, unitId);
-      if (commits.length > 0) {
-        for (const sha of commits.reverse()) {
-          try {
-            nativeRevertCommit(basePath, sha);
-            commitsReverted++;
-          } catch {
-            // Revert conflict or already reverted — skip
-            try { nativeRevertAbort(basePath); } catch { /* no-op */ }
-            break;
-          }
+    const commits = findCommitsForUnit(activityDir, unitType, unitId);
+    if (commits.length > 0) {
+      for (const sha of commits.reverse()) {
+        try {
+          nativeRevertCommit(basePath, sha);
+          commitsReverted++;
+        } catch {
+          // Revert conflict or already reverted — skip
+          try { nativeRevertAbort(basePath); } catch { /* no-op */ }
+          break;
         }
       }
     }
   } finally {
-    // 6. Re-derive state — always invalidate caches even if git operations fail
+    // 4. Re-derive state — always invalidate caches even if git operations fail
     invalidateAllCaches();
     await deriveState(basePath);
   }
 
   // Build result message
   const results: string[] = [`Undone: ${unitType} (${unitId})`];
-  results.push(`  - Removed from completed-units.json`);
   if (summaryRemoved) results.push(`  - Deleted summary artifact`);
   if (planUpdated) results.push(`  - Unchecked task in PLAN`);
   if (commitsReverted > 0) {

package/src/resources/extensions/gsd/unit-runtime.ts

@@ -1,4 +1,4 @@
-import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import {
   gsdRoot,
@@ -8,8 +8,6 @@ import {
   resolveTaskFile,
 } from "./paths.js";
 import { loadFile, parseTaskPlanMustHaves, countMustHavesMentionedInSummary } from "./files.js";
-import { loadJsonFileOrNull, saveJsonFile } from "./json-persistence.js";
-import { parseUnitId } from "./unit-id.js";
 
 export type UnitRuntimePhase =
   | "dispatched"
@@ -48,23 +46,13 @@ export interface AutoUnitRuntimeRecord {
   lastRecoveryReason?: "idle" | "hard";
 }
 
-function isAutoUnitRuntimeRecord(data: unknown): data is AutoUnitRuntimeRecord {
-  return (
-    typeof data === "object" &&
-    data !== null &&
-    (data as AutoUnitRuntimeRecord).version === 1 &&
-    typeof (data as AutoUnitRuntimeRecord).unitType === "string" &&
-    typeof (data as AutoUnitRuntimeRecord).unitId === "string"
-  );
-}
-
 function runtimeDir(basePath: string): string {
   return join(gsdRoot(basePath), "runtime", "units");
 }
 
 function runtimePath(basePath: string, unitType: string, unitId: string): string {
-  const sanitizedUnitType = unitType.replace(/[^a-zA-Z0-9._-]+/g, "-");
-  const sanitizedUnitId = unitId.replace(/[^a-zA-Z0-9._-]+/g, "-");
+  const sanitizedUnitType = unitType.replace(/[\/]/g, "-");
+  const sanitizedUnitId = unitId.replace(/[\/]/g, "-");
   return join(runtimeDir(basePath), `${sanitizedUnitType}-${sanitizedUnitId}.json`);
 }
 
@@ -75,6 +63,8 @@ export function writeUnitRuntimeRecord(
   startedAt: number,
   updates: Partial<AutoUnitRuntimeRecord> = {},
 ): AutoUnitRuntimeRecord {
+  const dir = runtimeDir(basePath);
+  mkdirSync(dir, { recursive: true });
   const path = runtimePath(basePath, unitType, unitId);
   const prev = readUnitRuntimeRecord(basePath, unitType, unitId);
   const next: AutoUnitRuntimeRecord = {
@@ -94,12 +84,18 @@ export function writeUnitRuntimeRecord(
     recoveryAttempts: updates.recoveryAttempts ?? prev?.recoveryAttempts ?? 0,
     lastRecoveryReason: updates.lastRecoveryReason ?? prev?.lastRecoveryReason,
   };
-  saveJsonFile(path, next);
+  writeFileSync(path, JSON.stringify(next, null, 2) + "\n", "utf-8");
   return next;
 }
 
 export function readUnitRuntimeRecord(basePath: string, unitType: string, unitId: string): AutoUnitRuntimeRecord | null {
-  return loadJsonFileOrNull(runtimePath(basePath, unitType, unitId), isAutoUnitRuntimeRecord);
+  const path = runtimePath(basePath, unitType, unitId);
+  if (!existsSync(path)) return null;
+  try {
+    return JSON.parse(readFileSync(path, "utf-8")) as AutoUnitRuntimeRecord;
+  } catch {
+    return null;
+  }
 }
 
 export function clearUnitRuntimeRecord(basePath: string, unitType: string, unitId: string): void {
@@ -132,7 +128,7 @@ export async function inspectExecuteTaskDurability(
   basePath: string,
   unitId: string,
 ): Promise<ExecuteTaskRecoveryStatus | null> {
-  const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+  const [mid, sid, tid] = unitId.split("/");
   if (!mid || !sid || !tid) return null;
 
   const planAbs = resolveSliceFile(basePath, mid, sid, "PLAN");

package/src/resources/extensions/gsd/verification-evidence.ts

@@ -20,7 +20,6 @@ export interface EvidenceCheckJSON {
   exitCode: number;
   durationMs: number;
   verdict: "pass" | "fail";
-  blocking: boolean;
 }
 
 export interface RuntimeErrorJSON {
@@ -81,7 +80,6 @@ export function writeVerificationJSON(
       exitCode: check.exitCode,
       durationMs: check.durationMs,
       verdict: check.exitCode === 0 ? "pass" : "fail",
-      blocking: check.blocking,
     })),
     ...(retryAttempt !== undefined ? { retryAttempt } : {}),
     ...(maxRetries !== undefined ? { maxRetries } : {}),

package/src/resources/extensions/gsd/verification-gate.ts

@@ -45,12 +45,11 @@ const PACKAGE_SCRIPT_KEYS = ["typecheck", "lint", "test"] as const;
  *   4. None found
  */
 export function discoverCommands(options: DiscoverCommandsOptions): DiscoveredCommands {
-  // 1. Preference commands (still sanitize — may contain prose from misconfiguration)
+  // 1. Preference commands
   if (options.preferenceCommands && options.preferenceCommands.length > 0) {
     const filtered = options.preferenceCommands
       .map(c => c.trim())
-      .filter(Boolean)
-      .filter(c => isLikelyCommand(c));
+      .filter(Boolean);
     if (filtered.length > 0) {
       return { commands: filtered, source: "preference" };
     }
@@ -112,9 +111,7 @@ const MAX_FAILURE_CONTEXT_CHARS = 10_000;
  * Returns an empty string when all checks pass or the checks array is empty.
  */
 export function formatFailureContext(result: VerificationResult): string {
-  // Only include blocking failures in retry context — non-blocking (advisory) failures
-  // should not be injected into retry prompts to avoid noise pollution.
-  const failures = result.checks.filter((c) => c.exitCode !== 0 && c.blocking);
+  const failures = result.checks.filter((c) => c.exitCode !== 0);
   if (failures.length === 0) return "";
 
   const blocks: string[] = [];
@@ -258,10 +255,6 @@ export function runVerificationGate(options: RunVerificationGateOptions): Verifi
     };
   }
 
-  // Commands from preference and task-plan sources are blocking;
-  // package-json discovered commands are advisory (non-blocking).
-  const blocking = source === "preference" || source === "task-plan";
-
   const checks: VerificationCheck[] = [];
 
   for (const command of commands) {
@@ -297,16 +290,11 @@ export function runVerificationGate(options: RunVerificationGateOptions): Verifi
       stdout: truncate(result.stdout, MAX_OUTPUT_BYTES),
       stderr,
       durationMs,
-      blocking,
     });
   }
 
-  // Gate passes if all blocking checks pass (non-blocking failures are advisory)
-  const blockingChecks = checks.filter(c => c.blocking);
-  const passed = blockingChecks.length === 0 || blockingChecks.every(c => c.exitCode === 0);
-
   return {
-    passed,
+    passed: checks.every(c => c.exitCode === 0),
     checks,
     discoverySource: source,
     timestamp,

package/src/resources/extensions/gsd/worktree-command-bootstrap.ts

@@ -0,0 +1,46 @@
+import { importExtensionModule, type ExtensionAPI, type ExtensionCommandContext } from "@gsd/pi-coding-agent";
+
+const WORKTREE_SUBCOMMANDS = [
+  { cmd: "list", desc: "List existing worktrees" },
+  { cmd: "merge", desc: "Merge a worktree into a target branch" },
+  { cmd: "remove", desc: "Remove a worktree and its branch" },
+  { cmd: "switch", desc: "Switch into an existing worktree" },
+  { cmd: "create", desc: "Create and switch into a new worktree" },
+  { cmd: "return", desc: "Switch back to the main tree" },
+] as const;
+
+function getWorktreeCompletions(prefix: string) {
+  const parts = prefix.trim().split(/\s+/);
+  if (parts.length <= 1) {
+    const partial = parts[0] ?? "";
+    return WORKTREE_SUBCOMMANDS
+      .filter((option) => option.cmd.startsWith(partial))
+      .map((option) => ({
+        value: option.cmd,
+        label: option.cmd,
+        description: option.desc,
+      }));
+  }
+
+  if (parts[0] === "remove" && parts.length <= 2 && "all".startsWith(parts[1] ?? "")) {
+    return [{ value: "remove all", label: "all", description: "Remove all worktrees" }];
+  }
+
+  return null;
+}
+
+function registerLazyWorktreeAlias(pi: ExtensionAPI, name: "worktree" | "wt", description: string): void {
+  pi.registerCommand(name, {
+    description,
+    getArgumentCompletions: getWorktreeCompletions,
+    handler: async (args: string, ctx: ExtensionCommandContext) => {
+      const { handleWorktreeCommand } = await importExtensionModule<typeof import("./worktree-command.js")>(import.meta.url, "./worktree-command.js");
+      await handleWorktreeCommand(args, ctx, pi, name);
+    },
+  });
+}
+
+export function registerLazyWorktreeCommands(pi: ExtensionAPI): void {
+  registerLazyWorktreeAlias(pi, "worktree", "Git worktrees (also /wt): /worktree <name> | list | merge | remove");
+  registerLazyWorktreeAlias(pi, "wt", "Alias for /worktree");
+}