amalgm 0.1.44 → 0.1.47

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.47",
   "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/agents/hooks.js

@@ -0,0 +1,182 @@
+'use strict';
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const PHASE_BY_NATIVE_EVENT = {
+  UserPromptSubmit: 'userSubmit',
+  UserSubmit: 'userSubmit',
+  userSubmit: 'userSubmit',
+  Stop: 'responseComplete',
+  ResponseComplete: 'responseComplete',
+  responseComplete: 'responseComplete',
+};
+
+function readJson(filePath) {
+  try {
+    return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function compactCommand(command) {
+  const trimmed = String(command || '').trim();
+  if (!trimmed) return '';
+  const home = os.homedir();
+  return home ? trimmed.replaceAll(home, '~') : trimmed;
+}
+
+function commandLabel(command) {
+  const compact = compactCommand(command);
+  if (!compact) return 'Hook';
+  const parts = compact.split(/\s+/);
+  const script = parts.find((part) => /[./][^ ]+\.(?:js|mjs|cjs|sh|py|ts)$/i.test(part));
+  return script ? path.basename(script) : compact;
+}
+
+function appendHook(acc, sourcePath, harnessId, event, command, matcher, options = {}) {
+  const cleanCommand = String(command || '').trim();
+  if (!cleanCommand) return;
+  const phase = PHASE_BY_NATIVE_EVENT[event] || event;
+  const timeout = Number(options.timeout);
+  acc.push({
+    id: `${harnessId}:${sourcePath}:${event}:${acc.length}`,
+    harnessId,
+    source: 'native',
+    sourcePath,
+    event,
+    phase,
+    type: typeof options.type === 'string' && options.type.trim() ? options.type.trim() : 'command',
+    command: cleanCommand,
+    label: commandLabel(cleanCommand),
+    matcher: typeof matcher === 'string' ? matcher : '',
+    ...(Number.isFinite(timeout) ? { timeout } : {}),
+    ...(typeof options.statusMessage === 'string' && options.statusMessage.trim()
+      ? { statusMessage: options.statusMessage.trim() }
+      : {}),
+    enabled: true,
+  });
+}
+
+function isHookEventName(event) {
+  const clean = String(event || '').trim();
+  return Boolean(
+    PHASE_BY_NATIVE_EVENT[clean]
+    || /(?:prompt|submit|response|complete|stop|hook)/i.test(clean),
+  );
+}
+
+function hasCommandShape(value) {
+  return !!value
+    && typeof value === 'object'
+    && !Array.isArray(value)
+    && (
+      typeof value.command === 'string'
+      || typeof value.event === 'string'
+      || Array.isArray(value.hooks)
+    );
+}
+
+function extractCommands(value, context, acc) {
+  if (typeof value === 'string') {
+    if (!isHookEventName(context.event)) return;
+    appendHook(acc, context.sourcePath, context.harnessId, context.event, value, context.matcher);
+    return;
+  }
+
+  if (Array.isArray(value)) {
+    for (const item of value) extractCommands(item, context, acc);
+    return;
+  }
+
+  if (!value || typeof value !== 'object') return;
+
+  const matcher = typeof value.matcher === 'string' ? value.matcher : context.matcher;
+  const event = typeof value.event === 'string' ? value.event : context.event;
+  if (typeof value.command === 'string') {
+    appendHook(acc, context.sourcePath, context.harnessId, event, value.command, matcher, value);
+  }
+  if (Array.isArray(value.hooks)) {
+    for (const hook of value.hooks) extractCommands(hook, { ...context, event, matcher }, acc);
+  }
+}
+
+function hooksFromObject(rawHooks, context) {
+  const hooks = [];
+  if (Array.isArray(rawHooks)) {
+    extractCommands(rawHooks, context, hooks);
+    return hooks;
+  }
+  if (!rawHooks || typeof rawHooks !== 'object') return hooks;
+
+  if (Array.isArray(rawHooks.hooks)) {
+    extractCommands(rawHooks.hooks, context, hooks);
+  } else if (rawHooks.hooks && typeof rawHooks.hooks === 'object') {
+    hooks.push(...hooksFromObject(rawHooks.hooks, context));
+  }
+
+  for (const [event, value] of Object.entries(rawHooks)) {
+    if (event === 'hooks') continue;
+    if (!isHookEventName(event) && !hasCommandShape(value) && !Array.isArray(value)) continue;
+    extractCommands(value, { ...context, event }, hooks);
+  }
+  return hooks;
+}
+
+function collectCodexHooks(homeDir) {
+  const sourcePath = path.join(homeDir, '.codex', 'hooks.json');
+  const data = readJson(sourcePath);
+  const hooks = hooksFromObject(data?.hooks ?? data, {
+    harnessId: 'codex',
+    sourcePath,
+    event: '',
+    matcher: '',
+  });
+  return {
+    harnessId: 'codex',
+    sources: fs.existsSync(sourcePath) ? [sourcePath] : [],
+    hooks,
+  };
+}
+
+function collectClaudeHooks(homeDir) {
+  const sourcePaths = [
+    path.join(homeDir, '.claude', 'settings.json'),
+    path.join(homeDir, '.claude', 'settings.local.json'),
+    path.join(homeDir, '.claude.json'),
+  ];
+  const hooks = [];
+  const sources = [];
+
+  for (const sourcePath of sourcePaths) {
+    const data = readJson(sourcePath);
+    if (!data) continue;
+    sources.push(sourcePath);
+    hooks.push(...hooksFromObject(data.hooks, {
+      harnessId: 'claude_code',
+      sourcePath,
+      event: '',
+      matcher: '',
+    }));
+  }
+
+  return {
+    harnessId: 'claude_code',
+    sources,
+    hooks,
+  };
+}
+
+function collectNativeHooks() {
+  const homeDir = os.homedir();
+  return {
+    codex: collectCodexHooks(homeDir),
+    claude_code: collectClaudeHooks(homeDir),
+  };
+}
+
+module.exports = {
+  collectNativeHooks,
+};

package/runtime/scripts/amalgm-mcp/agents/rest.js

@@ -9,6 +9,7 @@ const {
   resolveAgent,
   updateAgent,
 } = require('./store');
+const { hydrateModelPreferences } = require('../lib/prefs');
 const credentialAdapter = require('../../credential-adapter');
 
 function coerceAuthMethodForHarness(harnessId, authMethod) {
@@ -50,6 +51,7 @@ function normalizeToolConfig(tools, legacyMcp) {
 }
 
 async function handleList(sendJson) {
+  await hydrateModelPreferences();
   sendJson(200, { agents: getAllAgentsWithBuiltins() });
 }
 
@@ -112,8 +114,11 @@ async function handleUpdate(body, sendJson) {
   const existing = resolveAgent(agent_id);
   if (!existing) return sendJson(404, { error: `Agent not found: ${agent_id}` });
 
+  const targetHarnessId = updates.baseHarnessId || existing.baseHarnessId;
   if (updates.authMethod !== undefined) {
-    updates.authMethod = coerceAuthMethodForHarness(existing.baseHarnessId, updates.authMethod);
+    updates.authMethod = coerceAuthMethodForHarness(targetHarnessId, updates.authMethod);
+  } else if (updates.baseHarnessId !== undefined) {
+    updates.authMethod = coerceAuthMethodForHarness(targetHarnessId, existing.authMethod);
   }
 
   let agent;