claude-code-conductor 2.49.0__tar.gz → 2.50.0__tar.gz

{claude_code_conductor-2.49.0 → claude_code_conductor-2.50.0}/.claude/docs/platform-adapters.md

@@ -11,7 +11,7 @@ C3 は **Claude Code** を canonical platform として設計されているが
 - 動作差分のまとめ
 
 を一箇所にまとめたリファレンス。実装は `src/c3/adapters.py` / `src/c3/mcp_server.py` /
-`src/c3/cli_ask.py` / `src/c3/platforms.py` を参照。
+`src/c3/cli_ask.py` / `src/c3/platforms.py` / `src/c3/cli_doctor.py` を参照。
 
 ---
 
@@ -92,6 +92,9 @@ python -m c3.mcp_server
 `C3_PROJECT_ROOT` 環境変数でプロジェクトルートを指定可能（adapter 生成時に自動設定）。
 ソースインストール時は `PYTHONPATH` も adapter が `<repo>/src` に設定する。
 
+生成される `.codex/config.toml` / `.cursor/mcp.json` の `command` は `python` ではなく、
+adapter 生成時点の `sys.executable`（絶対パス）を書き込む。理由は「7. 既知の制限」を参照。
+
 ---
 
 ## 4. `c3 ask` CLI fallback
@@ -178,3 +181,11 @@ Claude Code / Codex / Cursor / OpenCode が同じプロジェクトを行き来
 - **OpenCode の `AskUserQuestion`**: OpenCode adapter は MCP 設定を生成しないため、`c3_ask_user_question` ツールは使わず `AGENTS.md` の指示に従ってユーザーへ直接確認する。`multiSelect: true` は「複数選択の質問」として維持するよう指示済み
 - **OpenCode の `tools` 制限**: 生成される agent には一律で `bash/read/edit/write/websearch` を付与する。Claude 側 frontmatter の細かな `tools` 制限は反映されない（C3 の `code-reviewer` / `security-reviewer` は Claude 側でもレポート出力のため `write` を持つ）
 - **改行コード**: adapter 生成ファイルは LF 改行で書き出す（`newline="\n"`）。`.gitattributes` で `eol=lf` を固定済み
+- **Codex の trust 要件**: プロジェクトが Codex に trust されていない場合、`.codex/config.toml` は**エラーなしで無視**される（Codex 公式仕様）。MCP サーバーが読み込まれず `AskUserQuestion` が動かない場合は、まず対象プロジェクトを Codex 側で trust 済みか確認する（Codex CLI: 初回起動時のプロンプトで trust するか、設定で許可済みディレクトリに追加する）
+- **MCP `command` の絶対パス化**: adapter が書き込む `command` は `python` ではなく `sys.executable`（adapter 生成時の絶対パス）を使う。理由:
+  - macOS 12.3 以降、無印 `python` は標準に存在しない（`python3` のみ。Homebrew も同様）。`command: "python"` のままだと Codex が MCP spawn 時に program not found となり、「起動時にエラーで読み込まれない」症状になる
+  - `python` が PATH 上にあっても、pipx / venv などの隔離環境では `No module named c3` で起動失敗することがある
+  - GUI 起動の Codex（Desktop / IDE 拡張）はシェルの PATH を継承しないことがある（最小 PATH）
+  - 代案の「POSIX では `python3` にする」は不採用: 無印 python 不在の問題しか救えず、pipx 隔離や GUI PATH 最小の問題には無力なため
+  - `c3 doctor --platform codex|cursor` は生成済み config から `command` を読み取り、実行可能か・`<command> -c "import c3"` が成功するかを自己診断する
+- **adapter 生成物はマシン固有**: `command` に埋め込む `sys.executable` は生成したマシン・環境（venv / pipx / システム Python）に依存する絶対パスであるため、adapter 生成物（`.codex/config.toml` / `.cursor/mcp.json` など）はチームで共有せず、各マシンで `c3 init --platform <p>` または `c3 update --platform <p>` を実行して再生成する運用とする

{claude_code_conductor-2.49.0 → claude_code_conductor-2.50.0}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [2.50.0] - 2026-07-17
+
+### 修正
+
+- **MCP 設定の `command` を `sys.executable` 絶対パス化（Codex / Cursor adapter）**: 生成される `.codex/config.toml` / `.cursor/mcp.json` の `command` が `"python"` ハードコードだったため、無印 `python` が存在しない環境（macOS 12.3 以降の標準 / Homebrew）・pipx / venv 隔離（`No module named c3`）・GUI 起動の Codex（シェル PATH 非継承）で MCP サーバーが起動時エラーになり `c3_ask_user_question` が使えなかった問題を修正。`c3 init` / `c3 update --platform` を実行した Python の絶対パスを埋め込む（TOML は既存 `_toml_escape` でエスケープ）。X 上の実利用報告「Claude Code だと動くが Codex だと起動時にエラーで読み込まれない」が起点
+
+### 追加
+
+- **`c3 doctor` の MCP 起動自己診断**: 生成済み config（`.codex/config.toml` / `.cursor/mcp.json`）から `command` を読み取り、(a) 実行可能性 (b) `<command> -c "import c3"` の成否を検証する。失敗時は WARN と `c3 update --platform <p>` での再生成を案内。この種の環境起因の起動失敗を利用者が一発で自己診断できるようにした
+
+### 変更
+
+- `.claude/docs/platform-adapters.md` の「既知の制限」に、Codex の trust 要件（未 trust プロジェクトの `.codex/config.toml` は**エラーなしで無視**される・trust 手順）・`command` 絶対パス化の理由・adapter 生成物のマシン固有性（チームで共有せず各マシンで `c3 init/update --platform` 再生成する運用）を追記
+
+### 後方互換
+
+- 既存の生成済み config は次回 `c3 update --platform` 実行まで従来のまま。再生成すると `command` が実行環境の絶対パスに変わる（マシン固有・意図された挙動。チーム共有リポジトリでは各メンバーが自マシンで再生成する）。**破壊的変更なし**
+
 ## [2.49.0] - 2026-07-17
 
 ### 追加

{claude_code_conductor-2.49.0 → claude_code_conductor-2.50.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-conductor
-Version: 2.49.0
+Version: 2.50.0
 Summary: Multi-agent orchestration framework for Claude Code with Codex/Cursor adapters (C3)
 Project-URL: Homepage, https://github.com/satoh-y-0323/claude-code-conductor
 Project-URL: Repository, https://github.com/satoh-y-0323/claude-code-conductor

{claude_code_conductor-2.49.0 → claude_code_conductor-2.50.0}/src/c3/__init__.py

@@ -1,3 +1,3 @@
 """Claude Code Conductor (C3) - multi-agent orchestration framework for Claude Code."""
 
-__version__ = "2.49.0"
+__version__ = "2.50.0"

{claude_code_conductor-2.49.0 → claude_code_conductor-2.50.0}/src/c3/adapters.py

@@ -223,7 +223,7 @@ def _write_cursor_mcp(target_root: Path, *, dry_run: bool) -> list[AdapterAction
     if pythonpath is not None:
         env["PYTHONPATH"] = str(pythonpath)
     servers["c3"] = {
-        "command": "python",
+        "command": sys.executable,
         "args": ["-m", "c3.mcp_server"],
         "env": env,
     }
@@ -331,7 +331,7 @@ tool, read the matching generated Codex skill from `.agents/skills/<name>/SKILL.
 def _codex_config_section() -> str:
     lines = [
         "[mcp_servers.c3]",
-        'command = "python"',
+        f'command = "{_toml_escape(sys.executable)}"',
         'args = ["-m", "c3.mcp_server"]',
         "startup_timeout_sec = 10",
         "tool_timeout_sec = 600",

{claude_code_conductor-2.49.0 → claude_code_conductor-2.50.0}/src/c3/cli_doctor.py

@@ -4,7 +4,9 @@ from __future__ import annotations
 
 import argparse
 import json
+import re
 import shutil
+import subprocess
 from pathlib import Path
 
 from c3._terminal import supports_color as _supports_color
@@ -15,6 +17,8 @@ _OK = "OK"
 _WARN = "WARN"
 _ERR = "ERR"
 
+_MCP_STARTUP_TIMEOUT_SEC = 10
+
 
 def register(subparsers: argparse._SubParsersAction) -> None:
     parser = subparsers.add_parser(
@@ -111,6 +115,9 @@ def _check_codex_adapter() -> list[tuple[str, str, str]]:
     findings.append(_dir_or_warn(".agents/skills", skills, "run `c3 init --platform codex`"))
     findings.append(_file_or_warn(".codex/config.toml", config, "run `c3 init --platform codex`"))
     findings.append(_dir_or_warn(".codex/agents", custom_agents, "run `c3 init --platform codex`"))
+    if config.is_file():
+        command = _extract_codex_mcp_command(config.read_text(encoding="utf-8"))
+        findings.append(_check_mcp_command_startup("codex MCP startup", command, "codex"))
     codex = shutil.which("codex")
     if codex is None:
         findings.append((_WARN, "codex binary", "not on PATH; install Codex CLI to use the adapter"))
@@ -147,6 +154,9 @@ def _check_cursor_adapter() -> list[tuple[str, str, str]]:
     mcp = root / ".cursor" / "mcp.json"
     findings.append(_file_or_warn(".cursor/rules/c3-core.mdc", rule, "run `c3 init --platform cursor`"))
     findings.append(_file_or_warn(".cursor/mcp.json", mcp, "run `c3 init --platform cursor`"))
+    if mcp.is_file():
+        command = _extract_cursor_mcp_command(mcp.read_text(encoding="utf-8"))
+        findings.append(_check_mcp_command_startup("cursor MCP startup", command, "cursor"))
     cursor = shutil.which("cursor-agent") or shutil.which("cursor")
     if cursor is None:
         findings.append((_WARN, "cursor binary", "not on PATH; install Cursor CLI/editor to use the adapter"))
@@ -155,6 +165,73 @@ def _check_cursor_adapter() -> list[tuple[str, str, str]]:
     return findings
 
 
+def _extract_codex_mcp_command(config_text: str) -> str | None:
+    """Read the ``command`` value from the ``[mcp_servers.c3]`` table.
+
+    Uses a targeted regex rather than a full TOML parser: ``tomllib`` is only
+    available from Python 3.11 while C3 supports 3.10+, and the generated
+    config is always a single-line ``key = "value"`` pair under the section.
+    """
+    match = re.search(
+        r'(?ms)^\[mcp_servers\.c3\]\s*$.*?^command\s*=\s*"((?:[^"\\]|\\.)*)"',
+        config_text,
+    )
+    if match is None:
+        return None
+    return match.group(1).replace('\\"', '"').replace("\\\\", "\\")
+
+
+def _extract_cursor_mcp_command(mcp_json_text: str) -> str | None:
+    try:
+        payload = json.loads(mcp_json_text)
+    except json.JSONDecodeError:
+        return None
+    if not isinstance(payload, dict):
+        return None
+    servers = payload.get("mcpServers")
+    if not isinstance(servers, dict):
+        return None
+    c3 = servers.get("c3")
+    if not isinstance(c3, dict):
+        return None
+    command = c3.get("command")
+    return command if isinstance(command, str) else None
+
+
+def _check_mcp_command_startup(
+    label: str, command: str | None, platform: str
+) -> tuple[str, str, str]:
+    """Verify that the generated MCP ``command`` can actually launch and import c3."""
+    hint = f"run `c3 update --platform {platform}` to regenerate"
+    if not command:
+        return _WARN, label, f"command not found in generated config; {hint}"
+
+    resolvable = (Path(command).is_absolute() and Path(command).is_file()) or (
+        shutil.which(command) is not None
+    )
+    if not resolvable:
+        return _WARN, label, f"command not executable: {command}; {hint}"
+
+    try:
+        result = subprocess.run(
+            [command, "-c", "import c3"],
+            capture_output=True,
+            text=True,
+            timeout=_MCP_STARTUP_TIMEOUT_SEC,
+        )
+    except (OSError, subprocess.TimeoutExpired) as exc:
+        return _WARN, label, f"failed to launch {command}: {exc}; {hint}"
+
+    if result.returncode != 0:
+        detail = next(
+            (line for line in reversed(result.stderr.strip().splitlines()) if line.strip()),
+            "import c3 failed",
+        )
+        return _WARN, label, f'`{command} -c "import c3"` failed: {detail}; {hint}'
+
+    return _OK, label, f"{command} -c \"import c3\" succeeded"
+
+
 def _file_or_warn(label: str, path: Path, hint: str) -> tuple[str, str, str]:
     if path.is_file():
         return _OK, label, str(path)

{claude_code_conductor-2.49.0 → claude_code_conductor-2.50.0}/tests/test_adapters.py

@@ -58,6 +58,48 @@ def test_toml_multiline_escape_keeps_newlines():
     assert _toml_multiline_escape(text) == text
 
 
+# ----------------------------------------------------------------------
+# MCP `command` resolution — absolute sys.executable, not bare "python"
+# ----------------------------------------------------------------------
+
+
+def test_codex_config_section_uses_absolute_sys_executable(monkeypatch):
+    monkeypatch.setattr(adapters.sys, "executable", r"C:\Python312\python.exe")
+
+    section = adapters._codex_config_section()
+
+    assert 'command = "C:\\\\Python312\\\\python.exe"' in section
+    assert 'command = "python"' not in section
+
+
+def test_codex_config_section_escapes_plain_posix_executable(monkeypatch):
+    monkeypatch.setattr(adapters.sys, "executable", "/usr/bin/python3")
+
+    section = adapters._codex_config_section()
+
+    assert 'command = "/usr/bin/python3"' in section
+
+
+def test_write_codex_config_writes_absolute_windows_command(tmp_path: Path, monkeypatch):
+    monkeypatch.setattr(adapters.sys, "executable", r"C:\Users\dev\venv\Scripts\python.exe")
+
+    adapters._write_codex_config(tmp_path, dry_run=False)
+
+    config_text = (tmp_path / ".codex" / "config.toml").read_text(encoding="utf-8")
+    assert 'command = "C:\\\\Users\\\\dev\\\\venv\\\\Scripts\\\\python.exe"' in config_text
+
+
+def test_write_cursor_mcp_uses_absolute_sys_executable(tmp_path: Path, monkeypatch):
+    monkeypatch.setattr(adapters.sys, "executable", r"C:\Python312\python.exe")
+
+    adapters._write_cursor_mcp(tmp_path, dry_run=False)
+
+    payload = json.loads((tmp_path / ".cursor" / "mcp.json").read_text(encoding="utf-8"))
+    command = payload["mcpServers"]["c3"]["command"]
+    assert command == r"C:\Python312\python.exe"
+    assert Path(command).is_absolute()
+
+
 # ----------------------------------------------------------------------
 # _convert_skill
 # ----------------------------------------------------------------------
@@ -178,7 +220,8 @@ def test_write_cursor_mcp_creates_file_when_missing(tmp_path: Path):
     actions = _write_cursor_mcp(target, dry_run=False)
     assert any(a.action == "add" for a in actions)
     payload = json.loads((target / ".cursor" / "mcp.json").read_text(encoding="utf-8"))
-    assert payload["mcpServers"]["c3"]["command"] == "python"
+    assert payload["mcpServers"]["c3"]["command"] == sys.executable
+    assert Path(payload["mcpServers"]["c3"]["command"]).is_absolute()
 
 
 def test_write_cursor_mcp_rejects_invalid_json(tmp_path: Path):

{claude_code_conductor-2.49.0 → claude_code_conductor-2.50.0}/tests/test_cli_doctor.py

@@ -7,6 +7,8 @@ in handle() for opencode, codex, and cursor platforms.
 from __future__ import annotations
 
 import argparse
+import subprocess
+import sys
 from pathlib import Path
 
 import c3.cli_doctor as cli_doctor
@@ -181,3 +183,169 @@ def test_check_opencode_adapter_reports_binary_present(tmp_path: Path, monkeypat
         status == _OK and "opencode binary" in label and fake_path in detail
         for status, label, detail in findings
     ), f"Expected OK for 'opencode binary' with path, got: {findings}"
+
+
+# ---------------------------------------------------------------------------
+# MCP startup self-diagnostic — _check_mcp_command_startup
+# ---------------------------------------------------------------------------
+
+
+def test_check_mcp_command_startup_ok_when_import_succeeds(monkeypatch):
+    """When the resolved command can `import c3`, the check must return OK."""
+    monkeypatch.setattr(
+        cli_doctor.subprocess,
+        "run",
+        lambda *a, **k: subprocess.CompletedProcess(a[0], 0, stdout="", stderr=""),
+    )
+
+    status, label, detail = cli_doctor._check_mcp_command_startup(
+        "codex MCP startup", sys.executable, "codex"
+    )
+
+    assert status == _OK
+    assert "codex MCP startup" == label
+    assert "import c3" in detail
+
+
+def test_check_mcp_command_startup_warns_when_command_missing():
+    """When the config has no `command` value at all, the check must WARN."""
+    status, label, detail = cli_doctor._check_mcp_command_startup(
+        "codex MCP startup", None, "codex"
+    )
+
+    assert status == _WARN
+    assert "not found" in detail
+    assert "c3 update --platform codex" in detail
+
+
+def test_check_mcp_command_startup_warns_when_command_not_resolvable(monkeypatch):
+    """When the command path/binary cannot be located at all, the check must WARN
+    without attempting to spawn a subprocess."""
+    monkeypatch.setattr(cli_doctor.shutil, "which", lambda name: None)
+    called = []
+    monkeypatch.setattr(
+        cli_doctor.subprocess,
+        "run",
+        lambda *a, **k: called.append(a) or subprocess.CompletedProcess(a[0], 0),
+    )
+
+    status, label, detail = cli_doctor._check_mcp_command_startup(
+        "cursor MCP startup", "/nonexistent/path/to/python", "cursor"
+    )
+
+    assert status == _WARN
+    assert "not executable" in detail
+    assert "c3 update --platform cursor" in detail
+    assert called == []
+
+
+def test_check_mcp_command_startup_warns_when_import_c3_fails(monkeypatch):
+    """When the resolved command runs but `import c3` fails (e.g. an isolated
+    venv/pipx environment without c3 installed), the check must WARN."""
+    monkeypatch.setattr(
+        cli_doctor.subprocess,
+        "run",
+        lambda *a, **k: subprocess.CompletedProcess(
+            a[0], 1, stdout="", stderr="ModuleNotFoundError: No module named 'c3'"
+        ),
+    )
+
+    status, label, detail = cli_doctor._check_mcp_command_startup(
+        "codex MCP startup", sys.executable, "codex"
+    )
+
+    assert status == _WARN
+    assert "No module named" in detail
+    assert "c3 update --platform codex" in detail
+
+
+def test_check_mcp_command_startup_warns_when_launch_raises(monkeypatch):
+    """When subprocess.run itself raises (e.g. the binary vanished between the
+    resolvability check and the launch), the check must WARN, not raise."""
+    def _boom(*a, **k):
+        raise FileNotFoundError("no such file")
+
+    monkeypatch.setattr(cli_doctor.subprocess, "run", _boom)
+
+    status, label, detail = cli_doctor._check_mcp_command_startup(
+        "codex MCP startup", sys.executable, "codex"
+    )
+
+    assert status == _WARN
+    assert "failed to launch" in detail
+
+
+# ---------------------------------------------------------------------------
+# command extraction from generated adapter configs
+# ---------------------------------------------------------------------------
+
+
+def test_extract_codex_mcp_command_reads_absolute_windows_path():
+    config_text = (
+        "[mcp_servers.c3]\n"
+        'command = "C:\\\\Python312\\\\python.exe"\n'
+        'args = ["-m", "c3.mcp_server"]\n'
+    )
+
+    command = cli_doctor._extract_codex_mcp_command(config_text)
+
+    assert command == r"C:\Python312\python.exe"
+
+
+def test_extract_codex_mcp_command_none_when_section_missing():
+    assert cli_doctor._extract_codex_mcp_command("[some_other_table]\nfoo = 1\n") is None
+
+
+def test_extract_cursor_mcp_command_reads_absolute_path():
+    mcp_json = '{"mcpServers": {"c3": {"command": "/usr/bin/python3", "args": []}}}'
+
+    command = cli_doctor._extract_cursor_mcp_command(mcp_json)
+
+    assert command == "/usr/bin/python3"
+
+
+def test_extract_cursor_mcp_command_none_when_invalid_json():
+    assert cli_doctor._extract_cursor_mcp_command("{not valid") is None
+
+
+# ---------------------------------------------------------------------------
+# integration — _check_codex_adapter / _check_cursor_adapter wire the
+# self-diagnostic in using the real, currently-running interpreter
+# ---------------------------------------------------------------------------
+
+
+def test_check_codex_adapter_includes_ok_mcp_startup_with_real_interpreter(
+    tmp_path: Path, monkeypatch
+):
+    """End-to-end: generate a real adapter config pointed at sys.executable
+    (which does have c3 importable under the sandbox PYTHONPATH) and confirm
+    the doctor wires the self-diagnostic in as OK."""
+    (tmp_path / ".claude").mkdir()
+    monkeypatch.chdir(tmp_path)
+    from c3.adapters import _write_codex_config
+
+    _write_codex_config(tmp_path, dry_run=False)
+
+    findings = cli_doctor._check_codex_adapter()
+
+    assert any(
+        status == _OK and label == "codex MCP startup"
+        for status, label, _ in findings
+    ), f"Expected OK codex MCP startup finding, got: {findings}"
+
+
+def test_check_cursor_adapter_includes_ok_mcp_startup_with_real_interpreter(
+    tmp_path: Path, monkeypatch
+):
+    (tmp_path / ".claude").mkdir()
+    monkeypatch.chdir(tmp_path)
+    from c3.adapters import _write_cursor_mcp
+
+    _write_cursor_mcp(tmp_path, dry_run=False)
+
+    findings = cli_doctor._check_cursor_adapter()
+
+    assert any(
+        status == _OK and label == "cursor MCP startup"
+        for status, label, _ in findings
+    ), f"Expected OK cursor MCP startup finding, got: {findings}"