aiterm-mcp 0.37.9 → 0.37.10

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.37.10] - 2026-09-21
+
+### 修正
+
+- Codex 0.155.1 の「Approaching rate limits」model切替dialogを専用に認識する。通常の`pty_send`と`agent_configure`は同じsessionで一時的な「Keep current model」だけを選び、入力受付を再確認してから進める。model変更と今後の表示抑止は選ばない。復旧不能時はtyped errorで本文・設定変更を送らない。
+
 ## [0.37.9] - 2026-09-21
 
 ### 修正
@@ -1726,7 +1732,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.37.9...HEAD
+[Unreleased]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.10...HEAD
+[0.37.10]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.9...v0.37.10
 [0.37.9]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.8...v0.37.9
 [0.37.8]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.7...v0.37.8
 [0.37.7]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.6...v0.37.7

package/README.ja.md

@@ -202,7 +202,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.37.9** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
+**状態:** 開発継続中 · 現行公開版 **v0.37.10** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
 
 ### 更新と巻き戻し
 
@@ -250,6 +250,8 @@ Grok／Composerがread-only sandboxの適用を拒否した場合、prompt送信
 
 この判定はGrok専用アダプターが所有し、同じCLIを使うComposerにも適用する。初回prompt付きの`agent_launch`と通常の`pty_send`で、入力受付待ち中に拒否を検出すると未送信のエラーを返す。promptなし・`trust_project`指定なしの起動応答は入力受付を保証しない。`trust_project:true`では入力受付まで確認し、`startup.status`を返す。Grokのprivacy notice起動設定も同アダプターが所有する。実装の責務分担は[DESIGN](docs/DESIGN.md#failure-and-recovery)を参照。
 
+Codex 0.155.1の「Approaching rate limits」model切替dialogは、通常の`pty_send`と`agent_configure`で同じsessionのまま一時的な**2. Keep current model**だけを選ぶ。入力受付を再確認してから本文または設定変更を進め、dispatch receiptの`pane_input_recovery`には`codex_rate_limit_model_switch_kept_current`を記録する。model切替と今後の表示抑止は選ばない。入力受付へ戻らなければ`CODEX_RATE_LIMIT_MODEL_SWITCH_RECOVERY_FAILED`となり、本文・設定変更は未送信。このdialogは`agent_approval`の対象ではなく、inspectは`reason="rate_limit_model_switch"`だけを返し、prompt digestとchoicesを出さない。
+
 ```text
 agent_launch({ harness: "codex-cli", session_name: "codex1", cwd: "/repo",
               prompt: "port test/legacy.py to vitest",

package/README.md

@@ -216,7 +216,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.37.9** · 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.37.10** · 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
 
@@ -270,6 +270,8 @@ Grok／Composerがread-only sandboxの適用を拒否した場合、prompt送信
 
 この判定はGrok専用アダプターが所有し、同じCLIを使うComposerにも適用する。初回prompt付きの`agent_launch`と通常の`pty_send`で、入力受付待ち中に拒否を検出すると未送信のエラーを返す。promptなし・`trust_project`指定なしの起動応答は入力受付を保証しない。`trust_project:true`では入力受付まで確認し、`startup.status`を返す。Grokのprivacy notice起動設定も同アダプターが所有する。実装の責務分担は[DESIGN](docs/DESIGN.md#failure-and-recovery)を参照。
 
+Codex 0.155.1の「Approaching rate limits」model切替dialogは、通常の`pty_send`と`agent_configure`で同じsessionのまま一時的な**2. Keep current model**だけを選ぶ。入力受付を再確認してから本文または設定変更を進め、dispatch receiptの`pane_input_recovery`には`codex_rate_limit_model_switch_kept_current`を記録する。model切替と今後の表示抑止は選ばない。入力受付へ戻らなければ`CODEX_RATE_LIMIT_MODEL_SWITCH_RECOVERY_FAILED`となり、本文・設定変更は未送信。このdialogは`agent_approval`の対象ではなく、inspectは`reason="rate_limit_model_switch"`だけを返し、prompt digestとchoicesを出さない。
+
 For a correlated Claude turn stopped at `Do you want to proceed?`, use `claude_approval(action: "inspect", ...)` to capture the active operation and SHA-256 screen digest, review the displayed command, then call `respond` with that exact digest and either `approve_once` or `deny`. The relay rechecks the operation and screen under the send lock, never exposes arbitrary input or permanent approval, keeps the active marker intact, and records a prompt-free owner-only receipt. `pty_send(force: true)` does not bypass this boundary.
 
 ```text

package/dist/core.js

@@ -19,7 +19,7 @@ import { AitermError, telemetryOwnedFailure, ownTelemetryFailure } from "./error
 import { isWin, SOCKDIR, tmuxCommand, sendPsmuxPayload, loadPtyBufferChunk, pasteBufferBaseArgs, TMUX_EMPTY_CONFIG, attachCommand, normalizePaneCommand, atomicShellMultiline, appendMarkSentinel, markShellCommand, settlePaneLog, paneCwdArgument, sessionEnvironmentLaunch, } 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, observeGrokDone, buildGrokAgentCmd, grokLaunchNote, grokEnvTokens, grokTuiReady, grokTuiBusy, grokPaneObservation, grokRateLimitDialog, grokStartupAction, grokLaunchBlockingDialog, assertGrokSandboxNotRejected, GROK_COMPOSER_MARKER_RE, grokFooterHasConfiguration, grokTranscriptText, createGrokAgentMetadata, } from "./harnesses/grok.js";
-import { bindCodexTranscriptSession, latestCodexCompletion, observeCodexDone, buildCodexAgentCmd, codexLaunchNote, codexTuiReady, codexPaneObservation, codexApprovalDialog, codexStartupAction, CODEX_COMPOSER_MARKER_RE, codexModelChoice, codexEffortChoice, codexMoreReasoningChoice, codexTranscriptText, createCodexAgentMetadata, } from "./harnesses/codex.js";
+import { bindCodexTranscriptSession, latestCodexCompletion, observeCodexDone, buildCodexAgentCmd, codexLaunchNote, codexTuiReady, codexPaneObservation, codexRateLimitModelSwitchDialog, codexApprovalDialog, codexStartupAction, 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, claudePaneObservation, claudeStartupAction, CLAUDE_COMPOSER_MARKER_RE, createClaudeAgentMetadata, claudeSessionTranscriptPath, claudeApiErrorFromLine, } from "./harnesses/claude.js";
 import { bindCursorTranscriptSession, cursorTurnBoundary, latestCursorCompletion, observeCursorDone, cursorTranscriptText, assertCursorAuthenticationReady, assertCursorModelAvailable, buildCursorAgentCmd, cursorPromptWithLineage, createCursorAgentMetadata, cursorLaunchNote, cursorEffortNavigation, cursorTuiReady, cursorPaneObservation, CURSOR_SUBMIT_SEQUENCE, CURSOR_COMPOSER_CONTENT_MARKER_RE, validateCursorModelEffort, } from "./harnesses/cursor.js";
 import { resolveAgentBin, resolveThroughlineBin, runThroughlineHandoffContext, isWindowsNativeExecutable, agentBinForPaneShell, resolveWinPaneShell } from "./agent-resolver.js";
@@ -1414,7 +1414,7 @@ export function runAgentApproval(options) {
         const dialog = codexApprovalDialog(screen);
         if (!dialog) {
             result.status = state.state === "blocked" || state.state === "unknown" || action === "respond" ? "blocked" : "none";
-            result.reason = state.state === "blocked" ? "unknown_dialog" : state.state === "unknown" ? "unrecognized_screen" : "no_current_dialog";
+            result.reason = state.state === "blocked" ? state.reason : state.state === "unknown" ? "unrecognized_screen" : "no_current_dialog";
             return result;
         }
         result.kind = dialog.kind;
@@ -3242,6 +3242,31 @@ function sendMenuChoice(name, choice) {
         throw new AitermError(`agent設定の選択を送れませんでした: ${sent.stderr.trim() || `code=${sent.code}`}`, 2);
     }
 }
+/** Codexの上限接近modalは承認APIへ出さず、一時keepの2だけを選んで共通ready gateへ戻す。 */
+async function recoverCodexRateLimitModelSwitch(name, meta) {
+    const dialog = meta.kind === "codex"
+        ? codexRateLimitModelSwitchDialog(captureScreen(name, AGENT_TUI_READY_LINES))
+        : null;
+    if (!dialog)
+        return false;
+    const live = observeSession(name);
+    if (live.harness_alive !== true) {
+        throw new AitermError(`CODEX_RATE_LIMIT_MODEL_SWITCH_RECOVERY_BLOCKED: ${live.reason}。今回の文字列は送信していません。`, 2);
+    }
+    sendMenuChoice(name, String(dialog.keepCurrentIndex));
+    return true;
+}
+/** ready待機中に現れたCodex利用上限modalも、同じ一時keep復旧へ戻す。 */
+async function waitAgentTuiReadyAfterCodexRateLimitRecovery(name, meta, timeoutMs) {
+    let codexRateLimitModelSwitch = await recoverCodexRateLimitModelSwitch(name, meta);
+    let ready = await waitAgentTuiReady(name, meta, timeoutMs);
+    if (!ready.ready && !codexRateLimitModelSwitch) {
+        codexRateLimitModelSwitch = await recoverCodexRateLimitModelSwitch(name, meta);
+        if (codexRateLimitModelSwitch)
+            ready = await waitAgentTuiReady(name, meta, timeoutMs);
+    }
+    return { ready, codexRateLimitModelSwitch };
+}
 /** 同じ対話sessionを保ったまま、harness標準の操作でmodel／effortを変更する。 */
 export async function configureAgent(name, opts) {
     assertSessionName(name);
@@ -3254,9 +3279,13 @@ export async function configureAgent(name, opts) {
     }
     const meta = loadAgentMetadata(name);
     bindCompletedInitialPrompt(meta);
-    const ready = await waitAgentTuiReady(name, meta, AGENT_TUI_READY_TIMEOUT_MS);
-    if (!ready.ready)
+    const { ready, codexRateLimitModelSwitch } = await waitAgentTuiReadyAfterCodexRateLimitRecovery(name, meta, AGENT_TUI_READY_TIMEOUT_MS);
+    if (!ready.ready) {
+        if (codexRateLimitModelSwitch) {
+            throw new AitermError(`CODEX_RATE_LIMIT_MODEL_SWITCH_RECOVERY_FAILED: ${codexPaneObservation(ready.lastScreen).reason}。設定変更は送信していません。`, 2);
+        }
         throw new AitermError(`agent session '${name}' は入力待ちではありません`, 2);
+    }
     if (meta.kind === "claude") {
         if (model) {
             await sendAgentPromptText(name, `/model ${model}`);
@@ -3441,6 +3470,7 @@ export async function dispatchAgentTurn(name, text, o = {}) {
         && agentCompletionCursor(meta) === 0
         && readClaudeOperationMarker(meta) === null;
     const paneInputRecovery = await ensureAgentOwnsPaneInput(name, meta.kind);
+    let codexRateLimitModelSwitch = false;
     const limitDialog = meta.kind === "grok" || meta.kind === "composer"
         ? grokRateLimitDialog(captureScreen(name, 0)) : null;
     if (limitDialog) {
@@ -3453,8 +3483,13 @@ export async function dispatchAgentTurn(name, text, o = {}) {
         sendKey(name, limitDialog.dismissKey);
     }
     if (meta.kind !== "claude" || claudeColdStart) {
-        const ready = await waitAgentTuiReady(name, meta, o.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
+        const recovery = await waitAgentTuiReadyAfterCodexRateLimitRecovery(name, meta, o.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
+        codexRateLimitModelSwitch = recovery.codexRateLimitModelSwitch;
+        const { ready } = recovery;
         if (!ready.ready) {
+            if (codexRateLimitModelSwitch) {
+                throw new AitermError(`CODEX_RATE_LIMIT_MODEL_SWITCH_RECOVERY_FAILED: ${codexPaneObservation(ready.lastScreen).reason}。今回の文字列は送信していません。`, 2);
+            }
             if (limitDialog) {
                 const reason = grokPaneObservation(ready.lastScreen).reason;
                 throw new AitermError(`GROK_RATE_LIMIT_RECOVERY_FAILED: ${reason}。上限パネル解除後の入力受付を確認できません。今回の文字列は送信していません。`, 2);
@@ -3463,6 +3498,8 @@ export async function dispatchAgentTurn(name, text, o = {}) {
                 "少し後で pty_read(screen:true) を確認し、TUI が起動済みなら再度 pty_send してください。", 2);
         }
     }
+    if (codexRateLimitModelSwitch)
+        paneInputRecovery.push("codex_rate_limit_model_switch_kept_current");
     if (limitDialog)
         paneInputRecovery.push("grok_rate_limit_dialog_dismissed");
     const startOffset = agentCompletionCursor(meta);

package/dist/harnesses/codex.js

@@ -390,7 +390,7 @@ function currentCodexDialog(screen) {
     // 過去の完了footerより前の質問・選択番号を、現在のdialogへ持ち込まない。
     const previousFooter = footers.at(-2);
     const current = previousFooter ? screen.slice(previousFooter.index + previousFooter[0].length) : screen;
-    const heading = [...current.matchAll(/Would you like to run the following command\?|Allow the [^\n]+ MCP server to run tool|Hooks need review|Do you trust the contents of this directory|Update available!/g)].at(-1);
+    const heading = [...current.matchAll(/Would you like to run the following command\?|Allow the [^\n]+ MCP server to run tool|Hooks need review|Do you trust the contents of this directory|Update available!|Approaching rate limits/g)].at(-1);
     return heading ? current.slice(heading.index) : current;
 }
 export function codexPaneObservation(screen) {
@@ -400,7 +400,7 @@ export function codexPaneObservation(screen) {
     const tail = screen.split("\n").slice(-24).join("\n");
     // 現在のmodal footerがある時だけ、折返しで上へ出た質問を画面全体から探す。
     const lastComposer = [...tail.matchAll(/(?:^|\n)[ \t]*[›>](?![ \t]*\d+\.)/g)].at(-1)?.index ?? -1;
-    const lastDialog = [...tail.matchAll(/Press enter to confirm or esc to (?:cancel|go back)|enter to submit\s*\|\s*esc to cancel|Would you like to run the following command\?|Allow the [^\n]+ MCP server to run tool|Hooks need review|Do you trust the contents of this directory|Update available!/gi)].at(-1)?.index ?? -1;
+    const lastDialog = [...tail.matchAll(/Press enter to confirm or esc to (?:cancel|go back)|enter to submit\s*\|\s*esc to cancel|Would you like to run the following command\?|Allow the [^\n]+ MCP server to run tool|Hooks need review|Do you trust the contents of this directory|Update available!|Approaching rate limits/gi)].at(-1)?.index ?? -1;
     const modal = lastDialog > lastComposer;
     if (!modal) {
         if (/esc to interrupt/i.test(tail))
@@ -415,12 +415,35 @@ export function codexPaneObservation(screen) {
         return { state: "blocked", reason: "mcp_approval" };
     if (/Hooks need review/.test(current))
         return { state: "blocked", reason: "hooks_review" };
+    if (codexRateLimitModelSwitchDialog(current))
+        return { state: "blocked", reason: "rate_limit_model_switch" };
     if (codexLaunchBlockingDialog(current))
         return { state: "blocked", reason: "startup_dialog" };
     if (modal)
         return { state: "blocked", reason: "unknown_dialog" };
     return { state: "unknown", reason: "unrecognized_screen" };
 }
+/**
+ * Codex 0.155.1 の利用上限接近modal。agent_approvalの対象ではないため、選択肢は公開しない。
+ * 1はmodel切替、3は今後の表示抑止なので、Aitermが選んでよいのは一時keepの2だけである。
+ */
+export function codexRateLimitModelSwitchDialog(screen) {
+    const current = currentCodexDialog(screen);
+    const footer = current.lastIndexOf("Press enter to confirm or esc to go back");
+    const composer = [...current.matchAll(/(?:^|\n)[ \t]*[›>](?![ \t]*\d+\.)/g)].at(-1)?.index ?? -1;
+    // 現在のcomposerがmodal footerより後なら、scrollbackの古いmodalである。
+    if (composer > footer)
+        return null;
+    if (!/(?:^|\n)\s*Approaching rate limits\s*(?:\n|$)/.test(current)
+        || !/(?:^|\n)\s*Switch to gpt-5\.6-luna for lower credit usage\?\s*(?:\n|$)/.test(current)
+        || !/(?:^|\n)[ \t]*(?:›[ \t]*)?1\. Switch to gpt-5\.6-luna(?:[ \t]{2,}[^\n]*)?[ \t]*(?:\n|$)/.test(current)
+        || !/(?:^|\n)[ \t]*(?:›[ \t]*)?2\. Keep current model[ \t]*(?:\n|$)/.test(current)
+        || !/(?:^|\n)[ \t]*(?:›[ \t]*)?3\. Keep current model \(never show again\)(?:[ \t]{2,}[^\n]*)?[ \t]*(?:\n|$)/.test(current)
+        || !/Press enter to confirm or esc to go back/i.test(current))
+        return null;
+    const selected = current.match(/(?:^|\n)[ \t]*›[ \t]*([123])\. (?:Switch to gpt-5\.6-luna|Keep current model(?: \(never show again\))?)(?:[ \t]{2,}[^\n]*)?[ \t]*(?:\n|$)/)?.[1];
+    return { keepCurrentIndex: 2, selectedIndex: selected ? Number(selected) : null };
+}
 export function codexStartupFailure(screen) {
     return /(?:^|\n)[ \t]*[›>]?[ \t]*Error loading config\.toml:/m.test(screen)
         ? "configuration_error" : null;

package/docs/00_overview.md

@@ -20,12 +20,10 @@ Grok／Composerのsandbox起動拒否については、[DESIGNの失敗と復旧
 Codex親への回答の自動配送は[DESIGN](DESIGN.md#codex親への自動配送)に、対応範囲と失敗時の状態を置く。
 Claude Code親の非同期hookによる受信は[DESIGN](DESIGN.md#claude-code親への自動配送)を参照する。
 
-## 実装待ちの設計
-
-- [Grokの過去の利用上限表示からの復帰](https://github.com/kitepon/aiterm-mcp/blob/main/docs/grok-rate-limit-recovery-plan.md): 設計完了・実装未着手。通常dispatchでのパネル解除、現在の画面による上限観測、試験と実機受入を定める。
-
 ## 履歴と証拠
 
+- [Grokの上限パネル復帰の受入](https://github.com/kitepon/aiterm-mcp/blob/main/docs/adr/0069-grok-rate-limit-recovery.md): 通常送信による解除、公開package試験、本番導入と実機未検証範囲。
+
 - [`archive/`](https://github.com/kitepon/aiterm-mcp/tree/main/docs/archive): 完了・棄却・中断・失効・置換により現行制御から外れたsnapshot。
 - [`adr/`](https://github.com/kitepon/aiterm-mcp/tree/main/docs/adr): 採択・棄却した設計判断とrelease受入。
 - [`evidence/`](https://github.com/kitepon/aiterm-mcp/tree/main/docs/evidence): Lattice／campaignの検証証拠。

package/package.json

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