aiterm-mcp 0.29.2 → 0.29.5

package/dist/core.js

@@ -13,9 +13,9 @@ import * as path from "node:path";
 import { createHash, randomBytes } from "node:crypto";
 import * as rtk from "./rtk.js";
 import { AitermError, telemetryOwnedFailure, ownTelemetryFailure } from "./errors.js";
-import { isWin, SOCKDIR, tmuxCommand, loadPtyBufferChunk, pasteBufferBaseArgs, TMUX_EMPTY_CONFIG, attachCommand, normalizePaneCommand, appendMarkSentinel, settlePaneLog, paneCwdArgument, } from "./tmux-runtime.js";
+import { isWin, SOCKDIR, tmuxCommand, sendPsmuxPayload, loadPtyBufferChunk, pasteBufferBaseArgs, TMUX_EMPTY_CONFIG, attachCommand, normalizePaneCommand, appendMarkSentinel, settlePaneLog, paneCwdArgument, } from "./tmux-runtime.js";
 import { sleep, currentUid, runtimeStateBase, safeStatSize, readFileRange, writeJson0600, createEmpty0600, shq, LAUNCH_ID_RE, AGENT_DONE_POLL_MS, AGENT_EVENT_MAX_BYTES, assertSessionName, agentsDir, agentEventPath, agentMetadataPath, writeAgentMetadata, AGENT_EVENT_TAIL_BYTES, agentLabel, agentHarness, subagentInstruction, agentLineageFields, } from "./agent-shared.js";
-import { GROK_MODEL_DEFAULTS, realGrokHome, resolveAndValidateGrokAuth, assertGrokModelAvailable, grokEventsTranscript, latestGrokCompletion, grokInitializationComplete, observeGrokDone, buildGrokAgentCmd, grokLaunchNote, grokEnvTokens, grokTuiReady, GROK_COMPOSER_MARKER_RE, grokFooterHasConfiguration, grokTranscriptText, createGrokAgentMetadata, } from "./harnesses/grok.js";
+import { GROK_MODEL_DEFAULTS, realGrokHome, resolveAndValidateGrokAuth, assertGrokModelAvailable, grokEventsTranscript, latestGrokCompletion, observeGrokDone, buildGrokAgentCmd, grokLaunchNote, grokEnvTokens, grokTuiReady, GROK_COMPOSER_MARKER_RE, grokFooterHasConfiguration, grokTranscriptText, createGrokAgentMetadata, } from "./harnesses/grok.js";
 import { bindCodexTranscriptSession, latestCodexCompletion, observeCodexDone, buildCodexAgentCmd, codexLaunchNote, codexTuiReady, codexLaunchBlockingDialog, CODEX_COMPOSER_MARKER_RE, codexModelChoice, codexEffortChoice, codexMoreReasoningChoice, codexTranscriptText, createCodexAgentMetadata, } from "./harnesses/codex.js";
 import { OPERATION_ID_RE, CLAUDE_RESULT_MAX_BYTES, CLAUDE_EFFORTS, agentManagedClaudeSettingsPath, agentClaudeResultPath, agentClaudeOperationPath, agentClaudeApprovalReceiptPath, agentClaudeDispatchReceiptPath, validateOperationId, readClaudeResultText, assertClaudeAuthenticationReady, buildClaudeAgentCmd, claudeLaunchNote, claudeTuiReady, CLAUDE_COMPOSER_MARKER_RE, createClaudeAgentMetadata, } from "./harnesses/claude.js";
 import { bindCursorTranscriptSession, cursorTurnBoundary, latestCursorCompletion, observeCursorDone, cursorTranscriptText, assertCursorAuthenticationReady, assertCursorModelAvailable, buildCursorAgentCmd, createCursorAgentMetadata, cursorLaunchNote, cursorEffortNavigation, cursorTuiReady, CURSOR_COMPOSER_MARKER_RE, validateCursorModelEffort, } from "./harnesses/cursor.js";
@@ -75,7 +75,7 @@ const MAX_SEND_BYTES = 64 * 1024;
 const PTY_PASTE_CHUNK_BYTES = 256;
 const PTY_PASTE_CHUNK_PAUSE_MS = 10;
 const PTY_PASTE_PAUSE_BUFFER = new Int32Array(new SharedArrayBuffer(4));
-const SESSION_SEND_LOCK_WAIT_MS = 10_000;
+const SESSION_SEND_LOCK_WAIT_MS = isWin ? 130_000 : 10_000;
 const SESSION_SEND_LOCK_POLL_MS = 25;
 // 安全: send 前に弾く破壊的コマンド（外部システム境界の防御）
 const DESTRUCTIVE = [
@@ -121,6 +121,15 @@ function paneCurrentCommand(name) {
         return "";
     return normalizePaneCommand(r.stdout.trim());
 }
+function paneCurrentCommandForMark(name) {
+    const foreground = paneCurrentCommand(name);
+    if (!isWin || foreground === "powershell" || foreground === "pwsh")
+        return foreground;
+    // psmuxはnew-session直後だけpane_current_commandへ起動元shellを返すことがある。
+    // 現在の末尾画面にPowerShell promptが描画済みなら、mark構文はその実効shellへ合わせる。
+    const screen = captureScreen(name, 4).replace(/\x1b\[[0-9;?]*[a-zA-Z]/g, "");
+    return /(?:^|\n)PS [^\r\n]*>\s*$/m.test(screen) ? "pwsh" : foreground;
+}
 function pasteBufferSupportsNoSanitizeFlag() {
     const listed = tmux("list-commands");
     if (listed.code !== 0) {
@@ -658,7 +667,7 @@ export function send(name, text, o = {}) {
     if (o.mark) {
         // mark の sentinel は POSIX シェル構文。前面が fish/csh/tcsh 等の非 POSIX 対話シェルだと "$?" が
         // 壊れて sentinel が成立しない。黙って壊れた完了検出を作らず、明示エラーで until を促す（B8）。
-        fg = paneCurrentCommand(name);
+        fg = paneCurrentCommandForMark(name);
         if (NON_POSIX_MARK_SHELLS.has(fg)) {
             throw new AitermError(`mark は POSIX シェル(bash/sh/zsh/dash)前提です。前面が ${fg} のため sentinel の "$?" が` +
                 `正しく展開されません。until で完了パターンを指定してください。`, 2);
@@ -702,42 +711,44 @@ export function send(name, text, o = {}) {
                 /* noop */
             }
         }
-        // `send-keys -l`と単発`paste-buffer`は、長文をPTY入力queueへ一度に流すと、OSを問わず
-        // 途中以降が欠落しても tmux 自体は code=0 を返す。UTF-8を壊さない256byte以下に分け、
-        // 全chunk＋Enterをsession単位のcross-process lock内で直列化する。
-        const pasteSupportsNoSanitize = pasteBufferSupportsNoSanitizeFlag();
-        const chunks = splitPtyText(text);
-        const bufferBase = `aiterm-${process.pid}-${randomBytes(8).toString("hex")}`;
-        for (let i = 0; i < chunks.length; i += 1) {
-            const bufferName = `${bufferBase}-${i}`;
-            const partial = i > 0
-                ? " 先行chunkはPTYに入力済みでEnterは未送信です。再送前に入力を確認・消去してください。"
-                : "";
-            const loaded = loadPtyBufferChunk(true, bufferName, chunks[i]);
-            if (loaded.code !== 0) {
-                tmuxCleanup("delete-buffer", "-b", bufferName);
-                throw new AitermError(`tmux bufferへの送信準備に失敗しました` +
-                    `（chunk ${i + 1}/${chunks.length}）: ${loaded.stderr.trim() || `code=${loaded.code}`}.${partial}`, 2);
-            }
-            // -Sは対応新版だけでvis(3)制御文字変換を無効化する。
-            // send 自身の raw/sanitize 契約だけを真実とし、tmux 側で黙って再変換させない。
-            const pasteArgs = pasteBufferBaseArgs();
-            if (o.bracketedPaste)
-                pasteArgs.push("-p");
-            if (pasteSupportsNoSanitize)
-                pasteArgs.push("-S");
-            pasteArgs.push("-b", bufferName, "-t", name);
-            const pasted = tmux(...pasteArgs);
-            if (pasted.code !== 0) {
-                // paste 失敗時は -d で消えないbufferを明示的に掃除する。元エラーを優先する。
-                tmuxCleanup("delete-buffer", "-b", bufferName);
-                throw new AitermError(`tmux bufferのPTY送信に失敗しました` +
-                    `（chunk ${i + 1}/${chunks.length}）: ${pasted.stderr.trim() || `code=${pasted.code}`}.${partial}`, 2);
+        // POSIX tmuxはUTF-8安全な256byte pasteへ分割する。Windows psmuxは認証済み
+        // server commandでpayload全体を単一SendBytesへ変換し、別processとの交差を構造的に防ぐ。
+        if (isWin) {
+            const sent = sendPsmuxPayload(true, name, text, !!o.bracketedPaste);
+            if (sent.code !== 0) {
+                throw new AitermError(`psmuxのPTY送信に失敗しました: ${sent.stderr.trim() || `code=${sent.code}`}`, 2);
             }
-            if (i + 1 < chunks.length) {
-                // tmux clientの終了だけでは、serverが前chunkをPTYへdrainしたことを保証しない。
-                // 次chunkまで短く間を空け、外部PTY入力queueの飽和による黙った末尾欠落を防ぐ。
-                Atomics.wait(PTY_PASTE_PAUSE_BUFFER, 0, 0, PTY_PASTE_CHUNK_PAUSE_MS);
+        }
+        else {
+            const chunks = splitPtyText(text);
+            const pasteSupportsNoSanitize = pasteBufferSupportsNoSanitizeFlag();
+            const bufferBase = `aiterm-${process.pid}-${randomBytes(8).toString("hex")}`;
+            for (let i = 0; i < chunks.length; i += 1) {
+                const bufferName = `${bufferBase}-${i}`;
+                const partial = i > 0
+                    ? " 先行chunkはPTYに入力済みでEnterは未送信です。再送前に入力を確認・消去してください。"
+                    : "";
+                const loaded = loadPtyBufferChunk(true, bufferName, chunks[i]);
+                if (loaded.code !== 0) {
+                    tmuxCleanup("delete-buffer", "-b", bufferName);
+                    throw new AitermError(`tmux bufferへの送信準備に失敗しました` +
+                        `（chunk ${i + 1}/${chunks.length}）: ${loaded.stderr.trim() || `code=${loaded.code}`}.${partial}`, 2);
+                }
+                const pasteArgs = pasteBufferBaseArgs();
+                if (o.bracketedPaste)
+                    pasteArgs.push("-p");
+                if (pasteSupportsNoSanitize)
+                    pasteArgs.push("-S");
+                pasteArgs.push("-b", bufferName, "-t", name);
+                const pasted = tmux(...pasteArgs);
+                if (pasted.code !== 0) {
+                    tmuxCleanup("delete-buffer", "-b", bufferName);
+                    throw new AitermError(`tmux bufferのPTY送信に失敗しました` +
+                        `（chunk ${i + 1}/${chunks.length}）: ${pasted.stderr.trim() || `code=${pasted.code}`}.${partial}`, 2);
+                }
+                if (i + 1 < chunks.length) {
+                    Atomics.wait(PTY_PASTE_PAUSE_BUFFER, 0, 0, PTY_PASTE_CHUNK_PAUSE_MS);
+                }
             }
         }
         if (enter) {
@@ -2294,12 +2305,19 @@ function isAgentTuiReady(kind, screen) {
 // Codex/Claude は実行中に「(esc to interrupt)」、Cursor は「Working」＋
 // 「ctrl+c to stop」を表示する（いずれも実機採取）。startup 側の処理（MCP initialize 等）が
 // 走ったまま古い composer がscrollbackに残る画面は入力受付とみなさない。
-// Grok/Composer は busy 表示文字列の実機根拠が未採取のため対象外（誤ブロックで起動不能にしない）。
+// Grok/Composer は実機で `Waiting for response` / `Responding…` / `[stop]` を表示する。
 function isAgentTuiBusy(kind, screen) {
     if (kind === "cursor")
         return /ctrl\+c to stop/i.test(screen);
     if (kind === "codex" || kind === "claude")
         return /esc to interrupt/i.test(screen);
+    if (kind === "grok" || kind === "composer") {
+        return screen.includes("Waiting for response")
+            || screen.includes("Responding…")
+            || screen.includes("Responding...")
+            || screen.includes("[stop]")
+            || /\[hooks:\s*\d+\/\d+\]/u.test(screen);
+    }
     return false;
 }
 // ready gate 用: 入力欄マーカーがあっても busy 表示中は ready と数えない。
@@ -2353,11 +2371,7 @@ async function waitAgentTuiReadyImpl(kind, sample, sleepFn, opts = {}) {
     }
 }
 async function waitAgentTuiReady(name, meta, timeoutMs = AGENT_TUI_READY_TIMEOUT_MS) {
-    return waitAgentTuiReadyImpl(meta.kind, () => {
-        if ((meta.kind === "grok" || meta.kind === "composer") && !grokInitializationComplete(meta))
-            return "";
-        return captureScreen(name, AGENT_TUI_READY_LINES);
-    }, sleep, { timeoutMs });
+    return waitAgentTuiReadyImpl(meta.kind, () => captureScreen(name, AGENT_TUI_READY_LINES), sleep, { timeoutMs });
 }
 async function waitAgentTuiReadyByKind(name, kind, timeoutMs = AGENT_TUI_READY_TIMEOUT_MS) {
     return waitAgentTuiReadyImpl(kind, () => captureScreen(name, AGENT_TUI_READY_LINES), sleep, { timeoutMs });
@@ -3207,22 +3221,22 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
     }
     // v0.16.0: launcher は常に managed（Stop hook つき）で立つ。手動運転したい場合は
     // pty_open で素の PTY を開き、harness CLI を自分で send する。
-    // 第3要素は「起動時点でturnが走っているか」の event_cursor: Grok/Composer/Cursor の argv prompt は
-    // event file 新規作成直後の起動＝境界0、prompt なしの起動は turn なし＝null。
-    if (!prompt || (kind !== "codex" && kind !== "claude")) {
+    // prompt無しはTUIを起動するだけ。prompt有りはharnessを問わず、TUI ready確認後の
+    // sendInitialAgentPromptへ一本化する。Grokの--verbatim argvはCLIが本文をqueueへ置いただけで
+    // turnを開始しない版があり、event_cursor=0を「実行中」と返すと利用側へ嘘をつく。
+    if (!prompt) {
         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,
+            prompt: null,
             agent_done: true,
             launch_operation_id: opts.launch_operation_id ?? null,
             write_scope: opts.write_scope,
             env_vars: opts.env_vars,
         });
-        // argv prompt（grok/composer/cursor）は composer を経由しないため submit 座礁観測の対象外。
-        return [sid, hint, prompt ? 0 : null, null];
+        return [sid, hint, null, null];
     }
     const [sid, hint] = openAgent(kind, {
         session_name: opts.session_name ?? null,

package/dist/index.js

@@ -563,7 +563,7 @@ function registerAgentTool(toolName, kind, desc) {
             event_cursor: z.number().int().nullable(),
             wait_command: z.string().nullable(),
             // 初回prompt dispatch後のsubmit座礁観測（additive）。true=composerに残存を確認（submit未成立の疑い）/
-            // false=残存を観測せず（submit成立の保証ではない）/ null=promptなし・argv prompt・判定不能。
+            // false=残存を観測せず（submit成立の保証ではない）/ null=promptなし・判定不能。
             submit_residue: z.boolean().nullable(),
             ...writeScopeOutputSchema,
         },

package/dist/psmux-send-worker.js

@@ -0,0 +1,99 @@
+import * as fs from "node:fs";
+import * as net from "node:net";
+import * as os from "node:os";
+import * as path from "node:path";
+const MAX_PAYLOAD_BYTES = 64 * 1024 + 12;
+const PTY_CHUNK_BYTES = 256;
+const MAX_FINAL_DRAIN_MS = 3_000;
+const SESSION_BASE_RE = /^[A-Za-z0-9_-]{1,160}$/;
+const KEY_RE = /^[0-9a-f]{16}$/i;
+async function readPayload() {
+    const chunks = [];
+    let total = 0;
+    for await (const chunk of process.stdin) {
+        const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk));
+        total += bytes.length;
+        if (total > MAX_PAYLOAD_BYTES)
+            throw new Error(`payload exceeds ${MAX_PAYLOAD_BYTES} bytes`);
+        chunks.push(bytes);
+    }
+    return Buffer.concat(chunks);
+}
+function psmuxDataDir() {
+    const override = process.env.PSMUX_DATA_DIR;
+    if (override) {
+        if (!path.isAbsolute(override))
+            throw new Error("PSMUX_DATA_DIR must be absolute");
+        return override;
+    }
+    return path.join(process.env.USERPROFILE || os.homedir(), ".psmux");
+}
+async function sendCommand(port, key, command, expectedResponse) {
+    await new Promise((resolve, reject) => {
+        const socket = net.createConnection({ host: "127.0.0.1", port });
+        let response = "";
+        let settled = false;
+        const finish = (error) => {
+            if (settled)
+                return;
+            settled = true;
+            socket.destroy();
+            if (error)
+                reject(error);
+            else
+                resolve();
+        };
+        socket.setTimeout(2_000, () => finish(new Error("psmux command timed out")));
+        socket.on("connect", () => socket.end(`AUTH ${key}\n${command}\n`));
+        socket.on("data", (chunk) => {
+            response += chunk.toString("utf8");
+        });
+        socket.on("end", () => {
+            if (response.split(/\r?\n/).includes("OK") &&
+                (expectedResponse == null || response.includes(expectedResponse)))
+                finish();
+            else
+                finish(new Error(`psmux authentication failed: ${response.trim() || "empty response"}`));
+        });
+        socket.on("error", (error) => finish(error));
+    });
+}
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function send() {
+    const sessionBase = process.argv[2] ?? "";
+    if (!SESSION_BASE_RE.test(sessionBase))
+        throw new Error("invalid psmux session base");
+    const payload = await readPayload();
+    const dir = psmuxDataDir();
+    const portText = fs.readFileSync(path.join(dir, `${sessionBase}.port`), "utf8").trim();
+    const key = fs.readFileSync(path.join(dir, `${sessionBase}.key`), "utf8").trim();
+    const port = Number(portText);
+    if (!Number.isInteger(port) || port < 1 || port > 65535)
+        throw new Error("invalid psmux port");
+    if (!KEY_RE.test(key))
+        throw new Error("invalid psmux auth key");
+    const subcommands = [];
+    for (let offset = 0; offset < payload.length; offset += PTY_CHUNK_BYTES) {
+        const chunk = payload.subarray(offset, offset + PTY_CHUNK_BYTES);
+        const hex = Array.from(chunk, (byte) => byte.toString(16).padStart(2, "0")).join(" ");
+        subcommands.push(`send -H ${hex}`);
+    }
+    const chunkDrainMs = payload.length > 1024 ? 300 : 100;
+    for (const command of subcommands) {
+        await sendCommand(port, key, command);
+        await delay(chunkDrainMs);
+    }
+    const completionMarker = `AITERM_PSMUX_SEND_DONE_${process.pid}`;
+    await sendCommand(port, key, `display-message -p ${completionMarker}`, completionMarker);
+    const finalDrainMs = Math.min(MAX_FINAL_DRAIN_MS, Math.max(200, Math.ceil(payload.length / 1024) * 500));
+    await delay(finalDrainMs);
+    if (process.env.AITERM_PSMUX_DEBUG === "1") {
+        process.stderr.write(`psmux-send-worker debug: chunks=${subcommands.length} sent=${subcommands.length}\n`);
+    }
+}
+send().catch((error) => {
+    process.stderr.write(`psmux-send-worker: ${error instanceof Error ? error.message : String(error)}\n`);
+    process.exitCode = 1;
+});

package/dist/tmux-runtime.js

@@ -6,6 +6,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import * as os from "node:os";
 import { createHash } from "node:crypto";
+import { fileURLToPath } from "node:url";
 import { AitermError, ptyDependencyError } from "./errors.js";
 // Windows ネイティブには tmux が無いため、tmux CLI 互換の native psmux を叩く
 // （POSIX = Linux/WSL2/macOS は従来どおり tmux を直接叩く。WSL 橋は e3f5fc8 で全廃）。
@@ -129,6 +130,28 @@ export function tmuxCommandWithInput(observe, input, ...args) {
 export function tmuxCommand(observe, ...args) {
     return tmuxCommandWithInput(observe, undefined, ...args);
 }
+export function sendPsmuxPayload(observe, sessionName, text, bracketedPaste) {
+    if (!isWin)
+        return { code: 1, stdout: "", stderr: "psmux direct send is Windows-only" };
+    ensureWinPsmux(observe);
+    const worker = fileURLToPath(new URL("./psmux-send-worker.js", import.meta.url));
+    const body = bracketedPaste ? `\x1b[200~${text}\x1b[201~` : text;
+    const result = spawnSync(process.execPath, [worker, `${WIN_NS}__${sessionName}`], {
+        encoding: "utf8",
+        maxBuffer: 1024 * 1024,
+        input: Buffer.from(body, "utf8"),
+        env: tmuxSpawnEnv(),
+        timeout: 120_000,
+    });
+    if (result.error) {
+        return {
+            code: 1,
+            stdout: result.stdout ?? "",
+            stderr: `${result.error.code ?? "worker error"}: ${result.error.message}`,
+        };
+    }
+    return { code: result.status ?? 1, stdout: result.stdout ?? "", stderr: result.stderr ?? "" };
+}
 // psmux の load-buffer は stdin (`-`) 非対応で path 位置引数だけを取る。
 // Windows は owner-only の SOCKDIR 内へ一時ファイル経由で渡し、POSIX は stdin で渡す。
 export function loadPtyBufferChunk(observe, bufferName, chunk) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiterm-mcp",
-  "version": "0.29.2",
+  "version": "0.29.5",
   "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": [