amalgm 0.1.44 → 0.1.46

package/README.md

@@ -37,7 +37,6 @@ amalgm run
 The runtime supervisor keeps the declared local essentials alive:
 
 - port monitor on `8081`
-- filesystem/auth watcher on `8082`
 - Amalgm MCP on `8083`
 - chat server on `8084`
 - events/previews/artifact tunnel to `wire.events.amalgm.ai`

package/lib/cli.js

@@ -179,8 +179,6 @@ const SAFE_DAEMON_ENV_KEYS = [
   'AMALGM_SKIP_NATIVE_INSTALL',
   'CHAT_SERVER_PORT',
   'ELECTRON_RUN_AS_NODE',
-  'FS_WATCHER_PORT',
-  'FS_WATCHER_ROOT',
   'HOME',
   'LANG',
   'LC_ALL',

package/lib/runtime-manifest.js

@@ -1,131 +1,3 @@
 'use strict';
 
-const RUNTIME_SERVICES = [
-  {
-    name: 'local-gateway',
-    script: 'scripts/local-gateway.js',
-    portKey: 'gateway',
-    envName: 'AMALGM_GATEWAY_PORT',
-    stateKey: 'gateway',
-    defaultPort: 28781,
-    launchOrder: 50,
-  },
-  {
-    name: 'port-monitor',
-    script: 'scripts/port-monitor.js',
-    portKey: 'portMonitor',
-    envName: 'PORT_MONITOR_PORT',
-    stateKey: 'port_monitor',
-    defaultPort: 8081,
-    launchOrder: 10,
-  },
-  {
-    name: 'fs-watcher',
-    script: 'scripts/fs-watcher.js',
-    portKey: 'fsWatcher',
-    envName: 'FS_WATCHER_PORT',
-    stateKey: 'fs_watcher',
-    defaultPort: 8082,
-    launchOrder: 20,
-  },
-  {
-    name: 'amalgm-mcp',
-    script: 'scripts/amalgm-mcp/index.js',
-    portKey: 'amalgmMcp',
-    envName: 'AMALGM_MCP_PORT',
-    stateKey: 'amalgm_mcp',
-    defaultPort: 8083,
-    launchOrder: 40,
-  },
-  {
-    name: 'chat-server',
-    script: 'scripts/chat-server.js',
-    portKey: 'chatServer',
-    envName: 'CHAT_SERVER_PORT',
-    stateKey: 'chat_server',
-    defaultPort: 8084,
-    launchOrder: 30,
-  },
-];
-
-function runtimeServices() {
-  return RUNTIME_SERVICES.map((service) => ({ ...service }));
-}
-
-function runtimeLaunchServices() {
-  return runtimeServices().sort((left, right) => left.launchOrder - right.launchOrder);
-}
-
-function runtimeServiceNames() {
-  return RUNTIME_SERVICES.map((service) => service.name);
-}
-
-function runtimeServiceScripts() {
-  return RUNTIME_SERVICES.map((service) => service.script);
-}
-
-function runtimeServiceByName(name) {
-  return RUNTIME_SERVICES.find((service) => service.name === name) || null;
-}
-
-function runtimePortsFromState(state) {
-  const statePorts = state?.ports || {};
-  const values = {};
-  for (const service of RUNTIME_SERVICES) {
-    if (service.stateKey === 'gateway' && Number.isInteger(state?.gateway_port)) {
-      values[service.name] = Number(state.gateway_port);
-      continue;
-    }
-    const port = Number(statePorts[service.stateKey] || 0);
-    if (Number.isInteger(port) && port > 0) values[service.name] = port;
-  }
-  return values;
-}
-
-function runtimePortsFromEnv(env = process.env) {
-  const values = {};
-  for (const service of RUNTIME_SERVICES) {
-    const port = Number(env[service.envName] || service.defaultPort);
-    if (Number.isInteger(port) && port > 0) values[service.name] = port;
-  }
-  return values;
-}
-
-function runtimePortsForStatus(state, env = process.env) {
-  const fromState = runtimePortsFromState(state);
-  const fromEnv = runtimePortsFromEnv(env);
-  return RUNTIME_SERVICES
-    .map((service) => [service.name, fromState[service.name] || fromEnv[service.name]])
-    .filter(([, port]) => Number.isInteger(port) && port > 0);
-}
-
-function runtimePortsState(ports) {
-  const statePorts = {};
-  for (const service of RUNTIME_SERVICES) {
-    const port = Number(ports?.[service.portKey] || 0);
-    if (!Number.isInteger(port) || port <= 0) continue;
-    if (service.stateKey !== 'gateway') statePorts[service.stateKey] = port;
-  }
-  return {
-    gateway_port: Number(ports?.gateway || 0) || undefined,
-    gateway_url: ports?.gateway ? `http://127.0.0.1:${ports.gateway}` : undefined,
-    ports: statePorts,
-    services: RUNTIME_SERVICES.map((service) => ({
-      name: service.name,
-      port: Number(ports?.[service.portKey] || 0) || null,
-      health_path: '/healthz',
-    })),
-  };
-}
-
-module.exports = {
-  runtimeLaunchServices,
-  runtimePortsForStatus,
-  runtimePortsFromEnv,
-  runtimePortsFromState,
-  runtimePortsState,
-  runtimeServiceByName,
-  runtimeServiceNames,
-  runtimeServiceScripts,
-  runtimeServices,
-};
+module.exports = require('../runtime/lib/runtime-manifest');

package/lib/service.js

@@ -39,7 +39,6 @@ const SERVICE_ENV_KEYS = [
   'AMALGM_WORKSPACES_DIR',
   'CHAT_SERVER_PORT',
   'ELECTRON_RUN_AS_NODE',
-  'FS_WATCHER_PORT',
   'LANG',
   'LC_ALL',
   'NODE_PATH',

package/lib/supervisor.js

@@ -224,8 +224,6 @@ function baseRuntimeEnv(record, ports, options = {}) {
     CHAT_SERVER_PORT: String(ports.chatServer),
     AMALGM_MCP_PORT: String(ports.amalgmMcp),
     PORT_MONITOR_PORT: String(ports.portMonitor),
-    FS_WATCHER_PORT: String(ports.fsWatcher),
-    FS_WATCHER_ROOT: process.env.FS_WATCHER_ROOT || defaultCwd,
     AMALGM_RUNTIME_VERSION: require('../package.json').version,
   };
 
@@ -628,7 +626,6 @@ async function startSupervisor(options = {}) {
     AMALGM_GATEWAY_PORT: String(ports.gateway),
     AMALGM_MCP_PORT: String(ports.amalgmMcp),
     CHAT_SERVER_PORT: String(ports.chatServer),
-    FS_WATCHER_PORT: String(ports.fsWatcher),
     PORT_MONITOR_PORT: String(ports.portMonitor),
   });
   updateRuntimeState(runtimePortsState(ports));

package/lib/tunnel-chat.js

@@ -5,13 +5,17 @@ const fs = require('fs');
 const os = require('os');
 const { WebSocket } = require('ws');
 const { RUNTIME_STATE_FILE } = require('./paths');
+const { runtimePort, runtimeServiceByName } = require('./runtime-manifest');
 
-const DEFAULT_TARGET_PORT = 8084;
+const DEFAULT_TARGET_PORT = runtimeServiceByName('chat-server').defaultPort;
 const DEFAULT_CHAT_TUNNEL_URL = 'wss://amalgm-chat-gateway.fly.dev/wire';
 const CONNECT_TIMEOUT_MS = 20_000;
 const WATCHDOG_INTERVAL_MS = 15_000;
 const HEARTBEAT_TIMEOUT_MS = 75_000;
-const ALLOWED_TARGET_PORTS = new Set([8083, 8084]);
+const ALLOWED_TARGET_PORTS = new Set([
+  runtimeServiceByName('amalgm-mcp').defaultPort,
+  runtimeServiceByName('chat-server').defaultPort,
+]);
 const HOP_BY_HOP_HEADERS = new Set([
   'connection',
   'keep-alive',
@@ -62,22 +66,18 @@ function responseHeaders(headers = {}) {
 }
 
 function readRuntimePorts() {
-  const envPort = (name) => {
-    const port = Number(process.env[name]);
-    return Number.isInteger(port) && port > 0 && port <= 65535 ? port : undefined;
-  };
   try {
     const parsed = JSON.parse(fs.readFileSync(RUNTIME_STATE_FILE, 'utf8'));
     return {
-      gateway: Number(parsed?.gateway_port || parsed?.ports?.gateway) || envPort('AMALGM_GATEWAY_PORT'),
-      mcp: Number(parsed?.ports?.amalgm_mcp) || envPort('AMALGM_MCP_PORT'),
-      chat: Number(parsed?.ports?.chat_server) || envPort('CHAT_SERVER_PORT'),
+      gateway: Number(parsed?.gateway_port || parsed?.ports?.gateway) || runtimePort('local-gateway'),
+      mcp: Number(parsed?.ports?.amalgm_mcp) || runtimePort('amalgm-mcp'),
+      chat: Number(parsed?.ports?.chat_server) || runtimePort('chat-server'),
     };
   } catch {
     return {
-      gateway: envPort('AMALGM_GATEWAY_PORT'),
-      mcp: envPort('AMALGM_MCP_PORT'),
-      chat: envPort('CHAT_SERVER_PORT'),
+      gateway: runtimePort('local-gateway'),
+      mcp: runtimePort('amalgm-mcp'),
+      chat: runtimePort('chat-server'),
     };
   }
 }

package/lib/tunnel-events.js

@@ -7,12 +7,16 @@ const path = require('path');
 const { WebSocket } = require('ws');
 
 const { AMALGM_DIR, RUNTIME_STATE_FILE } = require('./paths');
+const { runtimePort, runtimeServiceByName } = require('./runtime-manifest');
 
-const DEFAULT_TARGET_PORT = 8083;
+const DEFAULT_TARGET_PORT = runtimeServiceByName('amalgm-mcp').defaultPort;
 const CONNECT_TIMEOUT_MS = 20_000;
 const WATCHDOG_INTERVAL_MS = 15_000;
 const HEARTBEAT_TIMEOUT_MS = 75_000;
-const CORE_TARGET_PORTS = new Set([8083, 8084]);
+const CORE_TARGET_PORTS = new Set([
+  runtimeServiceByName('amalgm-mcp').defaultPort,
+  runtimeServiceByName('chat-server').defaultPort,
+]);
 const HOP_BY_HOP_HEADERS = new Set([
   'connection',
   'keep-alive',
@@ -149,22 +153,18 @@ function readArtifactRoutes() {
 }
 
 function readRuntimePorts() {
-  const envPort = (name) => {
-    const port = Number(process.env[name]);
-    return Number.isInteger(port) && port > 0 && port <= 65535 ? port : undefined;
-  };
   try {
     const parsed = JSON.parse(fs.readFileSync(RUNTIME_STATE_FILE, 'utf8'));
     return {
-      gateway: Number(parsed?.gateway_port || parsed?.ports?.gateway) || envPort('AMALGM_GATEWAY_PORT'),
-      mcp: Number(parsed?.ports?.amalgm_mcp) || envPort('AMALGM_MCP_PORT'),
-      chat: Number(parsed?.ports?.chat_server) || envPort('CHAT_SERVER_PORT'),
+      gateway: Number(parsed?.gateway_port || parsed?.ports?.gateway) || runtimePort('local-gateway'),
+      mcp: Number(parsed?.ports?.amalgm_mcp) || runtimePort('amalgm-mcp'),
+      chat: Number(parsed?.ports?.chat_server) || runtimePort('chat-server'),
     };
   } catch {
     return {
-      gateway: envPort('AMALGM_GATEWAY_PORT'),
-      mcp: envPort('AMALGM_MCP_PORT'),
-      chat: envPort('CHAT_SERVER_PORT'),
+      gateway: runtimePort('local-gateway'),
+      mcp: runtimePort('amalgm-mcp'),
+      chat: runtimePort('chat-server'),
     };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "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/process-cleanup.js && node --check lib/runtime-manifest.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/runtime-manifest.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/lib/runtime-manifest.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/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/lib/runtime-manifest.js

@@ -0,0 +1,159 @@
+'use strict';
+
+const RUNTIME_SERVICES = [
+  {
+    name: 'local-gateway',
+    script: 'scripts/local-gateway.js',
+    portKey: 'gateway',
+    envName: 'AMALGM_GATEWAY_PORT',
+    stateKey: 'gateway',
+    defaultPort: 28781,
+    launchOrder: 50,
+  },
+  {
+    name: 'port-monitor',
+    script: 'scripts/port-monitor.js',
+    portKey: 'portMonitor',
+    envName: 'PORT_MONITOR_PORT',
+    stateKey: 'port_monitor',
+    defaultPort: 8081,
+    launchOrder: 10,
+  },
+  {
+    name: 'amalgm-mcp',
+    script: 'scripts/amalgm-mcp/index.js',
+    portKey: 'amalgmMcp',
+    envName: 'AMALGM_MCP_PORT',
+    stateKey: 'amalgm_mcp',
+    defaultPort: 8083,
+    launchOrder: 40,
+  },
+  {
+    name: 'chat-server',
+    script: 'scripts/chat-server.js',
+    portKey: 'chatServer',
+    envName: 'CHAT_SERVER_PORT',
+    stateKey: 'chat_server',
+    defaultPort: 8084,
+    launchOrder: 30,
+  },
+];
+
+function cloneService(service) {
+  return { ...service };
+}
+
+function serviceByName(name) {
+  return RUNTIME_SERVICES.find((service) => service.name === name) || null;
+}
+
+function parsePort(value, fallback = null) {
+  const port = Number.parseInt(String(value ?? ''), 10);
+  if (Number.isInteger(port) && port > 0 && port <= 65535) return port;
+  return fallback;
+}
+
+function runtimeServices() {
+  return RUNTIME_SERVICES.map(cloneService);
+}
+
+function runtimeLaunchServices() {
+  return runtimeServices().sort((left, right) => left.launchOrder - right.launchOrder);
+}
+
+function runtimeServiceNames() {
+  return RUNTIME_SERVICES.map((service) => service.name);
+}
+
+function runtimeServiceScripts() {
+  return RUNTIME_SERVICES.map((service) => service.script);
+}
+
+function runtimeServiceByName(name) {
+  const service = serviceByName(name);
+  return service ? cloneService(service) : null;
+}
+
+function runtimePort(name, env = process.env) {
+  const service = serviceByName(name);
+  if (!service) return null;
+  return parsePort(env?.[service.envName], service.defaultPort);
+}
+
+function runtimePortByKey(portKey, env = process.env) {
+  const service = RUNTIME_SERVICES.find((candidate) => candidate.portKey === portKey);
+  return service ? runtimePort(service.name, env) : null;
+}
+
+function runtimePorts(env = process.env) {
+  const values = {};
+  for (const service of RUNTIME_SERVICES) {
+    values[service.portKey] = runtimePort(service.name, env);
+  }
+  return values;
+}
+
+function runtimePortsFromState(state) {
+  const statePorts = state?.ports || {};
+  const values = {};
+  for (const service of RUNTIME_SERVICES) {
+    if (service.stateKey === 'gateway' && parsePort(state?.gateway_port)) {
+      values[service.name] = parsePort(state.gateway_port);
+      continue;
+    }
+    const port = parsePort(statePorts[service.stateKey]);
+    if (port) values[service.name] = port;
+  }
+  return values;
+}
+
+function runtimePortsFromEnv(env = process.env) {
+  const values = {};
+  for (const service of RUNTIME_SERVICES) {
+    values[service.name] = runtimePort(service.name, env);
+  }
+  return values;
+}
+
+function runtimePortsForStatus(state, env = process.env) {
+  const fromState = runtimePortsFromState(state);
+  const fromEnv = runtimePortsFromEnv(env);
+  return RUNTIME_SERVICES
+    .map((service) => [service.name, fromState[service.name] || fromEnv[service.name]])
+    .filter(([, port]) => Number.isInteger(port) && port > 0);
+}
+
+function runtimePortsState(ports) {
+  const statePorts = {};
+  for (const service of RUNTIME_SERVICES) {
+    const port = parsePort(ports?.[service.portKey]);
+    if (!port) continue;
+    if (service.stateKey !== 'gateway') statePorts[service.stateKey] = port;
+  }
+  return {
+    gateway_port: parsePort(ports?.gateway) || undefined,
+    gateway_url: ports?.gateway ? `http://127.0.0.1:${ports.gateway}` : undefined,
+    ports: statePorts,
+    services: RUNTIME_SERVICES.map((service) => ({
+      name: service.name,
+      port: parsePort(ports?.[service.portKey]),
+      health_path: '/healthz',
+    })),
+  };
+}
+
+module.exports = {
+  parsePort,
+  runtimeLaunchServices,
+  runtimePort,
+  runtimePortByKey,
+  runtimePorts,
+  runtimePortsForStatus,
+  runtimePortsFromEnv,
+  runtimePortsFromState,
+  runtimePortsState,
+  runtimeServiceByName,
+  runtimeServiceNames,
+  runtimeServiceScripts,
+  runtimeServices,
+};

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

@@ -10,6 +10,7 @@ const path = require('path');
 const { spawn } = require('child_process');
 const { DEFAULT_CWD } = require('../config');
 const activeMemory = require('../../chat-core/tooling/active-memory');
+const { runtimePort } = require('../../../lib/runtime-manifest');
 const { syncArtifactRoutesToGateway } = require('./advertise');
 const {
   allocatePort,
@@ -88,8 +89,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}`,
+    AMALGM_CHAT_SERVER_URL: `http://127.0.0.1:${runtimePort('chat-server')}`,
+    AMALGM_MCP_URL: `http://127.0.0.1:${runtimePort('amalgm-mcp')}`,
   };
 }
 

package/runtime/scripts/amalgm-mcp/config.js

@@ -14,8 +14,9 @@ const {
   proxyBaseUrl,
   readProxyToken,
 } = require('../proxy-token-store');
+const { runtimePort } = require('../../lib/runtime-manifest');
 
-const PORT = parseInt(process.env.AMALGM_MCP_PORT || '8083', 10);
+const PORT = runtimePort('amalgm-mcp');
 const MCP_PROTOCOL_VERSION = '2024-11-05';
 
 const AMALGM_DIR = process.env.AMALGM_DIR || path.join(os.homedir(), '.amalgm');
@@ -46,7 +47,7 @@ function cleanString(value) {
 }
 
 // Chat server (local Next.js/Electron) — same process tree; no cloud hop.
-const CHAT_SERVER_URL = `http://localhost:${process.env.CHAT_SERVER_PORT || 8084}`;
+const CHAT_SERVER_URL = `http://localhost:${runtimePort('chat-server')}`;
 
 const SCHEDULER_INTERVAL_MS = 30_000;
 

package/runtime/scripts/amalgm-mcp/index.js

@@ -6,8 +6,8 @@
  * (default: ~/.amalgm/) — same pattern as scripts/credential-adapter.js.
  *
  * Ports:
- *   8083  this server
- *   8084  chat-server (we delegate task/event/agent runs here)
+ *   this server uses the amalgm-mcp runtime port
+ *   chat-server uses the chat-server runtime port for task/event/agent runs
  *
  * Modules:
  *   config.js                   env + paths

package/runtime/scripts/amalgm-mcp/lib/chat-runner.js

@@ -7,7 +7,7 @@
  *  - agents/talk.js        (talk_to_agent tool)
  *  - email/inbound.js      (email replies/new email → agent runs)
  *
- * POSTs to chat-server (:8084) and consumes the SSE stream, accumulating
+ * POSTs to chat-server and consumes the SSE stream, accumulating
  * text from agent_message_chunk events and returning the final output.
  */
 

package/runtime/scripts/chat-core/contract.js

@@ -5,6 +5,7 @@ const os = require('os');
 const path = require('path');
 const { AMALGM_DIR, DEFAULT_CWD, PROXY_BASE_URL, PROXY_TOKEN } = require('../chat-server/config');
 const { authEnvelope, coerceAuth, fingerprint } = require('./auth');
+const { runtimePort } = require('../../lib/runtime-manifest');
 
 function agentToHarness(agent) {
   const clean = String(agent || '').trim();
@@ -323,7 +324,7 @@ function createContract(payload, options = {}) {
   const fastMode = payload.fastMode === true;
   const cliModel = cliModelFor({ harness, modelId, cliModel: payload.cliModel, reasoningEffort });
   const cwd = resolveCwd(payload.cwd, options);
-  const localBaseUrl = options.localBaseUrl || `http://127.0.0.1:${options.port || process.env.CHAT_SERVER_PORT || 8084}`;
+  const localBaseUrl = options.localBaseUrl || `http://127.0.0.1:${options.port || runtimePort('chat-server')}`;
   const origin = normalizeOrigin({ ...payload, cwd });
   const auth = authEnvelope({
     harness,

package/runtime/scripts/chat-core/tooling/mcp-bundle.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { getRuntimeToken } = require('../../runtime-auth');
+const { runtimePort } = require('../../../lib/runtime-manifest');
 
 function headerArrayToRecord(headers) {
   const out = {};
@@ -49,12 +50,11 @@ function normalizeServer(server) {
 }
 
 function localBaseUrl(contract) {
-  return String(contract.localBaseUrl || `http://127.0.0.1:${process.env.CHAT_SERVER_PORT || 8084}`).replace(/\/$/, '');
+  return String(contract.localBaseUrl || `http://127.0.0.1:${runtimePort('chat-server')}`).replace(/\/$/, '');
 }
 
 function amalgmMcpServer(contract) {
-  const port = process.env.AMALGM_MCP_PORT || '8083';
-  const url = process.env.AMALGM_MCP_URL || `http://127.0.0.1:${port}/mcp`;
+  const url = process.env.AMALGM_MCP_URL || `http://127.0.0.1:${runtimePort('amalgm-mcp')}/mcp`;
   const headers = [
     { name: 'x-amalgm-runtime-token', value: getRuntimeToken() },
     { name: 'x-amalgm-session-id', value: contract.sessionId },

package/runtime/scripts/chat-server/config.js

@@ -14,6 +14,7 @@ const {
   proxyBaseUrl,
   readProxyToken,
 } = require('../proxy-token-store');
+const { runtimePort } = require('../../lib/runtime-manifest');
 
 // ── Paths ──────────────────────────────────────────────────────────────────
 // Set by the orchestrator (entrypoint.sh or electron/main.ts).
@@ -24,7 +25,7 @@ const DEFAULT_CWD = process.env.AMALGM_DEFAULT_CWD || '/workspace';
 
 // ── Server ──────────────────────────────────────────────────────────────────
 
-const PORT = parseInt(process.env.CHAT_SERVER_PORT || '8084', 10);
+const PORT = runtimePort('chat-server');
 const BIND_HOST = process.env.AMALGM_BIND_HOST || '0.0.0.0';
 
 // ── API keys / proxy ────────────────────────────────────────────────────────

package/runtime/scripts/local-gateway.js

@@ -22,6 +22,7 @@ const {
   isAuthorizedRuntimeRequest,
   runtimeAuthHeaders,
 } = require('./runtime-auth');
+const { runtimePort } = require('../lib/runtime-manifest');
 
 function loadPty() {
   const candidates = [
@@ -51,7 +52,7 @@ const BIND_HOST = process.env.AMALGM_BIND_HOST || '127.0.0.1';
 const OWNER = process.env.AMALGM_RUNTIME_SOURCE || 'local';
 const VERSION = process.env.npm_package_version || process.env.AMALGM_RUNTIME_VERSION || '';
 const DEFAULT_CWD = process.env.AMALGM_DEFAULT_CWD || os.homedir();
-const PORT = Number.parseInt(process.env.AMALGM_GATEWAY_PORT || '28781', 10);
+const PORT = runtimePort('local-gateway');
 const RUNTIME_TOKEN_HEADER = 'x-amalgm-runtime-token';
 const DEFAULT_DIAGNOSTIC_LOG_TAIL_BYTES = 256 * 1024;
 const MAX_DIAGNOSTIC_LOG_TAIL_BYTES = 2 * 1024 * 1024;
@@ -61,7 +62,6 @@ const DIAGNOSTIC_LOG_FILES = Object.freeze({
   'chat-server': 'chat-server.log',
   'local-gateway': 'local-gateway.log',
   'amalgm-mcp': 'amalgm-mcp.log',
-  'fs-watcher': 'fs-watcher.log',
   'port-monitor': 'port-monitor.log',
 });
 
@@ -77,10 +77,9 @@ const DIAGNOSTIC_LOG_ALIASES = Object.freeze({
 
 const SERVICE_PORTS = {
   gateway: PORT,
-  portMonitor: Number.parseInt(process.env.PORT_MONITOR_PORT || '8081', 10),
-  fsWatcher: Number.parseInt(process.env.FS_WATCHER_PORT || '8082', 10),
-  mcp: Number.parseInt(process.env.AMALGM_MCP_PORT || '8083', 10),
-  chat: Number.parseInt(process.env.CHAT_SERVER_PORT || '8084', 10),
+  portMonitor: runtimePort('port-monitor'),
+  mcp: runtimePort('amalgm-mcp'),
+  chat: runtimePort('chat-server'),
 };
 const LOCAL_AGENT_APP_PORT = Number.parseInt(process.env.AMALGM_LOCAL_APP_PORT || '3456', 10);
 
@@ -275,6 +274,14 @@ function readJson(file, fallback = null) {
   }
 }
 
+function runtimeStateOwnedHere(previous) {
+  if (!previous || typeof previous !== 'object' || Object.keys(previous).length === 0) return true;
+  return previous.pid === process.pid
+    || previous.gateway_pid === process.pid
+    || previous.pid === process.ppid
+    || previous.supervisor_pid === process.ppid;
+}
+
 function ensurePtySpawnHelperExecutable() {
   try {
     const nodePtyRoot = path.dirname(require.resolve(`${pty.packageName}/package.json`));
@@ -294,6 +301,10 @@ function ensurePtySpawnHelperExecutable() {
 function writeRuntimeState(actualPort) {
   const computer = readJson(path.join(AMALGM_DIR, 'computer.json'), null);
   const previous = readJson(STATE_FILE, {});
+  if (!runtimeStateOwnedHere(previous)) {
+    console.warn('[local-gateway] runtime-state belongs to another Amalgm runtime; skipping write');
+    return;
+  }
   writeJsonSecret(STATE_FILE, {
     ...previous,
     schema_version: 1,
@@ -312,7 +323,6 @@ function writeRuntimeState(actualPort) {
     ports: {
       gateway: actualPort,
       port_monitor: SERVICE_PORTS.portMonitor,
-      fs_watcher: SERVICE_PORTS.fsWatcher,
       amalgm_mcp: SERVICE_PORTS.mcp,
       chat_server: SERVICE_PORTS.chat,
     },
@@ -550,12 +560,6 @@ function serviceForPath(pathname) {
   if (MCP_PREFIXES.some((prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`))) {
     return { port: SERVICE_PORTS.mcp, stripPrefix: '' };
   }
-  if (pathname === '/fs-watcher' || pathname.startsWith('/fs-watcher/')) {
-    return {
-      port: SERVICE_PORTS.fsWatcher,
-      stripPrefix: '/fs-watcher',
-    };
-  }
   if (PORT_MONITOR_PREFIXES.some((prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`))) {
     return {
       port: SERVICE_PORTS.portMonitor,
@@ -971,10 +975,6 @@ server.on('upgrade', (req, socket, head) => {
       bridgePtyWebSocket(req, ws, url.pathname);
       return;
     }
-    if (url.pathname === '/ws/fs' || url.pathname === '/fs-watcher/ws') {
-      proxyWebSocket(req, ws, { port: SERVICE_PORTS.fsWatcher, stripPrefix: '' }, '/');
-      return;
-    }
     const target = serviceForPath(url.pathname);
     if (!target) {
       ws.close(1008, 'Unknown local gateway route');