aiterm-mcp 0.41.3 → 0.42.0

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.42.0] - 2026-09-28
+
+### 追加
+
+- BellTeamとの連携用に、`pty_observe`がBellTeamからの要求にだけ、実行中のturnで書かれた作業の合間の言葉を返せるようにした。ほかの呼び手に対するツールの説明、引数、結果は変わらない。判断はrepositoryの`docs/adr/0071-bellteam-interim-words.md`。
+
+### 修正
+
+- Cursorは記録にturnの終了を書いたあとも、しばらく画面に実行中の表示を残す。完了通知の直後に`pty_send`すると差し込みと判定し、`STEER_NOT_QUEUED`で失敗していた（手元で3回中2回）。記録の末尾がturnの終了なら新しいturnとして送る。
+
 ## [0.41.3] - 2026-09-28
 
 ### 修正
@@ -1828,7 +1838,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.41.3...HEAD
+[Unreleased]: https://github.com/kitepon/aiterm-mcp/compare/v0.42.0...HEAD
+[0.42.0]: https://github.com/kitepon/aiterm-mcp/compare/v0.41.3...v0.42.0
 [0.41.3]: https://github.com/kitepon/aiterm-mcp/compare/v0.41.2...v0.41.3
 [0.41.2]: https://github.com/kitepon/aiterm-mcp/compare/v0.41.1...v0.41.2
 [0.41.1]: https://github.com/kitepon/aiterm-mcp/compare/v0.41.0...v0.41.1

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.41.3** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
+**状態:** 開発継続中 · 現行公開版 **v0.42.0** · 動作対象は 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.41.3** · 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.42.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).
 
 ### Update and rollback
 

package/dist/core.js

@@ -22,6 +22,7 @@ import { realGrokHome, resolveAndValidateGrokAuth, assertGrokModelAvailable, gro
 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, claudeLoginMethodMenu, CLAUDE_COMPOSER_MARKER_RE, createClaudeAgentMetadata, claudeSessionTranscriptPath, claudeApiErrorFromLine, claudeApiErrorAfter, } from "./harnesses/claude.js";
 import { bindCursorTranscriptSession, cursorTurnBoundary, latestCursorCompletion, observeCursorDone, cursorTranscriptText, assertCursorAuthenticationReady, assertCursorModelAvailable, buildCursorAgentCmd, cursorAgentArgv, cursorPwshLaunchLine, cursorPromptWithLineage, createCursorAgentMetadata, cursorLaunchNote, cursorEffortNavigation, cursorTuiReady, cursorPaneObservation, cursorPromptHooksRunning, cursorUsageLimit, CURSOR_SUBMIT_SEQUENCE, CURSOR_COMPOSER_CONTENT_MARKER_RE, validateCursorModelEffort, } from "./harnesses/cursor.js";
+import { readInterimWords, recordInterimBoundary } from "./interim-words.js";
 import { resolveAgentBin, resolveThroughlineBin, runThroughlineHandoffContext, isWindowsNativeExecutable, agentBinForPaneShell, resolveWinPaneShell } from "./agent-resolver.js";
 export { AitermError } from "./errors.js";
 export { tmuxSpawnEnv } from "./tmux-runtime.js";
@@ -306,7 +307,8 @@ function cleanupAgentState(name) {
                     f.endsWith(".cursor-result.json") ||
                     f.endsWith(".claude-operation.json") ||
                     f.endsWith(".claude-approval.json") ||
-                    f.endsWith(".claude-dispatch"))
+                    f.endsWith(".claude-dispatch") ||
+                    f.endsWith(".interim.json"))
                     fs.unlinkSync(p);
                 else if (f.endsWith(".codex-home") || f.endsWith(".grok-home") || f.endsWith(".cursor-plugin") || f.endsWith(".home")) {
                     fs.rmSync(p, { recursive: true, force: true });
@@ -1333,6 +1335,7 @@ export function killAll() {
                     f.endsWith(".claude-result.json") ||
                     f.endsWith(".claude-operation.json") ||
                     f.endsWith(".claude-dispatch") ||
+                    f.endsWith(".interim.json") ||
                     f.endsWith(".codex-home") ||
                     f.endsWith(".grok-home") ||
                     f.endsWith(".home")) {
@@ -2406,6 +2409,14 @@ async function settlePublishedClaudeCompletionMarker(meta, marker) {
     }
     return active;
 }
+/** BellTeamのため: agent sessionの現在（または直前）のturnの合間の言葉。agent sessionでなければnull。 */
+export function readSessionInterimWords(name, after) {
+    assertSessionName(name);
+    const dir = existingAgentsDir();
+    if (!dir || !fs.readdirSync(dir).some((f) => f.startsWith(`${name}.`) && f.endsWith(".agent.json")))
+        return null;
+    return readInterimWords(loadAgentMetadata(name), after);
+}
 /** agent harness の構造化 transcript から直近完了ターンの最終回答と相関情報を読む。 */
 export async function readAgentTranscriptResult(name, o = {}) {
     const meta = loadAgentMetadata(name);
@@ -3626,6 +3637,7 @@ export async function dispatchAgentTurn(name, text, o = {}) {
     prepareSendText(dispatchText, { raw: o.raw });
     await o.before_send?.({ session_id: name, launch_id: meta.launch_id, vendor: meta.kind,
         harness: agentHarness(meta.kind), event_cursor: startOffset, operation_id: operationId });
+    recordInterimBoundary(meta, startOffset, operationId);
     if (meta.kind === "claude") {
         // durable／anonymousを分岐する前に同じsend preflightを通す。拒否されるpromptの
         // receipt／active markerだけを残して、来ないStopを待つ状態を作らない。
@@ -3716,6 +3728,11 @@ export async function sendAgentMessage(name, text, o = {}) {
         clearClaudeApiErrorOperation(meta);
         running = readClaudeOperationMarker(meta) !== null;
     }
+    // Cursorはturn_endedを記録へ書いたあとも、しばらく画面にbusy表示を残す。その間に差し込むと待ち行列へ入らず
+    // STEER_NOT_QUEUEDで失敗していた（実測 2026-09-28、完了通知の直後の送信で3回中2回）。記録の末尾がturn_endedなら
+    // turnは終わっているので新しいturnとして送る。dispatchは入力を受け付けるまで待ってから送る。
+    if (running && meta.kind === "cursor" && latestCursorCompletion(meta, readTranscriptLines) !== null)
+        running = false;
     if (running) {
         return steerRunningTurn(name, meta, text, { raw: o.raw, pane_input_recovery: paneInputRecovery });
     }

package/dist/index.js

@@ -20,6 +20,7 @@ import { acceptRemote, callRemoteTool, observeRemoteAgentDone, remoteInputDescri
 import { codexParentFromRequest } from "./codex-parent-receiver.js";
 import { claudeParentFromRequest } from "./claude-parent-receiver.js";
 import { cursorParentFromRequest, isCursorMcpClient } from "./cursor-parent-receiver.js";
+import { INTERIM_RESULT_META_KEY, interimRequestFromMeta } from "./interim-words.js";
 // package.json の version を実行時に読み、MCP initialize で配るサーバ版と一致させる。
 // createRequire を使うのは、import 属性 `with { type: "json" }` が Node 18.20+ 限定で
 // engines "node >=18"（18.0〜18.19）を SyntaxError で壊し、旧 `assert` 構文は逆に Node 22 で
@@ -587,16 +588,30 @@ registerRemoteAwareTool("pty_observe", {
             cpu_seconds: z.number().nullable(), cpu_delta_seconds: z.number().nullable(), cpu_delta_complete: z.boolean().nullable(),
             background_cpu_seconds: z.number().nullable(), background_cpu_delta_seconds: z.number().nullable(), background_cpu_delta_complete: z.boolean().nullable() }),
     },
-}, async ({ session_id, cursor }) => {
+}, async ({ session_id, cursor }, extra) => {
     try {
         const observation = core.observeSession(session_id, cursor);
         const result = { ...observation, ...(parentDelivery ? { parent_deliveries: parentDelivery.status(session_id) } : {}) };
-        return { ...ok(JSON.stringify(result)), structuredContent: { ...result } };
+        return { ...ok(JSON.stringify(result)), structuredContent: { ...result }, ...interimWordsMeta(session_id, extra._meta) };
     }
     catch (e) {
         return fail(e);
     }
 });
+// BellTeamのため: 要求の_metaに aiterm/caller="BellTeam" がある時だけ、結果の_metaへ合間の言葉を載せる。
+// 説明と引数には出さない（interim-words.ts の冒頭）。それ以外の呼び手には何も足さない。
+function interimWordsMeta(sessionId, requestMeta) {
+    const request = interimRequestFromMeta(requestMeta);
+    if (!request)
+        return {};
+    try {
+        const words = core.readSessionInterimWords(sessionId, request.after);
+        return words ? { _meta: { [INTERIM_RESULT_META_KEY]: words } } : {};
+    }
+    catch (e) {
+        return { _meta: { [INTERIM_RESULT_META_KEY]: { schema: "aiterm.interim-words.v1", error: e instanceof Error ? e.message : String(e) } } };
+    }
+}
 registerRemoteAwareTool("agent_approval", {
     description: "Codexの現在の承認をinspectし、digestへ束縛した単発許可または拒否をrespondする。恒久許可は選ばない。Claudeは既存claude_approvalを使う。未知dialogはblockedのtyped errorで返す。",
     inputSchema: {

package/dist/interim-words.js

@@ -0,0 +1,256 @@
+// 合間の言葉: agent sessionがturnの途中で書き、そのあと道具を使った言葉。
+// BellTeamのためにある。BellTeamは実行中のBotが何をしているかを会話画面へ出すため、
+// pty_observeのMCP要求の_metaに caller="BellTeam" を入れて呼び、結果の_metaでこれを受け取る。
+// 利用者向けのツール説明と引数には出さない（BellTeam以外のAIに指定させないため）。要らないものと見て消さないこと。
+//
+// 最後の回答と思考は含めない。APIエラーやsession limitの知らせは、記録に書かれていれば含める。
+// ハーネスごとの見分け方（2026-09-28 記録で確認）:
+//   Claude Code: text block で message.stop_reason="tool_use"。isApiErrorMessage の行は知らせ。
+//   Codex:       assistant message の phase="commentary"。
+//   Grok:        content が空でなく tool_calls を持つ assistant。
+//   Cursor:      assistant の text のあとに tool_use が続くもの（Cursorは道具が終わってから行を書くので遅れて届く）。
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { AitermError } from "./errors.js";
+import { agentHarness, agentsDir, assertSessionName, LAUNCH_ID_RE, readFileRange, safeStatSize, writeJson0600, } from "./agent-shared.js";
+import { claudeSessionTranscriptPath } from "./harnesses/claude.js";
+import { codexRootTranscript } from "./harnesses/codex.js";
+import { grokSessionDirectory } from "./harnesses/grok.js";
+import { cursorTranscript } from "./harnesses/cursor.js";
+/** BellTeamが要求の_metaへ入れる呼び手の印。値が "BellTeam" の時だけ合間の言葉を返す。 */
+export const INTERIM_CALLER_META_KEY = "aiterm/caller";
+export const INTERIM_CALLER = "BellTeam";
+/** 前回受け取った最後のseq。これより後の言葉だけを返す。 */
+export const INTERIM_AFTER_META_KEY = "aiterm/interim_after";
+/** 結果の_metaで返すキー。 */
+export const INTERIM_RESULT_META_KEY = "aiterm/interim_words";
+export function agentInterimBoundaryPath(name, launchId) {
+    assertSessionName(name);
+    if (!LAUNCH_ID_RE.test(launchId))
+        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
+    return path.join(agentsDir(), `${name}.${launchId}.interim.json`);
+}
+/** 要求の_metaがBellTeamの印を持つ時だけ、前回のseqを返す。それ以外はnull（何も足さない）。 */
+export function interimRequestFromMeta(meta) {
+    if (!meta || typeof meta !== "object")
+        return null;
+    const record = meta;
+    if (record[INTERIM_CALLER_META_KEY] !== INTERIM_CALLER)
+        return null;
+    const after = record[INTERIM_AFTER_META_KEY];
+    return { after: typeof after === "number" && Number.isSafeInteger(after) && after > 0 ? after : 0 };
+}
+function parse(line) {
+    if (!line.trim())
+        return null;
+    try {
+        return JSON.parse(line);
+    }
+    catch {
+        // 書込み途中の末尾行と、byte境界で切れた先頭行は読まない。
+        return null;
+    }
+}
+// ---------------------------------------------------------------- Claude Code
+function claudeText(content) {
+    if (typeof content === "string")
+        return content;
+    if (!Array.isArray(content))
+        return "";
+    return content.map((part) => (part?.type === "text" && typeof part.text === "string" ? part.text : "")).join("");
+}
+export function claudeInterimWords(lines) {
+    const words = [];
+    for (const line of lines) {
+        const record = parse(line);
+        if (record?.type !== "assistant" || record.isSidechain === true)
+            continue;
+        const at = typeof record.timestamp === "string" ? record.timestamp : null;
+        if (record.isApiErrorMessage === true) {
+            const text = claudeText(record.message?.content).trim();
+            if (text)
+                words.push({ text, kind: "error", at, turn_id: null });
+            continue;
+        }
+        if (record.message?.stop_reason !== "tool_use")
+            continue;
+        const text = claudeText(record.message?.content).trim();
+        if (text)
+            words.push({ text, kind: "interim", at, turn_id: null });
+    }
+    return words;
+}
+// ---------------------------------------------------------------- Codex
+export function codexInterimWords(lines) {
+    const words = [];
+    for (const line of lines) {
+        const record = parse(line);
+        const payload = record?.payload;
+        if (record?.type !== "response_item" || payload?.type !== "message" || payload?.role !== "assistant"
+            || payload?.phase !== "commentary" || !Array.isArray(payload?.content))
+            continue;
+        const text = payload.content
+            .map((item) => (item?.type === "output_text" && typeof item.text === "string" ? item.text : ""))
+            .join("")
+            .trim();
+        if (!text)
+            continue;
+        const turnId = payload.internal_chat_message_metadata_passthrough?.turn_id;
+        words.push({
+            text,
+            kind: "interim",
+            at: typeof record.timestamp === "string" ? record.timestamp : null,
+            turn_id: typeof turnId === "string" && turnId ? turnId : null,
+        });
+    }
+    return words;
+}
+// ---------------------------------------------------------------- Grok
+function grokRealUser(record) {
+    return record?.type === "user" && !("synthetic_reason" in record);
+}
+export function grokUserCount(lines) {
+    let count = 0;
+    for (const line of lines)
+        if (grokRealUser(parse(line)))
+            count++;
+    return count;
+}
+/** boundary+1番目のuser発話（このturnの依頼）以後のassistantのうち、言葉と道具の呼び出しを両方持つもの。 */
+export function grokInterimWords(lines, boundary) {
+    const words = [];
+    let users = 0;
+    for (const line of lines) {
+        const record = parse(line);
+        if (grokRealUser(record))
+            users++;
+        if (users <= boundary || record?.type !== "assistant")
+            continue;
+        if (!Array.isArray(record.tool_calls) || record.tool_calls.length === 0)
+            continue;
+        const text = typeof record.content === "string" ? record.content.trim() : "";
+        if (text)
+            words.push({ text, kind: "interim", at: null, turn_id: null });
+    }
+    return words;
+}
+// ---------------------------------------------------------------- Cursor
+/**
+ * boundary+1番目のuser発話（このturnの依頼）以後で、あとにtool_useが続いたtextの塊。
+ * 次にuser発話かturn_endedが来た塊はそのturnの最後の回答なので含めない。末尾で行き先が決まっていない塊も待つ。
+ */
+export function cursorInterimWords(lines, boundary) {
+    const words = [];
+    let users = 0;
+    let pending = [];
+    for (const line of lines) {
+        const record = parse(line);
+        if (!record)
+            continue;
+        if (record.role === "user" || record.type === "turn_ended") {
+            if (record.role === "user")
+                users++;
+            pending = [];
+            continue;
+        }
+        if (record.role !== "assistant" || !Array.isArray(record.message?.content))
+            continue;
+        for (const part of record.message.content) {
+            if (part?.type === "text" && typeof part.text === "string")
+                pending.push(part.text);
+            else if (part?.type === "tool_use") {
+                const text = pending.join("\n").trim();
+                if (text && users > boundary)
+                    words.push({ text, kind: "interim", at: null, turn_id: null });
+                pending = [];
+            }
+        }
+    }
+    return words;
+}
+// ---------------------------------------------------------------- 境界と読み取り
+function claudeTranscriptSize(meta) {
+    const file = claudeSessionTranscriptPath(meta);
+    return file ? safeStatSize(file) : 0;
+}
+function grokChatHistory(meta) {
+    const dir = grokSessionDirectory(meta);
+    return dir ? path.join(dir, "chat_history.jsonl") : null;
+}
+function readLines(file, from = 0) {
+    if (!file)
+        return [];
+    const size = safeStatSize(file);
+    if (size <= from)
+        return [];
+    return readFileRange(file, from, size).toString("utf8").split("\n");
+}
+/**
+ * dispatchの送信直前に、このturnの言葉が記録のどこから始まるかを残す。
+ * eventCursorはdispatch receiptのevent_cursor（Codex・Cursorでは境界そのもの）。
+ * 失敗してもdispatchは止めない。境界が古いままでも、呼び手はevent_cursorの不一致で気づける。
+ */
+export function recordInterimBoundary(meta, eventCursor, operationId) {
+    try {
+        let boundary;
+        if (meta.kind === "claude")
+            boundary = claudeTranscriptSize(meta);
+        else if (meta.kind === "grok")
+            boundary = grokUserCount(readLines(grokChatHistory(meta)));
+        else
+            boundary = eventCursor;
+        const value = {
+            schema: "aiterm.interim-boundary.v1",
+            event_cursor: eventCursor,
+            operation_id: operationId,
+            boundary,
+            dispatched_at: new Date().toISOString(),
+        };
+        writeJson0600(agentInterimBoundaryPath(meta.aiterm_session, meta.launch_id), value);
+    }
+    catch {
+        /* 合間の言葉は表示のためだけにある。送信を妨げない。 */
+    }
+}
+function readInterimBoundary(meta) {
+    let value;
+    try {
+        value = JSON.parse(fs.readFileSync(agentInterimBoundaryPath(meta.aiterm_session, meta.launch_id), "utf8"));
+    }
+    catch {
+        return null;
+    }
+    if (value?.schema !== "aiterm.interim-boundary.v1" || !Number.isSafeInteger(value.boundary) || value.boundary < 0
+        || !Number.isSafeInteger(value.event_cursor))
+        return null;
+    return value;
+}
+/** 現在（または直前）のturnで書かれた合間の言葉のうち、seqがafterより後のもの。 */
+export function readInterimWords(meta, after) {
+    const recorded = readInterimBoundary(meta);
+    // dispatchの記録が無ければ、起動時promptのturnだけを記録の先頭から読む。promptなしで起動してまだ送っていない時は無い。
+    const launchTurn = !recorded && meta.initial_prompt !== "none";
+    let found = [];
+    if (recorded || launchTurn) {
+        const boundary = recorded?.boundary ?? 0;
+        if (meta.kind === "claude")
+            found = claudeInterimWords(readLines(claudeSessionTranscriptPath(meta), boundary));
+        else if (meta.kind === "codex")
+            found = codexInterimWords(readLines(codexRootTranscript(meta), boundary));
+        else if (meta.kind === "grok")
+            found = grokInterimWords(readLines(grokChatHistory(meta)), boundary);
+        else
+            found = cursorInterimWords(readLines(cursorTranscript(meta)), boundary);
+    }
+    const words = found.map((word, index) => ({ seq: index + 1, ...word }));
+    return {
+        schema: "aiterm.interim-words.v1",
+        session_id: meta.aiterm_session,
+        launch_id: meta.launch_id,
+        harness: agentHarness(meta.kind),
+        event_cursor: recorded?.event_cursor ?? null,
+        operation_id: recorded?.operation_id ?? null,
+        last_seq: words.length,
+        words: words.filter((word) => word.seq > after),
+    };
+}

package/package.json

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