@link-assistant/hive-mind 1.51.0 → 1.52.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @link-assistant/hive-mind
 
+## 1.52.0
+
+### Minor Changes
+
+- 5b24866: Add Claude Opus 4.7 model support with adaptive thinking, model-correct xhigh/max effort mapping, Opus 4.5/Mythos effort detection, and the --show-thinking-content option.
+
 ## 1.51.0
 
 ### Minor Changes

package/package.json

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

package/src/agent.prompts.lib.mjs

@@ -5,6 +5,7 @@
 
 import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mjs';
 import { getExperimentsExamplesSubPrompt } from './experiments-examples.prompts.lib.mjs';
+import { getThinkingPromptInstruction } from './thinking-prompt.lib.mjs';
 
 /**
  * Build the user prompt for Agent
@@ -58,15 +59,9 @@ export const buildUserPrompt = params => {
     promptLines.push('');
   }
 
-  // Add thinking instruction based on --think level
-  if (argv && argv.think) {
-    const thinkMessages = {
-      low: 'Think.',
-      medium: 'Think hard.',
-      high: 'Think harder.',
-      max: 'Ultrathink.',
-    };
-    promptLines.push(thinkMessages[argv.think]);
+  const thinkingPromptInstruction = getThinkingPromptInstruction({ tool: 'agent', argv });
+  if (thinkingPromptInstruction) {
+    promptLines.push(thinkingPromptInstruction);
   }
 
   // Final instruction

package/src/claude.lib.mjs

@@ -301,6 +301,7 @@ export const executeClaude = async params => {
     owner,
     repo,
     argv,
+    claudeVersion: getClaudeVersion(),
   });
   // Build the system prompt
   const systemPrompt = buildSystemPrompt({
@@ -784,7 +785,7 @@ export const executeClaudeCommand = async params => {
     }
     try {
       const { thinkingBudget: resolvedThinkingBudget, thinkLevel, isNewVersion, maxBudget } = await resolveThinkingSettings(argv, log);
-      const claudeEnv = getClaudeEnv({ thinkingBudget: resolvedThinkingBudget, model: effectiveModel, thinkLevel, maxBudget, planModel: resolvedPlanModel, executionModel: resolvedExecutionModel });
+      const claudeEnv = getClaudeEnv({ thinkingBudget: resolvedThinkingBudget, model: effectiveModel, thinkLevel, maxBudget, planModel: resolvedPlanModel, executionModel: resolvedExecutionModel, showThinkingContent: argv.showThinkingContent });
       if (argv.verbose) claudeEnv.ANTHROPIC_LOG = 'debug';
       const modelMaxOutputTokens = getMaxOutputTokensForModel(effectiveModel);
       if (argv.verbose) {
@@ -792,6 +793,7 @@ export const executeClaudeCommand = async params => {
         if (resolvedPlanModel) await log(`📊 opusplan: plan=${resolvedPlanModel}, exec=${resolvedExecutionModel}`, { verbose: true });
         if (resolvedThinkingBudget !== undefined) await log(`📊 MAX_THINKING_TOKENS: ${resolvedThinkingBudget}`, { verbose: true });
         if (claudeEnv.CLAUDE_CODE_EFFORT_LEVEL) await log(`📊 CLAUDE_CODE_EFFORT_LEVEL: ${claudeEnv.CLAUDE_CODE_EFFORT_LEVEL}`, { verbose: true });
+        if (claudeEnv.CLAUDE_CODE_SHOW_THINKING) await log(`📊 CLAUDE_CODE_SHOW_THINKING: ${claudeEnv.CLAUDE_CODE_SHOW_THINKING}`, { verbose: true });
         if (!isNewVersion && thinkLevel) await log(`📊 Thinking level (via keywords): ${thinkLevel}`, { verbose: true });
       }
       const simpleEscapedSystem = systemPrompt.replace(/"/g, '\\"');

package/src/claude.prompts.lib.mjs

@@ -6,6 +6,7 @@
 import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mjs';
 import { getExperimentsExamplesSubPrompt } from './experiments-examples.prompts.lib.mjs';
 import { primaryModelNames } from './models/index.mjs';
+import { getThinkingPromptInstruction } from './thinking-prompt.lib.mjs';
 
 /**
  * Build the user prompt for Claude
@@ -13,7 +14,7 @@ import { primaryModelNames } from './models/index.mjs';
  * @returns {string} The formatted user prompt
  */
 export const buildUserPrompt = params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, forkedRepo, feedbackLines, owner, repo, argv, contributingGuidelines } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, forkedRepo, feedbackLines, owner, repo, argv, contributingGuidelines, claudeVersion } = params;
 
   const promptLines = [];
 
@@ -65,18 +66,9 @@ export const buildUserPrompt = params => {
     promptLines.push('');
   }
 
-  // Note: --think keywords are deprecated for Claude Code >= 2.1.12
-  // Thinking is now enabled by default with 31,999 token budget
-  // Use --thinking-budget to control MAX_THINKING_TOKENS instead
-  // Keeping keywords for backward compatibility with older Claude Code versions
-  if (argv && argv.think) {
-    const thinkMessages = {
-      low: 'Think.',
-      medium: 'Think hard.',
-      high: 'Think harder.',
-      max: 'Ultrathink.',
-    };
-    promptLines.push(thinkMessages[argv.think]);
+  const thinkingPromptInstruction = getThinkingPromptInstruction({ tool: 'claude', argv, claudeVersion });
+  if (thinkingPromptInstruction) {
+    promptLines.push(thinkingPromptInstruction);
   }
 
   // Final instruction

package/src/codex.options.lib.mjs

@@ -9,6 +9,7 @@ const THINK_LEVEL_TO_CODEX_REASONING = {
   low: 'low',
   medium: 'medium',
   high: 'high',
+  xhigh: 'xhigh',
   max: 'xhigh',
 };
 

package/src/codex.prompts.lib.mjs

@@ -5,6 +5,7 @@
 
 import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mjs';
 import { getExperimentsExamplesSubPrompt } from './experiments-examples.prompts.lib.mjs';
+import { getThinkingPromptInstruction } from './thinking-prompt.lib.mjs';
 
 /**
  * Build the user prompt for Codex
@@ -58,15 +59,9 @@ export const buildUserPrompt = params => {
     promptLines.push('');
   }
 
-  // Add thinking instruction based on --think level
-  if (argv && argv.think) {
-    const thinkMessages = {
-      low: 'Think.',
-      medium: 'Think hard.',
-      high: 'Think harder.',
-      max: 'Ultrathink.',
-    };
-    promptLines.push(thinkMessages[argv.think]);
+  const thinkingPromptInstruction = getThinkingPromptInstruction({ tool: 'codex', argv });
+  if (thinkingPromptInstruction) {
+    promptLines.push(thinkingPromptInstruction);
   }
 
   // Final instruction

package/src/config.lib.mjs

@@ -178,11 +178,82 @@ 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.6 (Issue #1433), so we also check for the alias directly
+  // Note: The 'opus' alias now maps to Opus 4.7 (Issue #1620), 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-5');
 };
 
+const isOpus47 = model => {
+  if (!model) return false;
+  const normalizedModel = model.toLowerCase();
+  // 'opus' alias now maps to Opus 4.7 (Issue #1620)
+  // opusplan uses Opus for planning, so it gets Opus-level settings
+  return normalizedModel === 'opus' || normalizedModel === 'opusplan' || normalizedModel.includes('opus-4-7');
+};
+
+/**
+ * Check if a model is Opus 4.7 or later (Issue #1620)
+ * These models use Opus 4.7+ adaptive thinking behavior.
+ * @param {string} model - The model name or ID
+ * @returns {boolean} True if the model is Opus 4.7 or later
+ */
+export const isOpus47OrLater = model => {
+  if (!model) return false;
+  const normalizedModel = model.toLowerCase();
+  return isOpus47(model) || normalizedModel.includes('opus-5');
+};
+
+const isOpus45 = model => {
+  if (!model) return false;
+  const m = model.toLowerCase();
+  return m === 'opus-4-5' || m.includes('opus-4-5');
+};
+
+const isOpus46 = model => {
+  if (!model) return false;
+  const m = model.toLowerCase();
+  return m === 'opus-4-6' || m.includes('opus-4-6');
+};
+
+const isSonnet46OrLater = model => {
+  if (!model) return false;
+  const m = model.toLowerCase();
+  return m === 'sonnet' || m === 'sonnet-4-6' || m.includes('sonnet-4-6') || m.includes('sonnet-5');
+};
+
+const isMythosPreview = model => {
+  if (!model) return false;
+  return model.toLowerCase().includes('mythos');
+};
+
+/**
+ * Check if a model supports CLAUDE_CODE_EFFORT_LEVEL (Issue #1238, Issue #1620)
+ * Official effort support: Claude Mythos Preview, Opus 4.7, Opus 4.6, Sonnet 4.6, and Opus 4.5.
+ * Haiku 4.5 and older models use MAX_THINKING_TOKENS only.
+ * @param {string} model - The model name or ID
+ * @returns {boolean} True if the model supports effort levels
+ */
+export const supportsEffortLevel = model => {
+  if (!model) return false;
+  return isMythosPreview(model) || isOpus47OrLater(model) || isOpus46(model) || isSonnet46OrLater(model) || isOpus45(model);
+};
+
+/**
+ * Check if a model supports the xhigh effort level.
+ * Official docs list xhigh only for Claude Opus 4.7.
+ * @param {string} model - The model name or ID
+ * @returns {boolean} True if the model supports xhigh effort
+ */
+export const supportsXHighEffortLevel = model => isOpus47(model);
+
+/**
+ * Check if a model supports the max effort level.
+ * Official docs list max for Claude Mythos Preview, Opus 4.7, Opus 4.6, and Sonnet 4.6.
+ * @param {string} model - The model name or ID
+ * @returns {boolean} True if the model supports max effort
+ */
+export const supportsMaxEffortLevel = model => isMythosPreview(model) || isOpus47OrLater(model) || isOpus46(model) || isSonnet46OrLater(model);
+
 /**
  * Get the max output tokens for a specific model (Issue #1221)
  * @param {string} model - The model name or ID
@@ -218,6 +289,7 @@ export const getThinkingLevelToTokens = (maxBudget = DEFAULT_MAX_THINKING_BUDGET
   low: Math.floor(maxBudget / 4), // ~8000 for default 31999
   medium: Math.floor(maxBudget / 2), // ~16000 for default 31999
   high: Math.floor((maxBudget * 3) / 4), // ~24000 for default 31999
+  xhigh: maxBudget, // same as max when represented as MAX_THINKING_TOKENS
   max: maxBudget, // 31999 by default
 });
 
@@ -250,56 +322,73 @@ export const getTokensToThinkingLevel = (maxBudget = DEFAULT_MAX_THINKING_BUDGET
 export const tokensToThinkingLevel = getTokensToThinkingLevel(DEFAULT_MAX_THINKING_BUDGET);
 
 /**
- * Valid effort levels for Opus 4.6 (Issue #1238)
- * Opus 4.6 uses CLAUDE_CODE_EFFORT_LEVEL for thinking depth control
+ * Valid effort levels for Opus 4.6 and Sonnet 4.6 (Issue #1238, Issue #1620)
+ * These models use CLAUDE_CODE_EFFORT_LEVEL for thinking depth control
+ * @type {string[]}
+ */
+export const OPUS_46_EFFORT_LEVELS = ['low', 'medium', 'high', 'max'];
+
+/**
+ * Valid effort levels for Opus 4.7 (Issue #1620)
+ * Opus 4.7 supports the additional 'xhigh' level.
+ * See: https://platform.claude.com/docs/en/build-with-claude/effort
  * @type {string[]}
  */
-export const OPUS_46_EFFORT_LEVELS = ['low', 'medium', 'high'];
+export const OPUS_47_EFFORT_LEVELS = ['low', 'medium', 'high', 'xhigh', 'max'];
 
 /**
- * Convert thinking level to Opus 4.6 effort level (Issue #1238)
- * Opus 4.6 uses CLAUDE_CODE_EFFORT_LEVEL (low/medium/high) instead of MAX_THINKING_TOKENS
- * @param {string|undefined} thinkLevel - The thinking level (off/low/medium/high/max)
- * @returns {string|undefined} The effort level (low/medium/high) or undefined if thinking is off
+ * Convert thinking level to effort level (Issue #1238, Issue #1620)
+ * Models with max support keep max as max. Opus 4.7 keeps xhigh as xhigh.
+ * Models with effort but without max support use high for max/xhigh.
+ * @param {string|undefined} thinkLevel - The thinking level (off/low/medium/high/xhigh/max)
+ * @param {Object} [options] - Options
+ * @param {boolean} [options.isOpus47] - Backward-compatible shorthand for supportsXHigh
+ * @param {boolean} [options.supportsXHigh] - Whether the model supports xhigh effort
+ * @param {boolean} [options.supportsMax] - Whether the model supports max effort
+ * @returns {string|undefined} The effort level or undefined if thinking is off
  */
-export const thinkLevelToEffortLevel = thinkLevel => {
+export const thinkLevelToEffortLevel = (thinkLevel, options = {}) => {
   if (!thinkLevel || thinkLevel === 'off') {
-    // No effort level when thinking is disabled
     return undefined;
   }
 
-  // Map hive-mind thinking levels to Opus 4.6 effort levels
-  // Note: Opus 4.6 only supports low/medium/high, not 'max'
-  // We map 'max' to 'high' as it's the highest available level
+  const supportsXHigh = options.supportsXHigh ?? options.isOpus47 ?? false;
+  const supportsMax = options.supportsMax ?? true;
+
   switch (thinkLevel) {
     case 'low':
       return 'low';
     case 'medium':
       return 'medium';
     case 'high':
-    case 'max':
       return 'high';
+    case 'xhigh':
+      return supportsXHigh ? 'xhigh' : supportsMax ? 'max' : 'high';
+    case 'max':
+      return supportsMax ? 'max' : 'high';
     default:
       return undefined;
   }
 };
 
 /**
- * Convert thinking budget (tokens) to Opus 4.6 effort level (Issue #1238)
+ * Convert thinking budget (tokens) to effort level (Issue #1238, Issue #1620)
  * Uses token thresholds to determine the appropriate effort level
  * @param {number|undefined} thinkingBudget - The thinking budget in tokens
  * @param {number} maxBudget - Maximum thinking budget (default: 31999)
- * @returns {string|undefined} The effort level (low/medium/high) or undefined if thinking is off
+ * @param {Object} [options] - Options
+ * @param {boolean} [options.isOpus47] - Backward-compatible shorthand for supportsXHigh
+ * @param {boolean} [options.supportsXHigh] - Whether the model supports xhigh effort
+ * @param {boolean} [options.supportsMax] - Whether the model supports max effort
+ * @returns {string|undefined} The effort level or undefined if thinking is off
  */
-export const thinkingBudgetToEffortLevel = (thinkingBudget, maxBudget = DEFAULT_MAX_THINKING_BUDGET) => {
+export const thinkingBudgetToEffortLevel = (thinkingBudget, maxBudget = DEFAULT_MAX_THINKING_BUDGET, options = {}) => {
   if (thinkingBudget === undefined || thinkingBudget === 0) {
-    // No effort level when thinking is disabled
     return undefined;
   }
 
-  // Convert tokens to thinking level, then to effort level
   const thinkLevel = getTokensToThinkingLevel(maxBudget)(thinkingBudget);
-  return thinkLevelToEffortLevel(thinkLevel);
+  return thinkLevelToEffortLevel(thinkLevel, options);
 };
 
 // Check if a version supports thinking budget (>= minimum version)
@@ -339,27 +428,40 @@ export const getClaudeEnv = (options = {}) => {
     MCP_TOOL_TIMEOUT: String(claudeCode.mcpToolTimeout),
   };
 
-  // Set MAX_THINKING_TOKENS to control Claude Code's extended thinking feature (Claude Code >= 2.1.12)
-  // Default is 0 (thinking disabled) per Issue #1238. Set to 0 to disable thinking.
-  // Users can explicitly enable thinking via --think or --thinking-budget options.
-  env.MAX_THINKING_TOKENS = String(options.thinkingBudget ?? 0);
+  // Opus 4.7+ always uses adaptive thinking — MAX_THINKING_TOKENS has no effect (Issue #1620)
+  // For Opus 4.6 and earlier, MAX_THINKING_TOKENS controls extended thinking (Claude Code >= 2.1.12)
+  // Default is 0 (thinking disabled) per Issue #1238.
+  const opus47 = options.model && isOpus47OrLater(options.model);
+  if (opus47) {
+    // Remove any inherited MAX_THINKING_TOKENS from process.env — Opus 4.7 ignores it
+    delete env.MAX_THINKING_TOKENS;
+  } else {
+    env.MAX_THINKING_TOKENS = String(options.thinkingBudget ?? 0);
+  }
 
-  // For Opus 4.6+, also set CLAUDE_CODE_EFFORT_LEVEL to control thinking depth (Issue #1238)
-  // Opus 4.6 uses effort level (low/medium/high) instead of MAX_THINKING_TOKENS for thinking depth.
-  // MAX_THINKING_TOKENS is only used to disable thinking (when set to 0).
-  if (options.model && isOpus46OrLater(options.model)) {
-    // Convert thinkLevel or thinkingBudget to effort level
+  // Set CLAUDE_CODE_EFFORT_LEVEL for models that support it (Issue #1238, Issue #1620)
+  if (options.model && supportsEffortLevel(options.model)) {
+    const effortOptions = {
+      supportsXHigh: supportsXHighEffortLevel(options.model),
+      supportsMax: supportsMaxEffortLevel(options.model),
+    };
     let effortLevel;
     if (options.thinkLevel) {
-      effortLevel = thinkLevelToEffortLevel(options.thinkLevel);
+      effortLevel = thinkLevelToEffortLevel(options.thinkLevel, effortOptions);
     } else if (options.thinkingBudget !== undefined && options.thinkingBudget > 0) {
-      effortLevel = thinkingBudgetToEffortLevel(options.thinkingBudget, options.maxBudget);
+      effortLevel = thinkingBudgetToEffortLevel(options.thinkingBudget, options.maxBudget, effortOptions);
     }
 
     if (effortLevel) {
       env.CLAUDE_CODE_EFFORT_LEVEL = effortLevel;
     }
   }
+
+  // Opus 4.7 omits thinking content by default; opt in with --show-thinking-content (Issue #1620)
+  // Sets CLAUDE_CODE_SHOW_THINKING=1 which Claude Code uses to request display: "summarized"
+  if (options.showThinkingContent) {
+    env.CLAUDE_CODE_SHOW_THINKING = '1';
+  }
   // Set ANTHROPIC_DEFAULT_OPUS_MODEL when planModel is specified (Issue #1223)
   // This tells Claude Code which model to use during plan mode in opusplan
   if (options.planModel) {

package/src/models/index.mjs

@@ -23,23 +23,25 @@ import { log } from '../lib.mjs';
 // ─── MODEL DATA ──────────────────────────────────────────────────────────────
 
 // Claude models (Anthropic API)
-// Updated for Opus 4.5/4.6 and Sonnet 4.6 support (Issue #1221, Issue #1238, Issue #1329, Issue #1433)
+// Updated for Opus 4.5/4.6/4.7 and Sonnet 4.6 support (Issue #1221, Issue #1238, Issue #1329, Issue #1433, Issue #1620)
 export const claudeModels = {
   sonnet: 'claude-sonnet-4-6', // Sonnet 4.6 (default, Issue #1329)
-  opus: 'claude-opus-4-6', // Opus 4.6 (Issue #1433)
+  opus: 'claude-opus-4-7', // Opus 4.7 (Issue #1620)
   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
   opusplan: 'opusplan', // Special mode: Opus for planning, Sonnet for execution (Issue #1223)
   // Shorter version aliases (Issue #1221, Issue #1329 - PR comment feedback)
   'sonnet-4-6': 'claude-sonnet-4-6', // Sonnet 4.6 short alias (Issue #1329)
-  'opus-4-6': 'claude-opus-4-6', // Opus 4.6 short alias
+  'opus-4-7': 'claude-opus-4-7', // Opus 4.7 short alias (Issue #1620)
+  '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)
+  // Version aliases for backward compatibility (Issue #1221, Issue #1329, Issue #1620)
+  'claude-opus-4-7': 'claude-opus-4-7', // Opus 4.7 (Issue #1620)
   'claude-sonnet-4-6': 'claude-sonnet-4-6', // Sonnet 4.6 (Issue #1329)
-  'claude-opus-4-6': 'claude-opus-4-6', // Opus 4.6
+  'claude-opus-4-6': 'claude-opus-4-6', // Opus 4.6 (backward compatibility)
   'claude-opus-4-5': 'claude-opus-4-5-20251101', // Opus 4.5
   'claude-sonnet-4-5': 'claude-sonnet-4-5-20250929', // Sonnet 4.5 (backward compatibility)
   'claude-haiku-4-5': 'claude-haiku-4-5-20251001', // Haiku 4.5
@@ -129,6 +131,7 @@ export const defaultModels = {
 // Models that support 1M token context window via [1m] suffix (Issue #1221, Issue #1238, Issue #1329)
 // See: https://code.claude.com/docs/en/model-config
 export const MODELS_SUPPORTING_1M_CONTEXT = [
+  'claude-opus-4-7', // Opus 4.7 (Issue #1620)
   'claude-opus-4-6',
   'claude-opus-4-5-20251101',
   'claude-sonnet-4-6', // Sonnet 4.6 (Issue #1329)
@@ -136,7 +139,8 @@ export const MODELS_SUPPORTING_1M_CONTEXT = [
   'claude-sonnet-4-5',
   'sonnet', // Now maps to Sonnet 4.6 (Issue #1329)
   'sonnet-4-6', // Short alias (Issue #1329)
-  'opus',
+  'opus', // Now maps to Opus 4.7 (Issue #1620)
+  'opus-4-7', // Short alias (Issue #1620)
   'opus-4-6', // Short alias (Issue #1221 - PR comment feedback)
   'opus-4-5', // Short alias (Issue #1238)
   'sonnet-4-5', // Short alias (Issue #1221 - PR comment feedback)
@@ -165,6 +169,7 @@ export const freeToBaseModelMap = {
 
 export const CLAUDE_MODELS = {
   ...claudeModels,
+  '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',
   'claude-opus-4-5-20251101': 'claude-opus-4-5-20251101',
   'claude-haiku-4-5-20251001': 'claude-haiku-4-5-20251001',

package/src/opencode.prompts.lib.mjs

@@ -5,6 +5,7 @@
 
 import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mjs';
 import { getExperimentsExamplesSubPrompt } from './experiments-examples.prompts.lib.mjs';
+import { getThinkingPromptInstruction } from './thinking-prompt.lib.mjs';
 
 /**
  * Build the user prompt for OpenCode
@@ -58,15 +59,9 @@ export const buildUserPrompt = params => {
     promptLines.push('');
   }
 
-  // Add thinking instruction based on --think level
-  if (argv && argv.think) {
-    const thinkMessages = {
-      low: 'Think.',
-      medium: 'Think hard.',
-      high: 'Think harder.',
-      max: 'Ultrathink.',
-    };
-    promptLines.push(thinkMessages[argv.think]);
+  const thinkingPromptInstruction = getThinkingPromptInstruction({ tool: 'opencode', argv });
+  if (thinkingPromptInstruction) {
+    promptLines.push(thinkingPromptInstruction);
   }
 
   // Final instruction

package/src/solve.config.lib.mjs

@@ -229,8 +229,8 @@ export const SOLVE_OPTION_DEFINITIONS = {
   },
   think: {
     type: 'string',
-    description: 'Thinking level hint. For Claude, translated to --thinking-budget for Claude Code >= 2.1.12 (off=0, low=~8000, medium=~16000, high=~24000, max=31999). For Codex, mapped to reasoning effort (off=none, low=low, medium=medium, high=high, max=xhigh).',
-    choices: ['off', 'low', 'medium', 'high', 'max'],
+    description: 'Thinking level hint. For Claude, translated to --thinking-budget for Claude Code >= 2.1.12 (off=0, low=~8000, medium=~16000, high=~24000, xhigh/max=31999) and to CLAUDE_CODE_EFFORT_LEVEL when supported. Opus 4.7 supports xhigh and max; Opus 4.6/Sonnet 4.6/Mythos support max; Opus 4.5 uses high for xhigh/max. For Codex, mapped to reasoning effort (off=none, low=low, medium=medium, high=high, xhigh/max=xhigh).',
+    choices: ['off', 'low', 'medium', 'high', 'xhigh', 'max'],
     default: undefined,
   },
   'thinking-budget': {
@@ -248,6 +248,11 @@ export const SOLVE_OPTION_DEFINITIONS = {
     description: 'Maximum thinking budget for calculating --think level mappings (default: 31999 for Claude Code). Values: off=0, low=max/4, medium=max/2, high=max*3/4, max=max.',
     default: 31999,
   },
+  'show-thinking-content': {
+    type: 'boolean',
+    description: 'Show thinking content in Claude responses. Opus 4.7 omits thinking content by default; this option opts in to receive summarized thinking blocks. Disabled by default. Only affects --tool claude.',
+    default: false,
+  },
   'prompt-plan-sub-agent': {
     type: 'boolean',
     description: 'Encourage AI to use a planning sub-agent or planning workflow for initial planning. Supported for --tool claude and --tool codex.',

package/src/telegram-bot.mjs

@@ -651,7 +651,7 @@ bot.command('help', async ctx => {
   message += '🔧 *Common Options:*\n';
   message += `• \`--model <model>\` or \`-m\` - ${buildModelOptionDescription()}\n`;
   message += '• `--base-branch <branch>` or `-b` - Target branch for PR (default: repo default branch)\n';
-  message += '• `--think <level>` - Thinking level (off/low/medium/high/max) | `--thinking-budget <num>` - Token budget (0-63999)\n';
+  message += '• `--think <level>` - Thinking level (off/low/medium/high/xhigh/max) | `--thinking-budget <num>` - Token budget (0-63999)\n';
   message += '• `--verbose` or `-v` - Verbose output | `--attach-logs` - Attach logs to PR\n';
   message += '\n💡 *Tip:* Many more options available. See full documentation for complete list.\n';
 

package/src/thinking-prompt.lib.mjs

@@ -0,0 +1,61 @@
+#!/usr/bin/env node
+
+import { supportsEffortLevel, supportsThinkingBudget } from './config.lib.mjs';
+import { defaultModels, mapModelForTool } from './models/index.mjs';
+
+export const THINK_PROMPT_MESSAGES = Object.freeze({
+  low: 'Think.',
+  medium: 'Think hard.',
+  high: 'Think harder.',
+  xhigh: 'Ultrathink.',
+  max: 'Ultrathink.',
+});
+
+export const isClaudeLikeModel = model => {
+  if (!model) return false;
+  const normalized = String(model).toLowerCase();
+  return normalized === 'opusplan' || normalized.includes('claude') || normalized.startsWith('anthropic/');
+};
+
+export const resolvePromptModelForTool = (tool = 'claude', model) => {
+  const selectedModel = model || defaultModels[tool];
+  return selectedModel ? mapModelForTool(tool, selectedModel) : null;
+};
+
+export const toolSupportsStructuredThinkingBudget = ({ tool = 'claude', claudeVersion, thinkingBudgetClaudeMinimumVersion } = {}) => {
+  if (tool === 'claude') {
+    return supportsThinkingBudget(claudeVersion || '0.0.0', thinkingBudgetClaudeMinimumVersion || '2.1.12');
+  }
+
+  // Codex maps --think/--thinking-budget to model_reasoning_effort instead of prompt text.
+  return tool === 'codex';
+};
+
+export const shouldAddThinkingPromptInstruction = ({ tool = 'claude', argv, claudeVersion } = {}) => {
+  const thinkLevel = argv?.think;
+  if (!thinkLevel || !THINK_PROMPT_MESSAGES[thinkLevel]) {
+    return false;
+  }
+
+  const resolvedModel = resolvePromptModelForTool(tool, argv?.model);
+  if (!isClaudeLikeModel(resolvedModel)) {
+    return false;
+  }
+
+  if (supportsEffortLevel(resolvedModel)) {
+    return false;
+  }
+
+  return !toolSupportsStructuredThinkingBudget({
+    tool,
+    claudeVersion,
+    thinkingBudgetClaudeMinimumVersion: argv?.thinkingBudgetClaudeMinimumVersion,
+  });
+};
+
+export const getThinkingPromptInstruction = options => {
+  if (!shouldAddThinkingPromptInstruction(options)) {
+    return undefined;
+  }
+  return THINK_PROMPT_MESSAGES[options?.argv?.think];
+};