@vibelet/cli 1.2.137 → 1.2.139

package/dist/runtime-version.cjs

@@ -1,2 +1,2 @@
-var c=require("node:fs"),n=require("node:path"),p="@vibelet/cli";function i(r){try{let e=JSON.parse((0,c.readFileSync)(r,"utf8"));if(e.name===p&&typeof e.version=="string"&&e.version.length>0)return e.version}catch{}return null}function l(){return"1.2.137"}var a=l();process.stdout.write(`${a}
+var c=require("node:fs"),n=require("node:path"),p="@vibelet/cli";function i(r){try{let e=JSON.parse((0,c.readFileSync)(r,"utf8"));if(e.name===p&&typeof e.version=="string"&&e.version.length>0)return e.version}catch{}return null}function l(){return"1.2.139"}var a=l();process.stdout.write(`${a}
 `);

package/dist/vibelet.mjs

@@ -11768,7 +11768,7 @@ __nccwpck_require__.d(__webpack_exports__, {
   gJ: () => (/* binding */ terminalControlTokenPath)
 });
 
-// UNUSED EXPORTS: buildClaudeSessionIdArgs, buildClaudeTerminalArgs, buildResumeNativeArgs, cleanupClaudeTerminalHookFiles, collectProcessTreePids, createClaudeTerminalHookFiles, createTerminalModeState, exitCodeFromChildExit, extractInitialSessionId, formatTerminalControlScreen, hasClaudeContinueArg, hasClaudeResumePickerArg, hasClaudeSettingsArg, requestSwitchBackWhenReady, resolveNativeAgentCommand, stopNativeChild
+// UNUSED EXPORTS: buildClaudeSessionIdArgs, buildClaudeTerminalArgs, buildResumeNativeArgs, cleanupClaudeTerminalHookFiles, collectProcessTreePids, connectTerminalControl, createClaudeTerminalHookFiles, createTerminalModeState, exitCodeFromChildExit, extractInitialSessionId, formatTerminalControlScreen, hasClaudeContinueArg, hasClaudeResumePickerArg, hasClaudeSettingsArg, monitorTerminalControlUntilChildExit, requestSwitchBackWhenReady, resolveNativeAgentCommand, stopNativeChild
 
 // EXTERNAL MODULE: external "node:child_process"
 var external_node_child_process_ = __nccwpck_require__(1421);
@@ -11814,13 +11814,13 @@ const TAKEOVER_STOP_TIMEOUT_MS = 3000;
 const TAKEOVER_MODE_SETTLE_TIMEOUT_MS = TAKEOVER_STOP_TIMEOUT_MS + 2000;
 const SWITCHBACK_RESTORE_NOTICE_MS = 1200;
 const SWITCHBACK_BUSY_RETRY_DELAY_MS = 750;
+const TERMINAL_CONTROL_RECONNECT_DELAY_MS = 1000;
 const CLAUDE_HOOK_SECRET_HEADER = 'x-vibelet-claude-hook-secret';
 const ANSI_CLEAR_SCREEN = '\x1b[2J\x1b[H';
 const ANSI_HIDE_CURSOR = '\x1b[?25l';
 const ANSI_SHOW_CURSOR = '\x1b[?25h';
 const ANSI_RESET = '\x1b[0m';
 const ANSI_BOLD = '\x1b[1m';
-const ANSI_DIM = '\x1b[2m';
 const ANSI_CYAN = '\x1b[36m';
 const ANSI_GREEN = '\x1b[32m';
 const ANSI_YELLOW = '\x1b[33m';
@@ -12226,13 +12226,6 @@ function wrapText(text, width) {
   return lines;
 }
 
-function centerText(text, width) {
-  const value = String(text);
-  if (value.length >= width) return value.slice(0, width);
-  const left = Math.floor((width - value.length) / 2);
-  return `${' '.repeat(left)}${value}`;
-}
-
 function padRight(text, width) {
   const value = String(text);
   if (value.length >= width) return value.slice(0, width);
@@ -12240,7 +12233,7 @@ function padRight(text, width) {
 }
 
 function colorize(enabled, style, text) {
-  if (!enabled) return text;
+  if (!enabled || !style) return text;
   return `${style}${text}${ANSI_RESET}`;
 }
 
@@ -12257,7 +12250,7 @@ function getTerminalControlScreenPalette(tone) {
       subtitle: ANSI_RED,
       separator: ANSI_RED,
       label: ANSI_YELLOW,
-      body: ANSI_WHITE,
+      body: '',
       footer: `${ANSI_BOLD}${ANSI_YELLOW}`,
     };
   }
@@ -12267,7 +12260,7 @@ function getTerminalControlScreenPalette(tone) {
       subtitle: ANSI_CYAN,
       separator: ANSI_CYAN,
       label: ANSI_CYAN,
-      body: ANSI_WHITE,
+      body: '',
       footer: `${ANSI_BOLD}${ANSI_GREEN}`,
     };
   }
@@ -12276,7 +12269,7 @@ function getTerminalControlScreenPalette(tone) {
     subtitle: ANSI_GREEN,
     separator: ANSI_GREEN,
     label: ANSI_CYAN,
-    body: ANSI_WHITE,
+    body: '',
     footer: `${ANSI_BOLD}${ANSI_YELLOW}`,
   };
 }
@@ -12305,7 +12298,6 @@ function formatTerminalControlScreen({
   const width = screenWidth < 60 ? screenWidth : Math.min(100, screenWidth);
   const height = Math.max(20, Number(rows) || 24);
   const innerWidth = width - 8;
-  const gutter = ' '.repeat(Math.max(0, Math.floor((screenWidth - width) / 2)));
   const separator = '='.repeat(width);
   const tone = getTerminalControlScreenTone(title);
   const palette = getTerminalControlScreenPalette(tone);
@@ -12315,12 +12307,12 @@ function formatTerminalControlScreen({
     ['Directory', cwd || process.cwd()],
   ].map(([label, value]) => {
     const parts = formatTerminalFieldParts(label, value, innerWidth);
-    return `${colorize(color, palette.label, parts.label)}${colorize(color, ANSI_DIM, parts.value)}`;
+    return `${colorize(color, palette.label, parts.label)}${parts.value}`;
   });
   const block = [
     colorize(color, palette.separator, separator),
-    colorize(color, palette.title, padRight(centerText(title, width), width)),
-    subtitle ? colorize(color, palette.subtitle, padRight(centerText(subtitle, width), width)) : '',
+    colorize(color, palette.title, padRight(title, width)),
+    subtitle ? colorize(color, palette.subtitle, padRight(subtitle, width)) : '',
     colorize(color, palette.separator, separator),
     '',
     ...fieldLines,
@@ -12329,20 +12321,20 @@ function formatTerminalControlScreen({
 
   for (const line of bodyLines) {
     for (const wrapped of wrapText(line, innerWidth)) {
-      block.push(colorize(color, palette.body, padRight(centerText(wrapped, width), width)));
+      block.push(colorize(color, palette.body, padRight(wrapped, width)));
     }
   }
 
   block.push('');
   for (const line of footerLines) {
     for (const wrapped of wrapText(line, innerWidth)) {
-      block.push(colorize(color, palette.footer, padRight(centerText(wrapped, width), width)));
+      block.push(colorize(color, palette.footer, padRight(wrapped, width)));
     }
   }
   block.push(colorize(color, palette.separator, separator));
 
   const verticalPadding = Math.max(0, Math.floor((height - block.length) / 3));
-  return `${'\n'.repeat(verticalPadding)}${block.map((line) => `${gutter}${line}`).join('\n')}\n`;
+  return `${'\n'.repeat(verticalPadding)}${block.join('\n')}\n`;
 }
 
 function renderTerminalControlScreen(stream, options) {
@@ -12549,6 +12541,25 @@ async function connectTerminalControl({
   let activeChild = child;
   let activeChildExit = childExit;
   let heartbeatTimer = null;
+  let resolveClosed;
+  let closedResolved = false;
+  const closed = new Promise((resolve) => {
+    resolveClosed = resolve;
+  });
+
+  function resolveCloseOnce(code, reason) {
+    if (heartbeatTimer) {
+      clearInterval(heartbeatTimer);
+      heartbeatTimer = null;
+    }
+    requester.rejectAll('terminal_control_closed');
+    if (closedResolved) return;
+    closedResolved = true;
+    resolveClosed({
+      code,
+      reason: Buffer.isBuffer(reason) ? reason.toString('utf8') : String(reason ?? ''),
+    });
+  }
 
   async function sendSession(mode = getMode()) {
     if (!terminalId || !currentSessionId) return { ok: true };
@@ -12613,9 +12624,8 @@ async function connectTerminalControl({
     sendResponse(msg.id, true, { mode: 'remoteDaemon' });
   });
 
-  ws.on('close', () => {
-    if (heartbeatTimer) clearInterval(heartbeatTimer);
-    requester.rejectAll('terminal_control_closed');
+  ws.on('close', (code, reason) => {
+    resolveCloseOnce(code, reason);
   });
 
   const hello = await requester.sendRequest('terminal.hello', {
@@ -12651,6 +12661,10 @@ async function connectTerminalControl({
   if (typeof heartbeatTimer.unref === 'function') heartbeatTimer.unref();
 
   return {
+    closed,
+    getTerminalId() {
+      return terminalId;
+    },
     getSessionId() {
       return currentSessionId;
     },
@@ -12673,12 +12687,68 @@ async function connectTerminalControl({
       });
     },
     close() {
-      if (heartbeatTimer) clearInterval(heartbeatTimer);
-      ws.close();
+      if (heartbeatTimer) {
+        clearInterval(heartbeatTimer);
+        heartbeatTimer = null;
+      }
+      if (ws.readyState === wrapper.OPEN || ws.readyState === wrapper.CONNECTING) {
+        ws.close();
+      }
     },
   };
 }
 
+async function monitorTerminalControlUntilChildExit({
+  childExit,
+  getControl,
+  setControl,
+  connectControl,
+  shouldReconnect = () => true,
+  retryDelayMs = TERMINAL_CONTROL_RECONNECT_DELAY_MS,
+  onControlDisconnected,
+  onReconnectFailure,
+}) {
+  const delayMs = Math.max(1, Number(retryDelayMs) || TERMINAL_CONTROL_RECONNECT_DELAY_MS);
+  const childExitEvent = childExit.then((exit) => ({ type: 'childExit', exit }));
+
+  while (true) {
+    const currentControl = getControl();
+    const waiters = [childExitEvent];
+    if (currentControl?.closed) {
+      waiters.push(
+        currentControl.closed.then((closeInfo) => ({
+          type: 'controlClosed',
+          control: currentControl,
+          closeInfo,
+        })),
+      );
+    }
+    if (!currentControl || !shouldReconnect()) {
+      waiters.push(waitMs(delayMs).then(() => ({ type: 'retry' })));
+    }
+
+    const event = await Promise.race(waiters);
+    if (event.type === 'childExit') {
+      return event.exit;
+    }
+
+    if (event.type === 'controlClosed' && getControl() === event.control) {
+      setControl(null);
+      onControlDisconnected?.(event.control, event.closeInfo);
+    }
+
+    if (getControl() || !shouldReconnect()) {
+      continue;
+    }
+
+    try {
+      setControl(await connectControl());
+    } catch (error) {
+      onReconnectFailure?.(error);
+    }
+  }
+}
+
 async function runManagedNativeTerminal({
   agent,
   args,
@@ -12716,11 +12786,49 @@ async function runManagedNativeTerminal({
   let signalHandlers = null;
   const modeState = createTerminalModeState('localNative');
   let control = null;
+  let terminalId = claudeHookFiles?.terminalId ?? null;
+
+  function rememberControlState(nextControl) {
+    const nextTerminalId = nextControl?.getTerminalId?.();
+    if (nextTerminalId) terminalId = nextTerminalId;
+    const nextSessionId = nextControl?.getSessionId?.();
+    if (nextSessionId) initialSessionId = nextSessionId;
+  }
 
   try {
     while (true) {
       activeChild = await spawnNativeChild(command, nativeArgs, { cwd, env });
       const childExit = waitForChildExit(activeChild);
+      let reportedTerminalControlFailure = false;
+      const reportTerminalControlFailure = (prefix, error) => {
+        if (reportedTerminalControlFailure) return;
+        reportedTerminalControlFailure = true;
+        stderr.write(`${prefix}: ${error instanceof Error ? error.message : String(error)}\n`);
+      };
+      const connectActiveControl = async () => {
+        const nextControl = await connectTerminalControl({
+          agent,
+          cwd,
+          argv,
+          child: activeChild,
+          childExit,
+          cliVersion,
+          port,
+          token,
+          initialSessionId,
+          requestedTerminalId: terminalId ?? claudeHookFiles?.terminalId,
+          getMode: () => modeState.getMode(),
+          setMode: (nextMode) => modeState.setMode(nextMode),
+          stderr,
+        });
+        rememberControlState(nextControl);
+        reportedTerminalControlFailure = false;
+        return nextControl;
+      };
+      const setActiveControl = (nextControl) => {
+        control = nextControl;
+        rememberControlState(nextControl);
+      };
       if (!signalHandlers) {
         signalHandlers = installTerminalSignalHandlers(
           () => activeChild,
@@ -12732,30 +12840,32 @@ async function runManagedNativeTerminal({
         stderr.write('Vibelet terminal control is unavailable; running native TUI without App takeover.\n');
       } else if (!control) {
         try {
-          control = await connectTerminalControl({
-            agent,
-            cwd,
-            argv,
-            child: activeChild,
-            childExit,
-            cliVersion,
-            port,
-            token,
-            initialSessionId,
-            requestedTerminalId: claudeHookFiles?.terminalId,
-            getMode: () => modeState.getMode(),
-            setMode: (nextMode) => modeState.setMode(nextMode),
-            stderr,
-          });
+          setActiveControl(await connectActiveControl());
         } catch (error) {
-          stderr.write(`Vibelet terminal control failed: ${error instanceof Error ? error.message : String(error)}\n`);
+          reportTerminalControlFailure('Vibelet terminal control failed', error);
         }
       } else {
         control.setChild(activeChild, childExit);
         await control.sendSession('localNative');
+        rememberControlState(control);
       }
 
-      const exit = await childExit;
+      const exit = token
+        ? await monitorTerminalControlUntilChildExit({
+            childExit,
+            getControl: () => control,
+            setControl: setActiveControl,
+            connectControl: connectActiveControl,
+            shouldReconnect: () => modeState.getMode() === 'localNative',
+            onControlDisconnected: (closedControl) => {
+              rememberControlState(closedControl);
+              stderr.write('Vibelet terminal control disconnected; reconnecting so App takeover can resume.\n');
+            },
+            onReconnectFailure: (error) => {
+              reportTerminalControlFailure('Vibelet terminal control reconnect failed', error);
+            },
+          })
+        : await childExit;
       if (modeState.getMode() === 'switchingToRemote') {
         await modeState.waitUntilModeLeaves('switchingToRemote', TAKEOVER_MODE_SETTLE_TIMEOUT_MS);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibelet/cli",
-  "version": "1.2.137",
+  "version": "1.2.139",
   "description": "Cross-platform CLI for installing and running the Vibelet daemon",
   "homepage": "https://vibelet.icu",
   "files": [