amalgm 0.1.44 → 0.1.47

package/runtime/scripts/amalgm-mcp/agents/store.js

@@ -2,12 +2,12 @@
  * Agents storage — SQLite-backed local agent registry + conversation logs.
  *
  * The registry is the Local Live Store source of truth for agent capabilities.
- * Built-in harnesses are seeded as non-deletable rows. Custom agents are rows
- * in the same table, so discovery, snapshots, and agent-to-agent lookup use one
- * shape.
+ * Default harness agents are seeded as normal rows. User-created and default
+ * agents use the same editable/deletable shape.
  */
 
 const crypto = require('crypto');
+const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const {
@@ -25,10 +25,13 @@ const {
 } = require('../lib/storage');
 const { openLocalDb } = require('../state/db');
 const { insertStateEvent, publishStateEvent } = require('../state/events');
+const { getPreferredAuthMethod } = require('../lib/prefs');
+const credentialAdapter = require('../../credential-adapter');
 
 const DEFAULT_AGENT_STATUS = 'unknown';
 const CUSTOM_AGENT_STATUS = 'ready';
 const BUILTIN_AGENT_IDS = ['claude_code', 'codex', 'opencode', 'pi'];
+const DEFAULT_AGENTS_SEEDED_FILE = path.join(STORAGE_DIR, '.default-agents-seeded');
 const AMALGM_COMPUTER_ID = process.env.AMALGM_COMPUTER_ID || '';
 
 const BUILTIN_AGENT_BLUEPRINTS = [
@@ -76,9 +79,9 @@ const BUILTIN_AGENTS = BUILTIN_AGENT_BLUEPRINTS.map((agent) => ({
   nativeMcps: [],
   tools: { mode: 'all', selectedToolIds: [] },
   mcp: { inheritAll: true, customServers: [], appIds: [], nativeMcps: [] },
-  builtin: true,
-  deletable: false,
-  editable: false,
+  builtin: false,
+  deletable: true,
+  editable: true,
   status: DEFAULT_AGENT_STATUS,
 }));
 
@@ -133,6 +136,26 @@ function computerName() {
     || 'This computer';
 }
 
+function persistedAuthMethod(baseHarnessId) {
+  const localFallback = typeof credentialAdapter.getPersistedAuthMode === 'function'
+    ? credentialAdapter.getPersistedAuthMode(baseHarnessId)
+    : 'amalgm';
+  if (typeof getPreferredAuthMethod === 'function') {
+    return getPreferredAuthMethod(baseHarnessId, localFallback);
+  }
+  return localFallback;
+}
+
+function defaultAgentAuthMethod(baseHarnessId, existing) {
+  const persisted = persistedAuthMethod(baseHarnessId);
+  const existingAuth = nonEmptyString(existing?.authMethod);
+  if (!existingAuth) return persisted;
+  if (existingAuth === 'amalgm' && persisted && persisted !== 'amalgm') {
+    return persisted;
+  }
+  return existingAuth;
+}
+
 function normalizeLocation(inputLocation, fallback = {}) {
   const id = nonEmptyString(fallback.ownerComputerId) || computerId();
   const name = nonEmptyString(fallback.locationName) || computerName();
@@ -195,7 +218,7 @@ function normalizeToolConfig(tools, legacyMcp) {
 function normalizeAgent(input, existing) {
   if (!isObject(input)) throw new Error('agent must be an object');
   const id = nonEmptyString(input.id) || `custom-${crypto.randomUUID()}`;
-  const builtin = input.builtin === true || BUILTIN_AGENT_IDS.includes(id);
+  const builtin = input.builtin === true;
   const baseHarnessId = nonEmptyString(input.baseHarnessId || input.base_harness_id) || id;
   const adapter = nonEmptyString(input.adapter) || baseHarnessId;
   const mcpConfig = normalizeMcpConfig(input.mcp, input.mcpAppIds, input.nativeMcps);
@@ -227,7 +250,7 @@ function normalizeAgent(input, existing) {
       ...mcpConfig,
       inheritAll: toolConfig.mode !== 'selected',
     },
-    authMethod: input.authMethod || existing?.authMethod || 'amalgm',
+    authMethod: input.authMethod || existing?.authMethod || persistedAuthMethod(baseHarnessId),
     location,
     locationName: locationLabel(location),
     ownerComputerId,
@@ -238,8 +261,8 @@ function normalizeAgent(input, existing) {
       ? { ...defaultCapabilities({ tools: toolConfig }), ...input.capabilities }
       : defaultCapabilities({ tools: toolConfig }),
     builtin,
-    deletable: input.deletable === false || builtin ? false : true,
-    editable: input.editable === false || builtin ? false : true,
+    deletable: input.deletable === false ? false : true,
+    editable: input.editable === false ? false : true,
     createdAt,
     updatedAt,
     ...(input.configDir ? { configDir: input.configDir } : existing?.configDir ? { configDir: existing.configDir } : {}),
@@ -351,7 +374,6 @@ function writeAgentsJson(customAgents) {
 function readCustomAgentsFromDb(db = openLocalDb()) {
   return db.prepare(`
     SELECT * FROM agents
-    WHERE builtin = 0
     ORDER BY updated_at DESC, id ASC
   `).all()
     .map(rowToAgent)
@@ -372,29 +394,36 @@ function customAgentRowCount(db = openLocalDb()) {
 
 function seedBuiltinAgents(options = {}) {
   const db = openLocalDb();
+  const alreadySeeded = fs.existsSync(DEFAULT_AGENTS_SEEDED_FILE);
   const events = db.transaction(() => {
     const inserted = [];
     for (const blueprint of BUILTIN_AGENT_BLUEPRINTS) {
       const existing = readAgentRow(db, blueprint.id);
+      if (!existing && alreadySeeded) continue;
       const next = normalizeAgent({
         ...blueprint,
-        systemPrompt: '',
-        files: [],
-        skills: [],
-        mcpAppIds: [],
-        nativeMcps: [],
-        tools: { mode: 'all', selectedToolIds: [] },
-        mcp: { inheritAll: true, customServers: [], appIds: [], nativeMcps: [] },
-        builtin: true,
-        deletable: false,
-        editable: false,
+        name: existing?.name || blueprint.name,
+        description: existing?.description ?? blueprint.description,
+        adapter: existing?.adapter || blueprint.adapter,
+        baseHarnessId: existing?.baseHarnessId || blueprint.baseHarnessId,
+        baseModelId: existing?.baseModelId || blueprint.baseModelId,
+        systemPrompt: existing?.systemPrompt || '',
+        files: existing?.files || [],
+        skills: existing?.skills || [],
+        mcpAppIds: existing?.mcpAppIds || [],
+        nativeMcps: existing?.nativeMcps || [],
+        tools: existing?.tools || { mode: 'all', selectedToolIds: [] },
+        mcp: existing?.mcp || { inheritAll: true, customServers: [], appIds: [], nativeMcps: [] },
+        builtin: false,
+        deletable: true,
+        editable: true,
         status: existing?.status || DEFAULT_AGENT_STATUS,
         installStatus: existing?.installStatus || 'unknown',
         authStatus: existing?.authStatus || 'unknown',
         authDetails: existing?.authDetails,
         configDir: existing?.configDir,
         createdAt: existing?.createdAt,
-        authMethod: existing?.authMethod || 'amalgm',
+        authMethod: defaultAgentAuthMethod(existing?.baseHarnessId || blueprint.baseHarnessId, existing),
       }, existing);
       if (existing && agentsEqualForWrite(existing, next)) continue;
       upsertAgentRow(db, next);
@@ -406,13 +435,17 @@ function seedBuiltinAgents(options = {}) {
     }
     return inserted;
   })();
+  try {
+    ensureDir(STORAGE_DIR);
+    fs.writeFileSync(DEFAULT_AGENTS_SEEDED_FILE, nowIso());
+  } catch {
+    // Best-effort marker; default seeding still works without it.
+  }
   publishEvents(events);
 }
 
 function migrateLegacyAgentsJsonIfNeeded() {
   const db = openLocalDb();
-  if (customAgentRowCount(db) > 0) return;
-
   const legacy = readJson(AGENTS_FILE, { version: 1, agents: [] });
   const legacyAgents = Array.isArray(legacy?.agents) ? legacy.agents : [];
   if (legacyAgents.length === 0) return;
@@ -421,6 +454,7 @@ function migrateLegacyAgentsJsonIfNeeded() {
     for (const agent of legacyAgents) {
       const normalized = normalizeAgent(agent, null);
       if (normalized.builtin) continue;
+      if (readAgentRow(db, normalized.id)) continue;
       upsertAgentRow(db, normalized);
     }
   })();
@@ -523,10 +557,6 @@ function updateAgent(agentId, updates, options = {}) {
   const db = openLocalDb();
   const existing = readAgentRow(db, agentId);
   if (!existing) throw new Error(`Agent not found: ${agentId}`);
-  if (existing.builtin && options.allowBuiltinUpdate !== true) {
-    throw new Error(`Built-in agent "${existing.name}" cannot be edited`);
-  }
-
   const requestedName = nonEmptyString(updates?.name);
   if (requestedName) {
     const duplicate = getAllAgentsWithBuiltins()
@@ -569,12 +599,12 @@ function deleteAgent(agentId, options = {}) {
   const db = openLocalDb();
   const existing = readAgentRow(db, agentId);
   if (!existing) throw new Error(`Agent not found: ${agentId}`);
-  if (existing.builtin || existing.deletable === false) {
-    throw new Error(`Built-in agent "${existing.name}" cannot be deleted`);
+  if (existing.deletable === false) {
+    throw new Error(`Agent "${existing.name}" cannot be deleted`);
   }
 
   const event = db.transaction(() => {
-    db.prepare('DELETE FROM agents WHERE id = ? AND builtin = 0').run(agentId);
+    db.prepare('DELETE FROM agents WHERE id = ?').run(agentId);
     return insertAgentEvent(db, 'delete', existing, {
       source: options.source || 'agents:delete',
     });

package/runtime/scripts/amalgm-mcp/agents/talk.js

@@ -14,7 +14,7 @@ const crypto = require('crypto');
 const path = require('path');
 const os = require('os');
 
-const { AMALGM_COMPUTER_ID, AMALGM_USER_ID, DEFAULT_CWD, STORAGE_DIR } = require('../config');
+const { AMALGM_USER_ID, DEFAULT_CWD, STORAGE_DIR } = require('../config');
 const { runThroughChatServer } = require('../lib/chat-runner');
 const {
   hasSupabase,
@@ -31,11 +31,7 @@ const {
 } = require('../lib/prefs');
 const { textResult, errorResult } = require('../lib/tool-result');
 const { ensureDir } = require('../lib/storage');
-const {
-  appendAgentConvoLog,
-  normalizeConversationId,
-  resolveAgentByNameOrId,
-} = require('./store');
+const { appendAgentConvoLog, normalizeConversationId, resolveAgentByNameOrId } = require('./store');
 const {
   chatInputToLegacyFields,
   getChatInputText,
@@ -465,8 +461,6 @@ async function deliverResponseToCallerSession({
     callerResponseDelivered: true,
     callerResponseDeliveredAt: deliveredAt,
     callerResponseTarget: targetSessionId,
-    callerResponseText: messageText,
-    callerResponseDescription: description || null,
   });
   appendStatusLog(sourceSessionId, 'caller_response_delivered', {
     targetConversationId: targetSessionId,
@@ -537,6 +531,7 @@ async function handleTalkToAgent(args, context = {}) {
       `Agent not found: ${agentLookup}. Use agents_list to see available agents.`,
     );
   }
+
   const isNewConversation = !normalizedConversationId;
   const sessionId = normalizedConversationId || crypto.randomUUID();
   const userMessageId = crypto.randomUUID();
@@ -552,10 +547,13 @@ async function handleTalkToAgent(args, context = {}) {
   const persistedAuthMethod = credentialAdapter.VALID_HARNESS_IDS.includes(agent.baseHarnessId)
     ? credentialAdapter.getPersistedAuthMode(agent.baseHarnessId)
     : 'amalgm';
+  const preferredAuthMethod = getPreferredAuthMethod(agent.baseHarnessId, persistedAuthMethod);
+  const isDefaultAgentClass = agent.id === agent.baseHarnessId;
   const defaultAuthMethod = coerceAuthMethodForHarness(
     agent.baseHarnessId,
-    agent.authMethod
-    || getPreferredAuthMethod(agent.baseHarnessId, persistedAuthMethod),
+    isDefaultAgentClass && agent.authMethod === 'amalgm' && preferredAuthMethod !== 'amalgm'
+      ? preferredAuthMethod
+      : agent.authMethod || preferredAuthMethod,
   );
   const agentFiles = normalizeStringList(agent.files);
   const agentSkills = normalizeStringList(agent.skills);
@@ -707,7 +705,6 @@ async function handleTalkToAgent(args, context = {}) {
       await supabaseInsert('sessions', {
         id: sessionId,
         user_id: AMALGM_USER_ID,
-        computer_id: AMALGM_COMPUTER_ID,
         container_id: os.hostname() || 'agent-conversation',
         harness: agent.id,
         title: taskDescription || 'New Chat',
@@ -779,7 +776,6 @@ async function handleTalkToAgent(args, context = {}) {
       chatInput: normalizedChatInput,
       prompt: legacyChatFields.prompt,
       userId: AMALGM_USER_ID,
-      computerId: AMALGM_COMPUTER_ID,
       codeSessionId: sessionId,
       assistantMessageId,
       userMessageId,
@@ -912,11 +908,8 @@ async function handleTalkToAgent(args, context = {}) {
             },
           },
         );
-        const activeAfterTurn = summarizeActiveConversation(sessionId);
-        const deliveredResponseText = String(activeAfterTurn?.callerResponseText || '').trim();
-        const finalOutputText = String(outputText || '').trim() ? outputText : deliveredResponseText;
         const warnings = [];
-        if (!String(finalOutputText || '').trim()) {
+        if (!String(outputText || '').trim()) {
           warnings.push(
             metrics?.toolEvents > 0
               ? 'Agent completed without visible text after tool activity; check the session log or workspace diff before retrying.'
@@ -933,7 +926,7 @@ async function handleTalkToAgent(args, context = {}) {
           agentName: agent.name,
           runId,
           description: taskDescription,
-          message: finalOutputText,
+          message: outputText,
           timestamp: new Date().toISOString(),
           stopReason,
           usage,
@@ -954,7 +947,7 @@ async function handleTalkToAgent(args, context = {}) {
         });
 
         console.log(
-          `[AmalgmMCP:Agent] ${agent.name} responded (${finalOutputText.length} chars, session: ${sessionId})`,
+          `[AmalgmMCP:Agent] ${agent.name} responded (${outputText.length} chars, session: ${sessionId})`,
         );
 
         if (
@@ -982,7 +975,7 @@ async function handleTalkToAgent(args, context = {}) {
               status: 'completed',
               isNewConversation,
               longMessageContext,
-              outputText: finalOutputText,
+              outputText,
               stopReason,
               usage,
               metrics,
@@ -990,9 +983,6 @@ async function handleTalkToAgent(args, context = {}) {
               recovery:
                 'Use agents_get_conversation with this conversation_id if the caller times out or needs the local transcript.',
               includeMetrics,
-              extra: deliveredResponseText && !String(outputText || '').trim()
-                ? { response_source: 'return_channel' }
-                : {},
             }),
             null,
             2,

package/runtime/scripts/amalgm-mcp/agents/tools.js

@@ -26,20 +26,17 @@ module.exports = [
   {
     name: 'agents_list',
     description:
-      'List all available agents (built-in defaults + custom user-created agents). Use this to discover which agents you can talk to via talk_to_agent.',
+      'List all available agent classes. Use this to discover which agents you can talk to via talk_to_agent.',
     inputSchema: { type: 'object', properties: {} },
     async handler() {
       const all = getAllAgentsWithBuiltins();
       if (all.length === 0) return textResult('No agents available.');
       const summary = all
         .map((a) => {
-          const tag = a.builtin ? '[built-in]' : '[custom]';
-          const model = a.builtin
-            ? getSelectedModel(a.baseHarnessId) || a.baseModelId
-            : a.baseModelId ||
-              getSelectedModel(a.baseHarnessId) ||
-              DEFAULT_SELECTED_MODELS[a.baseHarnessId];
-          return `- ${a.name} (${a.id}) ${tag}\n  ${a.description || 'No description'}\n  adapter: ${a.adapter || a.baseHarnessId} | harness: ${a.baseHarnessId} | model: ${model}\n  location: ${a.locationName || a.location?.name || 'this computer'} | status: ${a.status || 'unknown'}`;
+          const model = a.baseModelId ||
+            getSelectedModel(a.baseHarnessId) ||
+            DEFAULT_SELECTED_MODELS[a.baseHarnessId];
+          return `- ${a.name} (${a.id})\n  ${a.description || 'No description'}\n  adapter: ${a.adapter || a.baseHarnessId} | harness: ${a.baseHarnessId} | model: ${model}\n  location: ${a.locationName || a.location?.name || 'this computer'} | status: ${a.status || 'unknown'}`;
         })
         .join('\n\n');
       return textResult(`Available agents:\n\n${summary}`);
@@ -63,11 +60,9 @@ module.exports = [
         description: agent.description,
         adapter: agent.adapter || agent.baseHarnessId,
         baseHarnessId: agent.baseHarnessId,
-        baseModelId: agent.builtin
-          ? getSelectedModel(agent.baseHarnessId) || agent.baseModelId
-          : agent.baseModelId ||
-            getSelectedModel(agent.baseHarnessId) ||
-            DEFAULT_SELECTED_MODELS[agent.baseHarnessId],
+        baseModelId: agent.baseModelId ||
+          getSelectedModel(agent.baseHarnessId) ||
+          DEFAULT_SELECTED_MODELS[agent.baseHarnessId],
         systemPrompt: agent.systemPrompt ? '(configured)' : '(none)',
         mcp: {
           inheritAll: agent.mcp?.inheritAll ?? true,

package/runtime/scripts/amalgm-mcp/artifacts/supervisor.js

@@ -10,6 +10,7 @@ const path = require('path');
 const { spawn } = require('child_process');
 const { DEFAULT_CWD } = require('../config');
 const activeMemory = require('../../chat-core/tooling/active-memory');
+const { runtimePort } = require('../../../lib/runtime-manifest');
 const { syncArtifactRoutesToGateway } = require('./advertise');
 const {
   allocatePort,
@@ -88,8 +89,8 @@ function buildEnv(artifact) {
     AMALGM_ARTIFACT_ID: artifact.id,
     AMALGM_ARTIFACT_REF: artifact.artifactRef,
     AMALGM_ARTIFACT_URL: artifact.publicUrl,
-    AMALGM_CHAT_SERVER_URL: `http://127.0.0.1:${process.env.CHAT_SERVER_PORT || 8084}`,
-    AMALGM_MCP_URL: `http://127.0.0.1:${process.env.AMALGM_MCP_PORT || 8083}`,
+    AMALGM_CHAT_SERVER_URL: `http://127.0.0.1:${runtimePort('chat-server')}`,
+    AMALGM_MCP_URL: `http://127.0.0.1:${runtimePort('amalgm-mcp')}`,
   };
 }
 

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

@@ -14,8 +14,9 @@ const {
   proxyBaseUrl,
   readProxyToken,
 } = require('../proxy-token-store');
+const { runtimePort } = require('../../lib/runtime-manifest');
 
-const PORT = parseInt(process.env.AMALGM_MCP_PORT || '8083', 10);
+const PORT = runtimePort('amalgm-mcp');
 const MCP_PROTOCOL_VERSION = '2024-11-05';
 
 const AMALGM_DIR = process.env.AMALGM_DIR || path.join(os.homedir(), '.amalgm');
@@ -46,7 +47,7 @@ function cleanString(value) {
 }
 
 // Chat server (local Next.js/Electron) — same process tree; no cloud hop.
-const CHAT_SERVER_URL = `http://localhost:${process.env.CHAT_SERVER_PORT || 8084}`;
+const CHAT_SERVER_URL = `http://localhost:${runtimePort('chat-server')}`;
 
 const SCHEDULER_INTERVAL_MS = 30_000;
 

package/runtime/scripts/amalgm-mcp/index.js

@@ -6,8 +6,8 @@
  * (default: ~/.amalgm/) — same pattern as scripts/credential-adapter.js.
  *
  * Ports:
- *   8083  this server
- *   8084  chat-server (we delegate task/event/agent runs here)
+ *   this server uses the amalgm-mcp runtime port
+ *   chat-server uses the chat-server runtime port for task/event/agent runs
  *
  * Modules:
  *   config.js                   env + paths

package/runtime/scripts/amalgm-mcp/lib/chat-runner.js

@@ -7,7 +7,7 @@
  *  - agents/talk.js        (talk_to_agent tool)
  *  - email/inbound.js      (email replies/new email → agent runs)
  *
- * POSTs to chat-server (:8084) and consumes the SSE stream, accumulating
+ * POSTs to chat-server and consumes the SSE stream, accumulating
  * text from agent_message_chunk events and returning the final output.
  */
 

package/runtime/scripts/amalgm-mcp/state/snapshot.js

@@ -2,27 +2,11 @@
 
 const { currentSeq } = require('./events');
 
-const DEFAULT_RESOURCES = [
-  'tasks',
-  'event_triggers',
-  'agents',
-  'artifacts',
-  'toolbox',
-  'tools',
-  'tool_actions',
-  'projects',
-  'workspaces',
-  'memories',
-];
+const DEFAULT_RESOURCES = ['tasks', 'event_triggers', 'agents', 'artifacts', 'toolbox', 'tools', 'tool_actions', 'hooks', 'projects', 'workspaces', 'memories'];
 
 function normalizeResources(resources) {
-  if (!resources) return DEFAULT_RESOURCES;
-  const values = Array.isArray(resources)
-    ? resources
-    : String(resources).split(',');
-  const clean = values
-    .map((value) => String(value || '').trim())
-    .filter(Boolean);
+  const values = resources ? String(resources).split(',') : DEFAULT_RESOURCES;
+  const clean = values.map((value) => String(value || '').trim()).filter(Boolean);
   return clean.length > 0 ? Array.from(new Set(clean)) : DEFAULT_RESOURCES;
 }
 
@@ -36,18 +20,17 @@ function readResource(resource, cache) {
       return require('../agents/store').getAllAgentsWithBuiltins();
     case 'artifacts':
       return require('../artifacts/store').loadArtifacts().artifacts;
-    case 'toolbox': {
+    case 'toolbox':
       cache.toolbox ||= require('../toolbox/store').readToolbox();
       return cache.toolbox;
-    }
-    case 'tools': {
+    case 'tools':
       cache.toolbox ||= require('../toolbox/store').readToolbox();
       return cache.toolbox.tools;
-    }
-    case 'tool_actions': {
+    case 'tool_actions':
       cache.toolbox ||= require('../toolbox/store').readToolbox();
       return cache.toolbox.toolActions;
-    }
+    case 'hooks':
+      return require('../agents/hooks').collectNativeHooks();
     case 'projects':
     case 'workspaces': {
       const workspaceStore = require('../workspace/store');
@@ -68,37 +51,18 @@ function buildSnapshot(resourcesInput) {
     const beforeSeq = currentSeq();
     const cache = {};
     const data = {};
-
     for (const resource of resources) {
       const value = readResource(resource, cache);
       if (value !== undefined) data[resource] = value;
     }
-
     const afterSeq = currentSeq();
     if (beforeSeq === afterSeq) {
-      return {
-        seq: afterSeq,
-        stable: true,
-        resources: data,
-      };
+      return { seq: afterSeq, stable: true, resources: data };
     }
-
-    lastUnstable = {
-      seq: beforeSeq,
-      stable: false,
-      resources: data,
-    };
+    lastUnstable = { seq: beforeSeq, stable: false, resources: data };
   }
 
-  return lastUnstable || {
-    seq: currentSeq(),
-    stable: true,
-    resources: {},
-  };
+  return lastUnstable || { seq: currentSeq(), stable: true, resources: {} };
 }
 
-module.exports = {
-  DEFAULT_RESOURCES,
-  buildSnapshot,
-  normalizeResources,
-};
+module.exports = { DEFAULT_RESOURCES, buildSnapshot, normalizeResources };

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

@@ -8,6 +8,7 @@ const { normalizeClaudeMessage, usageRecordsFromClaudeResult, usageFromClaude }
 const { recordNativeEvent } = require('../recorder');
 const { toClaudeMcpServers } = require('../tooling/mcp-bundle');
 const { bundledClaudeBinary } = require('../tooling/native-binaries');
+const { syncNativeHarnessConfig } = require('../tooling/native-config');
 const { importPackage } = require('../tooling/package-import');
 const { composeSystemPrompt } = require('../tooling/system-prompt');
 
@@ -31,6 +32,7 @@ class ClaudeAdapter {
   }
 
   options(contract, extra = {}) {
+    syncNativeHarnessConfig(contract);
     const systemPrompt = composeSystemPrompt(contract);
     const pathToClaudeCodeExecutable = process.env.CLAUDE_CODE_BINARY || bundledClaudeBinary();
     return {
@@ -47,7 +49,7 @@ class ClaudeAdapter {
       ...(process.env.CHAT_CORE_DEBUG_CLAUDE === '1'
         ? { debug: true, debugFile: path.join(contract.auth.runtimeHome || process.cwd(), 'claude-debug.log') }
         : {}),
-      settingSources: [],
+      settingSources: ['user', 'project', 'local'],
       strictMcpConfig: false,
       ...extra,
     };