@westbayberry/dg 2.3.2 → 2.3.4

package/dist/setup-ui/wizard.js

@@ -16,7 +16,7 @@ import { createTheme } from "../presentation/theme.js";
 import { activateShell, activationOffer } from "../setup/activate-shell.js";
 import { commitGuardOffer } from "../setup/git-hook.js";
 import { activationCommand, tildifyPath } from "../setup/plan.js";
-import { markSecurityNotesShown, markWizardSkipped, securityNotesShown } from "./gate.js";
+import { markSecurityNotesShown, securityNotesShown } from "./gate.js";
 import { Selector } from "./selector.js";
 import { buildCommitGuardTask, buildWizardTasks } from "./tasks.js";
 export function protectsSentence(agentLabels) {
@@ -30,31 +30,30 @@ export function protectsSentence(agentLabels) {
 }
 const Header = ({ version }) => (_jsxs(Box, { flexDirection: "column", children: [renderLogo("pass").map((line, i) => (_jsx(Text, { children: line }, i))), _jsx(Text, { children: " " }), _jsxs(Text, { bold: true, children: ["Dependency Guardian v", version] }), _jsx(Text, { children: " " })] }));
 const LoginFlow = ({ webBase, env, onDone }) => {
-    const { state, openAndPoll } = useLogin(webBase, env);
-    useEffect(() => {
-        if (state.phase === "ready") {
-            openAndPoll();
-        }
-    }, [state.phase, openAndPoll]);
+    const { state, openInBrowser } = useLogin(webBase, env);
     useInput((_input, key) => {
-        if (key.return && (state.phase === "success" || state.phase === "expired" || state.phase === "error")) {
-            onDone(state.phase === "success" ? state.email : "");
-        }
-        else if (key.escape) {
+        if (key.escape) {
             onDone("");
         }
+        else if (key.return) {
+            if (state.phase === "ready") {
+                openInBrowser();
+            }
+            else if (state.phase === "success" || state.phase === "expired" || state.phase === "error") {
+                onDone(state.phase === "success" ? state.email : "");
+            }
+        }
     });
     switch (state.phase) {
         case "creating":
             return _jsx(Spinner, { label: "Creating login session\u2026" });
         case "ready":
-        case "waiting":
-            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Sign in at:" }), _jsx(Text, { color: "cyan", children: state.verifyUrl }), _jsx(Text, { children: " " }), _jsx(Spinner, { label: "Waiting for you to approve in the browser\u2026" }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "Esc to skip" })] }));
+            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Sign in at:" }), _jsx(Text, { color: "cyan", children: state.verifyUrl }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "Press Enter to open it in your browser, or open the link yourself." }), _jsx(Text, { children: " " }), _jsx(Spinner, { label: "Waiting for you to approve\u2026" }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "Esc to cancel setup" })] }));
         case "success":
             return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "green", bold: true, children: ["\u2713 Logged in", state.email ? ` as ${state.email}` : "", state.plan ? ` (${displayTier(state.plan)} plan)` : ""] }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "Login successful. Press Enter to continue\u2026" })] }));
         case "expired":
         case "error":
-            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "yellow", children: state.phase === "expired" ? "That login link expired." : `Login failed: ${state.message}.` }), _jsx(Text, { dimColor: true, children: "You can run dg login later. Press Enter to continue\u2026" })] }));
+            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "yellow", children: state.phase === "expired" ? "That login link expired." : `Login failed: ${state.message}.` }), _jsx(Text, { dimColor: true, children: "Run dg login any time. Press Enter to exit setup\u2026" })] }));
     }
 };
 function hyperlink(label, url) {
@@ -70,7 +69,7 @@ const NotesStep = ({ termsUrl, privacyUrl, onAgree }) => {
 };
 export const SetupWizardApp = (props) => {
     const { exit } = useApp();
-    const [step, setStep] = useState(props.loginNeeded ? "login" : props.notesNeeded ? "notes" : "choose");
+    const [step, setStep] = useState(props.notesNeeded ? "notes" : props.loginNeeded ? "login" : "choose");
     const [results, setResults] = useState([]);
     const [running, setRunning] = useState(null);
     const [fatalDetail, setFatalDetail] = useState("");
@@ -79,7 +78,7 @@ export const SetupWizardApp = (props) => {
     const applyStarted = useRef(false);
     const Login = props.LoginFlowComponent ?? LoginFlow;
     const afterLogin = () => {
-        setStep(props.notesNeeded ? "notes" : "choose");
+        setStep("choose");
     };
     useInput((_input, key) => {
         if (key.return) {
@@ -136,30 +135,25 @@ export const SetupWizardApp = (props) => {
             cancelled = true;
         };
     }, [step, props]);
-    return (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, paddingTop: 1, children: [_jsx(Header, { version: props.version }), step === "login" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Connect your account" }), _jsx(Text, { children: " " }), _jsx(Selector, { options: [{ label: "Connect in your browser" }, { label: "Skip for now" }], onSelect: (index) => {
-                            if (index === 0) {
-                                setStep("login-flow");
-                            }
-                            else {
-                                props.onLoginSkipped();
-                                afterLogin();
-                            }
-                        }, onCancel: () => {
+    return (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, paddingTop: 1, children: [_jsx(Header, { version: props.version }), step === "login" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Connect your account" }), _jsx(Text, { dimColor: true, children: "Sign in to use dg. Esc cancels setup." }), _jsx(Text, { children: " " }), _jsx(Selector, { options: [{ label: "Connect in your browser" }], onSelect: () => setStep("login-flow"), onCancel: () => {
                             props.onLoginSkipped();
-                            afterLogin();
+                            props.onOutcome({ kind: "declined" });
+                            setStep("declined");
                         } })] })), step === "login-flow" && (_jsx(Login, { webBase: props.webBase, env: props.env, onDone: (loggedInEmail) => {
                     if (loggedInEmail) {
                         setEmail(loggedInEmail);
                         emailRef.current = loggedInEmail;
+                        afterLogin();
                     }
                     else {
                         props.onLoginSkipped();
+                        props.onOutcome({ kind: "declined" });
+                        setStep("declined");
                     }
-                    afterLogin();
                 } })), step === "notes" && (_jsx(NotesStep, { termsUrl: `${props.webBase}/terms`, privacyUrl: `${props.webBase}/privacy`, onAgree: () => {
                     props.onNotesAgreed();
-                    setStep("choose");
-                } })), step === "choose" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Use recommended settings?" }), _jsx(Text, { children: " " }), _jsx(Text, { children: props.sentence }), props.guardsRepo && _jsx(Text, { children: "Also scans this repo's commits before they land." }), props.skips.map((skip) => (_jsxs(Text, { dimColor: true, children: [skip.label, " found but skipped \u2014 ", skip.detail] }, skip.label))), _jsx(Text, { children: " " }), _jsx(Selector, { options: [{ label: "Yes, use recommended settings" }, { label: "No, maybe later with dg setup" }], onSelect: (index) => {
+                    setStep(props.loginNeeded ? "login" : "choose");
+                } })), step === "choose" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Use recommended settings?" }), _jsx(Text, { children: " " }), _jsx(Text, { children: props.sentence }), props.guardsRepo && _jsx(Text, { children: "Also scans this repo's commits before they land." }), props.skips.map((skip) => (_jsxs(Text, { dimColor: true, children: [skip.label, " found but skipped \u2014 ", skip.detail] }, skip.label))), _jsx(Text, { children: " " }), _jsx(Selector, { options: [{ label: "Yes, use recommended settings" }, { label: "Not now — exit setup" }], onSelect: (index) => {
                             if (index === 0) {
                                 setStep("applying");
                             }
@@ -170,7 +164,7 @@ export const SetupWizardApp = (props) => {
                         }, onCancel: () => {
                             props.onOutcome({ kind: "declined" });
                             setStep("declined");
-                        } })] })), (step === "applying" || step === "done" || step === "fatal") && (_jsxs(Box, { flexDirection: "column", children: [results.map((line) => (_jsxs(Text, { color: line.ok ? "green" : "yellow", children: [line.ok ? "✓" : "✗", " ", line.label, !line.ok && line.detail ? ` — ${line.detail}` : ""] }, line.label))), running !== null && _jsx(Spinner, { label: running }), step === "fatal" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsx(Text, { color: "red", children: fatalDetail })] })), step === "done" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "\u2713 Setup complete." }), " ", "Activate now: ", _jsx(Text, { bold: true, children: props.activateHint })] }), email ? _jsxs(Text, { dimColor: true, children: ["Logged in as ", email] }) : null, _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "Press Enter to continue\u2026" })] }))] })), step === "declined" && _jsx(Text, { dimColor: true, children: "Run dg setup any time to turn this on." })] }));
+                        } })] })), (step === "applying" || step === "done" || step === "fatal") && (_jsxs(Box, { flexDirection: "column", children: [results.map((line) => (_jsxs(Text, { color: line.ok ? "green" : "yellow", children: [line.ok ? "✓" : "✗", " ", line.label, !line.ok && line.detail ? ` — ${line.detail}` : ""] }, line.label))), running !== null && _jsx(Spinner, { label: running }), step === "fatal" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsx(Text, { color: "red", children: fatalDetail })] })), step === "done" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "\u2713 Setup complete." }), " ", "Activate now: ", _jsx(Text, { bold: true, children: props.activateHint })] }), email ? _jsxs(Text, { dimColor: true, children: ["Logged in as ", email] }) : null, _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "Press Enter to continue\u2026" })] }))] })), step === "declined" && _jsx(Text, { dimColor: true, children: "Setup not finished \u2014 dg is unavailable until setup completes." })] }));
 };
 export async function runSetupWizard(plan, options = {}) {
     const env = options.env ?? process.env;
@@ -179,55 +173,56 @@ export async function runSetupWizard(plan, options = {}) {
     if (restoreCi) {
         delete process.env.CI;
     }
-    const agents = collectAgentOffers();
-    const repo = commitGuardOffer();
-    const auth = authStatus(env);
-    const state = { outcome: null };
-    const tasks = buildWizardTasks(plan, agents);
-    if (repo) {
-        tasks.push(buildCommitGuardTask(repo));
-    }
-    const { render } = await import("ink");
-    enterTui();
-    const instance = render(_jsx(SetupWizardApp, { version: dgVersion(), notesNeeded: !securityNotesShown(env), loginNeeded: !auth.authenticated, authedEmail: auth.email ?? "", sentence: protectsSentence(agents.map((offer) => offer.label)), guardsRepo: repo !== null, skips: collectAgentSkips(), tasks: tasks, webBase: resolveWebBase(env), env: env, activateHint: activationCommand(plan.shell, tildifyPath(plan.rcPath)), onNotesAgreed: () => markSecurityNotesShown(env), onLoginSkipped: () => recordLoginNudge(env), onOutcome: (outcome) => {
-            state.outcome = outcome;
-        } }), { exitOnCtrlC: true });
-    await instance.waitUntilExit();
-    leaveTui();
-    if (restoreCi) {
-        process.env.CI = ci;
-    }
-    const theme = createTheme(resolvePresentation().color);
-    const accent = (text) => theme.paint("accent", text);
-    const muted = (text) => theme.paint("muted", text);
-    const outcome = state.outcome;
-    if (outcome === null) {
-        // Aborted (e.g. Ctrl-C). Record the skip so the wizard does not re-intercept
-        // every subsequent dg command until the user explicitly declines or applies it.
-        markWizardSkipped(env);
-        markFirstRunShown(env);
-        return { exitCode: 0, stdout: "", stderr: "" };
-    }
-    if (outcome.kind === "declined") {
-        markWizardSkipped(env);
+    try {
+        const agents = collectAgentOffers();
+        const repo = commitGuardOffer();
+        const auth = authStatus(env);
+        const state = { outcome: null };
+        const tasks = buildWizardTasks(plan, agents);
+        if (repo) {
+            tasks.push(buildCommitGuardTask(repo));
+        }
+        const { render } = await import("ink");
+        enterTui();
+        const instance = render(_jsx(SetupWizardApp, { version: dgVersion(), notesNeeded: !securityNotesShown(env), loginNeeded: !auth.authenticated, authedEmail: auth.email ?? "", sentence: protectsSentence(agents.map((offer) => offer.label)), guardsRepo: repo !== null, skips: collectAgentSkips(), tasks: tasks, webBase: resolveWebBase(env), env: env, activateHint: activationCommand(plan.shell, tildifyPath(plan.rcPath)), onNotesAgreed: () => markSecurityNotesShown(env), onLoginSkipped: () => recordLoginNudge(env), onOutcome: (outcome) => {
+                state.outcome = outcome;
+            } }), { exitOnCtrlC: true });
+        await instance.waitUntilExit();
+        leaveTui();
+        const theme = createTheme(resolvePresentation().color);
+        const accent = (text) => theme.paint("accent", text);
+        const muted = (text) => theme.paint("muted", text);
+        const outcome = state.outcome;
+        if (outcome === null || outcome.kind === "declined") {
+            return {
+                exitCode: 1,
+                stdout: "",
+                stderr: `  ${muted("Setup not finished — dg is unavailable until setup completes. Run")} ${accent("dg setup")} ${muted("to finish.")}\n`
+            };
+        }
+        if (outcome.kind === "fatal") {
+            return { exitCode: 1, stdout: "", stderr: `  ${outcome.detail}\n` };
+        }
         markFirstRunShown(env);
-        return { exitCode: 0, stdout: "", stderr: `  ${muted("Run")} ${accent("dg setup")} ${muted("any time to turn this on.")}\n` };
-    }
-    if (outcome.kind === "fatal") {
-        return { exitCode: 1, stdout: "", stderr: `  ${outcome.detail}\n` };
-    }
-    markFirstRunShown(env);
-    const lines = outcome.results.map((line) => line.ok
-        ? `  ${theme.paint("pass", `✓ ${line.label}`)}`
-        : `  ${theme.paint("warn", `✗ ${line.label}`)}${line.detail ? ` ${muted(`— ${line.detail}`)}` : ""}`);
-    lines.push(`  ${theme.paint("pass", "✓ dg setup complete — installs are protected in new terminals.")}`);
-    if (outcome.email) {
-        lines.push(`  ${muted(`Logged in as ${outcome.email}`)}`);
+        const lines = outcome.results.map((line) => line.ok
+            ? `  ${theme.paint("pass", `✓ ${line.label}`)}`
+            : `  ${theme.paint("warn", `✗ ${line.label}`)}${line.detail ? ` ${muted(`— ${line.detail}`)}` : ""}`);
+        lines.push(`  ${theme.paint("pass", "✓ dg setup complete — installs are protected in new terminals.")}`);
+        if (outcome.email) {
+            lines.push(`  ${muted(`Logged in as ${outcome.email}`)}`);
+        }
+        lines.push(`  ${muted("Next: run")} ${accent("dg scan")} ${muted("in a project for a dependency-risk overview")}`);
+        lines.push(`  ${muted("Docs:")} ${accent(`${resolveWebBase(env)}/docs`)}`);
+        if (options.autoActivate && activationOffer() === "prompt") {
+            process.stderr.write(`${lines.join("\n")}\n  ${muted("Starting a protected shell — type")} ${accent("exit")} ${muted("to return to your previous one.")}\n`);
+            return { exitCode: activateShell(), stdout: "", stderr: "" };
+        }
+        lines.push(`  ${muted("Activate now:")} ${accent(activationCommand(plan.shell, tildifyPath(plan.rcPath)))}`);
+        return { exitCode: 0, stdout: "", stderr: `${lines.join("\n")}\n` };
     }
-    if (options.autoActivate && activationOffer() === "prompt") {
-        process.stderr.write(`${lines.join("\n")}\n  ${muted("Starting a protected shell — type")} ${accent("exit")} ${muted("to return to your previous one.")}\n`);
-        return { exitCode: activateShell(), stdout: "", stderr: "" };
+    finally {
+        if (restoreCi) {
+            process.env.CI = ci;
+        }
     }
-    lines.push(`  ${muted("Activate now:")} ${accent(activationCommand(plan.shell, tildifyPath(plan.rcPath)))}`);
-    return { exitCode: 0, stdout: "", stderr: `${lines.join("\n")}\n` };
 }