aiterm-mcp 0.29.2 → 0.29.3

package/dist/core.js

@@ -15,7 +15,7 @@ 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 { 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";
@@ -2294,12 +2294,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 +2360,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 +3210,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/package.json

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