vibelet 1.2.211 → 1.2.216

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.211"}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.216"}var a=l();process.stdout.write(`${a}
 `);

package/dist/vibelet.mjs

@@ -12442,7 +12442,7 @@ function canUseSystemdUserManager({ spawnSyncImpl = node_child_process__WEBPACK_
 
 /***/ }),
 
-/***/ 877:
+/***/ 5028:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
 
@@ -12773,6 +12773,191 @@ var websocket_server = __nccwpck_require__(3261);
 
 /* harmony default export */ const wrapper = (websocket);
 
+;// CONCATENATED MODULE: ./bin/terminal-screen.mjs
+const ANSI_CLEAR_SCREEN = '\x1b[2J\x1b[H';
+const ANSI_HIDE_CURSOR = '\x1b[?25l';
+const terminal_screen_ANSI_RESET = '\x1b[0m';
+const ANSI_BOLD = '\x1b[1m';
+const ANSI_CYAN = '\x1b[36m';
+const ANSI_GREEN = '\x1b[32m';
+const ANSI_YELLOW = '\x1b[33m';
+const ANSI_RED = '\x1b[31m';
+const ANSI_BG_BLUE = '\x1b[44m';
+const ANSI_WHITE = '\x1b[97m';
+
+function truncateMiddle(value, maxLength) {
+  const text = String(value ?? '');
+  if (text.length <= maxLength) return text;
+  if (maxLength <= 5) return text.slice(0, maxLength);
+  const headLength = Math.ceil((maxLength - 3) / 2);
+  const tailLength = Math.floor((maxLength - 3) / 2);
+  return `${text.slice(0, headLength)}...${text.slice(text.length - tailLength)}`;
+}
+
+function truncateEnd(value, maxLength) {
+  const text = String(value ?? '');
+  if (text.length <= maxLength) return text;
+  if (maxLength <= 5) return text.slice(0, maxLength);
+  return `${text.slice(0, maxLength - 3)}...`;
+}
+
+function wrapText(text, width) {
+  const words = String(text).split(/\s+/).filter(Boolean);
+  if (words.length === 0) return [''];
+  const lines = [];
+  let current = '';
+  for (const word of words) {
+    if (word.length > width) {
+      if (current) {
+        lines.push(current);
+        current = '';
+      }
+      for (let index = 0; index < word.length; index += width) {
+        lines.push(word.slice(index, index + width));
+      }
+      continue;
+    }
+    const next = current ? `${current} ${word}` : word;
+    if (next.length > width) {
+      lines.push(current);
+      current = word;
+    } else {
+      current = next;
+    }
+  }
+  if (current) lines.push(current);
+  return lines;
+}
+
+function padRight(text, width) {
+  const value = String(text);
+  if (value.length >= width) return value.slice(0, width);
+  return `${value}${' '.repeat(width - value.length)}`;
+}
+
+function colorize(enabled, style, text) {
+  if (!enabled || !style) return text;
+  return `${style}${text}${terminal_screen_ANSI_RESET}`;
+}
+
+function getTerminalControlScreenTone(title) {
+  if (/\bFAILED\b|\bBLOCKED\b/i.test(title)) return 'danger';
+  if (/\bRESTORING\b|\bSTARTING\b/i.test(title)) return 'restore';
+  return 'takeover';
+}
+
+function getTerminalControlScreenPalette(tone) {
+  if (tone === 'danger') {
+    return {
+      title: `${ANSI_BOLD}${ANSI_RED}`,
+      subtitle: ANSI_RED,
+      separator: ANSI_RED,
+      label: ANSI_YELLOW,
+      body: '',
+      footer: `${ANSI_BOLD}${ANSI_YELLOW}`,
+    };
+  }
+  if (tone === 'restore') {
+    return {
+      title: `${ANSI_BOLD}${ANSI_CYAN}`,
+      subtitle: ANSI_CYAN,
+      separator: ANSI_CYAN,
+      label: ANSI_CYAN,
+      body: '',
+      footer: `${ANSI_BOLD}${ANSI_GREEN}`,
+    };
+  }
+  return {
+    title: `${ANSI_BOLD}${ANSI_BG_BLUE}${ANSI_WHITE}`,
+    subtitle: ANSI_GREEN,
+    separator: ANSI_GREEN,
+    label: ANSI_CYAN,
+    body: '',
+    footer: `${ANSI_BOLD}${ANSI_YELLOW}`,
+  };
+}
+
+function formatTerminalFieldParts(label, value, width, { truncate = 'middle' } = {}) {
+  const prefix = `${label}: `;
+  const maxValueLength = Math.max(8, width - prefix.length);
+  return {
+    label: prefix,
+    value: truncate === 'end' ? truncateEnd(value, maxValueLength) : truncateMiddle(value, maxValueLength),
+  };
+}
+
+function formatTerminalControlScreen({
+  title,
+  subtitle,
+  agent,
+  cwd,
+  sessionId,
+  task,
+  bodyLines = [],
+  footerLines = [],
+  columns = 80,
+  rows = 24,
+  color = false,
+}) {
+  const screenWidth = Math.max(20, Number(columns) || 80);
+  const width = screenWidth < 60 ? screenWidth : Math.min(100, screenWidth);
+  const height = Math.max(20, Number(rows) || 24);
+  const innerWidth = width - 8;
+  const separator = '='.repeat(width);
+  const tone = getTerminalControlScreenTone(title);
+  const palette = getTerminalControlScreenPalette(tone);
+  const fieldLines = [
+    { label: 'Agent', value: agent || 'unknown' },
+    { label: 'Session', value: sessionId || 'pending' },
+    ...(task ? [{ label: 'Task', value: task, truncate: 'end' }] : []),
+    { label: 'Directory', value: cwd || process.cwd() },
+  ].map(({ label, value, truncate }) => {
+    const parts = formatTerminalFieldParts(label, value, innerWidth, { truncate });
+    return `${colorize(color, palette.label, parts.label)}${parts.value}`;
+  });
+  const block = [
+    colorize(color, palette.separator, separator),
+    colorize(color, palette.title, padRight(title, width)),
+    subtitle ? colorize(color, palette.subtitle, padRight(subtitle, width)) : '',
+    colorize(color, palette.separator, separator),
+    '',
+    ...fieldLines,
+    '',
+  ];
+
+  for (const line of bodyLines) {
+    for (const wrapped of wrapText(line, innerWidth)) {
+      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(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.join('\n')}\n`;
+}
+
+function normalizeTerminalScreenForTty(screen) {
+  return `\r${String(screen).replace(/\r?\n/g, '\r\n')}`;
+}
+
+function renderTerminalControlScreen(stream, options) {
+  const columns = Number(stream?.columns) || 80;
+  const rows = Number(stream?.rows) || 24;
+  const screen = formatTerminalControlScreen({ ...options, columns, rows, color: Boolean(stream?.isTTY) });
+  if (stream?.isTTY) {
+    stream.write(`${ANSI_CLEAR_SCREEN}${ANSI_HIDE_CURSOR}${normalizeTerminalScreenForTty(screen)}`);
+    return;
+  }
+  stream.write(`\n${screen}`);
+}
+
 ;// CONCATENATED MODULE: ./bin/terminal-wrapper.mjs
 
 
@@ -12788,6 +12973,8 @@ var websocket_server = __nccwpck_require__(3261);
 
 
 
+
+
 const terminalControlTokenPath = (0,external_node_path_.join)((0,external_node_os_.homedir)(), '.vibelet', 'runtime', 'terminal-control-token');
 
 const terminal_wrapper_TAKEOVER_STOP_TIMEOUT_MS = 3000;
@@ -12796,21 +12983,25 @@ 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 terminal_wrapper_ANSI_RESET = '\x1b[0m';
-const ANSI_BOLD = '\x1b[1m';
-const ANSI_CYAN = '\x1b[36m';
-const ANSI_GREEN = '\x1b[32m';
-const ANSI_YELLOW = '\x1b[33m';
-const ANSI_RED = '\x1b[31m';
-const ANSI_BG_BLUE = '\x1b[44m';
-const ANSI_WHITE = '\x1b[97m';
-
 function isTerminalAgentCommand(command) {
   return command === 'claude' || command === 'codex';
 }
 
+async function waitForTakeoverResponseSent(control, timeoutMs = 5000) {
+  if (!control) return false;
+  let timer;
+  try {
+    return await Promise.race([
+      control.takeoverResponseSent,
+      new Promise((resolve) => {
+        timer = setTimeout(() => resolve(false), timeoutMs);
+      }),
+    ]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
 function resolveNativeAgentCommand(agent, env = process.env) {
   if (agent === 'claude') return env.CLAUDE_PATH || 'claude';
   if (agent === 'codex') return env.CODEX_PATH || 'codex';
@@ -13163,179 +13354,6 @@ function createTerminalModeState(initialMode = 'localNative') {
   };
 }
 
-function truncateMiddle(value, maxLength) {
-  const text = String(value ?? '');
-  if (text.length <= maxLength) return text;
-  if (maxLength <= 5) return text.slice(0, maxLength);
-  const headLength = Math.ceil((maxLength - 3) / 2);
-  const tailLength = Math.floor((maxLength - 3) / 2);
-  return `${text.slice(0, headLength)}...${text.slice(text.length - tailLength)}`;
-}
-
-function truncateEnd(value, maxLength) {
-  const text = String(value ?? '');
-  if (text.length <= maxLength) return text;
-  if (maxLength <= 5) return text.slice(0, maxLength);
-  return `${text.slice(0, maxLength - 3)}...`;
-}
-
-function wrapText(text, width) {
-  const words = String(text).split(/\s+/).filter(Boolean);
-  if (words.length === 0) return [''];
-  const lines = [];
-  let current = '';
-  for (const word of words) {
-    if (word.length > width) {
-      if (current) {
-        lines.push(current);
-        current = '';
-      }
-      for (let index = 0; index < word.length; index += width) {
-        lines.push(word.slice(index, index + width));
-      }
-      continue;
-    }
-    const next = current ? `${current} ${word}` : word;
-    if (next.length > width) {
-      lines.push(current);
-      current = word;
-    } else {
-      current = next;
-    }
-  }
-  if (current) lines.push(current);
-  return lines;
-}
-
-function padRight(text, width) {
-  const value = String(text);
-  if (value.length >= width) return value.slice(0, width);
-  return `${value}${' '.repeat(width - value.length)}`;
-}
-
-function colorize(enabled, style, text) {
-  if (!enabled || !style) return text;
-  return `${style}${text}${terminal_wrapper_ANSI_RESET}`;
-}
-
-function getTerminalControlScreenTone(title) {
-  if (/\bFAILED\b|\bBLOCKED\b/i.test(title)) return 'danger';
-  if (/\bRESTORING\b|\bSTARTING\b/i.test(title)) return 'restore';
-  return 'takeover';
-}
-
-function getTerminalControlScreenPalette(tone) {
-  if (tone === 'danger') {
-    return {
-      title: `${ANSI_BOLD}${ANSI_RED}`,
-      subtitle: ANSI_RED,
-      separator: ANSI_RED,
-      label: ANSI_YELLOW,
-      body: '',
-      footer: `${ANSI_BOLD}${ANSI_YELLOW}`,
-    };
-  }
-  if (tone === 'restore') {
-    return {
-      title: `${ANSI_BOLD}${ANSI_CYAN}`,
-      subtitle: ANSI_CYAN,
-      separator: ANSI_CYAN,
-      label: ANSI_CYAN,
-      body: '',
-      footer: `${ANSI_BOLD}${ANSI_GREEN}`,
-    };
-  }
-  return {
-    title: `${ANSI_BOLD}${ANSI_BG_BLUE}${ANSI_WHITE}`,
-    subtitle: ANSI_GREEN,
-    separator: ANSI_GREEN,
-    label: ANSI_CYAN,
-    body: '',
-    footer: `${ANSI_BOLD}${ANSI_YELLOW}`,
-  };
-}
-
-function formatTerminalFieldParts(label, value, width, { truncate = 'middle' } = {}) {
-  const prefix = `${label}: `;
-  const maxValueLength = Math.max(8, width - prefix.length);
-  return {
-    label: prefix,
-    value: truncate === 'end' ? truncateEnd(value, maxValueLength) : truncateMiddle(value, maxValueLength),
-  };
-}
-
-function formatTerminalControlScreen({
-  title,
-  subtitle,
-  agent,
-  cwd,
-  sessionId,
-  task,
-  bodyLines = [],
-  footerLines = [],
-  columns = 80,
-  rows = 24,
-  color = false,
-}) {
-  const screenWidth = Math.max(20, Number(columns) || 80);
-  const width = screenWidth < 60 ? screenWidth : Math.min(100, screenWidth);
-  const height = Math.max(20, Number(rows) || 24);
-  const innerWidth = width - 8;
-  const separator = '='.repeat(width);
-  const tone = getTerminalControlScreenTone(title);
-  const palette = getTerminalControlScreenPalette(tone);
-  const fieldLines = [
-    { label: 'Agent', value: agent || 'unknown' },
-    { label: 'Session', value: sessionId || 'pending' },
-    ...(task ? [{ label: 'Task', value: task, truncate: 'end' }] : []),
-    { label: 'Directory', value: cwd || process.cwd() },
-  ].map(({ label, value, truncate }) => {
-    const parts = formatTerminalFieldParts(label, value, innerWidth, { truncate });
-    return `${colorize(color, palette.label, parts.label)}${parts.value}`;
-  });
-  const block = [
-    colorize(color, palette.separator, separator),
-    colorize(color, palette.title, padRight(title, width)),
-    subtitle ? colorize(color, palette.subtitle, padRight(subtitle, width)) : '',
-    colorize(color, palette.separator, separator),
-    '',
-    ...fieldLines,
-    '',
-  ];
-
-  for (const line of bodyLines) {
-    for (const wrapped of wrapText(line, innerWidth)) {
-      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(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.join('\n')}\n`;
-}
-
-function normalizeTerminalScreenForTty(screen) {
-  return `\r${String(screen).replace(/\r?\n/g, '\r\n')}`;
-}
-
-function renderTerminalControlScreen(stream, options) {
-  const columns = Number(stream?.columns) || 80;
-  const rows = Number(stream?.rows) || 24;
-  const screen = formatTerminalControlScreen({ ...options, columns, rows, color: Boolean(stream?.isTTY) });
-  if (stream?.isTTY) {
-    stream.write(`${ANSI_CLEAR_SCREEN}${ANSI_HIDE_CURSOR}${normalizeTerminalScreenForTty(screen)}`);
-    return;
-  }
-  stream.write(`\n${screen}`);
-}
-
 async function waitForRetryOrSignal(signalExit, delayMs) {
   let timer;
   const retry = new Promise((resolve) => {
@@ -13461,6 +13479,10 @@ async function connectTerminalControl({
   let heartbeatTimer = null;
   let resolveClosed;
   let closedResolved = false;
+  let resolveTakeoverResponseSent;
+  const takeoverResponseSent = new Promise((resolve) => {
+    resolveTakeoverResponseSent = resolve;
+  });
   const closed = new Promise((resolve) => {
     resolveClosed = resolve;
   });
@@ -13471,6 +13493,7 @@ async function connectTerminalControl({
       heartbeatTimer = null;
     }
     requester.rejectAll('terminal_control_closed');
+    resolveTakeoverResponseSent(false);
     if (closedResolved) return;
     closedResolved = true;
     resolveClosed({
@@ -13491,7 +13514,7 @@ async function connectTerminalControl({
     });
   }
 
-  function sendResponse(id, ok, data, error) {
+  function sendResponse(id, ok, data, error, onSent) {
     ws.send(
       JSON.stringify({
         type: 'response',
@@ -13500,6 +13523,7 @@ async function connectTerminalControl({
         ...(data === undefined ? {} : { data }),
         ...(error ? { error } : {}),
       }),
+      onSent,
     );
   }
 
@@ -13527,21 +13551,28 @@ async function connectTerminalControl({
     restoreTerminalAfterNativeTui(stderr, process.stdin, terminalLineDiscipline);
     setMode('remoteDaemon');
     await sendSession('remoteDaemon');
-    renderTerminalControlScreen(stderr, {
-      title: 'VIBELET APP CONTROL',
-      subtitle: 'Remote takeover is active',
-      agent,
-      cwd,
-      sessionId: currentSessionId,
-      task: currentTaskPreview,
-      bodyLines: [
-        'The Vibelet app is now controlling this session.',
-        'The native terminal UI is paused so messages and tool output stay in the app.',
-        'Leave this terminal open while you work from the app.',
-      ],
-      footerLines: ['Press any key to restore the native terminal UI.', 'Press Ctrl-C to close this terminal monitor.'],
+    if (agent !== 'codex') {
+      renderTerminalControlScreen(stderr, {
+        title: 'VIBELET APP CONTROL',
+        subtitle: 'Remote takeover is active',
+        agent,
+        cwd,
+        sessionId: currentSessionId,
+        task: currentTaskPreview,
+        bodyLines: [
+          'The Vibelet app is now controlling this session.',
+          'The native terminal UI is paused so messages and tool output stay in the app.',
+          'Leave this terminal open while you work from the app.',
+        ],
+        footerLines: [
+          'Press any key to restore the native terminal UI.',
+          'Press Ctrl-C to close this terminal monitor.',
+        ],
+      });
+    }
+    sendResponse(msg.id, true, { mode: 'remoteDaemon' }, undefined, (error) => {
+      resolveTakeoverResponseSent(!error);
     });
-    sendResponse(msg.id, true, { mode: 'remoteDaemon' });
   });
 
   ws.on('close', (code, reason) => {
@@ -13582,6 +13613,7 @@ async function connectTerminalControl({
 
   return {
     closed,
+    takeoverResponseSent,
     getTerminalId() {
       return terminalId;
     },
@@ -13677,9 +13709,10 @@ async function runManagedNativeTerminal({
   cwd = process.cwd(),
   env = process.env,
   stderr = process.stderr,
+  controlToken,
 }) {
   const command = resolveNativeAgentCommand(agent, env);
-  const token = readTerminalControlToken();
+  const token = controlToken ?? readTerminalControlToken();
   const terminalLineDiscipline = captureTerminalLineDiscipline();
   let initialSessionId = extractInitialSessionId(agent, args);
   let nativeArgs = args;
@@ -13796,6 +13829,15 @@ async function runManagedNativeTerminal({
       if (modeState.getMode() !== 'remoteDaemon') {
         return exitCodeFromChildExit(exit);
       }
+      if (agent === 'codex') {
+        const acknowledged = await waitForTakeoverResponseSent(control);
+        stderr.write(
+          acknowledged
+            ? 'Codex session moved to Vibelet. This terminal session is closed.\n'
+            : 'Codex terminal stopped, but Vibelet takeover was not acknowledged.\n',
+        );
+        return acknowledged ? 0 : 1;
+      }
 
       const monitorAction = await waitForRemoteMonitorInput(signalHandlers.signalExit);
       if (monitorAction.type === 'exit') {
@@ -16043,7 +16085,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var _vibelet_help_mjs__WEBPACK_IMPORTED_MODULE_16__ = __nccwpck_require__(4162);
 /* harmony import */ var _vibelet_tailcat_config_mjs__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(5798);
 /* harmony import */ var _vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(4);
-/* harmony import */ var _terminal_wrapper_mjs__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(877);
+/* harmony import */ var _terminal_wrapper_mjs__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(5028);
 /* harmony import */ var _vibelet_pairing_connections_mjs__WEBPACK_IMPORTED_MODULE_15__ = __nccwpck_require__(7721);
 /* harmony import */ var _vibelet_pairing_output_mjs__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(9485);
 

package/package.json

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