amalgm 0.1.147 → 0.1.148

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.147",
+  "version": "0.1.148",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,
@@ -32,11 +32,11 @@
   },
   "dependencies": {
     "@ai-sdk/gateway": "^3.0.131",
-    "@anthropic-ai/claude-agent-sdk": "^0.3.177",
+    "@anthropic-ai/claude-agent-sdk": "^0.3.206",
     "@anthropic-ai/sdk": "^0.104.1",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@openai/codex": "^0.139.0",
+    "@openai/codex": "^0.144.1",
     "@opencode-ai/sdk": "^1.17.6",
     "agent-browser": "^0.27.3",
     "ai": "^6.0.205",

package/runtime/lib/harnesses.js

@@ -57,7 +57,7 @@ function buildGatewayCliModel(gatewayId, harness) {
 // lib/modelNaming.ts
 var DEFAULT_MODEL_IDS = {
   claude_code: "anthropic/claude-opus-4.8",
-  codex: "openai/gpt-5.5",
+  codex: "openai/gpt-5.6-sol",
   opencode: "opencode-deepseek-deepseek-v4-pro",
   pi: "pi-anthropic-claude-sonnet-4.6",
   amp: "amp-default",
@@ -84,19 +84,21 @@ var CLAUDE_LEGACY_ALIASES = {
   "claude-code-opus-4-8-1m": CLAUDE_OPUS_4_8_1M_MODEL_ID,
   "claude-code-opus-4.7-1m": CLAUDE_OPUS_4_8_1M_MODEL_ID,
   "claude-code-opus-4-7-1m": CLAUDE_OPUS_4_8_1M_MODEL_ID,
-  "claude-code-sonnet": "anthropic/claude-sonnet-4.6",
-  "claude-code-sonnet-45": "anthropic/claude-sonnet-4.6",
-  "claude-code-sonnet-4.6": "anthropic/claude-sonnet-4.6",
-  "claude-code-sonnet-4-6": "anthropic/claude-sonnet-4.6",
-  "claude-code-sonnet-4.5": "anthropic/claude-sonnet-4.6",
-  "claude-code-sonnet-4-5": "anthropic/claude-sonnet-4.6",
+  "claude-code-sonnet": "anthropic/claude-sonnet-5",
+  "claude-code-sonnet-5": "anthropic/claude-sonnet-5",
+  "claude-code-sonnet-45": "anthropic/claude-sonnet-5",
+  "claude-code-sonnet-4.6": "anthropic/claude-sonnet-5",
+  "claude-code-sonnet-4-6": "anthropic/claude-sonnet-5",
+  "claude-code-sonnet-4.5": "anthropic/claude-sonnet-5",
+  "claude-code-sonnet-4-5": "anthropic/claude-sonnet-5",
   "claude-code-haiku": "anthropic/claude-haiku-4.5",
   "claude-code-haiku-4.5": "anthropic/claude-haiku-4.5",
   "claude-code-haiku-4-5": "anthropic/claude-haiku-4.5",
   "anthropic/claude-opus-4.7": "anthropic/claude-opus-4.8",
   "anthropic/claude-opus-4.6": "anthropic/claude-opus-4.8",
   "anthropic/claude-opus-4.5": "anthropic/claude-opus-4.8",
-  "anthropic/claude-sonnet-4.5": "anthropic/claude-sonnet-4.6",
+  "anthropic/claude-sonnet-4.6": "anthropic/claude-sonnet-5",
+  "anthropic/claude-sonnet-4.5": "anthropic/claude-sonnet-5",
   "claude-opus-4.8-1m": CLAUDE_OPUS_4_8_1M_MODEL_ID,
   "claude-opus-4-8-1m": CLAUDE_OPUS_4_8_1M_MODEL_ID,
   "claude-opus-4.7-1m": CLAUDE_OPUS_4_8_1M_MODEL_ID,
@@ -104,8 +106,9 @@ var CLAUDE_LEGACY_ALIASES = {
   opus: "anthropic/claude-opus-4.8",
   opus1m: CLAUDE_OPUS_4_8_1M_MODEL_ID,
   "opus[1m]": CLAUDE_OPUS_4_8_1M_MODEL_ID,
-  sonnet: "anthropic/claude-sonnet-4.6",
-  "sonnet[1m]": "anthropic/claude-sonnet-4.6",
+  sonnet: "anthropic/claude-sonnet-5",
+  "sonnet[1m]": "anthropic/claude-sonnet-5",
+  "sonnet-5": "anthropic/claude-sonnet-5",
   haiku: "anthropic/claude-haiku-4.5",
   fable: "anthropic/claude-fable-5",
   "claude-code-fable": "anthropic/claude-fable-5",
@@ -117,6 +120,7 @@ var CLAUDE_HARNESS_MODELS = {
   "anthropic/claude-opus-4.7": "opus",
   "anthropic/claude-opus-4.6": "opus",
   "anthropic/claude-opus-4.5": "opus",
+  "anthropic/claude-sonnet-5": "sonnet",
   "anthropic/claude-sonnet-4.6": "sonnet",
   "anthropic/claude-sonnet-4.5": "sonnet",
   "anthropic/claude-haiku-4.5": "haiku",
@@ -202,8 +206,8 @@ var CURSOR_CLI_ALIASES = {
   "composer-2": "composer-2.5",
   "composer-2-fast": "composer-2.5-fast"
 };
-var CODEX_THINKING_SUFFIX_RE = /:thinking-(low|medium|high|xhigh)$/i;
-var CODEX_LEGACY_THINKING_SUFFIX_RE = /-thinking-(low|medium|high|xhigh)$/i;
+var CODEX_THINKING_SUFFIX_RE = /:thinking-(low|medium|high|xhigh|max|ultra)$/i;
+var CODEX_LEGACY_THINKING_SUFFIX_RE = /-thinking-(low|medium|high|xhigh|max|ultra)$/i;
 function cleanModelId(value) {
   return value.trim().replace(/^vercel\//i, "").toLowerCase();
 }
@@ -214,7 +218,8 @@ function normalizeClaudeModelPart(modelPart) {
     "claude-opus-4.7": "claude-opus-4.8",
     "claude-opus-4.6": "claude-opus-4.8",
     "claude-opus-4.5": "claude-opus-4.8",
-    "claude-sonnet-4.5": "claude-sonnet-4.6"
+    "claude-sonnet-4.6": "claude-sonnet-5",
+    "claude-sonnet-4.5": "claude-sonnet-5"
   }[base] ?? base;
   return hasOneMillionContext && currentBase === "claude-opus-4.8" ? `${currentBase}-1m` : currentBase;
 }
@@ -244,7 +249,7 @@ function codexGatewayModelId(modelId) {
 }
 function codexHarnessModelId(modelId, effort) {
   const baseModel = codexGatewayModelId(modelId).replace(/^openai\//, "");
-  if (effort && /^gpt-5\.[45](?:-mini)?$/i.test(baseModel)) {
+  if (effort && /^gpt-5\.(?:[45](?:-mini)?|6-(?:sol|terra|luna))$/i.test(baseModel)) {
     return `${baseModel}/${effort}`;
   }
   return baseModel;
@@ -252,7 +257,7 @@ function codexHarnessModelId(modelId, effort) {
 function normalizeCodexModelSelection(value) {
   const cleaned = cleanModelId(value);
   const legacyThinkingMatch = cleaned.match(
-    /^(codex-[a-z0-9.-]+(?:-[a-z0-9.-]+)*)-thinking-(low|medium|high|xhigh)$/i
+    /^(codex-[a-z0-9.-]+(?:-[a-z0-9.-]+)*)-thinking-(low|medium|high|xhigh|max|ultra)$/i
   );
   if (legacyThinkingMatch) {
     const effort = legacyThinkingMatch[2].toLowerCase();
@@ -262,7 +267,7 @@ function normalizeCodexModelSelection(value) {
     };
   }
   const canonicalThinkingMatch = cleaned.match(
-    /^((?:openai\/)?(?:gpt|o)[a-z0-9.-]+(?:-[a-z0-9.-]+)*)(?::thinking-|-thinking-)(low|medium|high|xhigh)$/i
+    /^((?:openai\/)?(?:gpt|o)[a-z0-9.-]+(?:-[a-z0-9.-]+)*)(?::thinking-|-thinking-)(low|medium|high|xhigh|max|ultra)$/i
   );
   if (canonicalThinkingMatch) {
     const effort = canonicalThinkingMatch[2].toLowerCase();
@@ -272,7 +277,7 @@ function normalizeCodexModelSelection(value) {
     };
   }
   const slashThinkingMatch = cleaned.match(
-    /^((?:openai\/)?(?:gpt|o)[a-z0-9.-]+(?:-[a-z0-9.-]+)*)\/(low|medium|high|xhigh)$/i
+    /^((?:openai\/)?(?:gpt|o)[a-z0-9.-]+(?:-[a-z0-9.-]+)*)\/(low|medium|high|xhigh|max|ultra)$/i
   );
   if (slashThinkingMatch) {
     const effort = slashThinkingMatch[2].toLowerCase();
@@ -495,11 +500,11 @@ var CLAUDE_MODELS = [
     providerGroup: "anthropic"
   },
   {
-    id: "anthropic/claude-sonnet-4.6",
-    name: "Sonnet 4.6",
+    id: "anthropic/claude-sonnet-5",
+    name: "Sonnet 5",
     description: "Balanced Claude Code model",
-    gatewayModelId: "anthropic/claude-sonnet-4.6",
-    cliModel: modelIdToHarnessModel("anthropic/claude-sonnet-4.6", "claude_code"),
+    gatewayModelId: "anthropic/claude-sonnet-5",
+    cliModel: modelIdToHarnessModel("anthropic/claude-sonnet-5", "claude_code"),
     provider: "claude",
     providerGroup: "anthropic"
   },
@@ -747,7 +752,7 @@ var CURSOR_MODELS = CURSOR_MODEL_ROWS.map(
     };
   }
 );
-function codexModel(id, name, description, reasoningEffort, gatewayModelId = id.replace(/(?::thinking-|-thinking-)(low|medium|high|xhigh)$/i, ""), providerGroup = id.includes("gpt-5.5") ? "gpt-5.5" : "gpt-5.4") {
+function codexModel(id, name, description, reasoningEffort, gatewayModelId = id.replace(/(?::thinking-|-thinking-)(low|medium|high|xhigh|max|ultra)$/i, ""), providerGroup = id.includes("gpt-5.6") ? "gpt-5.6" : id.includes("gpt-5.5") ? "gpt-5.5" : "gpt-5.4") {
   return {
     id,
     name,
@@ -760,6 +765,21 @@ function codexModel(id, name, description, reasoningEffort, gatewayModelId = id.
   };
 }
 var CODEX_MODELS = [
+  codexModel(
+    "openai/gpt-5.6-sol",
+    "GPT-5.6 Sol",
+    "Flagship GPT-5.6 tier for complex coding and agentic work"
+  ),
+  codexModel(
+    "openai/gpt-5.6-terra",
+    "GPT-5.6 Terra",
+    "Balanced GPT-5.6 tier for everyday work"
+  ),
+  codexModel(
+    "openai/gpt-5.6-luna",
+    "GPT-5.6 Luna",
+    "Fastest, lowest-cost GPT-5.6 tier"
+  ),
   codexModel(
     "openai/gpt-5.5",
     "GPT-5.5",

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

@@ -184,6 +184,7 @@ function normalizeEffort(value) {
   if (normalized === 'high') return 'high';
   if (normalized === 'xhigh' || normalized === 'extra-high' || normalized === 'extra high') return 'xhigh';
   if (normalized === 'max') return 'max';
+  if (normalized === 'ultra') return 'ultra';
   return null;
 }
 
@@ -195,11 +196,11 @@ function normalizeModelSettings(value, fallback = null, harnessId = null) {
     harnessId === 'claude_code'
       ? new Set(['low', 'medium', 'high', 'xhigh', 'max'])
       : harnessId === 'codex'
-        ? new Set(['low', 'medium', 'high', 'xhigh'])
+        ? new Set(['low', 'medium', 'high', 'xhigh', 'max', 'ultra'])
         : null;
   const normalized = {
     ...(effort && (!allowedEfforts || allowedEfforts.has(effort)) ? { effort } : {}),
-    ...((harnessId === 'claude_code' || harnessId === 'codex' || !harnessId)
+    ...((harnessId === 'codex' || !harnessId)
       && (raw.fastMode === true || raw.speed === 'fast')
       ? { fastMode: true }
       : {}),

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

@@ -361,6 +361,7 @@ function normalizeEffort(value) {
   if (normalized === 'high') return 'high';
   if (normalized === 'xhigh' || normalized === 'extra-high' || normalized === 'extra high') return 'xhigh';
   if (normalized === 'max') return 'max';
+  if (normalized === 'ultra') return 'ultra';
   return null;
 }
 
@@ -371,19 +372,19 @@ function sanitizeAgentModelSettings(settings, harness) {
     harness === 'claude_code'
       ? new Set(['low', 'medium', 'high', 'xhigh', 'max'])
       : harness === 'codex'
-        ? new Set(['low', 'medium', 'high', 'xhigh'])
+        ? new Set(['low', 'medium', 'high', 'xhigh', 'max', 'ultra'])
         : new Set();
   return {
     ...(effort && allowedEfforts.has(effort) ? { effort } : {}),
-    ...((harness === 'claude_code' || harness === 'codex') && settings.fastMode === true ? { fastMode: true } : {}),
+    ...(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;
+    .replace(/(?::thinking-|-thinking-)(low|medium|high|xhigh|max|ultra)$/i, '')
+    .replace(/\/(low|medium|high|xhigh|max|ultra)$/i, '') + '/' + modelSettings.effort;
 }
 
 async function appendAsyncCompletionToCallerSession({

package/runtime/scripts/amalgm-mcp/lib/prefs.js

@@ -15,7 +15,7 @@ const {
 
 const DEFAULT_SELECTED_MODELS = {
   claude_code: 'anthropic/claude-opus-4.8',
-  codex: 'openai/gpt-5.5',
+  codex: 'openai/gpt-5.6-sol',
   opencode: 'opencode-deepseek-deepseek-v4-pro',
   pi: 'pi-anthropic-claude-sonnet-4.6',
   amp: 'amp-default',
@@ -70,19 +70,21 @@ const CLAUDE_LEGACY_ALIASES = {
   'claude-code-opus-4-8-1m': CLAUDE_OPUS_4_8_1M_MODEL_ID,
   'claude-code-opus-4.7-1m': CLAUDE_OPUS_4_8_1M_MODEL_ID,
   'claude-code-opus-4-7-1m': CLAUDE_OPUS_4_8_1M_MODEL_ID,
-  'claude-code-sonnet': 'anthropic/claude-sonnet-4.6',
-  'claude-code-sonnet-45': 'anthropic/claude-sonnet-4.6',
-  'claude-code-sonnet-4.6': 'anthropic/claude-sonnet-4.6',
-  'claude-code-sonnet-4-6': 'anthropic/claude-sonnet-4.6',
-  'claude-code-sonnet-4.5': 'anthropic/claude-sonnet-4.6',
-  'claude-code-sonnet-4-5': 'anthropic/claude-sonnet-4.6',
+  'claude-code-sonnet': 'anthropic/claude-sonnet-5',
+  'claude-code-sonnet-5': 'anthropic/claude-sonnet-5',
+  'claude-code-sonnet-45': 'anthropic/claude-sonnet-5',
+  'claude-code-sonnet-4.6': 'anthropic/claude-sonnet-5',
+  'claude-code-sonnet-4-6': 'anthropic/claude-sonnet-5',
+  'claude-code-sonnet-4.5': 'anthropic/claude-sonnet-5',
+  'claude-code-sonnet-4-5': 'anthropic/claude-sonnet-5',
   'claude-code-haiku': 'anthropic/claude-haiku-4.5',
   'claude-code-haiku-4.5': 'anthropic/claude-haiku-4.5',
   'claude-code-haiku-4-5': 'anthropic/claude-haiku-4.5',
   'anthropic/claude-opus-4.7': 'anthropic/claude-opus-4.8',
   'anthropic/claude-opus-4.6': 'anthropic/claude-opus-4.8',
   'anthropic/claude-opus-4.5': 'anthropic/claude-opus-4.8',
-  'anthropic/claude-sonnet-4.5': 'anthropic/claude-sonnet-4.6',
+  'anthropic/claude-sonnet-4.6': 'anthropic/claude-sonnet-5',
+  'anthropic/claude-sonnet-4.5': 'anthropic/claude-sonnet-5',
   'claude-opus-4.8-1m': CLAUDE_OPUS_4_8_1M_MODEL_ID,
   'claude-opus-4-8-1m': CLAUDE_OPUS_4_8_1M_MODEL_ID,
   'claude-opus-4.7-1m': CLAUDE_OPUS_4_8_1M_MODEL_ID,
@@ -90,8 +92,9 @@ const CLAUDE_LEGACY_ALIASES = {
   opus: 'anthropic/claude-opus-4.8',
   opus1m: CLAUDE_OPUS_4_8_1M_MODEL_ID,
   'opus[1m]': CLAUDE_OPUS_4_8_1M_MODEL_ID,
-  sonnet: 'anthropic/claude-sonnet-4.6',
-  'sonnet[1m]': 'anthropic/claude-sonnet-4.6',
+  sonnet: 'anthropic/claude-sonnet-5',
+  'sonnet[1m]': 'anthropic/claude-sonnet-5',
+  'sonnet-5': 'anthropic/claude-sonnet-5',
   haiku: 'anthropic/claude-haiku-4.5',
   fable: 'anthropic/claude-fable-5',
   'claude-code-fable': 'anthropic/claude-fable-5',
@@ -104,14 +107,15 @@ const CLAUDE_HARNESS_MODELS = {
   'anthropic/claude-opus-4.7': 'opus',
   'anthropic/claude-opus-4.6': 'opus',
   'anthropic/claude-opus-4.5': 'opus',
+  'anthropic/claude-sonnet-5': 'sonnet',
   'anthropic/claude-sonnet-4.6': 'sonnet',
   'anthropic/claude-sonnet-4.5': 'sonnet',
   'anthropic/claude-haiku-4.5': 'haiku',
   'anthropic/claude-fable-5': 'claude-fable-5',
 };
 
-const CODEX_THINKING_SUFFIX_RE = /:thinking-(low|medium|high|xhigh)$/i;
-const CODEX_LEGACY_THINKING_SUFFIX_RE = /-thinking-(low|medium|high|xhigh)$/i;
+const CODEX_THINKING_SUFFIX_RE = /:thinking-(low|medium|high|xhigh|max|ultra)$/i;
+const CODEX_LEGACY_THINKING_SUFFIX_RE = /-thinking-(low|medium|high|xhigh|max|ultra)$/i;
 
 const CURSOR_MODEL_ALIASES = {
   'cursor-opus-4.6-thinking': 'anthropic/claude-opus-4.6-high-thinking',
@@ -178,7 +182,8 @@ function normalizeClaudeModelPart(modelPart) {
     'claude-opus-4.7': 'claude-opus-4.8',
     'claude-opus-4.6': 'claude-opus-4.8',
     'claude-opus-4.5': 'claude-opus-4.8',
-    'claude-sonnet-4.5': 'claude-sonnet-4.6',
+    'claude-sonnet-4.6': 'claude-sonnet-5',
+    'claude-sonnet-4.5': 'claude-sonnet-5',
   }[base] || base;
   return hasOneMillionContext && currentBase === 'claude-opus-4.8'
     ? currentBase + '-1m'
@@ -215,7 +220,7 @@ function codexGatewayModelId(modelId) {
 
 function codexHarnessModelId(modelId, effort) {
   const baseModel = codexGatewayModelId(modelId).replace(/^openai\//, '');
-  if (effort && /^gpt-5\.[45](?:-mini)?$/i.test(baseModel)) {
+  if (effort && /^gpt-5\.(?:[45](?:-mini)?|6-(?:sol|terra|luna))$/i.test(baseModel)) {
     return `${baseModel}/${effort}`;
   }
   return baseModel;
@@ -285,7 +290,7 @@ function normalizeModelSelection(harnessId, modelId) {
   }
 
   if (harnessId === 'codex') {
-    const legacyThinkingMatch = cleaned.match(/^(codex-[a-z0-9.-]+(?:-[a-z0-9.-]+)*)-thinking-(low|medium|high|xhigh)$/i);
+    const legacyThinkingMatch = cleaned.match(/^(codex-[a-z0-9.-]+(?:-[a-z0-9.-]+)*)-thinking-(low|medium|high|xhigh|max|ultra)$/i);
     if (legacyThinkingMatch) {
       const effort = legacyThinkingMatch[2].toLowerCase();
       return {
@@ -293,7 +298,7 @@ function normalizeModelSelection(harnessId, modelId) {
         reasoningEffort: effort,
       };
     }
-    const canonicalThinkingMatch = cleaned.match(/^((?:openai\/)?(?:gpt|o)[a-z0-9.-]+(?:-[a-z0-9.-]+)*)(?::thinking-|-thinking-)(low|medium|high|xhigh)$/i);
+    const canonicalThinkingMatch = cleaned.match(/^((?:openai\/)?(?:gpt|o)[a-z0-9.-]+(?:-[a-z0-9.-]+)*)(?::thinking-|-thinking-)(low|medium|high|xhigh|max|ultra)$/i);
     if (canonicalThinkingMatch) {
       const effort = canonicalThinkingMatch[2].toLowerCase();
       return {
@@ -301,7 +306,7 @@ function normalizeModelSelection(harnessId, modelId) {
         reasoningEffort: effort,
       };
     }
-    const slashThinkingMatch = cleaned.match(/^((?:openai\/)?(?:gpt|o)[a-z0-9.-]+(?:-[a-z0-9.-]+)*)\/(low|medium|high|xhigh)$/i);
+    const slashThinkingMatch = cleaned.match(/^((?:openai\/)?(?:gpt|o)[a-z0-9.-]+(?:-[a-z0-9.-]+)*)\/(low|medium|high|xhigh|max|ultra)$/i);
     if (slashThinkingMatch) {
       const effort = slashThinkingMatch[2].toLowerCase();
       return {
@@ -369,6 +374,8 @@ function normalizeReasoningEffort(value) {
   if (normalized === 'xhigh' || normalized === 'extra-high' || normalized === 'extra high') {
     return 'xhigh';
   }
+  if (normalized === 'max') return 'max';
+  if (normalized === 'ultra') return 'ultra';
   return null;
 }
 

package/runtime/scripts/amalgm-mcp/tasks/executor.js

@@ -59,6 +59,7 @@ function normalizeEffort(value) {
   if (normalized === 'high') return 'high';
   if (normalized === 'xhigh' || normalized === 'extra-high' || normalized === 'extra high') return 'xhigh';
   if (normalized === 'max') return 'max';
+  if (normalized === 'ultra') return 'ultra';
   return null;
 }
 
@@ -69,19 +70,19 @@ function sanitizeRunModelSettings(settings, harness) {
     harness === 'claude_code'
       ? new Set(['low', 'medium', 'high', 'xhigh', 'max'])
       : harness === 'codex'
-        ? new Set(['low', 'medium', 'high', 'xhigh'])
+        ? new Set(['low', 'medium', 'high', 'xhigh', 'max', 'ultra'])
         : new Set();
   return {
     ...(effort && allowedEfforts.has(effort) ? { effort } : {}),
-    ...((harness === 'claude_code' || harness === 'codex') && settings.fastMode === true ? { fastMode: true } : {}),
+    ...(harness === 'codex' && settings.fastMode === true ? { fastMode: true } : {}),
   };
 }
 
 function modelIdForSettings(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, '');
+    .replace(/(?::thinking-|-thinking-)(low|medium|high|xhigh|max|ultra)$/i, '')
+    .replace(/\/(low|medium|high|xhigh|max|ultra)$/i, '');
 }
 
 function disableTerminalScheduleIfNeeded(task) {

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

@@ -37,7 +37,6 @@ class ClaudeAdapter {
     const pathToClaudeCodeExecutable = process.env.CLAUDE_CODE_BINARY || bundledClaudeBinary();
     const settings = {
       ...toClaudeSettings(contract.agentConfig),
-      ...(contract.fastMode ? { fastMode: true, fastModePerSessionOptIn: true } : {}),
     };
     return {
       cwd: contract.cwd,

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

@@ -552,7 +552,7 @@ class CodexAdapter {
           threadId: session.providerSessionId,
           input: [{ type: 'text', text: prompt }],
           cwd: contract.cwd,
-          model: contract.cliModel.replace(/\/(?:low|medium|high|xhigh)$/i, ''),
+          model: contract.cliModel.replace(/\/(?:low|medium|high|xhigh|max|ultra)$/i, ''),
           effort: contract.reasoningEffort || undefined,
           serviceTier: serviceTierForContract(contract),
           approvalPolicy: 'never',

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

@@ -263,6 +263,7 @@ function cliModelFor({ harness, modelId, cliModel, reasoningEffort }) {
     const canonical = canonicalModel(clean, harness);
     const aliases = {
       'anthropic/claude-haiku-4.5': 'haiku',
+      'anthropic/claude-sonnet-5': 'sonnet',
       'anthropic/claude-sonnet-4.6': 'sonnet',
       'anthropic/claude-opus-4.8': 'opus',
       'anthropic/claude-opus-4.8-1m': 'opus[1m]',
@@ -271,6 +272,8 @@ function cliModelFor({ harness, modelId, cliModel, reasoningEffort }) {
       'anthropic/claude-fable-5': 'claude-fable-5',
       'haiku': 'haiku',
       'sonnet': 'sonnet',
+      'sonnet-5': 'sonnet',
+      'claude-sonnet-5': 'sonnet',
       'opus': 'opus',
       'opus1m': 'opus[1m]',
       'opus[1m]': 'opus[1m]',
@@ -284,12 +287,12 @@ function cliModelFor({ harness, modelId, cliModel, reasoningEffort }) {
   if (harness === 'codex') {
     let base = clean.replace(/^openai\//, '');
     let effort = reasoningEffort;
-    const slashEffort = base.match(/\/(low|medium|high|xhigh)$/i);
+    const slashEffort = base.match(/\/(low|medium|high|xhigh|max|ultra)$/i);
     if (slashEffort) {
       effort ||= slashEffort[1].toLowerCase();
       base = base.slice(0, -slashEffort[0].length);
     }
-    const thinkingEffort = base.match(/-thinking-(low|medium|high|xhigh)$/i);
+    const thinkingEffort = base.match(/-thinking-(low|medium|high|xhigh|max|ultra)$/i);
     if (!cliModel && thinkingEffort) {
       effort ||= thinkingEffort[1].toLowerCase();
       base = base.slice(0, -thinkingEffort[0].length);

package/runtime/scripts/chat-server/model-catalog.js

@@ -55,6 +55,7 @@ const MODEL_CATALOG = [
   { id: "anthropic/claude-sonnet-4", name: "Claude Sonnet 4", provider: "anthropic", contextWindow: 1000000, maxOutput: 64000, inputPrice: 3, outputPrice: 15, cacheRead: 0.3, cacheWrite: 3.75, tags: ["file-input", "reasoning", "tool-use", "vision", "explicit-caching"], released: "2025-05-22" },
   { id: "anthropic/claude-sonnet-4.5", name: "Claude Sonnet 4.5", provider: "anthropic", contextWindow: 1000000, maxOutput: 64000, inputPrice: 3, outputPrice: 15, cacheRead: 0.3, cacheWrite: 3.75, tags: ["file-input", "reasoning", "tool-use", "vision", "explicit-caching"], released: "2025-09-29" },
   { id: "anthropic/claude-sonnet-4.6", name: "Claude Sonnet 4.6", provider: "anthropic", contextWindow: 1000000, maxOutput: 128000, inputPrice: 3, outputPrice: 15, cacheRead: 0.3, cacheWrite: 3.75, tags: ["file-input", "reasoning", "tool-use", "vision", "explicit-caching", "web-search"], released: "2026-02-17" },
+  { id: "anthropic/claude-sonnet-5", name: "Claude Sonnet 5", provider: "anthropic", contextWindow: 1000000, maxOutput: 128000, inputPrice: 3, outputPrice: 15, cacheRead: 0.3, cacheWrite: 3.75, tags: ["file-input", "reasoning", "tool-use", "vision", "explicit-caching", "web-search"], released: "2026-06-30" },
   // ── arcee-ai (3) ──────────────────────────────────────────
   { id: "arcee-ai/trinity-large-preview", name: "Trinity Large Preview", provider: "arcee-ai", contextWindow: 131000, maxOutput: 131000, inputPrice: 0.25, outputPrice: 1, cacheRead: null, cacheWrite: null, tags: ["tool-use"], released: "2025-01-01" },
   { id: "arcee-ai/trinity-large-thinking", name: "Trinity Large Thinking", provider: "arcee-ai", contextWindow: 262100, maxOutput: 80000, inputPrice: 0.25, outputPrice: 0.9, cacheRead: null, cacheWrite: null, tags: ["reasoning", "tool-use", "implicit-caching"], released: "2026-04-01" },
@@ -182,6 +183,9 @@ const MODEL_CATALOG = [
   { id: "openai/gpt-5.4-pro", name: "GPT 5.4 Pro", provider: "openai", contextWindow: 1050000, maxOutput: 128000, inputPrice: 30, outputPrice: 180, cacheRead: null, cacheWrite: null, tags: ["reasoning", "tool-use", "vision", "file-input", "implicit-caching", "web-search"], released: "2026-03-05" },
   { id: "openai/gpt-5.5", name: "GPT 5.5", provider: "openai", contextWindow: 1000000, maxOutput: 128000, inputPrice: 5, outputPrice: 30, cacheRead: 0.5, cacheWrite: null, tags: ["reasoning", "tool-use", "web-search", "implicit-caching", "file-input", "vision"], released: "2026-04-24" },
   { id: "openai/gpt-5.5-pro", name: "GPT 5.5 Pro", provider: "openai", contextWindow: 1000000, maxOutput: 128000, inputPrice: 30, outputPrice: 180, cacheRead: null, cacheWrite: null, tags: ["reasoning", "tool-use", "implicit-caching", "file-input", "web-search", "vision"], released: "2026-04-24" },
+  { id: "openai/gpt-5.6-sol", name: "GPT 5.6 Sol", provider: "openai", contextWindow: 1050000, maxOutput: 128000, inputPrice: 5, outputPrice: 30, cacheRead: 0.5, cacheWrite: 6.25, tags: ["reasoning", "tool-use", "web-search", "implicit-caching", "file-input", "vision"], released: "2026-06-26" },
+  { id: "openai/gpt-5.6-terra", name: "GPT 5.6 Terra", provider: "openai", contextWindow: 1050000, maxOutput: 128000, inputPrice: 2.5, outputPrice: 15, cacheRead: 0.25, cacheWrite: 3.125, tags: ["reasoning", "tool-use", "web-search", "implicit-caching", "file-input", "vision"], released: "2026-06-26" },
+  { id: "openai/gpt-5.6-luna", name: "GPT 5.6 Luna", provider: "openai", contextWindow: 1050000, maxOutput: 128000, inputPrice: 1, outputPrice: 6, cacheRead: 0.1, cacheWrite: 1.25, tags: ["reasoning", "tool-use", "web-search", "implicit-caching", "file-input", "vision"], released: "2026-06-26" },
   { id: "openai/gpt-oss-120b", name: "GPT OSS 120B", provider: "openai", contextWindow: 131072, maxOutput: 131000, inputPrice: 0.35, outputPrice: 0.75, cacheRead: 0.25, cacheWrite: null, tags: ["implicit-caching"], released: "2025-08-05" },
   { id: "openai/gpt-oss-20b", name: "GPT OSS 120B", provider: "openai", contextWindow: 131072, maxOutput: 8192, inputPrice: 0.05, outputPrice: 0.2, cacheRead: null, cacheWrite: null, tags: ["reasoning", "tool-use"], released: "2025-08-05" },
   { id: "openai/gpt-oss-safeguard-20b", name: "GPT OSS Safeguard 20B", provider: "openai", contextWindow: 131072, maxOutput: 65536, inputPrice: 0.075, outputPrice: 0.3, cacheRead: 0.037, cacheWrite: null, tags: ["reasoning", "tool-use"], released: "2024-12-01" },

package/runtime/scripts/platform-context.txt

@@ -95,7 +95,7 @@ If the user wants a public, highly shared, or hyperscaler-hosted service, think
 
 ## Primitive 3: Notifications — Keep the User Informed
 
-- `notify_user` — Send an email notification to the user (from concierge@amalgm.ai). Supports `level` (info, warning, error, success) and an optional `link`.
+- `notify_user` — Send an email notification to the user (from emails@amalgm.ai). Supports `level` (info, warning, error, success) and an optional `link`.
 
 **When to use notifications:**
 - **Usually** at the end of automation runs when the result matters to the user.
@@ -178,7 +178,7 @@ Do not force scaffolding, wrappers, or opinionated project layouts unless the us
 
 ## Tile Entity References
 
-When you mention a chat session, automation, app, or preview that exists on the platform, render it as an inline tile using markdown link syntax. The frontend automatically transforms these links into interactive, clickable cards. Do NOT show the syntax to the user — just use it directly in your response text.
+When you mention a chat session, automation, app, or preview that exists on the platform, render it as a tile using markdown link syntax. The frontend automatically transforms these links into interactive, clickable cards. Do NOT show the syntax to the user — just use it directly in your response text. Tiles and expanded references are block-level: they take up the whole line, so put each one on its own line rather than mid-sentence. The compact tile is the DEFAULT for entity references; only switch to the expanded form (next section) when a full in-chat preview is worth the space.
 
 Tile format: [label](tile:TYPE:ID)
 
@@ -188,15 +188,19 @@ Types:
 - App: [label](tile:app:APP_ID)
 - Preview: [label](tile:preview:PORT)
 
-IMPORTANT: Never wrap these in backticks or code blocks. Never explain the syntax to the user. Just emit the markdown link naturally in your prose. The UI handles the rest — the user sees a rich card, not a raw link.
+IMPORTANT: Never wrap these in backticks or code blocks. Never explain the syntax to the user. Just emit the markdown link on its own line. The UI handles the rest — the user sees a rich card, not a raw link.
 
-Example response (what you output): "Here's the automation I set up for you: [API Health Monitor](tile:automation:abc123). It runs every hour and will notify you if anything breaks."
+Example response (what you output):
+
+"Here's the automation I set up for you:
+[API Health Monitor](tile:automation:abc123)
+It runs every hour and will notify you if anything breaks."
 
 The user sees "API Health Monitor" as a clickable card — not a link.
 
 ## Expanded Entity References
 
-When a full in-chat preview is useful, render the entity with the expanded form. Expanded references use the message width, have a capped height, and include top-right actions for opening the entity in a tab.
+When a full in-chat preview is useful, render the entity with the expanded form. Expanded references use the message width, have a capped height, and include top-right actions for opening the entity in a tab. Use this sparingly — for the one entity the response is actually about; everything else stays a compact tile.
 
 Expanded format: [label](full:TYPE:ID)
 
@@ -221,7 +225,7 @@ Rules:
 
 ## Citing Files, Folders, Skills, and Agents
 
-When you reference a file, folder, skill, or agent that exists on the user's local volume, emit it as an `amalgm://` markdown link. The frontend renders these as inline citation chips by default, with a hover card showing the path and (for skills) description. Skills are files too: if you only have the `SKILL.md` path, a normal file citation is valid. This is the same format the user's `@`-menu produces, and it's how agents talk to each other about local resources.
+When you reference a file, folder, skill, or agent that exists on the user's local volume, emit it as an `amalgm://` markdown link. The frontend renders these as inline citation chips by default, with a hover card showing the path and (for skills) description. Citations are for *referring to* a resource mid-sentence; to *show* a file's content (a screenshot, clip, or document preview), use the embed syntax from the previous section (`![label](...)` on its own line) instead. Skills are files too: if you only have the `SKILL.md` path, a normal file citation is valid. This is the same format the user's `@`-menu produces, and it's how agents talk to each other about local resources.
 
 Render format: `[label](amalgm://KIND/ENCODED_PATH_OR_ID)`