amalgm 0.1.75 → 0.1.76

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

@@ -238,6 +238,65 @@ function syncOpenCodeNativeConfig(runtimeHome) {
   };
 }
 
+function copyJsonSubsetIfPresent(source, target, keys) {
+  const data = readJsonFile(source);
+  if (!data || typeof data !== 'object' || Array.isArray(data)) return false;
+  const out = {};
+  for (const key of keys) {
+    if (data[key] !== undefined) out[key] = data[key];
+  }
+  if (Object.keys(out).length === 0) return false;
+  if (!ensureDirectory(path.dirname(target)) || !canWriteFileTarget(target)) return false;
+  fs.writeFileSync(target, JSON.stringify(out, null, 2), { mode: 0o600 });
+  try { fs.chmodSync(target, 0o600); } catch {}
+  return true;
+}
+
+function syncCodexProviderAuth(runtimeHome) {
+  if (!runtimeHome) return null;
+  const sourceDir = path.join(nativeHome(), '.codex');
+  fs.mkdirSync(runtimeHome, { recursive: true });
+  ensureHomeAlias(runtimeHome, '.codex');
+  const copied = copyFileIfPresent(path.join(sourceDir, 'auth.json'), path.join(runtimeHome, 'auth.json'));
+  if (copied) copyFileIfPresent(path.join(sourceDir, 'auth.json'), path.join(runtimeHome, '.codex', 'auth.json'));
+  return copied ? { sourceDir, runtimeHome, copied: true, authOnly: true } : null;
+}
+
+function syncClaudeProviderAuth(runtimeHome) {
+  if (!runtimeHome) return null;
+  const home = nativeHome();
+  const sourceDir = path.join(home, '.claude');
+  fs.mkdirSync(runtimeHome, { recursive: true });
+  ensureHomeAlias(runtimeHome, '.claude');
+  const copiedCredentials = copyFileIfPresent(
+    path.join(sourceDir, '.credentials.json'),
+    path.join(runtimeHome, '.credentials.json'),
+  );
+  const copiedOauth = copyJsonSubsetIfPresent(
+    path.join(home, '.claude.json'),
+    path.join(runtimeHome, '.claude.json'),
+    ['claudeAiOauth', 'oauthAccount'],
+  ) || copyJsonSubsetIfPresent(
+    path.join(sourceDir, '.claude.json'),
+    path.join(runtimeHome, '.claude.json'),
+    ['claudeAiOauth', 'oauthAccount'],
+  );
+  const keychain = ensureNativeKeychainAlias(runtimeHome);
+  return copiedCredentials || copiedOauth || keychain
+    ? { sourceDir, runtimeHome, copied: copiedCredentials || copiedOauth, keychain, authOnly: true }
+    : null;
+}
+
+function syncOpenCodeProviderAuth(runtimeHome) {
+  if (!runtimeHome) return null;
+  const home = nativeHome();
+  const source = path.join(home, '.local', 'share', 'opencode', 'auth.json');
+  const target = path.join(runtimeHome, '.local', 'share', 'opencode', 'auth.json');
+  fs.mkdirSync(runtimeHome, { recursive: true });
+  const copied = copyFileIfPresent(source, target);
+  return copied ? { sourceDir: path.dirname(source), runtimeHome, copied: true, authOnly: true } : null;
+}
+
 function readJsonFile(file) {
   try {
     return JSON.parse(fs.readFileSync(file, 'utf8'));
@@ -289,6 +348,16 @@ function syncNativeHarnessConfig(contract) {
   return null;
 }
 
+function syncNativeProviderAuth(contract) {
+  const runtimeHome = contract?.auth?.runtimeHome;
+  if (!runtimeHome) return null;
+  if (contract.authMethod !== 'provider_auth') return null;
+  if (contract.harness === 'codex') return syncCodexProviderAuth(runtimeHome);
+  if (contract.harness === 'claude_code') return syncClaudeProviderAuth(runtimeHome);
+  if (contract.harness === 'opencode') return syncOpenCodeProviderAuth(runtimeHome);
+  return null;
+}
+
 module.exports = {
   __private: {
     claudeNativeHookSettings,
@@ -301,8 +370,12 @@ module.exports = {
     shouldCopyConfigPath,
   },
   claudeNativeHookSettings,
+  syncClaudeProviderAuth,
   syncClaudeNativeConfig,
+  syncCodexProviderAuth,
   syncCodexNativeConfig,
   syncNativeHarnessConfig,
+  syncNativeProviderAuth,
+  syncOpenCodeProviderAuth,
   syncOpenCodeNativeConfig,
 };

package/runtime/scripts/chat-core/tooling/runtime-home.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const { runtimeEnv } = require('../auth');
-const { syncNativeHarnessConfig } = require('./native-config');
+const { syncNativeProviderAuth } = require('./native-config');
 
 function managedRuntimeHome(contract) {
   const runtimeHome = contract?.auth?.runtimeHome;
@@ -16,7 +16,7 @@ function prepareHarnessRuntime(contract, baseEnv = process.env) {
   const runtimeHome = managedRuntimeHome(contract);
   fs.mkdirSync(runtimeHome, { recursive: true });
   const syncInfo = contract?.authMethod === 'provider_auth'
-    ? syncNativeHarnessConfig(contract)
+    ? syncNativeProviderAuth(contract)
     : null;
   return {
     runtimeHome,

package/runtime/scripts/chat-core/tooling/system-prompt.js

@@ -3,6 +3,7 @@
 const { PLATFORM_CONTEXT } = require('../../chat-server/config');
 const { activeMemoryContextBlock, instructionsContextBlock } = require('./active-memory');
 const { passiveMemoryContextBlock } = require('./passive-memory');
+const { renderAgentInstructions } = require('../../amalgm-mcp/agent-config/renderers/instructions');
 
 function trimBlock(value) {
   return String(value || '').trim();
@@ -11,7 +12,8 @@ function trimBlock(value) {
 function composeSystemPrompt(contract) {
   const parts = [];
   const platform = trimBlock(PLATFORM_CONTEXT);
-  const custom = trimBlock(contract?.systemPrompt);
+  const custom = trimBlock(contract?.systemPrompt)
+    || trimBlock(renderAgentInstructions(contract?.agentConfig, { includeAgentToAgentPrompt: false }));
   const instructions = contract?.providerSessionId ? '' : trimBlock(instructionsContextBlock(contract));
   const active = contract?.providerSessionId ? '' : trimBlock(activeMemoryContextBlock(contract));
   const passive = contract?.providerSessionId ? '' : trimBlock(passiveMemoryContextBlock());

package/runtime/scripts/local-gateway.js

@@ -144,6 +144,7 @@ const MCP_PREFIXES = [
   '/state',
   '/local',
   '/credentials',
+  '/chat-payloads',
   '/email',
   '/slack',
   '/user-api-keys',