aiterm-mcp 0.12.2 → 0.15.0

package/dist/core.js

@@ -42,6 +42,7 @@ const NON_POSIX_MARK_SHELLS = new Set(["fish", "csh", "tcsh"]);
 // send の printf 書式（`rc=%d`）と対で保守すること。
 const MARK_DONE_RE = /<<<AITERM_DONE rc=[0-9]+>>>/;
 const LAUNCH_ID_RE = /^[0-9a-f]{32}$/;
+const OPERATION_ID_RE = /^sha256:[0-9a-f]{64}$/;
 const AGENT_DONE_POLL_MS = 100;
 const AGENT_DONE_SETTLE_MIN_MS = 250;
 const AGENT_DONE_SCREEN_SETTLE_POLL_MS = 100;
@@ -53,7 +54,10 @@ const AGENT_EVENT_TAIL_BYTES = 64 * 1024;
 const AGENT_METADATA_NEGATIVE_CACHE_TTL_MS = 2_000;
 const AGENT_TUI_READY_TIMEOUT_MS = 30_000;
 const AGENT_TUI_READY_POLL_MS = 500;
+const AGENT_TUI_READY_STABLE_SAMPLES = 11;
 const AGENT_TUI_READY_LINES = 45;
+const GROK_AUTH_MAX_BYTES = 64 * 1024;
+const CLAUDE_RESULT_MAX_BYTES = 4 * 1024 * 1024;
 // 出力削減（RTK の CAP 思想を移植）
 const MAX_LINES_BEFORE_ELIDE = 60;
 const HEAD_LINES = 30;
@@ -63,6 +67,12 @@ const LINE_HEAD_CHARS = 1200;
 const LINE_TAIL_CHARS = 600;
 const DEDUP_MIN_RUN = 3; // 同一行がこれ以上連続したら 1 行＋件数に畳む
 const MAX_FULL_BYTES = 8 * 1024 * 1024; // full/range 読取で一度にメモリへ載せる上限（B7）
+const MAX_SEND_BYTES = 64 * 1024;
+// macOSのPTY入力queueは、tmuxが長文を1回で流すと後半を落とすことがある。
+// UTF-8境界を守って小さいtmux client roundtripに分け、各回にserver event loopがPTYへdrainできる境界を作る。
+const PTY_PASTE_CHUNK_BYTES = process.platform === "darwin" ? 256 : MAX_SEND_BYTES;
+const SESSION_SEND_LOCK_WAIT_MS = 10_000;
+const SESSION_SEND_LOCK_POLL_MS = 25;
 // 安全: send 前に弾く破壊的コマンド（外部システム境界の防御）
 const DESTRUCTIVE = [
     // rm -rf の危険な対象形（best-effort・force で越えられる）。先頭の任意クオート ['"]? で
@@ -199,18 +209,19 @@ function resolveTmux(observe = true) {
     }
     ptyDependencyError(tmuxMissingMessage(), observe);
 }
-function tmuxCommand(observe, ...args) {
+function tmuxCommandWithInput(observe, input, ...args) {
     // maxBuffer は既定 1MiB。capture-pane（大きなスクロールバック）や多セッションの list-sessions で
     // 頭打ちになり stdout が切れる/空になる。Python の subprocess.run は無制限だったので 64MiB へ広げる。
     // Windows は同じ tmux を WSL 経由（-e でログインシェル非経由＝$ 展開やクオート崩れを防ぐ）で叩く。
     let r;
+    const spawnOpts = { encoding: "utf8", maxBuffer: 64 * 1024 * 1024, input };
     if (isWin) {
         ensureWinBridge(observe);
-        r = spawnSync("wsl.exe", ["-e", "tmux", "-S", SOCK, ...args], { encoding: "utf8", maxBuffer: 64 * 1024 * 1024 });
+        r = spawnSync("wsl.exe", ["-e", "tmux", "-S", SOCK, ...args], spawnOpts);
     }
     else {
         // resolveTmux() は tmux を解決できなければ明確な AitermError を投げる（POSIX 版の事前確認）。
-        r = spawnSync(resolveTmux(observe), ["-S", SOCK, ...args], { encoding: "utf8", maxBuffer: 64 * 1024 * 1024 });
+        r = spawnSync(resolveTmux(observe), ["-S", SOCK, ...args], spawnOpts);
     }
     // ENOBUFS（出力が 64MiB 超）を「code=1 の失敗」へ握り潰すと部分/空 stdout を正常扱いしてしまう。区別して投げる。
     // EXPECTED-FAILURE: 外部システム境界（tmux 出力過大）
@@ -225,9 +236,15 @@ function tmuxCommand(observe, ...args) {
     }
     return { code: r.status ?? 1, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
 }
+function tmuxCommand(observe, ...args) {
+    return tmuxCommandWithInput(observe, undefined, ...args);
+}
 function tmux(...args) {
     return tmuxCommand(true, ...args);
 }
+function tmuxWithInput(input, ...args) {
+    return tmuxCommandWithInput(true, input, ...args);
+}
 function tmuxCleanup(...args) {
     return tmuxCommand(false, ...args);
 }
@@ -238,6 +255,42 @@ function paneCurrentCommand(name) {
     const r = tmux("display-message", "-p", "-t", name, "#{pane_current_command}");
     return r.code === 0 ? r.stdout.trim() : "";
 }
+function pasteBufferSupportsNoSanitizeFlag() {
+    const listed = tmux("list-commands");
+    if (listed.code !== 0) {
+        throw new AitermError(`tmux paste-buffer 能力の確認に失敗しました: ${listed.stderr.trim() || `code=${listed.code}`}`, 2);
+    }
+    const usage = listed.stdout.split("\n").find((line) => line.startsWith("paste-buffer "));
+    if (!usage)
+        throw new AitermError("tmux list-commands にpaste-bufferがありません", 2);
+    // tmux 3.4は制御文字を無変換でpasteし、-S自体が無い。3.7は既定でvis(3)変換し、
+    // -Sが無変換を選ぶ。version文字比較で推測せず、実際のcommand usageにflagがあるかを見る。
+    return /\[-[^\]]*S[^\]]*\]/.test(usage);
+}
+function splitPtyText(text) {
+    const chunks = [];
+    let chunk = "";
+    let chunkBytes = 0;
+    for (const codePoint of text) {
+        const bytes = Buffer.byteLength(codePoint, "utf8");
+        if (chunk && chunkBytes + bytes > PTY_PASTE_CHUNK_BYTES) {
+            chunks.push(chunk);
+            chunk = "";
+            chunkBytes = 0;
+        }
+        chunk += codePoint;
+        chunkBytes += bytes;
+    }
+    if (chunk)
+        chunks.push(chunk);
+    return chunks;
+}
+function assertSendTextSize(text, context = "送信文字列") {
+    const bytes = Buffer.byteLength(text, "utf8");
+    if (bytes > MAX_SEND_BYTES) {
+        throw new AitermError(`${context}が${MAX_SEND_BYTES} bytesを超えています（${bytes} bytes）`, 2);
+    }
+}
 // session 名はファイルパス（logpath 等）と pipe-pane の /bin/sh 文字列へ流れる。英数 _ - のみ・64字に
 // 限定し、パストラバーサル（../）とシェルインジェクション（' でのクオート破り・$・; 等）を全入口で断つ。
 function assertSessionName(name) {
@@ -312,6 +365,31 @@ function agentWaitLockPath(name, launchId) {
         throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
     return path.join(agentsDir(), `${name}.${launchId}.wait.lock`);
 }
+function agentManagedClaudeSettingsPath(name, launchId) {
+    assertSessionName(name);
+    if (!LAUNCH_ID_RE.test(launchId))
+        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
+    return path.join(agentsDir(), `${name}.${launchId}.claude-settings.json`);
+}
+function agentClaudeResultPath(name, launchId) {
+    assertSessionName(name);
+    if (!LAUNCH_ID_RE.test(launchId))
+        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
+    return path.join(agentsDir(), `${name}.${launchId}.claude-result.json`);
+}
+function agentClaudeOperationPath(name, launchId) {
+    assertSessionName(name);
+    if (!LAUNCH_ID_RE.test(launchId))
+        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
+    return path.join(agentsDir(), `${name}.${launchId}.claude-operation.json`);
+}
+function agentClaudeDispatchReceiptPath(name, launchId, operationId) {
+    assertSessionName(name);
+    if (!LAUNCH_ID_RE.test(launchId))
+        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
+    const validated = validateOperationId(operationId);
+    return path.join(agentsDir(), `${name}.${launchId}.${validated.slice("sha256:".length)}.claude-dispatch`);
+}
 function agentManagedCodexHomePath(name, launchId) {
     assertSessionName(name);
     if (!LAUNCH_ID_RE.test(launchId))
@@ -365,7 +443,13 @@ function cleanupAgentState(name) {
                 continue;
             const p = path.join(dir, f);
             try {
-                if (f.endsWith(".agent.json") || f.endsWith(".events.jsonl") || f.endsWith(".wait.lock"))
+                if (f.endsWith(".agent.json") ||
+                    f.endsWith(".events.jsonl") ||
+                    f.endsWith(".wait.lock") ||
+                    f.endsWith(".claude-settings.json") ||
+                    f.endsWith(".claude-result.json") ||
+                    f.endsWith(".claude-operation.json") ||
+                    f.endsWith(".claude-dispatch"))
                     fs.unlinkSync(p);
                 else if (f.endsWith(".codex-home") || f.endsWith(".grok-home") || f.endsWith(".home")) {
                     fs.rmSync(p, { recursive: true, force: true });
@@ -393,6 +477,10 @@ function lastcmdpath(name) {
 function markpath(name) {
     return path.join(SOCKDIR, name + ".mark");
 }
+function sendLockPath(name) {
+    assertSessionName(name);
+    return path.join(SOCKDIR, name + ".send.lock");
+}
 function readOffset(name) {
     try {
         const n = parseInt(fs.readFileSync(offsetpath(name), "utf8").trim(), 10);
@@ -802,17 +890,21 @@ export function openSession(name, shell = "bash") {
     }
     return [nm, attachHint(nm)];
 }
+function prepareSendText(text, o) {
+    if (!o.raw)
+        text = text.replace(PASTE_MARKERS_RE, "").replace(ANSI_RE, "").replace(CTRL_RE, "");
+    if (!o.force)
+        assertNotDestructive(text, 3);
+    assertSendTextSize(text);
+    return text;
+}
 export function send(name, text, o = {}) {
     assertSessionName(name);
     const enter = o.enter ?? true;
     if (!sessionExists(name))
         throw new AitermError(`session '${name}' が無い（open してください）`, 2);
     assertInitialPromptNotPendingForSend(name, !!o.force);
-    if (!o.raw) {
-        text = text.replace(PASTE_MARKERS_RE, "").replace(ANSI_RE, "").replace(CTRL_RE, "");
-    }
-    if (!o.force)
-        assertNotDestructive(text, 3);
+    text = prepareSendText(text, o);
     if (o.mark) {
         // mark の sentinel は POSIX シェル構文。前面が fish/csh/tcsh 等の非 POSIX 対話シェルだと "$?" が
         // 壊れて sentinel が成立しない。黙って壊れた完了検出を作らず、明示エラーで until を促す（B8）。
@@ -822,41 +914,94 @@ export function send(name, text, o = {}) {
                 `正しく展開されません。until で完了パターンを指定してください。`, 2);
         }
     }
-    writeLastcmd(name, text); // read rtk の reducer 分類用（書換/mark 前の素のコマンド）
-    if (o.rtk)
-        text = rtkRewrite(text);
-    if (o.rtk && !o.force)
-        assertNotDestructive(text, 3, "rtk 変換後: ");
-    if (o.mark) {
-        // 実出力は rc=<数字>、この行のエコーは rc=%d(リテラル)。MARK_DONE_RE は数字アンカーで後者に免疫。
-        text = text + `; printf '\\n<<<AITERM_DONE rc=%d>>>\\n' "$?"`;
-        try {
-            fs.writeFileSync(markpath(name), "1"); // waitCompletion に sentinel 完了検出を有効化させる
+    const releaseSendLock = acquireSessionSendFileLock(name);
+    try {
+        // managed Claudeの通常送信は、lastcmd/mark/PTYのどれにも触れる前に拒否する。
+        // 拒否した呼び出しが古いmarkを消したり偽のmarkを残すと、後続readが存在しない
+        // sentinelを待つため、公開上の拒否は副作用ゼロでなければならない。
+        if (!o.preserveAgentOperation && managedClaudeOperation(name) !== undefined) {
+            throw new AitermError("managed Claude agent sessionへの通常送信はturn境界を失うため拒否します。" +
+                'pty_send(wait:"agent_done")を使うか、通常対話へ切り替えるならsessionをcloseしてagent_done:falseで起動し直してください。', 2);
+        }
+        writeLastcmd(name, text); // read rtk の reducer 分類用（書換/mark 前の素のコマンド）
+        if (o.rtk)
+            text = rtkRewrite(text);
+        if (o.rtk && !o.force)
+            assertNotDestructive(text, 3, "rtk 変換後: ");
+        if (o.mark)
+            text = text + `; printf '\\n<<<AITERM_DONE rc=%d>>>\\n' "$?"`;
+        assertSendTextSize(text, o.rtk || o.mark ? "変換後の送信文字列" : "送信文字列");
+        if (o.mark) {
+            try {
+                fs.writeFileSync(markpath(name), "1"); // waitCompletion に sentinel 完了検出を有効化させる
+            }
+            catch {
+                /* noop（フラグ書けなくても until/quiescence 経路は生きる） */
+            }
         }
-        catch {
-            /* noop（フラグ書けなくても until/quiescence 経路は生きる） */
+        else {
+            // 非 mark 送信は、未消化の古い mark 完了待ちを無効化する（前コマンドの sentinel を待ち続けない）。
+            try {
+                fs.unlinkSync(markpath(name));
+            }
+            catch {
+                /* noop */
+            }
         }
-    }
-    else {
-        // 非 mark 送信は、未消化の古い mark 完了待ちを無効化する（前コマンドの sentinel を待ち続けない）。
-        try {
-            fs.unlinkSync(markpath(name));
+        // `send-keys -l`と単発`paste-buffer`は、長文をPTY入力queueへ一度に流し、macOS CIで
+        // 途中以降が欠落しても tmux 自体は code=0 を返した。macOSだけUTF-8を壊さない256byte以下に分け、
+        // Linux/WSLは一括のままとする。全chunk＋Enterはsession単位のcross-process lock内で直列化する。
+        const pasteSupportsNoSanitize = pasteBufferSupportsNoSanitizeFlag();
+        const chunks = splitPtyText(text);
+        const bufferBase = `aiterm-${process.pid}-${randomBytes(8).toString("hex")}`;
+        for (let i = 0; i < chunks.length; i += 1) {
+            const bufferName = `${bufferBase}-${i}`;
+            const partial = i > 0
+                ? " 先行chunkはPTYに入力済みでEnterは未送信です。再送前に入力を確認・消去してください。"
+                : "";
+            const loaded = tmuxWithInput(chunks[i], "load-buffer", "-b", bufferName, "-");
+            if (loaded.code !== 0) {
+                tmuxCleanup("delete-buffer", "-b", bufferName);
+                throw new AitermError(`tmux bufferへの送信準備に失敗しました` +
+                    `（chunk ${i + 1}/${chunks.length}）: ${loaded.stderr.trim() || `code=${loaded.code}`}.${partial}`, 2);
+            }
+            // -r: LF→CR 置換を無効化。-Sは対応新版だけでvis(3)制御文字変換を無効化する。
+            // send 自身の raw/sanitize 契約だけを真実とし、tmux 側で黙って再変換させない。
+            const pasteArgs = ["paste-buffer", "-d", "-r"];
+            if (pasteSupportsNoSanitize)
+                pasteArgs.push("-S");
+            pasteArgs.push("-b", bufferName, "-t", name);
+            const pasted = tmux(...pasteArgs);
+            if (pasted.code !== 0) {
+                // paste 失敗時は -d で消えないbufferを明示的に掃除する。元エラーを優先する。
+                tmuxCleanup("delete-buffer", "-b", bufferName);
+                throw new AitermError(`tmux bufferのPTY送信に失敗しました` +
+                    `（chunk ${i + 1}/${chunks.length}）: ${pasted.stderr.trim() || `code=${pasted.code}`}.${partial}`, 2);
+            }
         }
-        catch {
-            /* noop */
+        if (enter) {
+            const entered = tmux("send-keys", "-t", name, "Enter");
+            if (entered.code !== 0) {
+                throw new AitermError(`文字列はPTYに入力済みですがtmuxへEnterを送れませんでした: ` +
+                    `${entered.stderr.trim() || `code=${entered.code}`}。再送前に入力を確認・消去してください`, 2);
+            }
         }
+        // コードポイント数で数える（JS の .length は UTF-16 単位で絵文字等がズレる。Python は len()=コードポイント）。
+        return `sent ${[...text].length} chars to ${name}` + (enter ? " (+Enter)" : "");
+    }
+    finally {
+        releaseSendLock();
     }
-    tmux("send-keys", "-t", name, "-l", "--", text);
-    if (enter)
-        tmux("send-keys", "-t", name, "Enter");
-    // コードポイント数で数える（JS の .length は UTF-16 単位で絵文字等がズレる。Python は len()=コードポイント）。
-    return `sent ${[...text].length} chars to ${name}` + (enter ? " (+Enter)" : "");
 }
-export function sendKey(name, key) {
+export function sendKey(name, key, o = {}) {
     assertSessionName(name);
     if (!sessionExists(name))
         throw new AitermError(`session '${name}' が無い`, 2);
     const k = KEYMAP[key.toLowerCase()] ?? key;
+    if (!o.preserveAgentOperation && managedClaudeOperation(name) !== undefined && k !== "C-c") {
+        throw new AitermError("managed Claude agent sessionではturn相関を壊さないC-cだけをpty_keyで送れます。" +
+            "他の対話操作はpty_send(wait:\"agent_done\")、終了はpty_closeを使ってください。", 2);
+    }
     tmux("send-keys", "-t", name, k);
     return `sent key ${k} to ${name}`;
 }
@@ -1066,8 +1211,15 @@ function closeSessionInternal(name, observeDependency = true) {
             throw new AitermError(`agent session '${name}' は別プロセス${d.pid != null ? `（pid ${d.pid}）` : ""}の agent_done 待機中のため close できません`, 2);
         }
     }
+    {
+        const sending = liveSendLocks(name);
+        if (sending.length > 0) {
+            const d = sending[0];
+            throw new AitermError(`session '${name}' は別プロセス${d.pid != null ? `（pid ${d.pid}）` : ""}の送信中のため close できません`, 2);
+        }
+    }
     (observeDependency ? tmux : tmuxCleanup)("kill-session", "-t", name);
-    for (const p of [logpath(name), offsetpath(name), lastcmdpath(name), markpath(name)]) {
+    for (const p of [logpath(name), offsetpath(name), lastcmdpath(name), markpath(name), sendLockPath(name)]) {
         try {
             fs.unlinkSync(p);
         }
@@ -1081,6 +1233,23 @@ function closeSessionInternal(name, observeDependency = true) {
 export function closeSession(name) {
     return closeSessionInternal(name, true);
 }
+/**
+ * Durable caller向けのclose receipt。
+ *
+ * closeSessionInternalのidempotent cleanupは維持し、呼出時点でtmux sessionが
+ * 存在したかだけを固定語彙で返す。MCP response loss後も同じsession IDで再試行すれば
+ * already_closedとなり、close完了を文字列解析なしで確定できる。
+ */
+export function closeSessionResult(name) {
+    assertSessionName(name);
+    const existed = sessionExists(name);
+    closeSessionInternal(name, true);
+    return {
+        schema: "aiterm.pty-close-result.v1",
+        session_id: name,
+        outcome: existed ? "closed" : "already_closed",
+    };
+}
 export function killAll() {
     if (agentWaitLocks.size > 0) {
         throw new AitermError(`agent_done 待機中の session があるため killAll できません: ${Array.from(agentWaitLocks).join(",")}`, 2);
@@ -1093,11 +1262,18 @@ export function killAll() {
             throw new AitermError(`agent_done 待機中の session があるため killAll できません: ${list}`, 2);
         }
     }
+    {
+        const sending = liveSendLocks(null);
+        if (sending.length > 0) {
+            const list = sending.map((d) => `${d.session}${d.pid != null ? `(pid ${d.pid})` : ""}`).join(",");
+            throw new AitermError(`送信中の session があるため killAll できません: ${list}`, 2);
+        }
+    }
     tmux("kill-server");
-    // B9: SOCKDIR 内の .log/.offset/.lastcmd/.mark 残骸も掃除する（残すと B5 の stale-log 復活の温床）。
+    // B9: SOCKDIR 内の .log/.offset/.lastcmd/.mark/.send.lock 残骸も掃除する。
     try {
         for (const f of fs.readdirSync(SOCKDIR)) {
-            if (/\.(log|offset|lastcmd|mark)$/.test(f)) {
+            if (/\.(log|offset|lastcmd|mark)$/.test(f) || f.endsWith(".send.lock")) {
                 try {
                     fs.unlinkSync(path.join(SOCKDIR, f));
                 }
@@ -1117,6 +1293,10 @@ export function killAll() {
                 if (f.endsWith(".agent.json") ||
                     f.endsWith(".events.jsonl") ||
                     f.endsWith(".wait.lock") ||
+                    f.endsWith(".claude-settings.json") ||
+                    f.endsWith(".claude-result.json") ||
+                    f.endsWith(".claude-operation.json") ||
+                    f.endsWith(".claude-dispatch") ||
                     f.endsWith(".codex-home") ||
                     f.endsWith(".grok-home") ||
                     f.endsWith(".home")) {
@@ -1139,6 +1319,7 @@ export function killAll() {
 const DEFAULT_AGENT_DONE_TIMEOUT = 600;
 const agentWaitLocks = new Set();
 const agentMetadataNegativeCache = new Map();
+let agentTuiReadyStableSamplesTestOverride = null;
 function normalizeAgentLauncherWait(v) {
     if (v == null || v === "none")
         return "none";
@@ -1152,6 +1333,9 @@ function codexHookScriptPath() {
 function grokHookScriptPath() {
     return path.join(path.dirname(fileURLToPath(import.meta.url)), "grok-stop-hook.js");
 }
+function claudeHookScriptPath() {
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), "claude-stop-hook.js");
+}
 function safeStatSize(p) {
     try {
         return fs.statSync(p).size;
@@ -1379,71 +1563,85 @@ function createManagedCodexHome(name, launchId, overrides = {}) {
     });
     return managedHome;
 }
-function realGrokHome() {
-    return process.env.GROK_HOME || path.join(process.env.HOME ?? os.homedir(), ".grok");
-}
-function validateGrokAuthLock(lockPath) {
-    let st;
-    try {
-        st = fs.lstatSync(lockPath);
-    }
-    catch (e) {
-        throw e;
-    }
-    if (st.isSymbolicLink())
-        throw new AitermError(`Grok auth lock が symlink です: ${lockPath}`, 2);
-    if (!st.isFile())
-        throw new AitermError(`Grok auth lock が通常ファイルではありません: ${lockPath}`, 2);
-    if (st.nlink !== 1)
-        throw new AitermError(`Grok auth lock が hard link です: ${lockPath}`, 2);
-    try {
-        fs.chmodSync(lockPath, 0o600);
-    }
-    catch {
-        /* lock file permission tightening is best-effort */
-    }
-}
-function ensureGrokAuthLock(srcHome) {
-    const lockPath = path.join(srcHome, "auth.json.lock");
-    try {
-        validateGrokAuthLock(lockPath);
-        return lockPath;
-    }
-    catch (e) {
-        if (e.code !== "ENOENT")
-            throw e;
-    }
-    try {
-        createEmpty0600NoFollow(lockPath);
-    }
-    catch (e) {
-        if (e.code !== "EEXIST")
-            throw e;
+function createManagedClaudeSettings(name, launchId) {
+    const hookScript = claudeHookScriptPath();
+    if (!fs.existsSync(hookScript)) {
+        throw new AitermError(`Claude Stop hook wrapper が見つかりません。npm run build を実行してください: ${hookScript}`, 2);
     }
-    validateGrokAuthLock(lockPath);
-    return lockPath;
+    const settings = agentManagedClaudeSettingsPath(name, launchId);
+    writeJson0600(settings, {
+        hooks: {
+            Stop: [
+                {
+                    hooks: [
+                        {
+                            type: "command",
+                            command: `${shq(process.execPath)} ${shq(hookScript)}`,
+                            timeout: 10,
+                        },
+                    ],
+                },
+            ],
+        },
+    });
+    return settings;
 }
-function linkGrokOauthFiles(srcHome, grokHome) {
-    const srcAuth = path.join(srcHome, "auth.json");
-    let authExists = false;
+function realGrokHome() {
+    return path.resolve(process.env.GROK_HOME || path.join(process.env.HOME ?? os.homedir(), ".grok"));
+}
+function resolveAndValidateGrokAuth(srcHome) {
+    const inheritedSet = Object.prototype.hasOwnProperty.call(process.env, "GROK_AUTH_PATH");
+    const inherited = process.env.GROK_AUTH_PATH;
+    if (inheritedSet && (!inherited || !path.isAbsolute(inherited)))
+        throw new AitermError("GROK_AUTH_PATH は空でない絶対パスで指定してください", 2);
+    const authPath = inherited ?? path.join(srcHome, "auth.json");
+    let fd;
     try {
-        const authSt = fs.statSync(srcAuth);
-        if (!authSt.isFile())
-            throw new AitermError(`Grok auth.json が通常ファイルではありません: ${srcAuth}`, 2);
-        authExists = true;
+        fd = fs.openSync(authPath, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW | fs.constants.O_NONBLOCK);
+        const st = fs.fstatSync(fd);
+        if (!st.isFile() || st.nlink !== 1 || st.uid !== currentUid() || (st.mode & 0o077) !== 0 || st.size > GROK_AUTH_MAX_BYTES) {
+            throw new AitermError("Grok 認証正本の安全検証に失敗しました", 2);
+        }
+        const value = JSON.parse(fs.readFileSync(fd, "utf8"));
+        if (!value || typeof value !== "object" || Array.isArray(value))
+            throw new AitermError("Grok 認証正本のJSONが不正です", 2);
+        // auth file 自体は O_NOFOLLOW で開いているが、中間 directory の symlink は辿り得る。
+        // vendor に渡す正本を path swap の入口にしないため、字句正規化した絶対 path と realpath を
+        // 一致させ、canonical な祖先も root まで検証する。same-UID race の排他は vendor lock の責務。
+        const lexicalPath = path.resolve(authPath);
+        const canonicalPath = fs.realpathSync(authPath);
+        if (lexicalPath !== canonicalPath)
+            throw new AitermError("Grok 認証正本の path に symlink を含められません", 2);
+        for (let dir = path.dirname(canonicalPath);; dir = path.dirname(dir)) {
+            const dirSt = fs.lstatSync(dir);
+            // /tmp のような root 所有 + sticky の共有 directory は、本人所有の private な
+            // 直下 directory を他 UID が rename/unlink できないため許可する。sticky 無しの
+            // group/other writable 祖先は path swap が可能なので従来どおり拒否する。
+            const writableByOthers = (dirSt.mode & 0o022) !== 0;
+            const protectedSharedRoot = dirSt.uid === 0 && (dirSt.mode & 0o1000) !== 0;
+            if (!dirSt.isDirectory()
+                || dirSt.isSymbolicLink()
+                || (dirSt.uid !== currentUid() && dirSt.uid !== 0)
+                || (writableByOthers && !protectedSharedRoot)) {
+                throw new AitermError("Grok 認証正本の祖先 directory が安全ではありません", 2);
+            }
+            const parent = path.dirname(dir);
+            if (parent === dir)
+                break;
+        }
+        return canonicalPath;
     }
     catch (e) {
-        if (e.code !== "ENOENT")
+        if (e.code === "ENOENT" && !inheritedSet && process.env.XAI_API_KEY)
+            return null;
+        if (e instanceof AitermError)
             throw e;
+        throw new AitermError(e.code === "ENOENT" ? "Grok 認証正本が見つかりません。先に grok login が必要です" : "Grok 認証正本を安全に開けません", 2);
     }
-    if (!authExists) {
-        if (process.env.XAI_API_KEY)
-            return;
-        throw new AitermError(`Grok auth.json が見つかりません。先に grok login が必要です: ${srcHome}`, 2);
+    finally {
+        if (fd !== undefined)
+            fs.closeSync(fd);
     }
-    const srcLock = ensureGrokAuthLock(srcHome);
-    fs.symlinkSync(srcAuth, path.join(grokHome, "auth.json"));
-    fs.symlinkSync(srcLock, path.join(grokHome, "auth.json.lock"));
 }
 function writeManagedGrokConfig(grokHome) {
     fs.mkdirSync(path.join(grokHome, "hooks"), { recursive: false, mode: 0o700 });
@@ -1471,17 +1669,7 @@ function writeManagedGrokConfig(grokHome) {
         "",
     ].join("\n"));
 }
-function createManagedGrokHome(name, launchId) {
-    const srcHome = realGrokHome();
-    let srcSt;
-    try {
-        srcSt = fs.statSync(srcHome);
-    }
-    catch {
-        throw new AitermError(`Grok home が見つかりません: ${srcHome}`, 2);
-    }
-    if (!srcSt.isDirectory())
-        throw new AitermError(`Grok home が directory ではありません: ${srcHome}`, 2);
+function createManagedGrokHome(name, launchId, authPath) {
     const grokHome = agentManagedGrokHomePath(name, launchId);
     const fakeHome = agentManagedGrokUserHomePath(name, launchId);
     fs.mkdirSync(grokHome, { recursive: false, mode: 0o700 });
@@ -1489,9 +1677,6 @@ function createManagedGrokHome(name, launchId) {
     fs.chmodSync(grokHome, 0o700);
     fs.chmodSync(fakeHome, 0o700);
     fs.symlinkSync(grokHome, path.join(fakeHome, ".grok"));
-    // OAuth refresh token rotation は auth.json だけでなく vendor lock と同じ実体を共有させる。
-    // per-launch GROK_HOME 隔離は維持し、通常 Grok home の hook/config/session は読ませない。
-    linkGrokOauthFiles(srcHome, grokHome);
     const hookScript = grokHookScriptPath();
     if (!fs.existsSync(hookScript)) {
         throw new AitermError(`Grok Stop hook wrapper が見つかりません。npm run build を実行してください: ${hookScript}`, 2);
@@ -1514,11 +1699,147 @@ function createManagedGrokHome(name, launchId) {
     });
     // Grok 0.2.87 は compat false でも ~/.claude/plugins の hook file を拾う。HOME を一時化して
     // plugin/hook source を完全に 0 にする。実 HOME は必要なら hook/agent 側で参照できるよう env で渡す。
-    return { grokHome, home: fakeHome };
+    return { grokHome, home: fakeHome, authPath };
 }
 function writeAgentMetadata(meta) {
     writeJson0600(agentMetadataPath(meta.aiterm_session, meta.launch_id), meta);
 }
+function validateOperationId(operationId) {
+    if (typeof operationId !== "string" || !OPERATION_ID_RE.test(operationId)) {
+        throw new AitermError("operation_id は sha256:<64 lowercase hex> で指定してください", 2);
+    }
+    return operationId;
+}
+function writeClaudeOperationMarker(meta, operationId) {
+    if (meta.kind !== "claude")
+        throw new AitermError("operation_id はClaude agent sessionだけで使用できます", 2);
+    writeJson0600(agentClaudeOperationPath(meta.aiterm_session, meta.launch_id), {
+        schema: "aiterm.claude-operation-marker.v1",
+        operation_id: operationId === null ? null : validateOperationId(operationId),
+    });
+}
+function readClaudeOperationMarker(meta) {
+    if (meta.kind !== "claude")
+        return null;
+    const file = agentClaudeOperationPath(meta.aiterm_session, meta.launch_id);
+    const nofollow = fs.constants.O_NOFOLLOW ?? 0;
+    let fd;
+    try {
+        fd = fs.openSync(file, fs.constants.O_RDONLY | nofollow);
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return null;
+        throw new AitermError(`Claude operation markerを確認できません: ${error.message}`, 2);
+    }
+    try {
+        const st = fs.fstatSync(fd);
+        if (!st.isFile() || st.uid !== currentUid() || st.nlink !== 1 || (st.mode & 0o077) !== 0 || st.size > 1024) {
+            throw new AitermError("Claude operation markerの安全検証に失敗しました", 2);
+        }
+        let value;
+        try {
+            value = JSON.parse(fs.readFileSync(fd, "utf8"));
+        }
+        catch {
+            throw new AitermError("Claude operation markerを読めません", 2);
+        }
+        const keys = value && typeof value === "object" && !Array.isArray(value) ? Object.keys(value).sort() : [];
+        if (keys.join(",") !== "operation_id,schema" ||
+            value.schema !== "aiterm.claude-operation-marker.v1" ||
+            (value.operation_id !== null &&
+                (typeof value.operation_id !== "string" || !OPERATION_ID_RE.test(value.operation_id)))) {
+            throw new AitermError("Claude operation markerが不正です", 2);
+        }
+        return { operationId: value.operation_id };
+    }
+    finally {
+        fs.closeSync(fd);
+    }
+}
+function reserveClaudeOperation(meta, operationId) {
+    const validated = validateOperationId(operationId);
+    const active = readClaudeOperationMarker(meta);
+    if (active?.operationId === validated) {
+        throw new AitermError(`operation ${validated} は既にdispatch済みです。再送しません。pty_read(agent_transcript:true, operation_id:...)で回収してください。`, 2);
+    }
+    if (active) {
+        throw new AitermError(`${active.operationId ? `別のoperation ${active.operationId}` : "operation_idなしのClaude turn"} が未解決です。` +
+            "Stop結果を回収するか、C-c後もStopが来なければsessionをcloseしてから次のoperationを送ってください。", 2);
+    }
+    const receipt = agentClaudeDispatchReceiptPath(meta.aiterm_session, meta.launch_id, validated);
+    try {
+        createEmpty0600NoFollow(receipt);
+    }
+    catch (error) {
+        if (error.code !== "EEXIST")
+            throw error;
+        let st;
+        try {
+            st = fs.lstatSync(receipt);
+        }
+        catch {
+            throw new AitermError("Claude dispatch receiptを確認できません", 2);
+        }
+        if (!st.isFile() || st.isSymbolicLink() || st.uid !== currentUid() || st.nlink !== 1 || (st.mode & 0o077) !== 0) {
+            throw new AitermError("Claude dispatch receiptの安全検証に失敗しました", 2);
+        }
+        throw new AitermError(`operation ${validated} は既にdispatch済みです。再送しません。`, 2);
+    }
+    try {
+        writeClaudeOperationMarker(meta, validated);
+    }
+    catch (error) {
+        try {
+            fs.unlinkSync(receipt);
+        }
+        catch { /* marker未作成時のrollback失敗は元エラーを優先 */ }
+        throw error;
+    }
+}
+function reserveAnonymousClaudeTurn(meta) {
+    const active = readClaudeOperationMarker(meta);
+    if (active) {
+        throw new AitermError(`${active.operationId ? `operation ${active.operationId}` : "operation_idなしのClaude turn"} が未解決です。` +
+            "Stop結果を回収するかsessionをcloseするまで次のturnを送れません。", 2);
+    }
+    writeClaudeOperationMarker(meta, null);
+}
+function managedClaudeOperation(name) {
+    let meta;
+    try {
+        meta = loadAgentMetadata(name);
+    }
+    catch (error) {
+        if (error instanceof AitermError && error.message.includes("agent_done 管理セッションではありません"))
+            return undefined;
+        throw error;
+    }
+    if (meta.kind !== "claude")
+        return undefined;
+    return readClaudeOperationMarker(meta);
+}
+function hasClaudeDispatchReceipt(meta, operationId) {
+    const file = agentClaudeDispatchReceiptPath(meta.aiterm_session, meta.launch_id, operationId);
+    let st;
+    try {
+        st = fs.lstatSync(file);
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return false;
+        throw new AitermError(`Claude dispatch receiptを確認できません: ${error.message}`, 2);
+    }
+    if (!st.isFile() ||
+        st.isSymbolicLink() ||
+        st.uid !== currentUid() ||
+        st.nlink !== 1 ||
+        (st.mode & 0o077) !== 0 ||
+        st.size !== 0) {
+        throw new AitermError("Claude dispatch receiptの安全検証に失敗しました", 2);
+    }
+    return true;
+}
 function normalizeInitialPromptState(v) {
     if (v === true)
         return "pending";
@@ -1581,13 +1902,101 @@ function probeWaitLock(p) {
 function unlinkStaleWaitLock(p) {
     try {
         const st = fs.lstatSync(p);
-        if (st.isFile() && !st.isSymbolicLink() && st.uid === currentUid())
+        const uid = typeof process.getuid === "function" ? process.getuid() : null;
+        if (st.isFile() && !st.isSymbolicLink() && (uid == null || st.uid === uid))
             fs.unlinkSync(p);
     }
     catch {
         /* noop */
     }
 }
+function liveSendLocks(name) {
+    let files;
+    try {
+        files = fs.readdirSync(SOCKDIR);
+    }
+    catch {
+        return [];
+    }
+    const out = [];
+    for (const f of files) {
+        if (!f.endsWith(".send.lock"))
+            continue;
+        const session = f.slice(0, -".send.lock".length);
+        if (name != null && session !== name)
+            continue;
+        const p = path.join(SOCKDIR, f);
+        const probe = probeWaitLock(p);
+        if (probe.live)
+            out.push({ session, pid: probe.pid, at: probe.at });
+        // dead send lockはここでunlinkしない。probe後に別processが同pathへ新しいlive lockを作る
+        // ABAが起きると、そのlive lockを消して二重owner化できる。close/killAllがsessionを止めた後に掃除する。
+    }
+    return out;
+}
+function acquireSessionSendFileLock(name) {
+    const p = sendLockPath(name);
+    const token = randomBytes(16).toString("hex");
+    const nofollow = fs.constants.O_NOFOLLOW ?? 0;
+    const deadline = Date.now() + SESSION_SEND_LOCK_WAIT_MS;
+    let fd = null;
+    let lastProbe = { pid: null, at: null, live: true };
+    while (fd == null) {
+        try {
+            fd = fs.openSync(p, fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_WRONLY | nofollow, 0o600);
+        }
+        catch (e) {
+            if (e.code !== "EEXIST")
+                throw e;
+            lastProbe = probeWaitLock(p);
+            if (!lastProbe.live) {
+                const detail = lastProbe.pid != null ? `pid ${lastProbe.pid}` : "owner不明";
+                throw new AitermError(`session '${name}' に前回送信のlock残骸があります（${detail}）。` +
+                    `自動回収は並行送信の混線を招くため行いません。pty_closeでsessionを閉じてから再作成するか、` +
+                    `不要な全sessionをpty_kill_allで停止して残骸を掃除してください`, 2);
+            }
+            if (Date.now() >= deadline) {
+                const detail = lastProbe.pid != null ? `pid ${lastProbe.pid}` : "owner不明";
+                throw new AitermError(`session '${name}' は別プロセスの送信中です（${detail}）。${SESSION_SEND_LOCK_WAIT_MS}ms待ってもlockを取得できませんでした`, 2);
+            }
+            Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, SESSION_SEND_LOCK_POLL_MS);
+        }
+    }
+    try {
+        fs.writeFileSync(fd, JSON.stringify({ pid: process.pid, at: new Date().toISOString(), token }) + "\n", "utf8");
+    }
+    catch (error) {
+        try {
+            fs.closeSync(fd);
+        }
+        catch {
+            /* noop */
+        }
+        // pathを再確認せずunlinkすると、外部置換後のlockを消し得る。書込失敗は残骸としてfail closedし、
+        // close/killAllのsession停止後cleanupへ委ねる。
+        throw error;
+    }
+    fs.closeSync(fd);
+    try {
+        fs.chmodSync(p, 0o600);
+    }
+    catch {
+        /* Windows等でmode強制できなくてもOS user temp境界とO_EXCLは維持される */
+    }
+    return () => {
+        try {
+            const st = fs.lstatSync(p);
+            if (!st.isFile() || st.isSymbolicLink())
+                return;
+            const current = JSON.parse(fs.readFileSync(p, "utf8").split("\n", 1)[0]);
+            if (current.token === token)
+                fs.unlinkSync(p);
+        }
+        catch {
+            /* 別ownerのlockや置換済みpathは消さない */
+        }
+    };
+}
 // close/killAll 用: 生きた別プロセス待機の wait lock を列挙する（stale 残骸は数えない）。
 function liveWaitLocks(name) {
     const dir = existingAgentsDir();
@@ -1662,6 +2071,32 @@ function acquireAgentWaitFileLock(meta) {
         }
     };
 }
+function createClaudeAgentMetadata(name, cwd, initialPrompt, launchOperationId, launchRequestDigest) {
+    const launchId = randomBytes(16).toString("hex");
+    const eventFile = agentEventPath(name, launchId);
+    const resultFile = agentClaudeResultPath(name, launchId);
+    createEmpty0600NoFollow(eventFile);
+    createEmpty0600NoFollow(resultFile);
+    const claudeSettings = createManagedClaudeSettings(name, launchId);
+    const meta = {
+        kind: "claude",
+        aiterm_session: name,
+        launch_id: launchId,
+        event_file: eventFile,
+        created_at: new Date().toISOString(),
+        cwd,
+        vendor_session_id: null,
+        initial_prompt: initialPrompt,
+        launch_operation_id: launchOperationId,
+        launch_request_digest: launchRequestDigest,
+        hook_route: "managed_claude_settings",
+        node_platform: process.platform,
+        claude_settings: claudeSettings,
+        result_file: resultFile,
+    };
+    writeAgentMetadata(meta);
+    return meta;
+}
 function createCodexAgentMetadata(name, cwd, initialPrompt, overrides = {}) {
     const launchId = randomBytes(16).toString("hex");
     const eventFile = agentEventPath(name, launchId);
@@ -1683,11 +2118,11 @@ function createCodexAgentMetadata(name, cwd, initialPrompt, overrides = {}) {
     writeAgentMetadata(meta);
     return meta;
 }
-function createGrokAgentMetadata(kind, name, cwd, initialPrompt) {
+function createGrokAgentMetadata(kind, name, cwd, initialPrompt, authPath) {
     const launchId = randomBytes(16).toString("hex");
     const eventFile = agentEventPath(name, launchId);
     createEmpty0600NoFollow(eventFile);
-    const managed = createManagedGrokHome(name, launchId);
+    const managed = createManagedGrokHome(name, launchId, authPath);
     const meta = {
         kind,
         aiterm_session: name,
@@ -1701,6 +2136,7 @@ function createGrokAgentMetadata(kind, name, cwd, initialPrompt) {
         node_platform: process.platform,
         grok_home: managed.grokHome,
         home: managed.home,
+        grok_auth_path: managed.authPath,
     };
     writeAgentMetadata(meta);
     return meta;
@@ -1725,7 +2161,7 @@ function loadAgentMetadata(name) {
         throw new AitermError(`agent metadata を読めません: ${e.message}`, 2);
     }
     const m = raw;
-    if ((m.kind !== "codex" && m.kind !== "grok" && m.kind !== "composer") ||
+    if ((m.kind !== "claude" && m.kind !== "codex" && m.kind !== "grok" && m.kind !== "composer") ||
         m.aiterm_session !== name ||
         typeof m.launch_id !== "string" ||
         !LAUNCH_ID_RE.test(m.launch_id)) {
@@ -1735,6 +2171,36 @@ function loadAgentMetadata(name) {
     if (m.event_file !== expectedEvent) {
         throw new AitermError("agent metadata の path が現在の secure state root と一致しません", 2);
     }
+    if (m.kind === "claude") {
+        const expectedSettings = agentManagedClaudeSettingsPath(name, m.launch_id);
+        const expectedResult = agentClaudeResultPath(name, m.launch_id);
+        const launchOperationId = m.launch_operation_id ?? null;
+        const launchRequestDigest = m.launch_request_digest ?? null;
+        if (m.hook_route !== "managed_claude_settings" ||
+            m.claude_settings !== expectedSettings ||
+            m.result_file !== expectedResult ||
+            ((launchOperationId === null) !== (launchRequestDigest === null)) ||
+            (launchOperationId !== null && !OPERATION_ID_RE.test(launchOperationId)) ||
+            (launchRequestDigest !== null && !OPERATION_ID_RE.test(launchRequestDigest))) {
+            throw new AitermError("agent metadata の path が現在の secure state root と一致しません", 2);
+        }
+        return {
+            kind: "claude",
+            aiterm_session: name,
+            launch_id: m.launch_id,
+            event_file: expectedEvent,
+            created_at: typeof m.created_at === "string" ? m.created_at : "",
+            cwd: typeof m.cwd === "string" ? m.cwd : null,
+            vendor_session_id: typeof m.vendor_session_id === "string" ? m.vendor_session_id : null,
+            initial_prompt: normalizeInitialPromptState(m.initial_prompt),
+            launch_operation_id: launchOperationId,
+            launch_request_digest: launchRequestDigest,
+            hook_route: "managed_claude_settings",
+            node_platform: process.platform,
+            claude_settings: expectedSettings,
+            result_file: expectedResult,
+        };
+    }
     if (m.kind === "codex") {
         const expectedHome = agentManagedCodexHomePath(name, m.launch_id);
         if (m.hook_route !== "managed_codex_home" || m.codex_home !== expectedHome) {
@@ -1759,6 +2225,10 @@ function loadAgentMetadata(name) {
     if (m.hook_route !== "managed_grok_home" || m.grok_home !== expectedGrokHome || m.home !== expectedHome) {
         throw new AitermError("agent metadata の path が現在の secure state root と一致しません", 2);
     }
+    const expectedAuthPath = resolveAndValidateGrokAuth(realGrokHome());
+    if ((typeof m.grok_auth_path === "string" ? m.grok_auth_path : null) !== expectedAuthPath) {
+        throw new AitermError("agent metadata の認証正本が現在の設定と一致しません", 2);
+    }
     return {
         kind: m.kind,
         aiterm_session: name,
@@ -1772,6 +2242,7 @@ function loadAgentMetadata(name) {
         node_platform: process.platform,
         grok_home: expectedGrokHome,
         home: expectedHome,
+        grok_auth_path: expectedAuthPath,
     };
 }
 function parseAgentDoneEvent(line, meta) {
@@ -1793,6 +2264,18 @@ function parseAgentDoneEvent(line, meta) {
     if (meta.vendor_session_id && ev.vendor_session_id !== meta.vendor_session_id) {
         return { event: null, malformed: false };
     }
+    if (meta.kind === "claude" &&
+        (typeof ev.vendor_session_id !== "string" ||
+            !ev.vendor_session_id ||
+            (ev.operation_id != null &&
+                (typeof ev.operation_id !== "string" || !OPERATION_ID_RE.test(ev.operation_id))) ||
+            typeof ev.result_digest !== "string" ||
+            !/^[0-9a-f]{64}$/.test(ev.result_digest) ||
+            !Number.isInteger(ev.result_bytes) ||
+            ev.result_bytes < 0 ||
+            ev.result_bytes > CLAUDE_RESULT_MAX_BYTES)) {
+        return { event: null, malformed: true };
+    }
     return {
         event: {
             type: "agent_done",
@@ -1801,15 +2284,18 @@ function parseAgentDoneEvent(line, meta) {
             launch_id: meta.launch_id,
             vendor_session_id: typeof ev.vendor_session_id === "string" ? ev.vendor_session_id : null,
             turn_id: typeof ev.turn_id === "string" ? ev.turn_id : null,
+            operation_id: typeof ev.operation_id === "string" && OPERATION_ID_RE.test(ev.operation_id) ? ev.operation_id : null,
             reason: typeof ev.reason === "string" ? ev.reason : "Stop",
             done_status: "turn_done",
             stop_hook_active: !!ev.stop_hook_active,
+            result_digest: typeof ev.result_digest === "string" && /^[0-9a-f]{64}$/.test(ev.result_digest) ? ev.result_digest : undefined,
+            result_bytes: Number.isInteger(ev.result_bytes) && ev.result_bytes >= 0 ? ev.result_bytes : undefined,
             at: typeof ev.at === "string" ? ev.at : new Date().toISOString(),
         },
         malformed: false,
     };
 }
-function scanAgentDoneLines(lines, meta) {
+function scanAgentDoneLines(lines, meta, expectedOperationId = null) {
     let malformedEvents = 0;
     let candidate = null;
     for (const line of lines) {
@@ -1827,6 +2313,8 @@ function scanAgentDoneLines(lines, meta) {
         const ev = parsed.event;
         if (!ev)
             continue;
+        if (expectedOperationId && ev.operation_id !== expectedOperationId)
+            continue;
         if (meta.vendor_session_id)
             return { event: ev, malformedEvents, ambiguousVendorSession: false };
         if (candidate?.vendor_session_id &&
@@ -1878,7 +2366,7 @@ function tryLoadAgentMetadata(name) {
         return null;
     }
 }
-function latestAgentDoneEvent(meta) {
+function latestAgentDoneEvent(meta, expectedOperationId = null) {
     const size = safeStatSize(meta.event_file);
     if (size === 0)
         return null;
@@ -1895,11 +2383,62 @@ function latestAgentDoneEvent(meta) {
         if (!line.trim() || Buffer.byteLength(line, "utf8") > 64 * 1024)
             continue;
         const parsed = parseAgentDoneEvent(line, meta);
-        if (parsed.event)
+        if (parsed.event && (!expectedOperationId || parsed.event.operation_id === expectedOperationId))
             latest = parsed.event;
     }
     return latest;
 }
+function completedClaudeOperationEvent(meta, operationId) {
+    const size = safeStatSize(meta.event_file);
+    if (size === 0)
+        return null;
+    if (size > AGENT_EVENT_MAX_BYTES) {
+        throw new AitermError("agent event file が大きすぎるためClaude operationを安全に回収できません", 2);
+    }
+    const text = readFileRange(meta.event_file, 0, size).toString("utf8");
+    const lines = text.split("\n");
+    const tail = lines.pop() ?? "";
+    if (tail.length > 0)
+        throw new AitermError("Claude operation event fileに未完結lineがあります", 2);
+    let match = null;
+    for (const line of lines) {
+        if (!line.trim())
+            continue;
+        if (Buffer.byteLength(line, "utf8") > 64 * 1024) {
+            throw new AitermError("Claude operation event lineが上限を超えています", 2);
+        }
+        const parsed = parseAgentDoneEvent(line, meta);
+        if (parsed.malformed)
+            throw new AitermError("Claude operation eventが不正です", 2);
+        if (!parsed.event || parsed.event.operation_id !== operationId)
+            continue;
+        if (match !== null)
+            throw new AitermError("Claude operation completion eventが重複しています", 2);
+        match = parsed.event;
+    }
+    return match;
+}
+function recoverAgentVendorSession(meta) {
+    if (meta.vendor_session_id)
+        return;
+    const size = safeStatSize(meta.event_file);
+    if (size === 0)
+        return;
+    if (size > AGENT_EVENT_MAX_BYTES) {
+        throw new AitermError("agent event file が大きすぎるため timeout 後のsessionを安全に回収できません。該当セッションを閉じて起動し直してください。", 2);
+    }
+    const text = readFileRange(meta.event_file, 0, size).toString("utf8");
+    const lines = text.split("\n");
+    lines.pop(); // hook は newline 完結eventだけを確定済みとして扱う。
+    const scanned = scanAgentDoneLines(lines, meta);
+    if (scanned.ambiguousVendorSession) {
+        throw new AitermError("agent event file に複数の vendor_session_id が混在しています。該当セッションを閉じて起動し直してください。", 2);
+    }
+    if (!scanned.event?.vendor_session_id)
+        return;
+    bindAgentVendorSession(meta, scanned.event);
+    writeAgentMetadata(meta);
+}
 function findLatestCodexTranscript(codexHome, vendorSessionId) {
     const sessionsDir = path.join(codexHome, "sessions");
     let latestFile = null;
@@ -1951,16 +2490,79 @@ function readTranscriptLines(file) {
         throw new AitermError(`transcript を読めません: ${e.message}`, 2);
     }
 }
+function readClaudeResultText(meta, done, operationId) {
+    if (meta.kind !== "claude" || !meta.result_file || !done.result_digest || done.result_bytes == null) {
+        transcriptUnavailable();
+    }
+    let st;
+    try {
+        st = fs.lstatSync(meta.result_file);
+    }
+    catch {
+        transcriptUnavailable();
+    }
+    if (!st.isFile() ||
+        st.isSymbolicLink() ||
+        st.uid !== currentUid() ||
+        st.nlink !== 1 ||
+        (st.mode & 0o077) !== 0 ||
+        st.size > CLAUDE_RESULT_MAX_BYTES + 4096) {
+        throw new AitermError("Claude result file の安全検証に失敗しました", 2);
+    }
+    let result;
+    try {
+        result = JSON.parse(fs.readFileSync(meta.result_file, "utf8"));
+    }
+    catch {
+        throw new AitermError("Claude result file を読めません", 2);
+    }
+    const keys = result && typeof result === "object" && !Array.isArray(result) ? Object.keys(result).sort() : [];
+    if (keys.join(",") !== "operation_id,result_bytes,result_digest,schema,text,vendor_session_id" ||
+        result.schema !== "aiterm.claude-turn-result.v2" ||
+        result.operation_id !== done.operation_id ||
+        (operationId !== null && result.operation_id !== operationId) ||
+        result.vendor_session_id !== meta.vendor_session_id ||
+        result.result_digest !== done.result_digest ||
+        result.result_bytes !== done.result_bytes ||
+        typeof result.text !== "string" ||
+        Buffer.byteLength(result.text, "utf8") !== done.result_bytes ||
+        createHash("sha256").update(result.text, "utf8").digest("hex") !== done.result_digest) {
+        throw new AitermError("Claude result file が完了eventと一致しません", 2);
+    }
+    return result.text;
+}
 /** agent vendor の構造化 transcript から直近完了ターンの最終回答を読む。 */
 export async function readAgentTranscript(name, o = {}) {
     const meta = loadAgentMetadata(name);
+    const operationId = o.operation_id == null ? null : validateOperationId(o.operation_id);
+    if (operationId && meta.kind !== "claude") {
+        throw new AitermError("operation_id付き回収はClaude agent sessionだけで使用できます", 2);
+    }
+    if (meta.kind === "claude") {
+        const active = readClaudeOperationMarker(meta);
+        if (active) {
+            const label = active.operationId ? `operation ${active.operationId}` : "operation_idなしのClaude turn";
+            throw new AitermError(`${label} はまだ完了していません。Stop完了後に同じsessionから再取得してください。`, 2);
+        }
+    }
+    // wait timeout は「失敗」ではなく状態不明。後着した同一launchの完了eventから
+    // vendor session をbindし、promptを再送せず結果だけ回収できるようにする。
+    recoverAgentVendorSession(meta);
     if (!meta.vendor_session_id) {
         throw new AitermError(`agent session '${name}' はまだターンが完了していません。agent_done 完了後に再取得してください。`, 2);
     }
-    const done = latestAgentDoneEvent(meta);
+    const done = latestAgentDoneEvent(meta, operationId);
+    if (operationId && !done) {
+        throw new AitermError(`operation ${operationId} はまだ完了していません。同じoperation_idで後から再取得してください。`, 2);
+    }
     const turnId = done?.turn_id ?? null;
     let text = "";
-    if (meta.kind === "codex") {
+    if (meta.kind === "claude") {
+        if (!done)
+            transcriptUnavailable();
+        text = readClaudeResultText(meta, done, operationId);
+    }
+    else if (meta.kind === "codex") {
         if (!meta.codex_home)
             transcriptUnavailable();
         const transcript = findLatestCodexTranscript(meta.codex_home, meta.vendor_session_id);
@@ -2038,8 +2640,9 @@ export async function readAgentTranscript(name, o = {}) {
         "agent_transcript",
         `vendor=${meta.kind}`,
         `turn_id=${turnId ?? "unknown"}`,
+        done?.operation_id ? `operation_id=${done.operation_id}` : null,
         `raw_chars=${rawChars}`,
-    ].join(" ");
+    ].filter(Boolean).join(" ");
     return `${body}\n${outputMeta} [${transcriptMeta}]`;
 }
 function inferAgentFrontend(name, meta, screen) {
@@ -2093,7 +2696,7 @@ function assertInitialPromptNotPendingForSend(name, force) {
     throw new AitermError(`agent session '${name}' は起動時 prompt の完了待ちです。通常 pty_send は混入防止のため送信しません。` +
         `完了後に pty_send(wait:"agent_done") するか、手動介入が必要な場合だけ force:true を明示してください。`, 2);
 }
-async function waitAgentDoneEvent(meta, startOffset, timeout) {
+async function waitAgentDoneEvent(meta, startOffset, timeout, expectedOperationId = null) {
     const deadline = performance.now() + timeout * 1000;
     let cursor = startOffset;
     let carry = "";
@@ -2112,7 +2715,7 @@ async function waitAgentDoneEvent(meta, startOffset, timeout) {
             cursor = size;
             const parts = carry.split("\n");
             carry = parts.pop() ?? "";
-            const scanned = scanAgentDoneLines(parts, meta);
+            const scanned = scanAgentDoneLines(parts, meta, expectedOperationId);
             malformedEvents += scanned.malformedEvents;
             if (scanned.ambiguousVendorSession) {
                 throw new AitermError("agent event file に複数の vendor_session_id が混在しています。該当セッションを閉じて起動し直してください。", 2);
@@ -2129,11 +2732,71 @@ async function waitAgentDoneEvent(meta, startOffset, timeout) {
         await sleep(AGENT_DONE_POLL_MS);
     }
 }
-function agentDoneSuffix(wait, vendor) {
+// 外部waiterプロセス用の純リーダー観測。lock・PTY・metadata書込・dispatch状態には一切触れない。
+// event fileのtail規律（未終端行保持・増分上限）はwaitAgentDoneEventと同一だが、
+// vendor_session_idのbind永続化を行わない点だけ意図的に異なる（waiterは観測者であって所有者でない）。
+export async function observeAgentDone(name, o = {}) {
+    const meta = loadAgentMetadata(name);
+    const operationId = o.operation_id == null ? null : validateOperationId(o.operation_id);
+    if (operationId && meta.kind !== "claude") {
+        throw new AitermError("operation_id はClaude agent sessionだけで使用できます", 2);
+    }
+    const timeout = o.timeout ?? DEFAULT_AGENT_DONE_TIMEOUT;
+    const metadataFile = agentMetadataPath(meta.aiterm_session, meta.launch_id);
+    // operation相関があるならoperation_idの一意性で誤帰属を防げるため先頭から全走査できる
+    // （waiter起動がdispatchより遅れても取りこぼさない）。相関なしはwaiter起動時EOFを境界にする。
+    const startOffset = operationId ? 0 : safeStatSize(meta.event_file);
+    const deadline = performance.now() + timeout * 1000;
+    let cursor = startOffset;
+    let carry = "";
+    let malformedEvents = 0;
+    const observation = (outcome, ev = null) => ({
+        schema: "aiterm.agent-wait-result.v1",
+        session_id: meta.aiterm_session,
+        launch_id: meta.launch_id,
+        vendor: meta.kind,
+        outcome,
+        operation_id: ev?.operation_id ?? operationId,
+        vendor_session_id: ev?.vendor_session_id ?? meta.vendor_session_id ?? null,
+        turn_id: ev?.turn_id ?? null,
+        malformed_events: malformedEvents,
+        at: ev?.at ?? null,
+    });
+    for (;;) {
+        if (!fs.existsSync(metadataFile))
+            return observation("closed");
+        const size = safeStatSize(meta.event_file);
+        if (size < cursor) {
+            cursor = 0;
+            carry = "";
+        }
+        if (size > cursor) {
+            if (size - cursor > AGENT_EVENT_MAX_BYTES) {
+                throw new AitermError("agent event file の増分が大きすぎます。該当セッションを閉じて起動し直してください。", 2);
+            }
+            carry += readFileRange(meta.event_file, cursor, size).toString("utf8");
+            cursor = size;
+            const parts = carry.split("\n");
+            carry = parts.pop() ?? "";
+            const scanned = scanAgentDoneLines(parts, meta, operationId);
+            malformedEvents += scanned.malformedEvents;
+            if (scanned.ambiguousVendorSession) {
+                throw new AitermError("agent event file に複数の vendor_session_id が混在しています。該当セッションを閉じて起動し直してください。", 2);
+            }
+            if (scanned.event)
+                return observation("done", scanned.event);
+        }
+        if (performance.now() >= deadline)
+            return observation("timeout");
+        await sleep(AGENT_DONE_POLL_MS);
+    }
+}
+function agentDoneSuffix(wait, vendor, operationId = null) {
     const ev = wait.event;
     if (!ev) {
         const malformed = wait.malformedEvents ? ` malformed_events=${wait.malformedEvents}` : "";
-        return ` [is_complete=False via agent_timeout vendor=${vendor}${malformed}]`;
+        const operation = operationId ? ` operation_id=${operationId}` : "";
+        return ` [is_complete=False via agent_timeout vendor=${vendor}${operation}${malformed}]`;
     }
     const bits = [
         "is_complete=True",
@@ -2141,11 +2804,15 @@ function agentDoneSuffix(wait, vendor) {
         `vendor=${ev.vendor}`,
         ev.turn_id ? `turn_id=${ev.turn_id}` : null,
         ev.vendor_session_id ? `vendor_session_id=${ev.vendor_session_id}` : null,
+        ev.operation_id ? `operation_id=${ev.operation_id}` : null,
         `done_status=${ev.done_status}`,
     ].filter(Boolean);
     return ` [${bits.join(" ")}]`;
 }
 function isAgentTuiReady(kind, screen) {
+    if (kind === "claude") {
+        return screen.includes("Claude Code") && /(^|\n)\s*❯/.test(screen);
+    }
     if (kind === "codex") {
         return screen.includes("OpenAI Codex") && /(^|\n)\s*[›>]/.test(screen);
     }
@@ -2154,14 +2821,22 @@ function isAgentTuiReady(kind, screen) {
 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;
+    const stableSamples = opts.stableSamples ?? agentTuiReadyStableSamplesTestOverride ?? AGENT_TUI_READY_STABLE_SAMPLES;
     const deadline = performance.now() + timeoutMs;
     let samples = 0;
+    let readyStreak = 0;
     let lastScreen = "";
     for (;;) {
         lastScreen = sample();
         samples++;
-        if (isAgentTuiReady(kind, lastScreen))
-            return { ready: true, samples, lastScreen };
+        if (isAgentTuiReady(kind, lastScreen)) {
+            readyStreak++;
+            if (readyStreak >= stableSamples)
+                return { ready: true, samples, lastScreen };
+        }
+        else {
+            readyStreak = 0;
+        }
         if (performance.now() >= deadline)
             return { ready: false, samples, lastScreen };
         await sleepFn(pollMs);
@@ -2229,6 +2904,12 @@ export async function __testWaitAgentTuiReady(kind, samples, opts = {}) {
     }, opts);
     return { ...result, sleeps };
 }
+export function __testSetAgentTuiReadyStableSamples(value) {
+    if (value !== null && (!Number.isInteger(value) || value < 1 || value > 1000)) {
+        throw new AitermError("test ready stable samplesが不正です", 2);
+    }
+    agentTuiReadyStableSamplesTestOverride = value;
+}
 async function sendAgentPromptText(name, text) {
     send(name, text, {
         enter: false,
@@ -2236,9 +2917,10 @@ async function sendAgentPromptText(name, text) {
         raw: false,
         mark: false,
         rtk: false,
+        preserveAgentOperation: true,
     });
     await sleep(AGENT_SUBMIT_DELAY_MS);
-    sendKey(name, "Enter");
+    sendKey(name, "Enter", { preserveAgentOperation: true });
 }
 export async function sendInitialAgentPrompt(name, text, o = {}) {
     assertSessionName(name);
@@ -2265,6 +2947,10 @@ export async function sendInitialAgentPrompt(name, text, o = {}) {
         }
         const startOffset = safeStatSize(meta.event_file);
         try {
+            if (meta.kind === "claude") {
+                prepareSendText(text, { raw: false, force: true });
+                reserveAnonymousClaudeTurn(meta);
+            }
             await sendAgentPromptText(name, text);
             setInitialPromptState(meta, "pending");
         }
@@ -2308,6 +2994,10 @@ export async function sendAndWaitAgentDone(name, text, o = {}) {
     if (o.rtk)
         throw new AitermError('wait:"agent_done" と rtk:true は併用できません', 2);
     const meta = loadAgentMetadata(name);
+    const operationId = o.operation_id == null ? null : validateOperationId(o.operation_id);
+    if (operationId && meta.kind !== "claude") {
+        throw new AitermError("operation_id はClaude agent sessionだけで使用できます", 2);
+    }
     if (agentWaitLocks.has(name))
         throw new AitermError(`agent session '${name}' は別の agent_done 待機中です`, 2);
     const releaseFileLock = acquireAgentWaitFileLock(meta);
@@ -2324,17 +3014,28 @@ export async function sendAndWaitAgentDone(name, text, o = {}) {
             }
         }
         const startOffset = safeStatSize(meta.event_file);
+        if (meta.kind === "claude") {
+            // durable／anonymousを分岐する前に同じsend preflightを通す。拒否されるpromptの
+            // receipt／active markerだけを残して、来ないStopを待つ状態を作らない。
+            prepareSendText(text, { raw: o.raw, force: o.force });
+            if (operationId) {
+                reserveClaudeOperation(meta, operationId);
+            }
+            else
+                reserveAnonymousClaudeTurn(meta);
+        }
         send(name, text, {
             enter: false,
             force: o.force,
             raw: o.raw,
             mark: false,
             rtk: false,
+            preserveAgentOperation: meta.kind === "claude",
         });
         // Codex TUI は literal text 投入直後の Enter を取り落とすことがある。agent 経路だけ submit を分離する。
         await sleep(AGENT_SUBMIT_DELAY_MS);
-        sendKey(name, "Enter");
-        const wait = await waitAgentDoneEvent(meta, startOffset, timeout);
+        sendKey(name, "Enter", { preserveAgentOperation: meta.kind === "claude" });
+        const wait = await waitAgentDoneEvent(meta, startOffset, timeout, operationId);
         const settled = wait.event
             ? await settleAgentDoneScreen(name, o.lines ?? 0)
             : { unstable: false, samples: 0 };
@@ -2344,22 +3045,87 @@ export async function sendAndWaitAgentDone(name, text, o = {}) {
             timeout: 0,
         });
         writeOffset(name, safeStatSize(logpath(name)));
-        return out + agentDoneSuffix(wait, meta.kind) + (settled.unstable ? " [agent_done_but_screen_unstable]" : "");
+        return out + agentDoneSuffix(wait, meta.kind, operationId) + (settled.unstable ? " [agent_done_but_screen_unstable]" : "");
     }
     finally {
         agentWaitLocks.delete(name);
         releaseFileLock();
     }
 }
-// ── 対話型エージェント起動（Codex / Grok Build(Grok) / Grok Build(Composer)）──────
+export async function runClaudeOperation({ session_id: name, action, operation_id: operationIdInput, text, timeout, }) {
+    assertSessionName(name);
+    if (action !== "issue" && action !== "recover") {
+        throw new AitermError('action は "issue" または "recover" を指定してください', 2);
+    }
+    const operationId = validateOperationId(operationIdInput);
+    const meta = loadAgentMetadata(name);
+    if (meta.kind !== "claude")
+        throw new AitermError("claude_turnはmanaged Claude agent sessionだけで使用できます", 2);
+    if (action === "issue") {
+        if (typeof text !== "string" || text.length === 0) {
+            throw new AitermError("claude_turn issueには空でないtextが必要です", 2);
+        }
+        const waitTimeout = timeout ?? DEFAULT_AGENT_DONE_TIMEOUT;
+        if (!Number.isFinite(waitTimeout) || waitTimeout < 0 || waitTimeout > 3600) {
+            throw new AitermError("claude_turn timeoutは0〜3600秒で指定してください", 2);
+        }
+        await sendAndWaitAgentDone(name, text, {
+            operation_id: operationId,
+            timeout: waitTimeout,
+            screen: false,
+            lines: 0,
+        });
+    }
+    else {
+        if (text != null)
+            throw new AitermError("claude_turn recoverにtextは指定できません", 2);
+        if (timeout != null)
+            throw new AitermError("claude_turn recoverにtimeoutは指定できません", 2);
+    }
+    const inspected = inspectClaudeOperation(meta, operationId, action);
+    if (action === "issue" && inspected.status === "pending") {
+        return { ...inspected, status: "accepted" };
+    }
+    return inspected;
+}
+function inspectClaudeOperation(meta, operationId, action) {
+    const base = {
+        schema: "aiterm.claude-operation-result.v1",
+        action,
+        session_id: meta.aiterm_session,
+        operation_id: operationId,
+    };
+    const active = readClaudeOperationMarker(meta);
+    if (active) {
+        if (active.operationId !== operationId) {
+            throw new AitermError(`${active.operationId ? `別のoperation ${active.operationId}` : "operation_idなしのClaude turn"} が未解決です`, 2);
+        }
+        return { ...base, status: "pending", raw_output: null, reason: null };
+    }
+    if (!hasClaudeDispatchReceipt(meta, operationId)) {
+        return { ...base, status: "unknown", raw_output: null, reason: "operation_not_found" };
+    }
+    const done = completedClaudeOperationEvent(meta, operationId);
+    if (!done)
+        return { ...base, status: "unknown", raw_output: null, reason: "result_unknown" };
+    if (!meta.vendor_session_id && done.vendor_session_id) {
+        bindAgentVendorSession(meta, done);
+        writeAgentMetadata(meta);
+    }
+    const rawOutput = readClaudeResultText(meta, done, operationId);
+    return { ...base, status: "completed", raw_output: rawOutput, reason: null };
+}
+// ── 対話型エージェント起動（Claude / Codex / Grok Build(Grok) / Grok Build(Composer)）──────
 // aiterm の永続端末に、指定モデルの対話エージェント TUI を起動する。以後は pty_read で画面を
 // 読み、pty_send で操作する＝aiterm の対話パラダイムそのもの。モデルはツールごとに固定し、
 // reasoning effort は引数で渡す。CLI 未導入環境は明示エラー（動くフリをしない）。
 function resolveAgentBin(kind) {
     const home = process.env.HOME ?? os.homedir();
-    const [envVar, rel, name] = kind === "codex"
-        ? ["CODEX_BIN", [".local", "bin", "codex"], "codex"]
-        : ["GROK_BIN", [".grok", "bin", "grok"], "grok"];
+    const [envVar, rel, name] = kind === "claude"
+        ? ["CLAUDE_BIN", [".local", "bin", "claude"], "claude"]
+        : kind === "codex"
+            ? ["CODEX_BIN", [".local", "bin", "codex"], "codex"]
+            : ["GROK_BIN", [".grok", "bin", "grok"], "grok"];
     const fromEnv = process.env[envVar];
     if (fromEnv) {
         // 明示指定 env は実在を検証する。存在しないパスを黙って返すと、session を作って
@@ -2415,9 +3181,19 @@ const GROK_MODEL_DEFAULTS = {
     grok: "grok-4.5",
     composer: "grok-composer-2.5-fast",
 };
+const CLAUDE_EFFORTS = new Set(["low", "medium", "high", "xhigh", "max"]);
 function buildAgentCmd(kind, bin, model, effort, prompt, meta = null) {
     const parts = [shq(bin)];
-    if (kind === "codex") {
+    if (kind === "claude") {
+        if (meta?.kind === "claude") {
+            parts.push("--setting-sources", shq(""), "--settings", shq(meta.claude_settings ?? ""));
+        }
+        if (model)
+            parts.push("--model", shq(model));
+        if (effort)
+            parts.push("--effort", shq(effort));
+    }
+    else if (kind === "codex") {
         if (meta?.kind === "codex")
             parts.push("--dangerously-bypass-hook-trust");
         // model/effort は CLI 引数で明示（config 継承より優先）。agent_done 時は managed home 側
@@ -2450,12 +3226,16 @@ function agentEnvPrefix(meta, sid) {
         `AITERM_AGENT_SESSION_ID=${shq(sid)}`,
         `AITERM_AGENT_LAUNCH_ID=${shq(meta.launch_id)}`,
     ];
+    if (meta.kind === "claude") {
+        return common.join(" ") + " ";
+    }
     if (meta.kind === "codex") {
         return [`CODEX_HOME=${shq(meta.codex_home ?? "")}`, ...common].join(" ") + " ";
     }
     return [
         `HOME=${shq(meta.home ?? "")}`,
         `GROK_HOME=${shq(meta.grok_home ?? "")}`,
+        ...(meta.grok_auth_path ? [`GROK_AUTH_PATH=${shq(meta.grok_auth_path)}`] : []),
         "GROK_DISABLE_AUTOUPDATER=1",
         "GROK_CLAUDE_HOOKS_ENABLED=false",
         "GROK_CURSOR_HOOKS_ENABLED=false",
@@ -2472,16 +3252,21 @@ function agentEnvPrefix(meta, sid) {
     ].join(" ") + " ";
 }
 function agentLabel(kind) {
-    return kind === "composer"
-        ? "Grok Build(Composer)"
-        : kind === "grok"
-            ? "Grok Build(Grok)"
-            : "Codex";
+    return kind === "claude"
+        ? "Claude Code"
+        : kind === "composer"
+            ? "Grok Build(Composer)"
+            : kind === "grok"
+                ? "Grok Build(Grok)"
+                : "Codex";
 }
 // 起動応答にモデル/effort の実効値と出所を明示する。codex は端末 config のピン（model /
 // model_reasoning_effort）が対話子へ波及する構造のため、引数・端末config継承・CLI既定の
 // どれで起動したかを起動時点で可視化し、実効 effort=ultra は proactive 自動委譲 ON を警告する。
 function buildAgentLaunchNote(kind, model, effort, meta) {
+    if (kind === "claude") {
+        return `起動設定: model=${model ?? "CLI既定"} effort=${effort ?? "CLI既定"}。`;
+    }
     if (kind !== "codex") {
         return (`起動設定: model=${model ?? GROK_MODEL_DEFAULTS[kind]}（${model ? "引数" : "ツール既定"}）。` +
             "reasoning effort は対話 TUI 非対応＝未指定で起動。");
@@ -2505,6 +3290,35 @@ function buildAgentLaunchNote(kind, model, effort, meta) {
     const summary = meta?.kind === "codex" && meta.codex_home ? managedCodexConfigSummary(configPath, true) : "";
     return summary ? `${launch}\n${summary}\n` : launch;
 }
+function claudeLaunchRequestDigest({ sessionName, model, effort, cwd, agentDone, }) {
+    const canonical = JSON.stringify({
+        schema: "aiterm.claude-agent-launch-request.v1",
+        provider: "claude",
+        session_name: sessionName,
+        model,
+        reasoning_effort: effort,
+        cwd,
+        managed_completion: agentDone,
+    });
+    return `sha256:${createHash("sha256").update(canonical, "utf8").digest("hex")}`;
+}
+function requireMatchingClaudeLaunch(name, operationId, requestDigest) {
+    const meta = loadAgentMetadata(name);
+    if (meta.kind !== "claude") {
+        throw new AitermError(`session '${name}' は相関対象のClaude agent sessionではありません`, 2);
+    }
+    if (meta.launch_operation_id !== operationId || meta.launch_request_digest !== requestDigest) {
+        throw new AitermError(`session '${name}' のClaude launch identityが一致しません。既存sessionをcloseするまで再利用できません`, 2);
+    }
+    return meta;
+}
+function existingAgentLaunchResult(kind, sid, model, effort) {
+    return [
+        sid,
+        `${agentLabel(kind)} の相関済みlaunchを既存session ${sid} から回収した。` +
+            `${buildAgentLaunchNote(kind, model, effort, null)}CLIは再送していません。\n${attachHint(sid)}`,
+    ];
+}
 export function openAgent(kind, opts = {}) {
     const label = agentLabel(kind);
     // 前提検証は session を作る前に全部済ませる（失敗の残骸 session を作らない）。
@@ -2516,6 +3330,9 @@ export function openAgent(kind, opts = {}) {
             throw new AitermError("model が空文字です（省略するか有効なモデル名を指定してください）", 2);
     }
     const effort = opts.reasoning_effort ?? null;
+    if (effort && kind === "claude" && !CLAUDE_EFFORTS.has(effort)) {
+        throw new AitermError("Claude Code の reasoning_effort は low/medium/high/xhigh/max のいずれかです", 2);
+    }
     // grok CLI の --effort は headless（grok -p）専用で、対話 TUI では警告の上無視される。
     // 黙って no-op の引数を受けない＝起動前に明示エラーで拒否する（codex は CLI 側の値集合が
     // 版で変わるため縛らず送信まで通す）。
@@ -2529,6 +3346,24 @@ export function openAgent(kind, opts = {}) {
             "（モデルカタログ supports_reasoning_effort=false）", 2);
     }
     const agentDone = !!opts.agent_done;
+    const launchOperationId = opts.launch_operation_id == null
+        ? null
+        : validateOperationId(opts.launch_operation_id);
+    if (launchOperationId !== null) {
+        if (kind !== "claude") {
+            throw new AitermError("launch_operation_idはClaude agentだけで指定できます", 2);
+        }
+        if (!opts.session_name) {
+            throw new AitermError("launch_operation_idには明示session_nameが必要です", 2);
+        }
+        assertSessionName(opts.session_name);
+        if (!agentDone) {
+            throw new AitermError("launch_operation_idにはagent_done:trueが必要です", 2);
+        }
+        if (opts.prompt != null) {
+            throw new AitermError("launch_operation_id付きlaunchにpromptは指定できません", 2);
+        }
+    }
     let bin;
     try {
         bin = resolveAgentBin(kind);
@@ -2537,7 +3372,7 @@ export function openAgent(kind, opts = {}) {
         ownTelemetryFailure("AITERM.VENDOR_LAUNCHER_FAILED", error, 2);
     }
     if (!bin) {
-        const where = kind === "codex" ? "~/.local/bin/codex" : "~/.grok/bin/grok";
+        const where = kind === "claude" ? "~/.local/bin/claude" : kind === "codex" ? "~/.local/bin/codex" : "~/.grok/bin/grok";
         ownTelemetryFailure("AITERM.VENDOR_LAUNCHER_FAILED", new AitermError(`${label} の CLI が見つかりません（${where} か PATH が必要）`, 2), 2);
     }
     // cwd 検証（session を作る前に。cd 失敗はシェル内で静かに死に「起動した」と偽成功を返すため）。
@@ -2562,6 +3397,19 @@ export function openAgent(kind, opts = {}) {
         }
         cwd = opts.cwd;
     }
+    const launchRequestDigest = launchOperationId === null
+        ? null
+        : claudeLaunchRequestDigest({
+            sessionName: opts.session_name,
+            model,
+            effort,
+            cwd,
+            agentDone,
+        });
+    if (launchOperationId !== null && sessionExists(opts.session_name)) {
+        requireMatchingClaudeLaunch(opts.session_name, launchOperationId, launchRequestDigest);
+        return existingAgentLaunchResult("claude", opts.session_name, model, effort);
+    }
     // Windows は起動コマンドが WSL 内 bash で走る（tmux ブリッジ）。bin/cwd を /mnt/c/... 形へ変換して
     // 渡す（ログの toWslPath と対称・A1）。前提: Windows 側に CLI を導入（resolveAgentBin が Windows
     // パスで解決）。toWslPath は session を作る前に呼ぶ＝変換失敗（非ドライブパス）で残骸 session を残さない。
@@ -2569,13 +3417,27 @@ export function openAgent(kind, opts = {}) {
     // でしか確認できない（CI 非対象。docs/03_audit-sweep-2026-07.md 参照）。
     const binForCmd = isWin ? toWslPath(bin) : bin;
     const cwdForCmd = cwd && isWin ? toWslPath(cwd) : cwd;
-    const [sid, hint] = openSession(opts.session_name ?? null, "bash");
+    const grokAuthPath = agentDone && (kind === "grok" || kind === "composer") ? resolveAndValidateGrokAuth(realGrokHome()) : null;
+    let sid;
+    let hint;
+    try {
+        [sid, hint] = openSession(opts.session_name ?? null, "bash");
+    }
+    catch (error) {
+        if (launchOperationId !== null && sessionExists(opts.session_name)) {
+            requireMatchingClaudeLaunch(opts.session_name, launchOperationId, launchRequestDigest);
+            return existingAgentLaunchResult("claude", opts.session_name, model, effort);
+        }
+        throw error;
+    }
     let launchNote = "";
     try {
         const meta = agentDone
-            ? kind === "codex"
-                ? createCodexAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", { model, effort })
-                : createGrokAgentMetadata(kind, sid, cwd, opts.prompt ? "pending" : "none")
+            ? kind === "claude"
+                ? createClaudeAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", launchOperationId, launchRequestDigest)
+                : kind === "codex"
+                    ? createCodexAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", { model, effort })
+                    : createGrokAgentMetadata(kind, sid, cwd, opts.prompt ? "pending" : "none", grokAuthPath)
             : null;
         if (meta)
             agentMetadataNegativeCache.delete(sid);
@@ -2586,7 +3448,14 @@ export function openAgent(kind, opts = {}) {
         // force:true で送る。起動骨格は `bin '...'` の固定形で、prompt/cwd/effort は shq でクオート済みの
         // 引数＝シェルは決して破壊コマンドとして実行しない。破壊ゲート（生シェルコマンド想定）を prompt に
         // 掛けるのは純誤検知で、`codex 'rm -rf / を説明して'` 等の正当な起動を塞いでしまう（A4）。
-        send(sid, full, { enter: true, mark: false, force: true, rtk: false, raw: true });
+        send(sid, full, {
+            enter: true,
+            mark: false,
+            force: true,
+            rtk: false,
+            raw: true,
+            preserveAgentOperation: meta?.kind === "claude",
+        });
     }
     catch (e) {
         const failure = telemetryOwnedFailure("AITERM.VENDOR_LAUNCHER_FAILED", e);
@@ -2599,12 +3468,17 @@ export function openAgent(kind, opts = {}) {
         }
         throw failure;
     }
+    const driveHint = agentDone && kind === "claude"
+        ? `TUI の描画には数秒かかる。少し置いてから pty_read(${sid}, screen:true) で画面を読み、` +
+            `turnはpty_send(${sid}, "...", wait:"agent_done")で送る。中断はpty_key(${sid}, "C-c")、` +
+            `Stopが来ない場合の解除はpty_close(${sid})を使う。`
+        : `TUI の描画には数秒かかる。少し置いてから pty_read(${sid}, screen:true) で画面を読み、` +
+            `pty_send(${sid}, "...") で入力・pty_key(${sid}, "Enter"/"Up"/"C-c" 等) で操作する（対話）。`;
     return [
         sid,
         `${label} を session ${sid} で起動した。${launchNote}${agentDone ? "agent_done 待機が有効。" : ""}` +
-            `${agentDone && kind !== "codex" ? " hook 汚染防止のため Grok 実行中は一時 HOME を使う。" : ""}\n${hint}\n` +
-            `TUI の描画には数秒かかる。少し置いてから pty_read(${sid}, screen:true) で画面を読み、` +
-            `pty_send(${sid}, "...") で入力・pty_key(${sid}, "Enter"/"Up"/"C-c" 等) で操作する（対話）。` +
+            `${agentDone && (kind === "grok" || kind === "composer") ? " hook 汚染防止のため Grok 実行中は一時 HOME を使う。" : ""}\n${hint}\n` +
+            driveHint +
             `起動直後に増分 pty_read すると空/半描画になり得るので screen:true を使う。`,
     ];
 }
@@ -2621,6 +3495,9 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
     const waitMode = normalizeAgentLauncherWait(opts.wait);
     const prompt = opts.prompt ?? null;
     const agentDone = !!opts.agent_done;
+    if (opts.launch_operation_id != null && (prompt !== null || waitMode !== "none")) {
+        throw new AitermError('launch_operation_idはpromptなし・wait:"none"のmanaged Claude launchだけで指定できます', 2);
+    }
     if (waitMode === "agent_done" && !prompt) {
         throw new AitermError('wait:"agent_done" は prompt 指定時だけ使えます', 2);
     }
@@ -2630,7 +3507,7 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
     if (!prompt) {
         return openAgent(kind, opts);
     }
-    if (kind !== "codex") {
+    if (kind !== "codex" && kind !== "claude") {
         if (waitMode === "agent_done") {
             throw new AitermError(`${agentLabel(kind)} の起動時 prompt wait は未対応です。` +
                 `agent_done:true で prompt なし起動後、TUI のログイン/ready を確認してから pty_send(wait:"agent_done") を使ってください。`, 2);
@@ -2644,6 +3521,7 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
         cwd: opts.cwd ?? null,
         prompt: null,
         agent_done: agentDone,
+        launch_operation_id: opts.launch_operation_id ?? null,
     });
     try {
         const initial = agentDone