amalgm 0.1.41 → 0.1.43

package/lib/cli.js

@@ -28,6 +28,11 @@ const {
   stopService,
   uninstallService,
 } = require('./service');
+const {
+  cleanupStaleRuntimeProcesses,
+  runtimeServiceProcesses,
+  supervisorProcesses,
+} = require('./process-cleanup');
 const {
   deleteComputerAuth,
   loadComputerRecord,
@@ -846,6 +851,8 @@ async function start(options) {
     await stop();
   }
 
+  cleanupStaleRuntimeProcesses({ includeSupervisors: true });
+
   const blockedPorts = await unavailableServicePorts();
   if (blockedPorts.length > 0) {
     const detail = blockedPorts.map(([name, port]) => `${name} (${port})`).join(', ');
@@ -928,6 +935,7 @@ async function stop() {
     } catch {
       // noop
     }
+    cleanupStaleRuntimeProcesses({ includeSupervisors: true });
     console.log('Amalgm is not running.');
     return;
   }
@@ -951,6 +959,7 @@ async function stop() {
   } catch {
     // noop
   }
+  cleanupStaleRuntimeProcesses({ includeSupervisors: true });
   console.log('Amalgm stopped.');
 }
 
@@ -1028,6 +1037,14 @@ async function status() {
   }
   console.log(`HMAC proxy: ${proxyTokenFromRecord(record) ? 'configured' : 'not configured'}`);
 
+  const runtimeChildren = runtimeServiceProcesses();
+  const runtimeSupervisors = supervisorProcesses();
+  if (runtimeChildren.length > 5 || runtimeSupervisors.length > 1) {
+    console.log(
+      `Warning: multiple Amalgm runtime processes detected (${runtimeSupervisors.length} supervisor, ${runtimeChildren.length} services). Run \`amalgm stop && amalgm start\`.`,
+    );
+  }
+
   for (const [name, port] of servicePorts()) {
     const ok = await checkHttp(port);
     console.log(`${name.padEnd(13)} ${ok ? 'up' : 'down'}  http://127.0.0.1:${port}`);
@@ -1101,6 +1118,16 @@ async function doctor() {
     );
   }
   add('daemon', daemonRunning, daemonRunning ? `pid ${pid}` : 'stopped', daemonRunning ? 'ok' : 'warn');
+  const runtimeChildren = runtimeServiceProcesses();
+  const runtimeSupervisors = supervisorProcesses();
+  const expectedServices = daemonRunning ? 5 : 0;
+  const cleanProcessShape = runtimeSupervisors.length <= 1 && runtimeChildren.length <= expectedServices;
+  add(
+    'runtime processes',
+    cleanProcessShape,
+    `${runtimeSupervisors.length} supervisor, ${runtimeChildren.length} services`,
+    cleanProcessShape ? 'ok' : 'warn',
+  );
   if (lastShutdown?.signal || lastShutdown?.reason) {
     add(
       'last shutdown',

package/lib/process-cleanup.js

@@ -0,0 +1,213 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+const {
+  AMALGM_DIR,
+  PACKAGE_ROOT,
+  RUNTIME_DIR,
+} = require('./paths');
+
+const RUNTIME_SERVICE_MARKERS = [
+  path.join(RUNTIME_DIR, 'scripts', 'port-monitor.js'),
+  path.join(RUNTIME_DIR, 'scripts', 'fs-watcher.js'),
+  path.join(RUNTIME_DIR, 'scripts', 'chat-server.js'),
+  path.join(RUNTIME_DIR, 'scripts', 'local-gateway.js'),
+  path.join(RUNTIME_DIR, 'scripts', 'amalgm-mcp', 'index.js'),
+].map((value) => value.replace(/\\/g, '/'));
+const RUNTIME_SERVICE_SUFFIXES = [
+  'runtime/scripts/port-monitor.js',
+  'runtime/scripts/fs-watcher.js',
+  'runtime/scripts/chat-server.js',
+  'runtime/scripts/local-gateway.js',
+  'runtime/scripts/amalgm-mcp/index.js',
+];
+
+const SUPERVISOR_MARKER = path.join(PACKAGE_ROOT, 'bin', 'amalgm.js').replace(/\\/g, '/');
+
+function isPidRunning(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function waitForExit(pid, timeoutMs = 5000) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline && isPidRunning(pid)) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
+  }
+  return !isPidRunning(pid);
+}
+
+function readProcString(file) {
+  try {
+    return fs.readFileSync(file).toString('utf8');
+  } catch {
+    return '';
+  }
+}
+
+function readProcCommand(pid) {
+  const cmdline = readProcString(`/proc/${pid}/cmdline`).replace(/\0/g, ' ').trim();
+  if (cmdline) return cmdline;
+  try {
+    const result = spawnSync('ps', ['-p', String(pid), '-o', 'command='], {
+      encoding: 'utf8',
+      timeout: 1000,
+    });
+    return String(result.stdout || '').trim();
+  } catch {
+    return '';
+  }
+}
+
+function readProcEnv(pid) {
+  const raw = readProcString(`/proc/${pid}/environ`);
+  if (!raw) return null;
+  const env = {};
+  for (const entry of raw.split('\0')) {
+    if (!entry) continue;
+    const index = entry.indexOf('=');
+    if (index <= 0) continue;
+    env[entry.slice(0, index)] = entry.slice(index + 1);
+  }
+  return env;
+}
+
+function listProcProcesses() {
+  try {
+    return fs.readdirSync('/proc')
+      .filter((entry) => /^\d+$/.test(entry))
+      .map((entry) => Number(entry))
+      .filter((pid) => Number.isInteger(pid) && pid > 0)
+      .map((pid) => ({
+        pid,
+        command: readProcCommand(pid),
+        env: readProcEnv(pid),
+      }))
+      .filter((item) => item.command);
+  } catch {
+    return null;
+  }
+}
+
+function listPsProcesses() {
+  try {
+    const result = spawnSync('ps', ['-eo', 'pid=,command='], {
+      encoding: 'utf8',
+      timeout: 2000,
+    });
+    if (result.status !== 0) return [];
+    return String(result.stdout || '')
+      .split('\n')
+      .map((line) => {
+        const match = line.trim().match(/^(\d+)\s+(.+)$/);
+        if (!match) return null;
+        return {
+          pid: Number(match[1]),
+          command: match[2],
+          env: null,
+        };
+      })
+      .filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+
+function listProcesses() {
+  return listProcProcesses() || listPsProcesses();
+}
+
+function normalizedCommand(command) {
+  return String(command || '').replace(/\\/g, '/');
+}
+
+function envMatchesAmalgmDir(env) {
+  if (!env || !env.AMALGM_DIR) return true;
+  return path.resolve(env.AMALGM_DIR) === path.resolve(AMALGM_DIR);
+}
+
+function commandLooksLikeRuntimeService(command) {
+  const normalized = normalizedCommand(command);
+  return RUNTIME_SERVICE_MARKERS.some((marker) => normalized.includes(marker))
+    || RUNTIME_SERVICE_SUFFIXES.some((marker) => normalized.includes(marker));
+}
+
+function commandLooksLikeSupervisor(command) {
+  const normalized = normalizedCommand(command);
+  return normalized.includes(SUPERVISOR_MARKER) && /\brun\b/.test(normalized);
+}
+
+function runtimeServiceProcesses(options = {}) {
+  const exclude = new Set([process.pid, ...(options.excludePids || [])].filter(Number.isInteger));
+  return listProcesses()
+    .filter((item) => !exclude.has(item.pid))
+    .filter((item) => commandLooksLikeRuntimeService(item.command))
+    .filter((item) => envMatchesAmalgmDir(item.env));
+}
+
+function supervisorProcesses(options = {}) {
+  const exclude = new Set([process.pid, ...(options.excludePids || [])].filter(Number.isInteger));
+  return listProcesses()
+    .filter((item) => !exclude.has(item.pid))
+    .filter((item) => commandLooksLikeSupervisor(item.command))
+    .filter((item) => envMatchesAmalgmDir(item.env));
+}
+
+function terminateProcesses(processes, options = {}) {
+  const logger = options.logger || null;
+  const unique = [...new Map(processes.map((item) => [item.pid, item])).values()]
+    .filter((item) => isPidRunning(item.pid));
+  if (unique.length === 0) return [];
+
+  for (const item of unique) {
+    try {
+      process.kill(item.pid, 'SIGTERM');
+    } catch {
+      // It may have exited between discovery and shutdown.
+    }
+  }
+
+  const survivors = [];
+  for (const item of unique) {
+    if (!waitForExit(item.pid, options.termTimeoutMs || 3000)) survivors.push(item);
+  }
+
+  for (const item of survivors) {
+    try {
+      process.kill(item.pid, 'SIGKILL');
+    } catch {
+      // noop
+    }
+  }
+  for (const item of survivors) waitForExit(item.pid, options.killTimeoutMs || 1500);
+
+  const stopped = unique.filter((item) => !isPidRunning(item.pid));
+  if (stopped.length > 0 && logger?.log) {
+    logger.log(`cleaned stale Amalgm runtime process(es): ${stopped.map((item) => item.pid).join(', ')}`);
+  }
+  return stopped;
+}
+
+function cleanupStaleRuntimeProcesses(options = {}) {
+  const stale = runtimeServiceProcesses(options);
+  const supervisors = options.includeSupervisors ? supervisorProcesses(options) : [];
+  return terminateProcesses([...stale, ...supervisors], options);
+}
+
+module.exports = {
+  cleanupStaleRuntimeProcesses,
+  commandLooksLikeRuntimeService,
+  commandLooksLikeSupervisor,
+  isPidRunning,
+  runtimeServiceProcesses,
+  supervisorProcesses,
+  terminateProcesses,
+};

package/lib/service.js

@@ -15,6 +15,9 @@ const {
   SERVICE_STATE_FILE,
   SERVICE_STOP_FILE,
 } = require('./paths');
+const {
+  cleanupStaleRuntimeProcesses,
+} = require('./process-cleanup');
 
 const PACKAGE_VERSION = require('../package.json').version;
 const SERVICE_LABEL = 'ai.amalgm.runtime';
@@ -250,6 +253,7 @@ function writePortableScript(localOnly) {
     `LOCK_DIR=${shellQuote(path.join(SERVICE_DIR, 'lock'))}`,
     `NODE_BIN=${shellQuote(process.execPath)}`,
     `AMALGM_BIN=${shellQuote(AMALGM_BIN)}`,
+    `NODE_WATCHDOG=${shellQuote(SERVICE_NODE_SCRIPT_FILE)}`,
     `DAEMON_LOG=${shellQuote(path.join(LOG_DIR, 'daemon.log'))}`,
     `SERVICE_LOG=${shellQuote(SERVICE_LOG_FILE)}`,
     `RESTART_DELAY=${shellQuote(String(process.env.AMALGM_SERVICE_RESTART_DELAY || '5'))}`,
@@ -261,42 +265,7 @@ function writePortableScript(localOnly) {
 
   lines.push(
     'mkdir -p "$AMALGM_DIR" "$LOG_DIR"',
-    'if ! mkdir "$LOCK_DIR" 2>/dev/null; then',
-    '  existing="$(cat "$PID_FILE" 2>/dev/null | sed -n \'s/.*"pid"[[:space:]]*:[[:space:]]*\\([0-9][0-9]*\\).*/\\1/p\')"',
-    '  [ -n "$existing" ] || existing="$(cat "$PID_FILE" 2>/dev/null || true)"',
-    '  if [ -n "$existing" ] && kill -0 "$existing" 2>/dev/null; then',
-    '    exit 0',
-    '  fi',
-    '  rm -rf "$LOCK_DIR"',
-    '  mkdir "$LOCK_DIR" || exit 1',
-    'fi',
-    'child_pid=""',
-    'cleanup() {',
-    '  touch "$STOP_FILE" 2>/dev/null || true',
-    '  if [ -n "$child_pid" ] && kill -0 "$child_pid" 2>/dev/null; then',
-    '    kill "$child_pid" 2>/dev/null || true',
-    '    wait "$child_pid" 2>/dev/null || true',
-    '  fi',
-    '  rm -f "$PID_FILE"',
-    '  rm -rf "$LOCK_DIR"',
-    '  exit 0',
-    '}',
-    'trap cleanup TERM INT HUP',
-    'printf \'{"pid":%s,"started_at":"%s","backend":"portable"}\\n\' "$$" "$(date -u +%Y-%m-%dT%H:%M:%SZ)" > "$PID_FILE"',
-    'rm -f "$STOP_FILE"',
-    'while [ ! -f "$STOP_FILE" ]; do',
-    '  printf \'[%s] [service] starting amalgm run\\n\' "$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$SERVICE_LOG"',
-    '  "$NODE_BIN" "$AMALGM_BIN" run >> "$DAEMON_LOG" 2>&1 &',
-    '  child_pid=$!',
-    '  wait "$child_pid"',
-    '  code=$?',
-    '  child_pid=""',
-    '  printf \'[%s] [service] amalgm run exited code=%s\\n\' "$(date -u +%Y-%m-%dT%H:%M:%SZ)" "$code" >> "$SERVICE_LOG"',
-    '  [ -f "$STOP_FILE" ] && break',
-    '  sleep "$RESTART_DELAY"',
-    'done',
-    'rm -f "$PID_FILE"',
-    'rm -rf "$LOCK_DIR"',
+    'exec "$NODE_BIN" "$NODE_WATCHDOG"',
   );
 
   fs.writeFileSync(SERVICE_SCRIPT_FILE, `${lines.join('\n')}\n`, { mode: 0o700 });
@@ -330,6 +299,9 @@ function writePortableNodeScript(localOnly) {
 const fs = require('fs');
 const path = require('path');
 const { spawn } = require('child_process');
+const {
+  cleanupStaleRuntimeProcesses,
+} = require(path.join(path.dirname(${JSON.stringify(AMALGM_BIN)}), '..', 'lib', 'process-cleanup'));
 
 const config = ${JSON.stringify(config, null, 2)};
 let child = null;
@@ -411,19 +383,39 @@ function cleanup(exitCode = 0) {
       if (child && !child.killed) {
         try { child.kill('SIGKILL'); } catch {}
       }
+      cleanupStaleRuntimeProcesses({
+        excludePids: [process.pid],
+        includeSupervisors: true,
+        logger: { log: (message) => append(config.serviceLog, message) },
+      });
       finish(exitCode);
     }, 5000);
     child.once('exit', () => {
       clearTimeout(timer);
+      cleanupStaleRuntimeProcesses({
+        excludePids: [process.pid],
+        includeSupervisors: true,
+        logger: { log: (message) => append(config.serviceLog, message) },
+      });
       finish(exitCode);
     });
     return;
   }
+  cleanupStaleRuntimeProcesses({
+    excludePids: [process.pid],
+    includeSupervisors: true,
+    logger: { log: (message) => append(config.serviceLog, message) },
+  });
   finish(exitCode);
 }
 
 function launch() {
   if (stopping || fs.existsSync(config.stopFile)) return cleanup(0);
+  cleanupStaleRuntimeProcesses({
+    excludePids: [process.pid],
+    includeSupervisors: true,
+    logger: { log: (message) => append(config.serviceLog, message) },
+  });
   append(config.serviceLog, 'starting amalgm run');
   const fd = fs.openSync(config.daemonLog, 'a');
   child = spawn(config.nodeBin, [config.amalgmBin, 'run'], {
@@ -655,10 +647,8 @@ function startPortable() {
   removeFile(SERVICE_STOP_FILE);
   ensureDir(LOG_DIR, 0o700);
   const logFd = fs.openSync(SERVICE_LOG_FILE, 'a');
-  const command = process.platform === 'win32' ? process.execPath : '/bin/sh';
-  const args = process.platform === 'win32'
-    ? [state?.files?.nodeScript || SERVICE_NODE_SCRIPT_FILE]
-    : [state?.files?.script || SERVICE_SCRIPT_FILE];
+  const command = process.execPath;
+  const args = [state?.files?.nodeScript || SERVICE_NODE_SCRIPT_FILE];
   const child = spawn(command, args, {
     detached: true,
     env: {
@@ -682,6 +672,7 @@ function stopDaemonProcess() {
   const pid = readPidFile(PID_FILE);
   if (!isPidRunning(pid)) {
     removeFile(PID_FILE);
+    cleanupStaleRuntimeProcesses({ includeSupervisors: true });
     return false;
   }
   try {
@@ -701,6 +692,7 @@ function stopDaemonProcess() {
     }
   }
   removeFile(PID_FILE);
+  cleanupStaleRuntimeProcesses({ includeSupervisors: true });
   return true;
 }
 
@@ -720,6 +712,7 @@ function stopPortable() {
     Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
   }
   removeFile(SERVICE_PID_FILE);
+  cleanupStaleRuntimeProcesses({ includeSupervisors: true });
 }
 
 function startService(options = {}) {

package/lib/supervisor.js

@@ -26,6 +26,11 @@ const {
   ensureAgentCommandShims,
   ensureNativeBinaries,
 } = require('../runtime/scripts/chat-core/tooling/native-binaries');
+const {
+  cleanupStaleRuntimeProcesses,
+  isPidRunning,
+  supervisorProcesses,
+} = require('./process-cleanup');
 const PACKAGE_VERSION = require('../package.json').version;
 
 function ensureDir(dir, mode = 0o700) {
@@ -408,6 +413,21 @@ async function startSupervisor(options = {}) {
   ensureDir(AMALGM_DIR, 0o700);
   ensureDir(LOG_DIR, 0o700);
 
+  const activeSupervisors = supervisorProcesses({ excludePids: [process.pid] });
+  if (activeSupervisors.length > 0) {
+    const pids = activeSupervisors
+      .filter((item) => isPidRunning(item.pid))
+      .map((item) => item.pid);
+    if (pids.length > 0) {
+      throw new Error(`Amalgm runtime is already running (pid ${pids.join(', ')}). Run \`amalgm stop\` first.`);
+    }
+  }
+
+  cleanupStaleRuntimeProcesses({
+    excludePids: [process.pid],
+    logger: options.foreground ? console : null,
+  });
+
   const nativeResult = ensureNativeBinaries({
     logger: console,
     quiet: !options.foreground,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,
@@ -17,7 +17,7 @@
     "sync-runtime": "node ../../scripts/sync-npm-package-runtime.mjs",
     "prepack": "node ../../scripts/sync-npm-package-runtime.mjs",
     "pack:dry": "npm pack --dry-run",
-    "check": "node --check bin/amalgm.js && node --check lib/auth-store.js && node --check lib/cli.js && node --check lib/paths.js && node --check lib/service.js && node --check lib/supervisor.js && node --check lib/tunnel-chat.js && node --check lib/tunnel-events.js && node --check runtime/scripts/runtime-auth.js && node --check runtime/scripts/proxy-token-store.js && node --check runtime/scripts/local-gateway.js && node --check runtime/scripts/port-monitor.js && node --check runtime/scripts/fs-watcher.js && node --check runtime/scripts/chat-server.js && node --check runtime/scripts/chat-server/index.js && node --check runtime/scripts/chat-server/config.js && node --check runtime/scripts/chat-core/tooling/native-binaries.js && node --check runtime/scripts/chat-core/tooling/package-import.js && node --check runtime/scripts/amalgm-mcp/index.js && node --check runtime/scripts/amalgm-mcp/config.js"
+    "check": "node --check bin/amalgm.js && node --check lib/auth-store.js && node --check lib/cli.js && node --check lib/paths.js && node --check lib/process-cleanup.js && node --check lib/service.js && node --check lib/supervisor.js && node --check lib/tunnel-chat.js && node --check lib/tunnel-events.js && node --check runtime/scripts/runtime-auth.js && node --check runtime/scripts/proxy-token-store.js && node --check runtime/scripts/local-gateway.js && node --check runtime/scripts/port-monitor.js && node --check runtime/scripts/fs-watcher.js && node --check runtime/scripts/chat-server.js && node --check runtime/scripts/chat-server/index.js && node --check runtime/scripts/chat-server/config.js && node --check runtime/scripts/chat-core/tooling/native-binaries.js && node --check runtime/scripts/chat-core/tooling/package-import.js && node --check runtime/scripts/amalgm-mcp/index.js && node --check runtime/scripts/amalgm-mcp/config.js"
   },
   "engines": {
     "node": ">=20"

package/runtime/scripts/amalgm-mcp/artifacts/supervisor.js

@@ -26,6 +26,13 @@ const stopping = new Set();
 const restartTimers = new Map();
 
 const ARTIFACT_ENV_ALLOWLIST = [
+  'AMALGM_BIND_HOST',
+  'AMALGM_DIR',
+  'AMALGM_GATEWAY_PORT',
+  'AMALGM_MCP_PORT',
+  'AMALGM_RUNTIME_TOKEN',
+  'AMALGM_WORKSPACES_DIR',
+  'CHAT_SERVER_PORT',
   'PATH',
   'HOME',
   'USER',
@@ -81,6 +88,8 @@ function buildEnv(artifact) {
     AMALGM_ARTIFACT_ID: artifact.id,
     AMALGM_ARTIFACT_REF: artifact.artifactRef,
     AMALGM_ARTIFACT_URL: artifact.publicUrl,
+    AMALGM_CHAT_SERVER_URL: `http://127.0.0.1:${process.env.CHAT_SERVER_PORT || 8084}`,
+    AMALGM_MCP_URL: `http://127.0.0.1:${process.env.AMALGM_MCP_PORT || 8083}`,
   };
 }
 

package/runtime/scripts/amalgm-mcp/events/executor.js

@@ -198,7 +198,7 @@ async function executeArtifactEvent(artifactOrTrigger, eventDef, payload, opts =
     if (hasSupabase()) {
       supabasePatch('sessions', 'id', codeSessionId, {
         last_message_at: new Date().toISOString(),
-        status: 'completed',
+        status: 'complete',
         new_messages: true,
       }).catch(() => {});
     }

package/runtime/scripts/amalgm-mcp/tasks/executor.js

@@ -233,6 +233,14 @@ async function executeTask(task) {
     console.log(
       `[AmalgmMCP:Exec] Task ${task.id} ${status} in ${durationMs}ms (session: ${codeSessionId})`,
     );
+
+    if (hasSupabase()) {
+      supabasePatch('sessions', 'id', codeSessionId, {
+        last_message_at: new Date().toISOString(),
+        status: 'complete',
+        new_messages: true,
+      }).catch(() => {});
+    }
   } catch (err) {
     if (err.name === 'AbortError') {
       appendRunLog(task.id, {

package/runtime/scripts/fs-watcher.js

@@ -86,12 +86,36 @@ const INTERNAL_SERVICE_PORTS = new Set([
 const COMMON_DEV_PORTS = new Set([3000, 3001, 3002, 3003, 4000, 4200, 4321, 5000, 5001, 5173, 5174, 6006, 7000, 8000, 8001, 8888]);
 const BLOCKED_PREVIEW_PROCESSES = new Set(['.opencode', 'controlce', 'figma_age', 'figma_agent', 'loom', 'opencode', 'rapportd']);
 const DEV_PREVIEW_PROCESS_RE = /^(node|bun|deno|npm|pnpm|yarn|vite|next|astro|nuxt|svelte|remix|webpack|rspack|parcel|serve|http-server|tsx|python|python3|uvicorn|gunicorn|flask|django|ruby|rails|puma|php|java|go|air|cargo|trunk|dotnet|nginx)$/i;
+const INTERNAL_COMMAND_RE = /(?:^|\s)(?:node(?:-[^\s]+)?\s+)?[^\s]*(?:\/|\\)runtime(?:\/|\\)scripts(?:\/|\\)(?:port-monitor|fs-watcher|chat-server|local-gateway|amalgm-mcp(?:\/|\\)index)\.js(?:\s|$)/i;
+const BLOCKED_COMMAND_RE = /(?:agent-browser|chromium|chrome)(?:\s|$)/i;
 
-function isPreviewablePort(port, processName) {
+function readProcessCommand(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return '';
+  try {
+    return fs.readFileSync(`/proc/${pid}/cmdline`, 'utf8').replace(/\0/g, ' ').trim();
+  } catch {
+    return '';
+  }
+}
+
+function normalizeProcessName(processName) {
+  const name = String(processName || '').trim().toLowerCase();
+  if (/^node(?:$|[-_])/.test(name)) return 'node';
+  return name;
+}
+
+function publicProcessName(info) {
+  if (!info || typeof info !== 'object') return info || null;
+  return info.processName || null;
+}
+
+function isPreviewablePort(port, processInfo) {
   if (!Number.isInteger(port) || port < 3000 || port > 65535) return false;
   if (INTERNAL_SERVICE_PORTS.has(port)) return false;
   if (port >= 9100 && port <= 9199) return false;
-  const name = String(processName || '').trim().toLowerCase();
+  const command = typeof processInfo === 'object' && processInfo ? String(processInfo.command || '') : '';
+  if (INTERNAL_COMMAND_RE.test(command) || BLOCKED_COMMAND_RE.test(command)) return false;
+  const name = normalizeProcessName(typeof processInfo === 'object' && processInfo ? processInfo.processName : processInfo);
   if (BLOCKED_PREVIEW_PROCESSES.has(name) || name.startsWith('figma')) return false;
   if (!name) return COMMON_DEV_PORTS.has(port);
   if (DEV_PREVIEW_PROCESS_RE.test(name)) return true;
@@ -721,7 +745,7 @@ function broadcastPortEvent(event) {
 }
 
 function getListeningPorts() {
-  /** @type {Map<number, string|null>} */
+  /** @type {Map<number, { processName: string|null, pid: number|null, command: string }>} */
   const currentPorts = new Map();
 
   if (process.platform === 'darwin') {
@@ -731,9 +755,13 @@ function getListeningPorts() {
     for (const line of lines) {
       const trimmed = line.trim();
       if (!trimmed) continue;
-      const match = trimmed.match(/^(\S+)\s+\d+\s+.+\sTCP\s+.+:(\d+)\s+\(LISTEN\)$/);
+      const match = trimmed.match(/^(\S+)\s+(\d+)\s+.+\sTCP\s+.+:(\d+)\s+\(LISTEN\)$/);
       if (!match) continue;
-      currentPorts.set(parseInt(match[2], 10), match[1] || null);
+      currentPorts.set(parseInt(match[3], 10), {
+        processName: match[1] || null,
+        pid: parseInt(match[2], 10),
+        command: '',
+      });
     }
 
     return currentPorts;
@@ -749,8 +777,14 @@ function getListeningPorts() {
     let processName = null;
     const procMatch = line.match(/users:\(\("([^"]+)"/) || line.match(/\/([^\s/]+)\s*$/);
     if (procMatch) processName = procMatch[1];
+    const pidMatch = line.match(/pid=(\d+)/);
+    const pid = pidMatch ? parseInt(pidMatch[1], 10) : null;
 
-    currentPorts.set(parseInt(portMatch[1], 10), processName);
+    currentPorts.set(parseInt(portMatch[1], 10), {
+      processName,
+      pid,
+      command: pid ? readProcessCommand(pid) : '',
+    });
   }
 
   return currentPorts;
@@ -760,16 +794,17 @@ function checkPorts() {
   try {
     const currentPorts = getListeningPorts();
 
-    for (const [port, processName] of currentPorts) {
-      if (!isPreviewablePort(port, processName)) {
+    for (const [port, processInfo] of currentPorts) {
+      if (!isPreviewablePort(port, processInfo)) {
         currentPorts.delete(port);
       }
     }
 
     // Detect newly opened ports
-    for (const [port, processName] of currentPorts) {
+    for (const [port, processInfo] of currentPorts) {
       if (!knownPorts.has(port)) {
-        knownPorts.set(port, processName);
+        knownPorts.set(port, processInfo);
+        const processName = publicProcessName(processInfo);
         console.log(`[FsWatcher:Ports] Port opened: ${port} (${processName || 'unknown'})`);
         broadcastPortEvent({ type: 'port', event: 'opened', port, processName, timestamp: Date.now() });
       }

package/runtime/scripts/port-monitor.js

@@ -31,10 +31,23 @@ const INTERNAL_SERVICE_PORTS = new Set([
   4096,
 ]);
 const COMMON_DEV_PORTS = new Set([3000, 3001, 3002, 3003, 4000, 4200, 4321, 5000, 5001, 5173, 5174, 6006, 7000, 8000, 8001, 8888]);
+const BLOCKED_PREVIEW_PROCESSES = new Set(['.opencode', 'controlce', 'figma_age', 'figma_agent', 'loom', 'opencode', 'rapportd']);
+const DEV_PREVIEW_PROCESS_RE = /^(node|bun|deno|npm|pnpm|yarn|vite|next|astro|nuxt|svelte|remix|webpack|rspack|parcel|serve|http-server|tsx|python|python3|uvicorn|gunicorn|flask|django|ruby|rails|puma|php|java|go|air|cargo|trunk|dotnet|nginx)$/i;
+const INTERNAL_COMMAND_RE = /(?:^|\s)(?:node(?:-[^\s]+)?\s+)?[^\s]*(?:\/|\\)runtime(?:\/|\\)scripts(?:\/|\\)(?:port-monitor|fs-watcher|chat-server|local-gateway|amalgm-mcp(?:\/|\\)index)\.js(?:\s|$)/i;
+const BLOCKED_COMMAND_RE = /(?:agent-browser|chromium|chrome)(?:\s|$)/i;
 
 const knownPorts = new Map();
 const subscribers = new Set();
 
+function readProcessCommand(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return '';
+  try {
+    return fs.readFileSync(`/proc/${pid}/cmdline`, 'utf8').replace(/\0/g, ' ').trim();
+  } catch {
+    return '';
+  }
+}
+
 function readProcTcpPorts(file) {
   try {
     const text = fs.readFileSync(file, 'utf8');
@@ -66,8 +79,14 @@ function getListeningPorts() {
     const output = execSync('lsof -nP -iTCP -sTCP:LISTEN 2>/dev/null', { encoding: 'utf-8' });
     const ports = new Map();
     for (const line of output.split('\n').slice(1)) {
-      const match = line.trim().match(/^(\S+)\s+\d+\s+.+\sTCP\s+.+:(\d+)\s+\(LISTEN\)$/);
-      if (match) ports.set(parseInt(match[2], 10), match[1] || null);
+      const match = line.trim().match(/^(\S+)\s+(\d+)\s+.+\sTCP\s+.+:(\d+)\s+\(LISTEN\)$/);
+      if (match) {
+        ports.set(parseInt(match[3], 10), {
+          processName: match[1] || null,
+          pid: parseInt(match[2], 10),
+          command: '',
+        });
+      }
     }
     return ports;
   }
@@ -79,39 +98,58 @@ function getListeningPorts() {
       const portMatch = line.match(/:(\d+)\s+/);
       if (!portMatch) continue;
       const procMatch = line.match(/users:\(\("([^"]+)"/) || line.match(/\/([^\s/]+)\s*$/);
-      ports.set(parseInt(portMatch[1], 10), procMatch ? procMatch[1] : null);
+      const pidMatch = line.match(/pid=(\d+)/);
+      const pid = pidMatch ? parseInt(pidMatch[1], 10) : null;
+      ports.set(parseInt(portMatch[1], 10), {
+        processName: procMatch ? procMatch[1] : null,
+        pid,
+        command: pid ? readProcessCommand(pid) : '',
+      });
     }
     if (ports.size > 0) return ports;
   } catch {
     // Minimal Docker images often omit ss and netstat.
   }
 
-  return new Map(getListeningPortsFromProc().map((port) => [port, null]));
+  return new Map(getListeningPortsFromProc().map((port) => [port, { processName: null, pid: null, command: '' }]));
 }
 
-function isPreviewablePort(port, processName) {
+function normalizeProcessName(processName) {
+  const name = String(processName || '').trim().toLowerCase();
+  if (/^node(?:$|[-_])/.test(name)) return 'node';
+  return name;
+}
+
+function publicProcessName(info) {
+  if (!info || typeof info !== 'object') return info || null;
+  return info.processName || null;
+}
+
+function isPreviewablePort(port, processInfo) {
   if (!Number.isInteger(port) || port < 3000 || port > 65535) return false;
   if (INTERNAL_SERVICE_PORTS.has(port)) return false;
   if (port >= 9100 && port <= 9199) return false;
-  const name = String(processName || '').trim().toLowerCase();
-  if (['.opencode', 'controlce', 'figma_age', 'figma_agent', 'loom', 'opencode', 'rapportd'].includes(name)) return false;
+  const command = typeof processInfo === 'object' && processInfo ? String(processInfo.command || '') : '';
+  if (INTERNAL_COMMAND_RE.test(command) || BLOCKED_COMMAND_RE.test(command)) return false;
+  const name = normalizeProcessName(typeof processInfo === 'object' && processInfo ? processInfo.processName : processInfo);
+  if (BLOCKED_PREVIEW_PROCESSES.has(name)) return false;
   if (name.startsWith('figma')) return false;
   if (!name) return COMMON_DEV_PORTS.has(port);
-  if (/^(node|bun|deno|npm|pnpm|yarn|vite|next|astro|nuxt|svelte|remix|webpack|rspack|parcel|serve|http-server|tsx|python|python3|uvicorn|gunicorn|flask|django|ruby|rails|puma|php|java|go|air|cargo|trunk|dotnet|nginx)$/i.test(name)) return true;
+  if (DEV_PREVIEW_PROCESS_RE.test(name)) return true;
   return COMMON_DEV_PORTS.has(port) && name === 'unknown';
 }
 
 function checkPorts() {
   try {
     const ports = getListeningPorts();
-    for (const [port, processName] of ports) {
-      if (!isPreviewablePort(port, processName)) ports.delete(port);
+    for (const [port, processInfo] of ports) {
+      if (!isPreviewablePort(port, processInfo)) ports.delete(port);
     }
 
-    for (const [port, processName] of ports) {
+    for (const [port, processInfo] of ports) {
       if (!knownPorts.has(port)) {
-        knownPorts.set(port, processName);
-        broadcast({ type: 'port_opened', port, processName, timestamp: Date.now() });
+        knownPorts.set(port, processInfo);
+        broadcast({ type: 'port_opened', port, processName: publicProcessName(processInfo), timestamp: Date.now() });
       }
     }
 
@@ -143,7 +181,7 @@ const server = http.createServer((req, res) => {
     res.writeHead(200, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({
       status: 'ok',
-      activePorts: [...knownPorts.entries()].map(([port, processName]) => ({ port, processName })),
+      activePorts: [...knownPorts.entries()].map(([port, processInfo]) => ({ port, processName: publicProcessName(processInfo) })),
     }));
     return;
   }
@@ -154,7 +192,7 @@ const server = http.createServer((req, res) => {
       'Cache-Control': 'no-cache, no-transform',
       'Connection': 'keep-alive',
     });
-    res.write(`event: init\ndata: ${JSON.stringify({ ports: [...knownPorts.entries()].map(([port, processName]) => ({ port, processName })) })}\n\n`);
+    res.write(`event: init\ndata: ${JSON.stringify({ ports: [...knownPorts.entries()].map(([port, processInfo]) => ({ port, processName: publicProcessName(processInfo) })) })}\n\n`);
     subscribers.add(res);
     req.on('close', () => subscribers.delete(res));
     return;
@@ -162,7 +200,7 @@ const server = http.createServer((req, res) => {
 
   if (url.pathname === '/api/ports') {
     res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ ports: [...knownPorts.entries()].map(([port, processName]) => ({ port, processName })) }));
+    res.end(JSON.stringify({ ports: [...knownPorts.entries()].map(([port, processInfo]) => ({ port, processName: publicProcessName(processInfo) })) }));
     return;
   }