gsd-pi 2.75.0-dev.b6ad8c5f7 → 2.75.0-dev.e41b70b10

package/dist/resources/extensions/gsd/commands/handlers/onboarding.js

@@ -1,55 +1,26 @@
-// GSD — /gsd onboarding command handler (re-entry, --resume, --reset, --step)
+// GSD — /gsd onboarding command handler (re-entry hub)
 //
-// Provides the discoverable re-entry point for the onboarding wizard. The
-// first-run wizard in src/onboarding.ts is hidden behind shouldRunOnboarding;
-// this handler lets users re-launch it on demand.
-import { AuthStorage } from "@gsd/pi-coding-agent";
-import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
-import { ONBOARDING_STEPS, isValidStepId, nearestResumeStep, } from "../../setup-catalog.js";
+// The first-run wizard in src/onboarding.ts uses @clack/prompts and takes over
+// raw stdin. Running it from inside the pi-coding-agent TUI wedges the TUI
+// (clack leaves stdin paused + cooked, pi-tui's data handler then receives no
+// keypresses). So re-entry cannot replay the clack wizard — instead it routes
+// to a setup hub built from ctx.ui.select, which the TUI owns.
+//
+// Clack-only steps (llm/search/remote/tool-keys via the first-run wizard) are
+// surfaced as notifications pointing the user at the canonical per-step
+// commands (/login, /gsd keys, /gsd remote) that are already ctx.ui-safe.
+import { ONBOARDING_STEPS, isValidStepId, } from "../../setup-catalog.js";
 import { isOnboardingComplete, readOnboardingRecord, resetOnboarding, } from "../../onboarding-state.js";
-// Inline auth path (mirrors src/app-paths.ts) — keep this module rootDir-clean
-// for the resources tsconfig. Importing from src/ pulls files outside
-// src/resources and breaks the build.
-const AUTH_FILE_PATH = join(process.env.GSD_CODING_AGENT_DIR ||
-    join(process.env.GSD_HOME || join(homedir(), ".gsd"), "agent"), "auth.json");
-async function loadFirstRunWizard() {
-    const candidates = [];
-    // Primary deployed path: loader sets GSD_PKG_ROOT (gsd package root).
-    if (process.env.GSD_PKG_ROOT) {
-        candidates.push(pathToFileURL(join(process.env.GSD_PKG_ROOT, "dist", "onboarding.js")).href);
-    }
-    // Fallback: derive package root from process entry (typically dist/loader.js).
-    // This keeps /gsd onboarding resilient if GSD_PKG_ROOT is absent.
-    const argvEntry = process.argv[1];
-    if (argvEntry) {
-        const pkgRootFromArgv = resolve(dirname(argvEntry), "..");
-        candidates.push(pathToFileURL(join(pkgRootFromArgv, "dist", "onboarding.js")).href);
-    }
-    // Source-tree/dev fallback (works in dist/resources/... and ts test loaders).
-    candidates.push("../../../../../onboarding.js");
-    let lastError = null;
-    for (const specifier of candidates) {
-        try {
-            return (await import(/* @vite-ignore */ specifier));
-        }
-        catch (err) {
-            lastError = err;
-        }
-    }
-    const reason = lastError instanceof Error ? lastError.message : String(lastError);
-    throw new Error(`[gsd] Failed to load onboarding wizard module. Tried: ${candidates.join(", ")}. Last error: ${reason}`);
-}
 function parseArgs(raw) {
     const tokens = raw.split(/\s+/).filter(Boolean);
-    const out = { resume: false, reset: false, step: null, stepValid: null };
+    const out = { reset: false, step: null, stepValid: null };
     for (let i = 0; i < tokens.length; i++) {
         const t = tokens[i];
-        if (t === "--resume" || t === "resume")
-            out.resume = true;
-        else if (t === "--reset" || t === "reset")
+        if (t === "--reset" || t === "reset")
             out.reset = true;
+        else if (t === "--resume" || t === "resume") {
+            // Re-entry no longer replays the wizard; --resume collapses into the hub.
+        }
         else if (t === "--step" || t === "step") {
             const next = tokens[i + 1];
             if (next) {
@@ -66,46 +37,26 @@ function parseArgs(raw) {
     }
     return out;
 }
-async function getAuthStorage() {
-    return AuthStorage.create(AUTH_FILE_PATH);
-}
-async function runWholeWizard(ctx, fromStep) {
-    const authStorage = await getAuthStorage();
-    // The first-run wizard ignores the resume hint today — it always walks the
-    // full sequence with skip prompts. We still mark completion at the end and
-    // record the resume hint for next time. This keeps the wizard linear and
-    // simple; per-step jump support comes via --step.
-    if (fromStep) {
-        ctx.ui.notify(`Resuming from step: ${fromStep}. The wizard runs all remaining steps; press skip on any you've already configured.`, "info");
-    }
-    const { runOnboarding } = await loadFirstRunWizard();
-    await runOnboarding(authStorage, { showIntro: false });
-}
-async function runSingleStep(ctx, stepId) {
-    const authStorage = await getAuthStorage();
-    const ob = await loadFirstRunWizard();
-    // Lazy-load clack + chalk via the same path the wizard uses
-    const p = await import("@clack/prompts");
-    const { default: chalk } = await import("chalk");
-    const pc = {
-        cyan: chalk.cyan, green: chalk.green, yellow: chalk.yellow,
-        dim: chalk.dim, bold: chalk.bold, red: chalk.red, reset: chalk.reset,
-    };
+// ─── Per-step routing ────────────────────────────────────────────────────────
+//
+// Clack-based steps are surfaced as notifications — running them inline from
+// the TUI would wedge stdin (see header comment). Everything else routes to an
+// existing ctx.ui-safe handler.
+async function runStep(ctx, stepId) {
     switch (stepId) {
         case "llm":
-            await ob.runLlmStep(p, pc, authStorage);
+            ctx.ui.notify("LLM provider setup: run /login to sign in via OAuth, or /gsd keys add to paste an API key.", "info");
             return;
         case "search":
-            await ob.runWebSearchStep(p, pc, authStorage, false);
+            ctx.ui.notify("Web search setup: run /gsd keys add and pick a search provider (brave, tavily, etc.).", "info");
             return;
         case "remote":
-            await ob.runRemoteQuestionsStep(p, pc, authStorage);
+            ctx.ui.notify("Remote questions setup: run /gsd remote to configure Discord / Slack / Telegram notifications.", "info");
             return;
         case "tool-keys":
-            await ob.runToolKeysStep(p, pc, authStorage);
+            ctx.ui.notify("Tool keys setup: run /gsd keys add to save API keys for Context7, Jina, Groq voice, etc.", "info");
             return;
         case "model": {
-            // Delegate to /gsd model picker
             const { handleCoreCommand } = await import("./core.js");
             await handleCoreCommand("model", ctx);
             return;
@@ -118,7 +69,6 @@ async function runSingleStep(ctx, stepId) {
             return;
         }
         case "doctor": {
-            // Best-effort: surface provider doctor results inline
             try {
                 const { runProviderDoctor } = await import("../../doctor-providers.js");
                 if (typeof runProviderDoctor === "function") {
@@ -130,10 +80,9 @@ async function runSingleStep(ctx, stepId) {
             ctx.ui.notify("Run /gsd doctor to validate your setup.", "info");
             return;
         }
-        case "skills": {
-            ctx.ui.notify("Skill install runs automatically during /gsd init. Use /gsd init or /skill manage.", "info");
+        case "skills":
+            ctx.ui.notify("Skill install runs during /gsd init. Use /gsd init or /skill manage.", "info");
             return;
-        }
         case "project": {
             const { handleCoreCommand } = await import("./core.js");
             await handleCoreCommand("init", ctx);
@@ -141,6 +90,25 @@ async function runSingleStep(ctx, stepId) {
         }
     }
 }
+// ─── Setup hub ───────────────────────────────────────────────────────────────
+async function renderSetupHub(ctx) {
+    const record = readOnboardingRecord();
+    const completed = new Set(record.completedSteps);
+    const skipped = new Set(record.skippedSteps);
+    const labels = ONBOARDING_STEPS.map(step => {
+        const mark = completed.has(step.id) ? "✓" : skipped.has(step.id) ? "↷" : "○";
+        const req = step.required ? " (required)" : "";
+        return `${mark} ${step.label}${req} — ${step.hint}`;
+    });
+    const labelToStep = new Map(labels.map((label, i) => [label, ONBOARDING_STEPS[i].id]));
+    const choice = await ctx.ui.select("GSD Setup — pick a step to configure", labels);
+    if (typeof choice !== "string")
+        return;
+    const stepId = labelToStep.get(choice);
+    if (!stepId)
+        return;
+    await runStep(ctx, stepId);
+}
 function renderStatus() {
     const r = readOnboardingRecord();
     const lines = ["GSD Onboarding\n"];
@@ -173,27 +141,19 @@ export async function handleOnboarding(rawArgs, ctx) {
             ctx.ui.notify(`Unknown step "${args.step}". Valid: ${validIds}`, "warning");
             return;
         }
-        await runSingleStep(ctx, args.step);
+        await runStep(ctx, args.step);
         return;
     }
     if (args.reset) {
         resetOnboarding();
-        ctx.ui.notify("Onboarding reset. Existing API keys/credentials are unchanged — manage them with /gsd keys.", "info");
-        await runWholeWizard(ctx);
-        return;
-    }
-    if (args.resume) {
-        const r = readOnboardingRecord();
-        const next = nearestResumeStep(r.lastResumePoint, r.completedSteps);
-        await runWholeWizard(ctx, next);
+        ctx.ui.notify("Onboarding state cleared. API keys/credentials are unchanged — manage them with /gsd keys. Restart GSD to re-run the first-run wizard, or pick a step below.", "info");
+        await renderSetupHub(ctx);
         return;
     }
-    // No flags. If already complete, show status + offer choice.
+    // No flags (or --resume). Show status if complete, then open the hub.
     if (isOnboardingComplete()) {
         ctx.ui.notify(renderStatus(), "info");
-        ctx.ui.notify("Onboarding already complete. Use /gsd onboarding --reset to start over, or --step <name> to redo one section.", "info");
-        return;
     }
-    await runWholeWizard(ctx);
+    await renderSetupHub(ctx);
 }
 export { renderStatus as renderOnboardingStatus };

package/dist/resources/extensions/gsd/commands/handlers/ops.js

@@ -248,6 +248,11 @@ Examples:
         await handleExtractLearnings(trimmed.replace(/^extract-learnings\s*/, "").trim(), ctx, pi);
         return true;
     }
+    if (trimmed === "memory" || trimmed.startsWith("memory ") || trimmed === "memory help") {
+        const { handleMemory } = await import("../../commands-memory.js");
+        await handleMemory(trimmed.replace(/^memory\s*/, "").trim(), ctx, pi);
+        return true;
+    }
     if (trimmed === "scan" || trimmed.startsWith("scan ")) {
         const { handleScan } = await import("../../commands-scan.js");
         // \s* (not \s+) is intentional: handles both /gsd scan (no args) and /gsd scan --focus X