aiterm-mcp 0.44.0 → 0.44.1

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.44.1] - 2026-09-30
+
+### 修正
+
+- `agent_models`のGrokが、ときどき`MODEL_CATALOG_INVALID: initializeの応答がありません（exit=0 … stdout=0bytes）`で失敗していた。要求を書いてすぐ標準入力を閉じていたため、grok 1.0.41がinitializeの処理中に入力の終わりを受けて、応答せずに終わっていた。ClaudeとGrokは、応答が出力に現れるまで標準入力を開けておき、現れてから閉じる。macOSのAqua外（launchd経由）でも同じ待ち方をする。
+
 ## [0.44.0] - 2026-09-30
 
 ### 追加
@@ -1918,7 +1924,8 @@ prototype (preserved under `prototype/python/` as the porting source and referen
   `ubuntu-latest` for Node 18/20/22, publishing to npm on `v*` tags with
   provenance.
 
-[Unreleased]: https://github.com/kitepon/aiterm-mcp/compare/v0.44.0...HEAD
+[Unreleased]: https://github.com/kitepon/aiterm-mcp/compare/v0.44.1...HEAD
+[0.44.1]: https://github.com/kitepon/aiterm-mcp/compare/v0.44.0...v0.44.1
 [0.44.0]: https://github.com/kitepon/aiterm-mcp/compare/v0.43.7...v0.44.0
 [0.43.7]: https://github.com/kitepon/aiterm-mcp/compare/v0.43.6...v0.43.7
 [0.43.6]: https://github.com/kitepon/aiterm-mcp/compare/v0.43.5...v0.43.6

package/README.ja.md

@@ -203,7 +203,7 @@ runtime-error store は canonical dotagents config の `collection.enabled: true
 場合だけ収集し、既定OFF、network送信は行いません。tag起点CIのnpm provenance（OIDC Trusted
 Publishing）で公開し、GitHub Release が Official MCP Registry を再登録します。
 
-**状態:** 開発継続中 · 現行公開版 **v0.44.0** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
+**状態:** 開発継続中 · 現行公開版 **v0.44.1** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
 
 ### 更新と巻き戻し
 

package/README.md

@@ -217,7 +217,7 @@ collection is off by default and performs no network I/O. It ships via
 tag-triggered CI with npm provenance (OIDC Trusted Publishing); the GitHub
 Release re-registers the Official MCP Registry entry.
 
-**Status:** actively maintained · current public release **v0.44.0** · runs on Linux · WSL2 · macOS · native Windows (tmux on POSIX, the tmux-CLI-compatible [psmux](https://github.com/psmux/psmux) on native Windows — no WSL required) · MIT · see the [CHANGELOG](CHANGELOG.md).
+**Status:** actively maintained · current public release **v0.44.1** · runs on Linux · WSL2 · macOS · native Windows (tmux on POSIX, the tmux-CLI-compatible [psmux](https://github.com/psmux/psmux) on native Windows — no WSL required) · MIT · see the [CHANGELOG](CHANGELOG.md).
 
 ### Update and rollback
 

package/dist/agent-resolver.js

@@ -1,6 +1,6 @@
 // エージェント CLI（claude / codex / grok / cursor-agent）・Throughline・pane shell（Windows は Git Bash）の
 // 実行ファイルをどう見つけ、どう起動するかの所有者（OS 分岐の所有者。tmux とは独立）。
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as os from "node:os";
@@ -75,11 +75,7 @@ export function spawnAgentControlCommand(bin, args, _cwd, options) {
         if (/\.(?:cmd|bat)$/i.test(bin)) {
             // Node は CVE-2024-27980 対処以降、.cmd/.bat の直接 spawn を EINVAL で拒否する。
             // 受入が .cmd/.bat を許す以上、control 経路は shell 経由で実行する（args は固定語彙とAiterm所有の一時path）。
-            // shell経由ではNodeが引数を引用しないので、空白を含むpathだけ二重引用符でくくる。引用符とshell記号は受け付けない。
-            if (args.some(arg => /["%^&|<>!]/.test(arg))) {
-                throw new AitermError(`${path.basename(bin)} のcontrol commandへ渡せない文字を含む引数があります`, 2);
-            }
-            return spawnSync(bin, args.map(arg => /\s/.test(arg) ? `"${arg}"` : arg), { ...options, shell: true });
+            return spawnSync(bin, windowsControlArgs(bin, args), { ...options, shell: true });
         }
         // 受入は pane shell（Git Bash）が shebang で実行できる script も許す。Windows の
         // CreateProcess は shebang を解さないため、control command も同じ Git Bash で実行する。
@@ -88,6 +84,72 @@ export function spawnAgentControlCommand(bin, args, _cwd, options) {
     }
     return spawnInMacGuiWhenOutsideAqua(bin, args, options) ?? spawnSync(bin, args, options);
 }
+function windowsControlArgs(bin, args) {
+    // shell経由ではNodeが引数を引用しないので、空白を含むpathだけ二重引用符でくくる。引用符とshell記号は受け付けない。
+    if (args.some(arg => /["%^&|<>!]/.test(arg))) {
+        throw new AitermError(`${path.basename(bin)} のcontrol commandへ渡せない文字を含む引数があります`, 2);
+    }
+    return args.map(arg => /\s/.test(arg) ? `"${arg}"` : arg);
+}
+/**
+ * 標準入出力で要求と応答をやりとりするcontrol command（`claude -p --input-format stream-json`、`grok agent stdio`）。
+ * inputを書いた後、untilの文字列がstdoutに現れるまで標準入力を開けておき、現れたら閉じて終了を待つ。
+ * 応答前に標準入力を閉じると、応答せずに正常終了するCLIがある（grok 1.0.41で実測）。
+ * 起動方法のOS差はspawnAgentControlCommandと同じ。macOSのAqua外はlaunchdの仕事の中で同じ待ち方をする。
+ */
+export async function runAgentProtocolCommand(bin, args, options) {
+    const gui = spawnInMacGuiWhenOutsideAqua(bin, args, options);
+    if (gui)
+        return { status: gui.status, signal: gui.signal, stdout: gui.stdout, stderr: gui.stderr, ...(gui.error ? { error: gui.error } : {}) };
+    let command = bin;
+    let argv = args;
+    let shell = false;
+    if (isWin && !/\.(?:exe|com)$/i.test(bin)) {
+        if (/\.(?:cmd|bat)$/i.test(bin)) {
+            argv = windowsControlArgs(bin, args);
+            shell = true;
+        }
+        else {
+            command = resolveWinPaneShell("bash");
+            argv = [bin, ...args];
+        }
+    }
+    return new Promise((resolve) => {
+        const child = spawn(command, argv, { cwd: options.cwd, env: options.env, shell, windowsHide: true, stdio: ["pipe", "pipe", "pipe"] });
+        let stdout = "";
+        let stderr = "";
+        let error;
+        let settled = false;
+        const finish = (status, signal) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            resolve({ status, signal, stdout, stderr, ...(error ? { error } : {}) });
+        };
+        const stop = (reason) => {
+            error ??= reason;
+            child.stdin.destroy();
+            child.kill();
+        };
+        const timer = setTimeout(() => stop(Object.assign(new Error(`${path.basename(bin)} ${args.join(" ")} が${options.timeout}ms以内に応答しませんでした`), { code: "ETIMEDOUT" })), options.timeout);
+        child.on("error", (reason) => { error ??= reason; finish(null, null); });
+        child.on("close", (status, signal) => finish(status, signal));
+        child.stdin.on("error", () => { });
+        child.stderr.setEncoding("utf8");
+        child.stderr.on("data", (chunk) => { if (stderr.length < options.maxBuffer)
+            stderr += chunk; });
+        child.stdout.setEncoding("utf8");
+        child.stdout.on("data", (chunk) => {
+            stdout += chunk;
+            if (stdout.length > options.maxBuffer)
+                return stop(new Error(`${path.basename(bin)} の出力が${options.maxBuffer}bytesを超えました`));
+            if (child.stdin.writable && stdout.includes(options.until))
+                child.stdin.end();
+        });
+        child.stdin.write(options.input);
+    });
+}
 export function resolveWinPaneShell(shell) {
     if (!isWin)
         return shell;

package/dist/harnesses/claude.js

@@ -8,7 +8,7 @@ import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import { AitermError } from "../errors.js";
 import { modeBitsWorldAccessible } from "../tmux-runtime.js";
-import { spawnAgentControlCommand } from "../agent-resolver.js";
+import { runAgentProtocolCommand, spawnAgentControlCommand } from "../agent-resolver.js";
 import { catalogInvalid, catalogUnavailable, checkedCatalog, findJsonLine, processSummary } from "../model-catalog.js";
 import { currentUid, writeJson0600, shq, subagentInstruction, writeScopeLaunchNote, agentEventPath, createEmpty0600, writeAgentMetadata, agentLineageFields, assertSessionName, agentsDir, LAUNCH_ID_RE, AGENT_EVENT_TAIL_BYTES, readFileRange, } from "../agent-shared.js";
 export const OPERATION_ID_RE = /^sha256:[0-9a-f]{64}$/;
@@ -146,24 +146,23 @@ const CLAUDE_ULTRACODE_NOTE = "Claude Codeの--effortが受け付けるsession
  * （SDKの公開型 SDKControlRequest／SDKControlInitializeResponse）の応答にある models を読む。
  * promptは送らず、sessionを保存せず、利用者のhookとMCP serverを起動しない。
  */
-export function claudeModelChoices(bin, cwd) {
+export async function claudeModelChoices(bin, cwd) {
     const dir = fs.mkdtempSync(path.join(os.tmpdir(), "aiterm-claude-models-"));
     try {
         const settings = path.join(dir, "settings.json");
         fs.writeFileSync(settings, JSON.stringify({ disableAllHooks: true }), { mode: 0o600 });
         const requestId = `aiterm-models-${randomUUID()}`;
         const request = { type: "control_request", request_id: requestId, request: { subtype: "initialize" } };
-        const result = spawnAgentControlCommand(bin, [
+        const result = await runAgentProtocolCommand(bin, [
             "-p", "--output-format", "stream-json", "--verbose", "--input-format", "stream-json",
             "--no-session-persistence", "--strict-mcp-config", "--settings", settings,
-        ], cwd, {
+        ], {
             cwd,
-            encoding: "utf8",
             env: process.env,
             input: JSON.stringify(request) + "\n",
+            until: requestId,
             timeout: CLAUDE_MODELS_TIMEOUT_MS,
             maxBuffer: CLAUDE_MODELS_MAX_BYTES,
-            windowsHide: true,
         });
         if (result.error || result.status !== 0) {
             throw catalogUnavailable("Claude Code", result.error?.message || result.stderr?.trim() || `exit=${result.status ?? "unknown"}`);

package/dist/harnesses/grok.js

@@ -7,7 +7,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { randomBytes, randomUUID } from "node:crypto";
 import { AitermError } from "../errors.js";
-import { spawnAgentControlCommand } from "../agent-resolver.js";
+import { runAgentProtocolCommand, spawnAgentControlCommand } from "../agent-resolver.js";
 import { catalogInvalid, catalogUnavailable, checkedCatalog, findJsonLine, processSummary } from "../model-catalog.js";
 import { shq, subagentInstruction, writeScopeLaunchNote, safeStatSize, readFileRange, sleep, agentMetadataPath, writeAgentMetadata, agentEventPath, createEmpty0600, agentLineageFields, AGENT_DONE_POLL_MS, AGENT_EVENT_MAX_BYTES, GROK_TRANSCRIPT_INCREMENT_MAX_BYTES, agentHarness, } from "../agent-shared.js";
 const GROK_MODELS_MAX_BYTES = 1024 * 1024;
@@ -67,16 +67,16 @@ const GROK_AGENT_CATALOG_TIMEOUT_MS = 30_000;
  * `initialize` 応答にある `_meta.modelState` を読む。`session/new` は同じ候補を返すがsessionを保存するので使わない。
  * promptもsessionも作らず、推論は起きない。
  */
-export function grokModelChoices(bin, cwd) {
+export async function grokModelChoices(bin, cwd) {
     const request = { jsonrpc: "2.0", id: 1, method: "initialize", params: { protocolVersion: 1, clientCapabilities: {} } };
-    const result = spawnAgentControlCommand(bin, ["agent", "--no-leader", "stdio"], cwd, {
+    // 応答前に標準入力を閉じると、grok 1.0.41は応答せずに正常終了することがある。応答を読むまで開けておく。
+    const result = await runAgentProtocolCommand(bin, ["agent", "--no-leader", "stdio"], {
         cwd,
-        encoding: "utf8",
         env: process.env,
         input: JSON.stringify(request) + "\n",
+        until: '"id":1',
         timeout: GROK_AGENT_CATALOG_TIMEOUT_MS,
         maxBuffer: GROK_MODELS_MAX_BYTES,
-        windowsHide: true,
     });
     if (result.error || result.status !== 0) {
         throw catalogUnavailable("Grok", result.error?.message || result.stderr?.trim() || `exit=${result.status ?? "unknown"}`);

package/dist/tmux-runtime.js

@@ -201,9 +201,9 @@ export function spawnInMacGuiWhenOutsideAqua(bin, args, options) {
         return null;
     const timeout = options.timeout ?? 30_000;
     const input = options.input === undefined ? undefined : typeof options.input === "string" ? options.input : Buffer.from(options.input.buffer, options.input.byteOffset, options.input.byteLength);
-    return runInMacGui([bin, ...args], options.env ?? process.env, String(options.cwd ?? process.cwd()), timeout, `launchd経由の ${path.basename(bin)} ${args.join(" ")} が${timeout}ms以内に終わりませんでした`, input);
+    return runInMacGui([bin, ...args], options.env ?? process.env, String(options.cwd ?? process.cwd()), timeout, `launchd経由の ${path.basename(bin)} ${args.join(" ")} が${timeout}ms以内に終わりませんでした`, input, options.until);
 }
-function runInMacGui(argv, env, cwd, timeoutMs, timeoutMessage, input) {
+function runInMacGui(argv, env, cwd, timeoutMs, timeoutMessage, input, until) {
     const uid = process.getuid?.();
     if (uid === undefined)
         return null;
@@ -219,10 +219,14 @@ function runInMacGui(argv, env, cwd, timeoutMs, timeoutMessage, input) {
     const plist = path.join(dir, "job.plist");
     try {
         // launchdの仕事は標準入力を持たない。入力を渡す時はファイルに書き、同じ仕事の中でつなぐ。
+        // untilを渡した時は、その文字列が出力に現れるまで標準入力を開けておく（閉じると応答前に終わるCLIがある）。
         if (input !== undefined) {
             const inputFile = path.join(dir, "in");
             fs.writeFileSync(inputFile, input, { mode: 0o600 });
-            argv = ["/bin/sh", "-c", 'f=$1; shift; exec "$@" <"$f"', "aiterm-gui-input", inputFile, ...argv];
+            argv = until === undefined
+                ? ["/bin/sh", "-c", 'f=$1; shift; exec "$@" <"$f"', "aiterm-gui-input", inputFile, ...argv]
+                : ["/bin/sh", "-c", 'f=$1; m=$2; o=$3; shift 3; { cat "$f"; until grep -qF -- "$m" "$o" 2>/dev/null; do sleep 0.05; done; } | "$@"',
+                    "aiterm-gui-input", inputFile, until, path.join(dir, "out"), ...argv];
         }
         fs.writeFileSync(plist, macGuiTmuxPlist(label, dir, argv, env, cwd));
         const boot = spawnSync("launchctl", ["bootstrap", `gui/${uid}`, plist], { encoding: "utf8", timeout: 10000 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiterm-mcp",
-  "version": "0.44.0",
+  "version": "0.44.1",
   "mcpName": "io.github.kitepon/aiterm-mcp",
   "description": "Persistent terminal MCP with one harness-based launcher for Claude Code, Codex CLI, Grok CLI, and Cursor Agent CLI, plus durable PTYs for SSH, containers, and REPLs.",
   "keywords": [