@rehpic/vcli 0.1.0-beta.68.1 → 0.1.0-beta.69.1

package/dist/index.js

@@ -285,7 +285,7 @@ var init_default_browser_id = __esm({
 // ../../node_modules/.pnpm/run-applescript@7.1.0/node_modules/run-applescript/index.js
 import process5 from "process";
 import { promisify as promisify4 } from "util";
-import { execFile as execFile4, execFileSync as execFileSync2 } from "child_process";
+import { execFile as execFile4, execFileSync as execFileSync3 } from "child_process";
 async function runAppleScript(script, { humanReadableOutput = true, signal } = {}) {
   if (process5.platform !== "darwin") {
     throw new Error("macOS only");
@@ -1152,7 +1152,7 @@ function createEmptySession() {
 
 // src/bridge-service.ts
 import { ConvexHttpClient as ConvexHttpClient2 } from "convex/browser";
-import { execFileSync, execSync as execSync2 } from "child_process";
+import { execFileSync as execFileSync2, execSync as execSync2 } from "child_process";
 
 // src/terminal-peer.ts
 import { createServer } from "http";
@@ -1161,6 +1161,7 @@ import { ConvexClient } from "convex/browser";
 import * as pty from "node-pty";
 import { existsSync } from "fs";
 import { randomUUID } from "crypto";
+import { execFileSync } from "child_process";
 import localtunnel from "localtunnel";
 function findTmuxPath() {
   for (const p of [
@@ -1172,20 +1173,51 @@ function findTmuxPath() {
   }
   return "tmux";
 }
+var TMUX = findTmuxPath();
 function ts() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(11, 19);
 }
-function findPort(start = 9100) {
+function findPort() {
   return new Promise((resolve, reject) => {
     const srv = createServer();
     srv.listen(0, "127.0.0.1", () => {
       const addr = srv.address();
-      const port = typeof addr === "object" && addr ? addr.port : start;
+      const port = typeof addr === "object" && addr ? addr.port : 9100;
       srv.close(() => resolve(port));
     });
     srv.on("error", reject);
   });
 }
+function createViewerSession(targetSession, paneId) {
+  const viewerName = `viewer-${randomUUID().slice(0, 8)}`;
+  try {
+    execFileSync(TMUX, [
+      "new-session",
+      "-d",
+      "-s",
+      viewerName,
+      "-t",
+      targetSession
+    ]);
+    execFileSync(TMUX, ["set-option", "-t", viewerName, "status", "off"]);
+    if (paneId) {
+      try {
+        execFileSync(TMUX, ["select-pane", "-t", paneId]);
+      } catch {
+      }
+    }
+    return viewerName;
+  } catch (err) {
+    console.error(`[${ts()}] Failed to create viewer session:`, err);
+    return targetSession;
+  }
+}
+function killViewerSession(sessionName) {
+  try {
+    execFileSync(TMUX, ["kill-session", "-t", sessionName]);
+  } catch {
+  }
+}
 var TerminalPeerManager = class {
   constructor(config) {
     this.terminals = /* @__PURE__ */ new Map();
@@ -1195,7 +1227,7 @@ var TerminalPeerManager = class {
     this.config = config;
     this.client = new ConvexClient(config.convexUrl);
   }
-  watchSession(workSessionId, tmuxSessionName) {
+  watchSession(workSessionId, tmuxSessionName, tmuxPaneId) {
     if (this.unsubscribers.has(workSessionId)) return;
     const unsub = this.client.onUpdate(
       api.agentBridge.bridgePublic.getWorkSessionTerminalState,
@@ -1217,6 +1249,7 @@ var TerminalPeerManager = class {
           void this.startTerminal(
             workSessionId,
             tmuxSessionName,
+            tmuxPaneId,
             state.terminalCols,
             state.terminalRows
           );
@@ -1245,17 +1278,21 @@ var TerminalPeerManager = class {
     }
     this.stopTerminal(workSessionId);
   }
-  async startTerminal(workSessionId, tmuxSessionName, cols, rows) {
+  async startTerminal(workSessionId, tmuxSessionName, tmuxPaneId, cols, rows) {
     if (this.terminals.has(workSessionId)) return;
-    const tmuxBin = findTmuxPath();
     try {
       const port = await findPort();
+      const viewerSession = createViewerSession(tmuxSessionName, tmuxPaneId);
+      const isLinked = viewerSession !== tmuxSessionName;
+      console.log(
+        `[${ts()}] Viewer session: ${viewerSession}${isLinked ? " (linked)" : ""}`
+      );
       console.log(
-        `[${ts()}] Spawning PTY: ${tmuxBin} attach-session -t ${tmuxSessionName}`
+        `[${ts()}] Spawning PTY: ${TMUX} attach-session -t ${viewerSession}`
       );
       const ptyProcess = pty.spawn(
-        tmuxBin,
-        ["attach-session", "-t", tmuxSessionName],
+        TMUX,
+        ["attach-session", "-t", viewerSession],
         {
           name: "xterm-256color",
           cols: Math.max(cols, 10),
@@ -1264,7 +1301,7 @@ var TerminalPeerManager = class {
           env: { ...process.env, TERM: "xterm-256color" }
         }
       );
-      console.log(`[${ts()}] PTY started for ${tmuxSessionName}`);
+      console.log(`[${ts()}] PTY started`);
       const token = randomUUID();
       const httpServer = createServer();
       const wss = new WebSocketServer({ server: httpServer });
@@ -1272,13 +1309,11 @@ var TerminalPeerManager = class {
         const url = new URL(req.url ?? "/", `http://localhost`);
         const clientToken = url.searchParams.get("token");
         if (clientToken !== token) {
-          console.log(`[${ts()}] Rejected unauthorized WebSocket connection`);
+          console.log(`[${ts()}] Rejected unauthorized connection`);
           ws.close(4401, "Unauthorized");
           return;
         }
-        console.log(
-          `[${ts()}] WebSocket client connected (${tmuxSessionName})`
-        );
+        console.log(`[${ts()}] Client connected (${tmuxSessionName})`);
         const dataHandler = ptyProcess.onData((data) => {
           if (ws.readyState === WebSocket.OPEN) {
             ws.send(data);
@@ -1302,18 +1337,22 @@ var TerminalPeerManager = class {
           ptyProcess.write(str);
         });
         ws.on("close", () => {
-          console.log(
-            `[${ts()}] WebSocket client disconnected (${tmuxSessionName})`
-          );
+          console.log(`[${ts()}] Client disconnected (${tmuxSessionName})`);
           dataHandler.dispose();
         });
       });
       await new Promise((resolve) => {
-        httpServer.listen(port, "127.0.0.1", resolve);
+        httpServer.listen(port, "0.0.0.0", resolve);
       });
       console.log(`[${ts()}] WS server on port ${port}`);
-      console.log(`[${ts()}] Opening tunnel...`);
-      const tunnel = await localtunnel({ port });
+      const tunnelOpts = { port };
+      if (this.config.tunnelHost) {
+        tunnelOpts.host = this.config.tunnelHost;
+      }
+      console.log(
+        `[${ts()}] Opening tunnel...${this.config.tunnelHost ? ` (host: ${this.config.tunnelHost})` : ""}`
+      );
+      const tunnel = await localtunnel(tunnelOpts);
       const tunnelUrl = tunnel.url;
       console.log(`[${ts()}] Tunnel: ${tunnelUrl}`);
       const wsUrl = tunnelUrl.replace(/^https?:\/\//, "wss://");
@@ -1322,7 +1361,7 @@ var TerminalPeerManager = class {
         httpServer,
         wss,
         tunnel,
-        tunnelUrl: wsUrl,
+        viewerSessionName: isLinked ? viewerSession : null,
         token,
         workSessionId,
         tmuxSessionName,
@@ -1336,7 +1375,8 @@ var TerminalPeerManager = class {
           deviceSecret: this.config.deviceSecret,
           workSessionId,
           terminalUrl: wsUrl,
-          terminalToken: token
+          terminalToken: token,
+          terminalLocalPort: port
         }
       );
       ptyProcess.onExit(() => {
@@ -1367,6 +1407,9 @@ var TerminalPeerManager = class {
       terminal.httpServer.close();
     } catch {
     }
+    if (terminal.viewerSessionName) {
+      killViewerSession(terminal.viewerSessionName);
+    }
     this.terminals.delete(workSessionId);
     console.log(`[${ts()}] Terminal stopped for ${terminal.tmuxSessionName}`);
   }
@@ -2394,7 +2437,8 @@ var BridgeService = class {
           if (activity.workSessionId && activity.tmuxSessionName) {
             this.terminalPeer.watchSession(
               activity.workSessionId,
-              activity.tmuxSessionName
+              activity.tmuxSessionName,
+              activity.tmuxPaneId
             );
           }
         }
@@ -2493,9 +2537,12 @@ var BridgeService = class {
       this.terminalPeer = new TerminalPeerManager({
         deviceId: this.config.deviceId,
         deviceSecret: this.config.deviceSecret,
-        convexUrl: this.config.convexUrl
+        convexUrl: this.config.convexUrl,
+        tunnelHost: this.config.tunnelHost
       });
-      console.log(`  WebRTC:  ready`);
+      console.log(
+        `  Terminal: ready${this.config.tunnelHost ? ` (tunnel: ${this.config.tunnelHost})` : ""}`
+      );
     } catch (e) {
       console.error(
         `  WebRTC:  failed (${e instanceof Error ? e.message : "unknown"})`
@@ -2859,7 +2906,7 @@ function createTmuxWorkSession(args) {
   const windowName = sanitizeTmuxName(
     args.provider === "codex" ? "codex" : args.provider === "claude_code" ? "claude" : "shell"
   );
-  execFileSync("tmux", [
+  execFileSync2("tmux", [
     "new-session",
     "-d",
     "-s",
@@ -2869,7 +2916,7 @@ function createTmuxWorkSession(args) {
     "-c",
     args.workspacePath
   ]);
-  const paneId = execFileSync(
+  const paneId = execFileSync2(
     "tmux",
     [
       "display-message",
@@ -2880,13 +2927,13 @@ function createTmuxWorkSession(args) {
     ],
     { encoding: "utf-8" }
   ).trim();
-  const paneProcessId = execFileSync(
+  const paneProcessId = execFileSync2(
     "tmux",
     ["display-message", "-p", "-t", paneId, "#{pane_pid}"],
     { encoding: "utf-8" }
   ).trim();
   if (args.provider) {
-    execFileSync("tmux", [
+    execFileSync2("tmux", [
       "send-keys",
       "-t",
       paneId,
@@ -2894,7 +2941,7 @@ function createTmuxWorkSession(args) {
       "Enter"
     ]);
   } else {
-    execFileSync("tmux", [
+    execFileSync2("tmux", [
       "send-keys",
       "-t",
       paneId,
@@ -2910,13 +2957,13 @@ function createTmuxWorkSession(args) {
   };
 }
 function sendTextToTmuxPane(paneId, text2) {
-  execFileSync("tmux", ["set-buffer", "--", text2]);
-  execFileSync("tmux", ["paste-buffer", "-t", paneId]);
-  execFileSync("tmux", ["send-keys", "-t", paneId, "Enter"]);
-  execFileSync("tmux", ["delete-buffer"]);
+  execFileSync2("tmux", ["set-buffer", "--", text2]);
+  execFileSync2("tmux", ["paste-buffer", "-t", paneId]);
+  execFileSync2("tmux", ["send-keys", "-t", paneId, "Enter"]);
+  execFileSync2("tmux", ["delete-buffer"]);
 }
 function captureTmuxPane(paneId) {
-  return execFileSync(
+  return execFileSync2(
     "tmux",
     ["capture-pane", "-p", "-e", "-t", paneId, "-S", "-120"],
     { encoding: "utf-8" }
@@ -2924,7 +2971,7 @@ function captureTmuxPane(paneId) {
 }
 function resizeTmuxPane(paneId, cols, rows) {
   try {
-    execFileSync("tmux", [
+    execFileSync2("tmux", [
       "resize-pane",
       "-t",
       paneId,
@@ -3246,7 +3293,7 @@ function launchctlGuiDomain() {
 }
 function runLaunchctl(args) {
   try {
-    execFileSync("launchctl", args, {
+    execFileSync2("launchctl", args, {
       stdio: "ignore"
     });
     return true;
@@ -3623,7 +3670,7 @@ async function resolveAppUrl(raw) {
     return url;
   }
 }
-async function fetchConvexUrl(appUrl) {
+async function fetchAppConfig(appUrl) {
   try {
     const url = new URL("/api/config", appUrl).toString();
     const response = await fetch(url);
@@ -3632,11 +3679,18 @@ async function fetchConvexUrl(appUrl) {
     }
     const data = await response.json();
     if (data.convexUrl) {
-      return data.convexUrl;
+      return {
+        convexUrl: data.convexUrl,
+        tunnelHost: data.tunnelHost || void 0
+      };
     }
   } catch {
   }
-  return "http://127.0.0.1:3210";
+  return { convexUrl: "http://127.0.0.1:3210" };
+}
+async function fetchConvexUrl(appUrl) {
+  const config = await fetchAppConfig(appUrl);
+  return config.convexUrl;
 }
 async function getRuntime(command) {
   const options = command.optsWithGlobals();
@@ -3781,6 +3835,10 @@ async function ensureBridgeConfig(command) {
     if (!config) {
       throw new Error("Bridge device is not configured.");
     }
+    const appConfig = await fetchAppConfig(runtime.appUrl);
+    if (appConfig.tunnelHost) {
+      config.tunnelHost = appConfig.tunnelHost;
+    }
     saveBridgeConfig(config);
     return config;
   } catch (error) {