aiterm-mcp 0.28.4 → 0.29.1

package/dist/core.js

@@ -16,7 +16,7 @@ import { AitermError, telemetryOwnedFailure, ownTelemetryFailure } from "./error
 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 { bindCodexTranscriptSession, latestCodexCompletion, observeCodexDone, buildCodexAgentCmd, codexLaunchNote, codexTuiReady, CODEX_COMPOSER_MARKER_RE, codexModelChoice, codexEffortChoice, codexMoreReasoningChoice, codexTranscriptText, createCodexAgentMetadata, } from "./harnesses/codex.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";
 import { resolveAgentBin, resolveThroughlineBin, runThroughlineHandoffContext, isWindowsNativeExecutable, agentBinForPaneShell, resolveWinPaneShell } from "./agent-resolver.js";
@@ -2309,6 +2309,23 @@ function isAgentTuiIdleReady(kind, screen) {
         return false;
     return !isAgentTuiBusy(kind, screen);
 }
+// 起動側が明示応答すべき既知UI。ここで自動承認せず、ready timeoutを待たずに
+// `initial_prompt=not_sent`を返してsessionを生かしたままcallerへ制御を戻す。
+function isAgentTuiActionRequired(kind, screen) {
+    if (kind === "codex") {
+        return screen.includes("Update available!")
+            || screen.includes("Do you trust the contents of this directory?")
+            || screen.includes("Hooks need review")
+            || screen.includes("Allow the room MCP server to run tool")
+            || screen.includes("Would you like to run the following command?");
+    }
+    if (kind === "claude") {
+        return /new MCP servers? found in this project/iu.test(screen)
+            || screen.includes("Is this a project you created or one you trust")
+            || screen.includes("trust this folder");
+    }
+    return false;
+}
 async function waitAgentTuiReadyImpl(kind, sample, sleepFn, opts = {}) {
     const timeoutMs = opts.timeoutMs ?? AGENT_TUI_READY_TIMEOUT_MS;
     const pollMs = opts.pollMs ?? AGENT_TUI_READY_POLL_MS;
@@ -2320,6 +2337,8 @@ async function waitAgentTuiReadyImpl(kind, sample, sleepFn, opts = {}) {
     for (;;) {
         lastScreen = sample();
         samples++;
+        if (isAgentTuiActionRequired(kind, lastScreen))
+            return { ready: false, samples, lastScreen };
         if (isAgentTuiIdleReady(kind, lastScreen)) {
             readyStreak++;
             if (readyStreak >= stableSamples)
@@ -2508,12 +2527,14 @@ export async function sendInitialAgentPrompt(name, text, o = {}) {
     setInitialPromptState(meta, "not_sent");
     const ready = await waitAgentTuiReady(name, meta, o.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
     if (!ready.ready) {
-        return {
-            text: `initial_prompt=not_sent vendor=${meta.kind} ready=false samples=${ready.samples} harness=${agentHarness(meta.kind)}\n` +
-                `agent session '${name}' の ${agentLabel(meta.kind)} TUI が入力受付状態になりません。prompt は送信していません。`,
-            event_cursor: null,
-            submit_residue: null,
-        };
+        // ready失敗は成功形で返さず明示エラーにする（実被弾 2026-08-25: Codexのupdate確認ダイアログで
+        // 未送信のまま成功形receiptが返り、呼び出し側が40分気づけなかった）。sessionは調査/復旧用に残る。
+        const dialog = meta.kind === "codex" ? codexLaunchBlockingDialog(ready.lastScreen) : null;
+        const causeNote = dialog
+            ? `${dialog}が入力を塞いでいます。pty_read(screen:true)で画面を確認し、pty_keyでダイアログに応答してから、pty_sendでpromptを送ってください。`
+            : `pty_read(screen:true)で画面を確認し、入力受付になってからpty_sendでpromptを送ってください。`;
+        throw new AitermError(`initial_prompt=not_sent vendor=${meta.kind} ready=false samples=${ready.samples} harness=${agentHarness(meta.kind)}\n` +
+            `agent session '${name}' の ${agentLabel(meta.kind)} TUI が入力受付状態にならず、prompt は送信していません。${causeNote}`, 2);
     }
     const startOffset = agentCompletionCursor(meta);
     try {

package/dist/harnesses/codex.js

@@ -381,6 +381,20 @@ export function codexTuiReady(screen) {
 }
 // submit座礁観測のcomposer領域マーカー（ready判定と同じ記号を行頭基準で探す）。
 export const CODEX_COMPOSER_MARKER_RE = /^\s*[›>]/;
+// Codexの起動前modalダイアログ検知。表示中はheader/footerが描かれず codexTuiReady が
+// 恒久falseになるため、ready gate失敗の原因究明用に画面から種別を特定する
+// （実被弾 2026-08-25: update確認で初手prompt未送信のまま30秒timeout→40分停滞）。
+// 文字列は実機captureの逐語。既知2種に一致しない「Press enter to continue」も
+// 同型のmodalとして拾う（種別不明のまま握りつぶさない）。
+export function codexLaunchBlockingDialog(screen) {
+    if (screen.includes("Update available!"))
+        return "update確認ダイアログ";
+    if (screen.includes("Do you trust the contents of this directory"))
+        return "directory trust確認ダイアログ";
+    if (screen.includes("Press enter to continue"))
+        return "起動時ダイアログ（種別未特定）";
+    return null;
+}
 export function codexModelChoice(screen, model) {
     for (const line of screen.slice(screen.lastIndexOf("Select Model and Effort")).split("\n")) {
         const match = line.match(/^\s*(?:›\s*)?(\d+)\.\s+(\S+)/);

package/package.json

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