@westbayberry/dg 2.0.11 → 2.2.0

package/dist/scan-ui/LegacyApp.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useCallback } from "react";
 import { Box, Text, useApp, useInput } from "ink";
+import { EXIT_ANALYSIS_INCOMPLETE, EXIT_NOTHING_TO_SCAN } from "../commands/types.js";
 import { useScan } from "./hooks/useScan.js";
 import { Spinner } from "./components/Spinner.js";
 import { ProgressBar } from "./components/ProgressBar.js";
@@ -8,14 +9,15 @@ import { InteractiveResultsView } from "./components/InteractiveResultsView.js";
 import { ErrorView } from "./components/ErrorView.js";
 import { ProjectSelector } from "./components/ProjectSelector.js";
 import { SetupBanner } from "./components/SetupBanner.js";
-import { useTerminalSize } from "./hooks/useTerminalSize.js";
-import { scanExitCode } from "./shims.js";
+import { useResizeRepaint } from "./hooks/useResizeRepaint.js";
+import { effectiveScanAction, scanExitCode } from "./shims.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, updateAvailable }) => {
+import { accountHeaderLine } from "./shims.js";
+export const App = ({ config, setupIssues = [], initialView, updateAvailable }) => {
     const { state, scanSelectedProjects, restartSelection } = useScan(config);
     const { exit } = useApp();
-    useTerminalSize();
+    useResizeRepaint();
     const leaveAltScreen = useCallback(() => {
         if (tuiIsActive()) {
             leaveTui();
@@ -27,15 +29,12 @@ export const App = ({ config, userStatus, scanUsage, setupIssues = [], initialVi
     useEffect(() => () => leaveAltScreen(), [leaveAltScreen]);
     const handleResultsExit = useCallback(() => {
         if (state.phase === "results") {
-            process.exitCode = scanExitCode(state.result.action, config.mode);
+            process.exitCode = scanExitCode(effectiveScanAction(state.result.action, state.decisions?.effectiveAction, config.mode), config.mode);
         }
         leaveAltScreen();
         exit();
     }, [state, config, exit, leaveAltScreen]);
     // Exit alt screen BEFORE writing messages so they appear on the main screen.
-    // `delayMs` keeps the alt-screen panel visible for that long before tearing
-    // down (default 0 — fire-and-exit). Used by the free_cap_reached path to
-    // give the free_cap_reached path time to read the "sign in to unlock" panel.
     const exitWithMessage = useCallback((message, exitCode, delayMs = 0) => {
         process.exitCode = exitCode;
         if (delayMs === 0) {
@@ -51,18 +50,18 @@ export const App = ({ config, userStatus, scanUsage, setupIssues = [], initialVi
     }, [exit, leaveAltScreen]);
     useEffect(() => {
         if (state.phase === "empty") {
-            const timer = exitWithMessage(`${state.message}\n`, 0);
+            const timer = exitWithMessage(`${state.message}\n`, EXIT_NOTHING_TO_SCAN);
             return () => clearTimeout(timer);
         }
         if (state.phase === "error") {
-            const timer = exitWithMessage(`Error: ${state.error.message}\n`, 3);
+            const timer = exitWithMessage(`Error: ${state.error.message}\n`, EXIT_ANALYSIS_INCOMPLETE);
             return () => clearTimeout(timer);
         }
         // Reflect the verdict in the process exit code as soon as results render,
         // not only when the user dismisses the view — a piped/killed/non-TTY exit
         // must still carry the right code (an unverified scan is never a silent 0).
         if (state.phase === "results") {
-            process.exitCode = scanExitCode(state.result.action, config.mode);
+            process.exitCode = scanExitCode(effectiveScanAction(state.result.action, state.decisions?.effectiveAction, config.mode), config.mode);
         }
     }, [state, config, exitWithMessage]);
     useInput((input, key) => {
@@ -91,13 +90,13 @@ export const App = ({ config, userStatus, scanUsage, setupIssues = [], initialVi
                 return _jsx(Spinner, { label: `Found ${state.found} · ${path}` });
             }
             case "selecting":
-                return (_jsx(ProjectSelector, { projects: state.projects, onConfirm: scanSelectedProjects, onCancel: () => { process.exitCode = 0; leaveAltScreen(); exit(); }, userStatus: userStatus }));
+                return (_jsx(ProjectSelector, { projects: state.projects, onConfirm: scanSelectedProjects, onCancel: () => { process.exitCode = 0; leaveAltScreen(); exit(); }, userStatus: accountHeaderLine() }));
             case "scanning":
                 return (_jsx(ProgressBar, { value: state.done, total: state.total, label: state.batchCount > 1 && state.batchIndex >= 1
                         ? `batch ${state.batchIndex}/${state.batchCount}`
                         : undefined }));
             case "results":
-                return (_jsx(InteractiveResultsView, { result: state.result, config: config, durationMs: state.durationMs, onExit: handleResultsExit, onBack: restartSelection ?? undefined, discoveredTotal: state.discoveredTotal, userStatus: userStatus, scanUsage: scanUsage, initialView: initialView }));
+                return (_jsx(InteractiveResultsView, { result: state.result, config: config, durationMs: state.durationMs, onExit: handleResultsExit, onBack: restartSelection ?? undefined, discoveredTotal: state.discoveredTotal, initialView: initialView, decisions: state.decisions }));
             case "empty":
                 return _jsx(Text, { dimColor: true, children: state.message });
             case "error":
@@ -107,9 +106,6 @@ export const App = ({ config, userStatus, scanUsage, setupIssues = [], initialVi
             }
         }
     })();
-    // Show the setup banner above the results — but not during empty/error/
-    // free_cap_reached phases where it would compete with the message the user
-    // actually needs to read.
     const showBanner = state.phase === "selecting" &&
         setupIssues.length > 0;
     // Results fill the terminal height exactly; an extra line there overflows the alt screen.

package/dist/scan-ui/alt-screen.js

@@ -5,10 +5,12 @@ const HIDE_CURSOR = `${ESC}[?25l`;
 const SHOW_CURSOR = `${ESC}[?25h`;
 const MOUSE_1000_OFF = `${ESC}[?1000l`;
 const MOUSE_1003_OFF = `${ESC}[?1003l`;
-const CLEAR_HOME = `${ESC}[2J${ESC}[H`;
+export const CLEAR_HOME = `${ESC}[2J${ESC}[H`;
 const CLEAR_LINE = `\r${ESC}[2K`;
 const TITLE = "Dependency Guardian";
 const TITLE_OSC = `${ESC}]0;${TITLE}\x07`;
+const TITLE_PUSH = `${ESC}[22;0t`;
+const TITLE_POP = `${ESC}[23;0t`;
 let tuiActive = false;
 let tuiHandle = null;
 let signalRegistrations = [];
@@ -43,7 +45,7 @@ function removeRestoreHandlers() {
 export function enterTui() {
     if (!process.stdout.isTTY || tuiActive)
         return;
-    process.stdout.write(CLEAR_LINE + ALT_SCREEN_ON + HIDE_CURSOR + MOUSE_1000_OFF + MOUSE_1003_OFF + CLEAR_HOME + TITLE_OSC);
+    process.stdout.write(CLEAR_LINE + ALT_SCREEN_ON + HIDE_CURSOR + MOUSE_1000_OFF + MOUSE_1003_OFF + CLEAR_HOME + TITLE_PUSH + TITLE_OSC);
     tuiActive = true;
     installRestoreHandlers();
     if (!tuiHandle)
@@ -56,7 +58,7 @@ export function leaveTui() {
         clearInterval(tuiHandle);
         tuiHandle = null;
     }
-    process.stdout.write(MOUSE_1003_OFF + MOUSE_1000_OFF + SHOW_CURSOR + ALT_SCREEN_OFF);
+    process.stdout.write(MOUSE_1003_OFF + MOUSE_1000_OFF + SHOW_CURSOR + ALT_SCREEN_OFF + TITLE_POP);
     tuiActive = false;
     removeRestoreHandlers();
 }
@@ -65,11 +67,6 @@ export function clearScreen() {
         return;
     process.stdout.write(CLEAR_HOME);
 }
-export function hideCursor() {
-    if (!process.stdout.isTTY)
-        return;
-    process.stdout.write(HIDE_CURSOR);
-}
 export function showCursor() {
     if (!process.stdout.isTTY)
         return;