amalgm 0.1.72 → 0.1.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.72",
+  "version": "0.1.73",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,
@@ -15,7 +15,6 @@
   ],
   "scripts": {
     "sync-runtime": "node ../../scripts/sync-npm-package-runtime.mjs",
-    "prepack": "node ../../scripts/sync-npm-package-runtime.mjs",
     "pack:dry": "npm pack --dry-run",
     "check": "node --check bin/amalgm.js && node --check lib/auth-store.js && node --check lib/cli.js && node --check lib/paths.js && node --check lib/process-cleanup.js && node --check lib/runtime-identity.js && node --check lib/runtime-manifest.js && node --check lib/service.js && node --check lib/state-migration.js && node --check lib/supervisor.js && node --check lib/tunnel-chat.js && node --check lib/tunnel-events.js && node --check runtime/lib/runtime-manifest.js && node --check runtime/scripts/runtime-auth.js && node --check runtime/scripts/proxy-token-store.js && node --check runtime/scripts/local-gateway.js && node --check runtime/scripts/port-monitor.js && node --check runtime/scripts/chat-server.js && node --check runtime/scripts/chat-server/index.js && node --check runtime/scripts/chat-server/config.js && node --check runtime/scripts/chat-core/tooling/native-binaries.js && node --check runtime/scripts/chat-core/tooling/package-import.js && node --check runtime/scripts/chat-core/tooling/runtime-home.js && node --check runtime/scripts/amalgm-mcp/index.js && node --check runtime/scripts/amalgm-mcp/config.js && node --check runtime/scripts/lib/project-paths.js && node --check runtime/scripts/lib/runtime-paths.js"
   },

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

@@ -11,6 +11,9 @@ const {
 } = require('./store');
 const { hydrateModelPreferences } = require('../lib/prefs');
 const credentialAdapter = require('../../credential-adapter');
+const {
+  defaultToolboxService: toolboxService,
+} = require('../toolbox/service');
 
 function coerceAuthMethodForHarness(harnessId, authMethod) {
   const supported = credentialAdapter.SUPPORTED_AUTH_BY_HARNESS?.[harnessId] || ['amalgm'];
@@ -25,27 +28,28 @@ function normalizeStringList(values) {
     .filter(Boolean))];
 }
 
-function normalizeMcpConfig(mcp, mcpAppIds, nativeMcps) {
+function derivedMcpTransportConfig(toolConfig) {
+  const appIds = toolboxService.externalMcpToolIdsForMode(
+    toolConfig.mode,
+    toolConfig.selectedToolIds,
+  );
   return {
-    inheritAll: mcp?.inheritAll !== false,
-    customServers: Array.isArray(mcp?.customServers) ? mcp.customServers : [],
-    appIds: normalizeStringList(mcp?.appIds ?? mcpAppIds),
-    nativeMcps: normalizeStringList(mcp?.nativeMcps ?? nativeMcps),
+    inheritAll: toolConfig.mode !== 'selected',
+    customServers: [],
+    appIds,
+    nativeMcps: [],
   };
 }
 
-function normalizeToolConfig(tools, legacyMcp) {
+function normalizeToolConfig(tools) {
   const raw = tools && typeof tools === 'object' && !Array.isArray(tools) ? tools : null;
   const selectedToolIds = normalizeStringList(
     raw?.selectedToolIds
     ?? raw?.selected
-    ?? [
-      ...normalizeStringList(legacyMcp?.appIds),
-      ...normalizeStringList(legacyMcp?.nativeMcps),
-    ],
+    ?? [],
   );
   return {
-    mode: raw?.mode === 'selected' || (!raw && legacyMcp?.inheritAll === false) ? 'selected' : 'all',
+    mode: raw?.mode === 'selected' ? 'selected' : 'all',
     selectedToolIds,
   };
 }
@@ -68,20 +72,18 @@ async function handleCreate(body, sendJson) {
     description,
     baseHarnessId,
     baseModelId,
+    modelSettings,
     systemPrompt,
     files,
     skills,
-    mcpAppIds,
-    nativeMcps,
-    mcp,
     tools,
     authMethod,
   } = body;
   if (!name || !name.trim()) return sendJson(400, { error: 'name is required' });
   if (!baseHarnessId) return sendJson(400, { error: 'baseHarnessId is required' });
 
-  const mcpConfig = normalizeMcpConfig(mcp, mcpAppIds, nativeMcps);
-  const toolConfig = normalizeToolConfig(tools, mcpConfig);
+  const toolConfig = normalizeToolConfig(tools);
+  const mcpConfig = derivedMcpTransportConfig(toolConfig);
   let agent;
   try {
     agent = createAgent({
@@ -89,16 +91,14 @@ async function handleCreate(body, sendJson) {
       description: description || '',
       baseHarnessId,
       baseModelId: baseModelId || '',
+      modelSettings,
       systemPrompt: systemPrompt || '',
       files: normalizeStringList(files),
       skills: normalizeStringList(skills),
-      mcpAppIds: normalizeStringList(mcpConfig.appIds),
-      nativeMcps: normalizeStringList(mcpConfig.nativeMcps),
+      mcpAppIds: mcpConfig.appIds,
+      nativeMcps: mcpConfig.nativeMcps,
       tools: toolConfig,
-      mcp: {
-        ...mcpConfig,
-        inheritAll: toolConfig.mode !== 'selected',
-      },
+      mcp: mcpConfig,
       authMethod: coerceAuthMethodForHarness(baseHarnessId, authMethod),
     });
   } catch (error) {
@@ -121,6 +121,13 @@ async function handleUpdate(body, sendJson) {
     updates.authMethod = coerceAuthMethodForHarness(targetHarnessId, existing.authMethod);
   }
 
+  const toolConfig = normalizeToolConfig(updates.tools ?? existing.tools);
+  const mcpConfig = derivedMcpTransportConfig(toolConfig);
+  updates.tools = toolConfig;
+  updates.mcpAppIds = mcpConfig.appIds;
+  updates.nativeMcps = mcpConfig.nativeMcps;
+  updates.mcp = mcpConfig;
+
   let agent;
   try {
     agent = updateAgent(agent_id, updates);

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

@@ -25,13 +25,26 @@ const {
 } = require('../lib/storage');
 const { openLocalDb } = require('../state/db');
 const { insertStateEvent, publishStateEvent } = require('../state/events');
-const { getPreferredAuthMethod } = require('../lib/prefs');
+const {
+  getModelSettingsForSelection,
+  getPreferredAuthMethod,
+  getSelectedModel,
+  readUserPreferences,
+} = 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 DEFAULT_AGENT_MODEL_SETTINGS_BACKFILLED_FILE = path.join(
+  STORAGE_DIR,
+  '.default-agent-model-settings-backfilled',
+);
+const DEFAULT_AGENT_AUTH_BACKFILLED_FILE = path.join(
+  STORAGE_DIR,
+  '.default-agent-auth-backfilled',
+);
 const AMALGM_COMPUTER_ID = process.env.AMALGM_COMPUTER_ID || '';
 
 const BUILTIN_AGENT_BLUEPRINTS = [
@@ -146,16 +159,47 @@ function persistedAuthMethod(baseHarnessId) {
   return localFallback;
 }
 
-function defaultAgentAuthMethod(baseHarnessId, existing) {
+function defaultAgentAuthMethod(baseHarnessId, existing, allowPreferenceBackfill = false) {
   const persisted = persistedAuthMethod(baseHarnessId);
   const existingAuth = nonEmptyString(existing?.authMethod);
   if (!existingAuth) return persisted;
-  if (existingAuth === 'amalgm' && persisted && persisted !== 'amalgm') {
+  if (allowPreferenceBackfill && existingAuth === 'amalgm' && persisted && persisted !== 'amalgm') {
     return persisted;
   }
   return existingAuth;
 }
 
+function normalizeEffort(value) {
+  if (typeof value !== 'string') return null;
+  const normalized = value.trim().toLowerCase().replace(/_/g, '-');
+  if (normalized === 'low') return 'low';
+  if (normalized === 'medium') return 'medium';
+  if (normalized === 'high') return 'high';
+  if (normalized === 'xhigh' || normalized === 'extra-high' || normalized === 'extra high') return 'xhigh';
+  if (normalized === 'max') return 'max';
+  return null;
+}
+
+function normalizeModelSettings(value, fallback = null, harnessId = null) {
+  const raw = isObject(value) ? value : isObject(fallback) ? fallback : null;
+  if (!raw) return null;
+  const effort = normalizeEffort(raw.effort || raw.reasoningEffort || raw.reasoning);
+  const allowedEfforts =
+    harnessId === 'claude_code'
+      ? new Set(['low', 'medium', 'high', 'xhigh', 'max'])
+      : harnessId === 'codex'
+        ? new Set(['low', 'medium', 'high', 'xhigh'])
+        : null;
+  const normalized = {
+    ...(effort && (!allowedEfforts || allowedEfforts.has(effort)) ? { effort } : {}),
+    ...((harnessId === 'claude_code' || harnessId === 'codex' || !harnessId)
+      && (raw.fastMode === true || raw.speed === 'fast')
+      ? { fastMode: true }
+      : {}),
+  };
+  return Object.keys(normalized).length > 0 ? normalized : null;
+}
+
 function normalizeLocation(inputLocation, fallback = {}) {
   const id = nonEmptyString(fallback.ownerComputerId) || computerId();
   const name = nonEmptyString(fallback.locationName) || computerName();
@@ -190,27 +234,24 @@ function defaultCapabilities(agent) {
   };
 }
 
-function normalizeMcpConfig(mcp, mcpAppIds, nativeMcps) {
+function normalizeMcpTransportConfig(toolConfig, mcpAppIds, nativeMcps) {
   return {
-    inheritAll: mcp?.inheritAll !== false,
-    customServers: Array.isArray(mcp?.customServers) ? mcp.customServers : [],
-    appIds: normalizeStringList(mcpAppIds !== undefined ? mcpAppIds : mcp?.appIds),
-    nativeMcps: normalizeStringList(nativeMcps !== undefined ? nativeMcps : mcp?.nativeMcps),
+    inheritAll: toolConfig.mode !== 'selected',
+    customServers: [],
+    appIds: normalizeStringList(mcpAppIds),
+    nativeMcps: normalizeStringList(nativeMcps),
   };
 }
 
-function normalizeToolConfig(tools, legacyMcp) {
+function normalizeToolConfig(tools) {
   const raw = isObject(tools) ? tools : null;
   const selectedToolIds = normalizeStringList(
     raw?.selectedToolIds
     ?? raw?.selected
-    ?? [
-      ...normalizeStringList(legacyMcp?.appIds),
-      ...normalizeStringList(legacyMcp?.nativeMcps),
-    ],
+    ?? [],
   );
   return {
-    mode: raw?.mode === 'selected' || (!raw && legacyMcp?.inheritAll === false) ? 'selected' : 'all',
+    mode: raw?.mode === 'selected' ? 'selected' : 'all',
     selectedToolIds,
   };
 }
@@ -221,8 +262,8 @@ function normalizeAgent(input, existing) {
   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);
-  const toolConfig = normalizeToolConfig(input.tools, mcpConfig);
+  const toolConfig = normalizeToolConfig(input.tools);
+  const mcpConfig = normalizeMcpTransportConfig(toolConfig, input.mcpAppIds, input.nativeMcps);
   const ownerComputerId = nonEmptyString(input.ownerComputerId || input.owner_computer_id)
     || nonEmptyString(existing?.ownerComputerId)
     || computerId();
@@ -240,6 +281,7 @@ function normalizeAgent(input, existing) {
     adapter,
     baseHarnessId,
     baseModelId: input.baseModelId || existing?.baseModelId || '',
+    modelSettings: normalizeModelSettings(input.modelSettings, existing?.modelSettings, baseHarnessId),
     systemPrompt: input.systemPrompt || '',
     files: normalizeStringList(input.files),
     skills: normalizeStringList(input.skills),
@@ -395,25 +437,46 @@ function customAgentRowCount(db = openLocalDb()) {
 function seedBuiltinAgents(options = {}) {
   const db = openLocalDb();
   const alreadySeeded = fs.existsSync(DEFAULT_AGENTS_SEEDED_FILE);
+  const authBackfilled = fs.existsSync(DEFAULT_AGENT_AUTH_BACKFILLED_FILE);
+  const modelSettingsBackfilled = fs.existsSync(DEFAULT_AGENT_MODEL_SETTINGS_BACKFILLED_FILE);
+  try {
+    readUserPreferences();
+  } catch {
+    // Best-effort preference cache fill for default agent bootstrapping.
+  }
   const events = db.transaction(() => {
     const inserted = [];
     for (const blueprint of BUILTIN_AGENT_BLUEPRINTS) {
       const existing = readAgentRow(db, blueprint.id);
       if (!existing && alreadySeeded) continue;
+      const baseModelId =
+        existing?.baseModelId ||
+        getSelectedModel(blueprint.baseHarnessId) ||
+        blueprint.baseModelId;
+      const modelSettings =
+        existing?.modelSettings ||
+        (!modelSettingsBackfilled
+          ? getModelSettingsForSelection(blueprint.baseHarnessId, baseModelId)
+          : null);
       const next = normalizeAgent({
         ...blueprint,
         name: existing?.name || blueprint.name,
         description: existing?.description ?? blueprint.description,
         adapter: existing?.adapter || blueprint.adapter,
         baseHarnessId: existing?.baseHarnessId || blueprint.baseHarnessId,
-        baseModelId: blueprint.baseModelId,
+        baseModelId,
         systemPrompt: existing?.systemPrompt || '',
         files: existing?.files || [],
         skills: existing?.skills || [],
         mcpAppIds: existing?.mcpAppIds || [],
-        nativeMcps: existing?.nativeMcps || [],
+        nativeMcps: [],
         tools: existing?.tools || { mode: 'all', selectedToolIds: [] },
-        mcp: existing?.mcp || { inheritAll: true, customServers: [], appIds: [], nativeMcps: [] },
+        mcp: {
+          inheritAll: existing?.tools?.mode !== 'selected',
+          customServers: [],
+          appIds: existing?.mcpAppIds || [],
+          nativeMcps: [],
+        },
         builtin: false,
         deletable: true,
         editable: true,
@@ -423,7 +486,12 @@ function seedBuiltinAgents(options = {}) {
         authDetails: existing?.authDetails,
         configDir: existing?.configDir,
         createdAt: existing?.createdAt,
-        authMethod: persistedAuthMethod(existing?.baseHarnessId || blueprint.baseHarnessId),
+        modelSettings,
+        authMethod: defaultAgentAuthMethod(
+          existing?.baseHarnessId || blueprint.baseHarnessId,
+          existing,
+          !authBackfilled,
+        ),
       }, existing);
       if (existing && agentsEqualForWrite(existing, next)) continue;
       upsertAgentRow(db, next);
@@ -438,6 +506,8 @@ function seedBuiltinAgents(options = {}) {
   try {
     ensureDir(STORAGE_DIR);
     fs.writeFileSync(DEFAULT_AGENTS_SEEDED_FILE, nowIso());
+    fs.writeFileSync(DEFAULT_AGENT_AUTH_BACKFILLED_FILE, nowIso());
+    fs.writeFileSync(DEFAULT_AGENT_MODEL_SETTINGS_BACKFILLED_FILE, nowIso());
   } catch {
     // Best-effort marker; default seeding still works without it.
   }
@@ -564,7 +634,6 @@ function updateAgent(agentId, updates, options = {}) {
     if (duplicate) throw new Error(`An agent named "${requestedName}" already exists`);
   }
 
-  const hasOwn = (key) => Object.prototype.hasOwnProperty.call(updates || {}, key);
   const merged = {
     ...existing,
     ...updates,
@@ -574,9 +643,6 @@ function updateAgent(agentId, updates, options = {}) {
     editable: existing.editable,
     updatedAt: nowIso(),
   };
-  if (!hasOwn('tools') && (hasOwn('mcp') || hasOwn('mcpAppIds') || hasOwn('nativeMcps'))) {
-    delete merged.tools;
-  }
 
   const next = normalizeAgent(merged, existing);
 

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

@@ -40,6 +40,9 @@ const {
 } = require('../../../lib/chatInput');
 const credentialAdapter = require('../../credential-adapter');
 const { buildLocalMcpServerConfigs } = require('../lib/mcp-resolver');
+const {
+  defaultToolboxService: toolboxService,
+} = require('../toolbox/service');
 
 const MAX_INLINE_MESSAGE_CHARS = Number(
   process.env.AMALGM_TALK_TO_AGENT_MAX_INLINE_CHARS
@@ -340,6 +343,39 @@ function coerceAuthMethodForHarness(harnessId, authMethod) {
   return supported.includes(authMethod) ? authMethod : supported[0] || 'amalgm';
 }
 
+function normalizeEffort(value) {
+  if (typeof value !== 'string') return null;
+  const normalized = value.trim().toLowerCase().replace(/_/g, '-');
+  if (normalized === 'low') return 'low';
+  if (normalized === 'medium') return 'medium';
+  if (normalized === 'high') return 'high';
+  if (normalized === 'xhigh' || normalized === 'extra-high' || normalized === 'extra high') return 'xhigh';
+  if (normalized === 'max') return 'max';
+  return null;
+}
+
+function sanitizeAgentModelSettings(settings, harness) {
+  if (!settings || typeof settings !== 'object' || Array.isArray(settings)) return {};
+  const effort = normalizeEffort(settings.effort || settings.reasoningEffort || settings.reasoning);
+  const allowedEfforts =
+    harness === 'claude_code'
+      ? new Set(['low', 'medium', 'high', 'xhigh', 'max'])
+      : harness === 'codex'
+        ? new Set(['low', 'medium', 'high', 'xhigh'])
+        : new Set();
+  return {
+    ...(effort && allowedEfforts.has(effort) ? { effort } : {}),
+    ...((harness === 'claude_code' || harness === 'codex') && settings.fastMode === true ? { fastMode: true } : {}),
+  };
+}
+
+function modelIdForAgentSettings(modelId, harness, modelSettings) {
+  if (harness !== 'codex' || !modelSettings.effort || typeof modelId !== 'string') return modelId;
+  return modelId
+    .replace(/(?::thinking-|-thinking-)(low|medium|high|xhigh)$/i, '')
+    .replace(/\/(low|medium|high|xhigh)$/i, '') + '/' + modelSettings.effort;
+}
+
 async function appendAsyncCompletionToCallerSession({
   callerSessionId,
   agent,
@@ -550,19 +586,17 @@ async function handleTalkToAgent(args, context = {}) {
     ? credentialAdapter.getPersistedAuthMode(agent.baseHarnessId)
     : 'amalgm';
   const preferredAuthMethod = getPreferredAuthMethod(agent.baseHarnessId, persistedAuthMethod);
-  const isDefaultAgentClass = agent.id === agent.baseHarnessId;
   const defaultAuthMethod = coerceAuthMethodForHarness(
     agent.baseHarnessId,
-    isDefaultAgentClass && agent.authMethod === 'amalgm' && preferredAuthMethod !== 'amalgm'
-      ? preferredAuthMethod
-      : agent.authMethod || preferredAuthMethod,
+    agent.authMethod || preferredAuthMethod,
   );
   const agentFiles = normalizeStringList(agent.files);
   const agentSkills = normalizeStringList(agent.skills);
   const agentTools = agent.tools || { mode: 'all', selectedToolIds: [] };
-  const agentMcpAppIds = agentTools.mode === 'selected'
-    ? normalizeStringList(agentTools.selectedToolIds)
-    : normalizeStringList(agent.mcp?.appIds ?? agent.mcpAppIds);
+  const agentMcpAppIds = toolboxService.externalMcpToolIdsForMode(
+    agentTools.mode,
+    agentTools.selectedToolIds,
+  );
   const baseAgentSystemPrompt = buildAgentInstructions(
     agent.systemPrompt,
     agentFiles,
@@ -576,35 +610,27 @@ async function handleTalkToAgent(args, context = {}) {
   const fallbackModelId = agent.builtin
     ? agent.baseModelId
     : agent.baseModelId || DEFAULT_SELECTED_MODELS[agent.baseHarnessId] || null;
+  const agentModelSettings = sanitizeAgentModelSettings(agent.modelSettings, agent.baseHarnessId);
+  const effectiveModelId = modelIdForAgentSettings(
+    fallbackModelId,
+    agent.baseHarnessId,
+    agentModelSettings,
+  );
   const normalizedChatInput = normalizeChatInput({
     ...(isObject(chatInput) ? chatInput : {}),
     agent: {
       ...((isObject(chatInput) && isObject(chatInput.agent)) ? chatInput.agent : {}),
-      harness:
-        ((isObject(chatInput) && isObject(chatInput.agent) && chatInput.agent.harness) || null)
-        || agent.baseHarnessId,
-      model:
-        ((isObject(chatInput) && isObject(chatInput.agent) && chatInput.agent.model) || null)
-        || fallbackModelId,
-      authMethod: coerceAuthMethodForHarness(
-        agent.baseHarnessId,
-        ((isObject(chatInput) && isObject(chatInput.agent) && chatInput.agent.authMethod) || null)
-        || defaultAuthMethod,
-      ),
+      harness: agent.baseHarnessId,
+      model: effectiveModelId,
+      authMethod: defaultAuthMethod,
       customAgentId: agent.builtin ? null : agent.id,
-      systemPrompt:
-        ((isObject(chatInput) && isObject(chatInput.agent) && chatInput.agent.systemPrompt) || null)
-        || agentSystemPrompt
-        || null,
+      systemPrompt: agentSystemPrompt || null,
     },
     tools: {
       ...((isObject(chatInput) && isObject(chatInput.tools)) ? chatInput.tools : {}),
-      mcpAppIds: normalizeStringList([
-        ...agentMcpAppIds,
-        ...((((isObject(chatInput) && isObject(chatInput.tools) && Array.isArray(chatInput.tools.mcpAppIds))
-          ? chatInput.tools.mcpAppIds
-          : []))),
-      ]),
+      mode: agentTools.mode,
+      toolIds: normalizeStringList(agentTools.selectedToolIds),
+      mcpAppIds: agentMcpAppIds,
     },
     execution: {
       ...((isObject(chatInput) && isObject(chatInput.execution)) ? chatInput.execution : {}),
@@ -616,7 +642,7 @@ async function handleTalkToAgent(args, context = {}) {
   }, {
     prompt: taskPrompt,
     harness: agent.baseHarnessId,
-    modelId: fallbackModelId,
+    modelId: effectiveModelId,
     authMethod: defaultAuthMethod,
     cwd,
     systemPrompt: agentSystemPrompt,
@@ -624,7 +650,7 @@ async function handleTalkToAgent(args, context = {}) {
   const legacyChatFields = chatInputToLegacyFields(normalizedChatInput, {
     prompt: taskPrompt,
     harness: agent.baseHarnessId,
-    modelId: fallbackModelId,
+    modelId: effectiveModelId,
     authMethod: defaultAuthMethod,
     cwd,
     systemPrompt: agentSystemPrompt,
@@ -723,11 +749,12 @@ async function handleTalkToAgent(args, context = {}) {
             taskDescription,
             computerId,
             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],
+            modelSettings: agentModelSettings,
+            authMethod: defaultAuthMethod,
             isAgentConversation: true,
             builtin: !!agent.builtin,
             systemPrompt: baseAgentSystemPrompt || '',
@@ -776,8 +803,9 @@ async function handleTalkToAgent(args, context = {}) {
   try {
     const { modelId: uiModelId, cliModel, reasoningEffort } = resolveModelSelection(
       agent.baseHarnessId,
-      legacyChatFields.modelId || fallbackModelId,
+      legacyChatFields.modelId || effectiveModelId,
     );
+    const effectiveReasoningEffort = agentModelSettings.effort || reasoningEffort;
     const mcpServers = await buildLocalMcpServerConfigs(legacyChatFields.mcpAppIds || []);
 
     const chatPayload = {
@@ -793,7 +821,8 @@ async function handleTalkToAgent(args, context = {}) {
       agentId: chatAgentId,
       modelId: uiModelId,
       cliModel,
-      ...(reasoningEffort ? { reasoningEffort } : {}),
+      ...(effectiveReasoningEffort ? { reasoningEffort: effectiveReasoningEffort } : {}),
+      ...(agentModelSettings.fastMode ? { fastMode: true } : {}),
       cwd: legacyChatFields.cwd || DEFAULT_CWD,
       authMethod: legacyChatFields.authMethod || defaultAuthMethod,
       mcpServers,

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

@@ -64,10 +64,6 @@ module.exports = [
           getSelectedModel(agent.baseHarnessId) ||
           DEFAULT_SELECTED_MODELS[agent.baseHarnessId],
         systemPrompt: agent.systemPrompt ? '(configured)' : '(none)',
-        mcp: {
-          inheritAll: agent.mcp?.inheritAll ?? true,
-          customServerCount: agent.mcp?.customServers?.length ?? 0,
-        },
         tools: agent.tools || { mode: 'all', selectedToolIds: [] },
         location: agent.location || null,
         locationName: agent.locationName || null,

package/runtime/scripts/amalgm-mcp/automations/runner.js

@@ -9,7 +9,7 @@ const { DEFAULT_CWD } = require('../config');
 const { compileWorkflowText } = require('../workflows/compiler');
 const { callToolboxMcpTool, toolboxMcpToolName } = require('../toolbox/runner');
 const { buildWorkflowInput } = require('./context');
-const { resolveAmalgmCoreTool, resolveToolboxAction, suggestWorkflowToolActions } = require('./tool-actions');
+const { resolveFirstPartyToolAction, resolveToolboxAction, suggestWorkflowToolActions } = require('./tool-actions');
 const {
   getAutomation,
   getAutomationByTriggerId,
@@ -290,10 +290,9 @@ async function runToolCell(cell, args, allowlist) {
     return runHttpTool(args);
   }
 
-  if (cell.toolId === 'amalgm') {
-    const coreTool = resolveAmalgmCoreTool(cell.actionName);
-    if (!coreTool?.handler) throw new Error(`Amalgm action not found: ${cell.actionName}.`);
-    const result = await coreTool.handler(args, {
+  const firstPartyAction = resolveFirstPartyToolAction(cell.toolId, cell.actionName);
+  if (firstPartyAction) {
+    const result = await firstPartyAction.tool.handler(args, {
       workflow: true,
       sessionMetadata: {
         origin: 'automation-workflow',