npm - @openchamber/web - Versions diffs - 1.3.9 → 1.4.1 - Mend

@openchamber/web 1.3.9 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/README.md +1 -0
package/bin/cli.js +109 -15
package/dist/assets/{ToolOutputDialog-BrFH3eLi.js → ToolOutputDialog-CBMeCbbW.js} +3 -3
package/dist/assets/{index-CqiXpckC.js → index-CbGhBA-v.js} +2 -2
package/dist/assets/index-Cx6NUrC-.css +1 -0
package/dist/assets/main-BJvFwyGz.js +122 -0
package/dist/assets/vendor--Jn2c0Clh.css +1 -0
package/dist/assets/{vendor-.bun-B0k_58z8.js → vendor-.bun-CpaXrlrC.js} +630 -561
package/dist/assets/{worker-Doc90iwx.js → worker-NULm4lOi.js} +18 -18
package/dist/index.html +4 -4
package/package.json +5 -5
package/server/index.js +92 -32
package/server/lib/cloudflare-tunnel.js +196 -0
package/server/lib/git-service.js +120 -13
package/dist/assets/index-Coco_yFR.css +0 -1
package/dist/assets/main-DpLFDKL6.js +0 -119
package/dist/assets/vendor--swUGvSZA.css +0 -1

package/dist/index.html CHANGED Viewed

@@ -160,10 +160,10 @@
         pointer-events: none;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-CqiXpckC.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-B0k_58z8.js">
-    <link rel="stylesheet" crossorigin href="/assets/vendor--swUGvSZA.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-Coco_yFR.css">
+    <script type="module" crossorigin src="/assets/index-CbGhBA-v.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-CpaXrlrC.js">
+    <link rel="stylesheet" crossorigin href="/assets/vendor--Jn2c0Clh.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-Cx6NUrC-.css">
   </head>
   <body class="h-full bg-background text-foreground">
     <div id="root" class="h-full">

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@openchamber/web",
-  "version": "1.3.9",
+  "version": "1.4.1",
   "private": false,
   "type": "module",
   "main": "./server/index.js",
@@ -19,7 +19,7 @@
     "build:watch": "vite build --watch",
     "type-check": "tsc --noEmit",
     "lint": "eslint \"./src/**/*.{ts,tsx}\" --config ../../eslint.config.js",
-    "start": "node server/index.js"
+    "start": "node bin/cli.js serve"
   },
   "dependencies": {
     "@fontsource/ibm-plex-mono": "^5.2.7",
@@ -37,15 +37,15 @@
     "@radix-ui/react-tooltip": "^1.2.8",
     "@remixicon/react": "^4.7.0",
     "@types/react-syntax-highlighter": "^15.5.13",
-    "@xterm/addon-fit": "^0.10.0",
-    "@xterm/xterm": "^5.3.0",
+    "ghostty-web": "0.3.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "express": "^5.1.0",
     "http-proxy-middleware": "^3.0.5",
     "next-themes": "^0.4.6",
-    "node-pty": "^1.0.0",
+    "bun-pty": "^0.4.5",
+    "node-pty": "^1.1.0",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
     "react-markdown": "^10.1.0",

package/server/index.js CHANGED Viewed

@@ -7,6 +7,7 @@ import http from 'http';
 import { fileURLToPath } from 'url';
 import os from 'os';
 import { createUiAuth } from './lib/ui-auth.js';
+import { startCloudflareTunnel, printTunnelWarning, checkCloudflaredAvailable } from './lib/cloudflare-tunnel.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -578,6 +579,7 @@ let isOpenCodeReady = false;
 let openCodeNotReadySince = 0;
 let exitOnShutdown = true;
 let uiAuthController = null;
+let cloudflareTunnelController = null;
 // Sync helper - call after modifying any HMR state variable
 const syncToHmrState = () => {
@@ -713,21 +715,18 @@ function resolveBinaryFromPath(binaryName, searchPath) {
 }
 function getOpencodeSpawnConfig() {
-  const envPath = buildAugmentedPath();
-  const resolvedEnv = { ...process.env, PATH: envPath };
   if (OPENCODE_BINARY_ENV) {
-    const explicit = resolveBinaryFromPath(OPENCODE_BINARY_ENV, envPath);
+    const explicit = resolveBinaryFromPath(OPENCODE_BINARY_ENV, process.env.PATH);
     if (explicit) {
       console.log(`Using OpenCode binary from OPENCODE_BINARY: ${explicit}`);
-      return { command: explicit, env: resolvedEnv };
+      return { command: explicit, env: undefined };
     }
     console.warn(
       `OPENCODE_BINARY path "${OPENCODE_BINARY_ENV}" not found. Falling back to search.`
     );
   }
-  return { command: 'opencode', env: resolvedEnv };
+  return { command: 'opencode', env: undefined };
 }
 const ENV_CONFIGURED_OPENCODE_PORT = (() => {
@@ -1151,7 +1150,8 @@ function parseArgs(argv = process.argv.slice(2)) {
     process.env.OPENCHAMBER_UI_PASSWORD ||
     process.env.OPENCODE_UI_PASSWORD ||
     null;
-  const options = { port: DEFAULT_PORT, uiPassword: envPassword };
+  const envCfTunnel = process.env.OPENCHAMBER_TRY_CF_TUNNEL === 'true';
+  const options = { port: DEFAULT_PORT, uiPassword: envPassword, tryCfTunnel: envCfTunnel };
   const consumeValue = (currentIndex, inlineValue) => {
     if (typeof inlineValue === 'string') {
@@ -1188,6 +1188,11 @@ function parseArgs(argv = process.argv.slice(2)) {
       options.uiPassword = typeof value === 'string' ? value : '';
       continue;
     }
+    if (optionName === 'try-cf-tunnel') {
+      options.tryCfTunnel = true;
+      continue;
+    }
   }
   return options;
@@ -1835,6 +1840,12 @@ async function gracefulShutdown(options = {}) {
     uiAuthController = null;
   }
+  if (cloudflareTunnelController) {
+    console.log('Stopping Cloudflare tunnel...');
+    cloudflareTunnelController.stop();
+    cloudflareTunnelController = null;
+  }
   console.log('Graceful shutdown complete');
   if (exitProcess) {
     process.exit(0);
@@ -1843,7 +1854,9 @@ async function gracefulShutdown(options = {}) {
 async function main(options = {}) {
   const port = Number.isFinite(options.port) && options.port >= 0 ? Math.trunc(options.port) : DEFAULT_PORT;
+  const tryCfTunnel = options.tryCfTunnel === true;
   const attachSignals = options.attachSignals !== false;
+  const onTunnelReady = typeof options.onTunnelReady === 'function' ? options.onTunnelReady : null;
   if (typeof options.exitOnShutdown === 'boolean') {
     exitOnShutdown = options.exitOnShutdown;
   }
@@ -3387,12 +3400,12 @@ async function main(options = {}) {
         return res.status(400).json({ error: 'directory parameter is required' });
       }
-      const { path, branch, createBranch } = req.body;
+      const { path, branch, createBranch, startPoint } = req.body;
       if (!path || !branch) {
         return res.status(400).json({ error: 'path and branch are required' });
       }
-      const result = await addWorktree(directory, path, branch, { createBranch });
+      const result = await addWorktree(directory, path, branch, { createBranch, startPoint });
       res.json(result);
     } catch (error) {
       console.error('Failed to add worktree:', error);
@@ -3599,7 +3612,9 @@ async function main(options = {}) {
           const isSymbolicLink = dirent.isSymbolicLink();
           if (!isDirectory && isSymbolicLink) {
-            try {
+  try {
               const linkStats = await fsPromises.stat(entryPath);
               isDirectory = linkStats.isDirectory();
             } catch {
@@ -3677,23 +3692,39 @@ async function main(options = {}) {
     }
   });
-  let ptyLib = null;
-  let ptyLoadError = null;
-  const getPtyLib = async () => {
-    if (ptyLib) return ptyLib;
-    if (ptyLoadError) throw ptyLoadError;
-    try {
-      ptyLib = await import('node-pty');
-      console.log('node-pty loaded successfully');
-      return ptyLib;
-    } catch (error) {
-      ptyLoadError = error;
-      console.error('Failed to load node-pty:', error.message);
-      console.error('Terminal functionality will not be available.');
-      console.error('To fix: run "npm rebuild node-pty" or "npm install"');
-      throw new Error('node-pty is not available. Run: npm rebuild node-pty');
+  let ptyProviderPromise = null;
+  const getPtyProvider = async () => {
+    if (ptyProviderPromise) {
+      return ptyProviderPromise;
     }
+    ptyProviderPromise = (async () => {
+      const isBunRuntime = typeof globalThis.Bun !== 'undefined';
+      if (isBunRuntime) {
+        try {
+          const bunPty = await import('bun-pty');
+          console.log('Using bun-pty for terminal sessions');
+          return { spawn: bunPty.spawn, backend: 'bun-pty' };
+        } catch (error) {
+          console.warn('bun-pty unavailable, falling back to node-pty');
+        }
+      }
+      try {
+        const nodePty = await import('node-pty');
+        console.log('Using node-pty for terminal sessions');
+        return { spawn: nodePty.spawn, backend: 'node-pty' };
+      } catch (error) {
+        console.error('Failed to load node-pty:', error && error.message ? error.message : error);
+        if (isBunRuntime) {
+          throw new Error('No PTY backend available. Install bun-pty or node-pty.');
+        }
+        throw new Error('node-pty is not available. Run: npm rebuild node-pty (or install Bun for bun-pty)');
+      }
+    })();
+    return ptyProviderPromise;
   };
   const terminalSessions = new Map();
@@ -3730,7 +3761,6 @@ async function main(options = {}) {
         return res.status(400).json({ error: 'Invalid working directory' });
       }
-      const pty = await getPtyLib();
       const shell = process.env.SHELL || (process.platform === 'win32' ? 'powershell.exe' : '/bin/zsh');
       const sessionId = Math.random().toString(36).substring(2, 15) +
@@ -3739,6 +3769,7 @@ async function main(options = {}) {
       const envPath = buildAugmentedPath();
       const resolvedEnv = { ...process.env, PATH: envPath };
+      const pty = await getPtyProvider();
       const ptyProcess = pty.spawn(shell, [], {
         name: 'xterm-256color',
         cols: cols || 80,
@@ -3753,6 +3784,7 @@ async function main(options = {}) {
       const session = {
         ptyProcess,
+        ptyBackend: pty.backend,
         cwd,
         lastActivity: Date.now(),
         clients: new Set(),
@@ -3786,12 +3818,14 @@ async function main(options = {}) {
     res.setHeader('Connection', 'keep-alive');
     res.setHeader('X-Accel-Buffering', 'no');
-    res.write('data: {"type":"connected"}\n\n');
     const clientId = Math.random().toString(36).substring(7);
     session.clients.add(clientId);
     session.lastActivity = Date.now();
+    const runtime = typeof globalThis.Bun === 'undefined' ? 'node' : 'bun';
+    const ptyBackend = session.ptyBackend || 'unknown';
+    res.write(`data: ${JSON.stringify({ type: 'connected', runtime, ptyBackend })}\n\n`);
     const heartbeatInterval = setInterval(() => {
       try {
@@ -3856,7 +3890,7 @@ async function main(options = {}) {
     req.on('close', cleanup);
     req.on('error', cleanup);
-    console.log(`Client ${clientId} connected to terminal session ${sessionId}`);
+    console.log(`Terminal connected: session=${sessionId} client=${clientId} runtime=${runtime} pty=${ptyBackend}`);
   });
   app.post('/api/terminal/:sessionId/input', express.text({ type: '*/*' }), (req, res) => {
@@ -3943,7 +3977,6 @@ async function main(options = {}) {
         return res.status(400).json({ error: 'Invalid working directory' });
       }
-      const pty = await getPtyLib();
       const shell = process.env.SHELL || (process.platform === 'win32' ? 'powershell.exe' : '/bin/zsh');
       const newSessionId = Math.random().toString(36).substring(2, 15) +
@@ -3952,6 +3985,7 @@ async function main(options = {}) {
       const envPath = buildAugmentedPath();
       const resolvedEnv = { ...process.env, PATH: envPath };
+      const pty = await getPtyProvider();
       const ptyProcess = pty.spawn(shell, [], {
         name: 'xterm-256color',
         cols: cols || 80,
@@ -3966,6 +4000,7 @@ async function main(options = {}) {
       const session = {
         ptyProcess,
+        ptyBackend: pty.backend,
         cwd,
         lastActivity: Date.now(),
         clients: new Set(),
@@ -4026,6 +4061,7 @@ async function main(options = {}) {
     res.json({ success: true, killedCount });
   });
   try {
     // Check if we can reuse an existing OpenCode process from a previous HMR cycle
     syncFromHmrState();
@@ -4086,13 +4122,35 @@ async function main(options = {}) {
       reject(error);
     };
     server.once('error', onError);
-    server.listen(port, () => {
+    server.listen(port, async () => {
       server.off('error', onError);
       const addressInfo = server.address();
       activePort = typeof addressInfo === 'object' && addressInfo ? addressInfo.port : port;
       console.log(`OpenChamber server running on port ${activePort}`);
       console.log(`Health check: http://localhost:${activePort}/health`);
       console.log(`Web interface: http://localhost:${activePort}`);
+      if (tryCfTunnel) {
+        console.log('\nInitializing Cloudflare Quick Tunnel...');
+        const cfCheck = await checkCloudflaredAvailable();
+        if (cfCheck.available) {
+          try {
+            const originUrl = `http://localhost:${activePort}`;
+            cloudflareTunnelController = await startCloudflareTunnel({ originUrl, port: activePort });
+            printTunnelWarning();
+            if (onTunnelReady) {
+              const tunnelUrl = cloudflareTunnelController.getPublicUrl();
+              if (tunnelUrl) {
+                onTunnelReady(tunnelUrl);
+              }
+            }
+          } catch (error) {
+            console.error(`Failed to start Cloudflare tunnel: ${error.message}`);
+            console.log('Continuing without tunnel...');
+          }
+        }
+      }
       resolve();
     });
   });
@@ -4119,6 +4177,7 @@ async function main(options = {}) {
     httpServer: server,
     getPort: () => activePort,
     getOpenCodePort: () => openCodePort,
+    getTunnelUrl: () => cloudflareTunnelController?.getPublicUrl() ?? null,
     isReady: () => isOpenCodeReady,
     restartOpenCode: () => restartOpenCode(),
     stop: (shutdownOptions = {}) =>
@@ -4133,6 +4192,7 @@ if (isCliExecution) {
   exitOnShutdown = true;
   main({
     port: cliOptions.port,
+    tryCfTunnel: cliOptions.tryCfTunnel,
     attachSignals: true,
     exitOnShutdown: true,
     uiPassword: cliOptions.uiPassword

package/server/lib/cloudflare-tunnel.js ADDED Viewed

@@ -0,0 +1,196 @@
+import { spawn, spawnSync } from 'child_process';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const TRY_CF_URL_REGEX = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/i;
+async function searchPathFor(command) {
+  const pathValue = process.env.PATH || '';
+  const segments = pathValue.split(path.delimiter).filter(Boolean);
+  const WINDOWS_EXTENSIONS = process.platform === 'win32'
+    ? (process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM')
+        .split(';')
+        .map((ext) => ext.trim().toLowerCase())
+        .filter(Boolean)
+        .map((ext) => (ext.startsWith('.') ? ext : `.${ext}`))
+    : [''];
+  for (const dir of segments) {
+    for (const ext of WINDOWS_EXTENSIONS) {
+      const fileName = process.platform === 'win32' ? `${command}${ext}` : command;
+      const candidate = path.join(dir, fileName);
+      try {
+        const stats = fs.statSync(candidate);
+        if (stats.isFile()) {
+          if (process.platform !== 'win32') {
+            try {
+              fs.accessSync(candidate, fs.constants.X_OK);
+            } catch {
+              continue;
+            }
+          }
+          return candidate;
+        }
+      } catch {
+        continue;
+      }
+    }
+  }
+  return null;
+}
+export async function checkCloudflaredAvailable() {
+  const cfPath = await searchPathFor('cloudflared');
+  if (cfPath) {
+    try {
+      const result = spawnSync(cfPath, ['--version'], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] });
+      if (result.status === 0) {
+        return { available: true, path: cfPath, version: result.stdout.trim() };
+      }
+    } catch {
+      // Ignore
+    }
+  }
+  return { available: false, path: null, version: null };
+}
+export function printCloudflareTunnelInstallHelp() {
+  const platform = process.platform;
+  let installCmd = '';
+  if (platform === 'darwin') {
+    installCmd = 'brew install cloudflared';
+  } else if (platform === 'win32') {
+    installCmd = 'winget install --id Cloudflare.cloudflared';
+  } else {
+    installCmd = 'Download from https://github.com/cloudflare/cloudflared/releases';
+  }
+  console.log(`
+╔══════════════════════════════════════════════════════════════════╗
+║  Cloudflare tunnel requires 'cloudflared' to be installed        ║
+╚══════════════════════════════════════════════════════════════════╝
+Install instructions for your platform:
+  macOS:    brew install cloudflared
+  Windows:  winget install --id Cloudflare.cloudflared
+  Linux:    Download from https://github.com/cloudflare/cloudflared/releases
+Or visit: https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflared/downloads/
+`);
+}
+export async function startCloudflareTunnel({ originUrl, port }) {
+  const cfCheck = await checkCloudflaredAvailable();
+  if (!cfCheck.available) {
+    printCloudflareTunnelInstallHelp();
+    throw new Error('cloudflared is not installed');
+  }
+  console.log(`Using cloudflared: ${cfCheck.path} (${cfCheck.version})`);
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'openchamber-cf-'));
+  const child = spawn('cloudflared', ['tunnel', '--url', originUrl], {
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env: {
+      ...process.env,
+      HOME: tempDir,
+      CF_TELEMETRY_DISABLE: '1',
+    },
+    killSignal: 'SIGINT',
+  });
+  let publicUrl = null;
+  let tunnelReady = false;
+  const onData = (chunk, isStderr) => {
+    const text = chunk.toString('utf8');
+    if (!tunnelReady) {
+      const match = text.match(TRY_CF_URL_REGEX);
+      if (match) {
+        publicUrl = match[0];
+        tunnelReady = true;
+      }
+    }
+    process.stderr.write(isStderr ? text : '');
+  };
+  child.stdout.on('data', (chunk) => onData(chunk, false));
+  child.stderr.on('data', (chunk) => onData(chunk, true));
+  child.on('error', (error) => {
+    console.error(`Cloudflared error: ${error.message}`);
+    cleanupTempDir();
+  });
+  const cleanupTempDir = () => {
+    try {
+      if (fs.existsSync(tempDir)) {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+      }
+    } catch {
+      // Ignore cleanup errors
+    }
+  };
+  await new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      if (!publicUrl) {
+        reject(new Error('Tunnel URL not received within 30 seconds'));
+      }
+    }, 30000);
+    const checkReady = setInterval(() => {
+      if (publicUrl) {
+        clearTimeout(timeout);
+        clearInterval(checkReady);
+        resolve(null);
+      }
+    }, 100);
+    child.on('exit', (code) => {
+      clearTimeout(timeout);
+      clearInterval(checkReady);
+      cleanupTempDir();
+      if (code !== null && code !== 0) {
+        reject(new Error(`Cloudflared exited with code ${code}`));
+      }
+    });
+  });
+  return {
+    stop: () => {
+      try {
+        child.kill('SIGINT');
+      } catch {
+        // Ignore
+      }
+    },
+    process: child,
+    getPublicUrl: () => publicUrl,
+  };
+}
+export function printTunnelWarning() {
+  console.log(`
+⚠️  Cloudflare Quick Tunnel Limitations:
+   • Maximum 200 concurrent requests
+   • Server-Sent Events (SSE) are NOT supported
+   • URLs are temporary and will expire when the tunnel stops
+   • Password protection is required for tunnel access
+   For production use, set up a named Cloudflare Tunnel:
+   https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/
+`);
+}