gsd-pi 2.13.0 → 2.14.0

package/dist/resources/extensions/gsd/commands.ts

@@ -5,7 +5,8 @@
  */
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@gsd/pi-coding-agent";
-import { existsSync, readFileSync } from "node:fs";
+import { AuthStorage } from "@gsd/pi-coding-agent";
+import { existsSync, readFileSync, mkdirSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { deriveState } from "./state.js";
@@ -53,10 +54,10 @@ function dispatchDoctorHeal(pi: ExtensionAPI, scope: string | undefined, reportT
 
 export function registerGSDCommand(pi: ExtensionAPI): void {
   pi.registerCommand("gsd", {
-    description: "GSD — Get Shit Done: /gsd next|auto|stop|status|queue|prefs|hooks|doctor|migrate|remote",
+    description: "GSD — Get Shit Done: /gsd next|auto|stop|status|queue|prefs|config|hooks|doctor|migrate|remote",
 
     getArgumentCompletions: (prefix: string) => {
-      const subcommands = ["next", "auto", "stop", "status", "queue", "discuss", "prefs", "hooks", "doctor", "migrate", "remote"];
+      const subcommands = ["next", "auto", "stop", "status", "queue", "discuss", "prefs", "config", "hooks", "doctor", "migrate", "remote"];
       const parts = prefix.trim().split(/\s+/);
 
       if (parts.length <= 1) {
@@ -151,6 +152,11 @@ export function registerGSDCommand(pi: ExtensionAPI): void {
         return;
       }
 
+      if (trimmed === "config") {
+        await handleConfig(ctx);
+        return;
+      }
+
       if (trimmed === "hooks") {
         const { formatHookStatus } = await import("./post-unit-hooks.js");
         ctx.ui.notify(formatHookStatus(), "info");
@@ -174,7 +180,7 @@ export function registerGSDCommand(pi: ExtensionAPI): void {
       }
 
       ctx.ui.notify(
-        `Unknown: /gsd ${trimmed}. Use /gsd, /gsd next, /gsd auto, /gsd stop, /gsd status, /gsd queue, /gsd discuss, /gsd prefs [global|project|status|wizard|setup], /gsd hooks, /gsd doctor [audit|fix|heal] [M###/S##], /gsd migrate <path>, or /gsd remote [slack|discord|status|disconnect].`,
+        `Unknown: /gsd ${trimmed}. Use /gsd, /gsd next, /gsd auto, /gsd stop, /gsd status, /gsd queue, /gsd discuss, /gsd prefs, /gsd config, /gsd hooks, /gsd doctor [audit|fix|heal] [M###/S##], /gsd migrate <path>, or /gsd remote [slack|discord|status|disconnect].`,
         "warning",
       );
     },
@@ -215,20 +221,16 @@ export async function fireStatusViaCommand(
 async function handlePrefs(args: string, ctx: ExtensionCommandContext): Promise<void> {
   const trimmed = args.trim();
 
-  if (trimmed === "" || trimmed === "global") {
+  if (trimmed === "" || trimmed === "global" || trimmed === "wizard" || trimmed === "setup"
+    || trimmed === "wizard global" || trimmed === "setup global") {
     await ensurePreferencesFile(getGlobalGSDPreferencesPath(), ctx, "global");
+    await handlePrefsWizard(ctx, "global");
     return;
   }
 
-  if (trimmed === "project") {
+  if (trimmed === "project" || trimmed === "wizard project" || trimmed === "setup project") {
     await ensurePreferencesFile(getProjectGSDPreferencesPath(), ctx, "project");
-    return;
-  }
-
-  if (trimmed === "wizard" || trimmed === "setup" || trimmed === "wizard global" || trimmed === "setup global"
-    || trimmed === "wizard project" || trimmed === "setup project") {
-    const scope = trimmed.includes("project") ? "project" : "global";
-    await handlePrefsWizard(ctx, scope);
+    await handlePrefsWizard(ctx, "project");
     return;
   }
 
@@ -319,22 +321,41 @@ async function handlePrefsWizard(
   const modelPhases = ["research", "planning", "execution", "completion"] as const;
   const models: Record<string, string> = (prefs.models as Record<string, string>) ?? {};
 
-  for (const phase of modelPhases) {
-    const current = models[phase] ?? "";
-    const input = await ctx.ui.input(
-      `Model for ${phase} phase${current ? ` (current: ${current})` : ""}:`,
-      current || "e.g. claude-sonnet-4-20250514",
-    );
-    if (input !== null && input !== undefined) {
-      const val = input.trim();
-      if (val) {
-        models[phase] = val;
-      } else if (current) {
-        // User cleared it — remove
-        delete models[phase];
+  const availableModels = ctx.modelRegistry.getAvailable();
+  if (availableModels.length > 0) {
+    const modelOptions = availableModels.map(m => `${m.id} · ${m.provider}`);
+    modelOptions.push("(keep current)", "(clear)");
+
+    for (const phase of modelPhases) {
+      const current = models[phase] ?? "";
+      const title = `Model for ${phase} phase${current ? ` (current: ${current})` : ""}:`;
+      const choice = await ctx.ui.select(title, modelOptions);
+
+      if (choice && choice !== "(keep current)") {
+        if (choice === "(clear)") {
+          delete models[phase];
+        } else {
+          models[phase] = choice.split(" · ")[0];
+        }
+      }
+    }
+  } else {
+    // No authenticated models available — fall back to text input
+    for (const phase of modelPhases) {
+      const current = models[phase] ?? "";
+      const input = await ctx.ui.input(
+        `Model for ${phase} phase${current ? ` (current: ${current})` : ""}:`,
+        current || "e.g. claude-sonnet-4-20250514",
+      );
+      if (input !== null && input !== undefined) {
+        const val = input.trim();
+        if (val) {
+          models[phase] = val;
+        } else if (current) {
+          delete models[phase];
+        }
       }
     }
-    // null/undefined = Escape/skip — keep existing value
   }
   if (Object.keys(models).length > 0) {
     prefs.models = models;
@@ -452,8 +473,7 @@ function serializePreferencesToFrontmatter(prefs: Record<string, unknown>): stri
 
     if (Array.isArray(value)) {
       if (value.length === 0) {
-        lines.push(`${prefix}${key}: []`);
-        return;
+        return; // Omit empty arrays — avoids parse/serialize cycle bug with "[]" strings
       }
       lines.push(`${prefix}${key}:`);
       for (const item of value) {
@@ -484,8 +504,7 @@ function serializePreferencesToFrontmatter(prefs: Record<string, unknown>): stri
     if (typeof value === "object") {
       const entries = Object.entries(value as Record<string, unknown>);
       if (entries.length === 0) {
-        lines.push(`${prefix}${key}: {}`);
-        return;
+        return; // Omit empty objects — avoids parse/serialize cycle bug with "{}" strings
       }
       lines.push(`${prefix}${key}:`);
       for (const [k, v] of entries) {
@@ -521,6 +540,74 @@ function serializePreferencesToFrontmatter(prefs: Record<string, unknown>): stri
   return lines.join("\n") + "\n";
 }
 
+// ─── Tool Config Wizard ───────────────────────────────────────────────────────
+
+const TOOL_KEYS = [
+  { id: "tavily",   env: "TAVILY_API_KEY",   label: "Tavily Search",     hint: "tavily.com/app/api-keys" },
+  { id: "brave",    env: "BRAVE_API_KEY",     label: "Brave Search",      hint: "brave.com/search/api" },
+  { id: "context7", env: "CONTEXT7_API_KEY",  label: "Context7 Docs",     hint: "context7.com/dashboard" },
+  { id: "jina",     env: "JINA_API_KEY",      label: "Jina Page Extract", hint: "jina.ai/api" },
+  { id: "groq",     env: "GROQ_API_KEY",      label: "Groq Voice",        hint: "console.groq.com" },
+] as const;
+
+function getConfigAuthStorage(): InstanceType<typeof AuthStorage> {
+  const authPath = join(process.env.HOME ?? "", ".gsd", "agent", "auth.json");
+  mkdirSync(dirname(authPath), { recursive: true });
+  return AuthStorage.create(authPath);
+}
+
+async function handleConfig(ctx: ExtensionCommandContext): Promise<void> {
+  const auth = getConfigAuthStorage();
+
+  // Show current status
+  const statusLines = ["GSD Tool Configuration\n"];
+  for (const tool of TOOL_KEYS) {
+    const hasKey = !!process.env[tool.env] || !!(auth.get(tool.id) as { key?: string })?.key;
+    statusLines.push(`  ${hasKey ? "✓" : "✗"} ${tool.label}${hasKey ? "" : ` — get key at ${tool.hint}`}`);
+  }
+  ctx.ui.notify(statusLines.join("\n"), "info");
+
+  // Ask which tools to configure
+  const options = TOOL_KEYS.map(t => {
+    const hasKey = !!process.env[t.env] || !!(auth.get(t.id) as { key?: string })?.key;
+    return `${t.label} ${hasKey ? "(configured ✓)" : "(not set)"}`;
+  });
+  options.push("(done)");
+
+  let changed = false;
+  while (true) {
+    const choice = await ctx.ui.select("Configure which tool? Press Escape when done.", options);
+    if (!choice || choice === "(done)") break;
+
+    const toolIdx = TOOL_KEYS.findIndex(t => choice.startsWith(t.label));
+    if (toolIdx === -1) break;
+
+    const tool = TOOL_KEYS[toolIdx];
+    const input = await ctx.ui.input(
+      `API key for ${tool.label} (${tool.hint}):`,
+      "paste your key here",
+    );
+
+    if (input !== null && input !== undefined) {
+      const key = input.trim();
+      if (key) {
+        auth.set(tool.id, { type: "api_key", key });
+        process.env[tool.env] = key;
+        ctx.ui.notify(`${tool.label} key saved and activated.`, "info");
+        // Update option label
+        options[toolIdx] = `${tool.label} (configured ✓)`;
+        changed = true;
+      }
+    }
+  }
+
+  if (changed) {
+    await ctx.waitForIdle();
+    await ctx.reload();
+    ctx.ui.notify("Configuration saved. Extensions reloaded with new keys.", "info");
+  }
+}
+
 async function ensurePreferencesFile(
   path: string,
   ctx: ExtensionCommandContext,
@@ -538,7 +625,4 @@ async function ensurePreferencesFile(
     ctx.ui.notify(`Using existing ${scope} GSD skill preferences at ${path}`, "info");
   }
 
-  await ctx.waitForIdle();
-  await ctx.reload();
-  ctx.ui.notify(`Edit ${path} to update ${scope} GSD skill preferences.`, "info");
 }

package/dist/resources/extensions/gsd/doctor.ts

@@ -1,6 +1,6 @@
 import { execSync } from "node:child_process";
 import { existsSync, mkdirSync } from "node:fs";
-import { join } from "node:path";
+import { join, sep } from "node:path";
 
 import { loadFile, parsePlan, parseRoadmap, parseSummary, saveFile, parseTaskPlanMustHaves, countMustHavesMentionedInSummary } from "./files.js";
 import { resolveMilestoneFile, resolveMilestonePath, resolveSliceFile, resolveSlicePath, resolveTaskFile, resolveTaskFiles, resolveTasksDir, milestonesDir, gsdRoot, relMilestoneFile, relSliceFile, relTaskFile, relSlicePath, relGsdRootFile, resolveGsdRootFile } from "./paths.js";
@@ -31,7 +31,8 @@ export type DoctorIssueCode =
   | "orphaned_auto_worktree"
   | "stale_milestone_branch"
   | "corrupt_merge_state"
-  | "tracked_runtime_files";
+  | "tracked_runtime_files"
+  | "legacy_slice_branches";
 
 export interface DoctorIssue {
   severity: DoctorSeverity;
@@ -511,7 +512,7 @@ async function checkGitHealth(
         if (shouldFix("orphaned_auto_worktree")) {
           // Never remove a worktree matching current working directory
           const cwd = process.cwd();
-          if (wt.path === cwd || cwd.startsWith(wt.path + "/")) {
+          if (wt.path === cwd || cwd.startsWith(wt.path + sep)) {
             fixesApplied.push(`skipped removing worktree at ${wt.path} (is cwd)`);
           } else {
             try {
@@ -527,7 +528,9 @@ async function checkGitHealth(
 
     // ── Stale milestone branches ─────────────────────────────────────────
     try {
-      const branchOutput = execSync("git branch --list 'milestone/*'", { cwd: basePath, stdio: "pipe" }).toString().trim();
+      // Use unquoted glob — single quotes are not interpreted by cmd.exe on Windows,
+      // causing the pattern to match literally instead of as a glob.
+      const branchOutput = execSync("git branch --list milestone/*", { cwd: basePath, stdio: "pipe" }).toString().trim();
       if (branchOutput) {
         const branches = branchOutput.split("\n").map(b => b.trim().replace(/^\*\s*/, "")).filter(Boolean);
         const worktreeBranches = new Set(milestoneWorktrees.map(wt => wt.branch));
@@ -640,6 +643,28 @@ async function checkGitHealth(
   } catch {
     // git ls-files failed — skip
   }
+
+  // ── Legacy slice branches ──────────────────────────────────────────────
+  try {
+    const sliceBranches = execSync('git branch --format="%(refname:short)" --list "gsd/*/*"', {
+      cwd: basePath,
+      stdio: ["ignore", "pipe", "pipe"],
+      encoding: "utf-8",
+    }).trim();
+    if (sliceBranches) {
+      const branchList = sliceBranches.split("\n").map(b => b.trim()).filter(Boolean);
+      issues.push({
+        severity: "info",
+        code: "legacy_slice_branches",
+        scope: "project",
+        unitId: "project",
+        message: `${branchList.length} legacy slice branch(es) found: ${branchList.slice(0, 3).join(", ")}${branchList.length > 3 ? "..." : ""}. These are no longer used (branchless architecture). Delete with: git branch -D ${branchList.join(" ")}`,
+        fixable: false,
+      });
+    }
+  } catch {
+    // git branch list failed — skip
+  }
 }
 
 export async function runGSDDoctor(basePath: string, options?: { fix?: boolean; scope?: string; fixLevel?: "task" | "all" }): Promise<DoctorReport> {

package/dist/resources/extensions/gsd/git-self-heal.ts

@@ -83,77 +83,6 @@ export function abortAndReset(cwd: string): AbortAndResetResult {
   return { cleaned };
 }
 
-/**
- * Wrap a merge operation with self-healing retry logic.
- *
- * Calls `mergeFn()`. On failure:
- * - If conflicted files exist (via `git diff --diff-filter=U`), re-throws
- *   as MergeConflictError immediately — no retry for real code conflicts.
- * - Otherwise, runs `abortAndReset(cwd)`, retries `mergeFn()` once.
- * - On second failure, throws the error.
- *
- * @param cwd - Working directory for git operations
- * @param mergeFn - Synchronous function that performs the merge
- * @returns The return value of `mergeFn()`
- */
-export function withMergeHeal<T>(cwd: string, mergeFn: () => T): T {
-  try {
-    return mergeFn();
-  } catch (firstError) {
-    // Check for real code conflicts — escalate immediately, no retry
-    try {
-      const conflictOutput = execSync("git diff --name-only --diff-filter=U", {
-        cwd,
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"],
-      }).trim();
-
-      if (conflictOutput.length > 0) {
-        const conflictedFiles = conflictOutput.split("\n").filter(Boolean);
-        // If the original error is already a MergeConflictError, re-throw as-is
-        if (firstError instanceof MergeConflictError) {
-          throw firstError;
-        }
-        throw new MergeConflictError(
-          conflictedFiles,
-          "merge",
-          "unknown",
-          "unknown",
-        );
-      }
-    } catch (diffErr) {
-      // If diffErr is a MergeConflictError we just created/re-threw, propagate it
-      if (diffErr instanceof MergeConflictError) throw diffErr;
-      // Otherwise git diff itself failed — proceed with retry
-    }
-
-    // No real conflict detected — try abort+reset+retry once
-    abortAndReset(cwd);
-
-    // Retry
-    return mergeFn();
-  }
-}
-
-/**
- * Recover a failed checkout by resetting first, then checking out.
- *
- * Performs `git reset --hard HEAD` then `git checkout <targetBranch>`.
- * If checkout still fails after reset, throws with context.
- */
-export function recoverCheckout(cwd: string, targetBranch: string): void {
-  execSync("git reset --hard HEAD", { cwd, stdio: "pipe" });
-
-  try {
-    execSync(`git checkout ${targetBranch}`, { cwd, stdio: "pipe" });
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    throw new Error(
-      `recoverCheckout failed: could not checkout '${targetBranch}' after reset. ${msg}`,
-    );
-  }
-}
-
 /** Known git error patterns mapped to user-friendly messages. */
 const ERROR_PATTERNS: Array<{ pattern: RegExp; message: string }> = [
   {