remote-codex 0.1.2 → 0.1.3

package/README.md

@@ -43,8 +43,8 @@ remote-codex stop
 
 The global CLI starts the production API and web service:
 
-- API: `http://127.0.0.1:8787`
-- Web: `http://127.0.0.1:4173`
+- API: `http://127.0.0.1:45674`
+- Web: `http://127.0.0.1:45673`
 - service logs/state: `~/.remote-codex/service/`
 - production database: `~/.remote-codex/supervisor.sqlite`
 

package/bin/remote-codex.mjs

@@ -9,6 +9,11 @@ const binDir = path.dirname(fileURLToPath(import.meta.url));
 const packageRoot = path.resolve(binDir, '..');
 const packageJsonPath = path.join(packageRoot, 'package.json');
 const serviceManagerPath = path.join(packageRoot, 'scripts', 'service-manager.mjs');
+const sourceCheckout =
+  fs.existsSync(path.join(packageRoot, 'pnpm-workspace.yaml')) &&
+  fs.existsSync(path.join(packageRoot, 'scripts', 'service-restart.mjs'));
+const defaultServicePort = sourceCheckout ? 4173 : 45673;
+const defaultApiPort = sourceCheckout ? 8787 : 45674;
 
 const aliases = new Map([
   ['service:start', 'start'],
@@ -84,9 +89,9 @@ Usage:
 
 Environment:
   SERVICE_HOST              Web listen host, default 127.0.0.1
-  SERVICE_PORT              Web listen port, default 4173
+  SERVICE_PORT              Web listen port, default ${defaultServicePort}
   SERVICE_API_HOST          API listen host, default 127.0.0.1
-  SERVICE_API_PORT          API listen port, default 8787
+  SERVICE_API_PORT          API listen port, default ${defaultApiPort}
   REMOTE_CODEX_SERVICE_DIR  Service state and log directory, default ~/.remote-codex/service
 `);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remote-codex",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Local web supervisor for Codex workspaces and threads.",
   "license": "MIT",
   "type": "module",

package/scripts/run-web-service.mjs

@@ -7,11 +7,16 @@ import { fileURLToPath } from 'node:url';
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
+const sourceCheckout =
+  fs.existsSync(path.join(repoRoot, 'pnpm-workspace.yaml')) &&
+  fs.existsSync(path.join(repoRoot, 'scripts', 'service-restart.mjs'));
+const defaultServicePort = sourceCheckout ? 4173 : 45673;
+const defaultApiPort = sourceCheckout ? 8787 : 45674;
 
 const serviceHost = process.env.SERVICE_HOST ?? '127.0.0.1';
-const servicePort = parsePort(process.env.SERVICE_PORT, 4173);
+const servicePort = parsePort(process.env.SERVICE_PORT, defaultServicePort);
 const apiHost = process.env.SERVICE_API_HOST ?? '127.0.0.1';
-const apiPort = parsePort(process.env.SERVICE_API_PORT, 8787);
+const apiPort = parsePort(process.env.SERVICE_API_PORT, defaultApiPort);
 const distDir = path.resolve(
   process.env.SERVICE_WEB_DIST_DIR ?? path.join(repoRoot, 'apps/supervisor-web/dist')
 );

package/scripts/service-manager.mjs

@@ -4,6 +4,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
+import net from 'node:net';
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
@@ -17,11 +18,13 @@ const webIndex = path.join(repoRoot, 'apps', 'supervisor-web', 'dist', 'index.ht
 const supportsSourceRestart =
   fs.existsSync(path.join(repoRoot, 'pnpm-workspace.yaml')) &&
   fs.existsSync(path.join(repoRoot, 'scripts', 'service-restart.mjs'));
+const defaultServicePort = supportsSourceRestart ? 4173 : 45673;
+const defaultApiPort = supportsSourceRestart ? 8787 : 45674;
 
 const serviceHost = process.env.SERVICE_HOST ?? '127.0.0.1';
-const servicePort = parsePort(process.env.SERVICE_PORT, 4173);
+const servicePort = parsePort(process.env.SERVICE_PORT, defaultServicePort);
 const apiHost = process.env.SERVICE_API_HOST ?? '127.0.0.1';
-const apiPort = parsePort(process.env.SERVICE_API_PORT, 8787);
+const apiPort = parsePort(process.env.SERVICE_API_PORT, defaultApiPort);
 
 const command = process.argv[2];
 
@@ -58,6 +61,10 @@ async function startService() {
   const webLogPath = path.join(serviceDir, 'web.log');
   prepareLogFile(apiLogPath);
   prepareLogFile(webLogPath);
+
+  await assertTcpPortAvailable(apiHost, apiPort, 'API');
+  await assertTcpPortAvailable(serviceHost, servicePort, 'Web');
+
   const apiPid = spawnDetached(process.execPath, [apiEntry], apiLogPath, {
     NODE_ENV: 'production',
     HOST: apiHost,
@@ -73,7 +80,7 @@ async function startService() {
     await waitForHttp(`http://${apiHost}:${apiPort}/healthz`, apiPid, 15_000);
   } catch (error) {
     stopPid(apiPid);
-    throw error;
+    throw appendLogTail(error, apiLogPath, 'API');
   }
 
   const webPid = spawnDetached(process.execPath, [webEntry], webLogPath, {
@@ -89,7 +96,7 @@ async function startService() {
   } catch (error) {
     stopPid(webPid);
     stopPid(apiPid);
-    throw error;
+    throw appendLogTail(error, webLogPath, 'Web');
   }
 
   const state = {
@@ -214,6 +221,54 @@ async function waitForHttp(url, pid, timeoutMs) {
   throw new Error(`Timed out waiting for ${url}.`);
 }
 
+async function assertTcpPortAvailable(host, port, label) {
+  await new Promise((resolve, reject) => {
+    const server = net.createServer();
+    server.unref();
+
+    server.once('error', (error) => {
+      const code = typeof error === 'object' && error !== null ? error.code : undefined;
+      if (code === 'EADDRINUSE') {
+        reject(
+          new Error(
+            `${label} port ${host}:${port} is already in use. Set ${label === 'API' ? 'SERVICE_API_PORT' : 'SERVICE_PORT'} to another port, or stop the process currently using it.`
+          )
+        );
+        return;
+      }
+
+      reject(error);
+    });
+
+    server.listen(port, host, () => {
+      server.close(resolve);
+    });
+  });
+}
+
+function appendLogTail(error, logPath, label) {
+  const message = error instanceof Error ? error.message : String(error);
+  const tail = readLogTail(logPath, 80);
+  if (!tail) {
+    return new Error(`${message}\n${label} log: ${logPath}`);
+  }
+
+  return new Error(`${message}\n${label} log: ${logPath}\n\nLast ${label} log lines:\n${tail}`);
+}
+
+function readLogTail(logPath, maxLines) {
+  try {
+    const content = fs.readFileSync(logPath, 'utf8').trimEnd();
+    if (!content) {
+      return '';
+    }
+
+    return content.split(/\r?\n/).slice(-maxLines).join('\n');
+  } catch {
+    return '';
+  }
+}
+
 async function probeHttp(url) {
   try {
     const controller = new AbortController();