@link-assistant/hive-mind 1.56.2 → 1.56.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/hive-mind
 
+## 1.56.4
+
+### Patch Changes
+
+- 2d6d405: Fix Telegram bot LINO configuration parsing for parenthesized option/value links such as `(--isolation screen)`.
+
+## 1.56.3
+
+### Patch Changes
+
+- 86da037: Support `gpt-5.5` for the Codex tool, prefer it as the default model, accept forward-compatible `gpt-5.5-mini` and `gpt-5.5-nano` aliases, and document per-tool model and reasoning defaults.
+
 ## 1.56.2
 
 ### Patch Changes

package/README.hi.md

@@ -452,7 +452,7 @@ Aliases:
 /agent /solve --tool agent के बराबर है
 
 Tool alias examples:
-/codex https://github.com/owner/repo/issues/123 --model gpt-5.4
+/codex https://github.com/owner/repo/issues/123 --model gpt-5.5
 /opencode https://github.com/owner/repo/issues/123 --model grok-code-fast-1
 /agent https://github.com/owner/repo/issues/123 --model nemotron-3-super-free
 

package/README.md

@@ -461,7 +461,7 @@ Aliases:
 /agent is equivalent to /solve --tool agent
 
 Tool alias examples:
-/codex https://github.com/owner/repo/issues/123 --model gpt-5.4
+/codex https://github.com/owner/repo/issues/123 --model gpt-5.5
 /opencode https://github.com/owner/repo/issues/123 --model grok-code-fast-1
 /agent https://github.com/owner/repo/issues/123 --model nemotron-3-super-free
 
@@ -477,6 +477,17 @@ Free Models via Kilo Gateway (with --tool agent):
 /solve https://github.com/owner/repo/issues/123 --tool agent --model kilo/deepseek-r1-free
 ```
 
+Current tool defaults in Hive Mind:
+
+| Tool       | Default model                                               | Default reasoning behavior                                                               |
+| ---------- | ----------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
+| `claude`   | `sonnet`                                                    | No extra thinking is requested unless you pass `--think` or `--thinking-budget`          |
+| `codex`    | `gpt-5.5` preferred, with runtime fallback to local catalog | Codex runs with `reasoning_effort=none` unless you pass `--think` or `--thinking-budget` |
+| `opencode` | `grok-code-fast-1`                                          | No extra thinking prompt is added for the default model                                  |
+| `agent`    | `nemotron-3-super-free`                                     | No extra thinking prompt is added for the default model                                  |
+
+See [docs/CONFIGURATION.md](./docs/CONFIGURATION.md) for the full per-tool defaults and reasoning mappings.
+
 > **📖 Free Models Guide**: See [docs/FREE_MODELS.md](./docs/FREE_MODELS.md) for comprehensive information about all free models including OpenCode Zen and Kilo Gateway providers.
 
 #### `/hive` - Run Hive Orchestration

package/README.ru.md

@@ -452,7 +452,7 @@ Aliases:
 /agent эквивалентна /solve --tool agent
 
 Tool alias examples:
-/codex https://github.com/owner/repo/issues/123 --model gpt-5.4
+/codex https://github.com/owner/repo/issues/123 --model gpt-5.5
 /opencode https://github.com/owner/repo/issues/123 --model grok-code-fast-1
 /agent https://github.com/owner/repo/issues/123 --model nemotron-3-super-free
 

package/README.zh.md

@@ -452,7 +452,7 @@ Aliases:
 /agent 等同于 /solve --tool agent
 
 Tool alias examples:
-/codex https://github.com/owner/repo/issues/123 --model gpt-5.4
+/codex https://github.com/owner/repo/issues/123 --model gpt-5.5
 /opencode https://github.com/owner/repo/issues/123 --model grok-code-fast-1
 /agent https://github.com/owner/repo/issues/123 --model nemotron-3-super-free
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.56.2",
+  "version": "1.56.4",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",
@@ -15,7 +15,7 @@
     "hive-telegram-bot": "./src/telegram-bot.mjs"
   },
   "scripts": {
-    "test": "node tests/solve-queue.test.mjs && node tests/limits-display.test.mjs && node tests/test-usage-limit.mjs && node tests/test-codex-support.mjs && node tests/test-build-cost-info-string.mjs && node tests/test-claude-code-install-method.mjs && node tests/test-claude-quiet-config.mjs && node tests/test-configure-claude-bin.mjs && node tests/test-docker-release-order.mjs && node tests/test-docker-box-migration.mjs && node tests/test-hive-screens.mjs && node tests/test-issue-1616-pr-issue-link-preservation.mjs && node tests/test-pre-pr-failure-notifier-1640.mjs && node tests/test-ready-to-merge-pagination-1645.mjs && node tests/test-require-gh-paginate-rule.mjs && node tests/test-telegram-message-filters.mjs && node tests/test-telegram-bot-command-aliases.mjs && node tests/test-solve-queue-command.mjs && node tests/test-queue-display-1267.mjs && node tests/test-telegram-bot-launcher.mjs",
+    "test": "node tests/solve-queue.test.mjs && node tests/limits-display.test.mjs && node tests/test-usage-limit.mjs && node tests/test-codex-support.mjs && node tests/test-build-cost-info-string.mjs && node tests/test-claude-code-install-method.mjs && node tests/test-claude-quiet-config.mjs && node tests/test-configure-claude-bin.mjs && node tests/test-docker-release-order.mjs && node tests/test-docker-box-migration.mjs && node tests/test-hive-screens.mjs && node tests/test-issue-1616-pr-issue-link-preservation.mjs && node tests/test-pre-pr-failure-notifier-1640.mjs && node tests/test-ready-to-merge-pagination-1645.mjs && node tests/test-require-gh-paginate-rule.mjs && node tests/test-telegram-message-filters.mjs && node tests/test-telegram-bot-command-aliases.mjs && node tests/test-telegram-bot-configuration-isolation-links-notation.mjs && node tests/test-extract-isolation-from-args.mjs && node tests/test-solve-queue-command.mjs && node tests/test-queue-display-1267.mjs && node tests/test-telegram-bot-launcher.mjs",
     "test:queue": "node tests/solve-queue.test.mjs",
     "test:limits-display": "node tests/limits-display.test.mjs",
     "test:usage-limit": "node tests/test-usage-limit.mjs",

package/src/codex.lib.mjs

@@ -23,6 +23,7 @@ import { createInteractiveHandler } from './interactive-mode.lib.mjs';
 import { initProgressMonitoring } from './solve.progress-monitoring.lib.mjs';
 import { getCodexPlaywrightMcpDisableConfigArgs } from './playwright-mcp.lib.mjs';
 import { fetchModelInfo } from './model-info.lib.mjs';
+import { defaultModels } from './models/index.mjs';
 import Decimal from 'decimal.js-light';
 
 const CODEX_USAGE_FIELD_NAMES = ['input_tokens', 'cached_input_tokens', 'output_tokens', 'cache_write_tokens', 'cache_creation_input_tokens', 'reasoning_tokens', 'input_tokens_details.cached_tokens', 'input_tokens_details.cache_read_tokens', 'input_tokens_details.cache_write_tokens', 'input_tokens_details.cache_creation_tokens', 'input_tokens_details.cache_creation_input_tokens', 'output_tokens_details.reasoning_tokens'];
@@ -408,7 +409,7 @@ export const calculateCodexPricing = async (modelId, tokenUsage) => {
 };
 
 // Function to validate Codex CLI connection
-export const validateCodexConnection = async (model = 'gpt-5.4', verbose = false) => {
+export const validateCodexConnection = async (model = defaultModels.codex, verbose = false) => {
   // Map model alias to full ID
   const mappedModel = mapModelToId(model);
 

package/src/hive.mjs

@@ -86,7 +86,7 @@ if (isRunningDirectly) {
     const { validateClaudeConnection } = claudeLib;
     // Import model validation library
     const modelValidation = await import('./models/index.mjs');
-    const { validateAndExitOnInvalidModel, defaultModels } = modelValidation;
+    const { validateAndExitOnInvalidModel, defaultModels, resolveRuntimeDefaultModel } = modelValidation;
     const githubLib = await import('./github.lib.mjs');
     const { checkGitHubPermissions, fetchAllIssuesWithPagination, fetchProjectIssues, isRateLimitError, batchCheckPullRequestsForIssues, parseGitHubUrl, batchCheckArchivedRepositories } = githubLib;
     // Import YouTrack-related functions
@@ -458,7 +458,7 @@ if (isRunningDirectly) {
 
     const modelExplicitlyProvided = rawArgs.includes('--model') || rawArgs.includes('-m') || rawArgs.includes('--worker-model');
     if (argv.tool && !modelExplicitlyProvided && defaultModels[argv.tool]) {
-      argv.model = defaultModels[argv.tool];
+      argv.model = await resolveRuntimeDefaultModel(argv.tool);
     }
 
     // Validate model names EARLY (simple string check, always runs)

package/src/lenv-reader.lib.mjs

@@ -38,6 +38,43 @@ const LinoParser = linoModule.Parser || linoModule.default?.Parser;
 
 const fs = await import('fs');
 
+function isCliOptionToken(value) {
+  return /^--[a-zA-Z0-9][a-zA-Z0-9=_.-]*$/.test(value) || /^-[a-zA-Z]$/.test(value);
+}
+
+function collectStringValues(value, result = []) {
+  if (value && typeof value === 'object' && Array.isArray(value.values)) {
+    if (value.id !== null && value.id !== undefined) {
+      result.push(String(value.id));
+    }
+    for (const child of value.values) {
+      collectStringValues(child, result);
+    }
+  } else if (value !== null && value !== undefined) {
+    result.push(String(value));
+  }
+  return result;
+}
+
+function validateNoBareSameLineOptions(content) {
+  let currentVar = 'configuration';
+
+  for (const line of content.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed === '(' || trimmed === ')') continue;
+
+    const topLevelMatch = !/^\s/.test(line) ? trimmed.match(/^([A-Za-z_][A-Za-z0-9_]*):(?:\s*(.*))?$/) : null;
+    const valueText = topLevelMatch ? (topLevelMatch[2] || '').trim() : trimmed;
+    if (topLevelMatch) currentVar = topLevelMatch[1];
+    if (!valueText || valueText === '(' || valueText === ')' || valueText.startsWith('(')) continue;
+
+    const parts = valueText.split(/\s+/).filter(Boolean);
+    if (parts.length > 1 && isCliOptionToken(parts[0])) {
+      throw new Error(`Invalid LINO format in "${currentVar}": Multiple values on the same line are not supported.\n` + `Found: "${parts.join(' ')}"\n` + `Each value must be on its own line with proper indentation, or grouped explicitly as a parenthesized link.`);
+    }
+  }
+}
+
 /**
  * LenvReader - Reads and parses .lenv files using LINO notation
  */
@@ -59,6 +96,8 @@ export class LenvReader {
     const result = {};
 
     try {
+      validateNoBareSameLineOptions(content);
+
       // Parse the entire content as LINO
       const parsed = this.parser.parse(content);
 
@@ -77,36 +116,9 @@ export class LenvReader {
 
         // The values are the variable value
         if (link.values && link.values.length > 0) {
-          // Check for nested structures (multiple items on same line) - reject with error
-          // A nested tuple with id=null that appears amongst other direct values indicates
-          // same-line grouping (e.g., "--option1  --option2" on same line)
-          // However, if the entire list is a SINGLE nested tuple (e.g., "VAR: (\n  1\n  2\n)"),
-          // that's valid parenthesized syntax
-          const hasDirectValues = link.values.some(v => v && typeof v === 'object' && v.id !== null);
-          const hasNestedTuples = link.values.some(v => v && typeof v === 'object' && v.id === null && v.values && v.values.length > 0);
-
-          if (hasDirectValues && hasNestedTuples) {
-            // Mixed direct values and nested tuples indicates same-line grouping
-            for (const v of link.values) {
-              if (v && typeof v === 'object' && v.id === null && v.values && v.values.length > 0) {
-                const nestedItems = v.values.map(nested => nested.id || nested).join(' ');
-                throw new Error(`Invalid LINO format in "${varName}": Multiple values on the same line are not supported.\n` + `Found: "${nestedItems}"\n` + `Each value must be on its own line with proper indentation.`);
-              }
-            }
-          }
-
-          // Determine which values to validate for invalid characters
-          // If it's a single nested tuple (parenthesized list), unwrap it for validation
-          let valuesToValidate = link.values;
-          if (link.values.length === 1 && link.values[0] && typeof link.values[0] === 'object' && link.values[0].id === null && link.values[0].values) {
-            // Single parenthesized list - use inner values
-            valuesToValidate = link.values[0].values;
-          }
-
           // Check for invalid characters in option-like values
-          for (const v of valuesToValidate) {
+          for (const valueStr of link.values.flatMap(v => collectStringValues(v))) {
             // Options should match pattern: --option-name or -o (with optional =value)
-            const valueStr = v.id || v;
             if (typeof valueStr === 'string' && valueStr.startsWith('-')) {
               // This looks like a command-line option, validate it
               // Valid option pattern: -x, --option-name, --option-name=value
@@ -119,7 +131,7 @@ export class LenvReader {
           }
 
           // If there are multiple values, format them as LINO notation
-          const values = link.values.map(v => v.id || v);
+          const values = link.values.flatMap(v => collectStringValues(v));
 
           // If it's a single value, just use it as-is
           if (values.length === 1) {

package/src/lino.lib.mjs

@@ -9,6 +9,20 @@ const fs = await import('fs');
 const path = await import('path');
 const os = await import('os');
 
+function collectStringValues(value, result = []) {
+  if (value && typeof value === 'object' && Array.isArray(value.values)) {
+    if (value.id !== null && value.id !== undefined) {
+      result.push(String(value.id));
+    }
+    for (const child of value.values) {
+      collectStringValues(child, result);
+    }
+  } else if (value !== null && value !== undefined) {
+    result.push(String(value));
+  }
+  return result;
+}
+
 export class LinksNotationManager {
   constructor() {
     this.parser = new LinoParser();
@@ -26,8 +40,7 @@ export class LinksNotationManager {
 
       if (link.values && link.values.length > 0) {
         for (const value of link.values) {
-          const val = value.id || value;
-          values.push(val);
+          values.push(...collectStringValues(value));
         }
       } else if (link.id) {
         values.push(link.id);
@@ -50,9 +63,11 @@ export class LinksNotationManager {
 
       if (link.values && link.values.length > 0) {
         for (const value of link.values) {
-          const num = parseInt(value.id || value);
-          if (!isNaN(num)) {
-            ids.push(num);
+          for (const linkValue of collectStringValues(value)) {
+            const num = parseInt(linkValue);
+            if (!isNaN(num)) {
+              ids.push(num);
+            }
           }
         }
       } else if (link.id) {
@@ -79,8 +94,7 @@ export class LinksNotationManager {
 
       if (link.values && link.values.length > 0) {
         for (const value of link.values) {
-          const linkStr = value.id || value;
-          if (typeof linkStr === 'string') {
+          for (const linkStr of collectStringValues(value)) {
             links.push(linkStr);
           }
         }

package/src/models/index.mjs

@@ -12,6 +12,9 @@
  * @see https://github.com/link-assistant/hive-mind/issues/1473
  */
 
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+
 // Check if use is already defined (when imported from solve.mjs)
 // If not, fetch it (when running standalone)
 if (typeof globalThis.use === 'undefined') {
@@ -20,6 +23,8 @@ if (typeof globalThis.use === 'undefined') {
 
 import { log } from '../lib.mjs';
 
+const execFileAsync = promisify(execFile);
+
 // ─── MODEL DATA ──────────────────────────────────────────────────────────────
 
 // Claude models (Anthropic API)
@@ -106,9 +111,13 @@ export const opencodeModels = {
 export const codexModels = {
   gpt5: 'gpt-5',
   'gpt-5': 'gpt-5',
+  'gpt-5.5': 'gpt-5.5',
+  'gpt-5.5-mini': 'gpt-5.5-mini',
+  'gpt-5.5-nano': 'gpt-5.5-nano',
   'gpt-5.4': 'gpt-5.4',
   'gpt-5.4-mini': 'gpt-5.4-mini',
   'gpt-5.4-nano': 'gpt-5.4-nano',
+  'gpt-5.2': 'gpt-5.2',
   'gpt-5.2-codex': 'gpt-5.2-codex',
   'gpt-5.3-codex': 'gpt-5.3-codex',
   'gpt-5.3-codex-spark': 'gpt-5.3-codex-spark',
@@ -125,7 +134,7 @@ export const defaultModels = {
   claude: 'sonnet',
   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.4',
+  codex: 'gpt-5.5',
 };
 
 // Models that support 1M token context window via [1m] suffix (Issue #1221, Issue #1238, Issue #1329)
@@ -190,9 +199,13 @@ export const OPENCODE_MODELS = {
 export const CODEX_MODELS = {
   ...codexModels,
   'gpt-5': 'gpt-5',
+  'gpt-5.5': 'gpt-5.5',
+  'gpt-5.5-mini': 'gpt-5.5-mini',
+  'gpt-5.5-nano': 'gpt-5.5-nano',
   'gpt-5.4': 'gpt-5.4',
   'gpt-5.4-mini': 'gpt-5.4-mini',
   'gpt-5.4-nano': 'gpt-5.4-nano',
+  'gpt-5.2': 'gpt-5.2',
   'gpt-5.2-codex': 'gpt-5.2-codex',
   'gpt-5.3-codex': 'gpt-5.3-codex',
   'gpt-5.3-codex-spark': 'gpt-5.3-codex-spark',
@@ -249,6 +262,50 @@ export const getDefaultModelForTool = tool => {
   return defaultModels[tool] || defaultModels.claude;
 };
 
+let cachedInstalledCodexModelsPromise = null;
+const CODEX_DEFAULT_FALLBACK_CHAIN = ['gpt-5.4', 'gpt-5.5-mini', 'gpt-5.4-mini', 'gpt-5.3-codex', 'gpt-5.3-codex-spark', 'gpt-5.2', 'gpt-5.2-codex', 'gpt-5.5-nano', 'gpt-5.4-nano'];
+
+export const getInstalledCodexModels = async () => {
+  if (!cachedInstalledCodexModelsPromise) {
+    cachedInstalledCodexModelsPromise = (async () => {
+      try {
+        const { stdout } = await execFileAsync('codex', ['debug', 'models'], {
+          encoding: 'utf8',
+          maxBuffer: 10 * 1024 * 1024,
+        });
+        const parsed = JSON.parse(stdout);
+        const modelSlugs = parsed?.models?.map(model => model?.slug).filter(Boolean);
+        return Array.isArray(modelSlugs) ? [...new Set(modelSlugs)] : null;
+      } catch {
+        return null;
+      }
+    })();
+  }
+
+  return cachedInstalledCodexModelsPromise;
+};
+
+export const resolveRuntimeDefaultModel = async (tool, options = {}) => {
+  const toolName = (tool || 'claude').toString().toLowerCase();
+  const preferredDefault = defaultModels[toolName] || defaultModels.claude;
+
+  if (toolName !== 'codex') {
+    return preferredDefault;
+  }
+
+  const availableCodexModels = options.availableCodexModels === undefined ? await getInstalledCodexModels() : options.availableCodexModels;
+
+  if (!Array.isArray(availableCodexModels) || availableCodexModels.length === 0) {
+    return preferredDefault;
+  }
+
+  if (availableCodexModels.includes(preferredDefault)) {
+    return preferredDefault;
+  }
+
+  return CODEX_DEFAULT_FALLBACK_CHAIN.find(model => availableCodexModels.includes(model)) || preferredDefault;
+};
+
 /**
  * Map model name to full model ID for a specific tool
  * @param {string} tool - The tool name (claude, agent, opencode, codex)
@@ -318,7 +375,7 @@ export const getValidModelsForTool = tool => {
 export const primaryModelNames = {
   claude: ['opus', 'sonnet', 'haiku', 'opusplan'],
   opencode: ['grok', 'gpt4o'],
-  codex: ['gpt-5.4', 'gpt-5.4-mini', 'gpt-5.3-codex', 'gpt-5.3-codex-spark', 'gpt-5.2-codex'],
+  codex: ['gpt-5.5', 'gpt-5.4', 'gpt-5.4-mini', 'gpt-5.3-codex', 'gpt-5.3-codex-spark'],
   agent: ['nemotron-3-super-free', 'minimax-m2.5-free', 'big-pickle', 'gpt-5-nano', 'glm-5-free', 'deepseek-r1-free'],
 };
 

package/src/solve.config.lib.mjs

@@ -8,7 +8,7 @@
 // This approach was adopted per issue #482 feedback to minimize custom code maintenance
 
 import { enhanceErrorMessage, detectMalformedFlags } from './option-suggestions.lib.mjs';
-import { defaultModels, buildModelOptionDescription } from './models/index.mjs';
+import { defaultModels, buildModelOptionDescription, resolveRuntimeDefaultModel } from './models/index.mjs';
 import { validateBranchName } from './solve.branch.lib.mjs';
 
 // Re-export for use by telegram-bot.mjs (avoids extra import lines there)
@@ -678,7 +678,7 @@ export const parseArguments = async (yargs, hideBin) => {
   if (argv.tool && !modelExplicitlyProvided && defaultModels[argv.tool]) {
     // User did not explicitly provide --model, so use the correct default for the tool
     // (Issue #1473: centralized in models/index.mjs)
-    argv.model = defaultModels[argv.tool];
+    argv.model = await resolveRuntimeDefaultModel(argv.tool);
   }
 
   // Validate mutual exclusivity of --claude-file and --gitkeep-file

package/src/telegram-bot.mjs

@@ -28,7 +28,7 @@ const getenv = typeof getenvModule === 'function' ? getenvModule : getenvModule.
 
 // Load .env/.lenv configuration (issue #1318)
 dotenvx.config({ quiet: true, ignore: ['MISSING_ENV_FILE'] });
-loadLenvConfig({ override: true, quiet: true });
+await loadLenvConfig({ override: true, quiet: true });
 
 const yargsModule = await use('yargs@17.7.2');
 const yargs = yargsModule.default || yargsModule;
@@ -123,7 +123,7 @@ const config = yargs(hideBin(process.argv))
 
 // Configuration priority: CLI option > --configuration LINO > .lenv > .env
 if (config.configuration) {
-  loadLenvConfig({ configuration: config.configuration, override: true, quiet: true });
+  await loadLenvConfig({ configuration: config.configuration, override: true, quiet: true });
 }
 
 const BOT_TOKEN = config.token || getenv('TELEGRAM_BOT_TOKEN', '');
@@ -173,8 +173,12 @@ if (ISOLATION_BACKEND) {
 if (solveEnabled && solveOverrides.length > 0) {
   console.log('Validating solve overrides...');
   try {
+    const { backend: solveOverrideIsolation, filteredArgs: solveOverridesForValidation } = extractIsolationFromArgs(solveOverrides);
+    if (solveOverrideIsolation && !isValidPerCommandIsolation(solveOverrideIsolation)) {
+      throw new Error(`Invalid --isolation value '${solveOverrideIsolation}'. Must be: screen, tmux, or docker`);
+    }
     // Add a dummy URL as the first argument (required positional for solve)
-    const testArgs = ['https://github.com/test/test/issues/1', ...solveOverrides];
+    const testArgs = ['https://github.com/test/test/issues/1', ...solveOverridesForValidation];
 
     // Temporarily suppress stderr to avoid yargs error output during validation
     const originalStderrWrite = process.stderr.write;
@@ -197,7 +201,7 @@ if (solveEnabled && solveOverrides.length > 0) {
         });
       await testYargs.parse(testArgs);
       // Issue #1482: Validate --base-branch in overrides early
-      const overrideBranchError = validateBranchInArgs(solveOverrides);
+      const overrideBranchError = validateBranchInArgs(solveOverridesForValidation);
       if (overrideBranchError) throw new Error(overrideBranchError);
       console.log('✅ Solve overrides validated successfully');
     } finally {
@@ -216,8 +220,12 @@ if (solveEnabled && solveOverrides.length > 0) {
 if (hiveEnabled && hiveOverrides.length > 0) {
   console.log('Validating hive overrides...');
   try {
+    const { backend: hiveOverrideIsolation, filteredArgs: hiveOverridesForValidation } = extractIsolationFromArgs(hiveOverrides);
+    if (hiveOverrideIsolation && !isValidPerCommandIsolation(hiveOverrideIsolation)) {
+      throw new Error(`Invalid --isolation value '${hiveOverrideIsolation}'. Must be: screen, tmux, or docker`);
+    }
     // Add a dummy URL as the first argument (required positional for hive)
-    const testArgs = ['https://github.com/test/test', ...hiveOverrides];
+    const testArgs = ['https://github.com/test/test', ...hiveOverridesForValidation];
 
     // Temporarily suppress stderr to avoid yargs error output during validation
     const originalStderrWrite = process.stderr.write;
@@ -239,7 +247,7 @@ if (hiveEnabled && hiveOverrides.length > 0) {
           throw new Error(msg);
         });
       await testYargs.parse(testArgs);
-      const overrideBranchError = validateBranchInArgs(hiveOverrides); // Issue #1482
+      const overrideBranchError = validateBranchInArgs(hiveOverridesForValidation); // Issue #1482
       if (overrideBranchError) throw new Error(overrideBranchError);
       console.log('✅ Hive overrides validated successfully');
     } finally {
@@ -890,7 +898,13 @@ async function handleSolveCommand(ctx) {
     await safeReply(ctx, `❌ Invalid --isolation value '${escapeMarkdown(solvePerCommandIsolation)}'. Must be: screen, tmux, or docker`, { reply_to_message_id: ctx.message.message_id });
     return;
   }
-  const args = mergeArgsWithOverrides(userArgsWithoutIsolation, solveOverrides);
+  const mergedSolveArgs = mergeArgsWithOverrides(userArgsWithoutIsolation, solveOverrides);
+  const { backend: solveOverrideIsolation, filteredArgs: args } = extractIsolationFromArgs(mergedSolveArgs);
+  if (solveOverrideIsolation && !isValidPerCommandIsolation(solveOverrideIsolation)) {
+    await safeReply(ctx, `❌ Invalid locked --isolation value '${escapeMarkdown(solveOverrideIsolation)}'. Must be: screen, tmux, or docker`, { reply_to_message_id: ctx.message.message_id });
+    return;
+  }
+  const effectiveSolveIsolation = solveOverrideIsolation || solvePerCommandIsolation;
 
   // Determine tool from args (default: claude)
   let solveTool = 'claude';
@@ -990,9 +1004,9 @@ async function handleSolveCommand(ctx) {
   const toolQueuedCount = queueStats.queuedByTool[solveTool] || 0; // tool-specific queue count (#1551)
   if (check.canStart && toolQueuedCount === 0) {
     const startingMessage = await safeReply(ctx, `🚀 Starting solve command...\n\n${infoBlock}`, { reply_to_message_id: ctx.message.message_id });
-    await executeAndUpdateMessage(ctx, startingMessage, 'solve', args, infoBlock, solvePerCommandIsolation);
+    await executeAndUpdateMessage(ctx, startingMessage, 'solve', args, infoBlock, effectiveSolveIsolation);
   } else {
-    const queueItem = solveQueue.enqueue({ url: normalizedUrl, args, ctx, requester, infoBlock, tool: solveTool, perCommandIsolation: solvePerCommandIsolation });
+    const queueItem = solveQueue.enqueue({ url: normalizedUrl, args, ctx, requester, infoBlock, tool: solveTool, perCommandIsolation: effectiveSolveIsolation });
     let queueMessage = `📋 Solve command queued (${solveTool} queue position #${toolQueuedCount + 1})\n\n${infoBlock}`; // tool-specific position (#1551)
     if (check.reason) queueMessage += `\n\n⏳ Waiting: ${escapeMarkdown(check.reason)}`;
     const queuedMessage = await safeReply(ctx, queueMessage, { reply_to_message_id: ctx.message.message_id });
@@ -1102,7 +1116,13 @@ async function handleHiveCommand(ctx) {
     await safeReply(ctx, `❌ Invalid --isolation value '${escapeMarkdown(hivePerCommandIsolation)}'. Must be: screen, tmux, or docker`, { reply_to_message_id: ctx.message.message_id });
     return;
   }
-  const args = mergeArgsWithOverrides(normalizedArgsWithoutIsolation, hiveOverrides);
+  const mergedHiveArgs = mergeArgsWithOverrides(normalizedArgsWithoutIsolation, hiveOverrides);
+  const { backend: hiveOverrideIsolation, filteredArgs: args } = extractIsolationFromArgs(mergedHiveArgs);
+  if (hiveOverrideIsolation && !isValidPerCommandIsolation(hiveOverrideIsolation)) {
+    await safeReply(ctx, `❌ Invalid locked --isolation value '${escapeMarkdown(hiveOverrideIsolation)}'. Must be: screen, tmux, or docker`, { reply_to_message_id: ctx.message.message_id });
+    return;
+  }
+  const effectiveHiveIsolation = hiveOverrideIsolation || hivePerCommandIsolation;
 
   // Determine tool from args (default: claude)
   let hiveTool = 'claude';
@@ -1161,7 +1181,7 @@ async function handleHiveCommand(ctx) {
   }
 
   const startingMessage = await safeReply(ctx, `🚀 Starting hive command...\n\n${infoBlock}`, { reply_to_message_id: ctx.message.message_id });
-  await executeAndUpdateMessage(ctx, startingMessage, 'hive', args, infoBlock, hivePerCommandIsolation);
+  await executeAndUpdateMessage(ctx, startingMessage, 'hive', args, infoBlock, effectiveHiveIsolation);
 }
 
 bot.command(/^hive$/i, handleHiveCommand);