amalgm 0.1.65 → 0.1.67

package/package.json

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

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

@@ -72,7 +72,7 @@ function sanitizeRunModelSettings(settings, harness) {
         : new Set();
   return {
     ...(effort && allowedEfforts.has(effort) ? { effort } : {}),
-    ...(harness === 'claude_code' && settings.fastMode === true ? { fastMode: true } : {}),
+    ...((harness === 'claude_code' || harness === 'codex') && settings.fastMode === true ? { fastMode: true } : {}),
   };
 }
 

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

@@ -173,6 +173,10 @@ function modelWindowConfigLines(contract) {
   ];
 }
 
+function serviceTierForContract(contract) {
+  return contract.fastMode ? 'fast' : null;
+}
+
 function isCompactCommand(text) {
   return String(text || '').trim().toLowerCase() === '/compact';
 }
@@ -378,6 +382,7 @@ class CodexAdapter {
       approvalPolicy: 'never',
       sandbox: 'danger-full-access',
       modelProvider: contract.authMethod === 'amalgm' ? 'amalgm' : 'openai',
+      serviceTier: serviceTierForContract(contract),
       developerInstructions: composeSystemPrompt(contract) || null,
       persistExtendedHistory: true,
     };
@@ -460,6 +465,7 @@ class CodexAdapter {
           cwd: contract.cwd,
           model: contract.cliModel.replace(/\/(?:low|medium|high|xhigh)$/i, ''),
           effort: contract.reasoningEffort || undefined,
+          serviceTier: serviceTierForContract(contract),
           approvalPolicy: 'never',
         });
     startRequest.then((result) => {
@@ -504,6 +510,7 @@ module.exports = {
     modelWindowConfigLines,
     removeTomlSections,
     removeTopLevelKeys,
+    serviceTierForContract,
     writeConfig,
   },
 };

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

@@ -126,11 +126,6 @@ function runtimeHome({ amalgmDir, harness, authProfileId }) {
   return path.join(amalgmDir, 'cli-homes', safePathSegment(harness), safePathSegment(authProfileId));
 }
 
-function nativeProviderHome(harness) {
-  if (harness === 'claude_code') return os.homedir();
-  return null;
-}
-
 function pinnedRuntimeHome(amalgmDir, cliHomePath) {
   if (typeof cliHomePath !== 'string' || !cliHomePath.trim()) return null;
   const root = path.resolve(amalgmDir);
@@ -183,8 +178,7 @@ function authEnvelope({ harness, authMethod, sessionId, localBaseUrl, proxyToken
     tokenFingerprint,
     authProfileId: profileId,
     runtimeHome:
-      nativeProviderHome(method === 'provider_auth' ? harness : null)
-      || pinnedRuntimeHome(amalgmDir, cliHomePath)
+      pinnedRuntimeHome(amalgmDir, cliHomePath)
       || runtimeHome({ amalgmDir, harness, authProfileId: profileId }),
   };
 }
@@ -202,15 +196,6 @@ function runtimeEnv(contract, baseEnv = process.env) {
   for (const key of ['OPENAI_API_KEY', 'OPENAI_BASE_URL', 'ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'AI_GATEWAY_API_KEY', 'AI_GATEWAY_BASE_URL']) {
     delete env[key];
   }
-  if (contract.harness === 'claude_code' && contract.authMethod === 'provider_auth') {
-    env.HOME = os.homedir();
-    delete env.CLAUDE_CONFIG_DIR;
-    return {
-      ...env,
-      IS_SANDBOX: '1',
-      ...(baseEnv.AMALGM_RUNTIME_TOKEN ? { AMALGM_RUNTIME_TOKEN: baseEnv.AMALGM_RUNTIME_TOKEN } : {}),
-    };
-  }
   if (contract.auth.runtimeHome) {
     fs.mkdirSync(contract.auth.runtimeHome, { recursive: true });
     env.HOME = contract.auth.runtimeHome;

package/runtime/scripts/chat-core/tests/auth.test.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const assert = require('node:assert/strict');
-const os = require('node:os');
 const test = require('node:test');
 const { authEnvelope, runtimeEnv } = require('../auth');
 
@@ -63,7 +62,7 @@ test('opencode amalgm auth uses a pinned CLI home across sessions and proxy toke
   assert.equal(env.OPENCODE_CONFIG_DIR, first.runtimeHome);
 });
 
-test('claude provider auth uses the native user home with CLAUDE_CONFIG_DIR unset', () => {
+test('claude provider auth uses a pinned CLI home with native config copied separately', () => {
   const envelope = authEnvelope({
     harness: 'claude_code',
     authMethod: 'provider_auth',
@@ -71,7 +70,7 @@ test('claude provider auth uses the native user home with CLAUDE_CONFIG_DIR unse
     amalgmDir: '/tmp/amalgm-test',
   });
 
-  assert.equal(envelope.runtimeHome, os.homedir());
+  assert.match(envelope.runtimeHome, /\/tmp\/amalgm-test\/cli-homes\/claude_code\/provider-[0-9a-f]{16}$/);
 
   const env = runtimeEnv({
     harness: 'claude_code',
@@ -84,8 +83,8 @@ test('claude provider auth uses the native user home with CLAUDE_CONFIG_DIR unse
     ANTHROPIC_API_KEY: 'should-not-leak',
   });
 
-  assert.equal(env.HOME, os.homedir());
-  assert.equal(env.CLAUDE_CONFIG_DIR, undefined);
+  assert.equal(env.HOME, envelope.runtimeHome);
+  assert.equal(env.CLAUDE_CONFIG_DIR, envelope.runtimeHome);
   assert.equal(env.ANTHROPIC_API_KEY, undefined);
 });
 

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

@@ -30,7 +30,7 @@ function withNativeHome(fn) {
   }
 }
 
-test('codex native sync copies hook support without bulk runtime state', () => {
+test('codex native sync copies config without deleting existing runtime state', () => {
   withNativeHome((home) => {
     const source = path.join(home, '.codex');
     fs.mkdirSync(path.join(source, 'sessions'), { recursive: true });
@@ -58,7 +58,8 @@ test('codex native sync copies hook support without bulk runtime state', () => {
     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);
-    assert.equal(fs.existsSync(path.join(runtimeHome, 'sessions')), false);
+    assert.equal(fs.existsSync(path.join(runtimeHome, 'sessions', 'legacy.jsonl')), true);
+    assert.equal(fs.existsSync(path.join(runtimeHome, 'sessions', 'huge.jsonl')), false);
     assert.equal(fs.existsSync(path.join(runtimeHome, 'worktrees')), false);
     assert.equal(fs.existsSync(path.join(runtimeHome, 'plugins')), false);
     assert.equal(fs.existsSync(path.join(runtimeHome, '.codex', 'hooks.json')), true);

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

@@ -124,14 +124,6 @@ function nativeHome() {
   return process.env.AMALGM_NATIVE_HOME || os.homedir();
 }
 
-function pruneLegacyCodexRuntimeHome(runtimeHome) {
-  for (const name of EXCLUDED_DIR_NAMES) {
-    try {
-      fs.rmSync(path.join(runtimeHome, name), { recursive: true, force: true });
-    } catch {}
-  }
-}
-
 function copyDirBounded(sourceDir, targetDir, options = {}) {
   if (!sourceDir || !targetDir || !exists(sourceDir)) return { copied: false, files: 0, bytes: 0, truncated: false };
   const maxFiles = Number(options.maxFiles || 200);
@@ -178,7 +170,6 @@ function syncCodexNativeConfig(runtimeHome) {
   fs.mkdirSync(runtimeHome, { recursive: true });
   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')),