ai-cli-mcp 2.7.0 → 2.8.1

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [2.8.1](https://github.com/mkXultra/ai-cli-mcp/compare/v2.8.0...v2.8.1) (2026-03-02)
+
+
+### Bug Fixes
+
+* リポジトリ名変更に伴うURL・参照の更新 ([909cab7](https://github.com/mkXultra/ai-cli-mcp/commit/909cab77cc1e03f5880bd699ed680c32d990adb5))
+* リポジトリ名変更に伴う再リリース ([c6a165b](https://github.com/mkXultra/ai-cli-mcp/commit/c6a165b101eae5cbc1b9d139227dfd074172a070))
+
+# [2.8.0](https://github.com/mkXultra/claude-code-mcp/compare/v2.7.0...v2.8.0) (2026-03-01)
+
+
+### Bug Fixes
+
+* セッション再開時に--fork-sessionフラグを追加 ([44b359a](https://github.com/mkXultra/claude-code-mcp/commit/44b359a3acf6112339424efc703c1693df1ce1e9))
+
+
+### Features
+
+* Gemini 3.1 Pro Previewモデルを追加 ([1c314bb](https://github.com/mkXultra/claude-code-mcp/commit/1c314bba3019aea791117a974bfc5ee809e15eee))
+
 # [2.7.0](https://github.com/mkXultra/claude-code-mcp/compare/v2.6.0...v2.7.0) (2026-03-01)
 
 

package/CONTRIBUTING.md

@@ -3,8 +3,8 @@
 ## Development Setup
 
 ```bash
-git clone https://github.com/mkXultra/claude-code-mcp.git
-cd claude-code-mcp
+git clone https://github.com/mkXultra/ai-cli-mcp.git
+cd ai-cli-mcp
 npm install
 npm run build
 ```

package/README.ja.md

@@ -19,7 +19,7 @@ Cursorなどのエディタが、複雑な手順を伴う編集や操作に苦
 - 複数のAIモデルのサポート：
     - Claude (sonnet, sonnet[1m], opus, opusplan, haiku)
     - Codex (gpt-5.3-codex, gpt-5.2-codex, gpt-5.1-codex-mini, gpt-5.1-codex-max, など)
-    - Gemini (gemini-2.5-pro, gemini-2.5-flash, gemini-3-pro-preview, gemini-3-flash-preview)
+    - Gemini (gemini-2.5-pro, gemini-2.5-flash, gemini-3.1-pro-preview, gemini-3-pro-preview, gemini-3-flash-preview)
 - PID追跡によるバックグラウンドプロセスの管理
 - ツールからの構造化された出力の解析と返却
 
@@ -134,9 +134,9 @@ Claude CLI、Codex CLI、またはGemini CLIを使用してプロンプトを実
     - **Ultra エイリアス:** `claude-ultra`, `codex-ultra` (自動的に high-reasoning に設定), `gemini-ultra`
     - Claude: `sonnet`, `sonnet[1m]`, `opus`, `opusplan`, `haiku`
     - Codex: `gpt-5.3-codex`, `gpt-5.2-codex`, `gpt-5.1-codex-mini`, `gpt-5.1-codex-max`, `gpt-5.2`, `gpt-5.1`, `gpt-5`
-    - Gemini: `gemini-2.5-pro`, `gemini-2.5-flash`, `gemini-3-pro-preview`, `gemini-3-flash-preview`
+    - Gemini: `gemini-2.5-pro`, `gemini-2.5-flash`, `gemini-3.1-pro-preview`, `gemini-3-pro-preview`, `gemini-3-flash-preview`
 - `reasoning_effort` (string, 任意): Codex専用。`model_reasoning_effort` を設定します（許容値: "low", "medium", "high", "xhigh"）。
-- `session_id` (string, 任意): 以前のセッションを再開するためのセッションID。対応モデル: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3-pro-preview, gemini-3-flash-preview。
+- `session_id` (string, 任意): 以前のセッションを再開するためのセッションID。対応モデル: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3.1-pro-preview, gemini-3-pro-preview, gemini-3-flash-preview。
 
 ### `wait`
 

package/README.md

@@ -18,7 +18,7 @@ This MCP server provides tools that can be used by LLMs to interact with AI CLI
 - Run Claude CLI with all permissions bypassed (using `--dangerously-skip-permissions`)
 - Execute Codex CLI with automatic approval mode (using `--full-auto`)
 - Execute Gemini CLI with automatic approval mode (using `-y`)
-- Support multiple AI models: Claude (sonnet, sonnet[1m], opus, opusplan, haiku), Codex (gpt-5.3-codex, gpt-5.2-codex, gpt-5.1-codex-mini, gpt-5.1-codex-max, gpt-5.2, gpt-5.1, gpt-5.1-codex, gpt-5-codex, gpt-5-codex-mini, gpt-5), and Gemini (gemini-2.5-pro, gemini-2.5-flash, gemini-3-pro-preview, gemini-3-flash-preview)
+- Support multiple AI models: Claude (sonnet, sonnet[1m], opus, opusplan, haiku), Codex (gpt-5.3-codex, gpt-5.2-codex, gpt-5.1-codex-mini, gpt-5.1-codex-max, gpt-5.2, gpt-5.1, gpt-5.1-codex, gpt-5-codex, gpt-5-codex-mini, gpt-5), and Gemini (gemini-2.5-pro, gemini-2.5-flash, gemini-3.1-pro-preview, gemini-3-pro-preview, gemini-3-flash-preview)
 - Manage background processes with PID tracking
 - Parse and return structured outputs from both tools
 
@@ -133,9 +133,9 @@ Executes a prompt using Claude CLI, Codex CLI, or Gemini CLI. The appropriate CL
 - **Ultra Aliases:** `claude-ultra`, `codex-ultra` (defaults to high-reasoning), `gemini-ultra`
 - Claude: `sonnet`, `sonnet[1m]`, `opus`, `opusplan`, `haiku`
 - Codex: `gpt-5.3-codex`, `gpt-5.2-codex`, `gpt-5.1-codex-mini`, `gpt-5.1-codex-max`, `gpt-5.2`, `gpt-5.1`, `gpt-5`
-- Gemini: `gemini-2.5-pro`, `gemini-2.5-flash`, `gemini-3-pro-preview`, `gemini-3-flash-preview`
+- Gemini: `gemini-2.5-pro`, `gemini-2.5-flash`, `gemini-3.1-pro-preview`, `gemini-3-pro-preview`, `gemini-3-flash-preview`
 - `reasoning_effort` (string, optional): Codex only. Sets `model_reasoning_effort` (allowed: "low", "medium", "high", "xhigh").
-- `session_id` (string, optional): Optional session ID to resume a previous session. Supported for: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3-pro-preview, gemini-3-flash-preview.
+- `session_id` (string, optional): Optional session ID to resume a previous session. Supported for: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3.1-pro-preview, gemini-3-pro-preview, gemini-3-flash-preview.
 
 ### `wait`
 

package/dist/__tests__/cli-builder.test.js

@@ -28,8 +28,8 @@ describe('cli-builder', () => {
         it('should resolve codex-ultra to gpt-5.3-codex', () => {
             expect(resolveModelAlias('codex-ultra')).toBe('gpt-5.3-codex');
         });
-        it('should resolve gemini-ultra to gemini-3-pro-preview', () => {
-            expect(resolveModelAlias('gemini-ultra')).toBe('gemini-3-pro-preview');
+        it('should resolve gemini-ultra to gemini-3.1-pro-preview', () => {
+            expect(resolveModelAlias('gemini-ultra')).toBe('gemini-3.1-pro-preview');
         });
         it('should pass through non-alias model names', () => {
             expect(resolveModelAlias('sonnet')).toBe('sonnet');
@@ -160,6 +160,7 @@ describe('cli-builder', () => {
                 });
                 expect(cmd.args).toContain('-r');
                 expect(cmd.args).toContain('ses-123');
+                expect(cmd.args).toContain('--fork-session');
             });
             it('should resolve claude-ultra alias to opus', () => {
                 const cmd = buildCliCommand({
@@ -271,7 +272,7 @@ describe('cli-builder', () => {
                     cliPaths: DEFAULT_CLI_PATHS,
                 });
                 expect(cmd.agent).toBe('gemini');
-                expect(cmd.resolvedModel).toBe('gemini-3-pro-preview');
+                expect(cmd.resolvedModel).toBe('gemini-3.1-pro-preview');
             });
         });
     });

package/dist/__tests__/server.test.js

@@ -499,7 +499,7 @@ describe('ClaudeCodeServer Unit Tests', () => {
                 }
             });
             // Verify spawn was called with -r flag
-            expect(mockSpawn).toHaveBeenCalledWith(expect.any(String), expect.arrayContaining(['-r', 'test-session-123', '-p', 'test prompt']), expect.any(Object));
+            expect(mockSpawn).toHaveBeenCalledWith(expect.any(String), expect.arrayContaining(['-r', 'test-session-123', '--fork-session', '-p', 'test prompt']), expect.any(Object));
         });
         it('should handle session_id parameter for Codex using exec resume', async () => {
             mockHomedir.mockReturnValue('/home/user');

package/dist/cli-builder.js

@@ -4,7 +4,7 @@ import { resolve as pathResolve, isAbsolute } from 'node:path';
 export const MODEL_ALIASES = {
     'claude-ultra': 'opus',
     'codex-ultra': 'gpt-5.3-codex',
-    'gemini-ultra': 'gemini-3-pro-preview'
+    'gemini-ultra': 'gemini-3.1-pro-preview'
 };
 export const ALLOWED_REASONING_EFFORTS = new Set(['low', 'medium', 'high', 'xhigh']);
 /**
@@ -134,7 +134,7 @@ export function buildCliCommand(options) {
         cliPath = options.cliPaths.claude;
         args = ['--dangerously-skip-permissions', '--output-format', 'stream-json', '--verbose'];
         if (options.session_id && typeof options.session_id === 'string') {
-            args.push('-r', options.session_id);
+            args.push('-r', options.session_id, '--fork-session');
         }
         args.push('-p', prompt);
         if (resolvedModel) {

package/dist/cli-utils.js

@@ -0,0 +1,125 @@
+import { existsSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import * as path from 'path';
+// Define debugMode globally using const
+const debugMode = process.env.MCP_CLAUDE_DEBUG === 'true';
+// Dedicated debug logging function
+export function debugLog(message, ...optionalParams) {
+    if (debugMode) {
+        console.error(message, ...optionalParams);
+    }
+}
+/**
+ * Determine the Gemini CLI command/path.
+ * Similar to findClaudeCli but for Gemini
+ */
+export function findGeminiCli() {
+    debugLog('[Debug] Attempting to find Gemini CLI...');
+    // Check for custom CLI name from environment variable
+    const customCliName = process.env.GEMINI_CLI_NAME;
+    if (customCliName) {
+        debugLog(`[Debug] Using custom Gemini CLI name from GEMINI_CLI_NAME: ${customCliName}`);
+        // If it's an absolute path, use it directly
+        if (path.isAbsolute(customCliName)) {
+            debugLog(`[Debug] GEMINI_CLI_NAME is an absolute path: ${customCliName}`);
+            return customCliName;
+        }
+        // If it starts with ~ or ./, reject as relative paths are not allowed
+        if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
+            throw new Error(`Invalid GEMINI_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'gemini') or an absolute path (e.g., '/tmp/gemini-test')`);
+        }
+    }
+    const cliName = customCliName || 'gemini';
+    // Try local install path: ~/.gemini/local/gemini
+    const userPath = join(homedir(), '.gemini', 'local', 'gemini');
+    debugLog(`[Debug] Checking for Gemini CLI at local user path: ${userPath}`);
+    if (existsSync(userPath)) {
+        debugLog(`[Debug] Found Gemini CLI at local user path: ${userPath}. Using this path.`);
+        return userPath;
+    }
+    else {
+        debugLog(`[Debug] Gemini CLI not found at local user path: ${userPath}.`);
+    }
+    // Fallback to CLI name (PATH lookup)
+    debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
+    console.warn(`[Warning] Gemini CLI not found at ~/.gemini/local/gemini. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
+    return cliName;
+}
+/**
+ * Determine the Codex CLI command/path.
+ * Similar to findClaudeCli but for Codex
+ */
+export function findCodexCli() {
+    debugLog('[Debug] Attempting to find Codex CLI...');
+    // Check for custom CLI name from environment variable
+    const customCliName = process.env.CODEX_CLI_NAME;
+    if (customCliName) {
+        debugLog(`[Debug] Using custom Codex CLI name from CODEX_CLI_NAME: ${customCliName}`);
+        // If it's an absolute path, use it directly
+        if (path.isAbsolute(customCliName)) {
+            debugLog(`[Debug] CODEX_CLI_NAME is an absolute path: ${customCliName}`);
+            return customCliName;
+        }
+        // If it starts with ~ or ./, reject as relative paths are not allowed
+        if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
+            throw new Error(`Invalid CODEX_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'codex') or an absolute path (e.g., '/tmp/codex-test')`);
+        }
+    }
+    const cliName = customCliName || 'codex';
+    // Try local install path: ~/.codex/local/codex
+    const userPath = join(homedir(), '.codex', 'local', 'codex');
+    debugLog(`[Debug] Checking for Codex CLI at local user path: ${userPath}`);
+    if (existsSync(userPath)) {
+        debugLog(`[Debug] Found Codex CLI at local user path: ${userPath}. Using this path.`);
+        return userPath;
+    }
+    else {
+        debugLog(`[Debug] Codex CLI not found at local user path: ${userPath}.`);
+    }
+    // Fallback to CLI name (PATH lookup)
+    debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
+    console.warn(`[Warning] Codex CLI not found at ~/.codex/local/codex. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
+    return cliName;
+}
+/**
+ * Determine the Claude CLI command/path.
+ * 1. Checks for CLAUDE_CLI_NAME environment variable:
+ *    - If absolute path, uses it directly
+ *    - If relative path, throws error
+ *    - If simple name, continues with path resolution
+ * 2. Checks for Claude CLI at the local user path: ~/.claude/local/claude.
+ * 3. If not found, defaults to the CLI name (or 'claude'), relying on the system's PATH for lookup.
+ */
+export function findClaudeCli() {
+    debugLog('[Debug] Attempting to find Claude CLI...');
+    // Check for custom CLI name from environment variable
+    const customCliName = process.env.CLAUDE_CLI_NAME;
+    if (customCliName) {
+        debugLog(`[Debug] Using custom Claude CLI name from CLAUDE_CLI_NAME: ${customCliName}`);
+        // If it's an absolute path, use it directly
+        if (path.isAbsolute(customCliName)) {
+            debugLog(`[Debug] CLAUDE_CLI_NAME is an absolute path: ${customCliName}`);
+            return customCliName;
+        }
+        // If it starts with ~ or ./, reject as relative paths are not allowed
+        if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
+            throw new Error(`Invalid CLAUDE_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'claude') or an absolute path (e.g., '/tmp/claude-test')`);
+        }
+    }
+    const cliName = customCliName || 'claude';
+    // Try local install path: ~/.claude/local/claude (using the original name for local installs)
+    const userPath = join(homedir(), '.claude', 'local', 'claude');
+    debugLog(`[Debug] Checking for Claude CLI at local user path: ${userPath}`);
+    if (existsSync(userPath)) {
+        debugLog(`[Debug] Found Claude CLI at local user path: ${userPath}. Using this path.`);
+        return userPath;
+    }
+    else {
+        debugLog(`[Debug] Claude CLI not found at local user path: ${userPath}.`);
+    }
+    // 3. Fallback to CLI name (PATH lookup)
+    debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
+    console.warn(`[Warning] Claude CLI not found at ~/.claude/local/claude. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
+    return cliName;
+}

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { spawn } from 'node:child_process';
 import { buildCliCommand } from './cli-builder.js';
-import { findClaudeCli, findCodexCli, findGeminiCli } from './server.js';
+import { findClaudeCli, findCodexCli, findGeminiCli } from './cli-utils.js';
 /**
  * Minimal argv parser. No external dependencies.
  * Supports: --key value, --key=value

package/dist/parsers.js

@@ -1,4 +1,4 @@
-import { debugLog } from './server.js';
+import { debugLog } from './cli-utils.js';
 /**
  * Parse Codex NDJSON output to extract the last agent message and token count
  */

package/dist/server.js

@@ -3,143 +3,20 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError, } from '@modelcontextprotocol/sdk/types.js';
 import { spawn } from 'node:child_process';
-import { existsSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import * as path from 'path';
 import { parseCodexOutput, parseClaudeOutput, parseGeminiOutput } from './parsers.js';
 import { buildCliCommand } from './cli-builder.js';
+import { debugLog, findClaudeCli, findCodexCli, findGeminiCli } from './cli-utils.js';
+// Re-export for backward compatibility
+export { debugLog, findClaudeCli, findCodexCli, findGeminiCli } from './cli-utils.js';
+export { resolveModelAlias } from './cli-builder.js';
 // Server version - update this when releasing new versions
 const SERVER_VERSION = "2.2.0";
-// Define debugMode globally using const
-const debugMode = process.env.MCP_CLAUDE_DEBUG === 'true';
 // Track if this is the first tool use for version printing
 let isFirstToolUse = true;
 // Capture server startup time when the module loads
 const serverStartupTime = new Date().toISOString();
 // Global process manager
 const processManager = new Map();
-// Dedicated debug logging function
-export function debugLog(message, ...optionalParams) {
-    if (debugMode) {
-        console.error(message, ...optionalParams);
-    }
-}
-/**
- * Determine the Gemini CLI command/path.
- * Similar to findClaudeCli but for Gemini
- */
-export function findGeminiCli() {
-    debugLog('[Debug] Attempting to find Gemini CLI...');
-    // Check for custom CLI name from environment variable
-    const customCliName = process.env.GEMINI_CLI_NAME;
-    if (customCliName) {
-        debugLog(`[Debug] Using custom Gemini CLI name from GEMINI_CLI_NAME: ${customCliName}`);
-        // If it's an absolute path, use it directly
-        if (path.isAbsolute(customCliName)) {
-            debugLog(`[Debug] GEMINI_CLI_NAME is an absolute path: ${customCliName}`);
-            return customCliName;
-        }
-        // If it starts with ~ or ./, reject as relative paths are not allowed
-        if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-            throw new Error(`Invalid GEMINI_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'gemini') or an absolute path (e.g., '/tmp/gemini-test')`);
-        }
-    }
-    const cliName = customCliName || 'gemini';
-    // Try local install path: ~/.gemini/local/gemini
-    const userPath = join(homedir(), '.gemini', 'local', 'gemini');
-    debugLog(`[Debug] Checking for Gemini CLI at local user path: ${userPath}`);
-    if (existsSync(userPath)) {
-        debugLog(`[Debug] Found Gemini CLI at local user path: ${userPath}. Using this path.`);
-        return userPath;
-    }
-    else {
-        debugLog(`[Debug] Gemini CLI not found at local user path: ${userPath}.`);
-    }
-    // Fallback to CLI name (PATH lookup)
-    debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-    console.warn(`[Warning] Gemini CLI not found at ~/.gemini/local/gemini. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-    return cliName;
-}
-/**
- * Determine the Codex CLI command/path.
- * Similar to findClaudeCli but for Codex
- */
-export function findCodexCli() {
-    debugLog('[Debug] Attempting to find Codex CLI...');
-    // Check for custom CLI name from environment variable
-    const customCliName = process.env.CODEX_CLI_NAME;
-    if (customCliName) {
-        debugLog(`[Debug] Using custom Codex CLI name from CODEX_CLI_NAME: ${customCliName}`);
-        // If it's an absolute path, use it directly
-        if (path.isAbsolute(customCliName)) {
-            debugLog(`[Debug] CODEX_CLI_NAME is an absolute path: ${customCliName}`);
-            return customCliName;
-        }
-        // If it starts with ~ or ./, reject as relative paths are not allowed
-        if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-            throw new Error(`Invalid CODEX_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'codex') or an absolute path (e.g., '/tmp/codex-test')`);
-        }
-    }
-    const cliName = customCliName || 'codex';
-    // Try local install path: ~/.codex/local/codex
-    const userPath = join(homedir(), '.codex', 'local', 'codex');
-    debugLog(`[Debug] Checking for Codex CLI at local user path: ${userPath}`);
-    if (existsSync(userPath)) {
-        debugLog(`[Debug] Found Codex CLI at local user path: ${userPath}. Using this path.`);
-        return userPath;
-    }
-    else {
-        debugLog(`[Debug] Codex CLI not found at local user path: ${userPath}.`);
-    }
-    // Fallback to CLI name (PATH lookup)
-    debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-    console.warn(`[Warning] Codex CLI not found at ~/.codex/local/codex. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-    return cliName;
-}
-/**
- * Determine the Claude CLI command/path.
- * 1. Checks for CLAUDE_CLI_NAME environment variable:
- *    - If absolute path, uses it directly
- *    - If relative path, throws error
- *    - If simple name, continues with path resolution
- * 2. Checks for Claude CLI at the local user path: ~/.claude/local/claude.
- * 3. If not found, defaults to the CLI name (or 'claude'), relying on the system's PATH for lookup.
- */
-export function findClaudeCli() {
-    debugLog('[Debug] Attempting to find Claude CLI...');
-    // Check for custom CLI name from environment variable
-    const customCliName = process.env.CLAUDE_CLI_NAME;
-    if (customCliName) {
-        debugLog(`[Debug] Using custom Claude CLI name from CLAUDE_CLI_NAME: ${customCliName}`);
-        // If it's an absolute path, use it directly
-        if (path.isAbsolute(customCliName)) {
-            debugLog(`[Debug] CLAUDE_CLI_NAME is an absolute path: ${customCliName}`);
-            return customCliName;
-        }
-        // If it starts with ~ or ./, reject as relative paths are not allowed
-        if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-            throw new Error(`Invalid CLAUDE_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'claude') or an absolute path (e.g., '/tmp/claude-test')`);
-        }
-    }
-    const cliName = customCliName || 'claude';
-    // Try local install path: ~/.claude/local/claude (using the original name for local installs)
-    const userPath = join(homedir(), '.claude', 'local', 'claude');
-    debugLog(`[Debug] Checking for Claude CLI at local user path: ${userPath}`);
-    if (existsSync(userPath)) {
-        debugLog(`[Debug] Found Claude CLI at local user path: ${userPath}. Using this path.`);
-        return userPath;
-    }
-    else {
-        debugLog(`[Debug] Claude CLI not found at local user path: ${userPath}.`);
-    }
-    // 3. Fallback to CLI name (PATH lookup)
-    debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-    console.warn(`[Warning] Claude CLI not found at ~/.claude/local/claude. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-    return cliName;
-}
-// Re-export resolveModelAlias for backward compatibility
-export { resolveModelAlias } from './cli-builder.js';
 // Ensure spawnAsync is defined correctly *before* the class
 export async function spawnAsync(command, args, options) {
     return new Promise((resolve, reject) => {
@@ -239,7 +116,7 @@ export class ClaudeCodeServer {
 **IMPORTANT**: This tool now returns immediately with a PID. Use other tools to check status and get results.
 
 **Supported models**:
-"claude-ultra", "codex-ultra", "gemini-ultra", "sonnet", "sonnet[1m]", "opus", "opusplan", "haiku", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex-mini", "gpt-5.1-codex-max", "gpt-5.2", "gpt-5.1", "gpt-5.1-codex", "gpt-5-codex", "gpt-5-codex-mini", "gpt-5", "gemini-2.5-pro", "gemini-2.5-flash", "gemini-3-pro-preview", "gemini-3-flash-preview"
+"claude-ultra", "codex-ultra", "gemini-ultra", "sonnet", "sonnet[1m]", "opus", "opusplan", "haiku", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex-mini", "gpt-5.1-codex-max", "gpt-5.2", "gpt-5.1", "gpt-5.1-codex", "gpt-5-codex", "gpt-5-codex-mini", "gpt-5", "gemini-2.5-pro", "gemini-2.5-flash", "gemini-3.1-pro-preview", "gemini-3-pro-preview", "gemini-3-flash-preview"
 
 **Prompt input**: You must provide EITHER prompt (string) OR prompt_file (file path), but not both.
 
@@ -267,7 +144,7 @@ export class ClaudeCodeServer {
                             },
                             model: {
                                 type: 'string',
-                                description: 'The model to use. Aliases: "claude-ultra", "codex-ultra" (auto high-reasoning), "gemini-ultra". Standard: "sonnet", "sonnet[1m]", "opus", "opusplan", "haiku", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex-mini", "gpt-5.1", "gemini-2.5-pro", "gemini-3-pro-preview", "gemini-3-flash-preview", etc.',
+                                description: 'The model to use. Aliases: "claude-ultra", "codex-ultra" (auto high-reasoning), "gemini-ultra". Standard: "sonnet", "sonnet[1m]", "opus", "opusplan", "haiku", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex-mini", "gpt-5.1", "gemini-2.5-pro", "gemini-3.1-pro-preview", "gemini-3-pro-preview", "gemini-3-flash-preview", etc.',
                             },
                             reasoning_effort: {
                                 type: 'string',
@@ -275,7 +152,7 @@ export class ClaudeCodeServer {
                             },
                             session_id: {
                                 type: 'string',
-                                description: 'Optional session ID to resume a previous session. Supported for: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3-pro-preview, gemini-3-flash-preview.',
+                                description: 'Optional session ID to resume a previous session. Supported for: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3.1-pro-preview, gemini-3-pro-preview, gemini-3-flash-preview.',
                             },
                         },
                         required: ['workFolder'],

package/docs/RELEASE_CHECKLIST.md

@@ -61,5 +61,5 @@ This project uses OIDC trusted publishing (no npm token required).
 
 Configuration on npmjs.com:
 - Organization/user: `mkXultra`
-- Repository: `claude-code-mcp`
+- Repository: `ai-cli-mcp`
 - Workflow filename: `publish.yml`

package/docs/development.md

@@ -4,8 +4,8 @@
 
 ```bash
 # Clone the repository
-git clone https://github.com/mkXultra/claude-code-mcp.git
-cd claude-code-mcp
+git clone https://github.com/mkXultra/ai-cli-mcp.git
+cd ai-cli-mcp
 
 # Install dependencies
 npm install
@@ -153,4 +153,4 @@ These can be set in your shell environment or within the `env` block of your `mc
 
 Contributions are welcome!
 
-Submit issues and pull requests to the [GitHub repository](https://github.com/mkXultra/claude-code-mcp).
+Submit issues and pull requests to the [GitHub repository](https://github.com/mkXultra/ai-cli-mcp).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-cli-mcp",
-  "version": "2.7.0",
+  "version": "2.8.1",
   "description": "MCP server for AI CLI tools (Claude, Codex, and Gemini) with background process management",
   "author": "mkXultra",
   "license": "MIT",
@@ -39,7 +39,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/mkXultra/claude-code-mcp.git"
+    "url": "git+https://github.com/mkXultra/ai-cli-mcp.git"
   },
   "keywords": [
     "mcp",
@@ -52,7 +52,7 @@
     "gpt5"
   ],
   "bugs": {
-    "url": "https://github.com/mkXultra/claude-code-mcp/issues"
+    "url": "https://github.com/mkXultra/ai-cli-mcp/issues"
   },
-  "homepage": "https://github.com/mkXultra/claude-code-mcp#readme"
+  "homepage": "https://github.com/mkXultra/ai-cli-mcp#readme"
 }

package/src/__tests__/cli-builder.test.ts

@@ -40,8 +40,8 @@ describe('cli-builder', () => {
       expect(resolveModelAlias('codex-ultra')).toBe('gpt-5.3-codex');
     });
 
-    it('should resolve gemini-ultra to gemini-3-pro-preview', () => {
-      expect(resolveModelAlias('gemini-ultra')).toBe('gemini-3-pro-preview');
+    it('should resolve gemini-ultra to gemini-3.1-pro-preview', () => {
+      expect(resolveModelAlias('gemini-ultra')).toBe('gemini-3.1-pro-preview');
     });
 
     it('should pass through non-alias model names', () => {
@@ -209,6 +209,7 @@ describe('cli-builder', () => {
 
         expect(cmd.args).toContain('-r');
         expect(cmd.args).toContain('ses-123');
+        expect(cmd.args).toContain('--fork-session');
       });
 
       it('should resolve claude-ultra alias to opus', () => {
@@ -338,7 +339,7 @@ describe('cli-builder', () => {
         });
 
         expect(cmd.agent).toBe('gemini');
-        expect(cmd.resolvedModel).toBe('gemini-3-pro-preview');
+        expect(cmd.resolvedModel).toBe('gemini-3.1-pro-preview');
       });
     });
   });

package/src/__tests__/server.test.ts

@@ -624,7 +624,7 @@ describe('ClaudeCodeServer Unit Tests', () => {
       // Verify spawn was called with -r flag
       expect(mockSpawn).toHaveBeenCalledWith(
         expect.any(String),
-        expect.arrayContaining(['-r', 'test-session-123', '-p', 'test prompt']),
+        expect.arrayContaining(['-r', 'test-session-123', '--fork-session', '-p', 'test prompt']),
         expect.any(Object)
       );
     });

package/src/cli-builder.ts

@@ -5,7 +5,7 @@ import { resolve as pathResolve, isAbsolute } from 'node:path';
 export const MODEL_ALIASES: Record<string, string> = {
   'claude-ultra': 'opus',
   'codex-ultra': 'gpt-5.3-codex',
-  'gemini-ultra': 'gemini-3-pro-preview'
+  'gemini-ultra': 'gemini-3.1-pro-preview'
 };
 
 export const ALLOWED_REASONING_EFFORTS = new Set(['low', 'medium', 'high', 'xhigh']);
@@ -177,7 +177,7 @@ export function buildCliCommand(options: BuildCliCommandOptions): CliCommand {
     args = ['--dangerously-skip-permissions', '--output-format', 'stream-json', '--verbose'];
 
     if (options.session_id && typeof options.session_id === 'string') {
-      args.push('-r', options.session_id);
+      args.push('-r', options.session_id, '--fork-session');
     }
 
     args.push('-p', prompt);

package/src/cli-utils.ts

@@ -0,0 +1,148 @@
+import { existsSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import * as path from 'path';
+
+// Define debugMode globally using const
+const debugMode = process.env.MCP_CLAUDE_DEBUG === 'true';
+
+// Dedicated debug logging function
+export function debugLog(message?: any, ...optionalParams: any[]): void {
+  if (debugMode) {
+    console.error(message, ...optionalParams);
+  }
+}
+
+/**
+ * Determine the Gemini CLI command/path.
+ * Similar to findClaudeCli but for Gemini
+ */
+export function findGeminiCli(): string {
+  debugLog('[Debug] Attempting to find Gemini CLI...');
+
+  // Check for custom CLI name from environment variable
+  const customCliName = process.env.GEMINI_CLI_NAME;
+  if (customCliName) {
+    debugLog(`[Debug] Using custom Gemini CLI name from GEMINI_CLI_NAME: ${customCliName}`);
+
+    // If it's an absolute path, use it directly
+    if (path.isAbsolute(customCliName)) {
+      debugLog(`[Debug] GEMINI_CLI_NAME is an absolute path: ${customCliName}`);
+      return customCliName;
+    }
+
+    // If it starts with ~ or ./, reject as relative paths are not allowed
+    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
+      throw new Error(`Invalid GEMINI_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'gemini') or an absolute path (e.g., '/tmp/gemini-test')`);
+    }
+  }
+
+  const cliName = customCliName || 'gemini';
+
+  // Try local install path: ~/.gemini/local/gemini
+  const userPath = join(homedir(), '.gemini', 'local', 'gemini');
+  debugLog(`[Debug] Checking for Gemini CLI at local user path: ${userPath}`);
+
+  if (existsSync(userPath)) {
+    debugLog(`[Debug] Found Gemini CLI at local user path: ${userPath}. Using this path.`);
+    return userPath;
+  } else {
+    debugLog(`[Debug] Gemini CLI not found at local user path: ${userPath}.`);
+  }
+
+  // Fallback to CLI name (PATH lookup)
+  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
+  console.warn(`[Warning] Gemini CLI not found at ~/.gemini/local/gemini. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
+  return cliName;
+}
+
+/**
+ * Determine the Codex CLI command/path.
+ * Similar to findClaudeCli but for Codex
+ */
+export function findCodexCli(): string {
+  debugLog('[Debug] Attempting to find Codex CLI...');
+
+  // Check for custom CLI name from environment variable
+  const customCliName = process.env.CODEX_CLI_NAME;
+  if (customCliName) {
+    debugLog(`[Debug] Using custom Codex CLI name from CODEX_CLI_NAME: ${customCliName}`);
+
+    // If it's an absolute path, use it directly
+    if (path.isAbsolute(customCliName)) {
+      debugLog(`[Debug] CODEX_CLI_NAME is an absolute path: ${customCliName}`);
+      return customCliName;
+    }
+
+    // If it starts with ~ or ./, reject as relative paths are not allowed
+    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
+      throw new Error(`Invalid CODEX_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'codex') or an absolute path (e.g., '/tmp/codex-test')`);
+    }
+  }
+
+  const cliName = customCliName || 'codex';
+
+  // Try local install path: ~/.codex/local/codex
+  const userPath = join(homedir(), '.codex', 'local', 'codex');
+  debugLog(`[Debug] Checking for Codex CLI at local user path: ${userPath}`);
+
+  if (existsSync(userPath)) {
+    debugLog(`[Debug] Found Codex CLI at local user path: ${userPath}. Using this path.`);
+    return userPath;
+  } else {
+    debugLog(`[Debug] Codex CLI not found at local user path: ${userPath}.`);
+  }
+
+  // Fallback to CLI name (PATH lookup)
+  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
+  console.warn(`[Warning] Codex CLI not found at ~/.codex/local/codex. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
+  return cliName;
+}
+
+/**
+ * Determine the Claude CLI command/path.
+ * 1. Checks for CLAUDE_CLI_NAME environment variable:
+ *    - If absolute path, uses it directly
+ *    - If relative path, throws error
+ *    - If simple name, continues with path resolution
+ * 2. Checks for Claude CLI at the local user path: ~/.claude/local/claude.
+ * 3. If not found, defaults to the CLI name (or 'claude'), relying on the system's PATH for lookup.
+ */
+export function findClaudeCli(): string {
+  debugLog('[Debug] Attempting to find Claude CLI...');
+
+  // Check for custom CLI name from environment variable
+  const customCliName = process.env.CLAUDE_CLI_NAME;
+  if (customCliName) {
+    debugLog(`[Debug] Using custom Claude CLI name from CLAUDE_CLI_NAME: ${customCliName}`);
+
+    // If it's an absolute path, use it directly
+    if (path.isAbsolute(customCliName)) {
+      debugLog(`[Debug] CLAUDE_CLI_NAME is an absolute path: ${customCliName}`);
+      return customCliName;
+    }
+
+    // If it starts with ~ or ./, reject as relative paths are not allowed
+    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
+      throw new Error(`Invalid CLAUDE_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'claude') or an absolute path (e.g., '/tmp/claude-test')`);
+    }
+  }
+
+  const cliName = customCliName || 'claude';
+
+  // Try local install path: ~/.claude/local/claude (using the original name for local installs)
+  const userPath = join(homedir(), '.claude', 'local', 'claude');
+  debugLog(`[Debug] Checking for Claude CLI at local user path: ${userPath}`);
+
+  if (existsSync(userPath)) {
+    debugLog(`[Debug] Found Claude CLI at local user path: ${userPath}. Using this path.`);
+    return userPath;
+  } else {
+    debugLog(`[Debug] Claude CLI not found at local user path: ${userPath}.`);
+  }
+
+  // 3. Fallback to CLI name (PATH lookup)
+  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
+  console.warn(`[Warning] Claude CLI not found at ~/.claude/local/claude. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
+  return cliName;
+}

package/src/cli.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { spawn } from 'node:child_process';
 import { buildCliCommand } from './cli-builder.js';
-import { findClaudeCli, findCodexCli, findGeminiCli } from './server.js';
+import { findClaudeCli, findCodexCli, findGeminiCli } from './cli-utils.js';
 
 /**
  * Minimal argv parser. No external dependencies.

package/src/parsers.ts

@@ -1,4 +1,4 @@
-import { debugLog } from './server.js';
+import { debugLog } from './cli-utils.js';
 
 /**
  * Parse Codex NDJSON output to extract the last agent message and token count

package/src/server.ts

@@ -9,19 +9,17 @@ import {
   type ServerResult,
 } from '@modelcontextprotocol/sdk/types.js';
 import { spawn, ChildProcess } from 'node:child_process';
-import { existsSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import * as path from 'path';
 import { parseCodexOutput, parseClaudeOutput, parseGeminiOutput } from './parsers.js';
 import { buildCliCommand } from './cli-builder.js';
+import { debugLog, findClaudeCli, findCodexCli, findGeminiCli } from './cli-utils.js';
+
+// Re-export for backward compatibility
+export { debugLog, findClaudeCli, findCodexCli, findGeminiCli } from './cli-utils.js';
+export { resolveModelAlias } from './cli-builder.js';
 
 // Server version - update this when releasing new versions
 const SERVER_VERSION = "2.2.0";
 
-// Define debugMode globally using const
-const debugMode = process.env.MCP_CLAUDE_DEBUG === 'true';
-
 // Track if this is the first tool use for version printing
 let isFirstToolUse = true;
 
@@ -53,150 +51,6 @@ interface ProcessListItem {
 // Global process manager
 const processManager = new Map<number, ClaudeProcess>();
 
-// Dedicated debug logging function
-export function debugLog(message?: any, ...optionalParams: any[]): void {
-  if (debugMode) {
-    console.error(message, ...optionalParams);
-  }
-}
-
-/**
- * Determine the Gemini CLI command/path.
- * Similar to findClaudeCli but for Gemini
- */
-export function findGeminiCli(): string {
-  debugLog('[Debug] Attempting to find Gemini CLI...');
-
-  // Check for custom CLI name from environment variable
-  const customCliName = process.env.GEMINI_CLI_NAME;
-  if (customCliName) {
-    debugLog(`[Debug] Using custom Gemini CLI name from GEMINI_CLI_NAME: ${customCliName}`);
-
-    // If it's an absolute path, use it directly
-    if (path.isAbsolute(customCliName)) {
-      debugLog(`[Debug] GEMINI_CLI_NAME is an absolute path: ${customCliName}`);
-      return customCliName;
-    }
-
-    // If it starts with ~ or ./, reject as relative paths are not allowed
-    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-      throw new Error(`Invalid GEMINI_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'gemini') or an absolute path (e.g., '/tmp/gemini-test')`);
-    }
-  }
-
-  const cliName = customCliName || 'gemini';
-
-  // Try local install path: ~/.gemini/local/gemini
-  const userPath = join(homedir(), '.gemini', 'local', 'gemini');
-  debugLog(`[Debug] Checking for Gemini CLI at local user path: ${userPath}`);
-
-  if (existsSync(userPath)) {
-    debugLog(`[Debug] Found Gemini CLI at local user path: ${userPath}. Using this path.`);
-    return userPath;
-  } else {
-    debugLog(`[Debug] Gemini CLI not found at local user path: ${userPath}.`);
-  }
-
-  // Fallback to CLI name (PATH lookup)
-  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-  console.warn(`[Warning] Gemini CLI not found at ~/.gemini/local/gemini. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-  return cliName;
-}
-
-/**
- * Determine the Codex CLI command/path.
- * Similar to findClaudeCli but for Codex
- */
-export function findCodexCli(): string {
-  debugLog('[Debug] Attempting to find Codex CLI...');
-
-  // Check for custom CLI name from environment variable
-  const customCliName = process.env.CODEX_CLI_NAME;
-  if (customCliName) {
-    debugLog(`[Debug] Using custom Codex CLI name from CODEX_CLI_NAME: ${customCliName}`);
-    
-    // If it's an absolute path, use it directly
-    if (path.isAbsolute(customCliName)) {
-      debugLog(`[Debug] CODEX_CLI_NAME is an absolute path: ${customCliName}`);
-      return customCliName;
-    }
-    
-    // If it starts with ~ or ./, reject as relative paths are not allowed
-    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-      throw new Error(`Invalid CODEX_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'codex') or an absolute path (e.g., '/tmp/codex-test')`);
-    }
-  }
-  
-  const cliName = customCliName || 'codex';
-
-  // Try local install path: ~/.codex/local/codex
-  const userPath = join(homedir(), '.codex', 'local', 'codex');
-  debugLog(`[Debug] Checking for Codex CLI at local user path: ${userPath}`);
-
-  if (existsSync(userPath)) {
-    debugLog(`[Debug] Found Codex CLI at local user path: ${userPath}. Using this path.`);
-    return userPath;
-  } else {
-    debugLog(`[Debug] Codex CLI not found at local user path: ${userPath}.`);
-  }
-
-  // Fallback to CLI name (PATH lookup)
-  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-  console.warn(`[Warning] Codex CLI not found at ~/.codex/local/codex. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-  return cliName;
-}
-
-/**
- * Determine the Claude CLI command/path.
- * 1. Checks for CLAUDE_CLI_NAME environment variable:
- *    - If absolute path, uses it directly
- *    - If relative path, throws error
- *    - If simple name, continues with path resolution
- * 2. Checks for Claude CLI at the local user path: ~/.claude/local/claude.
- * 3. If not found, defaults to the CLI name (or 'claude'), relying on the system's PATH for lookup.
- */
-export function findClaudeCli(): string {
-  debugLog('[Debug] Attempting to find Claude CLI...');
-
-  // Check for custom CLI name from environment variable
-  const customCliName = process.env.CLAUDE_CLI_NAME;
-  if (customCliName) {
-    debugLog(`[Debug] Using custom Claude CLI name from CLAUDE_CLI_NAME: ${customCliName}`);
-    
-    // If it's an absolute path, use it directly
-    if (path.isAbsolute(customCliName)) {
-      debugLog(`[Debug] CLAUDE_CLI_NAME is an absolute path: ${customCliName}`);
-      return customCliName;
-    }
-    
-    // If it starts with ~ or ./, reject as relative paths are not allowed
-    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-      throw new Error(`Invalid CLAUDE_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'claude') or an absolute path (e.g., '/tmp/claude-test')`);
-    }
-  }
-  
-  const cliName = customCliName || 'claude';
-
-  // Try local install path: ~/.claude/local/claude (using the original name for local installs)
-  const userPath = join(homedir(), '.claude', 'local', 'claude');
-  debugLog(`[Debug] Checking for Claude CLI at local user path: ${userPath}`);
-
-  if (existsSync(userPath)) {
-    debugLog(`[Debug] Found Claude CLI at local user path: ${userPath}. Using this path.`);
-    return userPath;
-  } else {
-    debugLog(`[Debug] Claude CLI not found at local user path: ${userPath}.`);
-  }
-
-  // 3. Fallback to CLI name (PATH lookup)
-  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-  console.warn(`[Warning] Claude CLI not found at ~/.claude/local/claude. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-  return cliName;
-}
-
-// Re-export resolveModelAlias for backward compatibility
-export { resolveModelAlias } from './cli-builder.js';
-
 // Ensure spawnAsync is defined correctly *before* the class
 export async function spawnAsync(command: string, args: string[], options?: { timeout?: number, cwd?: string }): Promise<{ stdout: string; stderr: string }> {
   return new Promise((resolve, reject) => {
@@ -308,7 +162,7 @@ export class ClaudeCodeServer {
 **IMPORTANT**: This tool now returns immediately with a PID. Use other tools to check status and get results.
 
 **Supported models**:
-"claude-ultra", "codex-ultra", "gemini-ultra", "sonnet", "sonnet[1m]", "opus", "opusplan", "haiku", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex-mini", "gpt-5.1-codex-max", "gpt-5.2", "gpt-5.1", "gpt-5.1-codex", "gpt-5-codex", "gpt-5-codex-mini", "gpt-5", "gemini-2.5-pro", "gemini-2.5-flash", "gemini-3-pro-preview", "gemini-3-flash-preview"
+"claude-ultra", "codex-ultra", "gemini-ultra", "sonnet", "sonnet[1m]", "opus", "opusplan", "haiku", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex-mini", "gpt-5.1-codex-max", "gpt-5.2", "gpt-5.1", "gpt-5.1-codex", "gpt-5-codex", "gpt-5-codex-mini", "gpt-5", "gemini-2.5-pro", "gemini-2.5-flash", "gemini-3.1-pro-preview", "gemini-3-pro-preview", "gemini-3-flash-preview"
 
 **Prompt input**: You must provide EITHER prompt (string) OR prompt_file (file path), but not both.
 
@@ -336,7 +190,7 @@ export class ClaudeCodeServer {
               },
               model: {
                 type: 'string',
-                description: 'The model to use. Aliases: "claude-ultra", "codex-ultra" (auto high-reasoning), "gemini-ultra". Standard: "sonnet", "sonnet[1m]", "opus", "opusplan", "haiku", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex-mini", "gpt-5.1", "gemini-2.5-pro", "gemini-3-pro-preview", "gemini-3-flash-preview", etc.',
+                description: 'The model to use. Aliases: "claude-ultra", "codex-ultra" (auto high-reasoning), "gemini-ultra". Standard: "sonnet", "sonnet[1m]", "opus", "opusplan", "haiku", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex-mini", "gpt-5.1", "gemini-2.5-pro", "gemini-3.1-pro-preview", "gemini-3-pro-preview", "gemini-3-flash-preview", etc.',
               },
               reasoning_effort: {
                 type: 'string',
@@ -344,7 +198,7 @@ export class ClaudeCodeServer {
               },
               session_id: {
                 type: 'string',
-                description: 'Optional session ID to resume a previous session. Supported for: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3-pro-preview, gemini-3-flash-preview.',
+                description: 'Optional session ID to resume a previous session. Supported for: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3.1-pro-preview, gemini-3-pro-preview, gemini-3-flash-preview.',
               },
             },
             required: ['workFolder'],