cp dines

Author: dines-rl

src/commands/blueprint/list.tsx

@@ -18,7 +18,7 @@ import { getBlueprintUrl } from "../../utils/url.js";
 import { colors } from "../../utils/theme.js";
 import { getStatusDisplay } from "../../components/StatusBadge.js";
 import { DevboxCreatePage } from "../../components/DevboxCreatePage.js";
-import { exitAlternateScreenBuffer } from "../../utils/screen.js";
+import { useExitOnCtrlC } from "../../hooks/useExitOnCtrlC.js";
 
 const PAGE_SIZE = 10;
 const MAX_FETCH = 100;
@@ -310,17 +310,14 @@ const ListBlueprintsUI = ({
     };
   }, []);
 
+  // Handle Ctrl+C to exit
+  useExitOnCtrlC();
+
   // Handle input for all views - combined into single hook
   useInput((input, key) => {
     // Don't process input if unmounting
     if (!isMounted.current) return;
 
-    // Handle Ctrl+C to force exit
-    if (key.ctrl && input === "c") {
-      exitAlternateScreenBuffer(); // Exit alternate screen
-      process.exit(130);
-    }
-
     // Handle operation input mode
     if (executingOperation && !operationResult && !operationError) {
       const currentOp = allOperations.find(

src/commands/devbox/list.tsx

@@ -18,7 +18,7 @@ import { ResourceActionsMenu } from "../../components/ResourceActionsMenu.js";
 import { ActionsPopup } from "../../components/ActionsPopup.js";
 import { getDevboxUrl } from "../../utils/url.js";
 import { useViewportHeight } from "../../hooks/useViewportHeight.js";
-import { exitAlternateScreenBuffer } from "../../utils/screen.js";
+import { useExitOnCtrlC } from "../../hooks/useExitOnCtrlC.js";
 import { colors } from "../../utils/theme.js";
 
 interface ListOptions {
@@ -548,13 +548,10 @@ const ListDevboxesUI = ({
 
   // Removed refresh icon animation to prevent constant re-renders and flashing
 
-  useInput((input, key) => {
-    // Handle Ctrl+C to force exit
-    if (key.ctrl && input === "c") {
-      exitAlternateScreenBuffer(); // Exit alternate screen
-      process.exit(130);
-    }
+  // Handle Ctrl+C to exit
+  useExitOnCtrlC();
 
+  useInput((input, key) => {
     const pageDevboxes = currentDevboxes.length;
 
     // Skip input handling when in search mode - let TextInput handle it

src/components/DevboxActionsMenu.tsx

@@ -10,6 +10,7 @@ import { Breadcrumb } from "./Breadcrumb.js";
 import { colors } from "../utils/theme.js";
 import { useViewportHeight } from "../hooks/useViewportHeight.js";
 import { useNavigation } from "../store/navigationStore.js";
+import { useExitOnCtrlC } from "../hooks/useExitOnCtrlC.js";
 import {
   getDevboxLogs,
   execCommand,
@@ -224,6 +225,9 @@ export const DevboxActionsMenu = ({
     }
   }, [executingOperation]);
 
+  // Handle Ctrl+C to exit
+  useExitOnCtrlC();
+
   useInput((input, key) => {
     // Handle operation input mode
     if (executingOperation && !operationResult && !operationError) {

src/components/DevboxCreatePage.tsx

@@ -10,6 +10,7 @@ import { SuccessMessage } from "./SuccessMessage.js";
 import { Breadcrumb } from "./Breadcrumb.js";
 import { MetadataDisplay } from "./MetadataDisplay.js";
 import { colors } from "../utils/theme.js";
+import { useExitOnCtrlC } from "../hooks/useExitOnCtrlC.js";
 
 interface DevboxCreatePageProps {
   onBack: () => void;
@@ -135,6 +136,9 @@ export const DevboxCreatePage = ({
 
   const currentFieldIndex = fields.findIndex((f) => f.key === currentField);
 
+  // Handle Ctrl+C to exit
+  useExitOnCtrlC();
+
   useInput((input, key) => {
     // Handle result screen
     if (result) {

src/components/DevboxDetailPage.tsx

@@ -9,6 +9,7 @@ import { DevboxActionsMenu } from "./DevboxActionsMenu.js";
 import { getDevboxUrl } from "../utils/url.js";
 import { colors } from "../utils/theme.js";
 import { useViewportHeight } from "../hooks/useViewportHeight.js";
+import { useExitOnCtrlC } from "../hooks/useExitOnCtrlC.js";
 
 interface DevboxDetailPageProps {
   devbox: any;
@@ -171,6 +172,9 @@ export const DevboxDetailPage = ({
     ? formatTimeAgo(selectedDevbox.create_time_ms)
     : "";
 
+  // Handle Ctrl+C to exit
+  useExitOnCtrlC();
+
   useInput((input, key) => {
     // Don't process input if unmounting
     if (!isMounted.current) return;
@@ -605,7 +609,7 @@ export const DevboxDetailPage = ({
 
   // Detailed info mode - full screen
   if (showDetailedInfo) {
-    const detailLines = [<></>]; //buildDetailLines()]];
+    const detailLines = buildDetailLines();
     const viewportHeight = detailViewport.viewportHeight;
     const maxScroll = Math.max(0, detailLines.length - viewportHeight);
     const actualScroll = Math.min(detailScroll, maxScroll);

src/components/MainMenu.tsx

@@ -6,7 +6,7 @@ import { Breadcrumb } from "./Breadcrumb.js";
 import { VERSION } from "../cli.js";
 import { colors } from "../utils/theme.js";
 import { useViewportHeight } from "../hooks/useViewportHeight.js";
-import { exitAlternateScreenBuffer } from "../utils/screen.js";
+import { useExitOnCtrlC } from "../hooks/useExitOnCtrlC.js";
 
 interface MenuItem {
   key: string;
@@ -51,6 +51,9 @@ export const MainMenu = ({ onSelect }: MainMenuProps) => {
   // Use centralized viewport hook for consistent layout
   const { terminalHeight } = useViewportHeight({ overhead: 0 });
 
+  // Handle Ctrl+C to exit
+  useExitOnCtrlC();
+
   useInput((input, key) => {
     if (key.upArrow && selectedIndex > 0) {
       setSelectedIndex(selectedIndex - 1);
@@ -66,9 +69,6 @@ export const MainMenu = ({ onSelect }: MainMenuProps) => {
       onSelect("blueprints");
     } else if (input === "s" || input === "3") {
       onSelect("snapshots");
-    } else if (key.ctrl && input === "c") {
-      exitAlternateScreenBuffer();
-      process.exit(130);
     }
   });
 

src/components/ResourceListView.tsx

@@ -8,7 +8,7 @@ import { ErrorMessage } from "./ErrorMessage.js";
 import { Table, Column } from "./Table.js";
 import { colors } from "../utils/theme.js";
 import { useViewportHeight } from "../hooks/useViewportHeight.js";
-import { exitAlternateScreenBuffer } from "../utils/screen.js";
+import { useExitOnCtrlC } from "../hooks/useExitOnCtrlC.js";
 
 // Format time ago in a succinct way
 export const formatTimeAgo = (timestamp: number): string => {
@@ -211,17 +211,14 @@ export function ResourceListView<T>({ config }: ResourceListViewProps<T>) {
 
   const selectedResource = currentResources[selectedIndex];
 
+  // Handle Ctrl+C to exit
+  useExitOnCtrlC();
+
   // Input handling
   useInput((input, key) => {
     // Don't process input if unmounting
     if (!isMounted.current) return;
 
-    // Handle Ctrl+C to force exit
-    if (key.ctrl && input === "c") {
-      exitAlternateScreenBuffer(); // Exit alternate screen
-      process.exit(130);
-    }
-
     const pageResourcesCount = currentResources.length;
 
     // Skip input handling when in search mode

src/hooks/useExitOnCtrlC.ts

@@ -0,0 +1,16 @@
+/**
+ * Hook to handle Ctrl+C (SIGINT) consistently across all screens
+ * Exits the program with proper cleanup of alternate screen buffer
+ */
+import { useInput } from "ink";
+import { exitAlternateScreenBuffer } from "../utils/screen.js";
+
+export function useExitOnCtrlC(): void {
+  useInput((input, key) => {
+    if (key.ctrl && input === "c") {
+      exitAlternateScreenBuffer();
+      process.exit(130); // Standard exit code for SIGINT
+    }
+  });
+}
+

src/screens/DevboxListScreen.tsx

@@ -19,6 +19,7 @@ import { ActionsPopup } from "../components/ActionsPopup.js";
 import { getDevboxUrl } from "../utils/url.js";
 import { useViewportHeight } from "../hooks/useViewportHeight.js";
 import { colors, sanitizeWidth } from "../utils/theme.js";
+import { useExitOnCtrlC } from "../hooks/useExitOnCtrlC.js";
 
 export function DevboxListScreen() {
   // Get state from store
@@ -393,12 +394,11 @@ export function DevboxListScreen() {
     },
   ];
 
+  // Handle Ctrl+C to exit
+  useExitOnCtrlC();
+
   // Input handling
   useInput((input, key) => {
-    if (key.ctrl && input === "c") {
-      process.exit(130);
-    }
-
     const pageDevboxes = devboxes.length;
 
     // Search mode

src/screens/SSHSessionScreen.tsx

@@ -13,10 +13,14 @@ import {
 import { Breadcrumb } from "../components/Breadcrumb.js";
 import { colors } from "../utils/theme.js";
 import figures from "figures";
+import { useExitOnCtrlC } from "../hooks/useExitOnCtrlC.js";
 
 export function SSHSessionScreen() {
   const { params, navigate } = useNavigation();
 
+  // Handle Ctrl+C to exit (before SSH connects or on error)
+  useExitOnCtrlC();
+
   // Extract SSH config from params
   const keyPath = params.keyPath;
   const proxyCommand = params.proxyCommand;