vibelet 1.2.210 → 1.2.215

package/dist/vibelet.mjs

@@ -11340,7 +11340,7 @@ module.exports = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("zlib");
 
 /***/ }),
 
-/***/ 6895:
+/***/ 1484:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
 
@@ -11362,218 +11362,16 @@ var external_node_fs_ = __nccwpck_require__(3024);
 var external_node_module_ = __nccwpck_require__(8995);
 // EXTERNAL MODULE: external "node:path"
 var external_node_path_ = __nccwpck_require__(6760);
-// EXTERNAL MODULE: external "node:fs/promises"
-var promises_ = __nccwpck_require__(1455);
-// EXTERNAL MODULE: external "node:util"
-var external_node_util_ = __nccwpck_require__(7975);
-;// CONCATENATED MODULE: ../../packages/cloudflared-tunnel/managed-binary.mjs
-
-
-
-
-
-
-const execFileAsync = (0,external_node_util_.promisify)(external_node_child_process_.execFile);
-const DEFAULT_UPDATE_INTERVAL_MS = 24 * 60 * 60 * 1000;
-const DEFAULT_UPDATE_TIMEOUT_MS = 30_000;
-
-function parseCloudflaredVersion(output) {
-  return String(output || '').match(/cloudflared version\s+([0-9]+(?:\.[0-9]+){1,2})/i)?.[1] ?? null;
-}
-
-async function readUpdateState(updateStatePath) {
-  try {
-    const state = JSON.parse(await (0,promises_.readFile)(updateStatePath, 'utf8'));
-    return state && typeof state === 'object' ? state : null;
-  } catch {
-    return null;
-  }
-}
-
-async function writeUpdateState(updateStatePath, state) {
-  await (0,promises_.mkdir)((0,external_node_path_.dirname)(updateStatePath), { recursive: true });
-  const temporaryPath = `${updateStatePath}.tmp-${process.pid}-${Date.now()}`;
-  await (0,promises_.writeFile)(temporaryPath, `${JSON.stringify(state, null, 2)}\n`, 'utf8');
-  await (0,promises_.rename)(temporaryPath, updateStatePath);
-}
-
-async function runVersion(binaryPath, timeoutMs, runCommand) {
-  if (!binaryPath || !(0,external_node_fs_.existsSync)(binaryPath)) return null;
-  try {
-    const { stdout, stderr } = await runCommand(binaryPath, ['--version'], {
-      encoding: 'utf8',
-      timeout: timeoutMs,
-      maxBuffer: 1024 * 1024,
-    });
-    return parseCloudflaredVersion(`${stdout || ''}\n${stderr || ''}`);
-  } catch {
-    return null;
-  }
-}
-
-async function probeCloudflaredLaunchSpecVersion(
-  launchSpec,
-  { timeoutMs = 5_000, runCommand = execFileAsync } = {},
-) {
-  try {
-    const { stdout, stderr } = await runCommand(launchSpec.command, [...launchSpec.args, '--version'], {
-      encoding: 'utf8',
-      timeout: timeoutMs,
-      maxBuffer: 1024 * 1024,
-      ...(launchSpec.shell ? { shell: true } : {}),
-    });
-    return parseCloudflaredVersion(`${stdout || ''}\n${stderr || ''}`);
-  } catch {
-    return null;
-  }
-}
-
-async function installLatestToTemporaryPath({ launchSpec, binaryPath, timeoutMs, platform, runCommand }) {
-  const temporaryDir = (0,external_node_path_.join)((0,external_node_path_.dirname)(binaryPath), `.cloudflared-update-${process.pid}-${Date.now()}`);
-  const temporaryBinaryPath = (0,external_node_path_.join)(temporaryDir, (0,external_node_path_.basename)(binaryPath));
-  await (0,promises_.mkdir)(temporaryDir, { recursive: true });
-  try {
-    await runCommand(launchSpec.command, [...launchSpec.args, 'bin', 'install', 'latest'], {
-      encoding: 'utf8',
-      timeout: timeoutMs,
-      maxBuffer: 4 * 1024 * 1024,
-      env: { ...process.env, CLOUDFLARED_BIN: temporaryBinaryPath },
-      ...(launchSpec.shell ? { shell: true } : {}),
-    });
-    const version = await runVersion(temporaryBinaryPath, timeoutMs, runCommand);
-    if (!version) throw new Error('downloaded cloudflared did not report a valid version');
-
-    if (platform === 'win32' && (0,external_node_fs_.existsSync)(binaryPath)) {
-      const backupPath = `${binaryPath}.previous-${process.pid}`;
-      await (0,promises_.rename)(binaryPath, backupPath);
-      try {
-        await (0,promises_.rename)(temporaryBinaryPath, binaryPath);
-        await (0,promises_.rm)(backupPath, { force: true });
-      } catch (error) {
-        await (0,promises_.rename)(backupPath, binaryPath).catch(() => undefined);
-        throw error;
-      }
-    } else {
-      await (0,promises_.rename)(temporaryBinaryPath, binaryPath);
-    }
-    return version;
-  } finally {
-    await (0,promises_.rm)(temporaryDir, { recursive: true, force: true });
-  }
-}
-
-async function resolveManagedCloudflared({
-  launchSpec,
-  updateStatePath,
-  now = Date.now(),
-  updateIntervalMs = DEFAULT_UPDATE_INTERVAL_MS,
-  timeoutMs = DEFAULT_UPDATE_TIMEOUT_MS,
-  platform = process.platform,
-  runCommand = execFileAsync,
-}) {
-  const state = await readUpdateState(updateStatePath);
-  const lastAttemptAt = Date.parse(state?.lastAttemptAt || '');
-  const recentlyAttempted = Number.isFinite(lastAttemptAt) && now - lastAttemptAt < updateIntervalMs;
-  if (recentlyAttempted) {
-    return {
-      launchSpec,
-      version: state?.installedVersion ?? null,
-      update: 'skipped',
-    };
-  }
-
-  const attemptedAt = new Date(now).toISOString();
-  const binaryPath = launchSpec.managedBinaryPath;
-  if (launchSpec.source !== 'dependency' || !binaryPath) {
-    const version = state?.installedVersion ?? null;
-    let stateWarning = '';
-    try {
-      await writeUpdateState(updateStatePath, {
-        ...state,
-        lastAttemptAt: attemptedAt,
-        installedVersion: version,
-      });
-    } catch (error) {
-      stateWarning = ` Update state could not be saved: ${error instanceof Error ? error.message : String(error)}`;
-    }
-    return {
-      launchSpec,
-      version,
-      update: 'skipped',
-      warning: `Skipping cloudflared self-update for unmanaged ${launchSpec.source} executable: ${launchSpec.description}.${stateWarning}`,
-    };
-  }
-
-  const previousVersion = await runVersion(binaryPath, timeoutMs, runCommand);
-  try {
-    const installedVersion = await installLatestToTemporaryPath({
-      launchSpec,
-      binaryPath,
-      timeoutMs,
-      platform,
-      runCommand,
-    });
-    await writeUpdateState(updateStatePath, {
-      lastAttemptAt: attemptedAt,
-      lastSuccessAt: attemptedAt,
-      installedVersion,
-    });
-    return {
-      launchSpec,
-      version: installedVersion,
-      update: previousVersion ? 'updated' : 'fresh',
-    };
-  } catch (error) {
-    const fallbackVersion = previousVersion || (await runVersion(binaryPath, timeoutMs, runCommand));
-    await writeUpdateState(updateStatePath, {
-      ...state,
-      lastAttemptAt: attemptedAt,
-      installedVersion: fallbackVersion,
-    }).catch(() => undefined);
-    return {
-      launchSpec,
-      version: fallbackVersion,
-      update: 'failed',
-      warning: `cloudflared update failed; continuing with ${fallbackVersion || 'the existing launcher'}: ${error instanceof Error ? error.message : String(error)}`,
-    };
-  }
-}
-
-;// CONCATENATED MODULE: ../../packages/cloudflared-tunnel/index.mjs
-
-
-
+;// CONCATENATED MODULE: ../../packages/cloudflared-tunnel/launch-spec.mjs
 
 
 
 
 
-const QUICK_TUNNEL_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com(?=$|[\s"',)\]])/g;
 const npmFallbackArgs = ['--yes', '--package=cloudflared', 'cloudflared'];
 const npmFallbackDescription = `npx ${npmFallbackArgs.join(' ')}`;
 const defaultUrlTimeoutMs = 90_000;
 
-function supportsFastAutoProtocolFallback(version) {
-  if (!version) return false;
-  const parts = version.split('.').map(Number);
-  const threshold = [2026, 5, 2];
-  for (let index = 0; index < threshold.length; index += 1) {
-    const value = parts[index] || 0;
-    if (value !== threshold[index]) return value > threshold[index];
-  }
-  return true;
-}
-
-function extractQuickTunnelUrl(logContent) {
-  if (typeof logContent !== 'string' || logContent.length === 0) {
-    return null;
-  }
-
-  const match = QUICK_TUNNEL_URL_PATTERN.exec(logContent);
-  QUICK_TUNNEL_URL_PATTERN.lastIndex = 0;
-  return match?.[0] ?? null;
-}
-
 function isQuickTunnelUrl(url) {
   if (typeof url !== 'string' || !url.trim()) return false;
   try {
@@ -11657,55 +11455,6 @@ function readProcessCommandLine(pid, { platform = process.platform, spawnSyncImp
   return result.status === 0 ? String(result.stdout || '').trim() : '';
 }
 
-function extractCloudflaredMetricsBaseUrl(logContent) {
-  if (typeof logContent !== 'string' || logContent.length === 0) {
-    return null;
-  }
-  const match = logContent.match(
-    /Starting metrics server on (?:https?:\/\/)?(127\.0\.0\.1|localhost|\[::1\]):(\d+)\/metrics\b/iu,
-  );
-  if (!match) return null;
-  return `http://${match[1]}:${match[2]}`;
-}
-
-async function probeCloudflaredReadiness(logContent, { fetchFn = globalThis.fetch, timeoutMs = 1000 } = {}) {
-  const metricsBaseUrl = extractCloudflaredMetricsBaseUrl(logContent);
-  if (!metricsBaseUrl || typeof fetchFn !== 'function') return false;
-
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const response = await fetchFn(`${metricsBaseUrl}/ready`, { signal: controller.signal });
-    return response.ok;
-  } catch {
-    return false;
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-
-async function probeQuickTunnelPublicHealth(state, { fetchFn = globalThis.fetch, timeoutMs = 1_500 } = {}) {
-  if (!isQuickTunnelUrl(state?.url) || typeof fetchFn !== 'function') return false;
-
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const healthUrl = new URL('/health', state.url);
-    healthUrl.searchParams.set('_vibelet_reuse_probe', String(Date.now()));
-    const response = await fetchFn(healthUrl, {
-      headers: { 'cache-control': 'no-cache' },
-      signal: controller.signal,
-    });
-    if (!response.ok) return false;
-    const payload = await response.json().catch(() => null);
-    return payload?.status === 'ok';
-  } catch {
-    return false;
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-
 function getNpmFallbackCommand(platform = process.platform) {
   return platform === 'win32' ? 'npx.cmd' : 'npx';
 }
@@ -11803,79 +11552,389 @@ function resolveInstalledCloudflaredCliPath({
     return null;
   }
 
-  let packageJson;
-  try {
-    packageJson = JSON.parse((0,external_node_fs_.readFileSync)(packageJsonPath, 'utf8'));
-  } catch {
-    return null;
-  }
+  let packageJson;
+  try {
+    packageJson = JSON.parse((0,external_node_fs_.readFileSync)(packageJsonPath, 'utf8'));
+  } catch {
+    return null;
+  }
+
+  const relativeBinPath = typeof packageJson.bin === 'string' ? packageJson.bin : packageJson.bin?.cloudflared;
+
+  if (typeof relativeBinPath !== 'string' || !relativeBinPath) {
+    return null;
+  }
+
+  const cliPath = (0,external_node_path_.isAbsolute)(relativeBinPath) ? relativeBinPath : (0,external_node_path_.resolve)((0,external_node_path_.dirname)(packageJsonPath), relativeBinPath);
+
+  return (0,external_node_fs_.existsSync)(cliPath) ? cliPath : null;
+}
+
+function createDependencyLaunchSpec(dependencyCliPath, platform = process.platform) {
+  return {
+    command: process.execPath,
+    args: [dependencyCliPath],
+    source: 'dependency',
+    description: dependencyCliPath,
+    managedBinaryPath: (0,external_node_path_.join)(
+      (0,external_node_path_.dirname)((0,external_node_path_.dirname)(dependencyCliPath)),
+      'bin',
+      platform === 'win32' ? 'cloudflared.exe' : 'cloudflared',
+    ),
+    urlTimeoutMs: defaultUrlTimeoutMs,
+  };
+}
+
+function resolveCloudflaredLaunchSpec({
+  pathValue = process.env.PATH ?? '',
+  pathExtValue = process.env.PATHEXT ?? '',
+  platform = process.platform,
+  resolvePackageJsonPath,
+} = {}) {
+  const directPathCandidates = findExecutablesInPath('cloudflared', { pathValue, pathExtValue, platform });
+  const directPath =
+    directPathCandidates.find((candidatePath) => !isNodeModulesBinPath(candidatePath)) ??
+    directPathCandidates[0] ??
+    null;
+  if (directPath) {
+    return {
+      command: directPath,
+      args: [],
+      source: 'path',
+      description: directPath,
+      ...(isWindowsCommandScript(directPath, platform) ? { shell: true } : {}),
+      urlTimeoutMs: defaultUrlTimeoutMs,
+    };
+  }
+
+  const dependencyCliPath = resolveInstalledCloudflaredCliPath({ resolvePackageJsonPath });
+  if (dependencyCliPath) {
+    return createDependencyLaunchSpec(dependencyCliPath, platform);
+  }
+
+  return {
+    command: getNpmFallbackCommand(platform),
+    args: [...npmFallbackArgs],
+    source: 'npm',
+    description: npmFallbackDescription,
+    ...(platform === 'win32' ? { shell: true } : {}),
+    urlTimeoutMs: defaultUrlTimeoutMs,
+  };
+}
+
+function resolvePreferredCloudflaredLaunchSpec() {
+  const dependencyCliPath = resolveInstalledCloudflaredCliPath();
+  return dependencyCliPath ? createDependencyLaunchSpec(dependencyCliPath) : resolveCloudflaredLaunchSpec();
+}
+
+function cloudflaredChildEnv(launchSpec, env = process.env, versions = process.versions) {
+  // Electron must run the npm CLI as Node; app mode can exit while its child
+  // tunnel is still starting, losing ownership of the process.
+  return launchSpec.source === 'dependency' && versions.electron ? { ...env, ELECTRON_RUN_AS_NODE: '1' } : env;
+}
+
+;// CONCATENATED MODULE: external "node:http"
+const external_node_http_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:http");
+;// CONCATENATED MODULE: external "node:https"
+const external_node_https_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:https");
+;// CONCATENATED MODULE: ../../packages/cloudflared-tunnel/health-fetch.mjs
+
+
+
+// This package runs in Node and Electron plugin hosts. Renderer fetch applies
+// browser CORS to cloudflared's local metrics endpoint, which has no CORS headers.
+function fetchTunnelHealth(input, { signal, headers } = {}) {
+  const url = new URL(input);
+  const request = url.protocol === 'https:' ? external_node_https_namespaceObject.request : url.protocol === 'http:' ? external_node_http_namespaceObject.request : null;
+  if (!request) return Promise.reject(new Error('Unsupported tunnel health protocol'));
+  return new Promise((resolve, reject) => {
+    const req = request(url, { signal, headers, method: 'GET' }, (res) => {
+      const chunks = [];
+      let size = 0;
+      res.on('data', (chunk) => {
+        size += chunk.length;
+        if (size > 64 * 1024) {
+          res.destroy(new Error('Tunnel health response is too large'));
+          return;
+        }
+        chunks.push(chunk);
+      });
+      res.on('error', reject);
+      res.on('end', () => {
+        const body = Buffer.concat(chunks).toString('utf8');
+        resolve({
+          ok: res.statusCode >= 200 && res.statusCode < 300,
+          json: async () => JSON.parse(body),
+        });
+      });
+    });
+    req.on('error', reject);
+    req.end();
+  });
+}
+
+// EXTERNAL MODULE: external "node:fs/promises"
+var promises_ = __nccwpck_require__(1455);
+// EXTERNAL MODULE: external "node:util"
+var external_node_util_ = __nccwpck_require__(7975);
+;// CONCATENATED MODULE: ../../packages/cloudflared-tunnel/managed-binary.mjs
+
+
+
+
+
+
+
+const execFileAsync = (0,external_node_util_.promisify)(external_node_child_process_.execFile);
+const DEFAULT_UPDATE_INTERVAL_MS = 24 * 60 * 60 * 1000;
+const DEFAULT_UPDATE_TIMEOUT_MS = 30_000;
+
+function parseCloudflaredVersion(output) {
+  return String(output || '').match(/cloudflared version\s+([0-9]+(?:\.[0-9]+){1,2})/i)?.[1] ?? null;
+}
+
+async function readUpdateState(updateStatePath) {
+  try {
+    const state = JSON.parse(await (0,promises_.readFile)(updateStatePath, 'utf8'));
+    return state && typeof state === 'object' ? state : null;
+  } catch {
+    return null;
+  }
+}
+
+async function writeUpdateState(updateStatePath, state) {
+  await (0,promises_.mkdir)((0,external_node_path_.dirname)(updateStatePath), { recursive: true });
+  const temporaryPath = `${updateStatePath}.tmp-${process.pid}-${Date.now()}`;
+  await (0,promises_.writeFile)(temporaryPath, `${JSON.stringify(state, null, 2)}\n`, 'utf8');
+  await (0,promises_.rename)(temporaryPath, updateStatePath);
+}
+
+async function runVersion(binaryPath, timeoutMs, runCommand) {
+  if (!binaryPath || !(0,external_node_fs_.existsSync)(binaryPath)) return null;
+  try {
+    const { stdout, stderr } = await runCommand(binaryPath, ['--version'], {
+      encoding: 'utf8',
+      timeout: timeoutMs,
+      maxBuffer: 1024 * 1024,
+    });
+    return parseCloudflaredVersion(`${stdout || ''}\n${stderr || ''}`);
+  } catch {
+    return null;
+  }
+}
+
+async function probeCloudflaredLaunchSpecVersion(
+  launchSpec,
+  { timeoutMs = 5_000, runCommand = execFileAsync } = {},
+) {
+  try {
+    const { stdout, stderr } = await runCommand(launchSpec.command, [...launchSpec.args, '--version'], {
+      encoding: 'utf8',
+      timeout: timeoutMs,
+      maxBuffer: 1024 * 1024,
+      env: cloudflaredChildEnv(launchSpec),
+      ...(launchSpec.shell ? { shell: true } : {}),
+    });
+    return parseCloudflaredVersion(`${stdout || ''}\n${stderr || ''}`);
+  } catch {
+    return null;
+  }
+}
+
+async function installLatestToTemporaryPath({ launchSpec, binaryPath, timeoutMs, platform, runCommand }) {
+  const temporaryDir = (0,external_node_path_.join)((0,external_node_path_.dirname)(binaryPath), `.cloudflared-update-${process.pid}-${Date.now()}`);
+  const temporaryBinaryPath = (0,external_node_path_.join)(temporaryDir, (0,external_node_path_.basename)(binaryPath));
+  await (0,promises_.mkdir)(temporaryDir, { recursive: true });
+  try {
+    await runCommand(launchSpec.command, [...launchSpec.args, 'bin', 'install', 'latest'], {
+      encoding: 'utf8',
+      timeout: timeoutMs,
+      maxBuffer: 4 * 1024 * 1024,
+      env: cloudflaredChildEnv(launchSpec, { ...process.env, CLOUDFLARED_BIN: temporaryBinaryPath }),
+      ...(launchSpec.shell ? { shell: true } : {}),
+    });
+    const version = await runVersion(temporaryBinaryPath, timeoutMs, runCommand);
+    if (!version) throw new Error('downloaded cloudflared did not report a valid version');
+
+    if (platform === 'win32' && (0,external_node_fs_.existsSync)(binaryPath)) {
+      const backupPath = `${binaryPath}.previous-${process.pid}`;
+      await (0,promises_.rename)(binaryPath, backupPath);
+      try {
+        await (0,promises_.rename)(temporaryBinaryPath, binaryPath);
+        await (0,promises_.rm)(backupPath, { force: true });
+      } catch (error) {
+        await (0,promises_.rename)(backupPath, binaryPath).catch(() => undefined);
+        throw error;
+      }
+    } else {
+      await (0,promises_.rename)(temporaryBinaryPath, binaryPath);
+    }
+    return version;
+  } finally {
+    await (0,promises_.rm)(temporaryDir, { recursive: true, force: true });
+  }
+}
+
+async function resolveManagedCloudflared({
+  launchSpec,
+  updateStatePath,
+  now = Date.now(),
+  updateIntervalMs = DEFAULT_UPDATE_INTERVAL_MS,
+  timeoutMs = DEFAULT_UPDATE_TIMEOUT_MS,
+  platform = process.platform,
+  runCommand = execFileAsync,
+}) {
+  const state = await readUpdateState(updateStatePath);
+  const lastAttemptAt = Date.parse(state?.lastAttemptAt || '');
+  const recentlyAttempted = Number.isFinite(lastAttemptAt) && now - lastAttemptAt < updateIntervalMs;
+  if (recentlyAttempted) {
+    return {
+      launchSpec,
+      version: state?.installedVersion ?? null,
+      update: 'skipped',
+    };
+  }
+
+  const attemptedAt = new Date(now).toISOString();
+  const binaryPath = launchSpec.managedBinaryPath;
+  if (launchSpec.source !== 'dependency' || !binaryPath) {
+    const version = state?.installedVersion ?? null;
+    let stateWarning = '';
+    try {
+      await writeUpdateState(updateStatePath, {
+        ...state,
+        lastAttemptAt: attemptedAt,
+        installedVersion: version,
+      });
+    } catch (error) {
+      stateWarning = ` Update state could not be saved: ${error instanceof Error ? error.message : String(error)}`;
+    }
+    return {
+      launchSpec,
+      version,
+      update: 'skipped',
+      warning: `Skipping cloudflared self-update for unmanaged ${launchSpec.source} executable: ${launchSpec.description}.${stateWarning}`,
+    };
+  }
+
+  const previousVersion = await runVersion(binaryPath, timeoutMs, runCommand);
+  try {
+    const installedVersion = await installLatestToTemporaryPath({
+      launchSpec,
+      binaryPath,
+      timeoutMs,
+      platform,
+      runCommand,
+    });
+    await writeUpdateState(updateStatePath, {
+      lastAttemptAt: attemptedAt,
+      lastSuccessAt: attemptedAt,
+      installedVersion,
+    });
+    return {
+      launchSpec,
+      version: installedVersion,
+      update: previousVersion ? 'updated' : 'fresh',
+    };
+  } catch (error) {
+    const fallbackVersion = previousVersion || (await runVersion(binaryPath, timeoutMs, runCommand));
+    await writeUpdateState(updateStatePath, {
+      ...state,
+      lastAttemptAt: attemptedAt,
+      installedVersion: fallbackVersion,
+    }).catch(() => undefined);
+    return {
+      launchSpec,
+      version: fallbackVersion,
+      update: 'failed',
+      warning: `cloudflared update failed; continuing with ${fallbackVersion || 'the existing launcher'}: ${error instanceof Error ? error.message : String(error)}`,
+    };
+  }
+}
+
+;// CONCATENATED MODULE: ../../packages/cloudflared-tunnel/index.mjs
+
+
+
+
+
+
+
+
+
 
-  const relativeBinPath = typeof packageJson.bin === 'string' ? packageJson.bin : packageJson.bin?.cloudflared;
 
-  if (typeof relativeBinPath !== 'string' || !relativeBinPath) {
-    return null;
-  }
 
-  const cliPath = (0,external_node_path_.isAbsolute)(relativeBinPath) ? relativeBinPath : (0,external_node_path_.resolve)((0,external_node_path_.dirname)(packageJsonPath), relativeBinPath);
+const QUICK_TUNNEL_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com(?=$|[\s"',)\]])/g;
 
-  return (0,external_node_fs_.existsSync)(cliPath) ? cliPath : null;
+function supportsFastAutoProtocolFallback(version) {
+  if (!version) return false;
+  const parts = version.split('.').map(Number);
+  const threshold = [2026, 5, 2];
+  for (let index = 0; index < threshold.length; index += 1) {
+    const value = parts[index] || 0;
+    if (value !== threshold[index]) return value > threshold[index];
+  }
+  return true;
 }
 
-function createDependencyLaunchSpec(dependencyCliPath, platform = process.platform) {
-  return {
-    command: process.execPath,
-    args: [dependencyCliPath],
-    source: 'dependency',
-    description: dependencyCliPath,
-    managedBinaryPath: (0,external_node_path_.join)(
-      (0,external_node_path_.dirname)((0,external_node_path_.dirname)(dependencyCliPath)),
-      'bin',
-      platform === 'win32' ? 'cloudflared.exe' : 'cloudflared',
-    ),
-    urlTimeoutMs: defaultUrlTimeoutMs,
-  };
+function extractQuickTunnelUrl(logContent) {
+  if (typeof logContent !== 'string' || logContent.length === 0) {
+    return null;
+  }
+
+  const match = QUICK_TUNNEL_URL_PATTERN.exec(logContent);
+  QUICK_TUNNEL_URL_PATTERN.lastIndex = 0;
+  return match?.[0] ?? null;
 }
 
-function resolveCloudflaredLaunchSpec({
-  pathValue = process.env.PATH ?? '',
-  pathExtValue = process.env.PATHEXT ?? '',
-  platform = process.platform,
-  resolvePackageJsonPath,
-} = {}) {
-  const directPathCandidates = findExecutablesInPath('cloudflared', { pathValue, pathExtValue, platform });
-  const directPath =
-    directPathCandidates.find((candidatePath) => !isNodeModulesBinPath(candidatePath)) ??
-    directPathCandidates[0] ??
-    null;
-  if (directPath) {
-    return {
-      command: directPath,
-      args: [],
-      source: 'path',
-      description: directPath,
-      ...(isWindowsCommandScript(directPath, platform) ? { shell: true } : {}),
-      urlTimeoutMs: defaultUrlTimeoutMs,
-    };
+function extractCloudflaredMetricsBaseUrl(logContent) {
+  if (typeof logContent !== 'string' || logContent.length === 0) {
+    return null;
   }
+  const match = logContent.match(
+    /Starting metrics server on (?:https?:\/\/)?(127\.0\.0\.1|localhost|\[::1\]):(\d+)\/metrics\b/iu,
+  );
+  if (!match) return null;
+  return `http://${match[1]}:${match[2]}`;
+}
 
-  const dependencyCliPath = resolveInstalledCloudflaredCliPath({ resolvePackageJsonPath });
-  if (dependencyCliPath) {
-    return createDependencyLaunchSpec(dependencyCliPath, platform);
-  }
+async function probeCloudflaredReadiness(logContent, { fetchFn = fetchTunnelHealth, timeoutMs = 1000 } = {}) {
+  const metricsBaseUrl = extractCloudflaredMetricsBaseUrl(logContent);
+  if (!metricsBaseUrl || typeof fetchFn !== 'function') return false;
 
-  return {
-    command: getNpmFallbackCommand(platform),
-    args: [...npmFallbackArgs],
-    source: 'npm',
-    description: npmFallbackDescription,
-    ...(platform === 'win32' ? { shell: true } : {}),
-    urlTimeoutMs: defaultUrlTimeoutMs,
-  };
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetchFn(`${metricsBaseUrl}/ready`, { signal: controller.signal });
+    return response.ok;
+  } catch {
+    return false;
+  } finally {
+    clearTimeout(timeout);
+  }
 }
 
-function resolvePreferredCloudflaredLaunchSpec() {
-  const dependencyCliPath = resolveInstalledCloudflaredCliPath();
-  return dependencyCliPath ? createDependencyLaunchSpec(dependencyCliPath) : resolveCloudflaredLaunchSpec();
+async function probeQuickTunnelPublicHealth(state, { fetchFn = fetchTunnelHealth, timeoutMs = 1_500 } = {}) {
+  if (!isQuickTunnelUrl(state?.url) || typeof fetchFn !== 'function') return false;
+
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const healthUrl = new URL('/health', state.url);
+    healthUrl.searchParams.set('_vibelet_reuse_probe', String(Date.now()));
+    const response = await fetchFn(healthUrl, {
+      headers: { 'cache-control': 'no-cache' },
+      signal: controller.signal,
+    });
+    if (!response.ok) return false;
+    const payload = await response.json().catch(() => null);
+    return payload?.status === 'ok';
+  } catch {
+    return false;
+  } finally {
+    clearTimeout(timeout);
+  }
 }
 
 function summarizeCloudflaredLog(logContent, { maxLines = 8, maxChars = 1200 } = {}) {
@@ -12187,6 +12246,7 @@ async function startTunnel({
         [...launchSpec.args, 'tunnel', '--no-autoupdate', '--protocol', effectiveProtocol, '--url', originUrl],
         {
           detached: true,
+          env: cloudflaredChildEnv(launchSpec),
           stdio: ['ignore', stdoutLogFd, stderrLogFd],
           windowsHide: true,
           ...(launchSpec.shell ? { shell: true } : {}),
@@ -12382,7 +12442,7 @@ function canUseSystemdUserManager({ spawnSyncImpl = node_child_process__WEBPACK_
 
 /***/ }),
 
-/***/ 877:
+/***/ 5028:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
 
@@ -12711,9 +12771,196 @@ var websocket_server = __nccwpck_require__(3261);
 
 
 
-/* harmony default export */ const wrapper = (websocket);
+/* 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
+
 
-;// CONCATENATED MODULE: ./bin/terminal-wrapper.mjs
 
 
 
@@ -12736,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';
@@ -13103,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) => {
@@ -13401,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;
   });
@@ -13411,6 +13493,7 @@ async function connectTerminalControl({
       heartbeatTimer = null;
     }
     requester.rejectAll('terminal_control_closed');
+    resolveTakeoverResponseSent(false);
     if (closedResolved) return;
     closedResolved = true;
     resolveClosed({
@@ -13431,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',
@@ -13440,6 +13523,7 @@ async function connectTerminalControl({
         ...(data === undefined ? {} : { data }),
         ...(error ? { error } : {}),
       }),
+      onSent,
     );
   }
 
@@ -13467,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) => {
@@ -13522,6 +13613,7 @@ async function connectTerminalControl({
 
   return {
     closed,
+    takeoverResponseSent,
     getTerminalId() {
       return terminalId;
     },
@@ -13617,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;
@@ -13736,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') {
@@ -14040,7 +14142,7 @@ function parseAccessTargetArg(argv, fail, env = process.env) {
 /* harmony export */ });
 /* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(3024);
 /* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(6760);
-/* harmony import */ var _cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(6895);
+/* harmony import */ var _cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(1484);
 
 
 
@@ -15975,7 +16077,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(6760);
 /* harmony import */ var node_url__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(3136);
 /* harmony import */ var _vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_17__ = __nccwpck_require__(6927);
-/* harmony import */ var _cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(6895);
+/* harmony import */ var _cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(1484);
 /* harmony import */ var _vibelet_cloudflare_runtime_mjs__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(3869);
 /* harmony import */ var _vibelet_launchd_mjs__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(1010);
 /* harmony import */ var _linux_systemd_mjs__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(4217);
@@ -15983,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);