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

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[] = [];
@@ -232,20 +229,13 @@ export interface RunVerificationGateOptions {
   commandTimeoutMs?: number;
 }
 
-/** Error codes from spawnSync that indicate infrastructure/OS-level failures
- *  rather than the command itself failing. These are transient — the agent
- *  cannot fix them, so they should not trigger auto-fix retries. */
-const INFRA_ERROR_CODES = new Set(["ETIMEDOUT", "ENOENT", "ENOMEM", "EMFILE", "ENFILE", "EAGAIN"]);
-
 /**
  * Run the verification gate: discover commands, execute each via spawnSync,
  * and return a structured result.
  *
  * - All commands run sequentially regardless of individual pass/fail.
- * - `passed` is true when every blocking command exits 0 (or no commands are discovered).
+ * - `passed` is true when every command exits 0 (or no commands are discovered).
  * - stdout/stderr per command are truncated to 10 KB.
- * - Spawn/infra errors (ETIMEDOUT, ENOENT, etc.) are tagged with `infraError: true`
- *   so the retry logic can distinguish "the OS couldn't run this" from "the tests failed".
  */
 export function runVerificationGate(options: RunVerificationGateOptions): VerificationResult {
   const timestamp = Date.now();
@@ -265,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) {
@@ -286,26 +272,12 @@ export function runVerificationGate(options: RunVerificationGateOptions): Verifi
     let stderr: string;
 
     if (result.error) {
-      // Spawn infrastructure failure — OS-level, not a test failure.
-      // Tag with infraError so the retry logic can skip auto-fix attempts.
-      const errCode = (result.error as NodeJS.ErrnoException).code;
-      const isInfra = !!errCode && INFRA_ERROR_CODES.has(errCode);
+      // Command not found or spawn failure
       exitCode = 127;
       stderr = truncate(
         (result.stderr || "") + "\n" + (result.error as Error).message,
         MAX_OUTPUT_BYTES,
       );
-
-      checks.push({
-        command,
-        exitCode,
-        stdout: truncate(result.stdout, MAX_OUTPUT_BYTES),
-        stderr,
-        durationMs,
-        blocking,
-        ...(isInfra ? { infraError: true } : {}),
-      });
-      continue;
     } else {
       // status is null when killed by signal — treat as failure
       exitCode = result.status ?? 1;
@@ -318,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.ts

@@ -34,7 +34,6 @@ import type { FileLineStat } from "./worktree-manager.js";
 import { existsSync, realpathSync, readdirSync, rmSync, unlinkSync } from "node:fs";
 import { nativeMergeAbort } from "./native-git-bridge.js";
 import { join, sep } from "node:path";
-import { getErrorMessage } from "./error-utils.js";
 
 /**
  * Tracks the original project root so we can switch back.
@@ -42,28 +41,16 @@ import { getErrorMessage } from "./error-utils.js";
  */
 let originalCwd: string | null = null;
 
-function ensureWorktreeStateInitialized(): void {
-  if (originalCwd) return;
-  const cwd = process.cwd();
-  const marker = `${sep}.gsd${sep}worktrees${sep}`;
-  const markerIdx = cwd.indexOf(marker);
-  if (markerIdx !== -1) {
-    originalCwd = cwd.slice(0, markerIdx);
-  }
-}
-
 /** Get the original project root if currently in a worktree, or null. */
 export function getWorktreeOriginalCwd(): string | null {
-  ensureWorktreeStateInitialized();
   return originalCwd;
 }
 
 /** Get the name of the active worktree, or null if not in one. */
 export function getActiveWorktreeName(): string | null {
-  ensureWorktreeStateInitialized();
   if (!originalCwd) return null;
   const cwd = process.cwd();
-  const wtDir = join(gsdRoot(originalCwd), "worktrees");
+  const wtDir = join(originalCwd, ".gsd", "worktrees");
   if (!cwd.startsWith(wtDir)) return null;
   const rel = cwd.slice(wtDir.length + 1);
   const name = rel.split("/")[0] ?? rel.split("\\")[0];
@@ -116,13 +103,12 @@ function worktreeCompletions(prefix: string) {
   return [];
 }
 
-export async function handleWorktreeCommand(
+async function worktreeHandler(
   args: string,
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI,
   alias: string,
 ): Promise<void> {
-  ensureWorktreeStateInitialized();
   const trimmed = (typeof args === "string" ? args : "").trim();
   const basePath = process.cwd();
 
@@ -242,11 +228,27 @@ export async function handleWorktreeCommand(
   }
 }
 
+export async function handleWorktreeCommand(
+  args: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI,
+  alias: string,
+): Promise<void> {
+  await worktreeHandler(args, ctx, pi, alias);
+}
+
 export function registerWorktreeCommand(pi: ExtensionAPI): void {
   // Restore worktree state after /reload.
   // The module-level originalCwd resets to null when extensions are re-loaded,
   // but process.cwd() is still inside the worktree. Detect this and recover.
-  ensureWorktreeStateInitialized();
+  if (!originalCwd) {
+    const cwd = process.cwd();
+    const marker = `${sep}.gsd${sep}worktrees${sep}`;
+    const markerIdx = cwd.indexOf(marker);
+    if (markerIdx !== -1) {
+      originalCwd = cwd.slice(0, markerIdx);
+    }
+  }
 
   pi.registerCommand("worktree", {
     description: "Git worktrees (also /wt): /worktree <name> | list | merge | remove",
@@ -377,7 +379,7 @@ async function handleCreate(
       "info",
     );
   } catch (error) {
-    const msg = getErrorMessage(error);
+    const msg = error instanceof Error ? error.message : String(error);
     ctx.ui.notify(`Failed to create worktree: ${msg}`, "error");
   }
 }
@@ -425,7 +427,7 @@ async function handleSwitch(
       "info",
     );
   } catch (error) {
-    const msg = getErrorMessage(error);
+    const msg = error instanceof Error ? error.message : String(error);
     ctx.ui.notify(`Failed to switch to worktree: ${msg}`, "error");
   }
 }
@@ -535,7 +537,7 @@ async function handleList(
 
     ctx.ui.notify(lines.join("\n"), "info");
   } catch (error) {
-    const msg = getErrorMessage(error);
+    const msg = error instanceof Error ? error.message : String(error);
     ctx.ui.notify(`Failed to list worktrees: ${msg}`, "error");
   }
 }
@@ -640,6 +642,16 @@ async function handleMerge(
     const commitType = inferCommitType(name);
     const commitMessage = `${commitType}(${name}): merge worktree ${name}`;
 
+    // Reconcile worktree DB into main DB before squash merge
+    const wtDbPath = join(worktreePath(basePath, name), ".gsd", "gsd.db");
+    const mainDbPath = join(basePath, ".gsd", "gsd.db");
+    if (existsSync(wtDbPath) && existsSync(mainDbPath)) {
+      try {
+        const { reconcileWorktreeDb } = await import("./gsd-db.js");
+        reconcileWorktreeDb(mainDbPath, wtDbPath);
+      } catch { /* non-fatal */ }
+    }
+
     try {
       mergeWorktreeToMain(basePath, name, commitMessage);
       ctx.ui.notify(
@@ -653,7 +665,7 @@ async function handleMerge(
       );
       return;
     } catch (mergeErr) {
-      const mergeMsg = getErrorMessage(mergeErr);
+      const mergeMsg = mergeErr instanceof Error ? mergeErr.message : String(mergeErr);
       const isConflict = /conflict/i.test(mergeMsg);
 
       if (isConflict) {
@@ -710,7 +722,7 @@ async function handleMerge(
       "info",
     );
   } catch (error) {
-    const msg = getErrorMessage(error);
+    const msg = error instanceof Error ? error.message : String(error);
     ctx.ui.notify(`Failed to start merge: ${msg}`, "error");
   }
 }
@@ -753,7 +765,7 @@ async function handleRemove(
 
     ctx.ui.notify(`${CLR.ok("✓")} Worktree ${CLR.name(name)} removed ${CLR.muted("(branch deleted)")}.`, "info");
   } catch (error) {
-    const msg = getErrorMessage(error);
+    const msg = error instanceof Error ? error.message : String(error);
     ctx.ui.notify(`Failed to remove worktree: ${msg}`, "error");
   }
 }
@@ -807,7 +819,7 @@ async function handleRemoveAll(
     if (failed.length > 0) lines.push(`${CLR.warn("✗")} Failed: ${failed.map(n => CLR.name(n)).join(", ")}`);
     ctx.ui.notify(lines.join("\n"), failed.length > 0 ? "warning" : "info");
   } catch (error) {
-    const msg = getErrorMessage(error);
+    const msg = error instanceof Error ? error.message : String(error);
     ctx.ui.notify(`Failed to remove worktrees: ${msg}`, "error");
   }
 }

package/src/resources/extensions/gsd/worktree-manager.ts

@@ -17,7 +17,6 @@
 
 import { existsSync, mkdirSync, readFileSync, realpathSync } from "node:fs";
 import { join, resolve, sep } from "node:path";
-import { gsdRoot } from "./paths.js";
 import { GSDError, GSD_PARSE_ERROR, GSD_STALE_STATE, GSD_LOCK_HELD, GSD_GIT_ERROR, GSD_MERGE_CONFLICT } from "./errors.js";
 import {
   nativeBranchDelete,
@@ -101,7 +100,7 @@ export function resolveGitDir(basePath: string): string {
 }
 
 export function worktreesDir(basePath: string): string {
-  return join(gsdRoot(basePath), "worktrees");
+  return join(basePath, ".gsd", "worktrees");
 }
 
 export function worktreePath(basePath: string, name: string): string {
@@ -194,7 +193,7 @@ export function listWorktrees(basePath: string): WorktreeInfo[] {
   const seenRoots = new Set<string>();
   const worktreeRoots = baseVariants
     .map(baseVariant => {
-      const path = join(gsdRoot(baseVariant), "worktrees");
+      const path = join(baseVariant, ".gsd", "worktrees");
       return {
         normalized: normalizePathForComparison(path),
       };