amalgm 0.1.61 → 0.1.63

package/lib/tunnel-events.js

@@ -231,6 +231,7 @@ function createEventTunnel({ record, foreground = false }) {
   let connectStartedAt = 0;
   let lastGatewayFrameAt = 0;
   const upstreamSockets = new Map();
+  const upstreamStreams = new Map();
 
   function log(message) {
     const line = `[event-tunnel] ${message}`;
@@ -386,6 +387,71 @@ function createEventTunnel({ record, foreground = false }) {
     req.end(body);
   }
 
+  function forwardStream(frame) {
+    const targetPort = resolveTargetPort(frame);
+    if (!targetPort) {
+      send({
+        type: 'stream_res_error',
+        req_id: frame.req_id,
+        status: 403,
+        message: 'Target port is not allowed',
+      });
+      return;
+    }
+    const body = frame.body_b64 ? Buffer.from(frame.body_b64, 'base64') : Buffer.alloc(0);
+    const req = http.request(
+      {
+        hostname: '127.0.0.1',
+        port: targetPort,
+        method: frame.method || 'GET',
+        path: frame.path || '/',
+        headers: localHeaders(frame.headers),
+      },
+      (res) => {
+        send({
+          type: 'stream_res_start',
+          req_id: frame.req_id,
+          status: res.statusCode || 200,
+          headers: responseHeaders(res.headers),
+        });
+        res.on('data', (chunk) => {
+          send({
+            type: 'stream_res_data',
+            req_id: frame.req_id,
+            chunk_b64: Buffer.from(chunk).toString('base64'),
+          });
+        });
+        res.on('end', () => {
+          upstreamStreams.delete(frame.req_id);
+          send({ type: 'stream_res_end', req_id: frame.req_id });
+        });
+      },
+    );
+
+    upstreamStreams.set(frame.req_id, req);
+
+    req.on('error', (error) => {
+      if (!upstreamStreams.has(frame.req_id)) return;
+      upstreamStreams.delete(frame.req_id);
+      send({
+        type: 'stream_res_error',
+        req_id: frame.req_id,
+        status: 502,
+        message: error.message || 'Local stream request failed',
+      });
+    });
+
+    if (body.length > 0) req.write(body);
+    req.end();
+  }
+
+  function cancelStream(frame) {
+    const req = upstreamStreams.get(frame.req_id);
+    if (!req) return;
+    upstreamStreams.delete(frame.req_id);
+    req.destroy(new Error('stream canceled'));
+  }
+
   function openPreviewSocket(frame) {
     const targetPort = resolveTargetPort(frame);
     if (!targetPort) {
@@ -436,6 +502,14 @@ function createEventTunnel({ record, foreground = false }) {
       handleRequest(frame);
       return;
     }
+    if (frame.type === 'stream_req') {
+      forwardStream(frame);
+      return;
+    }
+    if (frame.type === 'stream_cancel') {
+      cancelStream(frame);
+      return;
+    }
     if (frame.type === 'ws_open') {
       openPreviewSocket(frame);
       return;
@@ -518,6 +592,14 @@ function createEventTunnel({ record, foreground = false }) {
         }
       }
       upstreamSockets.clear();
+      for (const stream of upstreamStreams.values()) {
+        try {
+          stream.destroy(new Error('event tunnel stopped'));
+        } catch {
+          // noop
+        }
+      }
+      upstreamStreams.clear();
       void postPresence(record, false);
       if (ws) {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.61",
+  "version": "0.1.63",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,

package/runtime/scripts/chat-core/adapters/codex.js

@@ -338,12 +338,16 @@ function buildCodexConfig(contract, existingConfig, syncInfo) {
   ].filter(Boolean).join('\n\n') + '\n';
 }
 
+function baseNativeConfigForContract(contract, syncInfo) {
+  return readTextFile(syncInfo?.sourceConfigPath);
+}
+
 function writeConfig(contract) {
   const home = contract.auth.runtimeHome;
   if (!home) return;
   fs.mkdirSync(home, { recursive: true });
   const syncInfo = syncCodexNativeConfig(home);
-  const nativeHookTrust = hookTrustToml(readTextFile(syncInfo?.sourceConfigPath));
+  const nativeConfig = baseNativeConfigForContract(contract, syncInfo);
   const configPath = path.join(home, 'config.toml');
   if (contract.authMethod === 'provider_auth') {
     const sourceAuth = path.join(syncInfo?.sourceDir || path.join(os.homedir(), '.codex'), 'auth.json');
@@ -352,10 +356,10 @@ function writeConfig(contract) {
       fs.copyFileSync(sourceAuth, targetAuth);
       fs.chmodSync(targetAuth, 0o600);
     }
-    fs.writeFileSync(configPath, buildCodexConfig(contract, nativeHookTrust, syncInfo), { mode: 0o600 });
+    fs.writeFileSync(configPath, buildCodexConfig(contract, nativeConfig, syncInfo), { mode: 0o600 });
     return;
   }
-  fs.writeFileSync(configPath, buildCodexConfig(contract, nativeHookTrust, syncInfo), { mode: 0o600 });
+  fs.writeFileSync(configPath, buildCodexConfig(contract, nativeConfig, syncInfo), { mode: 0o600 });
   fs.writeFileSync(path.join(home, 'auth.json'), JSON.stringify({
     auth_mode: 'apikey',
     OPENAI_API_KEY: contract.auth.tokenRef,

package/runtime/scripts/chat-core/tests/native-config.test.js

@@ -37,6 +37,8 @@ test('codex native sync copies hook support without bulk runtime state', () => {
     fs.mkdirSync(path.join(source, 'worktrees'), { recursive: true });
     fs.mkdirSync(path.join(source, 'plugins'), { recursive: true });
     fs.mkdirSync(path.join(source, 'supermemory'), { recursive: true });
+    fs.writeFileSync(path.join(source, 'config.toml'), 'model = "gpt-5.5"');
+    fs.writeFileSync(path.join(source, 'preferences.json'), '{"theme":"dark"}');
     fs.writeFileSync(path.join(source, 'hooks.json'), '{"hooks":{}}');
     fs.writeFileSync(path.join(source, 'supermemory.json'), '{"projectContainerTag":"test"}');
     fs.writeFileSync(path.join(source, 'supermemory', 'recall.js'), 'console.log("recall")');
@@ -51,6 +53,8 @@ test('codex native sync copies hook support without bulk runtime state', () => {
     const result = syncCodexNativeConfig(runtimeHome);
 
     assert.equal(result.sourceDir, source);
+    assert.equal(fs.existsSync(path.join(runtimeHome, 'config.toml')), true);
+    assert.equal(fs.existsSync(path.join(runtimeHome, 'preferences.json')), true);
     assert.equal(fs.existsSync(path.join(runtimeHome, 'hooks.json')), true);
     assert.equal(fs.existsSync(path.join(runtimeHome, 'supermemory.json')), true);
     assert.equal(fs.existsSync(path.join(runtimeHome, 'supermemory', 'recall.js')), true);
@@ -61,7 +65,7 @@ test('codex native sync copies hook support without bulk runtime state', () => {
   });
 });
 
-test('codex provider config keeps hooks but drops native model and mcp config', () => {
+test('codex provider config keeps native mcp config and overrides managed model provider', () => {
   withNativeHome((home) => {
     const source = path.join(home, '.codex');
     fs.mkdirSync(source, { recursive: true });
@@ -72,7 +76,10 @@ test('codex provider config keeps hooks but drops native model and mcp config',
       'model_provider = "native-provider"',
       '',
       '[mcp_servers.native]',
-      'command = "native-mcp"',
+      'url = "https://example.com/mcp"',
+      '',
+      '[mcp_servers.native.http_headers]',
+      'Authorization = "Bearer test"',
       '',
       `[hooks.state.${JSON.stringify(`${hooksPath}:UserPromptSubmit:0`)}]`,
       'trusted = true',
@@ -90,7 +97,47 @@ test('codex provider config keeps hooks but drops native model and mcp config',
     assert.match(config, /model_provider = "openai"/);
     assert.match(config, /codex_hooks = true/);
     assert.doesNotMatch(config, /native-provider/);
-    assert.doesNotMatch(config, /mcp_servers\.native/);
+    assert.match(config, /\[mcp_servers\.native\]/);
+    assert.match(config, /\[mcp_servers\.native\.http_headers\]/);
+    assert.match(config, /Authorization = "Bearer test"/);
+    assert.equal(config.includes(path.join(runtimeHome, 'hooks.json')), true);
+  });
+});
+
+test('codex amalgm config keeps native mcp config and overrides managed model provider', () => {
+  withNativeHome((home) => {
+    const source = path.join(home, '.codex');
+    fs.mkdirSync(source, { recursive: true });
+    const hooksPath = path.join(source, 'hooks.json');
+    fs.writeFileSync(hooksPath, '{"hooks":{"UserPromptSubmit":[]}}');
+    fs.writeFileSync(path.join(source, 'config.toml'), [
+      'model_provider = "native-provider"',
+      '',
+      '[mcp_servers.native]',
+      'url = "https://example.com/mcp"',
+      '',
+      '[mcp_servers.native.http_headers]',
+      'Authorization = "Bearer test"',
+      '',
+      `[hooks.state.${JSON.stringify(`${hooksPath}:UserPromptSubmit:0`)}]`,
+      'trusted = true',
+      '',
+    ].join('\n'));
+
+    const runtimeHome = path.join(home, 'runtime-home');
+    codexPrivate.writeConfig({
+      authMethod: 'amalgm',
+      auth: { runtimeHome, baseUrl: 'https://amalgm.example/v1', tokenRef: 'test-token' },
+      mcpServers: [],
+    });
+
+    const config = fs.readFileSync(path.join(runtimeHome, 'config.toml'), 'utf8');
+    assert.match(config, /model_provider = "amalgm"/);
+    assert.match(config, /codex_hooks = true/);
+    assert.doesNotMatch(config, /native-provider/);
+    assert.match(config, /\[mcp_servers\.native\]/);
+    assert.match(config, /\[mcp_servers\.native\.http_headers\]/);
+    assert.match(config, /Authorization = "Bearer test"/);
     assert.equal(config.includes(path.join(runtimeHome, 'hooks.json')), true);
   });
 });

package/runtime/scripts/chat-core/tooling/native-config.js

@@ -179,7 +179,10 @@ function syncCodexNativeConfig(runtimeHome) {
   if (!exists(sourceDir)) return null;
 
   pruneLegacyCodexRuntimeHome(runtimeHome);
+  const nativeConfig = copyDirBounded(sourceDir, runtimeHome);
   const copiedFiles = [
+    copyFileIfPresent(path.join(sourceDir, 'config.toml'), path.join(runtimeHome, 'config.toml')),
+    copyFileIfPresent(path.join(sourceDir, 'auth.json'), path.join(runtimeHome, 'auth.json')),
     copyFileIfPresent(path.join(sourceDir, 'hooks.json'), path.join(runtimeHome, 'hooks.json')),
     copyFileIfPresent(path.join(sourceDir, 'supermemory.json'), path.join(runtimeHome, 'supermemory.json')),
   ].filter(Boolean).length;
@@ -191,8 +194,8 @@ function syncCodexNativeConfig(runtimeHome) {
     sourceDir,
     runtimeHome,
     sourceConfigPath: path.join(sourceDir, 'config.toml'),
-    copied: copiedFiles + (supermemory.copied ? 1 : 0) > 0,
-    truncated: supermemory.truncated,
+    copied: nativeConfig.copied || copiedFiles + (supermemory.copied ? 1 : 0) > 0,
+    truncated: nativeConfig.truncated || supermemory.truncated,
   };
 }