@link-assistant/hive-mind 2.8.10 → 2.9.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/hive-mind
 
+## 2.9.0
+
+### Minor Changes
+
+- 42c4e91: Add full support for Claude Opus 5 (`claude-opus-5`) and make it the default model for `--tool claude` (and therefore for the `/claude` and `/solve` commands). The bare `opus` alias now resolves to `claude-opus-5` (previously `claude-opus-4-8`). Opus 5 supports 1M context (`[1m]`), the full effort ladder including `xhigh` and `max`, 128K max output tokens, and adaptive-thinking-only environment handling. Explicit `opus-5`/`claude-opus-5` aliases now correctly receive `xhigh` effort. The `opus-4-8`/`claude-opus-4-8` (and earlier) aliases are retained for backward compatibility. (Issue #2096)
+
+## 2.8.11
+
+### Patch Changes
+
+- 55a318d: Keep locally provisioned `openai-curated` plugins visible when Codex's authenticated remote plugin catalog is enabled. The repository-scoped `remote_plugin` override is written in place for every TOML spelling of the setting, so an operator config that uses a dotted key or an inline table cannot produce a duplicate key that Codex refuses to load.
+
 ## 2.8.10
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "2.8.10",
+  "version": "2.9.0",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/codex-capability-preflight.lib.mjs

@@ -219,7 +219,7 @@ const checkModelVisibleSkills = async ({ command, env, runCommand, log, required
   return { status: missing.length === 0 ? 'satisfied' : 'missing', visible, missing };
 };
 
-const skillVisibilityError = ({ missing, visible, requirements, repairs = [] }) => new CodexCapabilityPreflightError(`Codex reports the required plugins as installed, but the model cannot see: ${missing.join(', ')}. ` + `Codex exposes a plugin's skills only while its payload is materialized under ` + `CODEX_HOME/plugins/cache/<marketplace>/<plugin>/<version>/skills. ` + `Visible skills were: ${visible ? [...visible].sort().join(', ') || 'none' : 'unknown'}.` + (repairs.length > 0 ? ` Attempted repairs: ${repairs.join(', ')}.` : ''), { missing, failClosed: missing.some(skill => isExplicitRequirement(requirements, skill)) });
+const skillVisibilityError = ({ missing, visible, requirements, repairs = [] }) => new CodexCapabilityPreflightError(`Codex reports the required plugins as installed, but the model cannot see: ${missing.join(', ')}. ` + `A plugin must survive Codex loader reconciliation and have a valid payload under ` + `CODEX_HOME/plugins/cache/<marketplace>/<plugin>/<version>/skills before its skills are exposed. ` + `Visible skills were: ${visible ? [...visible].sort().join(', ') || 'none' : 'unknown'}.` + (repairs.length > 0 ? ` Attempted repairs: ${repairs.join(', ')}.` : ''), { missing, failClosed: missing.some(skill => isExplicitRequirement(requirements, skill)) });
 
 const verifyModelVisibleSkills = async ({ command, env, runCommand, log, requiredSkills, requirements }) => {
   const outcome = await checkModelVisibleSkills({ command, env, runCommand, log, requiredSkills });
@@ -316,10 +316,10 @@ export async function resolveRequiredPlugins(options) {
   return (await resolveRequiredCapabilities(options)).plugins;
 }
 
-const readIssueRequirementText = async ({ owner, repo, issueNumber, runCommand }) => {
-  const issueResult = await runCommand({ command: 'gh', args: ['api', `repos/${owner}/${repo}/issues/${issueNumber}`], env: process.env });
+const readIssueRequirementText = async ({ owner, repo, issueNumber, runCommand, env }) => {
+  const issueResult = await runCommand({ command: 'gh', args: ['api', `repos/${owner}/${repo}/issues/${issueNumber}`], env });
   const issue = parseJsonCommand(issueResult, 'Codex capability issue discovery');
-  const commentsResult = await runCommand({ command: 'gh', args: ['api', `repos/${owner}/${repo}/issues/${issueNumber}/comments`, '--paginate'], env: process.env });
+  const commentsResult = await runCommand({ command: 'gh', args: ['api', `repos/${owner}/${repo}/issues/${issueNumber}/comments`, '--paginate'], env });
   const comments = parseJsonCommand(commentsResult, 'Codex capability comment discovery');
   return [issue?.title, issue?.body, ...(Array.isArray(comments) ? comments.map(comment => comment?.body) : [])].filter(Boolean).join('\n');
 };
@@ -358,6 +358,128 @@ const readIfPresent = async filePath => {
   }
 };
 
+const escapeRegExp = value => String(value).replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+
+// A line inside a multi-line string is data, not structure: `[plugins."x"]`
+// written inside `"""…"""` is a string, and treating it as a table header would
+// splice a key into the operator's value.
+const markStructuralLines = lines => {
+  const structural = [];
+  let openDelimiter = null;
+  for (const line of lines) {
+    structural.push(openDelimiter === null);
+    let rest = line;
+    for (;;) {
+      if (openDelimiter) {
+        const closeIndex = rest.indexOf(openDelimiter);
+        if (closeIndex === -1) break;
+        rest = rest.slice(closeIndex + openDelimiter.length);
+        openDelimiter = null;
+        continue;
+      }
+      const opened = /"""|'''/u.exec(rest);
+      if (!opened) break;
+      openDelimiter = opened[0];
+      rest = rest.slice(opened.index + opened[0].length);
+    }
+  }
+  return structural;
+};
+
+// TOML accepts the same setting as a header table, a dotted key, or an inline
+// table. Appending `[features]` next to any of the other two is a duplicate-key
+// document that Codex refuses to load, which would break every scoped
+// invocation for the repository — so each spelling is edited in place.
+export const setTomlTableBoolean = ({ config, table, key, value }) => {
+  const lines = String(config || '')
+    .replace(/\r\n/gu, '\n')
+    .split('\n');
+  const structural = markStructuralLines(lines);
+  const [escapedTable, escapedKey] = [escapeRegExp(table), escapeRegExp(key)];
+  const quoted = name => `(?:${name}|"${name}"|'${name}')`;
+  const tableHeaderPattern = new RegExp(`^\\s*\\[\\s*${quoted(escapedTable)}\\s*\\]\\s*(?:#.*)?$`, 'u');
+  const anyTableHeaderPattern = /^\s*\[\[?[^\]]*\]\]?\s*(?:#.*)?$/u;
+  // The value is everything before an optional trailing comment, so a comment
+  // an operator attached to the setting survives the rewrite.
+  const assignmentPattern = name => new RegExp(`^(\\s*${name}\\s*=\\s*)([^#]*?)(\\s*(?:#.*)?)$`, 'u');
+  const keyPattern = assignmentPattern(quoted(escapedKey));
+  const dottedPattern = assignmentPattern(`${quoted(escapedTable)}\\s*\\.\\s*${quoted(escapedKey)}`);
+  const inlineTablePattern = new RegExp(`^(\\s*${quoted(escapedTable)}\\s*=\\s*\\{)([^}]*)(\\}\\s*(?:#.*)?)$`, 'u');
+  const finish = () => `${lines.join('\n').trimEnd()}\n`;
+  const isStructural = index => structural[index];
+
+  const tableStart = lines.findIndex((line, index) => isStructural(index) && tableHeaderPattern.test(line));
+  if (tableStart !== -1) {
+    let tableEnd = lines.length;
+    for (let index = tableStart + 1; index < lines.length; index++) {
+      if (isStructural(index) && anyTableHeaderPattern.test(lines[index])) {
+        tableEnd = index;
+        break;
+      }
+    }
+    for (let index = tableStart + 1; index < tableEnd; index++) {
+      // Any existing value is replaced, not only a boolean literal: leaving a
+      // stale `remote_plugin = 1` behind and appending a second assignment is
+      // also a duplicate key.
+      if (isStructural(index) && keyPattern.test(lines[index])) {
+        lines[index] = lines[index].replace(keyPattern, `$1${value}$3`);
+        return finish();
+      }
+    }
+    // Insert after the table's last content line so the key is not separated
+    // from its own table by the blank lines that precede the next one.
+    let insertAt = tableEnd;
+    while (insertAt > tableStart + 1 && lines[insertAt - 1].trim() === '') insertAt--;
+    lines.splice(insertAt, 0, `${key} = ${value}`);
+    return finish();
+  }
+
+  // Outside any table header the operator may have used a dotted key or an
+  // inline table for the same setting.
+  const rootEnd = lines.findIndex((line, index) => isStructural(index) && anyTableHeaderPattern.test(line));
+  const rootLimit = rootEnd === -1 ? lines.length : rootEnd;
+  for (let index = 0; index < rootLimit; index++) {
+    if (!isStructural(index)) continue;
+    if (dottedPattern.test(lines[index])) {
+      lines[index] = lines[index].replace(dottedPattern, `$1${value}$3`);
+      return finish();
+    }
+    const inlineTable = inlineTablePattern.exec(lines[index]);
+    if (inlineTable) {
+      const [, prefix, contents, suffix] = inlineTable;
+      // The trailing separator is captured so the operator's spacing inside the
+      // braces survives the rewrite.
+      const inlineKeyPattern = new RegExp(`(^|,)(\\s*${quoted(escapedKey)}\\s*=\\s*)[^,]*?(\\s*)(,|$)`, 'u');
+      const nextContents = inlineKeyPattern.test(contents) ? contents.replace(inlineKeyPattern, `$1$2${value}$3$4`) : `${contents.trim() ? `${contents.trimEnd()}, ` : ' '}${key} = ${value} `;
+      lines[index] = `${prefix}${nextContents}${suffix}`;
+      return finish();
+    }
+  }
+
+  while (lines.length > 0 && lines.at(-1) === '') lines.pop();
+  if (lines.length > 0) lines.push('');
+  lines.push(`[${table}]`, `${key} = ${value}`, '');
+  return lines.join('\n');
+};
+
+// Codex's authenticated remote global catalog owns the reserved
+// `openai-curated` marketplace. In codex-rs 0.144.6 the prompt loader removes
+// every locally configured plugin from that marketplace before merging remote
+// installations. Hive provisions the local marketplace payload, so the scoped
+// home must select that local catalog or plugin list and prompt assembly report
+// contradictory states (issue #2094). This override is deliberately scoped to
+// runs that selected a local curated plugin; personal marketplaces retain the
+// operator's remote catalog setting.
+const configureScopedPluginLoader = async ({ codexHome, plugins, log }) => {
+  const localCurated = plugins.filter(plugin => pluginIdParts(plugin).marketplace === 'openai-curated');
+  if (localCurated.length === 0) return;
+  const configPath = path.join(codexHome, 'config.toml');
+  const config = await readIfPresent(configPath);
+  const nextConfig = setTomlTableBoolean({ config, table: 'features', key: 'remote_plugin', value: false });
+  if (nextConfig !== config) await fs.writeFile(configPath, nextConfig);
+  await log(`   🧭 Scoped Codex loader: remote_plugin=false for ${localCurated.join(', ')}; an authenticated remote catalog otherwise removes local @openai-curated entries before prompt assembly`, { verbose: true });
+};
+
 // Runtime settings follow the operator config while plugin enablement remains
 // persistent and isolated to this repository.
 const syncScopedConfig = async ({ baseConfigPath, scopedConfigPath }) => {
@@ -464,13 +586,13 @@ export async function runCodexCapabilityPreflight(options = {}) {
   }
 }
 
-async function provisionCodexCapabilities({ owner, repo, issueNumber, projectDir, baseCodexHome = process.env.HIVE_MIND_PARENT_CODEX_HOME || process.env.CODEX_HOME || path.join(os.homedir(), '.codex'), codexPath = 'codex', runCommand = defaultRunCommand, log = async () => {} } = {}) {
+async function provisionCodexCapabilities({ owner, repo, issueNumber, projectDir, env = process.env, baseCodexHome = env.HIVE_MIND_PARENT_CODEX_HOME || env.CODEX_HOME || path.join(os.homedir(), '.codex'), codexPath = 'codex', runCommand = defaultRunCommand, log = async () => {} } = {}) {
   if (!owner || !repo || !issueNumber) return { required: false, plugins: [], codexHome: null };
 
   // `executeToolWithBun` uses a shell expression for execution. Preflight uses
   // execFile and therefore selects the installed Codex binary directly.
   const command = /\s/u.test(codexPath) ? 'codex' : codexPath;
-  const requirementText = await readIssueRequirementText({ owner, repo, issueNumber, runCommand });
+  const requirementText = await readIssueRequirementText({ owner, repo, issueNumber, runCommand, env });
   const requirements = detectRequiredCodexCapabilities(requirementText);
   for (const { capability, line } of requirements.rejected || []) {
     await log(`   ⏭️  Ignored non-capability token '${capability}' from: ${line.slice(0, 160)}`, { verbose: true });
@@ -481,8 +603,13 @@ async function provisionCodexCapabilities({ owner, repo, issueNumber, projectDir
   for (const { capability, line } of requirements.evidence || []) {
     await log(`   🔎 '${capability}' detected from: ${line.slice(0, 160)}`, { verbose: true });
   }
-  const baseEnv = { ...process.env, CODEX_HOME: baseCodexHome, HIVE_MIND_PARENT_CODEX_HOME: baseCodexHome };
-  const baseCatalogResult = await runCommand({ command, args: ['plugin', 'list', '--available', '--json'], env: baseEnv });
+  // Every Codex-side preflight operation runs from the checkout that the
+  // solver will enter. Besides matching `codex exec`, this keeps any future
+  // repository-local discovery deterministic without relying on Hive's launch
+  // directory (issue #2094).
+  const runCodexCommand = invocation => runCommand({ ...invocation, cwd: projectDir });
+  const baseEnv = { ...env, CODEX_HOME: baseCodexHome, HIVE_MIND_PARENT_CODEX_HOME: baseCodexHome };
+  const baseCatalogResult = await runCodexCommand({ command, args: ['plugin', 'list', '--available', '--json'], env: baseEnv });
   const baseCatalog = parseJsonCommand(baseCatalogResult, 'Codex plugin catalog discovery');
   const skillDirectories = [path.join(os.homedir(), '.agents', 'skills'), projectDir && path.join(projectDir, '.agents', 'skills')].filter(Boolean);
   const { plugins, providers } = await resolveRequiredCapabilities({ requirements, catalog: baseCatalog, skillDirectories });
@@ -491,24 +618,25 @@ async function provisionCodexCapabilities({ owner, repo, issueNumber, projectDir
   }
   if (plugins.length === 0) {
     await log('   ✅ Required Agent Skills are already available from standard skill directories');
-    await verifyModelVisibleSkills({ command, env: baseEnv, runCommand, log, requiredSkills: requirements.skills, requirements });
+    await verifyModelVisibleSkills({ command, env: baseEnv, runCommand: runCodexCommand, log, requiredSkills: requirements.skills, requirements });
     return { required: true, plugins, skills: requirements.skills, codexHome: null, baseCodexHome };
   }
 
   const codexHome = buildCodexCapabilityStatePath({ baseCodexHome, owner, repo });
   await prepareScopedCodexHome({ baseCodexHome, codexHome });
-  const scopedEnv = { ...process.env, CODEX_HOME: codexHome, HIVE_MIND_PARENT_CODEX_HOME: baseCodexHome };
+  await configureScopedPluginLoader({ codexHome, plugins, log });
+  const scopedEnv = { ...env, CODEX_HOME: codexHome, HIVE_MIND_PARENT_CODEX_HOME: baseCodexHome };
 
   // Issue #2088: install *and repair*. Enablement recorded in the scoped
   // `config.toml` survives a container restart while the payload under
   // `plugins/cache` may not, and `codex plugin list` cannot tell those states
   // apart — so the payload itself is the thing that gets checked and rebuilt.
-  const repair = await repairScopedPluginPayloads({ command, env: scopedEnv, runCommand, log, codexHome, baseCodexHome, plugins, providers });
+  const repair = await repairScopedPluginPayloads({ command, env: scopedEnv, runCommand: runCodexCommand, log, codexHome, baseCodexHome, plugins, providers });
   for (const entry of repair.report) {
     if (entry.healthy) await log(`   ✅ Provisioned ${entry.pluginId} in repository-scoped Codex state`);
   }
 
-  const verifyResult = await runCommand({ command, args: ['plugin', 'list', '--json'], env: scopedEnv });
+  const verifyResult = await runCodexCommand({ command, args: ['plugin', 'list', '--json'], env: scopedEnv });
   const verifiedCatalog = parseJsonCommand(verifyResult, 'Codex capability verification');
   const verified = new Set((verifiedCatalog.installed || []).filter(plugin => plugin.installed && plugin.enabled).map(plugin => normalizePluginSelector(plugin.pluginId)));
   const unverified = plugins.filter(plugin => !verified.has(plugin));
@@ -525,14 +653,14 @@ async function provisionCodexCapabilities({ owner, repo, issueNumber, projectDir
   // the model saw zero `superpowers:*` skills, so the run proceeded and then
   // stalled on the repository's mandatory preflight. Confirm the requirement
   // against the catalog the model actually receives.
-  let visibility = await checkModelVisibleSkills({ command, env: scopedEnv, runCommand, log, requiredSkills: requirements.skills });
+  let visibility = await checkModelVisibleSkills({ command, env: scopedEnv, runCommand: runCodexCommand, log, requiredSkills: requirements.skills });
   if (visibility.status === 'missing') {
     // The payload looks materialized but the prompt disagrees: rebuild it from
     // scratch and re-probe before deciding (issue #2088).
     await log(`   🛠️  Model cannot see ${visibility.missing.join(', ')}; forcing a repository-scoped plugin payload rebuild`);
-    const forced = await repairScopedPluginPayloads({ command, env: scopedEnv, runCommand, log, codexHome, baseCodexHome, plugins, providers, strategies: PLUGIN_PAYLOAD_REPAIRS.slice(1), force: true });
+    const forced = await repairScopedPluginPayloads({ command, env: scopedEnv, runCommand: runCodexCommand, log, codexHome, baseCodexHome, plugins, providers, strategies: PLUGIN_PAYLOAD_REPAIRS.slice(1), force: true });
     repair.applied.push(...forced.applied);
-    visibility = await checkModelVisibleSkills({ command, env: scopedEnv, runCommand, log, requiredSkills: requirements.skills });
+    visibility = await checkModelVisibleSkills({ command, env: scopedEnv, runCommand: runCodexCommand, log, requiredSkills: requirements.skills });
   }
   if (visibility.status === 'missing') throw skillVisibilityError({ missing: visibility.missing, visible: visibility.visible, requirements, repairs: repair.applied });
   if (visibility.status === 'unknown' && repair.unhealthy.length > 0) {
@@ -556,4 +684,5 @@ export default {
   repairScopedPluginPayloads,
   resolveRequiredCapabilities,
   runCodexCapabilityPreflight,
+  setTomlTableBoolean,
 };

package/src/codex.lib.mjs

@@ -744,8 +744,8 @@ export const executeCodex = async params => {
   // Issue #1877: deploy the experimental HANDOFF.md Agent Skill so Codex loads
   // it natively from .agents/skills/handoff/SKILL.md (no-op unless --use-handoff).
   await deployHandoffSkill({ tempDir, argv, log, $ });
-
-  const capabilityPreflight = await runCodexCapabilityPreflight({ owner, repo, issueNumber, projectDir: tempDir, codexPath, log });
+  const codexBaseEnv = getCodexExecEnv(argv.verbose);
+  const capabilityPreflight = await runCodexCapabilityPreflight({ owner, repo, issueNumber, projectDir: tempDir, codexPath, log, env: codexBaseEnv });
   // Execute the Codex command
   return await executeCodexCommand({
     tempDir,
@@ -763,7 +763,7 @@ export const executeCodex = async params => {
     owner,
     repo,
     prNumber,
-    capabilityPreflight,
+    capabilityPreflight: { ...capabilityPreflight, codexBaseEnv },
   });
 };
 
@@ -809,7 +809,7 @@ export const executeCodexCommand = async params => {
     const mappedModel = mapModelToId(argv.model);
     const { reasoningEffort, source: reasoningEffortSource, rolloutTokenBudget } = resolveCodexReasoningEffort(argv);
     const isResumeMode = !!argv.resume;
-    const codexEnv = applyCodexCapabilityEnv(getCodexExecEnv(argv.verbose), {
+    const codexEnv = applyCodexCapabilityEnv(capabilityPreflight?.codexBaseEnv || getCodexExecEnv(argv.verbose), {
       codexHome: capabilityPreflight?.codexHome,
       baseCodexHome: capabilityPreflight?.baseCodexHome,
     });

package/src/config.lib.mjs

@@ -209,7 +209,7 @@ export const isOpus46OrLater = model => {
   if (!model) return false;
   const normalizedModel = model.toLowerCase();
   // Check for explicit opus-4-6 or later versions, or opusplan (Issue #1223)
-  // Note: The 'opus' alias now maps to Opus 4.8 (Issue #1832), so we also check for the alias directly
+  // Note: The 'opus' alias now maps to Opus 5 (Issue #2096), so we also check for the alias directly
   // opusplan uses Opus for planning, so it should get Opus-level settings
   return normalizedModel === 'opus' || normalizedModel === 'opusplan' || normalizedModel.includes('opus-4-6') || normalizedModel.includes('opus-4-7') || normalizedModel.includes('opus-4-8') || normalizedModel.includes('opus-5');
 };
@@ -217,7 +217,7 @@ export const isOpus46OrLater = model => {
 const isOpus47 = model => {
   if (!model) return false;
   const normalizedModel = model.toLowerCase();
-  // 'opus' alias now maps to Opus 4.8 (Issue #1832), which inherits 4.7 behaviour
+  // 'opus' alias now maps to Opus 5 (Issue #2096), which inherits 4.7/4.8 behaviour
   // opusplan uses Opus for planning, so it gets Opus-level settings
   return normalizedModel === 'opus' || normalizedModel === 'opusplan' || normalizedModel.includes('opus-4-7') || normalizedModel.includes('opus-4-8');
 };
@@ -246,10 +246,26 @@ export const isOpus47OrLater = model => {
 export const isOpus48OrLater = model => {
   if (!model) return false;
   const normalizedModel = model.toLowerCase();
-  // 'opus' alias now maps to Opus 4.8 (Issue #1832)
+  // 'opus' alias now maps to Opus 5 (Issue #2096)
   return normalizedModel === 'opus' || normalizedModel === 'opusplan' || normalizedModel.includes('opus-4-8') || normalizedModel.includes('opus-5');
 };
 
+/**
+ * Check if a model is Claude Opus 5 (Issue #2096)
+ * Opus 5 (`claude-opus-5`) is the current default for `--tool claude` (the bare
+ * `opus` alias now resolves to it). Like Opus 4.8 it supports the full effort ladder
+ * (low/medium/high/xhigh/max), up to 128k output tokens, a 1M context window, and uses
+ * adaptive thinking only (extended/manual thinking with an explicit budget is
+ * unavailable). See: https://www.anthropic.com/news/claude-opus-5
+ * @param {string} model - The model name or ID
+ * @returns {boolean} True if the model is Claude Opus 5
+ */
+export const isOpus5 = model => {
+  if (!model) return false;
+  const m = model.toLowerCase();
+  return m === 'opus' || m === 'opus-5' || m.includes('opus-5');
+};
+
 const isOpus45 = model => {
   if (!model) return false;
   const m = model.toLowerCase();
@@ -294,7 +310,7 @@ const isMythosPreview = model => {
  * Fable 5 (`claude-fable-5`) is Anthropic's most capable widely released model
  * (generally available June 9, 2026). It is a Mythos-class model wrapped in safety
  * classifiers that can refuse high-risk requests (returning stop_reason "refusal")
- * and fall back to Claude Opus 4.8.
+ * and fall back to Claude Opus (the bare `opus` alias, now Opus 5).
  * @param {string} model - The model name or ID
  * @returns {boolean} True if the model is Claude Fable 5
  */
@@ -360,11 +376,11 @@ export const supportsAdaptiveThinking = model => {
 /**
  * Check if a model supports the xhigh effort level.
  * Official docs list xhigh for Claude Fable 5, Claude Mythos 5, Claude Opus 4.7,
- * Opus 4.8, and Sonnet 5 (Issue #1832, Issue #1875, Issue #2003).
+ * Opus 4.8, Opus 5, and Sonnet 5 (Issue #1832, Issue #1875, Issue #2003, Issue #2096).
  * @param {string} model - The model name or ID
  * @returns {boolean} True if the model supports xhigh effort
  */
-export const supportsXHighEffortLevel = model => isFable5OrMythos5(model) || isOpus47(model) || isSonnet5(model);
+export const supportsXHighEffortLevel = model => isFable5OrMythos5(model) || isOpus47(model) || isOpus5(model) || isSonnet5(model);
 
 /**
  * Check if a model supports the max effort level.
@@ -492,9 +508,9 @@ export const describeRequestedThinking = (argv = {}) => {
 export const OPUS_46_EFFORT_LEVELS = ['low', 'medium', 'high', 'max'];
 
 /**
- * Valid effort levels for Opus 4.7 and Opus 4.8 (Issue #1620, Issue #1832)
- * Both models support the additional 'xhigh' level.
- * Opus 4.8 keeps the same effort level set; the default effort level is 'high'
+ * Valid effort levels for Opus 4.7, Opus 4.8, and Opus 5 (Issue #1620, Issue #1832, Issue #2096)
+ * These models support the additional 'xhigh' level.
+ * Opus 5 keeps the same effort level set as Opus 4.8; the default effort level is 'high'
  * (enforced by Claude Code itself, not by this module).
  * See: https://platform.claude.com/docs/en/build-with-claude/effort
  * @type {string[]}

package/src/models/index.mjs

@@ -29,11 +29,11 @@ const execFileAsync = promisify(execFile);
 // ─── MODEL DATA ──────────────────────────────────────────────────────────────
 
 // Claude models (Anthropic API)
-// Updated for Opus 4.5/4.6/4.7/4.8, Sonnet 4.6/5, and Fable 5 / Mythos 5 support
-// (Issue #1221, Issue #1238, Issue #1329, Issue #1433, Issue #1620, Issue #1832, Issue #1875, Issue #2003)
+// Updated for Opus 4.5/4.6/4.7/4.8/5, Sonnet 4.6/5, and Fable 5 / Mythos 5 support
+// (Issue #1221, Issue #1238, Issue #1329, Issue #1433, Issue #1620, Issue #1832, Issue #1875, Issue #2003, Issue #2096)
 export const claudeModels = {
-  sonnet: 'claude-sonnet-5', // Sonnet 5 (default, Issue #2003)
-  opus: 'claude-opus-4-8', // Opus 4.8 (Issue #1832)
+  sonnet: 'claude-sonnet-5', // Sonnet 5 (Issue #2003)
+  opus: 'claude-opus-5', // Opus 5 (default, Issue #2096)
   haiku: 'claude-haiku-4-5-20251001', // Haiku 4.5
   'haiku-3-5': 'claude-3-5-haiku-20241022', // Haiku 3.5
   'haiku-3': 'claude-3-haiku-20240307', // Haiku 3
@@ -48,13 +48,15 @@ export const claudeModels = {
   // Shorter version aliases (Issue #1221, Issue #1329 - PR comment feedback)
   'sonnet-5': 'claude-sonnet-5', // Sonnet 5 short alias (Issue #2003)
   'sonnet-4-6': 'claude-sonnet-4-6', // Sonnet 4.6 short alias (Issue #1329)
+  'opus-5': 'claude-opus-5', // Opus 5 short alias (Issue #2096)
   'opus-4-8': 'claude-opus-4-8', // Opus 4.8 short alias (Issue #1832)
   'opus-4-7': 'claude-opus-4-7', // Opus 4.7 short alias (backward compatibility)
   'opus-4-6': 'claude-opus-4-6', // Opus 4.6 short alias (backward compatibility)
   'opus-4-5': 'claude-opus-4-5-20251101', // Opus 4.5 short alias
   'sonnet-4-5': 'claude-sonnet-4-5-20250929', // Sonnet 4.5 short alias (backward compatibility)
   'haiku-4-5': 'claude-haiku-4-5-20251001', // Haiku 4.5 short alias
-  // Version aliases for backward compatibility (Issue #1221, Issue #1329, Issue #1620, Issue #1832)
+  // Version aliases for backward compatibility (Issue #1221, Issue #1329, Issue #1620, Issue #1832, Issue #2096)
+  'claude-opus-5': 'claude-opus-5', // Opus 5 (Issue #2096)
   'claude-opus-4-8': 'claude-opus-4-8', // Opus 4.8 (Issue #1832)
   'claude-opus-4-7': 'claude-opus-4-7', // Opus 4.7 (backward compatibility)
   'claude-sonnet-5': 'claude-sonnet-5', // Sonnet 5 (Issue #2003)
@@ -230,7 +232,7 @@ export const geminiModels = {
 
 // Default model for each tool (Issue #1473: centralized to avoid scattered hardcoded defaults)
 export const defaultModels = {
-  claude: 'opus', // Issue #2033: Opus is the preferred default for Claude; sonnet remains available explicitly
+  claude: 'opus', // Issue #2033: Opus is the preferred default for Claude; sonnet remains available explicitly. Opus now maps to Opus 5 (Issue #2096)
   agent: 'nemotron-3-super-free', // Issue #1563: changed from qwen3.6-plus-free (free promotion ended) per agent PR #243
   opencode: 'grok-code-fast-1',
   codex: 'gpt-5.6-sol', // Issue #2027: GPT-5.6 Sol is the released Codex flagship; runtime falls back to gpt-5.5 when Sol is not in the local catalog
@@ -254,10 +256,12 @@ export const MODELS_SUPPORTING_1M_CONTEXT = [
   'claude-sonnet-4-6', // Sonnet 4.6 (Issue #1329)
   'claude-sonnet-4-5-20250929',
   'claude-sonnet-4-5',
+  'claude-opus-5', // Opus 5 — 1M context (Issue #2096)
   'sonnet', // Now maps to Sonnet 5 (Issue #2003)
   'sonnet-5', // Short alias (Issue #2003)
   'sonnet-4-6', // Short alias (Issue #1329)
-  'opus', // Now maps to Opus 4.8 (Issue #1832)
+  'opus', // Now maps to Opus 5 (Issue #2096)
+  'opus-5', // Short alias (Issue #2096)
   'opus-4-8', // Short alias (Issue #1832)
   'opus-4-7', // Short alias (Issue #1620)
   'opus-4-6', // Short alias (Issue #1221 - PR comment feedback)
@@ -290,6 +294,7 @@ export const CLAUDE_MODELS = {
   ...claudeModels,
   'claude-fable-5': 'claude-fable-5', // Fable 5 full ID (Issue #1875)
   'claude-mythos-5': 'claude-mythos-5', // Mythos 5 full ID (Issue #1875)
+  'claude-opus-5': 'claude-opus-5', // Opus 5 full ID (Issue #2096)
   'claude-opus-4-8': 'claude-opus-4-8', // Opus 4.8 full ID (Issue #1832)
   'claude-opus-4-7': 'claude-opus-4-7', // Opus 4.7 full ID (Issue #1620)
   'claude-sonnet-4-5-20250929': 'claude-sonnet-4-5-20250929',
@@ -1231,12 +1236,14 @@ export const resolveModelId = (requestedModel, tool) => {
 export const defaultFallbackModels = {
   claude: {
     // Claude Fable 5's safety classifiers can refuse high-risk requests and hand them
-    // off to Claude Opus 4.8; mirror that documented fallback here (Issue #1875).
+    // off to Claude Opus; mirror that documented fallback here (Issue #1875).
     // See: https://platform.claude.com/docs/en/about-claude/models/introducing-claude-fable-5-and-claude-mythos-5
     'claude-fable-5': 'opus',
     // Claude Mythos 5 (limited availability) falls back to the generally available
     // Mythos-class model, Claude Fable 5 (Issue #1875).
     'claude-mythos-5': 'fable',
+    // Claude Opus 5 falls back to the prior Opus generation (Issue #2096).
+    'claude-opus-5': 'opus-4-8',
     'claude-opus-4-8': 'opus-4-7',
     'claude-opus-4-7': 'opus-4-6',
     // Claude Sonnet 5 falls back to the prior Sonnet generation (Issue #2003).

package/src/solve.config.lib.mjs

@@ -354,7 +354,7 @@ export const SOLVE_OPTION_DEFINITIONS = {
   },
   'fallback-model': {
     type: 'string',
-    description: 'Fallback model to switch to on model capacity/overload errors (and, for Fable 5, on safety-classifier refusals). When supported, retries resume the same session with this model. An explicit value is pinned exactly; the built-in defaults form a chain that steps to the next-closest model on repeated capacity errors. Defaults: claude fable/claude-fable-5 -> opus (Opus 4.8); claude mythos-5/claude-mythos-5 -> fable; claude opus/opus-4-8 -> opus-4-7; claude opus-4-7 -> opus-4-6; codex gpt-5.6-sol -> gpt-5.6-terra -> gpt-5.6-luna -> gpt-5.5 -> gpt-5.4; all others unset.',
+    description: 'Fallback model to switch to on model capacity/overload errors (and, for Fable 5, on safety-classifier refusals). When supported, retries resume the same session with this model. An explicit value is pinned exactly; the built-in defaults form a chain that steps to the next-closest model on repeated capacity errors. Defaults: claude fable/claude-fable-5 -> opus (Opus 5); claude mythos-5/claude-mythos-5 -> fable; claude opus/opus-5 -> opus-4-8; claude opus-4-8 -> opus-4-7; claude opus-4-7 -> opus-4-6; codex gpt-5.6-sol -> gpt-5.6-terra -> gpt-5.6-luna -> gpt-5.5 -> gpt-5.4; all others unset.',
     default: undefined,
   },
   'sub-agent-model': {
@@ -364,7 +364,7 @@ export const SOLVE_OPTION_DEFINITIONS = {
   },
   'show-thinking-content': {
     type: 'boolean',
-    description: 'Show thinking content in Claude responses. Opus 4.7+ omits thinking content by default (applies to Opus 4.8 as well); this option opts in to receive summarized thinking blocks. Disabled by default. Only affects --tool claude.',
+    description: 'Show thinking content in Claude responses. Opus 4.7+ omits thinking content by default (applies to Opus 4.8 and Opus 5 as well); this option opts in to receive summarized thinking blocks. Disabled by default. Only affects --tool claude.',
     default: false,
   },
   'prompt-plan-sub-agent': {

package/src/solve.escalate.lib.mjs

@@ -79,10 +79,12 @@ const TIER_ALIASES = {
   'claude-sonnet-4-6': 'sonnet',
   'claude-sonnet-4-5': 'sonnet',
   opus: 'opus',
+  'opus-5': 'opus',
   'opus-4-8': 'opus',
   'opus-4-7': 'opus',
   'opus-4-6': 'opus',
   'opus-4-5': 'opus',
+  'claude-opus-5': 'opus',
   'claude-opus-4-8': 'opus',
   'claude-opus-4-7': 'opus',
   fable: 'fable',