aiterm-mcp 0.8.0 → 0.9.1

package/dist/grok-stop-hook.js

@@ -0,0 +1,120 @@
+#!/usr/bin/env node
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+const LAUNCH_ID_RE = /^[0-9a-f]{32}$/;
+const SESSION_RE = /^[A-Za-z0-9_-]{1,64}$/;
+const MAX_STDIN_BYTES = 1024 * 1024;
+function fail(message) {
+    process.stderr.write(`aiterm grok-stop-hook: ${message}\n`);
+    process.exit(0);
+}
+function noop() {
+    process.exit(0);
+}
+function hasAitermEnv() {
+    return !!(process.env.AITERM_AGENT_KIND ||
+        process.env.AITERM_SESSION_ID ||
+        process.env.AITERM_AGENT_SESSION_ID ||
+        process.env.AITERM_AGENT_LAUNCH_ID);
+}
+function uid() {
+    if (typeof process.getuid !== "function")
+        fail("POSIX getuid が使えません");
+    return process.getuid();
+}
+function runtimeStateBase() {
+    const xdg = process.env.XDG_RUNTIME_DIR;
+    if (xdg) {
+        try {
+            if (fs.statSync(xdg).isDirectory())
+                return xdg;
+        }
+        catch {
+            /* XDG_RUNTIME_DIR が壊れている CI/非 login 環境では os.tmpdir() に戻す */
+        }
+    }
+    return os.tmpdir();
+}
+function secureAgentsDir() {
+    const root = path.join(runtimeStateBase(), `aiterm-mcp-${uid()}`);
+    const agents = path.join(root, "agents");
+    const rst = fs.lstatSync(root);
+    if (!rst.isDirectory() || rst.isSymbolicLink() || rst.uid !== uid() || (rst.mode & 0o077) !== 0) {
+        fail(`agent state root が安全ではありません: ${root}`);
+    }
+    const ast = fs.lstatSync(agents);
+    if (!ast.isDirectory() || ast.isSymbolicLink() || ast.uid !== uid() || (ast.mode & 0o077) !== 0) {
+        fail(`agent state dir が安全ではありません: ${agents}`);
+    }
+    return agents;
+}
+function str(v) {
+    return typeof v === "string" ? v : null;
+}
+async function readStdin() {
+    const chunks = [];
+    let total = 0;
+    for await (const chunk of process.stdin) {
+        const b = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk));
+        total += b.length;
+        if (total > MAX_STDIN_BYTES)
+            fail("payload が大きすぎます");
+        chunks.push(b);
+    }
+    return Buffer.concat(chunks).toString("utf8");
+}
+function appendEvent(file, event) {
+    const nofollow = fs.constants.O_NOFOLLOW ?? 0;
+    const line = JSON.stringify(event) + "\n";
+    if (Buffer.byteLength(line, "utf8") > 64 * 1024)
+        fail("event line が大きすぎます");
+    const fd = fs.openSync(file, fs.constants.O_CREAT | fs.constants.O_APPEND | fs.constants.O_WRONLY | nofollow, 0o600);
+    try {
+        const st = fs.fstatSync(fd);
+        if (!st.isFile() || st.uid !== uid() || st.nlink !== 1 || (st.mode & 0o077) !== 0) {
+            fail(`event file が安全ではありません: ${file}`);
+        }
+        fs.writeSync(fd, line, undefined, "utf8");
+    }
+    finally {
+        fs.closeSync(fd);
+    }
+}
+async function main() {
+    if (!hasAitermEnv())
+        noop();
+    const kind = process.env.AITERM_AGENT_KIND;
+    const session = process.env.AITERM_SESSION_ID || process.env.AITERM_AGENT_SESSION_ID || "";
+    const launchId = process.env.AITERM_AGENT_LAUNCH_ID || "";
+    if (kind !== "grok" && kind !== "composer")
+        fail(`AITERM_AGENT_KIND が grok/composer ではありません: ${kind ?? ""}`);
+    if (!SESSION_RE.test(session))
+        fail(`session id が不正です: ${session}`);
+    if (!LAUNCH_ID_RE.test(launchId))
+        fail(`launch id が不正です: ${launchId}`);
+    let payload = {};
+    const input = await readStdin();
+    if (input.trim()) {
+        try {
+            payload = JSON.parse(input);
+        }
+        catch {
+            payload = {};
+        }
+    }
+    const agents = secureAgentsDir();
+    const eventFile = path.join(agents, `${session}.${launchId}.events.jsonl`);
+    appendEvent(eventFile, {
+        type: "agent_done",
+        vendor: kind,
+        aiterm_session: session,
+        launch_id: launchId,
+        vendor_session_id: str(payload.sessionId),
+        turn_id: str(payload.promptId),
+        reason: str(payload.reason) ?? str(payload.hookEventName) ?? "stop",
+        done_status: "turn_done",
+        at: new Date().toISOString(),
+    });
+}
+main().catch((e) => fail(e instanceof Error ? e.message : String(e)));

package/dist/index.js

@@ -44,11 +44,19 @@ server.registerTool("pty_open", {
     }
 });
 server.registerTool("pty_send", {
-    description: "セッションへテキスト(コマンド)を送る。送信後の出力は pty_read で取得する。",
+    description: "セッションへテキスト(コマンド)を送る。通常は送信だけ行い、出力は pty_read で取得する。" +
+        "agent_done:true で起動した Codex/Grok/Composer セッションは wait:'agent_done' で Stop hook まで待てる。",
     inputSchema: {
         session_id: z.string(),
         text: z.string().describe("送る文字列（コマンド）"),
         enter: z.boolean().default(true).describe("末尾で Enter を送る"),
+        wait: z
+            .enum(["none", "agent_done"])
+            .default("none")
+            .describe("none=従来通り送信のみ。agent_done=agent Stop hook まで待って最終画面を返す"),
+        timeout: z.number().default(600).describe("wait:'agent_done' の最大待ち秒数"),
+        screen: z.boolean().default(true).describe("wait:'agent_done' の返り値を描画済みスクリーンにする"),
+        lines: z.number().int().nullish().describe("wait:'agent_done' で返す末尾 N 行"),
         mark: z
             .boolean()
             .default(false)
@@ -58,8 +66,20 @@ server.registerTool("pty_send", {
         rtk: z.boolean().default(false).describe("既知コマンドを rtk 形へ委譲して送る（rtk 不在なら素通し）"),
         raw: z.boolean().default(false).describe("送信前サニタイズを無効化"),
     },
-}, async ({ session_id, text, enter, mark, force, rtk, raw }) => {
+}, async ({ session_id, text, enter, wait, timeout, screen, lines, mark, force, rtk, raw }) => {
     try {
+        if (wait === "agent_done") {
+            return ok(await core.sendAndWaitAgentDone(session_id, text, {
+                enter,
+                mark,
+                force,
+                rtk,
+                raw,
+                timeout,
+                screen,
+                lines: lines ?? null,
+            }));
+        }
         return ok(core.send(session_id, text, { enter, mark, force, rtk, raw }));
     }
     catch (e) {
@@ -175,14 +195,19 @@ function registerAgentTool(toolName, kind, desc, grokLike) {
                 .describe(agentEffortDesc(grokLike)),
             cwd: z.string().nullish().describe("作業ディレクトリ（対象リポのルート等・任意）"),
             session_name: z.string().nullish().describe("セッション名（省略で自動採番）"),
+            agent_done: z
+                .boolean()
+                .default(false)
+                .describe("managed Stop hook を有効化し、pty_send(wait:'agent_done') を使えるようにする"),
         },
-    }, async ({ prompt, reasoning_effort, cwd, session_name }) => {
+    }, async ({ prompt, reasoning_effort, cwd, session_name, agent_done }) => {
         try {
             const [sid, hint] = core.openAgent(kind, {
                 prompt: prompt ?? undefined,
                 reasoning_effort: reasoning_effort ?? undefined,
                 cwd: cwd ?? undefined,
                 session_name: session_name ?? undefined,
+                agent_done: agent_done ?? false,
             });
             return ok(`session_id: ${sid}\n${hint}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiterm-mcp",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "mcpName": "io.github.kitepon-rgb/aiterm-mcp",
   "description": "AI-driven persistent terminal as a local stdio MCP server (tmux-backed). Holds one local PTY; SSH and containers are just commands you send into it. Also launches interactive Codex/Grok/Composer agent TUIs in a persistent terminal. Token-reducing reads.",
   "keywords": [