aiterm-mcp 0.29.9 → 0.29.10

package/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.29.10] - 2026-08-31
+
+### Fixed
+
+- Return `pty_read(agent_transcript:true)` answer text separately as `aiterm.pty-read-result.v1` structured content while preserving the existing human-readable diagnostic suffix.
+- For Grok and Composer, return only the last non-empty assistant message after the last real user row instead of joining tool-use preambles with the final answer.
+
 ## [0.29.9] - 2026-08-31
 
 ### Fixed
@@ -1401,7 +1408,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.29.9...HEAD
+[Unreleased]: https://github.com/kitepon/aiterm-mcp/compare/v0.29.10...HEAD
+[0.29.10]: https://github.com/kitepon/aiterm-mcp/compare/v0.29.9...v0.29.10
 [0.29.9]: https://github.com/kitepon/aiterm-mcp/compare/v0.29.8...v0.29.9
 [0.29.8]: https://github.com/kitepon/aiterm-mcp/compare/v0.29.7...v0.29.8
 [0.29.7]: https://github.com/kitepon/aiterm-mcp/compare/v0.29.6...v0.29.7

package/README.ja.md

@@ -153,7 +153,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.29.9** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
+**状態:** 開発継続中 · 現行公開版 **v0.29.10** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
 
 ### 更新と巻き戻し
 
@@ -443,7 +443,7 @@ handoff contextを前置きできる。この任意経路は`throughline >= 0.9.
 `launch_operation_id`とは併用不可で、元sessionのDB所属を変更しない。Throughlineは
 `THROUGHLINE_BIN`、次に`PATH`から解決し、不在・不正・空のexportはPTY作成前に明示失敗する。
 
-エージェントの回答が画面tailより長ければ、`pty_read({ agent_transcript:true })`で再promptなしに全文回収する。Claudeはlaunch相関Stop hook、Codexは通常rollout、Grokは通常session history、Cursorはlaunch IDでbindした通常agent transcriptから同じturnを回収する。
+エージェントの回答が画面tailより長ければ、`pty_read({ agent_transcript:true })`で再promptなしに全文回収する。既存の人間向けcontentは診断suffixを維持し、機械呼出し側は`aiterm.pty-read-result.v1`の`structuredContent.text`から回答本文だけを取得する。Claudeはlaunch相関Stop hook、Codexは通常rollout、Grokは最後の実user行以後の最後の空でないassistantメッセージだけ、Cursorはlaunch IDでbindした通常agent transcriptから同じturnを回収する。
 
 ### 完了検出（5 層）
 

package/README.md

@@ -169,7 +169,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.29.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.29.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
 
@@ -475,7 +475,7 @@ cannot be combined with `launch_operation_id`, and leaves the source session's d
 unchanged. Throughline is resolved through `THROUGHLINE_BIN` and then `PATH`; a missing or invalid
 export fails before the PTY exists instead of silently launching clean.
 
-When an agent's answer is longer than the on-screen tail (pane height ≈ 24 lines), callers recover it in full with `pty_read({ agent_transcript: true })`. It returns the most recently completed turn's final assistant message in plain text with no re-prompting. Claude reads the bounded owner-only result captured by the launch-correlated Stop hook and verifies its digest/byte count; it never reads Claude's private transcript. Durable machine callers should use `claude_turn`: `issue` sends once, `recover` never sends, `pending` is distinct from unsafe or malformed state, and only `completed` carries the exact verified `raw_output`. Codex uses the normal rollout transcript's `task_complete.turn_id`; Grok/Composer use their normal session history after the last real user row; Cursor uses the normal agent transcript bound to the launch ID and current turn. Missing or ambiguous attribution remains an explicit error.
+When an agent's answer is longer than the on-screen tail (pane height ≈ 24 lines), callers recover it in full with `pty_read({ agent_transcript: true })`. It returns the most recently completed turn's final assistant message in plain text with no re-prompting. The existing human-readable content keeps its diagnostic suffix; machine callers read the answer alone from `structuredContent.text` in `aiterm.pty-read-result.v1`. Claude reads the bounded owner-only result captured by the launch-correlated Stop hook and verifies its digest/byte count; it never reads Claude's private transcript. Durable machine callers should use `claude_turn`: `issue` sends once, `recover` never sends, `pending` is distinct from unsafe or malformed state, and only `completed` carries the exact verified `raw_output`. Codex uses the normal rollout transcript's `task_complete.turn_id`; Grok/Composer return the last non-empty assistant message after the last real user row, excluding tool-use preambles; Cursor uses the normal agent transcript bound to the launch ID and current turn. Missing or ambiguous attribution remains an explicit error.
 
 ### Completion detection (5 layers)
 

package/dist/core.js

@@ -1994,8 +1994,8 @@ async function settlePublishedClaudeCompletionMarker(meta, marker) {
     }
     return active;
 }
-/** agent harness の構造化 transcript から直近完了ターンの最終回答を読む。 */
-export async function readAgentTranscript(name, o = {}) {
+/** agent harness の構造化 transcript から直近完了ターンの最終回答と相関情報を読む。 */
+export async function readAgentTranscriptResult(name, o = {}) {
     const meta = loadAgentMetadata(name);
     const operationId = o.operation_id == null ? null : validateOperationId(o.operation_id);
     if (operationId && meta.kind !== "claude") {
@@ -2050,7 +2050,18 @@ export async function readAgentTranscript(name, o = {}) {
         done?.operation_id ? `operation_id=${done.operation_id}` : null,
         `raw_chars=${rawChars}`,
     ].filter(Boolean).join(" ");
-    return `${body}\n${outputMeta} [${transcriptMeta}]`;
+    return {
+        text: body,
+        display: `${body}\n${outputMeta} [${transcriptMeta}]`,
+        vendor: meta.kind,
+        turn_id: turnId,
+        harness: agentHarness(meta.kind),
+        raw_chars: rawChars,
+    };
+}
+/** 人間向け互換表示を維持する。機械利用は readAgentTranscriptResult の text を使う。 */
+export async function readAgentTranscript(name, o = {}) {
+    return (await readAgentTranscriptResult(name, o)).display;
 }
 function inferAgentFrontend(name, meta, screen) {
     const fg = paneCurrentCommand(name);

package/dist/harnesses/grok.js

@@ -283,7 +283,7 @@ export function grokFooterHasConfiguration(screen, model, effort) {
         return modelLabel !== null || effort !== null;
     });
 }
-// 最後のuser発話以降のassistantメッセージをchat_history.jsonlから抽出する。
+// 最後のuser発話以降に確定した最後のassistantメッセージをchat_history.jsonlから抽出する。
 export function grokTranscriptText(meta, readTranscriptLines, transcriptUnavailable) {
     if (!meta.grok_home || !meta.vendor_session_id)
         transcriptUnavailable();
@@ -307,11 +307,12 @@ export function grokTranscriptText(meta, readTranscriptLines, transcriptUnavaila
             // 外部 transcript の壊れた1行は残りの完結行を読む妨げにしない。
         }
     }
-    return records
+    const replies = records
         .slice(lastUser + 1)
         .filter((record) => record?.type === "assistant" && typeof record?.content === "string")
-        .map((record) => record.content)
-        .join("\n");
+        .map((record) => record.content.trim())
+        .filter(Boolean);
+    return replies.at(-1) ?? "";
 }
 export function createGrokAgentMetadata(kind, name, cwd, initialPrompt, authPath, writeScope, lineageContext) {
     const launchId = randomBytes(16).toString("hex");

package/dist/index.js

@@ -239,16 +239,39 @@ server.registerTool("pty_read", {
             .nullish()
             .describe("Claude operationの期待ID。agent_transcript:true時だけ指定し、古い別operationの結果を拒否する"),
     },
+    outputSchema: {
+        schema: z.literal("aiterm.pty-read-result.v1"),
+        mode: z.enum(["terminal", "agent_transcript"]),
+        session_id: z.string(),
+        text: z.string(),
+        vendor: z.enum(["claude", "codex", "grok", "composer", "cursor"]).nullable(),
+        turn_id: z.string().nullable(),
+        harness: z.enum(["claude-code", "codex-cli", "grok-cli", "cursor-cli"]).nullable(),
+        raw_chars: z.number().int().nonnegative().nullable(),
+    },
 }, async ({ session_id, wait, until, until_regex, timeout, screen, full, lines, line_range, raw, rtk, agent_transcript, operation_id }) => {
     try {
         if (agent_transcript) {
             if (screen || full || rtk || wait || line_range != null) {
                 throw new Error("agent_transcript:true は screen / full / rtk / line_range / wait と併用できません。lines のみ指定できます。");
             }
-            return ok(await core.readAgentTranscript(session_id, {
+            const result = await core.readAgentTranscriptResult(session_id, {
                 lines: lines ?? null,
                 operation_id: operation_id ?? null,
-            }));
+            });
+            return {
+                content: [{ type: "text", text: result.display }],
+                structuredContent: {
+                    schema: "aiterm.pty-read-result.v1",
+                    mode: "agent_transcript",
+                    session_id,
+                    text: result.text,
+                    vendor: result.vendor,
+                    turn_id: result.turn_id,
+                    harness: result.harness,
+                    raw_chars: result.raw_chars,
+                },
+            };
         }
         if (operation_id != null)
             throw new Error("operation_idはagent_transcript:true時だけ指定できます");
@@ -279,7 +302,19 @@ server.registerTool("pty_read", {
             raw,
             rtk,
         });
-        return ok(out);
+        return {
+            content: [{ type: "text", text: out }],
+            structuredContent: {
+                schema: "aiterm.pty-read-result.v1",
+                mode: "terminal",
+                session_id,
+                text: out,
+                vendor: null,
+                turn_id: null,
+                harness: null,
+                raw_chars: null,
+            },
+        };
     }
     catch (e) {
         return fail(e);

package/package.json

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