vibelet 1.2.195 → 1.2.196

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

package/dist/vibelet.mjs

@@ -12369,7 +12369,7 @@ function canUseSystemdUserManager({ spawnSyncImpl = node_child_process__WEBPACK_
 
 /***/ }),
 
-/***/ 1168:
+/***/ 877:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
 
@@ -12380,7 +12380,7 @@ __nccwpck_require__.d(__webpack_exports__, {
   gJ: () => (/* binding */ terminalControlTokenPath)
 });
 
-// UNUSED EXPORTS: buildClaudeSessionIdArgs, buildClaudeTerminalArgs, buildResumeNativeArgs, cleanupClaudeTerminalHookFiles, collectProcessTreePids, connectTerminalControl, createClaudeTerminalHookFiles, createTerminalModeState, exitCodeFromChildExit, extractInitialSessionId, extractTerminalPromptPreview, formatTerminalControlScreen, hasClaudeContinueArg, hasClaudeResumePickerArg, hasClaudeSettingsArg, installTerminalSignalHandlers, monitorTerminalControlUntilChildExit, normalizeTerminalScreenForTty, requestSwitchBackWhenReady, resolveNativeAgentCommand, stopNativeChild, waitForRemoteMonitorInput
+// UNUSED EXPORTS: buildClaudeSessionIdArgs, buildClaudeTerminalArgs, buildResumeNativeArgs, captureTerminalLineDiscipline, cleanupClaudeTerminalHookFiles, collectProcessTreePids, connectTerminalControl, createClaudeTerminalHookFiles, createTerminalModeState, exitCodeFromChildExit, extractInitialSessionId, extractTerminalPromptPreview, formatTerminalControlScreen, hasClaudeContinueArg, hasClaudeResumePickerArg, hasClaudeSettingsArg, installTerminalSignalHandlers, monitorTerminalControlUntilChildExit, normalizeTerminalScreenForTty, requestSwitchBackWhenReady, resolveNativeAgentCommand, restoreTerminalAfterNativeTui, stopNativeChild, waitForRemoteMonitorInput
 
 // EXTERNAL MODULE: external "node:child_process"
 var external_node_child_process_ = __nccwpck_require__(1421);
@@ -12543,6 +12543,125 @@ function installTerminalSignalHandlers(
   };
 }
 
+;// CONCATENATED MODULE: ./bin/terminal-state.mjs
+
+
+const ANSI_SHOW_CURSOR = '\x1b[?25h';
+const ANSI_RESET = '\x1b[0m';
+const ANSI_RESET_TERMINAL_INPUT_MODES = [
+  '\x1b[?1000l', // X10 mouse reporting
+  '\x1b[?1002l', // button-event mouse reporting
+  '\x1b[?1003l', // any-event mouse reporting
+  '\x1b[?1004l', // focus reporting
+  '\x1b[?1006l', // SGR mouse coordinates
+  '\x1b[?2004l', // bracketed paste
+  '\x1b[<1u', // pop kitty keyboard enhancement flags
+  '\x1b[=0u', // reset kitty keyboard enhancement flags
+  '\x1b[>4;0m', // disable xterm modifyOtherKeys
+].join('');
+
+function captureTerminalLineDiscipline(
+  stdin = process.stdin,
+  { platform = process.platform, execFile = external_node_child_process_.execFileSync } = {},
+) {
+  if (platform === 'win32' || !stdin?.isTTY) return null;
+  try {
+    const state = execFile('stty', ['-g'], {
+      encoding: 'utf8',
+      stdio: [Number.isInteger(stdin.fd) ? stdin.fd : 0, 'pipe', 'ignore'],
+    });
+    return String(state).trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+function restoreTerminalAfterNativeTui(
+  stream,
+  stdin = process.stdin,
+  lineDiscipline = null,
+  { platform = process.platform, execFile = external_node_child_process_.execFileSync } = {},
+) {
+  let restoredLineDiscipline = false;
+  if (platform !== 'win32' && lineDiscipline && stdin?.isTTY) {
+    try {
+      execFile('stty', [lineDiscipline], {
+        stdio: [Number.isInteger(stdin.fd) ? stdin.fd : 0, 'ignore', 'ignore'],
+      });
+      restoredLineDiscipline = true;
+    } catch {
+      // Fall through to Node's portable cooked-mode reset.
+    }
+  }
+  if (!restoredLineDiscipline && stdin?.isTTY && typeof stdin.setRawMode === 'function') {
+    try {
+      stdin.setRawMode(false);
+    } catch {
+      // The controlling terminal may already be detached during shutdown.
+    }
+  }
+  if (stream?.isTTY) {
+    stream.write(`${ANSI_RESET_TERMINAL_INPUT_MODES}${ANSI_SHOW_CURSOR}${ANSI_RESET}`);
+  }
+}
+
+function installRemoteMonitorSignalListeners(processObj, finish) {
+  if (!processObj || typeof processObj.once !== 'function') return () => {};
+  const off =
+    typeof processObj.off === 'function'
+      ? processObj.off.bind(processObj)
+      : typeof processObj.removeListener === 'function'
+        ? processObj.removeListener.bind(processObj)
+        : null;
+  const onSigint = () => finish({ type: 'exit', code: 130 });
+  const onSigterm = () => finish({ type: 'exit', code: 143 });
+  processObj.once('SIGINT', onSigint);
+  processObj.once('SIGTERM', onSigterm);
+  return () => {
+    if (!off) return;
+    off('SIGINT', onSigint);
+    off('SIGTERM', onSigterm);
+  };
+}
+
+function waitForRemoteMonitorInput(signalExit, stdin = process.stdin, processObj = process) {
+  return new Promise((resolve) => {
+    let settled = false;
+    let cleanupInput = () => {};
+    const cleanupSignals = installRemoteMonitorSignalListeners(processObj, (result) => finish(result));
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      cleanupSignals();
+      cleanupInput();
+      resolve(result);
+    };
+
+    if (stdin.isTTY && typeof stdin.setRawMode === 'function') {
+      const onData = (chunk) => {
+        const text = Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk);
+        const userInput = text.replaceAll('\x1b[I', '').replaceAll('\x1b[O', '');
+        if (!userInput) return;
+        if (userInput.includes('\u0003')) {
+          finish({ type: 'exit', code: 130 });
+          return;
+        }
+        finish({ type: 'switchBack' });
+      };
+      cleanupInput = () => {
+        stdin.off('data', onData);
+        stdin.setRawMode(false);
+        if (typeof stdin.pause === 'function') stdin.pause();
+      };
+      stdin.setRawMode(true);
+      stdin.resume();
+      stdin.on('data', onData);
+    }
+
+    signalExit.then((code) => finish({ type: 'exit', code }));
+  });
+}
+
 ;// CONCATENATED MODULE: external "node:crypto"
 const external_node_crypto_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:crypto");
 // EXTERNAL MODULE: external "node:fs"
@@ -12594,6 +12713,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;
@@ -12604,8 +12725,7 @@ 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 terminal_wrapper_ANSI_RESET = '\x1b[0m';
 const ANSI_BOLD = '\x1b[1m';
 const ANSI_CYAN = '\x1b[36m';
 const ANSI_GREEN = '\x1b[32m';
@@ -13022,7 +13142,7 @@ function padRight(text, width) {
 
 function colorize(enabled, style, text) {
   if (!enabled || !style) return text;
-  return `${style}${text}${ANSI_RESET}`;
+  return `${style}${text}${terminal_wrapper_ANSI_RESET}`;
 }
 
 function getTerminalControlScreenTone(title) {
@@ -13143,65 +13263,6 @@ function renderTerminalControlScreen(stream, options) {
   stream.write(`\n${screen}`);
 }
 
-function restoreTerminalCursor(stream) {
-  if (stream?.isTTY) stream.write(`${ANSI_SHOW_CURSOR}${ANSI_RESET}`);
-}
-
-function installRemoteMonitorSignalListeners(processObj, finish) {
-  if (!processObj || typeof processObj.once !== 'function') return () => {};
-  const off =
-    typeof processObj.off === 'function'
-      ? processObj.off.bind(processObj)
-      : typeof processObj.removeListener === 'function'
-        ? processObj.removeListener.bind(processObj)
-        : null;
-  const onSigint = () => finish({ type: 'exit', code: 130 });
-  const onSigterm = () => finish({ type: 'exit', code: 143 });
-  processObj.once('SIGINT', onSigint);
-  processObj.once('SIGTERM', onSigterm);
-  return () => {
-    if (!off) return;
-    off('SIGINT', onSigint);
-    off('SIGTERM', onSigterm);
-  };
-}
-
-function waitForRemoteMonitorInput(signalExit, stdin = process.stdin, processObj = process) {
-  return new Promise((resolve) => {
-    let settled = false;
-    let cleanupInput = () => {};
-    const cleanupSignals = installRemoteMonitorSignalListeners(processObj, (result) => finish(result));
-    const finish = (result) => {
-      if (settled) return;
-      settled = true;
-      cleanupSignals();
-      cleanupInput();
-      resolve(result);
-    };
-
-    if (stdin.isTTY && typeof stdin.setRawMode === 'function') {
-      const onData = (chunk) => {
-        const text = Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk);
-        if (text.includes('\u0003')) {
-          finish({ type: 'exit', code: 130 });
-          return;
-        }
-        finish({ type: 'switchBack' });
-      };
-      cleanupInput = () => {
-        stdin.off('data', onData);
-        stdin.setRawMode(false);
-        if (typeof stdin.pause === 'function') stdin.pause();
-      };
-      stdin.setRawMode(true);
-      stdin.resume();
-      stdin.on('data', onData);
-    }
-
-    signalExit.then((code) => finish({ type: 'exit', code }));
-  });
-}
-
 async function waitForRetryOrSignal(signalExit, delayMs) {
   let timer;
   const retry = new Promise((resolve) => {
@@ -13311,6 +13372,7 @@ async function connectTerminalControl({
   initialSessionId,
   requestedTerminalId,
   taskPreview,
+  terminalLineDiscipline,
   getMode,
   setMode,
   stderr = process.stderr,
@@ -13389,6 +13451,7 @@ async function connectTerminalControl({
       sendResponse(msg.id, false, undefined, 'failed_to_stop_native_terminal');
       return;
     }
+    restoreTerminalAfterNativeTui(stderr, process.stdin, terminalLineDiscipline);
     setMode('remoteDaemon');
     await sendSession('remoteDaemon');
     renderTerminalControlScreen(stderr, {
@@ -13544,6 +13607,7 @@ async function runManagedNativeTerminal({
 }) {
   const command = resolveNativeAgentCommand(agent, env);
   const token = readTerminalControlToken();
+  const terminalLineDiscipline = captureTerminalLineDiscipline();
   let initialSessionId = extractInitialSessionId(agent, args);
   let nativeArgs = args;
   const taskPreview = extractTerminalPromptPreview(agent, args);
@@ -13603,6 +13667,7 @@ async function runManagedNativeTerminal({
           initialSessionId,
           requestedTerminalId: terminalId ?? claudeHookFiles?.terminalId,
           taskPreview,
+          terminalLineDiscipline,
           getMode: () => modeState.getMode(),
           setMode: (nextMode) => modeState.setMode(nextMode),
           stderr,
@@ -13661,7 +13726,7 @@ async function runManagedNativeTerminal({
 
       const monitorAction = await waitForRemoteMonitorInput(signalHandlers.signalExit);
       if (monitorAction.type === 'exit') {
-        restoreTerminalCursor(stderr);
+        restoreTerminalAfterNativeTui(stderr, process.stdin, terminalLineDiscipline);
         return monitorAction.code;
       }
 
@@ -13717,7 +13782,7 @@ async function runManagedNativeTerminal({
         },
       });
       if (typeof switchBack.exitCode === 'number') {
-        restoreTerminalCursor(stderr);
+        restoreTerminalAfterNativeTui(stderr, process.stdin, terminalLineDiscipline);
         return switchBack.exitCode;
       }
       if (!switchBack.ok) {
@@ -13737,6 +13802,7 @@ async function runManagedNativeTerminal({
         continue;
       }
       modeState.setMode('localNative');
+      restoreTerminalAfterNativeTui(stderr, process.stdin, terminalLineDiscipline);
       renderTerminalControlScreen(stderr, {
         title: 'NATIVE TERMINAL UI STARTING',
         subtitle: 'Vibelet app control has been released',
@@ -13758,7 +13824,7 @@ async function runManagedNativeTerminal({
       argv = [command, ...nativeArgs];
     }
   } finally {
-    restoreTerminalCursor(stderr);
+    restoreTerminalAfterNativeTui(stderr, process.stdin, terminalLineDiscipline);
     control?.close();
     signalHandlers?.restore();
     cleanupClaudeTerminalHookFiles(claudeHookFiles);
@@ -14547,9 +14613,25 @@ function createScannablePairingPayload(pairingPayload) {
     c: pairingPayload.pairNonce,
     e: pairingPayload.expiresAt,
   };
-  const [primary] = normalizePairingConnections(pairingPayload);
+  const connections = normalizePairingConnections(pairingPayload);
+  const [primary] = connections;
   const needsExplicitTransport =
     primary && (Boolean(primary.tailcat) || (primary.secure === true && primary.port !== 443));
+  const compactFallback = !needsExplicitTransport
+    ? connections
+        .slice(1)
+        .find(
+          (target) =>
+            primary?.secure !== true &&
+            target.kind === 'direct' &&
+            target.secure !== true &&
+            !target.tailcat &&
+            target.port === primary.port,
+        )
+    : undefined;
+  if (compactFallback) {
+    compactPayload.f = [compactFallback.host];
+  }
   if (needsExplicitTransport) {
     const tuple = [
       primary.kind,
@@ -14958,7 +15040,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__(1168);
+/* harmony import */ var _terminal_wrapper_mjs__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(877);
 /* 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__(4021);
 

package/package.json

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