aiterm-mcp 0.10.0 → 0.11.0

package/README.md

@@ -60,11 +60,11 @@ One call per model, so the tool name itself tells you which model you get:
 
 | Tool | Launches | Key args |
 | --- | --- | --- |
-| `codex_agent` | Codex CLI (OpenAI; the CLI's default model) | `prompt?`, `reasoning_effort?`, `cwd?`, `session_name?`, `agent_done?`, `wait?`, `timeout?`, `screen?`, `lines?` |
-| `grok_agent` | Grok Build, model `grok-build` (xAI) | `prompt?`, `reasoning_effort?` (`low`/`medium`/`high`/`xhigh`/`max`), `cwd?`, `session_name?`, `agent_done?` |
-| `composer_agent` | Grok Build, model `grok-composer-2.5-fast` (xAI) | same as `grok_agent` |
+| `codex_agent` | Codex CLI (OpenAI; terminal config/CLI default unless overridden) | `prompt?`, `model?`, `reasoning_effort?` (`low`/`medium`/`high`/`xhigh`/`max`/`ultra`; ultra enables proactive automatic delegation), `cwd?`, `session_name?`, `agent_done?`, `wait?`, `timeout?`, `screen?`, `lines?` |
+| `grok_agent` | Grok Build, model `grok-4.5` by default (`model?` overrides) (xAI) | `prompt?`, `model?`, `reasoning_effort?` unsupported (an explicit value is an error; Grok CLI `--effort` is headless-only), `cwd?`, `session_name?`, `agent_done?` |
+| `composer_agent` | Grok Build, model `grok-composer-2.5-fast` by default (`model?` overrides) (xAI) | `prompt?`, `model?`, `reasoning_effort?` unsupported (an explicit value is an error), `cwd?`, `session_name?`, `agent_done?` |
 
-The vendor CLI must be installed and authenticated (`codex` for `codex_agent`; `grok` for both Grok tools). aiterm resolves the binary via `CODEX_BIN` / `GROK_BIN`, then `~/.local/bin/codex` / `~/.grok/bin/grok`, then `PATH`. Prerequisites are checked **before** a session exists: for `grok_agent` / `composer_agent` an out-of-range `reasoning_effort` is rejected up front (the value set is fixed — `low`/`medium`/`high`/`xhigh`/`max`); a missing CLI binary or a nonexistent `cwd` fails for all three. A rejected launch — bad `reasoning_effort`, an unresolvable binary, or a nonexistent `cwd` — leaves **zero leftover session** behind, and if the launch keystroke itself can't be delivered aiterm tears the session down. (Without an initial prompt wait, aiterm does *not* then verify the vendor CLI actually started or authenticated — read the session to confirm the agent came up.) (`codex_agent` forwards `reasoning_effort` to the Codex CLI as a config override — `-c model_reasoning_effort=…` — rather than validating it, since Codex's accepted values vary by version.) Pass an absolute path for `cwd` — `~` is not expanded. `agent_done` uses launch-local managed vendor homes and does not edit your normal hook files; Codex links only `auth.json` and copies `config.toml` into its managed `CODEX_HOME`, while Grok/Composer additionally isolate `GROK_HOME` and `HOME` to suppress compat hook/plugin contamination. Grok OAuth uses the normal Grok home's `auth.json` and `auth.json.lock` as a pair so refresh locking does not split across sessions. Before the first unbound `pty_send({ wait: "agent_done" })`, aiterm waits for the vendor TUI's input prompt and fails before sending if the prompt is not ready, avoiding dropped startup input. `codex_agent` launcher `wait:"agent_done"` has the same requirement and is only valid with both `prompt` and `agent_done:true`; if the TUI is not ready, the prompt is not sent and the session is left inspectable with `initial_prompt=not_sent`. While an initial prompt is still `pending`/`sent`, ordinary `pty_send` is rejected to prevent mixed input; manual takeover can still use `pty_key`, or `pty_send(..., force:true)` if you intentionally want to type into that live TUI. `agent_done` currently requires POSIX filesystem semantics (`getuid`, secure temp files, hard-link checks), so it is supported on Linux, WSL2, and macOS; native Windows can still use the core PTY tools and agent launchers without `agent_done`.
+The vendor CLI must be installed and authenticated (`codex` for `codex_agent`; `grok` for both Grok tools). aiterm resolves the binary via `CODEX_BIN` / `GROK_BIN`, then `~/.local/bin/codex` / `~/.grok/bin/grok`, then `PATH`. Prerequisites are checked **before** a session exists: empty `model` values and any `reasoning_effort` for `grok_agent` / `composer_agent` are rejected up front; a missing CLI binary or a nonexistent `cwd` fails for all three. A rejected launch leaves **zero leftover session** behind, and if the launch keystroke itself can't be delivered aiterm tears the session down. (Without an initial prompt wait, aiterm does *not* then verify the vendor CLI actually started or authenticated — read the session to confirm the agent came up.) `codex_agent` forwards `model` as `-m` and `reasoning_effort` as `-c model_reasoning_effort=…` without validating the effort value, since Codex's accepted values vary by version. Grok/Composer reject `reasoning_effort`: Grok CLI `--effort` is only for headless `grok -p`, and the interactive TUI ignores it with a warning. Pass an absolute path for `cwd` — `~` is not expanded. Codex launch responses always report the effective model/effort and where each came from (argument, terminal-config inheritance, or CLI default), with an explicit warning when the effective effort is `ultra` (max reasoning plus proactive automatic delegation). `agent_done` uses launch-local managed vendor homes and does not edit your normal hook files; Codex links only `auth.json` and copies `config.toml` into its managed `CODEX_HOME` — explicitly passed `model` / `reasoning_effort` values also rewrite the matching top-level pins in that copy, so terminal pins don't silently leak into the child — while Grok/Composer additionally isolate `GROK_HOME` and `HOME` to suppress compat hook/plugin contamination. Grok OAuth uses the normal Grok home's `auth.json` and `auth.json.lock` as a pair so refresh locking does not split across sessions. Before the first unbound `pty_send({ wait: "agent_done" })`, aiterm waits for the vendor TUI's input prompt and fails before sending if the prompt is not ready, avoiding dropped startup input. `codex_agent` launcher `wait:"agent_done"` has the same requirement and is only valid with both `prompt` and `agent_done:true`; if the TUI is not ready, the prompt is not sent and the session is left inspectable with `initial_prompt=not_sent`. While an initial prompt is still `pending`/`sent`, ordinary `pty_send` is rejected to prevent mixed input; manual takeover can still use `pty_key`, or `pty_send(..., force:true)` if you intentionally want to type into that live TUI. `agent_done` currently requires POSIX filesystem semantics (`getuid`, secure temp files, hard-link checks), so it is supported on Linux, WSL2, and macOS; native Windows can still use the core PTY tools and agent launchers without `agent_done`.
 
 There is deliberately **no Claude launcher**, and no protocol between the agents: aiterm's job is to let your Claude (or any MCP client) reach for *other* agents and drive their terminals. Because a launched agent is just another persistent session, everything else in this README applies to it: token-reduced reads, completion detection, and a human `attach` to watch or take over.
 
@@ -219,11 +219,11 @@ Each launcher starts a specific vendor's interactive coding-agent TUI inside a f
 
 | Tool | Launches | Key args |
 | --- | --- | --- |
-| `codex_agent` | Codex CLI (OpenAI; the CLI's default model) | `prompt?`, `reasoning_effort?`, `cwd?`, `session_name?`, `agent_done?`, `wait?`, `timeout?`, `screen?`, `lines?` |
-| `grok_agent` | Grok Build, model `grok-build` (xAI) | `prompt?`, `reasoning_effort?` (`low`/`medium`/`high`/`xhigh`/`max`), `cwd?`, `session_name?`, `agent_done?` |
-| `composer_agent` | Grok Build, model `grok-composer-2.5-fast` (xAI) | same as `grok_agent` |
+| `codex_agent` | Codex CLI (OpenAI; terminal config/CLI default unless overridden) | `prompt?`, `model?`, `reasoning_effort?` (`low`/`medium`/`high`/`xhigh`/`max`/`ultra`; ultra enables proactive automatic delegation), `cwd?`, `session_name?`, `agent_done?`, `wait?`, `timeout?`, `screen?`, `lines?` |
+| `grok_agent` | Grok Build, model `grok-4.5` by default (`model?` overrides) (xAI) | `prompt?`, `model?`, `reasoning_effort?` unsupported (an explicit value is an error; Grok CLI `--effort` is headless-only), `cwd?`, `session_name?`, `agent_done?` |
+| `composer_agent` | Grok Build, model `grok-composer-2.5-fast` by default (`model?` overrides) (xAI) | `prompt?`, `model?`, `reasoning_effort?` unsupported (an explicit value is an error), `cwd?`, `session_name?`, `agent_done?` |
 
-The vendor CLI must be installed and authenticated (`codex` for `codex_agent`; `grok` for both Grok tools). aiterm resolves the binary via `CODEX_BIN` / `GROK_BIN`, then `~/.local/bin/codex` / `~/.grok/bin/grok`, then `PATH`. Prerequisites are validated before a session is created (grok/composer reject an out-of-range `reasoning_effort`; a missing CLI or a nonexistent `cwd` fails for all three), and a failed launch leaves no session behind. Full details under [Launch other coding agents into that terminal](#2-launch-other-coding-agents-into-that-terminal--the-orchestration-flagship). Pass an absolute path for `cwd` — `~` is not expanded. `agent_done` is hook-backed for agent launchers; Codex/Grok/Composer have passing live smokes on Linux/WSL2/macOS for follow-up `pty_send(wait:"agent_done")`, and Codex has a live smoke for launcher `prompt + wait:"agent_done"`. Native Windows can launch agents but `agent_done` is not supported yet. Codex managed `CODEX_HOME` links only `auth.json`, copies `config.toml`, and owns its own `hooks.json`. Before the first unbound agent send, `pty_send({ wait:"agent_done" })` waits for the vendor TUI input prompt and fails before sending if it is not ready. `codex_agent` launcher `wait:"agent_done"` requires `prompt` plus `agent_done:true`; it sends the initial prompt only after the TUI is ready, and returns `initial_prompt=not_sent` without sending if the TUI is blocked before input. In Grok OAuth mode, aiterm keeps hook/config isolation per launch but shares both `auth.json` and `auth.json.lock` with the normal Grok home; missing OAuth auth fails without leaving a session behind.
+The vendor CLI must be installed and authenticated (`codex` for `codex_agent`; `grok` for both Grok tools). aiterm resolves the binary via `CODEX_BIN` / `GROK_BIN`, then `~/.local/bin/codex` / `~/.grok/bin/grok`, then `PATH`. Prerequisites are validated before a session is created: empty `model` and any Grok/Composer `reasoning_effort` are errors, while a missing CLI or nonexistent `cwd` fails for all three; a failed launch leaves no session behind. Codex forwards `model` as `-m` and `reasoning_effort` as `-c model_reasoning_effort=…`; Grok/Composer reject effort because interactive TUI does not support it (Grok CLI `--effort` is headless-only). Full details under [Launch other coding agents into that terminal](#2-launch-other-coding-agents-into-that-terminal--the-orchestration-flagship). Pass an absolute path for `cwd` — `~` is not expanded. `agent_done` is hook-backed for agent launchers; Codex/Grok/Composer have passing live smokes on Linux/WSL2/macOS for follow-up `pty_send(wait:"agent_done")`, and Codex has a live smoke for launcher `prompt + wait:"agent_done"`. Native Windows can launch agents but `agent_done` is not supported yet. Codex managed `CODEX_HOME` links only `auth.json`, copies `config.toml`, and owns its own `hooks.json`. Before the first unbound agent send, `pty_send({ wait:"agent_done" })` waits for the vendor TUI input prompt and fails before sending if it is not ready. `codex_agent` launcher `wait:"agent_done"` requires `prompt` plus `agent_done:true`; it sends the initial prompt only after the TUI is ready, and returns `initial_prompt=not_sent` without sending if the TUI is blocked before input. In Grok OAuth mode, aiterm keeps hook/config isolation per launch but shares both `auth.json` and `auth.json.lock` with the normal Grok home; missing OAuth auth fails without leaving a session behind.
 
 ### Completion detection (5 layers)
 

package/dist/core.js

@@ -1050,7 +1050,61 @@ function createEmpty0600NoFollow(p) {
 function realCodexHome() {
     return process.env.CODEX_HOME || path.join(process.env.HOME ?? os.homedir(), ".codex");
 }
-function createManagedCodexHome(name, launchId) {
+// 引数で model/effort を渡された時は managed config のピンを上書きする（端末 config の
+// model/model_reasoning_effort ピン——例: effort=ultra は proactive 自動委譲 ON——が対話子へ
+// 黙って波及するのを防ぐ）。TOML の top-level キーは最初のテーブルヘッダより前にしか置けないため、
+// 既存行の除去は先頭領域に限定し、上書き行はファイル先頭へ置く。
+function applyCodexConfigOverrides(body, overrides) {
+    const lines = [];
+    if (overrides.model)
+        lines.push(`model = ${JSON.stringify(overrides.model)}`);
+    if (overrides.effort)
+        lines.push(`model_reasoning_effort = ${JSON.stringify(overrides.effort)}`);
+    if (!lines.length)
+        return body;
+    if (body == null)
+        return lines.join("\n") + "\n";
+    const rows = body.split(/\r?\n/);
+    let firstTable = rows.findIndex((l) => /^\s*\[/.test(l));
+    if (firstTable === -1)
+        firstTable = rows.length;
+    const head = rows.slice(0, firstTable).filter((l) => {
+        if (overrides.model && /^\s*model\s*=/.test(l))
+            return false;
+        if (overrides.effort && /^\s*model_reasoning_effort\s*=/.test(l))
+            return false;
+        return true;
+    });
+    let out = [...lines, ...head, ...rows.slice(firstTable)].join("\n");
+    if (!out.endsWith("\n"))
+        out += "\n";
+    return out;
+}
+function readCodexConfigPins(configPath) {
+    let body;
+    try {
+        body = fs.readFileSync(configPath, "utf8");
+    }
+    catch {
+        return { model: { present: false, value: null }, effort: { present: false, value: null } };
+    }
+    const rows = body.split(/\r?\n/);
+    let firstTable = rows.findIndex((l) => /^\s*\[/.test(l));
+    if (firstTable === -1)
+        firstTable = rows.length;
+    const pick = (key) => {
+        for (const l of rows.slice(0, firstTable)) {
+            const m = l.match(new RegExp(`^\\s*${key}\\s*=\\s*(.*)$`));
+            if (m) {
+                const v = m[1].trim().match(/^"([^"\\]*)"\s*(?:#.*)?$/);
+                return { present: true, value: v ? v[1] : null };
+            }
+        }
+        return { present: false, value: null };
+    };
+    return { model: pick("model"), effort: pick("model_reasoning_effort") };
+}
+function createManagedCodexHome(name, launchId, overrides = {}) {
     const srcHome = realCodexHome();
     let srcSt;
     try {
@@ -1078,17 +1132,22 @@ function createManagedCodexHome(name, launchId) {
     }
     fs.symlinkSync(authSrc, path.join(managedHome, "auth.json"));
     const configSrc = path.join(srcHome, "config.toml");
+    let configBody = null;
     try {
         const st = fs.statSync(configSrc);
-        if (st.isFile()) {
-            fs.copyFileSync(configSrc, path.join(managedHome, "config.toml"));
-            fs.chmodSync(path.join(managedHome, "config.toml"), 0o600);
-        }
+        if (st.isFile())
+            configBody = fs.readFileSync(configSrc, "utf8");
     }
     catch (e) {
         if (e.code !== "ENOENT")
             throw e;
     }
+    const configOut = applyCodexConfigOverrides(configBody, overrides);
+    if (configOut != null) {
+        const configDst = path.join(managedHome, "config.toml");
+        fs.writeFileSync(configDst, configOut, { mode: 0o600 });
+        fs.chmodSync(configDst, 0o600);
+    }
     const hookScript = codexHookScriptPath();
     if (!fs.existsSync(hookScript)) {
         throw new AitermError(`Codex Stop hook wrapper が見つかりません。npm run build を実行してください: ${hookScript}`, 2);
@@ -1307,11 +1366,11 @@ function acquireAgentWaitFileLock(meta) {
         }
     };
 }
-function createCodexAgentMetadata(name, cwd, initialPrompt) {
+function createCodexAgentMetadata(name, cwd, initialPrompt, overrides = {}) {
     const launchId = randomBytes(16).toString("hex");
     const eventFile = agentEventPath(name, launchId);
     createEmpty0600NoFollow(eventFile);
-    const codexHome = createManagedCodexHome(name, launchId);
+    const codexHome = createManagedCodexHome(name, launchId, overrides);
     const meta = {
         kind: "codex",
         aiterm_session: name,
@@ -1868,23 +1927,31 @@ function resolveAgentBin(kind) {
 function shq(s) {
     return `'${s.replace(/'/g, "'\\''")}'`;
 }
-function buildAgentCmd(kind, bin, effort, prompt, meta = null) {
+// grok CLI はモデル未指定だと端末側 default に従うため、ツール契約として既定 slug を固定する。
+// codex は既定 slug を持たず端末 config／CLI 既定に委ねる（起動応答で実効値を報告する）。
+const GROK_MODEL_DEFAULTS = {
+    grok: "grok-4.5",
+    composer: "grok-composer-2.5-fast",
+};
+function buildAgentCmd(kind, bin, model, effort, prompt, meta = null) {
     const parts = [shq(bin)];
     if (kind === "codex") {
         if (meta?.kind === "codex")
             parts.push("--dangerously-bypass-hook-trust");
-        // codex は config override で reasoning effort（例: low/medium/high）を渡す。
+        // model/effort は CLI 引数で明示（config 継承より優先）。agent_done 時は managed home 側
+        // config.toml も同値で上書き済み（applyCodexConfigOverrides）。
+        if (model)
+            parts.push("-m", shq(model));
         if (effort)
             parts.push("-c", `model_reasoning_effort=${shq(effort)}`);
     }
     else {
-        // grok / composer は同じ grok CLI をモデル違いで起動。effort は low/medium/high/xhigh/max。
+        // grok / composer は同じ grok CLI をモデル違いで起動。--effort は headless（grok -p）専用で
+        // 対話 TUI では警告の上無視されるため渡さない（openAgent が指定を事前拒否する）。
         parts.push("--no-auto-update");
         if (meta?.kind === "grok" || meta?.kind === "composer")
             parts.push("--no-alt-screen");
-        parts.push("--model", kind === "composer" ? "grok-composer-2.5-fast" : "grok-build");
-        if (effort)
-            parts.push("--effort", shq(effort));
+        parts.push("--model", shq(model ?? GROK_MODEL_DEFAULTS[kind]));
         if ((meta?.kind === "grok" || meta?.kind === "composer") && prompt)
             parts.push("--verbatim");
     }
@@ -1929,15 +1996,53 @@ function agentLabel(kind) {
             ? "Grok Build(Grok)"
             : "Codex";
 }
-// grok CLI の --effort が受ける値集合（codex は CLI 側の値集合が版で変わるため縛らない）。
-const GROK_EFFORTS = new Set(["low", "medium", "high", "xhigh", "max"]);
+// 起動応答にモデル/effort の実効値と出所を明示する。codex は端末 config のピン（model /
+// model_reasoning_effort）が対話子へ波及する構造のため、引数・端末config継承・CLI既定の
+// どれで起動したかを起動時点で可視化し、実効 effort=ultra は proactive 自動委譲 ON を警告する。
+function buildAgentLaunchNote(kind, model, effort, meta) {
+    if (kind !== "codex") {
+        return (`起動設定: model=${model ?? GROK_MODEL_DEFAULTS[kind]}（${model ? "引数" : "ツール既定"}）。` +
+            "reasoning effort は対話 TUI 非対応＝未指定で起動。");
+    }
+    const configPath = meta?.kind === "codex" && meta.codex_home
+        ? path.join(meta.codex_home, "config.toml")
+        : path.join(realCodexHome(), "config.toml");
+    const pins = readCodexConfigPins(configPath);
+    const describePin = (arg, pin) => arg
+        ? `${arg}（引数）`
+        : pin.present
+            ? pin.value
+                ? `${pin.value}（端末config継承）`
+                : "端末config継承（値未解析）"
+            : "CLI既定";
+    const effectiveEffort = effort ?? (pins.effort.present ? pins.effort.value : null);
+    return (`起動設定: model=${describePin(model, pins.model)} effort=${describePin(effort, pins.effort)}。` +
+        (effectiveEffort === "ultra"
+            ? "⚠ effort=ultra は max 推論＋proactive 自動委譲 ON（子エージェント自動生成・使用量急増に注意）。"
+            : ""));
+}
 export function openAgent(kind, opts = {}) {
     const label = agentLabel(kind);
     // 前提検証は session を作る前に全部済ませる（失敗の残骸 session を作らない）。
-    // effort → bin → cwd の順: effort 検証は CLI 不在の端末でも同じ結果になる（テスト可能性）。
+    // model/effort → bin → cwd の順: model/effort 検証は CLI 不在の端末でも同じ結果になる（テスト可能性）。
+    let model = null;
+    if (opts.model != null) {
+        model = opts.model.trim();
+        if (!model)
+            throw new AitermError("model が空文字です（省略するか有効なモデル名を指定してください）", 2);
+    }
     const effort = opts.reasoning_effort ?? null;
-    if (effort && kind !== "codex" && !GROK_EFFORTS.has(effort)) {
-        throw new AitermError(`reasoning_effort '${effort}' は不正です（${label} は low/medium/high/xhigh/max）`, 2);
+    // grok CLI の --effort は headless（grok -p）専用で、対話 TUI では警告の上無視される。
+    // 黙って no-op の引数を受けない＝起動前に明示エラーで拒否する（codex は CLI 側の値集合が
+    // 版で変わるため縛らず送信まで通す）。
+    if (effort && kind === "grok") {
+        throw new AitermError(`${label} は reasoning_effort を指定できません。grok CLI の --effort は headless（grok -p）専用で、` +
+            "対話 TUI では警告の上無視されます（grok-4.5 の TUI 既定 effort は high）。" +
+            "effort 制御が必要なら通常 PTY で `grok -p --effort low|medium|high ...` を使ってください", 2);
+    }
+    if (effort && kind === "composer") {
+        throw new AitermError(`${label} は reasoning_effort を指定できません。grok-composer-2.5-fast は reasoning effort 非対応です` +
+            "（モデルカタログ supports_reasoning_effort=false）", 2);
     }
     const agentDone = !!opts.agent_done;
     const bin = resolveAgentBin(kind);
@@ -1975,13 +2080,15 @@ export function openAgent(kind, opts = {}) {
     const binForCmd = isWin ? toWslPath(bin) : bin;
     const cwdForCmd = cwd && isWin ? toWslPath(cwd) : cwd;
     const [sid, hint] = openSession(opts.session_name ?? null, "bash");
+    let launchNote = "";
     try {
         const meta = agentDone
             ? kind === "codex"
-                ? createCodexAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none")
+                ? createCodexAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", { model, effort })
                 : createGrokAgentMetadata(kind, sid, cwd, opts.prompt ? "pending" : "none")
             : null;
-        const cmd = buildAgentCmd(kind, binForCmd, effort, opts.prompt ?? null, meta);
+        launchNote = buildAgentLaunchNote(kind, model, effort, meta);
+        const cmd = buildAgentCmd(kind, binForCmd, model, effort, opts.prompt ?? null, meta);
         const envPrefix = agentEnvPrefix(meta, sid);
         const full = cwdForCmd ? `cd ${shq(cwdForCmd)} && ${envPrefix}${cmd}` : `${envPrefix}${cmd}`;
         // force:true で送る。起動骨格は `bin '...'` の固定形で、prompt/cwd/effort は shq でクオート済みの
@@ -2001,7 +2108,7 @@ export function openAgent(kind, opts = {}) {
     }
     return [
         sid,
-        `${label} を session ${sid} で起動した。${agentDone ? "agent_done 待機が有効。" : ""}` +
+        `${label} を session ${sid} で起動した。${launchNote}${agentDone ? "agent_done 待機が有効。" : ""}` +
             `${agentDone && kind !== "codex" ? " hook 汚染防止のため Grok 実行中は一時 HOME を使う。" : ""}\n${hint}\n` +
             `TUI の描画には数秒かかる。少し置いてから pty_read(${sid}, screen:true) で画面を読み、` +
             `pty_send(${sid}, "...") で入力・pty_key(${sid}, "Enter"/"Up"/"C-c" 等) で操作する（対話）。` +
@@ -2039,6 +2146,7 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
     }
     const [sid, hint] = openAgent(kind, {
         session_name: opts.session_name ?? null,
+        model: opts.model ?? null,
         reasoning_effort: opts.reasoning_effort ?? null,
         cwd: opts.cwd ?? null,
         prompt: null,

package/dist/index.js

@@ -180,9 +180,15 @@ server.registerTool("pty_list", {
 });
 // 対話型エージェント起動ツール（モデルごとに1つ＝ツール名/説明でどのモデルか一目で分かる）。
 // いずれも永続端末に TUI を起動し session_id を返す。以後 pty_read/pty_send で対話操作する。
-const agentEffortDesc = (grokLike) => "reasoning effort（思考レベル）。" +
-    (grokLike ? "low/medium/high/xhigh/max" : "low/medium/high 等") +
-    "。省略時は CLI 既定。";
+const agentModelDesc = (kind) => kind === "codex"
+    ? "起動モデル（例: gpt-5.6-sol / gpt-5.6-terra / gpt-5.6-luna）。省略時は端末 config／CLI 既定を継承" +
+        "（端末側のピンがそのまま効く。実効値は起動応答に明示される）"
+    : `起動モデル。省略時は ${kind === "grok" ? "grok-4.5" : "grok-composer-2.5-fast"}`;
+const agentEffortDesc = (grokLike) => grokLike
+    ? "指定不可（grok CLI の --effort は headless 専用で、対話 TUI では警告の上無視される。" +
+        "composer は effort 自体非対応）。指定すると起動前にエラーを返す"
+    : "reasoning effort（思考レベル）。low/medium/high/xhigh/max/ultra（CLI 版依存）。" +
+        "ultra は max 推論＋proactive 自動委譲 ON＝使用量急増注意（明示要求時のみ）。省略時は端末 config／CLI 既定。";
 function registerAgentTool(toolName, kind, desc, grokLike) {
     const initialPromptWaitSchema = {};
     if (kind === "codex") {
@@ -198,11 +204,10 @@ function registerAgentTool(toolName, kind, desc, grokLike) {
         description: desc,
         inputSchema: {
             prompt: z.string().nullish().describe("起動時に渡す初手プロンプト（任意）。省略で素のTUI起動"),
-            // grok/composer の effort は有限集合＝schema で拒否（session を作る前に弾く）。
+            model: z.string().nullish().describe(agentModelDesc(kind)),
+            // grok/composer の effort は対話 TUI で無効（headless 専用）＝core 側が起動前に明示エラーで拒否。
             // codex は CLI 側の値集合が版で変わるため縛らない（core 側も同方針）。
-            reasoning_effort: (grokLike ? z.enum(["low", "medium", "high", "xhigh", "max"]) : z.string())
-                .nullish()
-                .describe(agentEffortDesc(grokLike)),
+            reasoning_effort: z.string().nullish().describe(agentEffortDesc(grokLike)),
             cwd: z.string().nullish().describe("作業ディレクトリ（対象リポのルート等・任意）"),
             session_name: z.string().nullish().describe("セッション名（省略で自動採番）"),
             agent_done: z
@@ -211,10 +216,11 @@ function registerAgentTool(toolName, kind, desc, grokLike) {
                 .describe("managed Stop hook を有効化し、pty_send(wait:'agent_done') を使えるようにする"),
             ...initialPromptWaitSchema,
         },
-    }, async ({ prompt, reasoning_effort, cwd, session_name, agent_done, wait, timeout, screen, lines }) => {
+    }, async ({ prompt, model, reasoning_effort, cwd, session_name, agent_done, wait, timeout, screen, lines }) => {
         try {
             const [sid, hint] = await core.openAgentWithInitialPrompt(kind, {
                 prompt: prompt ?? undefined,
+                model: model ?? undefined,
                 reasoning_effort: reasoning_effort ?? undefined,
                 cwd: cwd ?? undefined,
                 session_name: session_name ?? undefined,
@@ -231,12 +237,13 @@ function registerAgentTool(toolName, kind, desc, grokLike) {
         }
     });
 }
-registerAgentTool("codex_agent", "codex", "【Codex (OpenAI・モデルは Codex CLI の既定)】の対話エージェント TUI を永続端末に起動する。実装・レビュー・調査を対話で回す。" +
-    "起動後は pty_read で画面を読み pty_send で操作する。reasoning_effort を引数で指定可。", false);
-registerAgentTool("grok_agent", "grok", "【Grok Build の Grok モデル (grok-build)】の対話エージェント TUI を永続端末に起動する。" +
-    "起動後は pty_read/pty_send で対話操作。reasoning_effort を引数で指定可。", true);
-registerAgentTool("composer_agent", "composer", "【Grok Build の Composer モデル (grok-composer-2.5-fast)】の対話エージェント TUI を永続端末に起動する。" +
-    "起動後は pty_read/pty_send で対話操作。reasoning_effort を引数で指定可。", true);
+registerAgentTool("codex_agent", "codex", "【Codex (OpenAI)】の対話エージェント TUI を永続端末に起動する。実装・レビュー・調査を対話で回す。" +
+    "起動後は pty_read で画面を読み pty_send で操作する。model / reasoning_effort を引数で指定可" +
+    "（省略時は端末 config／CLI 既定を継承。実効値は起動応答に明示）。", false);
+registerAgentTool("grok_agent", "grok", "【Grok Build の Grok モデル (既定 grok-4.5)】の対話エージェント TUI を永続端末に起動する。" +
+    "起動後は pty_read/pty_send で対話操作。model を引数で指定可。reasoning_effort は対話 TUI 非対応（指定はエラー）。", true);
+registerAgentTool("composer_agent", "composer", "【Grok Build の Composer モデル (既定 grok-composer-2.5-fast)】の対話エージェント TUI を永続端末に起動する。" +
+    "起動後は pty_read/pty_send で対話操作。model を引数で指定可。reasoning_effort は非対応（指定はエラー）。", true);
 async function main() {
     const transport = new StdioServerTransport();
     await server.connect(transport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiterm-mcp",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "mcpName": "io.github.kitepon-rgb/aiterm-mcp",
   "description": "AI-driven persistent terminal as a local stdio MCP server (tmux-backed). Holds one local PTY; SSH and containers are just commands you send into it. Also launches interactive Codex/Grok/Composer agent TUIs in a persistent terminal. Token-reducing reads.",
   "keywords": [