amalgm 0.1.83 → 0.1.84

package/package.json

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

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

@@ -3,8 +3,8 @@
 const crypto = require('crypto');
 
 const CONFIG_VERSION = 1;
-const DEFAULT_RUNTIME_HOME_LAYOUT = 'legacy';
 const PER_AGENT_RUNTIME_HOME_LAYOUT = 'per-agent';
+const DEFAULT_RUNTIME_HOME_LAYOUT = PER_AGENT_RUNTIME_HOME_LAYOUT;
 const {
   normalizeLoadout,
   uniqueStrings,

package/runtime/scripts/amalgm-mcp/tests/agents-source-of-truth.test.js

@@ -17,6 +17,8 @@ const {
   resolveAgent,
   updateAgent,
 } = require('../agents/store');
+const agentsRest = require('../agents/rest');
+const { getAgentConfig } = require('../agent-config/store');
 
 test.after(() => {
   closeLocalDb();
@@ -78,3 +80,43 @@ test('custom agent auth and model settings survive normalization', () => {
   assert.deepEqual(agent.loadout, { toolIds: ['tool.search'] });
   assert.equal(Object.prototype.hasOwnProperty.call(agent, 'tools'), false);
 });
+
+function captureSendJson() {
+  const response = {};
+  return {
+    response,
+    sendJson(status, payload) {
+      response.status = status;
+      response.payload = payload;
+    },
+  };
+}
+
+test('agents create REST preserves caller id and creates per-agent config', async () => {
+  const agentId = 'custom-first-class-ui-agent';
+  const { response, sendJson } = captureSendJson();
+
+  await agentsRest.handleCreate({
+    id: agentId,
+    name: 'First Class UI Agent',
+    baseHarnessId: 'codex',
+    baseModelId: 'openai/gpt-5.5',
+    authMethod: 'amalgm',
+    config: {
+      version: 1,
+      agentId,
+      instructions: 'Use the per-agent home.',
+      skills: [],
+      loadout: { toolIds: [] },
+      hooks: [],
+      subagents: [],
+    },
+  }, sendJson);
+
+  assert.equal(response.status, 200);
+  assert.equal(response.payload.agent.id, agentId);
+  assert.equal(resolveAgent(agentId).id, agentId);
+  assert.equal(response.payload.agent.config.agentId, agentId);
+  assert.equal(response.payload.agent.config.runtimeHomeLayout, 'per-agent');
+  assert.equal(getAgentConfig(agentId).runtimeHomeLayout, 'per-agent');
+});

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

@@ -111,15 +111,13 @@ function providerAuthIdentity(harness) {
 
 function runtimeHome({ amalgmDir, harness, agentConfigId, runtimeHomeLayout }) {
   const harnessHome = path.join(amalgmDir, 'cli-homes', safePathSegment(harness));
-  if (runtimeHomeLayout === 'per-agent') {
-    return path.join(
-      harnessHome,
-      'agents',
-      safePathSegment(agentConfigId || harness),
-      'home',
-    );
-  }
-  return path.join(harnessHome, 'home');
+  if (runtimeHomeLayout === 'legacy') return path.join(harnessHome, 'home');
+  return path.join(
+    harnessHome,
+    'agents',
+    safePathSegment(agentConfigId || harness),
+    'home',
+  );
 }
 
 function providerAuthFingerprint(harness) {

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

@@ -410,7 +410,7 @@ function createContract(payload, options = {}) {
     || payloadChatAgent?.customAgentId,
   ) || harness;
   const agentConfig = normalizeAgentConfig(payload.agentConfig || { agentId: agentConfigId });
-  const runtimeHomeLayout = agentConfig.runtimeHomeLayout === 'per-agent' ? 'per-agent' : 'legacy';
+  const runtimeHomeLayout = 'per-agent';
   const auth = authEnvelope({
     harness,
     authMethod,

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

@@ -7,10 +7,11 @@ const path = require('node:path');
 const test = require('node:test');
 const { authEnvelope, runtimeEnv } = require('../auth');
 
-test('codex keeps legacy CLI home unless per-agent layout is explicit', () => {
+test('codex uses one stable per-agent CLI home across auth methods', () => {
   const amalgmDir = fs.mkdtempSync(path.join(os.tmpdir(), 'amalgm-auth-test-'));
   fs.writeFileSync(path.join(amalgmDir, '.amalgm-credentials'), 'OPENAI_API_KEY=sk-test\n');
   try {
+    const agentConfigId = 'debugging-agent';
     const first = authEnvelope({
       harness: 'codex',
       authMethod: 'amalgm',
@@ -20,6 +21,7 @@ test('codex keeps legacy CLI home unless per-agent layout is explicit', () => {
       proxyBaseUrl: 'https://proxy.example.test',
       amalgmDir,
       userId: 'user-123',
+      agentConfigId,
     });
     const second = authEnvelope({
       harness: 'codex',
@@ -30,6 +32,7 @@ test('codex keeps legacy CLI home unless per-agent layout is explicit', () => {
       proxyBaseUrl: 'https://proxy.example.test',
       amalgmDir,
       userId: 'user-123',
+      agentConfigId,
     });
     const third = authEnvelope({
       harness: 'codex',
@@ -37,6 +40,7 @@ test('codex keeps legacy CLI home unless per-agent layout is explicit', () => {
       sessionId: 'session-three',
       amalgmDir,
       userId: 'user-123',
+      agentConfigId,
     });
     const otherAgent = authEnvelope({
       harness: 'codex',
@@ -49,31 +53,18 @@ test('codex keeps legacy CLI home unless per-agent layout is explicit', () => {
       userId: 'user-123',
       agentConfigId: 'agent-two',
     });
-    const perAgent = authEnvelope({
-      harness: 'codex',
-      authMethod: 'provider_auth',
-      sessionId: 'session-five',
-      proxyToken: 'proxy-token-three',
-      localBaseUrl: 'http://127.0.0.1:8084',
-      proxyBaseUrl: 'https://proxy.example.test',
-      amalgmDir,
-      userId: 'user-123',
-      agentConfigId: 'agent-two',
-      runtimeHomeLayout: 'per-agent',
-    });
     assert.notEqual(first.tokenFingerprint, second.tokenFingerprint);
     assert.equal(first.runtimeHome, second.runtimeHome);
     assert.equal(second.runtimeHome, third.runtimeHome);
-    assert.equal(first.runtimeHome, path.join(amalgmDir, 'cli-homes', 'codex', 'home'));
-    assert.equal(otherAgent.runtimeHome, first.runtimeHome);
-    assert.equal(perAgent.runtimeHome, path.join(amalgmDir, 'cli-homes', 'codex', 'agents', 'agent-two', 'home'));
-    assert.notEqual(first.runtimeHome, perAgent.runtimeHome);
+    assert.equal(first.runtimeHome, path.join(amalgmDir, 'cli-homes', 'codex', 'agents', agentConfigId, 'home'));
+    assert.equal(otherAgent.runtimeHome, path.join(amalgmDir, 'cli-homes', 'codex', 'agents', 'agent-two', 'home'));
+    assert.notEqual(first.runtimeHome, otherAgent.runtimeHome);
   } finally {
     fs.rmSync(amalgmDir, { recursive: true, force: true });
   }
 });
 
-test('opencode always uses one canonical CLI home across auth methods and token refreshes', () => {
+test('opencode uses one stable per-agent CLI home across auth methods', () => {
   const first = authEnvelope({
     harness: 'opencode',
     authMethod: 'amalgm',
@@ -98,15 +89,15 @@ test('opencode always uses one canonical CLI home across auth methods and token
 
   assert.notEqual(first.tokenFingerprint, second.tokenFingerprint);
   assert.equal(first.runtimeHome, second.runtimeHome);
-  assert.equal(first.runtimeHome, '/tmp/amalgm-test/cli-homes/opencode/home');
+  assert.equal(first.runtimeHome, '/tmp/amalgm-test/cli-homes/opencode/agents/opencode/home');
   assert.equal(env.HOME, first.runtimeHome);
   assert.equal(env.OPENCODE_HOME, first.runtimeHome);
   assert.equal(env.OPENCODE_CONFIG_DIR, first.runtimeHome);
-  assert.equal(env.XDG_CONFIG_HOME, '/tmp/amalgm-test/cli-homes/opencode/home/.config');
-  assert.equal(env.XDG_DATA_HOME, '/tmp/amalgm-test/cli-homes/opencode/home/.local/share');
+  assert.equal(env.XDG_CONFIG_HOME, '/tmp/amalgm-test/cli-homes/opencode/agents/opencode/home/.config');
+  assert.equal(env.XDG_DATA_HOME, '/tmp/amalgm-test/cli-homes/opencode/agents/opencode/home/.local/share');
 });
 
-test('claude always uses one canonical CLI home', () => {
+test('claude uses one stable per-agent CLI home', () => {
   const envelope = authEnvelope({
     harness: 'claude_code',
     authMethod: 'provider_auth',
@@ -114,7 +105,7 @@ test('claude always uses one canonical CLI home', () => {
     amalgmDir: '/tmp/amalgm-test',
   });
 
-  assert.equal(envelope.runtimeHome, '/tmp/amalgm-test/cli-homes/claude_code/home');
+  assert.equal(envelope.runtimeHome, '/tmp/amalgm-test/cli-homes/claude_code/agents/claude_code/home');
 
   const env = runtimeEnv({
     harness: 'claude_code',
@@ -146,5 +137,5 @@ test('provided CLI home path cannot move an agent off its canonical home', () =>
     authProfileId: 'manual-profile',
   });
 
-  assert.equal(envelope.runtimeHome, '/tmp/amalgm-test/cli-homes/codex/home');
+  assert.equal(envelope.runtimeHome, '/tmp/amalgm-test/cli-homes/codex/agents/codex/home');
 });