robot-resources 1.0.0 → 1.1.1

package/lib/detect.js

@@ -1,4 +1,4 @@
-import { execSync } from 'node:child_process';
+import { execSync, execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
@@ -61,8 +61,11 @@ export function detectAgents() {
  * Check if port 3838 is available.
  */
 export function isPortAvailable(port = 3838) {
+  if (typeof port !== 'number' || !Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new Error('Invalid port number');
+  }
   try {
-    execSync(`lsof -i :${port} -t 2>/dev/null`, { encoding: 'utf-8' });
+    execFileSync('lsof', ['-i', `:${port}`, '-t'], { encoding: 'utf-8', stdio: 'pipe' });
     return false; // port is in use
   } catch {
     return true; // port is available (lsof returned non-zero = no process)

package/lib/service.js

@@ -1,10 +1,11 @@
 import { execSync } from 'node:child_process';
-import { existsSync, writeFileSync, unlinkSync, mkdirSync, chmodSync } from 'node:fs';
+import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync, chmodSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
 import { readProviderKeys } from '@robot-resources/cli-core/config.mjs';
 
 const LABEL = 'ai.robotresources.router';
+const SERVICE_NAME = 'robot-resources-router.service';
 const ROUTER_PORT = 3838;
 
 // Maps config.json provider_keys names to environment variable names
@@ -14,6 +15,63 @@ const CONFIG_TO_ENV = {
   google: 'GOOGLE_API_KEY',
 };
 
+// ─── Environment detection ──────────────────────────────────────────────────
+
+function isDocker() {
+  return existsSync('/.dockerenv') ||
+    (existsSync('/proc/1/cgroup') &&
+      readFileSync('/proc/1/cgroup', 'utf-8').includes('docker'));
+}
+
+function isWSL() {
+  try {
+    const version = readFileSync('/proc/version', 'utf-8');
+    return /microsoft|wsl/i.test(version);
+  } catch {
+    return false;
+  }
+}
+
+function hasSystemd() {
+  // systemd is PID 1 — check if /run/systemd/system exists (standard detection)
+  return existsSync('/run/systemd/system');
+}
+
+function isRoot() {
+  return process.getuid?.() === 0;
+}
+
+// ─── Shared helpers ─────────────────────────────────────────────────────────
+
+function resolveProviderEnv() {
+  const configKeys = readProviderKeys();
+  const keyNames = ['ANTHROPIC_API_KEY', 'OPENAI_API_KEY', 'GOOGLE_API_KEY'];
+  const resolvedKeys = {};
+  for (const key of keyNames) {
+    if (process.env[key]) {
+      resolvedKeys[key] = process.env[key];
+    }
+  }
+  for (const [configName, envName] of Object.entries(CONFIG_TO_ENV)) {
+    if (!resolvedKeys[envName] && configKeys[configName]) {
+      resolvedKeys[envName] = configKeys[configName];
+    }
+  }
+  resolvedKeys['PATH'] = '/usr/local/bin:/usr/bin:/bin';
+  return resolvedKeys;
+}
+
+function writeEnvFile(resolvedKeys) {
+  const envDir = join(homedir(), '.robot-resources');
+  const envPath = join(envDir, 'router.env');
+  mkdirSync(envDir, { recursive: true });
+  const lines = Object.entries(resolvedKeys)
+    .map(([key, value]) => `${key}=${value}`)
+    .join('\n');
+  writeFileSync(envPath, lines + '\n', { mode: 0o600 });
+  return envPath;
+}
+
 // ─── macOS (launchd) ────────────────────────────────────────────────────────
 
 function getPlistPath() {
@@ -123,36 +181,16 @@ function isLaunchdRunning() {
   }
 }
 
-// ─── Linux (systemd) ────────────────────────────────────────────────────────
+// ─── Linux: systemd user service ────────────────────────────────────────────
 
-function getUnitPath() {
-  return join(homedir(), '.config', 'systemd', 'user', 'robot-resources-router.service');
+function getUserUnitPath() {
+  return join(homedir(), '.config', 'systemd', 'user', SERVICE_NAME);
 }
 
-function buildUnit(venvPythonPath) {
+function buildUserUnit(venvPythonPath, envFilePath) {
   const home = homedir();
   const logsDir = join(home, '.robot-resources', 'logs');
 
-  // Snapshot provider API keys: env vars take priority, then config.json
-  const envLines = [];
-  const configKeys = readProviderKeys();
-  const keyNames = ['ANTHROPIC_API_KEY', 'OPENAI_API_KEY', 'GOOGLE_API_KEY'];
-  const resolvedKeys = {};
-  for (const key of keyNames) {
-    if (process.env[key]) {
-      resolvedKeys[key] = process.env[key];
-    }
-  }
-  for (const [configName, envName] of Object.entries(CONFIG_TO_ENV)) {
-    if (!resolvedKeys[envName] && configKeys[configName]) {
-      resolvedKeys[envName] = configKeys[configName];
-    }
-  }
-  for (const [key, value] of Object.entries(resolvedKeys)) {
-    envLines.push(`Environment=${key}=${value}`);
-  }
-  envLines.push('Environment=PATH=/usr/local/bin:/usr/bin:/bin');
-
   return `[Unit]
 Description=Robot Resources Router — LLM cost optimization proxy
 After=network-online.target
@@ -163,7 +201,7 @@ Type=simple
 ExecStart=${venvPythonPath} -m robot_resources.cli.main start
 Restart=on-failure
 RestartSec=5
-${envLines.join('\n')}
+EnvironmentFile=${envFilePath}
 WorkingDirectory=${home}/.robot-resources
 StandardOutput=append:${logsDir}/router.stdout.log
 StandardError=append:${logsDir}/router.stderr.log
@@ -173,23 +211,32 @@ WantedBy=default.target
 `;
 }
 
-function installSystemd(venvPythonPath) {
-  const unitPath = getUnitPath();
+function installSystemdUser(venvPythonPath) {
+  const unitPath = getUserUnitPath();
   const logsDir = join(homedir(), '.robot-resources', 'logs');
   const unitDir = dirname(unitPath);
 
   mkdirSync(logsDir, { recursive: true });
   mkdirSync(unitDir, { recursive: true });
 
-  writeFileSync(unitPath, buildUnit(venvPythonPath));
+  const resolvedKeys = resolveProviderEnv();
+  const envFilePath = writeEnvFile(resolvedKeys);
+  writeFileSync(unitPath, buildUserUnit(venvPythonPath, envFilePath));
   chmodSync(unitPath, 0o600);
   execSync('systemctl --user daemon-reload', { stdio: 'pipe' });
   execSync('systemctl --user enable robot-resources-router.service', { stdio: 'pipe' });
   execSync('systemctl --user start robot-resources-router.service', { stdio: 'pipe' });
+
+  // Enable linger so the service survives SSH disconnects (critical for VMs)
+  try {
+    execSync('loginctl enable-linger', { stdio: 'pipe' });
+  } catch {
+    // Non-fatal — linger may not be available (e.g. no loginctl)
+  }
 }
 
-function uninstallSystemd() {
-  const unitPath = getUnitPath();
+function uninstallSystemdUser() {
+  const unitPath = getUserUnitPath();
   if (!existsSync(unitPath)) return;
 
   try {
@@ -202,6 +249,74 @@ function uninstallSystemd() {
   execSync('systemctl --user daemon-reload', { stdio: 'pipe' });
 }
 
+// ─── Linux: systemd system service (root / VMs / servers) ───────────────────
+
+const SYSTEM_UNIT_PATH = `/etc/systemd/system/${SERVICE_NAME}`;
+
+function buildSystemUnit(venvPythonPath, envFilePath) {
+  const home = homedir();
+  const logsDir = join(home, '.robot-resources', 'logs');
+
+  return `[Unit]
+Description=Robot Resources Router — LLM cost optimization proxy
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+User=root
+ExecStart=${venvPythonPath} -m robot_resources.cli.main start
+Restart=on-failure
+RestartSec=5
+EnvironmentFile=${envFilePath}
+WorkingDirectory=${home}/.robot-resources
+StandardOutput=append:${logsDir}/router.stdout.log
+StandardError=append:${logsDir}/router.stderr.log
+
+[Install]
+WantedBy=multi-user.target
+`;
+}
+
+function installSystemdSystem(venvPythonPath) {
+  const logsDir = join(homedir(), '.robot-resources', 'logs');
+  mkdirSync(logsDir, { recursive: true });
+
+  const resolvedKeys = resolveProviderEnv();
+  const envFilePath = writeEnvFile(resolvedKeys);
+  writeFileSync(SYSTEM_UNIT_PATH, buildSystemUnit(venvPythonPath, envFilePath));
+  chmodSync(SYSTEM_UNIT_PATH, 0o644);
+  execSync('systemctl daemon-reload', { stdio: 'pipe' });
+  execSync(`systemctl enable ${SERVICE_NAME}`, { stdio: 'pipe' });
+  execSync(`systemctl start ${SERVICE_NAME}`, { stdio: 'pipe' });
+}
+
+function uninstallSystemdSystem() {
+  if (!existsSync(SYSTEM_UNIT_PATH)) return;
+
+  try {
+    execSync(`systemctl stop ${SERVICE_NAME}`, { stdio: 'pipe' });
+    execSync(`systemctl disable ${SERVICE_NAME}`, { stdio: 'pipe' });
+  } catch {
+    // Already stopped
+  }
+  unlinkSync(SYSTEM_UNIT_PATH);
+  execSync('systemctl daemon-reload', { stdio: 'pipe' });
+}
+
+// ─── Linux routing logic ────────────────────────────────────────────────────
+
+function getLinuxMode() {
+  if (isDocker()) return 'docker';
+  if (isWSL() && !hasSystemd()) return 'wsl-no-systemd';
+  if (isRoot()) return 'system';
+  return 'user';
+}
+
+function getLinuxUnitPath() {
+  return isRoot() ? SYSTEM_UNIT_PATH : getUserUnitPath();
+}
+
 // ─── Public API ─────────────────────────────────────────────────────────────
 
 /**
@@ -212,10 +327,38 @@ export function installService(venvPythonPath) {
     installLaunchd(venvPythonPath);
     return { type: 'launchd', path: getPlistPath() };
   }
+
   if (process.platform === 'linux') {
-    installSystemd(venvPythonPath);
-    return { type: 'systemd', path: getUnitPath() };
+    const mode = getLinuxMode();
+
+    if (mode === 'docker') {
+      return {
+        type: 'skipped',
+        reason: 'Running inside Docker — service registration skipped.\n' +
+          '  Add this to your Dockerfile or entrypoint instead:\n' +
+          `  ${venvPythonPath} -m robot_resources.cli.main start`,
+      };
+    }
+
+    if (mode === 'wsl-no-systemd') {
+      return {
+        type: 'skipped',
+        reason: 'WSL without systemd detected — service registration skipped.\n' +
+          '  Enable systemd in WSL (wsl.conf → [boot] systemd=true) or run manually:\n' +
+          `  ${venvPythonPath} -m robot_resources.cli.main start`,
+      };
+    }
+
+    if (mode === 'system') {
+      installSystemdSystem(venvPythonPath);
+      return { type: 'systemd-system', path: SYSTEM_UNIT_PATH };
+    }
+
+    // mode === 'user'
+    installSystemdUser(venvPythonPath);
+    return { type: 'systemd-user', path: getUserUnitPath() };
   }
+
   throw new Error(
     `Service registration not supported on ${process.platform}.\n` +
     `  Run the router manually: rr-router start`
@@ -227,7 +370,11 @@ export function installService(venvPythonPath) {
  */
 export function uninstallService() {
   if (process.platform === 'darwin') return uninstallLaunchd();
-  if (process.platform === 'linux') return uninstallSystemd();
+  if (process.platform === 'linux') {
+    // Clean up whichever variant is installed
+    if (existsSync(SYSTEM_UNIT_PATH)) return uninstallSystemdSystem();
+    if (existsSync(getUserUnitPath())) return uninstallSystemdUser();
+  }
 }
 
 /**
@@ -236,8 +383,17 @@ export function uninstallService() {
 export function isServiceRunning() {
   if (process.platform === 'darwin') return isLaunchdRunning();
   if (process.platform === 'linux') {
+    // Check system-level first, then user-level
+    if (existsSync(SYSTEM_UNIT_PATH)) {
+      try {
+        execSync(`systemctl is-active ${SERVICE_NAME}`, { stdio: 'pipe' });
+        return true;
+      } catch {
+        return false;
+      }
+    }
     try {
-      execSync('systemctl --user is-active robot-resources-router.service', { stdio: 'pipe' });
+      execSync(`systemctl --user is-active ${SERVICE_NAME}`, { stdio: 'pipe' });
       return true;
     } catch {
       return false;
@@ -251,7 +407,7 @@ export function isServiceRunning() {
  */
 export function isServiceInstalled() {
   if (process.platform === 'darwin') return existsSync(getPlistPath());
-  if (process.platform === 'linux') return existsSync(getUnitPath());
+  if (process.platform === 'linux') return existsSync(SYSTEM_UNIT_PATH) || existsSync(getUserUnitPath());
   return false;
 }
 

package/lib/wizard.js

@@ -18,6 +18,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
 
   const results = {
     auth: false,
+    authMethod: null, // 'config' | 'apikey' | 'github'
     router: false,
     routerError: null,
     providerKeys: false,
@@ -32,6 +33,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
   if (config.api_key) {
     success(`Already logged in as ${config.user_name || config.user_email || 'unknown'}`);
     results.auth = true;
+    results.authMethod = 'config';
   } else if (process.env.RR_API_KEY) {
     // Agent flow: API key provided via environment variable
     const envKey = process.env.RR_API_KEY;
@@ -42,6 +44,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
       writeConfig({ api_key: envKey, signup_source: 'agent' });
       success('API key loaded from RR_API_KEY environment variable');
       results.auth = true;
+      results.authMethod = 'apikey';
     }
   } else {
     step('Setting up your Robot Resources account...');
@@ -51,6 +54,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
       try {
         await login();
         results.auth = true;
+        results.authMethod = 'github';
       } catch (err) {
         error(`Login failed: ${err.message}`);
         info('You can log in later with: npx robot-resources login');
@@ -168,10 +172,15 @@ export async function runWizard({ nonInteractive = false } = {}) {
 
       try {
         const svc = installService(getVenvPythonPath());
-        success(`Router registered as ${svc.type} service`);
-        info(`Config: ${svc.path}`);
-        info('Router will start automatically on login and restart on crash');
-        results.service = true;
+        if (svc.type === 'skipped') {
+          warn(svc.reason);
+          results.service = false;
+        } else {
+          success(`Router registered as ${svc.type} service`);
+          info(`Config: ${svc.path}`);
+          info('Router will start automatically and restart on crash');
+          results.service = true;
+        }
       } catch (err) {
         error(`Service registration failed: ${err.message}`);
         info('You can start the router manually: rr-router start');
@@ -209,7 +218,11 @@ export async function runWizard({ nonInteractive = false } = {}) {
   const lines = [];
 
   if (results.auth) {
-    lines.push('✓ Authenticated with GitHub');
+    const authLabel =
+      results.authMethod === 'apikey' ? 'Authenticated with API key' :
+      results.authMethod === 'config' ? 'Authenticated (saved credentials)' :
+      'Authenticated with GitHub';
+    lines.push(`✓ ${authLabel}`);
   } else {
     lines.push('○ Not logged in (run: npx robot-resources login)');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "robot-resources",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Robot Resources — AI agent runtime tools. One command to install everything.",
   "type": "module",
   "bin": {
@@ -42,6 +42,10 @@
     "url": "git+https://github.com/robot-resources/robot-resources.git",
     "directory": "packages/cli"
   },
+  "homepage": "https://robotresources.ai",
+  "bugs": {
+    "url": "https://github.com/robot-resources/robot-resources/issues"
+  },
   "publishConfig": {
     "access": "public"
   }