@link-assistant/hive-mind 1.62.1 → 1.64.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/hive-mind
 
+## 1.64.0
+
+### Minor Changes
+
+- 2ffb808: Add experimental `--use-agent-commander` option to delegate supported tool execution to the agent-commander library, including Claude, Codex, OpenCode, Agent, Qwen, and Gemini.
+
+## 1.63.0
+
+### Minor Changes
+
+- b7b0721: Add direct Google Gemini CLI support for solve, hive, queueing, model validation, structured stream JSON parsing, and Telegram `/gemini` aliases.
+
 ## 1.62.1
 
 ### Patch Changes

package/README.hi.md

@@ -343,7 +343,7 @@ solve <issue-url> [options]
 
 | विकल्प                   | संक्षिप्त | विवरण                                                       | डिफ़ॉल्ट |
 | ------------------------ | --------- | ----------------------------------------------------------- | -------- |
-| `--tool`                 |           | AI टूल (claude, opencode, codex, agent, qwen)               | claude   |
+| `--tool`                 |           | AI टूल (claude, opencode, codex, agent, qwen, gemini)       | claude   |
 | `--verbose`              | `-v`      | विस्तृत लॉगिंग सक्षम करें                                   | false    |
 | `--attach-logs`          |           | PR में लॉग संलग्न करें (⚠️ संवेदनशील डेटा उजागर हो सकता है) | false    |
 | `--auto-init-repository` |           | खाली रेपो स्वतः-आरंभ करें (README.md बनाता है)              | false    |
@@ -370,7 +370,7 @@ hive <github-url> [options]
 
 | विकल्प                   | संक्षिप्त | विवरण                                                       | डिफ़ॉल्ट |
 | ------------------------ | --------- | ----------------------------------------------------------- | -------- |
-| `--tool`                 |           | AI टूल (claude, opencode, codex, agent, qwen)               | claude   |
+| `--tool`                 |           | AI टूल (claude, opencode, codex, agent, qwen, gemini)       | claude   |
 | `--concurrency`          | `-c`      | समानांतर वर्कर की संख्या                                    | 2        |
 | `--skip-issues-with-prs` | `-s`      | मौजूदा PR वाले इश्यू छोड़ें                                 | false    |
 | `--verbose`              | `-v`      | विस्तृत लॉगिंग सक्षम करें                                   | false    |
@@ -463,12 +463,15 @@ Aliases:
 /opencode /solve --tool opencode के बराबर है
 /agent /solve --tool agent के बराबर है
 /qwen /solve --tool qwen के बराबर है
+/gemini /solve --tool gemini के बराबर है
 
 Tool alias examples:
 /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
+/gemini https://github.com/owner/repo/issues/123 --model flash
 /qwen https://github.com/owner/repo/issues/123 --model qwen3-coder-plus
+/gemini https://github.com/owner/repo/issues/123 --model gemini-2.5-flash
 
 Free Models (with --tool agent):
 /solve https://github.com/owner/repo/issues/123 --tool agent --model nemotron-3-super-free

package/README.md

@@ -350,13 +350,13 @@ solve <issue-url> [options]
 
 **Other useful options:**
 
-| Option                   | Alias | Description                                      | Default |
-| ------------------------ | ----- | ------------------------------------------------ | ------- |
-| `--tool`                 |       | AI tool (claude, opencode, codex, agent, qwen)   | claude  |
-| `--verbose`              | `-v`  | Enable verbose logging                           | false   |
-| `--attach-logs`          |       | Attach logs to PR (⚠️ may expose sensitive data) | false   |
-| `--auto-init-repository` |       | Auto-initialize empty repos (creates README.md)  | false   |
-| `--help`                 | `-h`  | Show all available options                       | -       |
+| Option                   | Alias | Description                                            | Default |
+| ------------------------ | ----- | ------------------------------------------------------ | ------- |
+| `--tool`                 |       | AI tool (claude, opencode, codex, agent, qwen, gemini) | claude  |
+| `--verbose`              | `-v`  | Enable verbose logging                                 | false   |
+| `--attach-logs`          |       | Attach logs to PR (⚠️ may expose sensitive data)       | false   |
+| `--auto-init-repository` |       | Auto-initialize empty repos (creates README.md)        | false   |
+| `--help`                 | `-h`  | Show all available options                             | -       |
 
 > **📖 Full options list**: See [docs/CONFIGURATION.md](./docs/CONFIGURATION.md#solve-options) for all available options including forking, auto-continue, watch mode, and experimental features.
 
@@ -377,14 +377,14 @@ hive <github-url> [options]
 
 **Other useful options:**
 
-| Option                   | Alias | Description                                       | Default |
-| ------------------------ | ----- | ------------------------------------------------- | ------- |
-| `--tool`                 |       | AI tool (claude, opencode, codex, agent, qwen)    | claude  |
-| `--concurrency`          | `-c`  | Number of parallel workers                        | 2       |
-| `--skip-issues-with-prs` | `-s`  | Skip issues with existing PRs                     | false   |
-| `--verbose`              | `-v`  | Enable verbose logging                            | false   |
-| `--attach-logs`          |       | Attach logs to PRs (⚠️ may expose sensitive data) | false   |
-| `--help`                 | `-h`  | Show all available options                        | -       |
+| Option                   | Alias | Description                                            | Default |
+| ------------------------ | ----- | ------------------------------------------------------ | ------- |
+| `--tool`                 |       | AI tool (claude, opencode, codex, agent, qwen, gemini) | claude  |
+| `--concurrency`          | `-c`  | Number of parallel workers                             | 2       |
+| `--skip-issues-with-prs` | `-s`  | Skip issues with existing PRs                          | false   |
+| `--verbose`              | `-v`  | Enable verbose logging                                 | false   |
+| `--attach-logs`          |       | Attach logs to PRs (⚠️ may expose sensitive data)      | false   |
+| `--help`                 | `-h`  | Show all available options                             | -       |
 
 > **📖 Full options list**: See [docs/CONFIGURATION.md](./docs/CONFIGURATION.md#hive-options) for all available options including project monitoring, YouTrack integration, and experimental features.
 
@@ -470,12 +470,15 @@ Aliases:
 /opencode is equivalent to /solve --tool opencode
 /agent is equivalent to /solve --tool agent
 /qwen is equivalent to /solve --tool qwen
+/gemini is equivalent to /solve --tool gemini
 
 Tool alias examples:
 /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
+/gemini https://github.com/owner/repo/issues/123 --model flash
 /qwen https://github.com/owner/repo/issues/123 --model qwen3-coder-plus
+/gemini https://github.com/owner/repo/issues/123 --model gemini-2.5-flash
 
 Free Models (with --tool agent):
 /solve https://github.com/owner/repo/issues/123 --tool agent --model nemotron-3-super-free
@@ -497,7 +500,9 @@ Current tool defaults in Hive Mind:
 | `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                                  |
+| `gemini`   | `flash`                                                     | No extra thinking prompt is added for the default model                                  |
 | `qwen`     | `qwen3-coder-plus`                                          | No extra thinking prompt is added for the default model                                  |
+| `gemini`   | `gemini-2.5-flash`                                          | 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.
 

package/README.ru.md

@@ -343,7 +343,7 @@ solve <issue-url> [options]
 
 | Параметр                 | Сокр. | Описание                                                              | По умолчанию |
 | ------------------------ | ----- | --------------------------------------------------------------------- | ------------ |
-| `--tool`                 |       | Инструмент ИИ (claude, opencode, codex, agent, qwen)                  | claude       |
+| `--tool`                 |       | Инструмент ИИ (claude, opencode, codex, agent, qwen, gemini)          | claude       |
 | `--verbose`              | `-v`  | Включить подробное логирование                                        | false        |
 | `--attach-logs`          |       | Прикрепить логи к PR (⚠️ может раскрыть конфиденциальные данные)      | false        |
 | `--auto-init-repository` |       | Автоматически инициализировать пустые репозитории (создаёт README.md) | false        |
@@ -370,7 +370,7 @@ hive <github-url> [options]
 
 | Параметр                 | Сокр. | Описание                                                          | По умолчанию |
 | ------------------------ | ----- | ----------------------------------------------------------------- | ------------ |
-| `--tool`                 |       | Инструмент ИИ (claude, opencode, codex, agent, qwen)              | claude       |
+| `--tool`                 |       | Инструмент ИИ (claude, opencode, codex, agent, qwen, gemini)      | claude       |
 | `--concurrency`          | `-c`  | Количество параллельных воркеров                                  | 2            |
 | `--skip-issues-with-prs` | `-s`  | Пропускать задачи с существующими PR                              | false        |
 | `--verbose`              | `-v`  | Включить подробное логирование                                    | false        |
@@ -464,12 +464,15 @@ Aliases:
 /opencode эквивалентна /solve --tool opencode
 /agent эквивалентна /solve --tool agent
 /qwen эквивалентна /solve --tool qwen
+/gemini эквивалентна /solve --tool gemini
 
 Tool alias examples:
 /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
+/gemini https://github.com/owner/repo/issues/123 --model flash
 /qwen https://github.com/owner/repo/issues/123 --model qwen3-coder-plus
+/gemini https://github.com/owner/repo/issues/123 --model gemini-2.5-flash
 
 Free Models (with --tool agent):
 /solve https://github.com/owner/repo/issues/123 --tool agent --model nemotron-3-super-free

package/README.zh.md

@@ -341,13 +341,13 @@ solve <issue-url> [options]
 
 **其他常用选项：**
 
-| 选项                     | 简写 | 描述                                            | 默认值 |
-| ------------------------ | ---- | ----------------------------------------------- | ------ |
-| `--tool`                 |      | AI 工具（claude、opencode、codex、agent、qwen） | claude |
-| `--verbose`              | `-v` | 启用详细日志                                    | false  |
-| `--attach-logs`          |      | 将日志附加到 PR（⚠️ 可能暴露敏感数据）          | false  |
-| `--auto-init-repository` |      | 自动初始化空仓库（创建 README.md）              | false  |
-| `--help`                 | `-h` | 显示所有可用选项                                | -      |
+| 选项                     | 简写 | 描述                                                    | 默认值 |
+| ------------------------ | ---- | ------------------------------------------------------- | ------ |
+| `--tool`                 |      | AI 工具（claude、opencode、codex、agent、qwen、gemini） | claude |
+| `--verbose`              | `-v` | 启用详细日志                                            | false  |
+| `--attach-logs`          |      | 将日志附加到 PR（⚠️ 可能暴露敏感数据）                  | false  |
+| `--auto-init-repository` |      | 自动初始化空仓库（创建 README.md）                      | false  |
+| `--help`                 | `-h` | 显示所有可用选项                                        | -      |
 
 > **📖 完整选项列表**：包含 Fork、自动续行、监视模式及实验性功能在内的所有可用选项，请参见 [docs/CONFIGURATION.zh.md](./docs/CONFIGURATION.zh.md#solve-options)。
 
@@ -368,14 +368,14 @@ hive <github-url> [options]
 
 **其他常用选项：**
 
-| 选项                     | 简写 | 描述                                            | 默认值 |
-| ------------------------ | ---- | ----------------------------------------------- | ------ |
-| `--tool`                 |      | AI 工具（claude、opencode、codex、agent、qwen） | claude |
-| `--concurrency`          | `-c` | 并行工作进程数量                                | 2      |
-| `--skip-issues-with-prs` | `-s` | 跳过已有 PR 的 Issue                            | false  |
-| `--verbose`              | `-v` | 启用详细日志                                    | false  |
-| `--attach-logs`          |      | 将日志附加到 PR（⚠️ 可能暴露敏感数据）          | false  |
-| `--help`                 | `-h` | 显示所有可用选项                                | -      |
+| 选项                     | 简写 | 描述                                                    | 默认值 |
+| ------------------------ | ---- | ------------------------------------------------------- | ------ |
+| `--tool`                 |      | AI 工具（claude、opencode、codex、agent、qwen、gemini） | claude |
+| `--concurrency`          | `-c` | 并行工作进程数量                                        | 2      |
+| `--skip-issues-with-prs` | `-s` | 跳过已有 PR 的 Issue                                    | false  |
+| `--verbose`              | `-v` | 启用详细日志                                            | false  |
+| `--attach-logs`          |      | 将日志附加到 PR（⚠️ 可能暴露敏感数据）                  | false  |
+| `--help`                 | `-h` | 显示所有可用选项                                        | -      |
 
 > **📖 完整选项列表**：包含项目监控、YouTrack 集成及实验性功能在内的所有可用选项，请参见 [docs/CONFIGURATION.zh.md](./docs/CONFIGURATION.zh.md#hive-options)。
 
@@ -460,12 +460,15 @@ Aliases:
 /opencode 等同于 /solve --tool opencode
 /agent 等同于 /solve --tool agent
 /qwen 等同于 /solve --tool qwen
+/gemini 等同于 /solve --tool gemini
 
 Tool alias examples:
 /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
+/gemini https://github.com/owner/repo/issues/123 --model flash
 /qwen https://github.com/owner/repo/issues/123 --model qwen3-coder-plus
+/gemini https://github.com/owner/repo/issues/123 --model gemini-2.5-flash
 
 Free Models (with --tool agent):
 /solve https://github.com/owner/repo/issues/123 --tool agent --model nemotron-3-super-free

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.62.1",
+  "version": "1.64.0",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",
@@ -72,7 +72,7 @@
     "@secretlint/secretlint-rule-preset-recommend": "^11.2.5",
     "@sentry/node": "^10.15.0",
     "@sentry/profiling-node": "^10.15.0",
-    "agent-commander": "^0.4.2",
+    "agent-commander": "^0.6.1",
     "dayjs": "^1.11.19",
     "decimal.js-light": "^2.5.1",
     "lino-arguments": "^0.3.0",

package/src/agent-commander.lib.mjs

@@ -0,0 +1,361 @@
+#!/usr/bin/env node
+/**
+ * Experimental agent-commander execution adapter.
+ *
+ * This module is only used when solve is called with --use-agent-commander.
+ * Default tool execution remains in claude.lib.mjs, codex.lib.mjs,
+ * opencode.lib.mjs, and agent.lib.mjs.
+ */
+
+import { resolveCodexReasoningEffort } from './codex.options.lib.mjs';
+import { mapModelForTool } from './models/index.mjs';
+import { buildCodexDisable1mContextConfigArgs, buildCodexSubSessionSizeConfigArgs, parseSubSessionSize } from './sub-session-size.lib.mjs';
+import { detectUsageLimit } from './usage-limit.lib.mjs';
+
+export const AGENT_COMMANDER_TOOLS = new Set(['claude', 'codex', 'opencode', 'agent', 'qwen', 'gemini']);
+
+const TOOL_EXECUTABLE_CONFIG = {
+  claude: { argvKey: 'claudePath', envKey: 'CLAUDE_PATH' },
+  codex: { argvKey: 'codexPath', envKey: 'CODEX_PATH' },
+  opencode: { argvKey: 'opencodePath', envKey: 'OPENCODE_PATH' },
+  agent: { argvKey: 'agentPath', envKey: 'AGENT_PATH' },
+  qwen: { argvKey: 'qwenPath', envKey: 'QWEN_PATH' },
+  gemini: { argvKey: 'geminiPath', envKey: 'GEMINI_PATH' },
+};
+
+const getConfiguredExecutable = (argv = {}, tool) => {
+  const config = TOOL_EXECUTABLE_CONFIG[tool];
+  if (!config) return null;
+  return argv[config.argvKey] || process.env[config.envKey] || null;
+};
+
+const appendExtraArgs = (options, args) => {
+  if (!Array.isArray(args) || args.length === 0) return;
+  options.extraArgs = [...(options.extraArgs || []), ...args];
+};
+
+const appendExtraEnv = (options, env) => {
+  const entries = Object.entries(env || {}).filter(([, value]) => value !== undefined && value !== null && value !== false);
+  if (entries.length === 0) return;
+  options.extraEnv = {
+    ...(options.extraEnv || {}),
+    ...Object.fromEntries(entries.map(([key, value]) => [key, String(value)])),
+  };
+};
+
+const buildClaudeToolOptions = (argv = {}) => {
+  const options = {};
+  options.verbose = !!argv.verbose;
+  if (argv.fallbackModel) options.fallbackModel = argv.fallbackModel;
+
+  const extraEnv = {};
+  if (argv.thinkingBudget !== undefined) extraEnv.MAX_THINKING_TOKENS = argv.thinkingBudget;
+  if (argv.disable1mContext) extraEnv.CLAUDE_CODE_DISABLE_1M_CONTEXT = '1';
+  if (argv.showThinkingContent) extraEnv.CLAUDE_CODE_SHOW_THINKING = '1';
+  if (argv.planModel) extraEnv.ANTHROPIC_DEFAULT_OPUS_MODEL = argv.planModel;
+  appendExtraEnv(options, extraEnv);
+
+  return options;
+};
+
+const buildCodexToolOptions = (argv = {}) => {
+  const options = {};
+  const { reasoningEffort } = resolveCodexReasoningEffort(argv);
+  appendExtraArgs(options, ['-c', `model_reasoning_effort=${reasoningEffort}`, '-c', 'model_reasoning_summary=auto']);
+
+  appendExtraArgs(options, buildCodexDisable1mContextConfigArgs(!!argv.disable1mContext));
+  try {
+    appendExtraArgs(options, buildCodexSubSessionSizeConfigArgs(parseSubSessionSize(argv.subSessionSize)));
+  } catch {
+    // The embedded Codex path logs parse warnings later. Keep agent-commander
+    // command construction permissive so validation can still run.
+  }
+
+  return options;
+};
+
+const defaultLog = async (message, options = {}) => {
+  if (options.verbose && !global.verboseMode) return;
+  if (options.level === 'error') {
+    console.error(message);
+  } else if (options.level === 'warning' || options.level === 'warn') {
+    console.warn(message);
+  } else {
+    console.log(message);
+  }
+};
+
+const getAgentCommander = async () => {
+  try {
+    return await import('agent-commander');
+  } catch (error) {
+    throw new Error(`agent-commander is not installed or cannot be loaded. Install it with: npm install agent-commander\nOriginal error: ${error.message}`);
+  }
+};
+
+export const isAgentCommanderAvailable = async () => {
+  try {
+    await getAgentCommander();
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+export const getAgentCommanderToolName = (argv = {}) => argv.tool || 'claude';
+
+const resolveAgentCommanderModel = (tool, model) => (model ? mapModelForTool(tool, model) : model);
+
+export const buildAgentCommanderToolOptions = (argv = {}, tool = getAgentCommanderToolName(argv)) => {
+  const options = tool === 'claude' ? buildClaudeToolOptions(argv) : tool === 'codex' ? buildCodexToolOptions(argv) : {};
+
+  const executable = getConfiguredExecutable(argv, tool);
+  if (executable) {
+    options.executable = executable;
+  }
+
+  if (tool === 'gemini' && argv.verbose) options.debug = true;
+
+  return options;
+};
+
+export const buildAgentCommanderControllerOptions = ({ tool, tempDir, prompt, systemPrompt, argv = {} }) => ({
+  tool,
+  workingDirectory: tempDir,
+  prompt,
+  systemPrompt,
+  model: resolveAgentCommanderModel(tool, argv.model),
+  json: tool !== 'agent',
+  resume: argv.resume,
+  toolOptions: buildAgentCommanderToolOptions(argv, tool),
+});
+
+export const validateAgentCommanderConnection = async ({ tool, model, log = defaultLog, agentCommanderModule = null }) => {
+  try {
+    const module = agentCommanderModule || (await getAgentCommander());
+    const { agent, isToolSupported } = module;
+    const toolName = tool || 'claude';
+
+    if (!AGENT_COMMANDER_TOOLS.has(toolName) || !isToolSupported({ toolName })) {
+      await log(`[agent-commander] Tool '${toolName}' is not supported`, { level: 'error' });
+      return false;
+    }
+
+    const controller = agent({
+      tool: toolName,
+      workingDirectory: process.cwd(),
+      prompt: 'connection check',
+      model: resolveAgentCommanderModel(toolName, model),
+      json: toolName !== 'agent',
+      toolOptions: buildAgentCommanderToolOptions({ model }, toolName),
+    });
+    await controller.start({ dryRun: true, attached: false });
+    await log(`[agent-commander] ${toolName} command construction validated`, { verbose: true });
+    return true;
+  } catch (error) {
+    await log(`[agent-commander] Connection validation failed: ${error.message}`, { level: 'error' });
+    return false;
+  }
+};
+
+const getPromptModule = async tool => {
+  if (tool === 'claude') return await import('./claude.prompts.lib.mjs');
+  if (tool === 'codex') return await import('./codex.prompts.lib.mjs');
+  if (tool === 'opencode') return await import('./opencode.prompts.lib.mjs');
+  if (tool === 'agent') return await import('./agent.prompts.lib.mjs');
+  if (tool === 'qwen') return await import('./qwen.prompts.lib.mjs');
+  if (tool === 'gemini') return await import('./gemini.prompts.lib.mjs');
+  throw new Error(`Unsupported tool for agent-commander: ${tool}`);
+};
+
+export const getPlaywrightMcpAvailabilityCheck = async tool => {
+  if (tool === 'opencode') return (await import('./opencode.lib.mjs')).checkPlaywrightMcpAvailability;
+  if (tool === 'codex') return (await import('./codex.lib.mjs')).checkPlaywrightMcpAvailability;
+  if (tool === 'agent') return (await import('./agent.lib.mjs')).checkPlaywrightMcpAvailability;
+  if (tool === 'qwen') return (await import('./qwen.lib.mjs')).checkPlaywrightMcpAvailability;
+  if (tool === 'gemini') return (await import('./gemini.lib.mjs')).checkPlaywrightMcpAvailability;
+  return (await import('./claude.lib.mjs')).checkPlaywrightMcpAvailability;
+};
+
+export const resolvePlaywrightMcpForAgentCommander = async ({ argv, log = defaultLog, tool = getAgentCommanderToolName(argv) }) => {
+  if (argv.playwrightMcp === false) return;
+  if (!argv.promptPlaywrightMcp) {
+    await log('ℹ️  Playwright MCP explicitly disabled via --no-prompt-playwright-mcp', { verbose: true });
+    return;
+  }
+
+  const checkFn = await getPlaywrightMcpAvailabilityCheck(tool);
+  const available = await checkFn();
+  if (available) {
+    await log('🎭 Playwright MCP detected - enabling browser automation hints', { verbose: true });
+  } else {
+    await log('ℹ️  Playwright MCP not detected - browser automation hints will be disabled', { verbose: true });
+    argv.promptPlaywrightMcp = false;
+  }
+};
+
+const getParsedMessages = result => {
+  const parsed = result?.output?.parsed;
+  if (Array.isArray(parsed)) return parsed;
+  if (parsed && typeof parsed === 'object') return [parsed];
+  return [];
+};
+
+const extractResultSummary = (messages, plainOutput) => {
+  for (const message of [...messages].reverse()) {
+    if (typeof message?.result === 'string' && message.result.trim()) return message.result.trim();
+    if (typeof message?.summary === 'string' && message.summary.trim()) return message.summary.trim();
+    if (typeof message?.text === 'string' && message.text.trim()) return message.text.trim();
+    if (typeof message?.message === 'string' && message.message.trim()) return message.message.trim();
+    if (typeof message?.item?.content === 'string' && message.item.content.trim()) return message.item.content.trim();
+    if (Array.isArray(message?.item?.content)) {
+      const text = message.item.content
+        .map(part => part?.text || '')
+        .join('')
+        .trim();
+      if (text) return text;
+    }
+  }
+
+  return plainOutput?.trim() ? plainOutput.trim().slice(-4000) : null;
+};
+
+const hasErrorMessage = messages => messages.some(message => message?.is_error === true || message?.type === 'error' || message?.type === 'step_error' || message?.error);
+
+export const summarizeAgentCommanderResult = ({ result, tool }) => {
+  const plainOutput = result?.output?.plain || '';
+  if (result?.metadata && typeof result.metadata === 'object') {
+    const metadata = result.metadata;
+    return {
+      success: metadata.success === true,
+      sessionId: metadata.sessionId || result.sessionId || null,
+      limitReached: !!metadata.limitReached,
+      limitResetTime: metadata.limitResetTime || null,
+      limitTimezone: metadata.limitTimezone || null,
+      anthropicTotalCostUSD: metadata.anthropicTotalCostUSD ?? null,
+      publicPricingEstimate: metadata.publicPricingEstimate ?? metadata.pricingInfo?.totalCostUSD ?? null,
+      pricingInfo: metadata.pricingInfo || null,
+      resultSummary: metadata.resultSummary || null,
+      resultModelUsage: metadata.resultModelUsage || null,
+      streamTokenUsage: metadata.streamTokenUsage || result.usage || null,
+      subAgentCalls: metadata.subAgentCalls || null,
+      errorDuringExecution: metadata.errorDuringExecution === true || result?.exitCode !== 0,
+      result: plainOutput,
+    };
+  }
+
+  const messages = getParsedMessages(result);
+  const usageLimit = detectUsageLimit(plainOutput);
+  const usage = result?.usage || null;
+  const resultMessage = [...messages].reverse().find(message => message?.type === 'result') || null;
+  const totalCost = typeof resultMessage?.total_cost_usd === 'number' ? resultMessage.total_cost_usd : null;
+  const publicPricingEstimate = tool === 'agent' && typeof usage?.totalCost === 'number' ? usage.totalCost : null;
+
+  return {
+    success: result?.exitCode === 0 && !usageLimit.isUsageLimit && !hasErrorMessage(messages),
+    sessionId: result?.sessionId || resultMessage?.session_id || null,
+    limitReached: usageLimit.isUsageLimit,
+    limitResetTime: usageLimit.resetTime,
+    limitTimezone: usageLimit.timezone,
+    anthropicTotalCostUSD: tool === 'claude' ? totalCost : null,
+    publicPricingEstimate,
+    pricingInfo: publicPricingEstimate !== null ? { totalCostUSD: publicPricingEstimate, source: 'agent-commander' } : null,
+    resultSummary: extractResultSummary(messages, plainOutput),
+    resultModelUsage: null,
+    streamTokenUsage: usage,
+    subAgentCalls: null,
+    errorDuringExecution: result?.exitCode !== 0 || hasErrorMessage(messages),
+    result: plainOutput,
+  };
+};
+
+export const executeWithAgentCommander = async params => {
+  const { agentCommanderModule = null, promptModule = null, log = defaultLog, argv, tempDir, workspaceTmpDir, ...promptParams } = params;
+  const tool = getAgentCommanderToolName(argv);
+  const module = agentCommanderModule || (await getAgentCommander());
+
+  if (!AGENT_COMMANDER_TOOLS.has(tool) || !module.isToolSupported({ toolName: tool })) {
+    throw new Error(`agent-commander does not support tool '${tool}'`);
+  }
+
+  const prompts = promptModule || (await getPromptModule(tool));
+  const promptBuilderParams = { ...promptParams, tempDir, workspaceTmpDir, argv };
+  const prompt = prompts.buildUserPrompt(promptBuilderParams);
+  const systemPrompt = prompts.buildSystemPrompt(promptBuilderParams);
+  const controllerOptions = buildAgentCommanderControllerOptions({ tool, tempDir, prompt, systemPrompt, argv });
+
+  if (argv.verbose) {
+    await log('\n[agent-commander] Final prompt structure:', { verbose: true });
+    await log(`   Tool: ${tool}`, { verbose: true });
+    await log(`   User prompt characters: ${prompt.length}`, { verbose: true });
+    await log(`   System prompt characters: ${systemPrompt.length}`, { verbose: true });
+  }
+
+  const controller = module.agent(controllerOptions);
+  const dryRun = !!(argv.dryRun || argv.onlyPrepareCommand);
+  await log(`\n[agent-commander] Starting ${tool} execution${dryRun ? ' (dry-run)' : ''}...`);
+  await controller.start({
+    dryRun,
+    attached: true,
+    onOutput: chunk => {
+      if (chunk.type === 'stderr') process.stderr.write(chunk.data);
+      else process.stdout.write(chunk.data);
+    },
+  });
+
+  if (dryRun) {
+    return {
+      success: true,
+      sessionId: null,
+      limitReached: false,
+      limitResetTime: null,
+      limitTimezone: null,
+      anthropicTotalCostUSD: null,
+      publicPricingEstimate: null,
+      pricingInfo: null,
+      resultSummary: null,
+    };
+  }
+
+  const result = await controller.stop();
+  await log(`[agent-commander] ${tool} exited with code ${result.exitCode}`);
+  return summarizeAgentCommanderResult({ result, tool });
+};
+
+export const checkForUncommittedChanges = async (tempDir, owner, repo, branchName, $, log = defaultLog, autoCommit = false, autoRestartEnabled = true) => {
+  await log('\n🔍 Checking for uncommitted changes...');
+  const gitStatusResult = await $({ cwd: tempDir })`git status --porcelain 2>&1`;
+  const statusOutput = gitStatusResult.stdout?.toString().trim() || '';
+
+  if (!statusOutput) {
+    await log('✅ No uncommitted changes found');
+    return false;
+  }
+
+  await log('📝 Found uncommitted changes');
+  await log('Changes:');
+  for (const line of statusOutput.split('\n')) await log(`   ${line}`);
+
+  if (autoCommit) {
+    await log('💾 Auto-committing changes (--auto-commit-uncommitted-changes is enabled)...');
+    const addResult = await $({ cwd: tempDir })`git add -A`;
+    if (addResult.code === 0) {
+      const commitResult = await $({ cwd: tempDir })`git commit -m ${'Auto-commit: Changes made through agent-commander during problem-solving session'}`;
+      if (commitResult.code === 0) {
+        const pushResult = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
+        await log(pushResult.code === 0 ? '✅ Changes pushed successfully' : `⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim() || pushResult.stdout?.toString().trim()}`, { level: pushResult.code === 0 ? 'info' : 'warning' });
+      }
+    }
+    return false;
+  }
+
+  if (autoRestartEnabled) {
+    await log('\n⚠️  IMPORTANT: Uncommitted changes detected!');
+    await log('   The agent-commander controlled tool made changes that were not committed.');
+    await log('\n🔄 AUTO-RESTART: Restarting the tool to handle uncommitted changes...\n');
+    return true;
+  }
+
+  await log('\n⚠️  Uncommitted changes detected but auto-restart is disabled.');
+  return false;
+};

package/src/bidirectional-interactive.lib.mjs

@@ -851,7 +851,7 @@ export const createBidirectionalHandler = options => {
 /**
  * Check if bidirectional interactive mode is supported for the given tool
  *
- * @param {string} tool - Tool name (claude, opencode, codex)
+ * @param {string} tool - Tool name (claude, opencode, codex, agent, gemini)
  * @returns {boolean} Whether bidirectional interactive mode is supported
  */
 export const isBidirectionalModeSupported = tool => {

package/src/claude.prompts.lib.mjs

@@ -294,13 +294,13 @@ Plan sub-agent usage.
 
 Agent Commander usage (unified subagent delegation).
    - When you need to delegate tasks to subagents, use the agent-commander CLI tool (start-agent) instead of the native Task tool.
-   - Agent Commander provides a unified API for different agent types (claude, opencode, codex, agent, qwen) and supports various isolation modes.
+   - Agent Commander provides a unified API for different agent types (claude, opencode, codex, agent, qwen, gemini) and supports various isolation modes.
    - To delegate a task, use the Bash tool to run start-agent with appropriate parameters:
       \`\`\`bash
       start-agent --tool claude --working-directory "$(pwd)" --prompt "Your task description here"
       \`\`\`
    - Common start-agent parameters:
-      --tool <name>: Agent to use (claude, opencode, codex, agent, qwen)
+      --tool <name>: Agent to use (claude, opencode, codex, agent, qwen, gemini)
       --working-directory <path>: Execution directory (use current directory for context)
       --prompt <text>: The task to delegate
       --model <name>: Model to use (${[...new Set(Object.values(primaryModelNames).flat())].slice(0, 5).join(', ')}, etc.)

package/src/codex.prompts.lib.mjs

@@ -277,13 +277,13 @@ Planning workflow usage.
 
 Agent Commander usage (unified subagent delegation).
    - When you need to delegate tasks to subagents, use the agent-commander CLI tool (start-agent) instead of relying only on native Codex collaboration.
-   - Agent Commander provides a unified API for different agent types (claude, opencode, codex, agent, qwen) and supports various isolation modes.
+   - Agent Commander provides a unified API for different agent types (claude, opencode, codex, agent, qwen, gemini) and supports various isolation modes.
    - To delegate a task, use a command like:
       \`\`\`bash
       start-agent --tool codex --working-directory "$(pwd)" --prompt "Your task description here"
       \`\`\`
    - Common start-agent parameters:
-      --tool <name>: Agent to use (claude, opencode, codex, agent, qwen)
+      --tool <name>: Agent to use (claude, opencode, codex, agent, qwen, gemini)
       --working-directory <path>: Execution directory (use the current directory for context)
       --prompt <text>: The task to delegate
       --model <name>: Model to use

package/src/config.lib.mjs

@@ -51,6 +51,7 @@ const parseFloatWithDefault = (envVar, defaultValue) => {
 export const timeouts = {
   claudeCli: parseIntWithDefault('HIVE_MIND_CLAUDE_TIMEOUT_SECONDS', 60) * 1000,
   opencodeCli: parseIntWithDefault('HIVE_MIND_OPENCODE_TIMEOUT_SECONDS', 60) * 1000,
+  geminiCli: parseIntWithDefault('HIVE_MIND_GEMINI_TIMEOUT_SECONDS', 60) * 1000,
   codexCli: parseIntWithDefault('HIVE_MIND_CODEX_TIMEOUT_SECONDS', 60) * 1000,
   qwenCli: parseIntWithDefault('HIVE_MIND_QWEN_TIMEOUT_SECONDS', 60) * 1000,
   githubApiDelay: parseIntWithDefault('HIVE_MIND_GITHUB_API_DELAY_MS', 5000),