aiterm-mcp 0.32.0 → 0.33.0

package/dist/core.js

@@ -13,13 +13,15 @@ import * as path from "node:path";
 import { createHash, randomBytes } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import * as rtk from "./rtk.js";
+import { paneTokenHint } from "./harnesses/pane-tokens.js";
+import { readRuntimeProcesses, processSubtree, processIdentity, backgroundProcesses } from "./process-runtime.js";
 import { AitermError, telemetryOwnedFailure, ownTelemetryFailure } from "./errors.js";
-import { isWin, SOCKDIR, tmuxCommand, sendPsmuxPayload, loadPtyBufferChunk, pasteBufferBaseArgs, TMUX_EMPTY_CONFIG, attachCommand, normalizePaneCommand, appendMarkSentinel, settlePaneLog, paneCwdArgument, } from "./tmux-runtime.js";
+import { isWin, SOCKDIR, tmuxCommand, sendPsmuxPayload, loadPtyBufferChunk, pasteBufferBaseArgs, TMUX_EMPTY_CONFIG, attachCommand, normalizePaneCommand, appendMarkSentinel, settlePaneLog, paneCwdArgument, sessionEnvironmentLaunch, } from "./tmux-runtime.js";
 import { sleep, currentUid, runtimeStateBase, safeStatSize, readFileRange, writeJson0600, createEmpty0600, shq, LAUNCH_ID_RE, AGENT_DONE_POLL_MS, AGENT_EVENT_MAX_BYTES, assertSessionName, agentsDir, agentEventPath, agentMetadataPath, writeAgentMetadata, AGENT_EVENT_TAIL_BYTES, agentLabel, agentHarness, subagentInstruction, agentLineageFields, } from "./agent-shared.js";
-import { GROK_MODEL_DEFAULTS, realGrokHome, resolveAndValidateGrokAuth, assertGrokModelAvailable, grokEventsTranscript, latestGrokCompletion, observeGrokDone, buildGrokAgentCmd, grokLaunchNote, grokEnvTokens, grokTuiReady, grokTuiBusy, grokLaunchBlockingDialog, assertGrokSandboxNotRejected, GROK_COMPOSER_MARKER_RE, grokFooterHasConfiguration, grokTranscriptText, createGrokAgentMetadata, } from "./harnesses/grok.js";
-import { bindCodexTranscriptSession, latestCodexCompletion, observeCodexDone, buildCodexAgentCmd, codexLaunchNote, codexTuiReady, codexLaunchBlockingDialog, CODEX_COMPOSER_MARKER_RE, codexModelChoice, codexEffortChoice, codexMoreReasoningChoice, codexTranscriptText, createCodexAgentMetadata, } from "./harnesses/codex.js";
-import { OPERATION_ID_RE, CLAUDE_RESULT_MAX_BYTES, CLAUDE_EFFORTS, agentManagedClaudeSettingsPath, agentClaudeResultPath, agentClaudeOperationPath, agentClaudeApprovalReceiptPath, agentClaudeDispatchReceiptPath, validateOperationId, readClaudeResultText, assertClaudeAuthenticationReady, buildClaudeAgentCmd, claudeLaunchNote, claudeTuiReady, CLAUDE_COMPOSER_MARKER_RE, createClaudeAgentMetadata, claudeSessionTranscriptPath, claudeApiErrorFromLine, } from "./harnesses/claude.js";
-import { bindCursorTranscriptSession, cursorTurnBoundary, latestCursorCompletion, observeCursorDone, cursorTranscriptText, assertCursorAuthenticationReady, assertCursorModelAvailable, buildCursorAgentCmd, cursorPromptWithLineage, createCursorAgentMetadata, cursorLaunchNote, cursorEffortNavigation, cursorTuiReady, CURSOR_SUBMIT_SEQUENCE, CURSOR_COMPOSER_CONTENT_MARKER_RE, validateCursorModelEffort, } from "./harnesses/cursor.js";
+import { GROK_MODEL_DEFAULTS, realGrokHome, resolveAndValidateGrokAuth, assertGrokModelAvailable, grokEventsTranscript, latestGrokCompletion, observeGrokDone, buildGrokAgentCmd, grokLaunchNote, grokEnvTokens, grokTuiReady, grokTuiBusy, grokPaneObservation, grokStartupAction, grokLaunchBlockingDialog, assertGrokSandboxNotRejected, GROK_COMPOSER_MARKER_RE, grokFooterHasConfiguration, grokTranscriptText, createGrokAgentMetadata, } from "./harnesses/grok.js";
+import { bindCodexTranscriptSession, latestCodexCompletion, observeCodexDone, buildCodexAgentCmd, codexLaunchNote, codexTuiReady, codexPaneObservation, codexApprovalDialog, codexStartupAction, CODEX_COMPOSER_MARKER_RE, codexModelChoice, codexEffortChoice, codexMoreReasoningChoice, codexTranscriptText, createCodexAgentMetadata, } from "./harnesses/codex.js";
+import { OPERATION_ID_RE, CLAUDE_RESULT_MAX_BYTES, CLAUDE_EFFORTS, agentManagedClaudeSettingsPath, agentClaudeResultPath, agentClaudeOperationPath, agentClaudeApprovalReceiptPath, agentClaudeDispatchReceiptPath, validateOperationId, readClaudeResultText, assertClaudeAuthenticationReady, buildClaudeAgentCmd, claudeLaunchNote, claudeTuiReady, claudePaneObservation, claudeStartupAction, CLAUDE_COMPOSER_MARKER_RE, createClaudeAgentMetadata, claudeSessionTranscriptPath, claudeApiErrorFromLine, } from "./harnesses/claude.js";
+import { bindCursorTranscriptSession, cursorTurnBoundary, latestCursorCompletion, observeCursorDone, cursorTranscriptText, assertCursorAuthenticationReady, assertCursorModelAvailable, buildCursorAgentCmd, cursorPromptWithLineage, createCursorAgentMetadata, cursorLaunchNote, cursorEffortNavigation, cursorTuiReady, cursorPaneObservation, CURSOR_SUBMIT_SEQUENCE, CURSOR_COMPOSER_CONTENT_MARKER_RE, validateCursorModelEffort, } from "./harnesses/cursor.js";
 import { resolveAgentBin, resolveThroughlineBin, runThroughlineHandoffContext, isWindowsNativeExecutable, agentBinForPaneShell, resolveWinPaneShell } from "./agent-resolver.js";
 export { AitermError } from "./errors.js";
 export { tmuxSpawnEnv } from "./tmux-runtime.js";
@@ -651,19 +653,21 @@ function rtkRewrite(text) {
 // Windows native pane の既定 shell 解決。裸の "bash" は PATH 上で System32 の
 // WSL launcher (bash.exe) に解決されてしまうため、Git for Windows の bash.exe を
 // 明示解決する（WSL 非依存の裁定に従う）。AITERM_BASH で上書き可。
-export function openSession(name, shell = "bash") {
+export function openSession(name, shell = "bash", envVars = []) {
     shell = resolveWinPaneShell(shell);
+    for (const key of envVars) {
+        if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key))
+            throw new AitermError("env_varsの環境変数名が不正です", 2);
+    }
     try {
         fs.mkdirSync(SOCKDIR, { recursive: true });
     }
     catch (error) {
         ownTelemetryFailure("AITERM.PERSISTENCE_WRITE_FAILED", error);
     }
-    // macOS の /bin/bash は 3.2 で、起動時に zsh 移行バナーを出して最初の read を汚す。darwin かつ bash の
-    // ときだけ -e で環境変数を渡して抑止する。-e は tmux>=3.2 が必要だが macOS の Homebrew tmux は常に該当。
-    // （古い tmux<3.2 が残る Linux/WSL で -e を渡すと new-session が落ちるため、darwin 限定にする。）
+    // macOS標準bashの移行bannerを抑止する。環境変数の注入方法はterminal runtimeが所有する。
     const banner = process.platform === "darwin" && path.basename(shell) === "bash"
-        ? ["-e", "BASH_SILENCE_DEPRECATION_WARNING=1"]
+        ? ["BASH_SILENCE_DEPRECATION_WARNING=1"]
         : [];
     // 並行性対策: 複数エージェントが同時に名前なし open すると autoName が同じ t{i} を返し得る（TOCTOU）。
     // 自動採番は初回のみ読みやすい t{i}、衝突したら乱数 nonce 名でリトライする（線形リトライは高並行で
@@ -680,9 +684,22 @@ export function openSession(name, shell = "bash") {
         }
         else {
             // -f は端末個人の設定ファイルを読まないための空 config。
-            const r = tmux("new-session", "-d", "-s", nm, ...banner, "-f", TMUX_EMPTY_CONFIG, shell);
-            if (r.code === 0)
+            const environment = [...banner, ...envVars.filter(key => key !== "AITERM_SESSION_ID" && process.env[key] !== undefined)
+                    .map(key => `${key}=${process.env[key]}`), `AITERM_SESSION_ID=${nm}`];
+            const launch = sessionEnvironmentLaunch(shell, environment);
+            const r = tmux("new-session", "-d", "-s", nm, ...launch.args, "-f", TMUX_EMPTY_CONFIG, launch.shell);
+            if (r.code === 0) {
+                if (launch.register_after_start)
+                    for (const entry of environment) {
+                        const at = entry.indexOf("=");
+                        const registered = tmux("set-environment", "-t", nm, entry.slice(0, at), entry.slice(at + 1));
+                        if (registered.code !== 0) {
+                            tmux("kill-session", "-t", nm);
+                            throw new AitermError("session環境変数を登録できません", 2);
+                        }
+                    }
                 break;
+            }
             // 自動採番かつ「重複名」由来の失敗（他エージェントが同名を先に取った）なら次名でリトライ。
             const dup = /duplicate|already exists/i.test(r.stderr);
             if (explicit || !dup)
@@ -1021,14 +1038,172 @@ export async function readOutput(name, o = {}) {
         return body + "\n" + meta + agentMeta + completionSuffix(status);
     return body + "\n" + meta + agentMeta;
 }
-export function listSessions() {
-    const r = tmux("list-sessions", "-F", "#{session_name}\t#{pane_current_command}\t#{?session_attached,attached,detached}\t#{window_width}x#{window_height}");
-    if (r.code === 0 && r.stdout.trim()) {
-        return r.stdout
-            .replace(/\s+$/, "")
-            .split("\n")
-            .map((line) => {
-            const name = line.split("\t", 1)[0];
+function decodeActivityCursor(cursor, name) {
+    let value;
+    try {
+        value = JSON.parse(Buffer.from(cursor, "base64url").toString("utf8"));
+    }
+    catch {
+        throw new AitermError("活動観測cursorを読めません", 2);
+    }
+    if (value?.session_id !== name || typeof value.pane_identity !== "string"
+        || typeof value.screen_digest !== "string" || !value.processes || typeof value.processes !== "object"
+        || Array.isArray(value.processes) || !Object.values(value.processes).every(cpu => typeof cpu === "number" && Number.isFinite(cpu) && cpu >= 0)
+        || !value.background_processes || typeof value.background_processes !== "object" || Array.isArray(value.background_processes)
+        || !Object.values(value.background_processes).every(cpu => typeof cpu === "number" && Number.isFinite(cpu) && cpu >= 0))
+        throw new AitermError("活動観測cursorが対象sessionの形式と一致しません", 2);
+    return value;
+}
+function selectHarnessProcesses(meta, rows, subtree) {
+    const matches = (row) => {
+        const first = /^(?:"([^"]+)"|(\S+))/.exec(row.command);
+        const executable = path.posix.basename((first?.[1] ?? first?.[2] ?? "").replace(/\\/g, "/"))
+            .replace(/\.exe$/i, "").replace(/^-/, "").toLowerCase();
+        const command = row.command.replace(/\\/g, "/").replace(/\.exe(?=["\s]|$)/gi, "").replace(/"/g, "");
+        const tokens = row.command.match(/"[^"]*"|'[^']*'|\S+/g) ?? [];
+        const argument = tokens[1]?.replace(/^["']|["']$/g, "").replace(/\\/g, "/");
+        const launchedScript = meta.agent_executable !== undefined && argument === meta.agent_executable.replace(/\\/g, "/");
+        return launchedScript || (!SHELLS.has(executable) && executable !== "pwsh" && AGENT_COMMAND_PATTERNS[meta.kind].test(command));
+    };
+    // WindowsのMSYS execでnative親子関係が切れる場合も、launch固有引数で相関する。
+    const correlated = rows.filter(row => matches(row) && row.command.includes(meta.launch_id));
+    const candidates = correlated.length ? correlated : subtree.filter(matches);
+    const roots = candidates.filter(row => !candidates.some(parent => row.parent_pid === parent.pid));
+    return roots;
+}
+export function observeSession(name, cursor) {
+    assertSessionName(name);
+    const previous = cursor === undefined ? null : decodeActivityCursor(cursor, name);
+    const listed = listSessionsResult().sessions.find(session => session.session_id === name);
+    const result = {
+        schema: "aiterm.pty-observe-result.v1", session_id: name, observed_at: new Date().toISOString(),
+        exists: !!listed, harness: null, launch_id: null, state: "missing", reason: "session_missing",
+        pane_alive: false, harness_alive: null, pane_process: null, harness_process: null, process_identity: null,
+        token_hint: null,
+        activity: { cursor: null, output_changed: null, cpu_seconds: null, cpu_delta_seconds: null, cpu_delta_complete: null,
+            background_cpu_seconds: null, background_cpu_delta_seconds: null, background_cpu_delta_complete: null },
+    };
+    if (!listed)
+        return result;
+    const pane = tmux("display-message", "-p", "-t", name, "#{pane_pid}\t#{pane_dead}");
+    if (pane.code !== 0)
+        throw new AitermError("paneの生存情報を取得できません", 2);
+    const [pidText, dead] = pane.stdout.trim().split("\t");
+    const panePid = Number(pidText);
+    if (!Number.isSafeInteger(panePid) || panePid < 1 || !["0", "1"].includes(dead))
+        throw new AitermError("paneの生存情報の形式を認識できません", 2);
+    const meta = tryLoadAgentMetadata(name);
+    result.harness = meta ? agentHarness(meta.kind) : null;
+    result.launch_id = meta?.launch_id ?? null;
+    if (dead === "1") {
+        result.state = "dead";
+        result.reason = "pane_dead";
+        result.harness_alive = meta ? false : null;
+        return result;
+    }
+    const rows = readRuntimeProcesses();
+    const root = rows.find(row => row.pid === panePid);
+    result.pane_alive = root ? true : null;
+    result.state = "unknown";
+    result.reason = root ? "ordinary_pty" : "native_pane_process_unresolved";
+    if (!root)
+        return result;
+    result.pane_process = processIdentity(root);
+    const subtree = processSubtree(rows, root.pid);
+    const candidates = meta ? selectHarnessProcesses(meta, rows, subtree) : [];
+    const agent = candidates.length === 1 ? candidates[0] : null;
+    if (meta) {
+        result.harness_process = agent ? processIdentity(agent) : null;
+        // Cursorにはlaunch固有argvがない。Windowsの切れた親子関係だけで死亡を断定しない。
+        result.harness_alive = candidates.length ? true : isWin && meta.kind === "cursor" ? null : false;
+        if (result.harness_alive === false) {
+            result.state = "dead";
+            result.reason = "harness_exited";
+        }
+        else if (result.harness_alive === null)
+            result.reason = "harness_process_unresolved";
+        else if (!agent)
+            result.reason = "harness_process_ambiguous";
+        result.process_identity = result.harness_process;
+    }
+    else {
+        const leaders = subtree.filter(row => row.parent_pid === root.pid && (isWin || row.process_group_id === row.pid));
+        result.process_identity = leaders.length > 1 ? null : processIdentity(leaders[0] ?? root);
+        if (leaders.length > 1)
+            result.reason = "process_identity_ambiguous";
+    }
+    const captured = tmux("capture-pane", "-p", "-J", "-t", name, "-S", "-200");
+    if (captured.code !== 0)
+        throw new AitermError("paneの活動観測を取得できません", 2);
+    const screen = captured.stdout;
+    result.token_hint = meta ? paneTokenHint(screen) : null;
+    if (meta && agent) {
+        const observation = meta.kind === "grok" || meta.kind === "composer" ? grokPaneObservation(screen)
+            : meta.kind === "codex" ? codexPaneObservation(screen)
+                : meta.kind === "claude" ? claudePaneObservation(screen) : cursorPaneObservation(screen);
+        result.state = observation.state;
+        result.reason = observation.reason;
+        if (agent.stopped === true || processSubtree(rows, agent.pid).some(row => row.process_group_id === agent.process_group_id && row.stopped === true)) {
+            result.state = "blocked";
+            result.reason = "harness_stopped";
+        }
+    }
+    const activityRows = agent && !subtree.some(row => row.pid === agent.pid)
+        ? [...subtree, ...processSubtree(rows, agent.pid)] : subtree;
+    const processes = Object.fromEntries(activityRows.map(row => [`${row.pid}:${row.started_identity}`, row.cpu_seconds]));
+    const backgroundCpu = Object.fromEntries(backgroundProcesses(activityRows, root)
+        .map(row => [`${row.pid}:${row.started_identity}`, row.cpu_seconds]));
+    const sample = {
+        session_id: name, pane_identity: `${root.pid}:${root.started_identity}`,
+        screen_digest: createHash("sha256").update(screen).digest("hex"), processes, background_processes: backgroundCpu,
+    };
+    const comparable = previous?.pane_identity === sample.pane_identity;
+    result.activity = {
+        cursor: Buffer.from(JSON.stringify(sample)).toString("base64url"),
+        output_changed: comparable ? previous.screen_digest !== sample.screen_digest : null,
+        cpu_seconds: Object.values(processes).reduce((sum, cpu) => sum + cpu, 0),
+        cpu_delta_seconds: comparable ? Object.entries(processes).reduce((sum, [identity, cpu]) => sum + cpu - (previous.processes[identity] ?? 0), 0) : null,
+        cpu_delta_complete: comparable ? Object.keys(previous.processes).every(identity => identity in processes) : null,
+        background_cpu_seconds: Object.values(backgroundCpu).reduce((sum, cpu) => sum + cpu, 0),
+        background_cpu_delta_seconds: comparable ? Object.entries(backgroundCpu).reduce((sum, [identity, cpu]) => sum + cpu - (previous.background_processes[identity] ?? 0), 0) : null,
+        background_cpu_delta_complete: comparable ? Object.keys(previous.background_processes).every(identity => identity in backgroundCpu) : null,
+    };
+    return result;
+}
+export function listSessionsResult(envKeys = []) {
+    for (const key of envKeys) {
+        if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key))
+            throw new AitermError("env_keysの環境変数名が不正です", 2);
+    }
+    const r = tmux("list-sessions", "-F", "#{session_name}\t#{pane_current_command}\t#{session_attached}\t#{window_width}\t#{window_height}");
+    const sessions = [];
+    if (r.code !== 0 && !/no server running|No such file or directory/i.test(r.stderr))
+        throw new AitermError("セッション一覧を取得できません: " + r.stderr.trim(), 2);
+    if (r.code === 0)
+        for (const line of r.stdout.trim().split("\n").filter(Boolean)) {
+            const [name, command, attached, width, height] = line.split("\t");
+            assertSessionName(name);
+            const environment = {};
+            for (const key of envKeys) {
+                const value = tmux("show-environment", "-t", name, key);
+                if (value.code !== 0 && !/unknown variable|not found|not set/i.test(value.stderr))
+                    throw new AitermError("session環境変数を照会できません", 2);
+                // psmuxは指定以外の内部キーも出すため、要求されたキーと完全一致した行だけを返す。
+                const selected = value.stdout.split(/\r?\n/).find(entry => entry.startsWith(`${key}=`));
+                environment[key] = selected === undefined ? null : selected.slice(key.length + 1);
+            }
+            const meta = tryLoadAgentMetadata(name);
+            sessions.push({ session_id: name, current_command: normalizePaneCommand(command), attached: Number(attached) > 0,
+                width: Number(width), height: Number(height), harness: meta ? agentHarness(meta.kind) : null, environment });
+        }
+    return { schema: "aiterm.pty-list-result.v1", observed_at: new Date().toISOString(), sessions };
+}
+export function listSessions(result = listSessionsResult()) {
+    if (result.sessions.length) {
+        return result.sessions
+            .map((session) => {
+            const name = session.session_id;
+            const line = `${name}\t${session.current_command}\t${session.attached ? "attached" : "detached"}\t${session.width}x${session.height}`;
             const meta = tryLoadAgentMetadata(name);
             if (!meta)
                 return line;
@@ -1222,6 +1397,72 @@ function createAgentLineageContext(kind, sessionId, seed) {
         delegationAllowed: true,
     };
 }
+export function runAgentApproval(options) {
+    const { action, session_id: name, approval_choice: selected, observed_prompt_digest: expected } = options;
+    assertSessionName(name);
+    if (action === "inspect" && (selected !== undefined || expected !== undefined))
+        throw new AitermError("inspectでは承認選択とdigestを指定できません", 2);
+    if (action === "respond" && (selected === undefined || expected === undefined))
+        throw new AitermError("respondにはapproval_choiceとobserved_prompt_digestが必要です", 2);
+    const release = action === "respond" ? acquireSessionSendFileLock(name) : () => { };
+    try {
+        const meta = loadAgentMetadata(name);
+        const result = {
+            schema: "aiterm.agent-approval-result.v1", action, status: "blocked", session_id: name,
+            harness: agentHarness(meta.kind), launch_id: meta.launch_id, reason: "harness_unsupported",
+            kind: null, prompt: null, prompt_digest: null, choices: [], selected_choice: null, at: new Date().toISOString(),
+        };
+        if (meta.kind !== "codex")
+            return result;
+        const captured = tmux("capture-pane", "-p", "-J", "-t", name, "-S", "-200");
+        if (captured.code !== 0)
+            throw new AitermError("現在の承認画面を取得できません", 2);
+        const screen = captured.stdout;
+        const state = codexPaneObservation(screen);
+        const dialog = codexApprovalDialog(screen);
+        if (!dialog) {
+            result.status = state.state === "blocked" || state.state === "unknown" || action === "respond" ? "blocked" : "none";
+            result.reason = state.state === "blocked" ? "unknown_dialog" : state.state === "unknown" ? "unrecognized_screen" : "no_current_dialog";
+            return result;
+        }
+        result.kind = dialog.kind;
+        result.prompt = dialog.prompt;
+        result.prompt_digest = `sha256:${createHash("sha256").update(`${meta.launch_id}\n${dialog.canonical}`).digest("hex")}`;
+        result.choices = dialog.choices.map(({ decision, label }) => ({ decision, label }));
+        result.reason = "approval_required";
+        result.status = "approval_required";
+        if (dialog.selected_index === null || dialog.choices.length === 0) {
+            result.status = "blocked";
+            result.reason = "unsupported_choices";
+            return result;
+        }
+        if (action === "inspect")
+            return result;
+        if (expected !== result.prompt_digest) {
+            result.status = "blocked";
+            result.reason = "dialog_changed";
+            return result;
+        }
+        const choice = dialog.choices.find(entry => entry.decision === selected);
+        if (!choice) {
+            result.status = "blocked";
+            result.reason = "choice_unavailable";
+            return result;
+        }
+        const distance = choice.index - dialog.selected_index;
+        const keys = [...Array(Math.abs(distance)).fill(distance > 0 ? "Down" : "Up"), "Enter"];
+        const sent = tmux("send-keys", "-t", name, ...keys);
+        if (sent.code !== 0)
+            throw new AitermError("Codex承認入力を送れませんでした", 2);
+        result.status = "submitted";
+        result.reason = "choice_submitted";
+        result.selected_choice = selected ?? null;
+        return result;
+    }
+    finally {
+        release();
+    }
+}
 const DEFAULT_AGENT_DONE_TIMEOUT = 600;
 const agentMetadataNegativeCache = new Map();
 let agentTuiReadyStableSamplesTestOverride = null;
@@ -1706,6 +1947,15 @@ function loadAgentMetadata(name) {
     if (m.event_file !== expectedEvent) {
         throw new AitermError("agent metadata の path が現在の secure state root と一致しません", 2);
     }
+    if (m.initial_prompt_delivery !== undefined && (!["not_requested", "not_sent", "submitted_unconfirmed", "started"].includes(m.initial_prompt_delivery.status)
+        || typeof m.initial_prompt_delivery.reason !== "string"
+        || ![true, false, null].includes(m.initial_prompt_delivery.turn_started)
+        || (m.initial_prompt_cursor !== null && !Number.isSafeInteger(m.initial_prompt_cursor))))
+        throw new AitermError("初手delivery metadataが不正です", 2);
+    const deliveryFields = m.initial_prompt_delivery === undefined ? {} : {
+        initial_prompt_delivery: m.initial_prompt_delivery, initial_prompt_cursor: m.initial_prompt_cursor,
+    };
+    const executableFields = m.agent_executable === undefined ? {} : { agent_executable: m.agent_executable };
     if (m.kind === "claude") {
         const expectedSettings = agentManagedClaudeSettingsPath(name, m.launch_id);
         const expectedResult = agentClaudeResultPath(name, m.launch_id);
@@ -1731,6 +1981,8 @@ function loadAgentMetadata(name) {
             ...(typeof m.write_scope === "string" ? { write_scope: m.write_scope } : {}),
             vendor_session_id: m.vendor_session_id,
             initial_prompt: normalizeInitialPromptState(m.initial_prompt),
+            ...deliveryFields,
+            ...executableFields,
             launch_operation_id: launchOperationId,
             launch_request_digest: launchRequestDigest,
             hook_route: "shared_claude_settings",
@@ -1760,6 +2012,8 @@ function loadAgentMetadata(name) {
             ...(typeof m.write_scope === "string" ? { write_scope: m.write_scope } : {}),
             vendor_session_id: typeof m.vendor_session_id === "string" ? m.vendor_session_id : null,
             initial_prompt: normalizeInitialPromptState(m.initial_prompt),
+            ...deliveryFields,
+            ...executableFields,
             hook_route: "shared_codex_home",
             completion_route: "codex_transcript",
             ...loadAgentLineageFields(m, true),
@@ -1785,6 +2039,8 @@ function loadAgentMetadata(name) {
             ...(typeof m.write_scope === "string" ? { write_scope: m.write_scope } : {}),
             vendor_session_id: typeof m.vendor_session_id === "string" ? m.vendor_session_id : null,
             initial_prompt: normalizeInitialPromptState(m.initial_prompt),
+            ...deliveryFields,
+            ...executableFields,
             hook_route: "shared_cursor_home",
             completion_route: "cursor_transcript",
             ...loadAgentLineageFields(m, true),
@@ -1818,6 +2074,8 @@ function loadAgentMetadata(name) {
         ...(typeof m.write_scope === "string" ? { write_scope: m.write_scope } : {}),
         vendor_session_id: m.vendor_session_id,
         initial_prompt: normalizeInitialPromptState(m.initial_prompt),
+        ...deliveryFields,
+        ...executableFields,
         hook_route: "shared_grok_home",
         completion_route: "grok_transcript",
         ...loadAgentLineageFields(m, true),
@@ -2495,9 +2753,10 @@ function isAgentTuiBusy(kind, screen) {
 // ready gate 用: 入力欄マーカーがあっても busy 表示中は ready と数えない。
 // frontend 推定（inferAgentFrontend）は「agent TUI が前面か」を見るだけなので isAgentTuiReady のまま。
 function isAgentTuiIdleReady(kind, screen) {
-    if (!isAgentTuiReady(kind, screen))
-        return false;
-    return !isAgentTuiBusy(kind, screen);
+    const observation = kind === "grok" || kind === "composer" ? grokPaneObservation(screen)
+        : kind === "codex" ? codexPaneObservation(screen)
+            : kind === "claude" ? claudePaneObservation(screen) : cursorPaneObservation(screen);
+    return observation.state === "idle";
 }
 // 起動側が明示応答すべき既知UI。ここで自動承認せず、ready timeoutを待たずに
 // `initial_prompt=not_sent`を返してsessionを生かしたままcallerへ制御を戻す。
@@ -2505,10 +2764,7 @@ function isAgentTuiActionRequired(kind, screen) {
     if (kind === "grok" || kind === "composer")
         return grokLaunchBlockingDialog(screen) !== null;
     if (kind === "codex") {
-        return codexLaunchBlockingDialog(screen) !== null
-            || screen.includes("Hooks need review")
-            || screen.includes("Allow the room MCP server to run tool")
-            || screen.includes("Would you like to run the following command?");
+        return codexPaneObservation(screen).state === "blocked";
     }
     if (kind === "claude") {
         return /new MCP servers? found in this project/iu.test(screen)
@@ -2797,6 +3053,39 @@ async function sendAgentPromptText(name, text, kind) {
     }
     sendKey(name, "Enter", { preserveAgentOperation: true });
 }
+function setInitialDelivery(meta, value, cursor) {
+    meta.initial_prompt_delivery = value;
+    meta.initial_prompt_cursor = cursor;
+    writeAgentMetadata(meta);
+}
+async function prepareAgentInput(name, meta, options) {
+    await ensureAgentOwnsPaneInput(name, meta.kind);
+    let ready = await waitAgentTuiReady(name, meta, options.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
+    const handled = new Set();
+    while (!ready.ready) {
+        const action = meta.kind === "codex" ? codexStartupAction(ready.lastScreen, options.trust_project === true)
+            : meta.kind === "claude" ? claudeStartupAction(ready.lastScreen, options.trust_project === true)
+                : meta.kind === "grok" || meta.kind === "composer" ? grokStartupAction(ready.lastScreen, options.trust_project === true) : null;
+        if (!action || handled.has(action.kind))
+            break;
+        handled.add(action.kind);
+        for (const key of action.keys) {
+            sendKey(name, key, { preserveAgentOperation: true });
+            await sleep(AGENT_SUBMIT_DELAY_MS);
+        }
+        ready = await waitAgentTuiReady(name, meta, options.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
+    }
+    if (!ready.ready) {
+        const state = meta.kind === "grok" || meta.kind === "composer" ? grokPaneObservation(ready.lastScreen)
+            : meta.kind === "codex" ? codexPaneObservation(ready.lastScreen)
+                : meta.kind === "claude" ? claudePaneObservation(ready.lastScreen) : cursorPaneObservation(ready.lastScreen);
+        return { status: "blocked", reason: state.reason };
+    }
+    const live = observeSession(name);
+    if (live.harness_alive !== true || live.harness_process === null || live.state !== "idle")
+        return { status: "blocked", reason: live.reason };
+    return { status: "ready", reason: "composer_ready" };
+}
 export async function sendInitialAgentPrompt(name, text, o = {}) {
     assertSessionName(name);
     const meta = loadAgentMetadata(name);
@@ -2807,29 +3096,12 @@ export async function sendInitialAgentPrompt(name, text, o = {}) {
         throw new AitermError(`agent session '${name}' は起動時 prompt の完了待ちです。初回応答完了後に再度操作してください。`, 2);
     }
     setInitialPromptState(meta, "not_sent");
-    // 起動直後の hooks 実行で bash が前面に残ると ready gate が恒久 false になり、brief 未送信で
-    // 席が巻き戻る（実測 2026-09-04: Codex 0.153 の初回起動が3回中2回）。打鍵の前に前面と raw を整える。
-    await ensureAgentOwnsPaneInput(name, meta.kind);
-    let ready = await waitAgentTuiReady(name, meta, o.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
-    // 無人Claude起動でCLI自身が順に出す、bypass mode確認とworkspace trustだけを
-    // 起動処理の一部として進める。通常turn中の権限確認やMCP承認には触れない。
-    for (let confirmations = 0; !ready.ready && meta.kind === "claude" && confirmations < 3 && isClaudeManagedLaunchConfirmation(ready.lastScreen); confirmations++) {
-        sendKey(name, "Down", { preserveAgentOperation: true });
-        await sleep(AGENT_SUBMIT_DELAY_MS);
-        sendKey(name, "Enter", { preserveAgentOperation: true });
-        await sleep(AGENT_SUBMIT_DELAY_MS);
-        ready = await waitAgentTuiReady(name, meta, o.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
-    }
-    if (!ready.ready) {
-        // ready失敗は成功形で返さず明示エラーにする（実被弾 2026-08-25: Codexのupdate確認ダイアログで
-        // 未送信のまま成功形receiptが返り、呼び出し側が40分気づけなかった）。sessionは調査/復旧用に残る。
-        const dialog = meta.kind === "codex" ? codexLaunchBlockingDialog(ready.lastScreen)
-            : meta.kind === "grok" || meta.kind === "composer" ? grokLaunchBlockingDialog(ready.lastScreen) : null;
-        const causeNote = dialog
-            ? `${dialog}が入力を塞いでいます。pty_read(screen:true)で画面を確認し、pty_keyでダイアログに応答してから、pty_sendでpromptを送ってください。`
-            : `pty_read(screen:true)で画面を確認し、入力受付になってからpty_sendでpromptを送ってください。`;
-        throw new AitermError(`initial_prompt=not_sent vendor=${meta.kind} ready=false samples=${ready.samples} harness=${agentHarness(meta.kind)}\n` +
-            `agent session '${name}' の ${agentLabel(meta.kind)} TUI が入力受付状態にならず、prompt は送信していません。${causeNote}`, 2);
+    setInitialDelivery(meta, { status: "not_sent", reason: "preparing", turn_started: false }, null);
+    const startup = await prepareAgentInput(name, meta, o);
+    if (startup.status !== "ready") {
+        setInitialDelivery(meta, { status: "not_sent", reason: startup.reason, turn_started: false }, null);
+        throw new AitermError(`initial_prompt=not_sent vendor=${meta.kind} ready=false harness=${agentHarness(meta.kind)}\n` +
+            `agent session '${name}' の起動準備が完了していないため、promptは送信していません。reason=${startup.reason}`, 2);
     }
     const promptText = meta.kind === "cursor" ? cursorPromptWithLineage(meta, text) : text;
     const startOffset = agentCompletionCursor(meta);
@@ -2838,6 +3110,7 @@ export async function sendInitialAgentPrompt(name, text, o = {}) {
             prepareSendText(text, { raw: false });
             reserveAnonymousClaudeTurn(meta);
         }
+        setInitialDelivery(meta, { status: "submitted_unconfirmed", reason: "dispatch_in_progress", turn_started: null }, startOffset);
         await sendAgentPromptText(name, promptText, meta.kind);
         setInitialPromptState(meta, "pending");
     }
@@ -2865,12 +3138,40 @@ export async function sendInitialAgentPrompt(name, text, o = {}) {
         setInitialPromptState(meta, "failed");
         throw e;
     }
+    let delivery = { status: "submitted_unconfirmed", reason: "start_unconfirmed", turn_started: null };
+    const deadline = performance.now() + 3000;
+    do {
+        const screen = captureScreen(name, AGENT_TUI_READY_LINES);
+        const state = meta.kind === "grok" || meta.kind === "composer" ? grokPaneObservation(screen)
+            : meta.kind === "codex" ? codexPaneObservation(screen)
+                : meta.kind === "claude" ? claudePaneObservation(screen) : cursorPaneObservation(screen);
+        if (state.state === "busy") {
+            delivery = { status: "started", reason: "turn_running", turn_started: true };
+            break;
+        }
+        if (state.state === "blocked" && ["command_approval", "mcp_approval", "tool_approval"].includes(state.reason)) {
+            delivery = { status: "started", reason: "approval_required", turn_started: true };
+            break;
+        }
+        const completed = await observeAgentDone(name, { cursor: startOffset, timeout: 0 });
+        if (completed.outcome === "done") {
+            delivery = { status: "started", reason: "turn_completed", turn_started: true };
+            break;
+        }
+        if (state.state === "blocked" || completed.outcome === "error" || completed.outcome === "rate_limited") {
+            delivery.reason = state.state === "blocked" ? state.reason : completed.outcome;
+            break;
+        }
+        await sleep(100);
+    } while (performance.now() < deadline);
+    setInitialDelivery(meta, delivery, startOffset);
     return {
         text: `initial_prompt=pending vendor=${meta.kind} event_cursor=${startOffset} harness=${agentHarness(meta.kind)}\n` +
             `起動時 prompt を送信した。${agentDispatchGuide(name, startOffset)}` +
             agentSubmitResidueWarning(name, residue.residue),
         event_cursor: startOffset,
         submit_residue: residue.residue,
+        initial_prompt: delivery,
     };
 }
 export function isAgentSession(name) {
@@ -3522,7 +3823,7 @@ export function openAgent(kind, opts = {}) {
     let sid;
     let hint;
     try {
-        [sid, hint] = openSession(opts.session_name ?? null, "bash");
+        [sid, hint] = openSession(opts.session_name ?? null, "bash", envVars);
     }
     catch (error) {
         if (launchOperationId !== null && sessionExists(opts.session_name)) {
@@ -3543,8 +3844,11 @@ export function openAgent(kind, opts = {}) {
                         ? createCursorAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", writeScope, lineageContext)
                         : createGrokAgentMetadata(kind, sid, cwd, opts.prompt ? "pending" : "none", grokAuthPath, writeScope, lineageContext)
             : null;
-        if (meta)
+        if (meta) {
+            meta.agent_executable = bin;
+            writeAgentMetadata(meta);
             agentMetadataNegativeCache.delete(sid);
+        }
         launchNote = buildAgentLaunchNote(kind, model, effort, meta);
         const cmd = buildAgentCmd(kind, binForCmd, model, effort, opts.prompt ?? null, meta);
         const envPrefix = agentEnvPrefix(meta, sid, envVars);
@@ -3584,6 +3888,19 @@ export function openAgent(kind, opts = {}) {
             `起動直後に増分 pty_read すると空/半描画になり得るので screen:true を使う。`,
     ];
 }
+export class AgentLaunchPromptError extends AitermError {
+    session_id;
+    initial_prompt;
+    event_cursor;
+    startup;
+    constructor(message, code, session_id, initial_prompt, event_cursor, startup = { status: "blocked", reason: initial_prompt.reason }) {
+        super(message, code);
+        this.session_id = session_id;
+        this.initial_prompt = initial_prompt;
+        this.event_cursor = event_cursor;
+        this.startup = startup;
+    }
+}
 export async function openAgentWithInitialPrompt(kind, opts = {}) {
     const mission = opts.prompt ?? null;
     const sourceSessionId = opts.throughline_source_session ?? null;
@@ -3626,7 +3943,21 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
             write_scope: opts.write_scope,
             env_vars: opts.env_vars,
         });
-        return [sid, hint, null, null];
+        const delivery = { status: "not_requested", reason: "not_requested", turn_started: false };
+        let startup = { status: "not_checked", reason: "startup_not_requested" };
+        if (opts.trust_project === true) {
+            try {
+                startup = await prepareAgentInput(sid, loadAgentMetadata(sid), {
+                    trust_project: true, ready_timeout: opts.ready_timeout ?? undefined,
+                });
+            }
+            catch (error) {
+                throw new AgentLaunchPromptError(`session_id: ${sid}\n起動準備中に失敗しました。${error instanceof Error ? error.message : String(error)}`, error instanceof AitermError ? error.code : 1, sid, delivery, null, { status: "blocked", reason: "startup_failed" });
+            }
+            if (startup.status !== "ready")
+                throw new AgentLaunchPromptError(`session_id: ${sid}\n起動準備を完了できませんでした。reason=${startup.reason}`, 2, sid, delivery, null, startup);
+        }
+        return [sid, hint, null, null, delivery, startup];
     }
     const [sid, hint] = openAgent(kind, {
         session_name: opts.session_name ?? null,
@@ -3642,13 +3973,17 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
     try {
         const initial = await sendInitialAgentPrompt(sid, prompt, {
             ready_timeout: opts.ready_timeout ?? undefined,
+            trust_project: opts.trust_project,
         });
-        return [sid, `${hint}\n${initial.text}`, initial.event_cursor, initial.submit_residue];
+        return [sid, `${hint}\n${initial.text}`, initial.event_cursor, initial.submit_residue, initial.initial_prompt,
+            { status: "ready", reason: "composer_ready" }];
     }
     catch (e) {
         const code = e instanceof AitermError ? e.code : 1;
         const message = e instanceof Error ? e.message : String(e);
-        throw new AitermError(`session_id: ${sid}\n` +
-            `起動後の初回 prompt 処理で失敗しました。session は調査/復旧用に残しています。\n${message}`, code);
+        const meta = loadAgentMetadata(sid);
+        throw new AgentLaunchPromptError(`session_id: ${sid}\n` +
+            `起動後の初回 prompt 処理で失敗しました。session は調査/復旧用に残しています。\n${message}`, code, sid, meta.initial_prompt_delivery ?? { status: "not_sent", reason: "startup_failed", turn_started: false }, meta.initial_prompt_cursor ?? null, { status: meta.initial_prompt_delivery?.status === "submitted_unconfirmed" ? "ready" : "blocked",
+            reason: meta.initial_prompt_delivery?.reason ?? "startup_failed" });
     }
 }