bortexcode 1.2.9 → 1.3.0

package/README.md

@@ -48,6 +48,7 @@ bortexcode
 bortexcode "explain this function"
 bortexcode --agent "refactor src/utils.js"
 bortexcode remote-control
+bortexcode remote-control --cloud
 bortexcode --remote-control
 ```
 
@@ -67,6 +68,7 @@ Common commands:
 /llm-config sync
 /remote-control [name]
 /remote-control --lan
+/remote-control --cloud
 /rc
 /exit
 ```
@@ -87,11 +89,19 @@ For phone access on the same LAN:
 bortexcode remote-control --remote-lan
 ```
 
+For remote access without opening an inbound port, use the bortex.site relay:
+
+```bash
+bortexcode remote-control --cloud --name "My Project"
+bortexcode --remote-cloud "My Project"
+```
+
 Inside the REPL:
 
 ```text
 /remote-control My Project
 /remote-control --lan
+/remote-control --cloud
 /remote-control stop
 ```
 
@@ -115,6 +125,10 @@ Inside the REPL:
                     Disable startup update check
     --remote-control, --rc [name]
                     Enable browser remote control
+    --remote-cloud, --cloud
+                    Use bortex.site relay instead of opening a local port
+    --remote-relay <url>
+                    Remote relay base URL
     --remote-lan    Bind remote control to 0.0.0.0 for LAN/mobile access
     --remote-host <host>, --remote-port <port>
                     Remote control bind address
@@ -141,4 +155,5 @@ BORTEX_CLI_ICONS=1
 BORTEX_NO_UPDATE_CHECK=1
 BORTEX_REMOTE_HOST
 BORTEX_REMOTE_PORT
+BORTEX_REMOTE_RELAY_URL
 ```

package/bin/bortex.js

@@ -33,6 +33,8 @@ function parseArgs(argv) {
     _apiKeyExplicit: false,
     remoteControl: false,
     remoteControlServerMode: false,
+    remoteControlCloud: false,
+    remoteControlRelayUrl: process.env.BORTEX_REMOTE_RELAY_URL || '',
     remoteControlName: '',
     remoteControlHost: process.env.BORTEX_REMOTE_HOST || '127.0.0.1',
     remoteControlPort: Number(process.env.BORTEX_REMOTE_PORT || 0) || 0,
@@ -51,6 +53,10 @@ function parseArgs(argv) {
       opts.remoteControlServerMode = true;
       continue;
     }
+    if ((a === 'cloud' || a === 'relay') && opts.remoteControlServerMode) {
+      opts.remoteControlCloud = true;
+      continue;
+    }
     if (a === '--agent' || a === '-a') {
       opts.agent = true;
       continue;
@@ -150,6 +156,28 @@ function parseArgs(argv) {
       opts.remoteControlName = a.slice('--remote-control='.length);
       continue;
     }
+    if (a === '--remote-cloud' || a === '--cloud' || a === '--relay') {
+      opts.remoteControl = true;
+      opts.remoteControlCloud = true;
+      if (argv[i + 1] && !String(argv[i + 1]).startsWith('-')) {
+        opts.remoteControlName = argv[i + 1];
+        i += 1;
+      }
+      continue;
+    }
+    if ((a === '--remote-relay' || a === '--relay-url') && argv[i + 1]) {
+      opts.remoteControlRelayUrl = argv[i + 1];
+      i += 1;
+      continue;
+    }
+    if (a.startsWith('--remote-relay=')) {
+      opts.remoteControlRelayUrl = a.slice('--remote-relay='.length);
+      continue;
+    }
+    if (a.startsWith('--relay-url=')) {
+      opts.remoteControlRelayUrl = a.slice('--relay-url='.length);
+      continue;
+    }
     if (a === '--remote-lan') {
       opts.remoteControlHost = '0.0.0.0';
       continue;
@@ -197,6 +225,7 @@ function usage() {
   console.log('Usage:');
   console.log(`  ${cliName} [options] [prompt]`);
   console.log(`  ${cliName} remote-control [--name <title>] [--remote-lan]`);
+  console.log(`  ${cliName} remote-control --cloud [--name <title>]`);
   console.log(`  ${cliName} --api-key <apikey>`);
   console.log(`  ${cliName} "write a python function"`);
   console.log('');
@@ -218,6 +247,10 @@ function usage() {
   console.log('                      Disable startup update check');
   console.log('      --remote-control, --rc [name]');
   console.log('                      Enable browser remote control for this session');
+  console.log('      --remote-cloud, --cloud');
+  console.log('                      Use bortex.site relay instead of opening a local port');
+  console.log('      --remote-relay <url>');
+  console.log('                      Remote relay base URL (default: current --url)');
   console.log('      --remote-lan    Bind remote control to 0.0.0.0 for LAN/mobile access');
   console.log('      --remote-host <host>, --remote-port <port>');
   console.log('                      Remote control bind address');
@@ -230,6 +263,7 @@ function usage() {
   console.log('Environment:');
   console.log('  BORTEX_URL      Server URL');
   console.log('  BORTEX_API_KEY  API key');
+  console.log('  BORTEX_REMOTE_RELAY_URL  Remote Control cloud relay URL');
 }
 
 function formatMs(ms) {
@@ -3930,6 +3964,7 @@ function printLocalHelp() {
   console.log('  /process-status     check running processes');
   console.log('  /port-status        check listening ports');
   console.log('  /remote-control [name] [--lan|--host <host>|--port <port>]');
+  console.log('  /remote-control --cloud [name]');
   console.log('  /remote-control stop');
   console.log('  /diff [unstaged|staged|all]');
   console.log('  /stage <file>|--all');
@@ -4382,7 +4417,7 @@ async function startRemoteControlServer(opts, overrides = {}) {
   const token = crypto.randomBytes(24).toString('hex');
   const state = {
     id: crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random().toString(16).slice(2)}`,
-    name: String(overrides.name || opts.remoteControlName || path.basename(opts.cwd || process.cwd()) || os.hostname() || 'Bortex Code').trim(),
+    name: getRemoteControlDisplayName(opts, overrides),
     host,
     port,
     token,
@@ -4496,11 +4531,231 @@ async function stopRemoteControlServer(opts) {
   return true;
 }
 
+function getRemoteControlDisplayName(opts, overrides = {}) {
+  return String(overrides.name || opts.remoteControlName || path.basename(opts.cwd || process.cwd()) || os.hostname() || 'Bortex Code').trim();
+}
+
+function getRemoteControlStatus(opts) {
+  if (opts.remoteControlCloudSession?.active) return 'cloud';
+  if (opts.remoteControlSession?.server) return 'local';
+  return 'off';
+}
+
+function getRemoteControlRelayBase(opts, overrides = {}) {
+  return String(overrides.relayUrl || opts.remoteControlRelayUrl || opts.url || 'https://bortex.site').replace(/\/+$/, '');
+}
+
+function remoteControlSleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function withRemoteControlQuery(rawUrl, baseUrl, params = {}) {
+  const urlObj = new URL(rawUrl, baseUrl);
+  Object.entries(params).forEach(([key, value]) => {
+    if (value !== undefined && value !== null && value !== '') {
+      urlObj.searchParams.set(key, String(value));
+    }
+  });
+  return urlObj.toString();
+}
+
+async function fetchRemoteControlJson(url, options = {}, timeoutMs = 30000) {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+  if (typeof timeoutId.unref === 'function') timeoutId.unref();
+  try {
+    const res = await fetch(url, {
+      ...options,
+      headers: {
+        Accept: 'application/json',
+        ...(options.headers || {})
+      },
+      signal: controller.signal
+    });
+    const text = await res.text();
+    let data = null;
+    if (text) {
+      try { data = JSON.parse(text); } catch (_err) { data = null; }
+    }
+    if (!res.ok) {
+      const detail = data?.error || data?.message || text || res.statusText || 'request failed';
+      throw new Error(`HTTP ${res.status}: ${detail}`);
+    }
+    if (data?.ok === false) {
+      throw new Error(data.error || data.message || 'request failed');
+    }
+    return data || {};
+  } finally {
+    clearTimeout(timeoutId);
+  }
+}
+
+async function postCloudRemoteHeartbeat(state) {
+  const heartbeatUrl = withRemoteControlQuery(
+    state.heartbeatUrl,
+    state.baseUrl,
+    { agentToken: state.agentToken }
+  );
+  await fetchRemoteControlJson(heartbeatUrl, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ cwd: state.cwd, version: CLI_VERSION })
+  }, 12000);
+}
+
+async function postCloudRemoteResult(state, commandId, result) {
+  const resultUrl = withRemoteControlQuery(
+    state.resultUrl,
+    state.baseUrl,
+    { agentToken: state.agentToken }
+  );
+  await fetchRemoteControlJson(resultUrl, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      commandId,
+      ok: !!result.ok,
+      output: String(result.output || '')
+    })
+  }, 35000);
+}
+
+async function pollCloudRemoteControlLoop(opts, state) {
+  let lastHeartbeatAt = 0;
+  while (state.active) {
+    let delayMs = 1200;
+    try {
+      const pollUrl = withRemoteControlQuery(
+        state.pollUrl,
+        state.baseUrl,
+        { agentToken: state.agentToken, after: state.lastCommandId || 0 }
+      );
+      const data = await fetchRemoteControlJson(pollUrl, { method: 'GET' }, 35000);
+      const commands = Array.isArray(data.commands) ? data.commands : [];
+      state.lastSeenAt = Date.now();
+      state.errorCount = 0;
+
+      for (const command of commands) {
+        if (!state.active) break;
+        const commandId = Number(command?.id || 0);
+        if (commandId > (state.lastCommandId || 0)) state.lastCommandId = commandId;
+        const text = String(command?.text || command?.prompt || '').trim();
+        if (!text) continue;
+        state.busy = true;
+        let result;
+        try {
+          result = await runRemoteControlPrompt(opts, text);
+        } catch (err) {
+          result = { ok: false, output: err.stack || err.message || String(err) };
+        } finally {
+          state.busy = false;
+        }
+        await postCloudRemoteResult(state, commandId, result);
+      }
+
+      if (!commands.length && Date.now() - lastHeartbeatAt > 10000) {
+        lastHeartbeatAt = Date.now();
+        await postCloudRemoteHeartbeat(state);
+      }
+      if (commands.length) delayMs = 250;
+    } catch (err) {
+      if (state.active) {
+        state.errorCount = (state.errorCount || 0) + 1;
+        const now = Date.now();
+        if (!state.lastErrorAt || now - state.lastErrorAt > 15000) {
+          console.error(`Cloud Remote Control error: ${err.message || String(err)}`);
+          state.lastErrorAt = now;
+        }
+        delayMs = Math.min(5000, 1000 + state.errorCount * 500);
+      }
+    } finally {
+      state.busy = false;
+    }
+    await remoteControlSleep(delayMs);
+  }
+}
+
+async function startCloudRemoteControlSession(opts, overrides = {}) {
+  if (opts.remoteControlCloudSession?.active) {
+    console.log(`Cloud Remote Control already active: ${opts.remoteControlCloudSession.url}`);
+    return opts.remoteControlCloudSession;
+  }
+
+  const baseUrl = getRemoteControlRelayBase(opts, overrides);
+  const name = getRemoteControlDisplayName(opts, overrides);
+  const payload = {
+    name,
+    cwd: opts.cwd,
+    version: CLI_VERSION,
+    machine: os.hostname(),
+    platform: process.platform,
+    node: process.version,
+    mode: opts.agent ? 'agent' : 'chat'
+  };
+  const data = await fetchRemoteControlJson(`${baseUrl}/api/bortex-code/remote/register`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(payload)
+  }, 30000);
+
+  const sessionId = String(data.sessionId || '').trim();
+  const agentToken = String(data.agentToken || '').trim();
+  if (!sessionId || !agentToken) {
+    throw new Error('Remote relay registration did not return a session token.');
+  }
+
+  const state = {
+    active: true,
+    cloud: true,
+    baseUrl,
+    sessionId,
+    agentToken,
+    clientToken: data.clientToken || '',
+    name,
+    cwd: opts.cwd,
+    url: data.url || `${baseUrl}/bortex-code/remote?session=${encodeURIComponent(sessionId)}`,
+    pollUrl: data.pollUrl || `${baseUrl}/api/bortex-code/remote/session/${encodeURIComponent(sessionId)}/poll`,
+    resultUrl: data.resultUrl || `${baseUrl}/api/bortex-code/remote/session/${encodeURIComponent(sessionId)}/result`,
+    heartbeatUrl: data.heartbeatUrl || `${baseUrl}/api/bortex-code/remote/session/${encodeURIComponent(sessionId)}/heartbeat`,
+    lastCommandId: 0,
+    startedAt: Date.now(),
+    busy: false,
+    errorCount: 0
+  };
+  state.stop = async () => {
+    state.active = false;
+  };
+  opts.remoteControlCloudSession = state;
+  state.pollPromise = pollCloudRemoteControlLoop(opts, state).catch((err) => {
+    if (state.active) console.error(`Cloud Remote Control stopped unexpectedly: ${err.message || String(err)}`);
+  });
+
+  console.log(`Cloud Remote Control active: ${state.name}`);
+  console.log(`URL: ${state.url}`);
+  console.log('No inbound port required. Keep this process running.');
+  console.log('Security: keep this tokenized URL private. Anyone with the URL can control this Bortex Code session.');
+  return state;
+}
+
+async function stopCloudRemoteControlSession(opts) {
+  const state = opts.remoteControlCloudSession;
+  if (!state?.active) {
+    console.log('Cloud Remote Control is not active.');
+    return false;
+  }
+  await state.stop();
+  opts.remoteControlCloudSession = null;
+  console.log('Cloud Remote Control stopped.');
+  return true;
+}
+
 function parseRemoteControlSlashArgs(rest = [], opts = {}) {
   const out = {
     name: '',
     host: opts.remoteControlHost || '127.0.0.1',
-    port: Number(opts.remoteControlPort || 0) || 0
+    port: Number(opts.remoteControlPort || 0) || 0,
+    relayUrl: opts.remoteControlRelayUrl || '',
+    cloud: false
   };
   const nameParts = [];
   for (let i = 0; i < rest.length; i += 1) {
@@ -4513,6 +4768,23 @@ function parseRemoteControlSlashArgs(rest = [], opts = {}) {
       out.host = '0.0.0.0';
       continue;
     }
+    if (a === 'cloud' || a === '--cloud' || a === '--remote-cloud' || a === '--relay') {
+      out.cloud = true;
+      continue;
+    }
+    if ((a === '--relay-url' || a === '--remote-relay') && rest[i + 1]) {
+      out.relayUrl = String(rest[i + 1]);
+      i += 1;
+      continue;
+    }
+    if (a.startsWith('--relay-url=')) {
+      out.relayUrl = a.slice('--relay-url='.length);
+      continue;
+    }
+    if (a.startsWith('--remote-relay=')) {
+      out.relayUrl = a.slice('--remote-relay='.length);
+      continue;
+    }
     if ((a === '--host' || a === '--remote-host') && rest[i + 1]) {
       out.host = String(rest[i + 1]);
       i += 1;
@@ -5835,13 +6107,18 @@ async function handleLocalCommand(opts, line) {
     const done = todoItems.filter((t) => t.done).length;
     const runPending = Array.isArray(opts.runState?.steps) ? opts.runState.steps.filter((s) => s.status === 'pending').length : 0;
     console.log(formatModeLine(opts));
-    console.log(`Todo: ${done}/${todoItems.length} | Plan: ${opts.plan?.goal ? 'active' : 'none'} | Run: ${opts.runState?.goal ? `active (${runPending} pending)` : 'none'} | Remote: ${opts.remoteControlSession?.server ? 'active' : 'off'}`);
+    console.log(`Todo: ${done}/${todoItems.length} | Plan: ${opts.plan?.goal ? 'active' : 'none'} | Run: ${opts.runState?.goal ? `active (${runPending} pending)` : 'none'} | Remote: ${getRemoteControlStatus(opts)}`);
     return { handled: true };
   }
   if (lc === '/remote-control' || lc === '/remote' || lc === '/rc') {
     const parsed = parseRemoteControlSlashArgs(rest, opts);
-    if (parsed.stop || opts.remoteControlSession?.server) {
-      await stopRemoteControlServer(opts);
+    if (parsed.stop || opts.remoteControlSession?.server || opts.remoteControlCloudSession?.active) {
+      if (opts.remoteControlSession?.server) await stopRemoteControlServer(opts);
+      if (opts.remoteControlCloudSession?.active) await stopCloudRemoteControlSession(opts);
+      return { handled: true };
+    }
+    if (parsed.cloud) {
+      await startCloudRemoteControlSession(opts, parsed);
       return { handled: true };
     }
     await startRemoteControlServer(opts, parsed);
@@ -7010,6 +7287,7 @@ const SLASH_COMMANDS = [
   ['/help', 'Show command help'],
   ['/remote-control [name]', 'Control this local session from a browser'],
   ['/remote-control --lan', 'Expose Remote Control on the local network'],
+  ['/remote-control --cloud', 'Control this session through bortex.site relay'],
   ['/rc', 'Toggle Remote Control'],
   ['/llm-config show', 'Show cached LLM configuration'],
   ['/llm-config sync', 'Sync LLM configuration from Bortex'],
@@ -7186,11 +7464,18 @@ async function runRepl(opts) {
   };
   opts._askInput = async (prompt) => new Promise((resolve) => rl.question(prompt, resolve));
   if (opts.remoteControl) {
-    await startRemoteControlServer(opts, {
-      name: opts.remoteControlName,
-      host: opts.remoteControlHost,
-      port: opts.remoteControlPort
-    });
+    if (opts.remoteControlCloud) {
+      await startCloudRemoteControlSession(opts, {
+        name: opts.remoteControlName,
+        relayUrl: opts.remoteControlRelayUrl
+      });
+    } else {
+      await startRemoteControlServer(opts, {
+        name: opts.remoteControlName,
+        host: opts.remoteControlHost,
+        port: opts.remoteControlPort
+      });
+    }
   }
 
   const question = () => new Promise((resolve) => {
@@ -7216,7 +7501,7 @@ async function runRepl(opts) {
       const done = todoItems.filter((t) => t.done).length;
       console.log(formatModeLine(opts));
       const runPending = Array.isArray(opts.runState?.steps) ? opts.runState.steps.filter((s) => s.status === 'pending').length : 0;
-      console.log(`Todo: ${done}/${todoItems.length} | Plan: ${opts.plan?.goal ? 'active' : 'none'} | Run: ${opts.runState?.goal ? `active (${runPending} pending)` : 'none'}`);
+      console.log(`Todo: ${done}/${todoItems.length} | Plan: ${opts.plan?.goal ? 'active' : 'none'} | Run: ${opts.runState?.goal ? `active (${runPending} pending)` : 'none'} | Remote: ${getRemoteControlStatus(opts)}`);
       continue;
     }
     if (line === '/help') {
@@ -7266,6 +7551,9 @@ async function runRepl(opts) {
   if (opts.remoteControlSession?.server) {
     await stopRemoteControlServer(opts);
   }
+  if (opts.remoteControlCloudSession?.active) {
+    await stopCloudRemoteControlSession(opts);
+  }
   try { saveCliWorkspaceState(opts); } catch (_err) { }
   delete opts._readMultiline;
   delete opts._askInput;
@@ -7317,18 +7605,30 @@ async function main() {
   }
 
   if (opts.remoteControlServerMode) {
-    await startRemoteControlServer(opts, {
-      name: opts.remoteControlName,
-      host: opts.remoteControlHost,
-      port: opts.remoteControlPort
-    });
+    if (opts.remoteControlCloud) {
+      await startCloudRemoteControlSession(opts, {
+        name: opts.remoteControlName,
+        relayUrl: opts.remoteControlRelayUrl
+      });
+    } else {
+      await startRemoteControlServer(opts, {
+        name: opts.remoteControlName,
+        host: opts.remoteControlHost,
+        port: opts.remoteControlPort
+      });
+    }
     console.log('Server mode: keep this process running. Press Ctrl+C to stop Remote Control.');
     await new Promise((resolve) => {
       let stopping = false;
       const stop = async () => {
         if (stopping) return;
         stopping = true;
-        try { await stopRemoteControlServer(opts); } catch (_err) {}
+        if (opts.remoteControlSession?.server) {
+          try { await stopRemoteControlServer(opts); } catch (_err) {}
+        }
+        if (opts.remoteControlCloudSession?.active) {
+          try { await stopCloudRemoteControlSession(opts); } catch (_err) {}
+        }
         resolve();
       };
       process.once('SIGINT', stop);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bortexcode",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "Bortex Code CLI - AI coding assistant powered by bortex.site",
   "homepage": "https://bortex.site",
   "license": "UNLICENSED",