@westbayberry/dg 2.0.8 → 2.0.11

package/dist/scan-ui/LegacyApp.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useEffect, useLayoutEffect, useCallback, useRef } from "react";
+import { useEffect, useCallback } from "react";
 import { Box, Text, useApp, useInput } from "ink";
-import { getStoredApiKey } from "./shims.js";
 import { useScan } from "./hooks/useScan.js";
 import { Spinner } from "./components/Spinner.js";
 import { ProgressBar } from "./components/ProgressBar.js";
@@ -11,56 +10,21 @@ import { ProjectSelector } from "./components/ProjectSelector.js";
 import { SetupBanner } from "./components/SetupBanner.js";
 import { useTerminalSize } from "./hooks/useTerminalSize.js";
 import { scanExitCode } from "./shims.js";
-import { enterTui, leaveTui, showCursor } from "./alt-screen.js";
+import { leaveTui, showCursor, tuiIsActive } from "./alt-screen.js";
 import { formatResetDate } from "../install-ui/block-render.js";
-export const App = ({ config, userStatus, scanUsage, setupIssues = [], initialView }) => {
+export const App = ({ config, userStatus, scanUsage, setupIssues = [], initialView, updateAvailable }) => {
     const { state, scanSelectedProjects, restartSelection } = useScan(config);
     const { exit } = useApp();
     useTerminalSize();
-    const prevPhaseRef = useRef(state.phase);
-    const altScreenActiveRef = useRef(false);
-    // Enter the alternate screen ONLY after we leave the discovering phase.
-    // The spinner stays inline on the user's main terminal during discovery so
-    // they see "Searching for dependencies..." in their normal scrollback rather
-    // than a cleared screen. useLayoutEffect runs synchronously after React
-    // commits the new tree but before Ink writes the next frame to stdout, so
-    // post-discovery content lands directly in the alt buffer (avoiding the
-    // "blank until keypress" diff-tracker mismatch documented in alt-screen.ts).
-    useLayoutEffect(() => {
-        if (state.phase === "discovering")
-            return;
-        if (!process.stdout.isTTY)
-            return;
-        if (altScreenActiveRef.current)
-            return;
-        enterTui();
-        altScreenActiveRef.current = true;
-    }, [state.phase]);
-    // Cleanup on unmount: leave alt screen, restore cursor.
-    useEffect(() => {
-        return () => {
-            if (altScreenActiveRef.current) {
-                leaveTui();
-                altScreenActiveRef.current = false;
-            }
-            else {
-                showCursor();
-            }
-        };
-    }, []);
-    // Track phase transitions (Ink handles repainting automatically)
-    useEffect(() => {
-        prevPhaseRef.current = state.phase;
-    }, [state.phase]);
     const leaveAltScreen = useCallback(() => {
-        if (altScreenActiveRef.current) {
+        if (tuiIsActive()) {
             leaveTui();
-            altScreenActiveRef.current = false;
         }
         else {
             showCursor();
         }
     }, []);
+    useEffect(() => () => leaveAltScreen(), [leaveAltScreen]);
     const handleResultsExit = useCallback(() => {
         if (state.phase === "results") {
             process.exitCode = scanExitCode(state.result.action, config.mode);
@@ -139,12 +103,7 @@ export const App = ({ config, userStatus, scanUsage, setupIssues = [], initialVi
             case "error":
                 return _jsx(ErrorView, { error: state.error });
             case "free_cap_reached": {
-                let hasKey = false;
-                try {
-                    hasKey = !!getStoredApiKey();
-                }
-                catch { /* ignore — best-effort */ }
-                return (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, children: [hasKey ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: "yellow", bold: true, children: "Your session expired." }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["Run ", _jsx(Text, { color: "cyan", bold: true, children: "dg logout" }), " then ", _jsx(Text, { color: "cyan", bold: true, children: "dg login" }), " to re-authenticate."] })] })) : state.capReason === "prefix_cap" ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: "yellow", bold: true, children: "Too many anonymous devices from your network this month." }), _jsxs(Text, { children: ["Sign in with ", _jsx(Text, { color: "cyan", bold: true, children: "dg login" }), " to keep scanning."] })] })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "yellow", bold: true, children: ["Free monthly limit reached (", state.scansUsed.toLocaleString(), "/", state.maxScans.toLocaleString(), " packages)."] }), formatResetDate(state.resetsAt) ? _jsxs(Text, { dimColor: true, children: ["Resets ", formatResetDate(state.resetsAt), "."] }) : null, _jsxs(Text, { children: ["Upgrade to Pro with ", _jsx(Text, { color: "cyan", bold: true, children: "dg upgrade" }), " for 250k packages/month."] })] })), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "[q] quit" })] }));
+                return (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, children: [state.capReason === "prefix_cap" ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: "yellow", bold: true, children: "Too many anonymous devices from your network this month." }), _jsxs(Text, { children: ["Sign in with ", _jsx(Text, { color: "cyan", bold: true, children: "dg login" }), " to keep scanning."] })] })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "yellow", bold: true, children: ["Free monthly limit reached (", state.scansUsed.toLocaleString(), "/", state.maxScans.toLocaleString(), " packages)."] }), formatResetDate(state.resetsAt) ? _jsxs(Text, { dimColor: true, children: ["Resets ", formatResetDate(state.resetsAt), "."] }) : null, _jsxs(Text, { children: ["Upgrade to Pro at ", _jsx(Text, { color: "cyan", bold: true, children: "westbayberry.com/pricing" }), " for 250k packages/month."] })] })), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "[q] quit" })] }));
             }
         }
     })();
@@ -153,5 +112,8 @@ export const App = ({ config, userStatus, scanUsage, setupIssues = [], initialVi
     // actually needs to read.
     const showBanner = state.phase === "selecting" &&
         setupIssues.length > 0;
-    return (_jsxs(Box, { flexDirection: "column", children: [showBanner ? _jsx(SetupBanner, { issues: setupIssues }) : null, content] }));
+    // Results fill the terminal height exactly; an extra line there overflows the alt screen.
+    const showUpdateLine = updateAvailable !== undefined &&
+        (state.phase === "selecting" || state.phase === "scanning");
+    return (_jsxs(Box, { flexDirection: "column", children: [showBanner ? _jsx(SetupBanner, { issues: setupIssues }) : null, content, showUpdateLine ? _jsx(Box, { paddingLeft: 1, children: _jsx(Text, { dimColor: true, children: updateAvailable }) }) : null] }));
 };