amalgm 0.1.69 → 0.1.71

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

@@ -11,6 +11,7 @@ const {
   claudeNativeHookSettings,
   syncClaudeNativeConfig,
   syncCodexNativeConfig,
+  syncOpenCodeNativeConfig,
 } = require('../tooling/native-config');
 const { prepareHarnessRuntime } = require('../tooling/runtime-home');
 
@@ -108,6 +109,50 @@ test('prepared opencode runtime always has an isolated managed home', () => {
   });
 });
 
+test('provider auth imports opencode native config into managed home', () => {
+  withNativeHome((home) => {
+    const configDir = path.join(home, '.config', 'opencode');
+    const dataDir = path.join(home, '.local', 'share', 'opencode');
+    fs.mkdirSync(configDir, { recursive: true });
+    fs.mkdirSync(dataDir, { recursive: true });
+    fs.writeFileSync(path.join(configDir, 'opencode.json'), '{"mcp":{}}');
+    fs.writeFileSync(path.join(dataDir, 'auth.json'), '{"provider":"test"}');
+
+    const runtimeHome = path.join(home, 'managed', 'opencode-home');
+    const prepared = prepareHarnessRuntime({
+      harness: 'opencode',
+      authMethod: 'provider_auth',
+      auth: { runtimeHome },
+    }, { PATH: '/bin', HOME: home });
+
+    assert.equal(prepared.runtimeHome, runtimeHome);
+    assert.equal(prepared.env.HOME, runtimeHome);
+    assert.equal(prepared.env.OPENCODE_HOME, runtimeHome);
+    assert.equal(prepared.env.XDG_CONFIG_HOME, path.join(runtimeHome, '.config'));
+    assert.equal(fs.existsSync(path.join(runtimeHome, '.config', 'opencode', 'opencode.json')), true);
+    assert.equal(fs.existsSync(path.join(runtimeHome, '.local', 'share', 'opencode', 'auth.json')), true);
+  });
+});
+
+test('non-user auth prepares a home without importing native config', () => {
+  withNativeHome((home) => {
+    const source = path.join(home, '.codex');
+    fs.mkdirSync(source, { recursive: true });
+    fs.writeFileSync(path.join(source, 'config.toml'), 'model = "native"');
+
+    const runtimeHome = path.join(home, 'managed', 'codex-home');
+    const prepared = prepareHarnessRuntime({
+      harness: 'codex',
+      authMethod: 'amalgm',
+      auth: { runtimeHome, tokenRef: 'test-token', baseUrl: 'https://example.test' },
+    }, { PATH: '/bin', HOME: home });
+
+    assert.equal(prepared.syncInfo, null);
+    assert.equal(fs.existsSync(runtimeHome), true);
+    assert.equal(fs.existsSync(path.join(runtimeHome, 'config.toml')), false);
+  });
+});
+
 test('codex provider config keeps native mcp config and overrides managed model provider', () => {
   withNativeHome((home) => {
     const source = path.join(home, '.codex');
@@ -147,7 +192,7 @@ test('codex provider config keeps native mcp config and overrides managed model
   });
 });
 
-test('codex amalgm config keeps native mcp config and overrides managed model provider', () => {
+test('codex amalgm config does not import native user config', () => {
   withNativeHome((home) => {
     const source = path.join(home, '.codex');
     fs.mkdirSync(source, { recursive: true });
@@ -176,12 +221,11 @@ test('codex amalgm config keeps native mcp config and overrides managed model pr
 
     const config = fs.readFileSync(path.join(runtimeHome, 'config.toml'), 'utf8');
     assert.match(config, /model_provider = "amalgm"/);
-    assert.match(config, /codex_hooks = true/);
     assert.doesNotMatch(config, /native-provider/);
-    assert.match(config, /\[mcp_servers\.native\]/);
-    assert.match(config, /\[mcp_servers\.native\.http_headers\]/);
-    assert.match(config, /Authorization = "Bearer test"/);
-    assert.equal(config.includes(path.join(runtimeHome, 'hooks.json')), true);
+    assert.doesNotMatch(config, /codex_hooks = true/);
+    assert.doesNotMatch(config, /\[mcp_servers\.native\]/);
+    assert.doesNotMatch(config, /Authorization = "Bearer test"/);
+    assert.equal(config.includes(path.join(runtimeHome, 'hooks.json')), false);
   });
 });
 
@@ -209,7 +253,7 @@ test('claude extracts native hooks without enabling full filesystem settings', (
       authMethod: 'provider_auth',
       auth: { runtimeHome },
       cwd: home,
-      cliModel: 'anthropic/claude-opus-4.7',
+      cliModel: 'anthropic/claude-opus-4.8',
       mcpServers: [],
     });
 
@@ -219,7 +263,7 @@ test('claude extracts native hooks without enabling full filesystem settings', (
   });
 });
 
-test('claude native sync skips debug symlinks', () => {
+test('claude native sync does not delete existing debug symlinks', () => {
   withNativeHome((home) => {
     const source = path.join(home, '.claude');
     fs.mkdirSync(path.join(source, 'debug'), { recursive: true });
@@ -237,7 +281,41 @@ test('claude native sync skips debug symlinks', () => {
     assert.equal(result.sourceDir, source);
     assert.equal(fs.existsSync(path.join(runtimeHome, 'settings.json')), true);
     assert.equal(fs.existsSync(path.join(runtimeHome, 'debug', 'trace.txt')), false);
-    assert.equal(fs.existsSync(path.join(runtimeHome, 'debug', 'latest')), false);
+    assert.equal(fs.lstatSync(path.join(runtimeHome, 'debug', 'latest')).isSymbolicLink(), true);
+  });
+});
+
+test('native sync never replaces existing in-home dot dirs', () => {
+  withNativeHome((home) => {
+    const source = path.join(home, '.codex');
+    fs.mkdirSync(source, { recursive: true });
+    fs.writeFileSync(path.join(source, 'config.toml'), 'model = "gpt-5.5"');
+
+    const runtimeHome = path.join(home, 'runtime-home');
+    fs.mkdirSync(path.join(runtimeHome, '.codex'), { recursive: true });
+    fs.writeFileSync(path.join(runtimeHome, '.codex', 'sentinel'), 'keep');
+
+    syncCodexNativeConfig(runtimeHome);
+
+    assert.equal(fs.existsSync(path.join(runtimeHome, '.codex', 'sentinel')), true);
+    assert.equal(fs.lstatSync(path.join(runtimeHome, '.codex')).isDirectory(), true);
+  });
+});
+
+test('opencode native sync preserves existing session state', () => {
+  withNativeHome((home) => {
+    const dataDir = path.join(home, '.local', 'share', 'opencode');
+    fs.mkdirSync(dataDir, { recursive: true });
+    fs.writeFileSync(path.join(dataDir, 'auth.json'), '{"provider":"test"}');
+
+    const runtimeHome = path.join(home, 'runtime-home');
+    fs.mkdirSync(path.join(runtimeHome, '.local', 'share', 'opencode', 'session'), { recursive: true });
+    fs.writeFileSync(path.join(runtimeHome, '.local', 'share', 'opencode', 'session', 'sentinel'), 'keep');
+
+    syncOpenCodeNativeConfig(runtimeHome);
+
+    assert.equal(fs.existsSync(path.join(runtimeHome, '.local', 'share', 'opencode', 'auth.json')), true);
+    assert.equal(fs.existsSync(path.join(runtimeHome, '.local', 'share', 'opencode', 'session', 'sentinel')), true);
   });
 });
 

package/runtime/scripts/chat-core/tool-shape.js

@@ -52,11 +52,12 @@ function normalizeError(error, fallback = 'Tool failed') {
 
 function toolKind(name = '', input = {}, metadata = {}) {
   const clean = String(name || '').toLowerCase();
+  const compact = clean.replace(/[^a-z0-9]/g, '');
   const mcp = metadata.mcp || parseMcpName(name);
   if (metadata.subagent || clean === 'task' || clean.includes('spawnagent') || clean.includes('collabagent')) return 'subagent';
   if (clean.includes('todo')) return 'todo';
   if (clean.includes('question') || clean.includes('askuser')) return 'question';
-  if (clean.includes('toolsearch')) return 'search';
+  if (compact.includes('toolsearch')) return 'search';
   if (clean.includes('bash') || clean.includes('command')) return 'bash';
   if (clean.includes('websearch') || clean === 'websearch') return 'web_search';
   if (clean.includes('browser') || mcp?.tool?.startsWith?.('browser_')) return 'browser';
@@ -101,6 +102,7 @@ function titleForTool({ name, input = {}, output, error, metadata = {}, fallback
   if (mcp) return titleFromMcp(mcp.tool, input);
 
   const clean = String(name || '').toLowerCase();
+  const compact = clean.replace(/[^a-z0-9]/g, '');
   if (metadata.action?.type === 'search') {
     return `Searching ${compactText(metadata.action.query || input.query || 'the web', 80)}`;
   }
@@ -114,7 +116,7 @@ function titleForTool({ name, input = {}, output, error, metadata = {}, fallback
     const host = hostLabel(url) || 'current page';
     return pattern ? `Finding "${compactText(pattern, 60)}" on ${host}` : `Finding text on ${host}`;
   }
-  if (clean.includes('toolsearch')) {
+  if (compact.includes('toolsearch')) {
     const selected = String(input.query || '').replace(/^select:/i, '').trim();
     return selected ? `Selecting ${compactText(selected, 80)}` : 'Selecting tool';
   }

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

@@ -11,13 +11,22 @@ function amalgmDir() {
 
 function nativeNodeModulesDirs() {
   const resourcesPath = process.resourcesPath || '';
-  return unique([
-    process.env.AMALGM_NATIVE_NODE_MODULES,
-    path.join(amalgmDir(), 'native', 'node_modules'),
+  const resourceNodeModules = [
     resourcesPath ? path.join(resourcesPath, 'app.asar.unpacked', 'node_modules') : '',
     resourcesPath ? path.join(resourcesPath, 'app.asar', 'node_modules') : '',
     resourcesPath ? path.join(resourcesPath, 'cli', 'node_modules') : '',
     resourcesPath ? path.join(resourcesPath, 'runtime', 'node_modules') : '',
+  ].filter(Boolean);
+  const wrapperPackages = [
+    '@anthropic-ai/claude-agent-sdk',
+    '@openai/codex',
+    'opencode-ai',
+  ];
+  return unique([
+    process.env.AMALGM_NATIVE_NODE_MODULES,
+    path.join(amalgmDir(), 'native', 'node_modules'),
+    ...resourceNodeModules,
+    ...resourceNodeModules.flatMap((dir) => wrapperPackages.map((packageName) => path.join(dir, packageName, 'node_modules'))),
   ].filter(Boolean));
 }
 
@@ -619,6 +628,14 @@ function ensureNativeBinaries(options = {}) {
 }
 
 module.exports = {
+  __private: {
+    bundledClaudeBinary,
+    claudeTargetPackage,
+    codexTarget,
+    nativeNodeModulesDirs,
+    openCodePackageCandidates,
+    packageRoot,
+  },
   binaryStatus,
   bundledCodexPathDirs,
   bundledClaudeBinary: resolveClaudeBinary,

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

@@ -57,20 +57,12 @@ function shouldCopyConfigPath(root, source) {
 function copyConfigTree(sourceDir, targetDir) {
   if (!sourceDir || !targetDir || !exists(sourceDir)) return false;
   if (path.resolve(sourceDir) === path.resolve(targetDir)) return true;
-  fs.mkdirSync(targetDir, { recursive: true });
-  fs.cpSync(sourceDir, targetDir, {
-    recursive: true,
-    force: true,
-    errorOnExist: false,
-    dereference: false,
-    filter: (source) => shouldCopyConfigPath(sourceDir, source),
-  });
-  return true;
+  return copyDirBounded(sourceDir, targetDir, { maxFiles: 500, maxBytes: 25 * 1024 * 1024 }).copied;
 }
 
 function copyFileIfPresent(source, target) {
   if (!exists(source)) return false;
-  fs.mkdirSync(path.dirname(target), { recursive: true });
+  if (!ensureDirectory(path.dirname(target)) || !canWriteFileTarget(target)) return false;
   fs.copyFileSync(source, target);
   try {
     fs.chmodSync(target, fs.statSync(source).mode & 0o777);
@@ -86,10 +78,8 @@ function ensureHomeAlias(runtimeHome, dotDirName) {
     if (stat.isSymbolicLink()) {
       const target = fs.readlinkSync(alias);
       if (target === '.' || path.resolve(runtimeHome, target) === path.resolve(runtimeHome)) return;
-      fs.rmSync(alias, { recursive: true, force: true });
-    } else {
-      fs.rmSync(alias, { recursive: true, force: true });
     }
+    return;
   } catch {}
   try {
     fs.symlinkSync('.', alias, 'dir');
@@ -98,28 +88,6 @@ function ensureHomeAlias(runtimeHome, dotDirName) {
   }
 }
 
-function removeOutboundSymlink(root, relativePath) {
-  const file = path.join(root, relativePath);
-  let stat;
-  try {
-    stat = fs.lstatSync(file);
-  } catch {
-    return;
-  }
-  if (!stat.isSymbolicLink()) return;
-  let target;
-  try {
-    target = fs.readlinkSync(file);
-  } catch {
-    return;
-  }
-  const resolvedRoot = path.resolve(root);
-  const resolvedTarget = path.resolve(path.dirname(file), target);
-  if (resolvedTarget !== resolvedRoot && !resolvedTarget.startsWith(`${resolvedRoot}${path.sep}`)) {
-    fs.rmSync(file, { force: true });
-  }
-}
-
 function ensureNativeKeychainAlias(runtimeHome) {
   if (process.platform !== 'darwin' || !runtimeHome) return false;
   const source = path.join(nativeHome(), 'Library', 'Keychains');
@@ -131,7 +99,7 @@ function ensureNativeKeychainAlias(runtimeHome) {
       const linkTarget = fs.readlinkSync(target);
       if (path.resolve(path.dirname(target), linkTarget) === path.resolve(source)) return true;
     }
-    fs.rmSync(target, { recursive: true, force: true });
+    return false;
   } catch {}
   fs.mkdirSync(path.dirname(target), { recursive: true });
   try {
@@ -146,6 +114,29 @@ function nativeHome() {
   return process.env.AMALGM_NATIVE_HOME || os.homedir();
 }
 
+function ensureDirectory(dir) {
+  try {
+    const stat = fs.lstatSync(dir);
+    return stat.isDirectory();
+  } catch {
+    try {
+      fs.mkdirSync(dir, { recursive: true });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+function canWriteFileTarget(target) {
+  try {
+    const stat = fs.lstatSync(target);
+    return stat.isFile();
+  } catch {
+    return true;
+  }
+}
+
 function copyDirBounded(sourceDir, targetDir, options = {}) {
   if (!sourceDir || !targetDir || !exists(sourceDir)) return { copied: false, files: 0, bytes: 0, truncated: false };
   const maxFiles = Number(options.maxFiles || 200);
@@ -163,7 +154,7 @@ function copyDirBounded(sourceDir, targetDir, options = {}) {
     }
     if (stat.isSymbolicLink()) return;
     if (stat.isDirectory()) {
-      fs.mkdirSync(target, { recursive: true });
+      if (!ensureDirectory(target)) return;
       for (const entry of fs.readdirSync(source)) {
         walk(path.join(source, entry), path.join(target, entry));
         if (state.truncated) break;
@@ -175,7 +166,7 @@ function copyDirBounded(sourceDir, targetDir, options = {}) {
       state.truncated = true;
       return;
     }
-    fs.mkdirSync(path.dirname(target), { recursive: true });
+    if (!ensureDirectory(path.dirname(target)) || !canWriteFileTarget(target)) return;
     fs.copyFileSync(source, target);
     state.files += 1;
     state.bytes += stat.size;
@@ -218,7 +209,6 @@ function syncClaudeNativeConfig(runtimeHome) {
   if (path.resolve(runtimeHome) === path.resolve(home)) return null;
   const sourceDir = path.join(home, '.claude');
   fs.mkdirSync(runtimeHome, { recursive: true });
-  removeOutboundSymlink(runtimeHome, path.join('debug', 'latest'));
   const copied = copyConfigTree(sourceDir, runtimeHome);
   ensureHomeAlias(runtimeHome, '.claude');
   ensureNativeKeychainAlias(runtimeHome);
@@ -227,6 +217,27 @@ function syncClaudeNativeConfig(runtimeHome) {
   return copied ? { sourceDir, runtimeHome } : null;
 }
 
+function syncOpenCodeNativeConfig(runtimeHome) {
+  if (!runtimeHome) return null;
+  const home = nativeHome();
+  fs.mkdirSync(runtimeHome, { recursive: true });
+  const config = copyConfigTree(
+    path.join(home, '.config', 'opencode'),
+    path.join(runtimeHome, '.config', 'opencode'),
+  );
+  const data = copyConfigTree(
+    path.join(home, '.local', 'share', 'opencode'),
+    path.join(runtimeHome, '.local', 'share', 'opencode'),
+  );
+  const dot = copyConfigTree(path.join(home, '.opencode'), path.join(runtimeHome, '.opencode'));
+  if (!config && !data && !dot) return null;
+  return {
+    sourceDir: path.join(home, '.config', 'opencode'),
+    runtimeHome,
+    copied: config || data || dot,
+  };
+}
+
 function readJsonFile(file) {
   try {
     return JSON.parse(fs.readFileSync(file, 'utf8'));
@@ -271,8 +282,10 @@ function claudeNativeHookSettings(options = {}) {
 function syncNativeHarnessConfig(contract) {
   const runtimeHome = contract?.auth?.runtimeHome;
   if (!runtimeHome) return null;
+  if (contract.authMethod !== 'provider_auth') return null;
   if (contract.harness === 'codex') return syncCodexNativeConfig(runtimeHome);
   if (contract.harness === 'claude_code') return syncClaudeNativeConfig(runtimeHome);
+  if (contract.harness === 'opencode') return syncOpenCodeNativeConfig(runtimeHome);
   return null;
 }
 
@@ -282,6 +295,7 @@ module.exports = {
     copyConfigTree,
     copyDirBounded,
     copyFileIfPresent,
+    ensureDirectory,
     ensureNativeKeychainAlias,
     ensureHomeAlias,
     shouldCopyConfigPath,
@@ -290,4 +304,5 @@ module.exports = {
   syncClaudeNativeConfig,
   syncCodexNativeConfig,
   syncNativeHarnessConfig,
+  syncOpenCodeNativeConfig,
 };

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

@@ -15,7 +15,9 @@ function managedRuntimeHome(contract) {
 function prepareHarnessRuntime(contract, baseEnv = process.env) {
   const runtimeHome = managedRuntimeHome(contract);
   fs.mkdirSync(runtimeHome, { recursive: true });
-  const syncInfo = syncNativeHarnessConfig(contract);
+  const syncInfo = contract?.authMethod === 'provider_auth'
+    ? syncNativeHarnessConfig(contract)
+    : null;
   return {
     runtimeHome,
     syncInfo,

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

@@ -49,6 +49,8 @@ const MODEL_CATALOG = [
   { id: "anthropic/claude-opus-4.6-1m", name: "Claude Opus 4.6 (1M context)", provider: "anthropic", contextWindow: 1000000, maxOutput: 128000, inputPrice: 5, outputPrice: 25, cacheRead: 0.5, cacheWrite: 6.25, tags: ["tool-use", "reasoning", "vision", "file-input", "explicit-caching", "web-search"], released: "2026-02-05" },
   { id: "anthropic/claude-opus-4.7", name: "Claude Opus 4.7", provider: "anthropic", contextWindow: 200000, maxOutput: 128000, inputPrice: 5, outputPrice: 25, cacheRead: 0.5, cacheWrite: 6.25, tags: ["tool-use", "reasoning", "vision", "file-input", "explicit-caching", "web-search"], released: "2026-04-16" },
   { id: "anthropic/claude-opus-4.7-1m", name: "Claude Opus 4.7 (1M context)", provider: "anthropic", contextWindow: 1000000, maxOutput: 128000, inputPrice: 5, outputPrice: 25, cacheRead: 0.5, cacheWrite: 6.25, tags: ["tool-use", "reasoning", "vision", "file-input", "explicit-caching", "web-search"], released: "2026-04-16" },
+  { id: "anthropic/claude-opus-4.8", name: "Claude Opus 4.8", provider: "anthropic", contextWindow: 200000, maxOutput: 128000, inputPrice: 5, outputPrice: 25, cacheRead: 0.5, cacheWrite: 6.25, tags: ["tool-use", "reasoning", "vision", "file-input", "explicit-caching", "web-search"], released: null },
+  { id: "anthropic/claude-opus-4.8-1m", name: "Claude Opus 4.8 (1M context)", provider: "anthropic", contextWindow: 1000000, maxOutput: 128000, inputPrice: 5, outputPrice: 25, cacheRead: 0.5, cacheWrite: 6.25, tags: ["tool-use", "reasoning", "vision", "file-input", "explicit-caching", "web-search"], released: null },
   { 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" },
@@ -236,10 +238,13 @@ const MODEL_CATALOG = [
 /** Find model by exact ID or fuzzy match (strips provider prefix, date suffixes). */
 // CLI agent internal model names → catalog IDs
 const MODEL_ALIASES = {
-  'claude-code-opus':      'anthropic/claude-opus-4.7',
-  'opus':                  'anthropic/claude-opus-4.7',
-  'opus1m':                'anthropic/claude-opus-4.7-1m',
-  'opus[1m]':              'anthropic/claude-opus-4.7-1m',
+  'claude-code-opus':      'anthropic/claude-opus-4.8',
+  'opus':                  'anthropic/claude-opus-4.8',
+  'opus1m':                'anthropic/claude-opus-4.8-1m',
+  'opus[1m]':              'anthropic/claude-opus-4.8-1m',
+  'claude-opus-4-8':       'anthropic/claude-opus-4.8',
+  'claude-opus-4.8-1m':    'anthropic/claude-opus-4.8-1m',
+  'claude-opus-4.8:1m':    'anthropic/claude-opus-4.8-1m',
   'claude-opus-4-7':       'anthropic/claude-opus-4.7',
   'claude-opus-4.7-1m':    'anthropic/claude-opus-4.7-1m',
   'claude-opus-4.7:1m':    'anthropic/claude-opus-4.7-1m',
@@ -255,7 +260,7 @@ function getModel(modelId) {
   if (!modelId) return null;
   const id = modelId.toLowerCase();
 
-  // Check aliases first (e.g. claude-code-opus -> anthropic/claude-opus-4.7)
+  // Check aliases first (e.g. claude-code-opus -> anthropic/claude-opus-4.8)
   const aliased = MODEL_ALIASES[id];
   if (aliased) return MODEL_CATALOG.find(e => e.id === aliased) || null;
 

package/runtime/scripts/credential-adapter.js

@@ -18,7 +18,7 @@ const VALID_AUTH_MODES = ['amalgm', 'provider_auth', 'byok'];
 const SUPPORTED_AUTH_BY_HARNESS = {
   claude_code: ['amalgm', 'byok', 'provider_auth'],
   codex: ['amalgm', 'byok', 'provider_auth'],
-  opencode: ['amalgm', 'byok'],
+  opencode: ['amalgm', 'byok', 'provider_auth'],
   pi: ['amalgm', 'byok', 'provider_auth'],
 };
 

package/runtime/scripts/test-claude-code-models.js

@@ -15,7 +15,7 @@ const {
   resolveModelSelection,
 } = require('./amalgm-mcp/lib/prefs');
 
-const OPUS_1M = 'anthropic/claude-opus-4.7-1m';
+const OPUS_1M = 'anthropic/claude-opus-4.8-1m';
 
 assert.deepEqual(
   getHarnessModels('claude_code').map((model) => ({
@@ -26,21 +26,26 @@ assert.deepEqual(
   [
     { id: 'anthropic/claude-haiku-4.5', name: 'Haiku 4.5', cliModel: 'haiku' },
     { id: 'anthropic/claude-sonnet-4.6', name: 'Sonnet 4.6', cliModel: 'sonnet' },
-    { id: 'anthropic/claude-opus-4.7', name: 'Opus 4.7', cliModel: 'opus' },
-    { id: OPUS_1M, name: 'Opus 4.7 1M', cliModel: 'opus[1m]' },
+    { id: 'anthropic/claude-opus-4.8', name: 'Opus 4.8', cliModel: 'opus' },
+    { id: OPUS_1M, name: 'Opus 4.8 1M', cliModel: 'opus[1m]' },
   ],
 );
 
 assert.equal(canonicalModel('haiku', 'claude_code'), 'anthropic/claude-haiku-4.5');
 assert.equal(canonicalModel('sonnet', 'claude_code'), 'anthropic/claude-sonnet-4.6');
-assert.equal(canonicalModel('opus', 'claude_code'), 'anthropic/claude-opus-4.7');
+assert.equal(canonicalModel('opus', 'claude_code'), 'anthropic/claude-opus-4.8');
 assert.equal(canonicalModel('opus1m', 'claude_code'), OPUS_1M);
 assert.equal(canonicalModel('opus[1m]', 'claude_code'), OPUS_1M);
-assert.equal(canonicalModel('claude-code-opus-46', 'claude_code'), 'anthropic/claude-opus-4.7');
-assert.equal(canonicalModel('claude-code-opus-4.6', 'claude_code'), 'anthropic/claude-opus-4.7');
-assert.equal(canonicalModel('claude-opus-4-6', 'claude_code'), 'anthropic/claude-opus-4.7');
-assert.equal(canonicalModel('anthropic/claude-opus-4-6', 'claude_code'), 'anthropic/claude-opus-4.7');
-assert.equal(canonicalModel('anthropic/claude-opus-4.5', 'claude_code'), 'anthropic/claude-opus-4.7');
+assert.equal(canonicalModel('claude-code-opus-48', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('claude-code-opus-4.8', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('claude-opus-4-8', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('claude-code-opus-47', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('claude-code-opus-46', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('claude-code-opus-4.6', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('claude-opus-4-6', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('anthropic/claude-opus-4-6', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('anthropic/claude-opus-4.7', 'claude_code'), 'anthropic/claude-opus-4.8');
+assert.equal(canonicalModel('anthropic/claude-opus-4.5', 'claude_code'), 'anthropic/claude-opus-4.8');
 assert.equal(canonicalModel('claude-code-sonnet-45', 'claude_code'), 'anthropic/claude-sonnet-4.6');
 assert.equal(canonicalModel('claude-code-sonnet-4.5', 'claude_code'), 'anthropic/claude-sonnet-4.6');
 assert.equal(canonicalModel('claude-sonnet-4-5', 'claude_code'), 'anthropic/claude-sonnet-4.6');
@@ -49,14 +54,14 @@ assert.equal(canonicalModel('claude-code-haiku-4.5', 'claude_code'), 'anthropic/
 
 assert.equal(cliModelFor({ harness: 'claude_code', modelId: 'anthropic/claude-haiku-4.5' }), 'haiku');
 assert.equal(cliModelFor({ harness: 'claude_code', modelId: 'anthropic/claude-sonnet-4.6' }), 'sonnet');
-assert.equal(cliModelFor({ harness: 'claude_code', modelId: 'anthropic/claude-opus-4.7' }), 'opus');
+assert.equal(cliModelFor({ harness: 'claude_code', modelId: 'anthropic/claude-opus-4.8' }), 'opus');
 assert.equal(cliModelFor({ harness: 'claude_code', modelId: OPUS_1M }), 'opus[1m]');
-assert.equal(cliModelFor({ harness: 'claude_code', modelId: 'anthropic/claude-opus-4.7', cliModel: 'opus1m' }), 'opus[1m]');
+assert.equal(cliModelFor({ harness: 'claude_code', modelId: 'anthropic/claude-opus-4.8', cliModel: 'opus1m' }), 'opus[1m]');
 
 for (const [modelId, cliModel] of [
   ['anthropic/claude-haiku-4.5', 'haiku'],
   ['anthropic/claude-sonnet-4.6', 'sonnet'],
-  ['anthropic/claude-opus-4.7', 'opus'],
+  ['anthropic/claude-opus-4.8', 'opus'],
   [OPUS_1M, 'opus[1m]'],
 ]) {
   const contract = createContract({