amalgm 0.1.67 → 0.1.68

package/package.json

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

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

@@ -203,6 +203,9 @@ function runtimeEnv(contract, baseEnv = process.env) {
     env.CLAUDE_CONFIG_DIR = contract.auth.runtimeHome;
     env.OPENCODE_HOME = contract.auth.runtimeHome;
     env.OPENCODE_CONFIG_DIR = contract.auth.runtimeHome;
+    if (contract.harness === 'claude_code' && contract.authMethod === 'provider_auth') {
+      delete env.CLAUDE_CONFIG_DIR;
+    }
   }
   env.IS_SANDBOX = '1';
   if (baseEnv.AMALGM_RUNTIME_TOKEN) env.AMALGM_RUNTIME_TOKEN = baseEnv.AMALGM_RUNTIME_TOKEN;

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

@@ -84,7 +84,7 @@ test('claude provider auth uses a pinned CLI home with native config copied sepa
   });
 
   assert.equal(env.HOME, envelope.runtimeHome);
-  assert.equal(env.CLAUDE_CONFIG_DIR, envelope.runtimeHome);
+  assert.equal(env.CLAUDE_CONFIG_DIR, undefined);
   assert.equal(env.ANTHROPIC_API_KEY, undefined);
 });
 

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

@@ -196,3 +196,23 @@ test('claude native sync skips debug symlinks', () => {
     assert.equal(fs.existsSync(path.join(runtimeHome, 'debug', 'latest')), false);
   });
 });
+
+test('claude native sync links native keychains on macOS', () => {
+  withNativeHome((home) => {
+    const source = path.join(home, '.claude');
+    fs.mkdirSync(source, { recursive: true });
+    fs.writeFileSync(path.join(source, 'settings.json'), '{"hooks":{}}');
+    fs.mkdirSync(path.join(home, 'Library', 'Keychains'), { recursive: true });
+
+    const runtimeHome = path.join(home, 'runtime-home');
+    syncClaudeNativeConfig(runtimeHome);
+
+    const keychains = path.join(runtimeHome, 'Library', 'Keychains');
+    if (process.platform === 'darwin') {
+      assert.equal(fs.lstatSync(keychains).isSymbolicLink(), true);
+      assert.equal(fs.realpathSync(keychains), fs.realpathSync(path.join(home, 'Library', 'Keychains')));
+    } else {
+      assert.equal(fs.existsSync(keychains), false);
+    }
+  });
+});

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

@@ -120,6 +120,28 @@ function removeOutboundSymlink(root, relativePath) {
   }
 }
 
+function ensureNativeKeychainAlias(runtimeHome) {
+  if (process.platform !== 'darwin' || !runtimeHome) return false;
+  const source = path.join(nativeHome(), 'Library', 'Keychains');
+  if (!exists(source)) return false;
+  const target = path.join(runtimeHome, 'Library', 'Keychains');
+  try {
+    const stat = fs.lstatSync(target);
+    if (stat.isSymbolicLink()) {
+      const linkTarget = fs.readlinkSync(target);
+      if (path.resolve(path.dirname(target), linkTarget) === path.resolve(source)) return true;
+    }
+    fs.rmSync(target, { recursive: true, force: true });
+  } catch {}
+  fs.mkdirSync(path.dirname(target), { recursive: true });
+  try {
+    fs.symlinkSync(source, target, 'dir');
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function nativeHome() {
   return process.env.AMALGM_NATIVE_HOME || os.homedir();
 }
@@ -199,6 +221,7 @@ function syncClaudeNativeConfig(runtimeHome) {
   removeOutboundSymlink(runtimeHome, path.join('debug', 'latest'));
   const copied = copyConfigTree(sourceDir, runtimeHome);
   ensureHomeAlias(runtimeHome, '.claude');
+  ensureNativeKeychainAlias(runtimeHome);
   copyFileIfPresent(path.join(home, '.claude.json'), path.join(runtimeHome, '.claude.json'));
   copyConfigTree(path.join(home, '.config', 'claude'), path.join(runtimeHome, '.config', 'claude'));
   return copied ? { sourceDir, runtimeHome } : null;
@@ -259,6 +282,7 @@ module.exports = {
     copyConfigTree,
     copyDirBounded,
     copyFileIfPresent,
+    ensureNativeKeychainAlias,
     ensureHomeAlias,
     shouldCopyConfigPath,
   },