ai-cli-mcp 2.4.0 → 2.6.0

package/.gemini/settings.json

@@ -0,0 +1,11 @@
+{
+  "mcpServers": {
+    "acm-dev": {
+      "command": "npm",
+      "args": [
+        "run",
+        "dev"
+      ]
+    }
+  }
+}

package/.mcp.json

@@ -3,7 +3,8 @@
     "acm-dev": {
       "command": "npm",
       "args": [
-        "start"
+        "run",
+        "dev"
       ]
     }
   }

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# [2.6.0](https://github.com/mkXultra/claude-code-mcp/compare/v2.5.0...v2.6.0) (2026-02-09)
+
+
+### Features
+
+* update model support (gpt-5.3-codex, sonnet[1m], opusplan) and refactor README ([eb6574d](https://github.com/mkXultra/claude-code-mcp/commit/eb6574d3760269d4be96cd934bc03d94ccb3801f))
+
+# [2.5.0](https://github.com/mkXultra/claude-code-mcp/compare/v2.4.0...v2.5.0) (2026-01-24)
+
+
+### Features
+
+* enhance output parsers for Codex and Claude with tool usage extraction ([b6410a1](https://github.com/mkXultra/claude-code-mcp/commit/b6410a104666eca592735acea093b877c0f03f64))
+* track command execution in Codex output and include .gemini config ([91f7f06](https://github.com/mkXultra/claude-code-mcp/commit/91f7f067a1d453fd8e3a5a95bb90f21b7df0af8a))
+* update Claude CLI args to stream-json and add verbose option to get_result ([b7f9abc](https://github.com/mkXultra/claude-code-mcp/commit/b7f9abc11c56ad0c8c95e90a614d1d869d8a3bfa))
+
 # [2.4.0](https://github.com/mkXultra/claude-code-mcp/compare/v2.3.3...v2.4.0) (2026-01-24)
 
 

package/README.ja.md

@@ -9,8 +9,6 @@ AI CLIツール（Claude, Codex, Gemini）をバックグラウンドプロセ
 
 Cursorなどのエディタが、複雑な手順を伴う編集や操作に苦戦していることに気づいたことはありませんか？このサーバーは、強力な統合 `run` ツールを提供し、複数のAIエージェントを活用してコーディングタスクをより効果的に処理できるようにします。
 
-<img src="assets/screenshot.png" width="300" alt="Screenshot">
-
 ## 概要
 
 このMCPサーバーは、LLMがAI CLIツールと対話するためのツールを提供します。MCPクライアントと統合することで、LLMは以下のことが可能になります：
@@ -19,8 +17,8 @@ Cursorなどのエディタが、複雑な手順を伴う編集や操作に苦
 - 自動承認モードでCodex CLIを実行（`--full-auto` を使用）
 - 自動承認モードでGemini CLIを実行（`-y` を使用）
 - 複数のAIモデルのサポート：
-    - Claude (sonnet, opus, haiku)
-    - Codex (gpt-5.2-codex, gpt-5.1-codex-mini, gpt-5.1-codex-max, など)
+    - 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)
 - PID追跡によるバックグラウンドプロセスの管理
 - ツールからの構造化された出力の解析と返却
@@ -134,10 +132,10 @@ Claude CLI、Codex CLI、またはGemini CLIを使用してプロンプトを実
 - `workFolder` (string, 必須): CLIを実行する作業ディレクトリ。絶対パスである必要があります。
 - **モデル (Models):**
     - **Ultra エイリアス:** `claude-ultra`, `codex-ultra` (自動的に high-reasoning に設定), `gemini-ultra`
-    - Claude: `sonnet`, `opus`, `haiku`
-    - Codex: `gpt-5.2-codex`, `gpt-5.1-codex-mini`, `gpt-5.1-codex-max`, `gpt-5.2`, `gpt-5.1`, `gpt-5`
+    - 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`
-- `reasoning_effort` (string, 任意): Codex専用。`model_reasoning_effort` を設定します（許容値: "low", "medium", "high"）。
+- `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。
 
 ### `wait`

package/README.md

@@ -11,8 +11,6 @@ An MCP (Model Context Protocol) server that allows running AI CLI tools (Claude,
 
 Did you notice that Cursor sometimes struggles with complex, multi-step edits or operations? This server, with its powerful unified `run` tool, enables multiple AI agents to handle your coding tasks more effectively.
 
-<img src="assets/screenshot.png" width="300" alt="Screenshot">
-
 ## Overview
 
 This MCP server provides tools that can be used by LLMs to interact with AI CLI tools. When integrated with MCP clients, it allows LLMs to:
@@ -20,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, opus, haiku), 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-pro-preview, gemini-3-flash-preview)
 - Manage background processes with PID tracking
 - Parse and return structured outputs from both tools
 
@@ -133,10 +131,10 @@ Executes a prompt using Claude CLI, Codex CLI, or Gemini CLI. The appropriate CL
 - `workFolder` (string, required): The working directory for the CLI execution. Must be an absolute path.
 **Models:**
 - **Ultra Aliases:** `claude-ultra`, `codex-ultra` (defaults to high-reasoning), `gemini-ultra`
-- Claude: `sonnet`, `opus`, `haiku`
-- Codex: `gpt-5.2-codex`, `gpt-5.1-codex-mini`, `gpt-5.1-codex-max`, `gpt-5.2`, `gpt-5.1`, `gpt-5`
+- 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`
-- `reasoning_effort` (string, optional): Codex only. Sets `model_reasoning_effort` (allowed: "low", "medium", "high").
+- `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.
 
 ### `wait`
@@ -165,77 +163,6 @@ Terminates a running AI agent process by PID.
 **Arguments:**
 - `pid` (number, required): The process ID to terminate.
 
-### Examples
-
-Here are some visual examples of the server in action:
-
-<img src="assets/claude_tool_git_example.png" alt="Claude Tool Git Example" width="50%">
-
-<img src="assets/additional_claude_screenshot.png" alt="Additional Claude Screenshot" width="50%">
-
-<img src="assets/cursor-screenshot.png" alt="Cursor Screenshot" width="50%">
-
-### Fixing ESLint Setup
-
-Here's an example of using the Claude Code MCP tool to interactively fix an ESLint setup by deleting old configuration files and creating a new one:
-
-<img src="assets/eslint_example.png" alt="ESLint file operations example" width="50%">
-
-### Listing Files Example
-
-Here's an example of the Claude Code tool listing files in a directory:
-
-<img src="assets/file_list_example.png" alt="File listing example" width="50%">
-
-## Key Use Cases
-
-This server, through its unified `run` tool, unlocks a wide range of powerful capabilities by giving your AI direct access to both Claude and Codex CLI tools. Here are some examples of what you can achieve:
-
-1.  **Code Generation, Analysis & Refactoring:**
-    -   `"Generate a Python script to parse CSV data and output JSON."`
-    -   `"Analyze my_script.py for potential bugs and suggest improvements."`
-
-2.  **File System Operations (Create, Read, Edit, Manage):**
-    -   **Creating Files:** `"Your work folder is /Users/steipete/my_project\n\nCreate a new file named 'config.yml' in the 'app/settings' directory with the following content:\nport: 8080\ndatabase: main_db"`
-    -   **Editing Files:** `"Your work folder is /Users/steipete/my_project\n\nEdit file 'public/css/style.css': Add a new CSS rule at the end to make all 'h2' elements have a 'color: navy'."`
-    -   **Moving/Copying/Deleting:** `"Your work folder is /Users/steipete/my_project\n\nMove the file 'report.docx' from the 'drafts' folder to the 'final_reports' folder and rename it to 'Q1_Report_Final.docx'."`
-
-3.  **Version Control (Git):**
-    -   `"Your work folder is /Users/steipete/my_project\n\n1. Stage the file 'src/main.java'.\n2. Commit the changes with the message 'feat: Implement user authentication'.\n3. Push the commit to the 'develop' branch on origin."`
-
-4.  **Running Terminal Commands:**
-    -   `"Your work folder is /Users/steipete/my_project/frontend\n\nRun the command 'npm run build'."`
-    -   `"Open the URL https://developer.mozilla.org in my default web browser."`
-
-5.  **Web Search & Summarization:**
-    -   `"Search the web for 'benefits of server-side rendering' and provide a concise summary."`
-
-6.  **Complex Multi-Step Workflows:**
-    -   Automate version bumps, update changelogs, and tag releases: `"Your work folder is /Users/steipete/my_project\n\nFollow these steps: 1. Update the version in package.json to 2.5.0. 2. Add a new section to CHANGELOG.md for version 2.5.0 with the heading '### Added' and list 'New feature X'. 3. Stage package.json and CHANGELOG.md. 4. Commit with message 'release: version 2.5.0'. 5. Push the commit. 6. Create and push a git tag v2.5.0."`
-
-    <img src="assets/multistep_example.png" alt="Complex multi-step operation example" width="50%">
-
-7.  **Repairing Files with Syntax Errors:**
-    -   `"Your work folder is /path/to/project\n\nThe file 'src/utils/parser.js' has syntax errors after a recent complex edit that broke its structure. Please analyze it, identify the syntax errors, and correct the file to make it valid JavaScript again, ensuring the original logic is preserved as much as possible."`
-
-8.  **Interacting with GitHub (e.g., Creating a Pull Request):**
-    -   `"Your work folder is /Users/steipete/my_project\n\nCreate a GitHub Pull Request in the repository 'owner/repo' from the 'feature-branch' to the 'main' branch. Title: 'feat: Implement new login flow'. Body: 'This PR adds a new and improved login experience for users.'"`
-
-9.  **Interacting with GitHub (e.g., Checking PR CI Status):**
-    -   `"Your work folder is /Users/steipete/my_project\n\nCheck the status of CI checks for Pull Request #42 in the GitHub repository 'owner/repo'. Report if they have passed, failed, or are still running."`
-
-### Correcting GitHub Actions Workflow
-
-<img src="assets/github_actions_fix_example.png" alt="GitHub Actions workflow fix example" width="50%">
-
-### Complex Multi-Step Operations
-
-This example illustrates the AI agent handling a more complex, multi-step task, such as preparing a release by creating a branch, updating multiple files (`package.json`, `CHANGELOG.md`), committing changes, and initiating a pull request, all within a single, coherent operation.
-
-<img src="assets/claude_code_multistep_example.png" alt="AI agent multi-step example" width="50%">
-
-**CRITICAL: Remember to provide Current Working Directory (CWD) context in your prompts for file system or git operations (e.g., `"Your work folder is /path/to/project\n\n...your command..."`).**
-
 ## Troubleshooting
 
 - **"Command not found" (claude-code-mcp):** If installed globally, ensure the npm global bin directory is in your system's PATH. If using `npx`, ensure `npx` itself is working.
@@ -244,76 +171,9 @@ This example illustrates the AI agent handling a more complex, multi-step task,
 - **JSON Errors from Server:** If `MCP_CLAUDE_DEBUG` is `true`, error messages or logs might interfere with MCP's JSON parsing. Set to `false` for normal operation.
 - **ESM/Import Errors:** Ensure you are using Node.js v20 or later.
 
-**For Developers: Local Setup & Contribution**
-
-If you want to develop or contribute to this server, or run it from a cloned repository for testing, please see our [Local Installation & Development Setup Guide](./docs/local_install.md).
-
-## Testing
-
-The project includes comprehensive test suites:
-
-```bash
-# Run all tests
-npm test
-
-# Run unit tests only
-npm run test:unit
-
-# Run e2e tests (with mocks)
-npm run test:e2e
-
-# Run e2e tests locally (requires Claude CLI)
-npm run test:e2e:local
-
-# Watch mode for development
-npm run test:watch
-
-# Coverage report
-npm run test:coverage
-```
-
-For detailed testing documentation, see our [E2E Testing Guide](./docs/e2e-testing.md).
-
-## Manual Testing with MCP Inspector
-
-You can manually test the MCP server using the Model Context Protocol Inspector:
-
-```bash
-# Build the project first
-npm run build
-
-# Start the MCP Inspector with the server
-npx @modelcontextprotocol/inspector node dist/server.js
-```
-
-This will open a web interface where you can:
-1. View all available tools (`run`, `list_processes`, `get_result`, `kill_process`)
-2. Test each tool with different parameters
-3. Test different AI models including:
-   - Claude models: `sonnet`, `opus`, `haiku`
-   - Codex models: `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 models: `gemini-2.5-pro`, `gemini-2.5-flash`, `gemini-3-pro-preview`, `gemini-3-flash-preview`
-
-Example test: Select the `run` tool and provide:
-- `prompt`: "What is 2+2?"
-- `workFolder`: "/tmp"
-- `model`: "gemini-2.5-flash"
-
-## Configuration via Environment Variables
-
-The server's behavior can be customized using these environment variables:
-
-- `CLAUDE_CLI_PATH`: Absolute path to the Claude CLI executable.
-  - Default: Checks `~/.claude/local/claude`, then falls back to `claude` (expecting it in PATH).
-- `MCP_CLAUDE_DEBUG`: Set to `true` for verbose debug logging from this MCP server. Default: `false`.
-
-These can be set in your shell environment or within the `env` block of your `mcp.json` server configuration (though the `env` block in `mcp.json` examples was removed for simplicity, it's still a valid way to set them for the server process if needed).
-
 ## Contributing
 
-Contributions are welcome! Please refer to the [Local Installation & Development Setup Guide](./docs/local_install.md) for details on setting up your environment.
-
-Submit issues and pull requests to the [GitHub repository](https://github.com/mkXultra/claude-code-mcp).
+For development setup, testing, and contribution guidelines, see the [Development Guide](./docs/development.md).
 
 ## Advanced Configuration (Optional)
 

package/dist/__tests__/parsers.test.js

@@ -0,0 +1,98 @@
+import { describe, it, expect } from 'vitest';
+import { parseCodexOutput, parseClaudeOutput } from '../parsers.js';
+describe('parseCodexOutput', () => {
+    it('should parse basic Codex output with message and session_id', () => {
+        const output = `
+{"type":"thread.started","thread_id":"test-session-id"}
+{"type":"turn.started"}
+{"type":"item.completed","item":{"type":"agent_message","text":"Hello world"}}
+{"type":"turn.completed"}
+`;
+        const result = parseCodexOutput(output);
+        expect(result).toEqual({
+            message: "Hello world",
+            session_id: "test-session-id",
+            token_count: null,
+            tools: undefined
+        });
+    });
+    it('should extract MCP tool calls', () => {
+        const output = `
+{"type":"thread.started","thread_id":"tool-test-id"}
+{"type":"turn.started"}
+{"type":"item.completed","item":{"id":"item_1","type":"mcp_tool_call","server":"acm","tool":"run","arguments":{"model":"gemini-2.5-flash","prompt":"hi"},"result":{"content":[{"text":"started","type":"text"}]},"status":"completed"}}
+{"type":"item.completed","item":{"type":"agent_message","text":"Tool executed"}}
+{"type":"turn.completed"}
+`;
+        const result = parseCodexOutput(output);
+        expect(result.message).toBe("Tool executed");
+        expect(result.session_id).toBe("tool-test-id");
+        expect(result.tools).toHaveLength(1);
+        expect(result.tools[0]).toEqual({
+            tool: "run",
+            server: "acm",
+            input: { model: "gemini-2.5-flash", prompt: "hi" },
+            output: { content: [{ text: "started", type: "text" }] }
+        });
+    });
+    it('should handle multiple tool calls', () => {
+        const output = `
+{"type":"item.completed","item":{"type":"mcp_tool_call","tool":"tool1","arguments":{"arg":1},"result":"res1"}}
+{"type":"item.completed","item":{"type":"mcp_tool_call","tool":"tool2","arguments":{"arg":2},"result":"res2"}}
+`;
+        const result = parseCodexOutput(output);
+        expect(result.tools).toHaveLength(2);
+        expect(result.tools[0].tool).toBe("tool1");
+        expect(result.tools[1].tool).toBe("tool2");
+    });
+    it('should return null for empty input', () => {
+        expect(parseCodexOutput("")).toBeNull();
+    });
+    it('should handle invalid JSON gracefully', () => {
+        const output = `
+{"type":"valid"}
+INVALID_JSON
+{"type":"item.completed","item":{"type":"agent_message","text":"Still parses valid lines"}}
+`;
+        const result = parseCodexOutput(output);
+        expect(result.message).toBe("Still parses valid lines");
+    });
+});
+describe('parseClaudeOutput', () => {
+    it('should parse legacy JSON output', () => {
+        const output = JSON.stringify({
+            content: [{ type: 'text', text: 'Hello' }]
+        });
+        const result = parseClaudeOutput(output);
+        expect(result).toEqual({
+            content: [{ type: 'text', text: 'Hello' }]
+        });
+    });
+    it('should parse stream-json (NDJSON) output', () => {
+        const output = `
+{"type":"system","session_id":"test-claude-session"}
+{"type":"assistant","message":{"content":[{"type":"text","text":"Thinking..."}]}}
+{"type":"assistant","message":{"content":[{"type":"tool_use","id":"call_1","name":"mcp__acm__run","input":{"prompt":"hi"}}]}}
+{"type":"user","message":{"content":[{"type":"tool_result","tool_use_id":"call_1","content":"done"}]}}
+{"type":"result","result":"Final Answer","is_error":false}
+`;
+        const result = parseClaudeOutput(output);
+        expect(result.message).toBe("Final Answer");
+        expect(result.session_id).toBe("test-claude-session");
+        expect(result.tools).toHaveLength(1);
+        expect(result.tools[0]).toEqual({
+            tool: "mcp__acm__run",
+            input: { prompt: "hi" },
+            output: "done"
+        });
+    });
+    it('should handle invalid NDJSON lines gracefully', () => {
+        const output = `
+{"type":"system"}
+INVALID_LINE
+{"type":"result","result":"Success"}
+`;
+        const result = parseClaudeOutput(output);
+        expect(result.message).toBe("Success");
+    });
+});

package/dist/__tests__/server.test.js

@@ -652,7 +652,7 @@ describe('ClaudeCodeServer Unit Tests', () => {
                 }
             });
             // Verify spawn was called with resolved model name
-            expect(mockSpawn).toHaveBeenCalledWith(expect.any(String), expect.arrayContaining(['--model', 'claude-3-5-haiku-20241022']), expect.any(Object));
+            expect(mockSpawn).toHaveBeenCalledWith(expect.any(String), expect.arrayContaining(['--model', 'haiku']), expect.any(Object));
             // Verify PID is returned
             expect(result.content[0].text).toContain('"pid": 12345');
         });

package/dist/parsers.js

@@ -10,6 +10,7 @@ export function parseCodexOutput(stdout) {
         let lastMessage = null;
         let tokenCount = null;
         let threadId = null;
+        const tools = [];
         for (const line of lines) {
             if (line.trim()) {
                 try {
@@ -29,6 +30,22 @@ export function parseCodexOutput(stdout) {
                     else if (parsed.msg?.type === 'token_count') {
                         tokenCount = parsed.msg;
                     }
+                    else if (parsed.type === 'item.completed' && parsed.item?.type === 'mcp_tool_call') {
+                        tools.push({
+                            server: parsed.item.server,
+                            tool: parsed.item.tool,
+                            input: parsed.item.arguments, // Map arguments to input to match common patterns
+                            output: parsed.item.result
+                        });
+                    }
+                    else if (parsed.type === 'item.completed' && parsed.item?.type === 'command_execution') {
+                        tools.push({
+                            tool: 'command_execution',
+                            input: { command: parsed.item.command },
+                            output: parsed.item.aggregated_output,
+                            exit_code: parsed.item.exit_code
+                        });
+                    }
                 }
                 catch (e) {
                     // Skip invalid JSON lines
@@ -36,11 +53,12 @@ export function parseCodexOutput(stdout) {
                 }
             }
         }
-        if (lastMessage || tokenCount || threadId) {
+        if (lastMessage || tokenCount || threadId || tools.length > 0) {
             return {
                 message: lastMessage,
                 token_count: tokenCount,
-                session_id: threadId
+                session_id: threadId,
+                tools: tools.length > 0 ? tools : undefined
             };
         }
     }
@@ -50,18 +68,86 @@ export function parseCodexOutput(stdout) {
     return null;
 }
 /**
- * Parse Claude JSON output
+ * Parse Claude Output (supports both JSON and stream-json/NDJSON)
  */
 export function parseClaudeOutput(stdout) {
     if (!stdout)
         return null;
+    // First try parsing as a single JSON object (backward compatibility)
     try {
         return JSON.parse(stdout);
     }
     catch (e) {
-        debugLog(`[Debug] Failed to parse Claude JSON output: ${e}`);
+        // If not valid single JSON, proceed to parse as NDJSON
+    }
+    try {
+        const lines = stdout.trim().split('\n');
+        let lastMessage = null;
+        let sessionId = null;
+        const toolsMap = new Map(); // Map by tool_use id for matching results
+        for (const line of lines) {
+            if (!line.trim())
+                continue;
+            try {
+                const parsed = JSON.parse(line);
+                // Extract session ID from any message that has it
+                if (parsed.session_id) {
+                    sessionId = parsed.session_id;
+                }
+                // Extract final result message
+                if (parsed.type === 'result' && parsed.result) {
+                    lastMessage = parsed.result;
+                }
+                // Extract tool usage from assistant messages
+                if (parsed.type === 'assistant' && parsed.message?.content) {
+                    for (const content of parsed.message.content) {
+                        if (content.type === 'tool_use') {
+                            toolsMap.set(content.id, {
+                                tool: content.name,
+                                input: content.input,
+                                output: null // Will be filled when tool_result is found
+                            });
+                        }
+                    }
+                }
+                // Match tool results from user messages
+                if (parsed.type === 'user' && parsed.message?.content) {
+                    for (const content of parsed.message.content) {
+                        if (content.type === 'tool_result' && content.tool_use_id) {
+                            const tool = toolsMap.get(content.tool_use_id);
+                            if (tool) {
+                                // Extract text from content array
+                                if (Array.isArray(content.content)) {
+                                    const textContent = content.content.find((c) => c.type === 'text');
+                                    tool.output = textContent?.text || null;
+                                }
+                                else {
+                                    tool.output = content.content;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                debugLog(`[Debug] Skipping invalid JSON line in Claude output: ${line}`);
+            }
+        }
+        // Convert Map to array
+        const tools = Array.from(toolsMap.values());
+        if (lastMessage || sessionId || tools.length > 0) {
+            return {
+                message: lastMessage, // This is the final result text
+                session_id: sessionId,
+                tools: tools.length > 0 ? tools : undefined
+            };
+        }
+    }
+    catch (e) {
+        debugLog(`[Debug] Failed to parse Claude NDJSON output: ${e}`);
         return null;
     }
+    return null;
 }
 /**
  * Parse Gemini JSON output

package/dist/server.js

@@ -12,12 +12,11 @@ import { parseCodexOutput, parseClaudeOutput, parseGeminiOutput } from './parser
 const SERVER_VERSION = "2.2.0";
 // Model alias mappings for user-friendly model names
 const MODEL_ALIASES = {
-    'haiku': 'claude-3-5-haiku-20241022',
     'claude-ultra': 'opus',
-    'codex-ultra': 'gpt-5.2-codex',
+    'codex-ultra': 'gpt-5.3-codex',
     'gemini-ultra': 'gemini-3-pro-preview'
 };
-const ALLOWED_REASONING_EFFORTS = new Set(['low', 'medium', 'high']);
+const ALLOWED_REASONING_EFFORTS = new Set(['low', 'medium', 'high', 'xhigh']);
 function getReasoningEffort(model, rawValue) {
     if (typeof rawValue !== 'string') {
         return '';
@@ -28,7 +27,7 @@ function getReasoningEffort(model, rawValue) {
     }
     const normalized = trimmed.toLowerCase();
     if (!ALLOWED_REASONING_EFFORTS.has(normalized)) {
-        throw new McpError(ErrorCode.InvalidParams, `Invalid reasoning_effort: ${rawValue}. Allowed values: low, medium, high.`);
+        throw new McpError(ErrorCode.InvalidParams, `Invalid reasoning_effort: ${rawValue}. Allowed values: low, medium, high, xhigh.`);
     }
     if (!model.startsWith('gpt-')) {
         throw new McpError(ErrorCode.InvalidParams, 'reasoning_effort is only supported for Codex models (gpt-*).');
@@ -269,7 +268,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", "opus", "haiku", "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-pro-preview", "gemini-3-flash-preview"
 
 **Prompt input**: You must provide EITHER prompt (string) OR prompt_file (file path), but not both.
 
@@ -297,11 +296,11 @@ export class ClaudeCodeServer {
                             },
                             model: {
                                 type: 'string',
-                                description: 'The model to use. Aliases: "claude-ultra", "codex-ultra" (auto high-reasoning), "gemini-ultra". Standard: "sonnet", "opus", "haiku", "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-pro-preview", "gemini-3-flash-preview", etc.',
                             },
                             reasoning_effort: {
                                 type: 'string',
-                                description: 'Codex only. Sets model_reasoning_effort. Allowed: "low", "medium", "high".',
+                                description: 'Codex only. Sets model_reasoning_effort. Allowed: "low", "medium", "high", "xhigh".',
                             },
                             session_id: {
                                 type: 'string',
@@ -329,6 +328,10 @@ export class ClaudeCodeServer {
                                 type: 'number',
                                 description: 'The process ID returned by run tool.',
                             },
+                            verbose: {
+                                type: 'boolean',
+                                description: 'Optional: If true, returns detailed execution information including tool usage history. Defaults to false.',
+                            }
                         },
                         required: ['pid'],
                     },
@@ -454,7 +457,7 @@ export class ClaudeCodeServer {
         // Special handling for codex-ultra: default to high reasoning effort if not specified
         let reasoningEffortArg = toolArguments.reasoning_effort;
         if (rawModel === 'codex-ultra' && !reasoningEffortArg) {
-            reasoningEffortArg = 'high';
+            reasoningEffortArg = 'xhigh';
         }
         const reasoningEffort = getReasoningEffort(resolvedModel, reasoningEffortArg);
         let agent;
@@ -506,7 +509,7 @@ export class ClaudeCodeServer {
         else {
             // Handle Claude (default)
             cliPath = this.claudeCliPath;
-            processArgs = ['--dangerously-skip-permissions', '--output-format', 'json'];
+            processArgs = ['--dangerously-skip-permissions', '--output-format', 'stream-json', '--verbose'];
             // Add session_id if provided (Claude only)
             if (toolArguments.session_id && typeof toolArguments.session_id === 'string') {
                 processArgs.push('-r', toolArguments.session_id);
@@ -604,18 +607,20 @@ export class ClaudeCodeServer {
     /**
      * Helper to get process result object
      */
-    getProcessResultHelper(pid) {
+    getProcessResultHelper(pid, verbose = false) {
         const process = processManager.get(pid);
         if (!process) {
             throw new McpError(ErrorCode.InvalidParams, `Process with PID ${pid} not found`);
         }
         // Parse output based on agent type
         let agentOutput = null;
-        if (process.stdout) {
-            if (process.toolType === 'codex') {
-                agentOutput = parseCodexOutput(process.stdout);
-            }
-            else if (process.toolType === 'claude') {
+        if (process.toolType === 'codex') {
+            // Codex may output structured logs to stderr
+            const combinedOutput = (process.stdout || '') + '\n' + (process.stderr || '');
+            agentOutput = parseCodexOutput(combinedOutput);
+        }
+        else if (process.stdout) {
+            if (process.toolType === 'claude') {
                 agentOutput = parseClaudeOutput(process.stdout);
             }
             else if (process.toolType === 'gemini') {
@@ -635,7 +640,14 @@ export class ClaudeCodeServer {
         };
         // If we have valid output from agent, include it
         if (agentOutput) {
-            response.agentOutput = agentOutput;
+            // Filter out tools if not verbose
+            if (!verbose && agentOutput.tools) {
+                const { tools, ...rest } = agentOutput;
+                response.agentOutput = rest;
+            }
+            else {
+                response.agentOutput = agentOutput;
+            }
             // Extract session_id if available
             if (agentOutput.session_id) {
                 response.session_id = agentOutput.session_id;
@@ -656,7 +668,8 @@ export class ClaudeCodeServer {
             throw new McpError(ErrorCode.InvalidParams, 'Missing or invalid required parameter: pid');
         }
         const pid = toolArguments.pid;
-        const response = this.getProcessResultHelper(pid);
+        const verbose = !!toolArguments.verbose;
+        const response = this.getProcessResultHelper(pid, verbose);
         return {
             content: [{
                     type: 'text',
@@ -706,8 +719,8 @@ export class ClaudeCodeServer {
         catch (error) {
             throw new McpError(ErrorCode.InternalError, error.message);
         }
-        // Collect results
-        const results = pids.map(pid => this.getProcessResultHelper(pid));
+        // Collect results (verbose=false for wait)
+        const results = pids.map(pid => this.getProcessResultHelper(pid, false));
         return {
             content: [{
                     type: 'text',