@scotthuang/agent-knock-knock 0.2.46 → 0.2.48

package/dist/src/cli.js

@@ -6,26 +6,53 @@ import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
 import { createCodexTerminalAgentAdapter, detectCodexDurableCompletion } from "./codex-terminal-agent-adapter.js";
+import { createClaudeTerminalAgentAdapter } from "./claude-terminal-agent-adapter.js";
+import { ClaudeHookStore, ClaudeHookStoreError, defaultClaudeHookStoreDir } from "./claude-hook-store.js";
+import { claudePermissionHookOutput } from "./claude-hook-protocol.js";
+import { defaultClaudeSettingsPath, installClaudeHooks, loadTrustedClaudeTokenjuiceLaunchers } from "./claude-hook-installer.js";
 import { CodexLocalSessionProvider } from "./codex-local-session-provider.js";
 import { CodexStoreAdapter } from "./codex-store-adapter.js";
 import { applyMessageToConversation, budgetAction, createConversation, createMessage, executorForConversation, extractStructuredMessage, parseMessageJson, resolveExecutor } from "./protocol.js";
 import { EXECUTOR_KINDS, acpxCommandForExecutor, executorDefinitionForKind, modelEnvForExecutor, normalizeModelForExecutor, proxyEnvForExecutor } from "./executors.js";
 import { executorBootstrapPrompt } from "./bootstrap.js";
-import { writeRuntimeLog } from "./runtime-log.js";
+import { redactString, writeRuntimeLog } from "./runtime-log.js";
 import { formatTranscript, readNdjsonLog } from "./transcript.js";
 import { appendEvent, defaultStoreDir, listConversations, logPathForStatePath, loadConversationById, loadState, messageEvent, pathsForConversation, pathsForConversationDir, saveState, statePathForConversationId } from "./store.js";
 import { planFork, planTakeover } from "./session-takeover-planner.js";
-import { StaticTerminalControlProvider, TmuxTerminalControlProvider } from "./terminal-control-provider.js";
+import { StaticTerminalControlProvider, TmuxTerminalControlProvider, terminalPaneContainsProcess } from "./terminal-control-provider.js";
 import { parseTerminalConversationId } from "./terminal-agent-adapter.js";
 import { createProductionTerminalAgentRegistry } from "./terminal-agent-registry.js";
 import { StaticTerminalProcessSource, SystemTerminalProcessSource } from "./terminal-process-source.js";
 import { TerminalAgentBridge } from "./terminal-agent-bridge.js";
+import { evaluateApprovalPolicy } from "./approval-policy.js";
 const DEFAULT_IDLE_TIMEOUT_MINUTES = 10080;
 const DEFAULT_AGENT_TIMEOUT_MINUTES = 60;
 const DEFAULT_AGENT_HARD_TIMEOUT_MINUTES = 720;
 const DEFAULT_MONITOR_POLL_INTERVAL_MS = 5000;
 const CALLBACK_RETRY_DELAYS_MS = [5000, 15000, 60000, 60000];
-const DEFAULT_CODEX_ACPX_AGENT_COMMAND = "npx -y @agentclientprotocol/codex-acp@^1.1.0";
+const TERMINAL_BRIDGE_MONITOR_LOCK_VERSION = 1;
+const MINIMUM_NODE_VERSION = "22.14.0";
+const PRIVATE_LOCK_FILE_MODE = 0o600;
+const NO_FOLLOW_FLAG = typeof fs.constants.O_NOFOLLOW === "number"
+    ? fs.constants.O_NOFOLLOW
+    : 0;
+const DEFAULT_CODEX_ACPX_AGENT_COMMAND = "npx -y @agentclientprotocol/codex-acp@1.1.7";
+const CONVERSATION_STATUSES = new Set([
+    "created",
+    "running",
+    "waiting_for_agent",
+    "waiting_for_openclaw",
+    "idle",
+    "stalled",
+    "needs_recovery",
+    "needs_model_selection",
+    "callback_pending",
+    "callback_failed",
+    "failed",
+    "closed",
+    "cancelled",
+    "cancelling"
+]);
 class InlineCodexSessionAdapter {
     threads;
     processes;
@@ -82,7 +109,13 @@ catch (error) {
     process.exit(1);
 }
 async function runCommand(commandName, options) {
-    if (commandName === "new") {
+    if (commandName === "help" || commandName === "--help" || commandName === "-h") {
+        usage();
+    }
+    else if (commandName === "version" || commandName === "--version" || commandName === "-v") {
+        printVersion();
+    }
+    else if (commandName === "new") {
         runNew(options);
     }
     else if (commandName === "record") {
@@ -115,6 +148,9 @@ async function runCommand(commandName, options) {
     else if (commandName === "renew") {
         await runRenew(options);
     }
+    else if (commandName === "reconcile-monitors") {
+        await runReconcileMonitors(options);
+    }
     else if (commandName === "recover") {
         runRecover(options);
     }
@@ -127,6 +163,12 @@ async function runCommand(commandName, options) {
     else if (commandName === "install-openclaw") {
         runInstallOpenClaw(options);
     }
+    else if (commandName === "install-claude-hooks") {
+        runInstallClaudeHooks(options);
+    }
+    else if (commandName === "claude-hook") {
+        await runClaudeHook(options);
+    }
     else if (commandName === "doctor") {
         runDoctor(options);
     }
@@ -197,6 +239,88 @@ function runInstallOpenClaw(options) {
             : "Agent Knock Knock is installed. Try: AKK list"
     });
 }
+function runInstallClaudeHooks(options) {
+    const configuredExecutable = stringValue(options.executablePath ?? options.binPath);
+    let executablePath;
+    if (configuredExecutable) {
+        executablePath = path.resolve(expandHome(configuredExecutable));
+    }
+    else {
+        try {
+            executablePath = resolveExecutable("agent-knock-knock");
+        }
+        catch {
+            executablePath = path.resolve(process.argv[1]);
+        }
+    }
+    const result = installClaudeHooks({
+        executablePath,
+        settingsPath: expandHome(options.settingsPath ?? options.settings),
+        dryRun: options.dryRun === true
+    });
+    printJson({
+        installed: result.written || !result.changed,
+        ...result,
+        executablePath,
+        next: result.dryRun
+            ? "Run again without --dry-run to install the Claude Code hooks."
+            : "Claude Code hooks are configured. Existing sessions pick them up through settings reload; start a new session if needed."
+    });
+}
+async function runClaudeHook(options) {
+    const rawInput = fs.readFileSync(0, "utf8");
+    let input;
+    try {
+        input = JSON.parse(rawInput);
+    }
+    catch {
+        throw new Error("Claude hook input must be valid JSON");
+    }
+    const agentRows = loadClaudeAgentRows(options);
+    const claudePid = inferClaudeAncestorPid(agentRows);
+    const store = createClaudeHookStore(options);
+    const record = store.record(input, {
+        ...(claudePid === undefined ? {} : { claudePid })
+    });
+    if (record.event.input.hook_event_name !== "PermissionRequest" || !record.permission) {
+        return;
+    }
+    const permission = record.permission;
+    const requestedTimeout = options.permissionWaitTimeoutMs ?? options.timeoutMs;
+    const timeoutMs = requestedTimeout === undefined
+        ? undefined
+        : Math.max(0, Number(requestedTimeout));
+    try {
+        const decision = await store.waitForPermissionDecision({
+            sessionId: permission.sessionId,
+            requestId: permission.requestId,
+            fingerprint: permission.fingerprint,
+            conversationId: permission.conversationId,
+            messageId: permission.messageId,
+            ...(timeoutMs === undefined ? {} : { timeoutMs })
+        });
+        process.stdout.write(`${JSON.stringify(decision?.hookOutput ?? claudePermissionHookOutput({
+            behavior: "deny",
+            interrupt: false,
+            message: "Agent Knock Knock approval timed out. Review the request and retry the task."
+        }))}\n`);
+    }
+    catch (error) {
+        if (error instanceof ClaudeHookStoreError && [
+            "PERMISSION_EXPIRED",
+            "PERMISSION_CONSUMED",
+            "PERMISSION_ALREADY_DECIDED"
+        ].includes(error.code)) {
+            process.stdout.write(`${JSON.stringify(claudePermissionHookOutput({
+                behavior: "deny",
+                interrupt: false,
+                message: "Agent Knock Knock approval expired before a safe decision was received."
+            }))}\n`);
+            return;
+        }
+        throw error;
+    }
+}
 function installOpenClawPlugin(openclawBin, root) {
     const linked = spawnSync(openclawBin, ["plugins", "install", "--link", root], {
         encoding: "utf8",
@@ -222,7 +346,17 @@ function installOpenClawPlugin(openclawBin, root) {
 }
 function runDoctor(options) {
     const commands = ["node", "openclaw", "acpx", "codex", "claude", "cursor"];
-    const checks = commands.map((commandName) => executableCheck(commandName));
+    const checks = commands.map((commandName) => {
+        const check = executableCheck(commandName);
+        return commandName === "node"
+            ? {
+                ...check,
+                version: process.versions.node,
+                version_supported: versionAtLeast(process.versions.node, MINIMUM_NODE_VERSION),
+                minimum_version: MINIMUM_NODE_VERSION
+            }
+            : check;
+    });
     const root = packageRootDir();
     const packageFiles = [
         "dist/src/cli.js",
@@ -238,22 +372,43 @@ function runDoctor(options) {
     });
     const requiredOk = checks
         .filter((check) => ["node", "openclaw", "acpx"].includes(check.command))
-        .every((check) => check.available);
+        .every((check) => check.available &&
+        (check.command !== "node" ||
+            ("version_supported" in check && check.version_supported === true)));
     const agentOk = checks
         .filter((check) => ["codex", "claude", "cursor"].includes(check.command))
         .some((check) => check.available);
     const filesOk = packageFiles.every((check) => check.exists);
+    const ok = requiredOk && agentOk && filesOk;
     printJson({
-        ok: requiredOk && agentOk && filesOk,
+        ok,
         package_root: root,
         checks,
         package_files: packageFiles,
         notes: [
-            "node, openclaw, and acpx are required.",
+            `Node.js ${MINIMUM_NODE_VERSION}+, openclaw, and acpx are required.`,
             "At least one local coding agent command should be available: codex, claude, or cursor."
         ],
         options
     });
+    if (!ok) {
+        process.exitCode = 1;
+    }
+}
+function versionAtLeast(version, minimum) {
+    const parsed = version.split(".").slice(0, 3).map((part) => Number.parseInt(part, 10));
+    const required = minimum.split(".").slice(0, 3).map((part) => Number.parseInt(part, 10));
+    if (parsed.length !== 3 ||
+        required.length !== 3 ||
+        [...parsed, ...required].some((part) => !Number.isInteger(part) || part < 0)) {
+        return false;
+    }
+    for (let index = 0; index < 3; index += 1) {
+        if (parsed[index] !== required[index]) {
+            return parsed[index] > required[index];
+        }
+    }
+    return true;
 }
 async function runAgent(options) {
     const agentCommand = required(options.agentCommand, "agent subcommand is required: takeover");
@@ -397,6 +552,7 @@ async function runAgentTakeover(options) {
                 options,
                 takeoverMatchKind: "terminal_control",
                 terminalControl: target.terminalControl,
+                terminalAgentPid: target.pid,
                 needsBootstrap: false
             });
             return {
@@ -558,7 +714,11 @@ function selectTerminateTarget({ plan, session, activeSessions, expectedPid, all
 }
 async function listActiveSessionsWithTerminalControl(provider, options, terminalProvider = createTerminalControlProvider(options)) {
     const activeSessions = await provider.listActiveSessions();
-    return createTerminalAgentBridge(options, terminalProvider).attachProcesses(provider.agent, activeSessions);
+    const activePids = new Set(activeSessions.map((session) => session.pid));
+    const processTree = activePids.size > 0
+        ? await createTerminalProcessSource(options).listProcessSnapshots((snapshot) => activePids.has(snapshot.pid), { includeCwd: false, includeAncestors: true })
+        : [];
+    return createTerminalAgentBridge(options, terminalProvider).attachProcesses(provider.agent, activeSessions, { processTree });
 }
 function createTerminalControlProvider(options) {
     if (options.terminalsJson || options.terminalScreensJson || options.processesJson) {
@@ -575,9 +735,107 @@ function createTerminalProcessSource(options) {
     }
     return new SystemTerminalProcessSource();
 }
+function createClaudeHookStore(options = {}) {
+    const configuredRoot = stringValue(options.claudeHookStoreDir);
+    return new ClaudeHookStore({
+        rootDir: expandHome(configuredRoot ?? defaultClaudeHookStoreDir())
+    });
+}
+function loadClaudeAgentRows(options = {}) {
+    let value;
+    if (options.claudeAgentsJson !== undefined) {
+        value = typeof options.claudeAgentsJson === "string"
+            ? parseJsonOption(options.claudeAgentsJson, "--claude-agents-json")
+            : options.claudeAgentsJson;
+    }
+    else if (options.processesJson || options.terminalsJson || options.terminalScreensJson) {
+        return [];
+    }
+    else {
+        const claudeExecutable = resolveOptionalExecutable("claude");
+        if (!claudeExecutable) {
+            return [];
+        }
+        const result = spawnSync(claudeExecutable, ["agents", "--json", "--all"], {
+            encoding: "utf8",
+            maxBuffer: 1024 * 1024 * 10,
+            timeout: 10_000
+        });
+        if (result.error || result.status !== 0) {
+            runtimeLog("warn", "claude_agents_list_failed", {
+                status: result.status ?? null,
+                error: result.error?.message,
+                stderr: textSummary(cleanProcessText(result.stderr))
+            });
+            return [];
+        }
+        try {
+            value = JSON.parse(result.stdout);
+        }
+        catch {
+            runtimeLog("warn", "claude_agents_list_invalid_json", {
+                stdout: textSummary(result.stdout)
+            });
+            return [];
+        }
+    }
+    const rows = Array.isArray(value)
+        ? value
+        : isRecord(value) && Array.isArray(value.agents)
+            ? value.agents
+            : [];
+    return rows.flatMap((row) => {
+        if (!isRecord(row) || !Number.isInteger(Number(row.pid))) {
+            return [];
+        }
+        return [{
+                pid: Number(row.pid),
+                ...(stringValue(row.cwd) ? { cwd: stringValue(row.cwd) } : {}),
+                ...(stringValue(row.kind) ? { kind: stringValue(row.kind) } : {}),
+                ...(stringValue(row.sessionId) ? { sessionId: stringValue(row.sessionId) } : {}),
+                ...(stringValue(row.status) ? { status: stringValue(row.status) } : {})
+            }];
+    });
+}
+function inferClaudeAncestorPid(agentRows, startingPid = process.ppid) {
+    const interactivePids = new Set(agentRows
+        .filter((row) => row.kind === undefined || row.kind === "interactive")
+        .map((row) => row.pid)
+        .filter((pid) => Number.isInteger(pid)));
+    let pid = startingPid;
+    const visited = new Set();
+    for (let depth = 0; depth < 16 && Number.isInteger(pid) && pid > 1 && !visited.has(pid); depth += 1) {
+        visited.add(pid);
+        const processRow = spawnSync("ps", ["-p", String(pid), "-o", "pid=,ppid=,command="], {
+            encoding: "utf8",
+            timeout: 2_000
+        });
+        if (processRow.error || processRow.status !== 0) {
+            return undefined;
+        }
+        const match = /^\s*(\d+)\s+(\d+)\s+(.+)$/u.exec(String(processRow.stdout).trim());
+        if (!match) {
+            return undefined;
+        }
+        const currentPid = Number(match[1]);
+        const parentPid = Number(match[2]);
+        const commandText = match[3];
+        if (interactivePids.has(currentPid) || isClaudeProcessCommand(commandText)) {
+            return currentPid;
+        }
+        pid = parentPid;
+    }
+    return undefined;
+}
+function isClaudeProcessCommand(commandText) {
+    const executable = commandText.trim().split(/\s+/u, 1)[0];
+    return path.basename(executable) === "claude" ||
+        /[\\/]\.local[\\/]share[\\/]claude[\\/]versions[\\/][^\\/\s]+$/u.test(executable);
+}
 function createRuntimeTerminalAgentRegistry(options) {
     return createProductionTerminalAgentRegistry({
-        overrides: [createCodexTerminalAgentAdapter({
+        overrides: [
+            createCodexTerminalAgentAdapter({
                 async detectDurableCompletion(request) {
                     const runtime = isRecord(request.context) ? request.context : undefined;
                     const conversation = runtime?.conversation;
@@ -611,13 +869,44 @@ function createRuntimeTerminalAgentRegistry(options) {
                         }
                         : undefined;
                 }
-            })]
+            }),
+            createClaudeTerminalAgentAdapter({
+                agentRows: loadClaudeAgentRows(options),
+                hookStore: createClaudeHookStore(options),
+                trustedTokenjuiceLaunchers: loadTrustedClaudeTokenjuiceLaunchers(expandHome(options.claudeSettingsPath ?? defaultClaudeSettingsPath()))
+            })
+        ]
     });
 }
-function createTerminalAgentBridge(options, terminalProvider = createTerminalControlProvider(options)) {
+function createTerminalAgentBridge(options, terminalProvider = createTerminalControlProvider(options), registry = createRuntimeTerminalAgentRegistry(options)) {
+    const processSource = createTerminalProcessSource(options);
     return new TerminalAgentBridge({
-        registry: createRuntimeTerminalAgentRegistry(options),
-        terminalProvider
+        registry,
+        terminalProvider,
+        async verifyIdentity({ agent, pid, terminalControl }) {
+            const adapter = registry.require(agent);
+            const snapshots = await processSource.listProcessSnapshots(undefined, { includeCwd: false });
+            const snapshot = snapshots.find((candidate) => candidate.pid === pid);
+            if (!snapshot || !adapter.classifyProcess(snapshot)) {
+                throw new Error(`terminal conversation agent ${agent} with pid ${pid} is no longer active`);
+            }
+            const panes = await terminalProvider.listPanes();
+            const pane = panes.find((candidate) => candidate.kind === terminalControl.kind &&
+                candidate.target === terminalControl.target &&
+                candidate.panePid === terminalControl.panePid);
+            if (!pane || !terminalPaneContainsProcess(snapshot, pane, snapshots)) {
+                throw new Error(`terminal conversation agent ${agent} with pid ${pid} no longer belongs to pane ${terminalControl.target}`);
+            }
+            return {
+                terminalControl: {
+                    ...terminalControl,
+                    socketPath: pane.socketPath,
+                    panePid: pane.panePid,
+                    currentCommand: pane.currentCommand,
+                    currentPath: pane.currentPath
+                }
+            };
+        }
     });
 }
 function planTerminalControlTakeover(session, activeSessions) {
@@ -695,6 +984,134 @@ function terminalControlFromTakeover(nativeTakeover) {
             ]
     };
 }
+function terminalRuntimeIdentityForConversation(conversation, terminalControl) {
+    const nativeTakeover = isRecord(conversation?.native_session_takeover)
+        ? conversation.native_session_takeover
+        : undefined;
+    const nativeSessionId = stringValue(nativeTakeover?.native_session_id);
+    const terminalIdentity = parseTerminalConversationId(nativeSessionId);
+    const explicitSessionId = stringValue(nativeTakeover?.terminal_agent_session_id) ??
+        (terminalIdentity ? undefined : nativeSessionId);
+    return {
+        pid: Number.isInteger(Number(nativeTakeover?.terminal_agent_pid))
+            ? Number(nativeTakeover?.terminal_agent_pid)
+            : terminalIdentity?.pid,
+        sessionId: explicitSessionId,
+        cwd: stringValue(nativeTakeover?.source_cwd) ?? terminalControl.currentPath,
+        conversationId: stringValue(conversation?.conversation_id),
+        messageId: stringValue(nativeTakeover?.terminal_bridge_message_id),
+        terminalTarget: terminalControl.target
+    };
+}
+async function migrateLegacyTerminalAgentIdentity({ conversation, statePath, logPath, options }) {
+    const nativeTakeover = isRecord(conversation?.native_session_takeover)
+        ? conversation.native_session_takeover
+        : undefined;
+    const terminalControl = terminalControlFromTakeover(nativeTakeover);
+    if (!nativeTakeover || !terminalControl) {
+        return conversation;
+    }
+    const runtime = terminalRuntimeIdentityForConversation(conversation, terminalControl);
+    if (Number.isInteger(runtime.pid) && Number(runtime.pid) > 0) {
+        return conversation;
+    }
+    const executor = executorForConversation(conversation);
+    const nativeSessionId = stringValue(nativeTakeover.native_session_id);
+    if (executor.kind !== "codex" ||
+        !nativeSessionId ||
+        parseTerminalConversationId(nativeSessionId)) {
+        return conversation;
+    }
+    let matchedProcess;
+    try {
+        const registry = createRuntimeTerminalAgentRegistry(options);
+        const adapter = registry.require("codex");
+        const snapshots = await createTerminalProcessSource(options).listProcessSnapshots((snapshot) => adapter.classifyProcess(snapshot) !== undefined, { includeAncestors: true });
+        const panes = await createTerminalControlProvider(options).listPanes();
+        const matchingPanes = panes.filter((pane) => pane.kind === terminalControl.kind &&
+            pane.target === terminalControl.target &&
+            pane.panePid === terminalControl.panePid);
+        if (matchingPanes.length !== 1) {
+            return conversation;
+        }
+        const candidates = snapshots.flatMap((snapshot) => {
+            const classified = adapter.classifyProcess(snapshot);
+            return classified ? [{ ...classified, agent: "codex" }] : [];
+        });
+        const matches = candidates.filter((candidate) => candidate.sessionId === nativeSessionId &&
+            terminalPaneContainsProcess(candidate, matchingPanes[0], snapshots));
+        if (matches.length !== 1) {
+            return conversation;
+        }
+        matchedProcess = matches[0];
+    }
+    catch (error) {
+        runtimeLog("warn", "legacy_terminal_agent_identity_migration_failed", {
+            conversation_id: conversation.conversation_id,
+            terminal_target: terminalControl.target,
+            reason: error instanceof Error ? error.message : String(error)
+        });
+        return conversation;
+    }
+    if (!matchedProcess) {
+        return conversation;
+    }
+    const releaseLock = acquireFileLock(`${statePath}.lock`);
+    let migratedConversation = conversation;
+    let migrated = false;
+    try {
+        const current = loadState(statePath);
+        const currentTakeover = isRecord(current.native_session_takeover)
+            ? current.native_session_takeover
+            : undefined;
+        const currentControl = terminalControlFromTakeover(currentTakeover);
+        if (!currentTakeover || !currentControl) {
+            return current;
+        }
+        const currentRuntime = terminalRuntimeIdentityForConversation(current, currentControl);
+        if (Number.isInteger(currentRuntime.pid) && Number(currentRuntime.pid) > 0) {
+            return current;
+        }
+        if (currentTakeover.native_session_id !== nativeSessionId ||
+            currentControl.target !== terminalControl.target ||
+            currentControl.socketPath !== terminalControl.socketPath ||
+            currentControl.panePid !== terminalControl.panePid) {
+            return current;
+        }
+        const migratedAt = new Date().toISOString();
+        migratedConversation = {
+            ...current,
+            native_session_takeover: {
+                ...currentTakeover,
+                terminal_agent_pid: matchedProcess.pid,
+                terminal_agent_session_id: matchedProcess.sessionId,
+                terminal_agent_identity_migrated_at: migratedAt
+            },
+            updated_at: migratedAt
+        };
+        saveState(statePath, migratedConversation);
+        migrated = true;
+    }
+    finally {
+        releaseLock();
+    }
+    if (migrated) {
+        appendEvent(logPath, {
+            ts: new Date().toISOString(),
+            conversation_id: migratedConversation.conversation_id,
+            event: "terminal_agent_identity_migrated",
+            terminal_target: terminalControl.target,
+            terminal_agent_pid: matchedProcess.pid,
+            native_session_id: nativeSessionId
+        });
+        runtimeLog("info", "terminal_agent_identity_migrated", {
+            conversation_id: migratedConversation.conversation_id,
+            terminal_target: terminalControl.target,
+            terminal_agent_pid: matchedProcess.pid
+        });
+    }
+    return migratedConversation;
+}
 function isTerminalControlCapability(value) {
     return typeof value === "string" && [
         "screen_status",
@@ -798,7 +1215,7 @@ function createForkConversation({ agent, strategy, session, contextPackage, fork
         next: `Use AKK send ${forkedConversation.conversation_id}: <message> to start the forked ${agent} session with the approved summary.`
     };
 }
-function createNativeSessionConversation({ agent, strategy, session, modelInfo, options, takeoverMatchKind = strategy, terminalControl = undefined, needsBootstrap = true }) {
+function createNativeSessionConversation({ agent, strategy, session, modelInfo, options, takeoverMatchKind = strategy, terminalControl = undefined, terminalAgentPid = undefined, needsBootstrap = true }) {
     const workspace = session.cwd;
     const storeDir = expandHome(options.storeDir ?? options.logDir ?? defaultStoreDir(workspace));
     cleanupIdleConversations(storeDir, options);
@@ -847,6 +1264,7 @@ function createNativeSessionConversation({ agent, strategy, session, modelInfo,
         native_session_takeover: {
             agent,
             native_session_id: session.id,
+            terminal_agent_pid: terminalAgentPid,
             source_cwd: session.cwd,
             source_title: session.title,
             strategy,
@@ -1094,7 +1512,7 @@ function runDelegate(options) {
             throw new Error(cleanProcessText(ensureSession.stderr || ensureSession.stdout || `acpx ${executor.kind} sessions ensure exited with status ${ensureSession.status}`));
         }
         const outputPath = path.join(newResult.paths.conversationDir, `${executor.kind}-output.log`);
-        const outputFd = fs.openSync(outputPath, "a");
+        const outputFd = openPrivateAppendFile(outputPath);
         const child = spawn(acpxPath, acpxArgs, {
             detached: true,
             stdio: ["ignore", outputFd, outputFd],
@@ -1241,12 +1659,12 @@ function startExecutorMonitor({ statePath, logPath, pid, outputPath, agentTimeou
         detached: true,
         stdio: "ignore",
         cwd: process.cwd(),
-        env: process.env
+        env: environmentWithoutGatewayTokens()
     });
     child.unref();
     return child;
 }
-function startTerminalBridgeMonitor({ statePath, logPath, agentTimeoutMinutes, agentHardTimeoutMinutes, pollIntervalMs, codexHome }) {
+function startTerminalBridgeMonitor({ statePath, logPath, agentTimeoutMinutes, agentHardTimeoutMinutes, pollIntervalMs, codexHome, claudeHookStoreDir }) {
     const args = [
         new URL(import.meta.url).pathname,
         "monitor",
@@ -1265,11 +1683,14 @@ function startTerminalBridgeMonitor({ statePath, logPath, agentTimeoutMinutes, a
     if (codexHome) {
         args.push("--codex-home", codexHome);
     }
+    if (claudeHookStoreDir) {
+        args.push("--claude-hook-store-dir", claudeHookStoreDir);
+    }
     const child = spawn(process.execPath, args, {
         detached: true,
         stdio: "ignore",
         cwd: process.cwd(),
-        env: process.env
+        env: environmentWithoutGatewayTokens()
     });
     child.unref();
     return child;
@@ -1291,7 +1712,8 @@ function startTerminalBridgeMonitorForConversation({ conversation, statePath, lo
             nativeTakeover?.["terminal_bridge_hard_timeout_minutes"] ??
             DEFAULT_AGENT_HARD_TIMEOUT_MINUTES),
         pollIntervalMs: Number(options.monitorPollIntervalMs ?? DEFAULT_MONITOR_POLL_INTERVAL_MS),
-        codexHome: options.codexHome
+        codexHome: options.codexHome,
+        claudeHookStoreDir: options.claudeHookStoreDir ?? nativeTakeover?.["claude_hook_store_dir"]
     });
 }
 function terminalBridgeEnabled(conversation) {
@@ -1314,6 +1736,8 @@ function withTerminalBridgeState({ conversation, message, startedAt, agentTimeou
             terminal_bridge_request_text: String(message.body ?? ""),
             terminal_bridge_request_hash: terminalBridgeRequestFingerprint(message.body),
             terminal_bridge_pre_send_screen_fingerprint: preSendScreenFingerprint,
+            terminal_bridge_completion_claim: undefined,
+            terminal_bridge_monitor_lock_version: TERMINAL_BRIDGE_MONITOR_LOCK_VERSION,
             terminal_bridge_monitor_started_at: startedAt,
             terminal_bridge_last_activity_at: startedAt,
             terminal_bridge_inactivity_timeout_minutes: agentTimeoutMinutes,
@@ -1324,6 +1748,165 @@ function withTerminalBridgeState({ conversation, message, startedAt, agentTimeou
         updated_at: startedAt
     };
 }
+function activateClaudeHookLease({ options, conversation, message, terminalControl, expiresAt }) {
+    const runtime = terminalRuntimeIdentityForConversation(conversation, terminalControl);
+    const pid = runtime.pid;
+    const agentRow = pid === undefined
+        ? undefined
+        : loadClaudeAgentRows(options).find((row) => row.pid === pid && (row.kind === undefined || row.kind === "interactive"));
+    const sessionId = agentRow?.sessionId ?? runtime.sessionId;
+    const cwd = agentRow?.cwd ?? runtime.cwd ?? terminalControl.currentPath;
+    if (!cwd || (pid === undefined && !sessionId)) {
+        runtimeLog("warn", "claude_hook_lease_unavailable", {
+            conversation_id: conversation.conversation_id,
+            terminal_target: terminalControl.target,
+            reason: "exact Claude pid/session identity is unavailable"
+        });
+        return undefined;
+    }
+    const store = createClaudeHookStore(options);
+    try {
+        const previous = store.resolveLease({
+            ...(sessionId === undefined ? {} : { sessionId }),
+            ...(pid === undefined ? {} : { pid }),
+            cwd,
+            requireUnique: true
+        });
+        if (previous && (previous.lease.conversationId !== conversation.conversation_id ||
+            previous.lease.messageId !== message.id)) {
+            store.releaseLease({ leaseId: previous.lease.id });
+        }
+        const lease = store.activateLease({
+            ...(sessionId === undefined ? {} : { sessionId }),
+            ...(pid === undefined ? {} : { pid }),
+            cwd,
+            conversationId: conversation.conversation_id,
+            messageId: message.id,
+            terminalTarget: terminalControl.target,
+            expiresAt
+        });
+        runtimeLog("info", "claude_hook_lease_activated", {
+            conversation_id: conversation.conversation_id,
+            message_id: message.id,
+            terminal_target: terminalControl.target,
+            lease_id: lease.id,
+            pid,
+            session_id: sessionId,
+            expires_at: lease.expiresAt
+        });
+        return {
+            lease,
+            storeDir: store.rootDir,
+            ...(pid === undefined ? {} : { pid }),
+            ...(sessionId === undefined ? {} : { sessionId })
+        };
+    }
+    catch (error) {
+        runtimeLog("warn", "claude_hook_lease_unavailable", {
+            conversation_id: conversation.conversation_id,
+            terminal_target: terminalControl.target,
+            reason: error instanceof Error ? error.message : String(error)
+        });
+        return undefined;
+    }
+}
+function withClaudeHookLeaseState(conversation, state) {
+    const nativeTakeover = isRecord(conversation.native_session_takeover)
+        ? conversation.native_session_takeover
+        : {};
+    return {
+        ...conversation,
+        native_session_takeover: {
+            ...nativeTakeover,
+            claude_hook_mode: "enabled",
+            claude_hook_store_dir: state.storeDir,
+            claude_hook_lease_id: state.lease.id,
+            terminal_agent_pid: state.pid,
+            terminal_agent_session_id: state.sessionId
+        }
+    };
+}
+function releaseClaudeHookLease(conversation) {
+    const nativeTakeover = isRecord(conversation?.native_session_takeover)
+        ? conversation.native_session_takeover
+        : undefined;
+    const leaseId = stringValue(nativeTakeover?.claude_hook_lease_id);
+    if (!leaseId || nativeTakeover?.agent !== "claude") {
+        return;
+    }
+    const storeDir = stringValue(nativeTakeover.claude_hook_store_dir) ?? defaultClaudeHookStoreDir();
+    try {
+        const released = new ClaudeHookStore({ rootDir: storeDir }).releaseLease({ leaseId });
+        runtimeLog("info", "claude_hook_lease_released", {
+            conversation_id: conversation.conversation_id,
+            message_id: released?.messageId,
+            lease_id: leaseId
+        });
+    }
+    catch (error) {
+        runtimeLog("warn", "claude_hook_lease_release_failed", {
+            conversation_id: conversation.conversation_id,
+            lease_id: leaseId,
+            reason: error instanceof Error ? error.message : String(error)
+        });
+    }
+}
+function renewClaudeHookLease(conversation, expiresAt) {
+    const nativeTakeover = isRecord(conversation?.native_session_takeover)
+        ? conversation.native_session_takeover
+        : undefined;
+    if (nativeTakeover?.agent !== "claude") {
+        return undefined;
+    }
+    const conversationId = stringValue(conversation.conversation_id);
+    const messageId = stringValue(nativeTakeover.terminal_bridge_message_id);
+    const terminalControl = terminalControlFromTakeover(nativeTakeover);
+    const cwd = stringValue(nativeTakeover.source_cwd) ?? terminalControl?.currentPath;
+    const pid = Number.isInteger(Number(nativeTakeover.terminal_agent_pid))
+        ? Number(nativeTakeover.terminal_agent_pid)
+        : undefined;
+    const sessionId = stringValue(nativeTakeover.terminal_agent_session_id);
+    if (!conversationId || !messageId || !terminalControl || !cwd || (pid === undefined && !sessionId)) {
+        return undefined;
+    }
+    const storeDir = stringValue(nativeTakeover.claude_hook_store_dir) ?? defaultClaudeHookStoreDir();
+    try {
+        return new ClaudeHookStore({ rootDir: storeDir }).activateLease({
+            ...(sessionId === undefined ? {} : { sessionId }),
+            ...(pid === undefined ? {} : { pid }),
+            cwd,
+            conversationId,
+            messageId,
+            terminalTarget: terminalControl.target,
+            expiresAt
+        });
+    }
+    catch (error) {
+        runtimeLog("warn", "claude_hook_lease_renew_failed", {
+            conversation_id: conversationId,
+            message_id: messageId,
+            reason: error instanceof Error ? error.message : String(error)
+        });
+        return undefined;
+    }
+}
+function releaseClaudeHookLeasesForTerminal({ storeDir, terminalControl, replacementConversationId }) {
+    for (const candidate of listConversations(storeDir)) {
+        if (candidate.conversation_id === replacementConversationId) {
+            continue;
+        }
+        const nativeTakeover = isRecord(candidate.native_session_takeover)
+            ? candidate.native_session_takeover
+            : undefined;
+        const candidateControl = terminalControlFromTakeover(nativeTakeover);
+        if (nativeTakeover?.agent === "claude" &&
+            nativeTakeover?.terminal_bridge === true &&
+            candidateControl?.target === terminalControl.target &&
+            candidateControl?.socketPath === terminalControl.socketPath) {
+            releaseClaudeHookLease(candidate);
+        }
+    }
+}
 function uniqueDelegateSessionName(kind) {
     const { sessionPrefix } = executorDefinitionForKind(kind || "claude");
     const timestamp = new Date().toISOString().replace(/\D/g, "").slice(0, 14);
@@ -1378,16 +1961,23 @@ function modelForExecutor(executor, options = {}) {
     return normalizeModelForExecutor(executor, modelEnvForExecutor(executor, process.env));
 }
 function environmentForExecutor(executor, options = {}) {
+    const environment = environmentWithoutGatewayTokens();
     const proxy = proxyForExecutor(executor, options);
     if (!proxy) {
-        return process.env;
+        return environment;
     }
     return {
-        ...process.env,
+        ...environment,
         ALL_PROXY: proxy,
         all_proxy: proxy
     };
 }
+function environmentWithoutGatewayTokens() {
+    const environment = { ...process.env };
+    delete environment.AKK_GATEWAY_TOKEN;
+    delete environment.OPENCLAW_GATEWAY_TOKEN;
+    return environment;
+}
 async function runList(options) {
     const storeDir = expandHome(options.storeDir ?? options.logDir ?? defaultStoreDir(process.cwd()));
     const cleanup = cleanupIdleConversations(storeDir, options);
@@ -1460,7 +2050,7 @@ async function buildNativeListGroups({ options, agentFilter, statusFilter }) {
         };
     }
     const terminalProvider = createTerminalControlProvider(options);
-    const bridge = new TerminalAgentBridge({ registry, terminalProvider });
+    const bridge = createTerminalAgentBridge(options, terminalProvider, registry);
     const terminalScan = options.terminalDebug ? await terminalControlDiagnostics(terminalProvider) : undefined;
     const terminalControlled = [];
     const native = [];
@@ -1468,7 +2058,7 @@ async function buildNativeListGroups({ options, agentFilter, statusFilter }) {
     const errors = [];
     try {
         const processSource = createTerminalProcessSource(options);
-        const snapshots = await processSource.listProcessSnapshots((snapshot) => adapters.some((adapter) => adapter.capabilities.processDiscovery && adapter.classifyProcess(snapshot) !== undefined));
+        const snapshots = await processSource.listProcessSnapshots((snapshot) => adapters.some((adapter) => adapter.capabilities.processDiscovery && adapter.classifyProcess(snapshot) !== undefined), { includeAncestors: true });
         const activeSessions = await bridge.listProcesses(snapshots, adapters.map((adapter) => adapter.agent));
         activeCount = activeSessions.length;
         const rootSessions = rootActiveProcesses(activeSessions);
@@ -1554,7 +2144,12 @@ async function terminalControlledListEntry(session, activeSessions, options, bri
     if (!terminalControl) {
         throw new Error(`process ${session.pid} is not terminal-controlled`);
     }
-    const terminalState = await listStateForTerminal(session.agent, terminalControl, options, bridge);
+    const terminalState = await listStateForTerminal(session.agent, terminalControl, options, bridge, {
+        pid: session.pid,
+        sessionId: session.sessionId,
+        cwd: session.cwd,
+        terminalTarget: terminalControl.target
+    });
     return {
         id: bridge.terminalConversationId(session),
         source: "terminal_control",
@@ -1583,7 +2178,7 @@ async function terminalControlledListEntry(session, activeSessions, options, bri
         }
     };
 }
-async function listStateForTerminal(agent, terminalControl, options, bridge = createTerminalAgentBridge(options)) {
+async function listStateForTerminal(agent, terminalControl, options, bridge = createTerminalAgentBridge(options), runtime) {
     if (options.noApprovalScan) {
         return {
             approval_state: {
@@ -1598,7 +2193,8 @@ async function listStateForTerminal(agent, terminalControl, options, bridge = cr
     }
     try {
         const status = await bridge.status(agent, terminalControl, {
-            scrollbackLines: Number(options.scrollbackLines ?? 120)
+            scrollbackLines: Number(options.scrollbackLines ?? 120),
+            runtime
         });
         return {
             approval_state: {
@@ -1629,7 +2225,7 @@ function rootActiveProcesses(processes) {
     const seenTerminalTargets = new Set();
     return roots.filter((process) => {
         const terminalTarget = process.terminalControl?.target
-            ? `${process.agent}:${process.terminalControl.target}`
+            ? `${process.agent}:${process.terminalControl.target}:${process.terminalControl.panePid}`
             : undefined;
         if (!terminalTarget) {
             return true;
@@ -1671,7 +2267,11 @@ async function runStatus(options) {
     cleanupIdleConversations(storeDirFromOptions(options), options);
     const terminalConversation = await resolveTerminalConversationFromOptions(options);
     if (terminalConversation) {
-        const terminalStatus = await terminalStatusForControl(terminalConversation.agent, terminalConversation.terminalControl, options);
+        const terminalStatus = await terminalStatusForControl(terminalConversation.agent, terminalConversation.terminalControl, options, {
+            pid: terminalConversation.pid,
+            cwd: terminalConversation.terminalControl.currentPath,
+            terminalTarget: terminalConversation.terminalControl.target
+        });
         printJson({
             conversation_id: terminalConversation.conversationId,
             source: "terminal_control",
@@ -1686,7 +2286,12 @@ async function runStatus(options) {
         });
         return;
     }
-    const { conversation, statePath, logPath } = loadConversationFromOptions(options);
+    const loaded = loadConversationFromOptions(options);
+    const { statePath, logPath } = loaded;
+    const conversation = await migrateLegacyTerminalAgentIdentity({
+        ...loaded,
+        options
+    });
     const events = readExistingEvents(logPath);
     const result = {
         conversation,
@@ -1703,7 +2308,7 @@ async function runStatus(options) {
     if (terminalControl) {
         const executor = executorForConversation(conversation);
         result.terminal_control = terminalControl;
-        result.terminal_status = await terminalStatusForControl(executor.kind, terminalControl, options);
+        result.terminal_status = await terminalStatusForControl(executor.kind, terminalControl, options, terminalRuntimeIdentityForConversation(conversation, terminalControl));
         result.terminal_screen = result.terminal_status.screen;
     }
     printJson(result);
@@ -1721,7 +2326,11 @@ async function runDescribe(options) {
     const conversationId = required(options.conversation ?? options.conversationId, "--conversation is required");
     const terminalConversation = await resolveTerminalConversationFromOptions(options);
     if (terminalConversation) {
-        const terminalStatus = await terminalStatusForControl(terminalConversation.agent, terminalConversation.terminalControl, options);
+        const terminalStatus = await terminalStatusForControl(terminalConversation.agent, terminalConversation.terminalControl, options, {
+            pid: terminalConversation.pid,
+            cwd: terminalConversation.terminalControl.currentPath,
+            terminalTarget: terminalConversation.terminalControl.target
+        });
         if (terminalConversation.agent !== "codex") {
             const adapter = createRuntimeTerminalAgentRegistry(options).require(terminalConversation.agent);
             printJson({
@@ -1763,11 +2372,16 @@ async function runDescribe(options) {
         }));
         return;
     }
-    const { conversation, statePath, logPath } = loadConversationFromOptions(options);
+    const loaded = loadConversationFromOptions(options);
+    const { statePath, logPath } = loaded;
+    const conversation = await migrateLegacyTerminalAgentIdentity({
+        ...loaded,
+        options
+    });
     const events = readExistingEvents(logPath);
     const terminalControl = terminalControlFromTakeover(isRecord(conversation.native_session_takeover) ? conversation.native_session_takeover : undefined);
     const terminalStatus = terminalControl
-        ? await terminalStatusForControl(executorForConversation(conversation).kind, terminalControl, options)
+        ? await terminalStatusForControl(executorForConversation(conversation).kind, terminalControl, options, terminalRuntimeIdentityForConversation(conversation, terminalControl))
         : undefined;
     printJson({
         conversation_id: conversation.conversation_id,
@@ -1786,9 +2400,10 @@ async function runDescribe(options) {
         event_log_path: logPath
     });
 }
-async function terminalStatusForControl(agent, terminalControl, options) {
+async function terminalStatusForControl(agent, terminalControl, options, runtime) {
     return createTerminalAgentBridge(options).status(agent, terminalControl, {
-        scrollbackLines: Number(options.scrollbackLines ?? 120)
+        scrollbackLines: Number(options.scrollbackLines ?? 120),
+        runtime
     });
 }
 function terminalBridgeApprovalFingerprint({ terminalControl, terminalStatus }) {
@@ -1805,10 +2420,26 @@ function terminalBridgeApprovalFingerprint({ terminalControl, terminalStatus })
         label: approval.label,
         prompt_kind: approval.prompt_kind,
         command: approval.command,
+        tool_name: approval.tool_name,
+        request_detail: approval.request_detail,
         excerpt: screen.excerpt
     }))
         .digest("hex");
 }
+function assertSafeClaudeTerminalSend(terminalStatus) {
+    const approval = isRecord(terminalStatus?.approval_state)
+        ? terminalStatus.approval_state
+        : undefined;
+    if (terminalStatus?.reachable !== true) {
+        throw new Error("Claude Code terminal status is unavailable");
+    }
+    if (approval?.blocked === true) {
+        throw new Error(stringValue(approval.reason) ?? "Claude Code is waiting at a permission dialog");
+    }
+    if (terminalStatus.activity_state !== "idle") {
+        throw new Error(`Claude Code terminal is ${stringValue(terminalStatus.activity_state) ?? "unknown"}, not idle`);
+    }
+}
 function terminalBridgeApprovalInstructions({ conversation, terminalControl, terminalStatus }) {
     const approval = isRecord(terminalStatus?.approval_state) ? terminalStatus.approval_state : {};
     const screen = isRecord(terminalStatus?.screen) ? terminalStatus.screen : {};
@@ -1818,10 +2449,18 @@ function terminalBridgeApprovalInstructions({ conversation, terminalControl, ter
     const keys = Array.isArray(approval.keys)
         ? approval.keys.filter((value) => typeof value === "string")
         : [];
-    const keyDescription = keys.length > 0
-        ? keys.join(" then ")
-        : stringValue(approval.key) || "the detected approve key sequence";
+    const decisionMode = stringValue(approval.decision_mode);
+    const keyDescription = decisionMode === "structured"
+        ? "structured one-time Hook decision"
+        : keys.length > 0
+            ? keys.join(" then ")
+            : stringValue(approval.key) || "the detected approve key sequence";
     const fingerprint = stringValue(approval.fingerprint);
+    const promptKind = stringValue(approval.prompt_kind);
+    const command = stringValue(approval.command);
+    const toolName = stringValue(approval.tool_name);
+    const requestDetail = stringValue(approval.request_detail);
+    const requestId = stringValue(approval.request_id);
     const excerpt = stringValue(screen.excerpt) || "(No terminal excerpt was available.)";
     return [
         `${agentName} is waiting for approval in a terminal-controlled AKK session.`,
@@ -1829,6 +2468,11 @@ function terminalBridgeApprovalInstructions({ conversation, terminalControl, ter
         `Conversation: ${conversation.conversation_id}`,
         `Terminal: ${terminalControl.kind}:${terminalControl.target}`,
         `Approval option: ${label} (${keyDescription})`,
+        promptKind ? `Request kind: ${promptKind}` : undefined,
+        toolName ? `Tool: ${toolName}` : undefined,
+        requestDetail ? `Request: ${requestDetail}` : undefined,
+        command ? `Command: ${command}` : undefined,
+        requestId ? `Structured request id: ${requestId}` : undefined,
         "",
         "Safe terminal excerpt:",
         "```text",
@@ -1850,7 +2494,7 @@ function terminalBridgeApprovalInstructions({ conversation, terminalControl, ter
         "Equivalent user command: `AKK cancel " + conversation.conversation_id + "`",
         "",
         "Do not use raw tmux, shell, or manual key presses for this approval. Do not approve without explicit user confirmation."
-    ].join("\n");
+    ].filter((line) => line !== undefined).join("\n");
 }
 function recordTerminalBridgeApprovalNotification({ statePath, logPath, terminalControl, terminalStatus, fingerprint }) {
     const releaseLock = acquireFileLock(`${statePath}.lock`);
@@ -1900,102 +2544,138 @@ function recordTerminalBridgeApprovalNotification({ statePath, logPath, terminal
         releaseLock();
     }
 }
-async function runSend(options) {
-    const messageBody = required(options.message ?? options.request, "--message is required");
-    if (options.agentHardTimeoutMinutes !== undefined) {
-        positiveMinutes(options.agentHardTimeoutMinutes, "--agent-hard-timeout-minutes");
-    }
-    cleanupIdleConversations(storeDirFromOptions(options), options);
-    const terminalConversation = await resolveTerminalConversationFromOptions(options);
-    if (terminalConversation) {
-        if (options.background) {
-            const managed = createManagedTerminalConversationFromRawId({
-                options,
-                conversationId: terminalConversation.conversationId,
-                agent: terminalConversation.agent,
-                messageBody,
-                terminalControl: terminalConversation.terminalControl
-            });
-            await runTerminalControlSend({
-                options,
-                conversation: managed.conversation,
-                nextConversation: managed.nextConversation,
-                statePath: managed.statePath,
-                logPath: managed.logPath,
-                executor: managed.executor,
-                message: managed.message,
-                terminalControl: terminalConversation.terminalControl,
-                needsNativeTakeoverBootstrap: true
-            });
-            return;
+function prepareManagedSend({ options, statePath, logPath, messageBody }) {
+    const releaseLock = acquireFileLock(`${statePath}.lock`);
+    try {
+        const conversation = loadState(statePath);
+        if (["done", "failed", "closed", "cancelled"].includes(conversation.status)) {
+            throw new Error(`cannot send to ${conversation.conversation_id}; conversation is ${conversation.status}`);
+        }
+        if (conversation.status === "needs_recovery") {
+            throw new Error(`cannot send to ${conversation.conversation_id}; choose recover, close, or delegate a new task first`);
+        }
+        if (conversation.status === "needs_model_selection" && !options.model) {
+            throw new Error(`cannot send to ${conversation.conversation_id}; choose a supported model with --model first`);
+        }
+        const executor = executorForConversation(conversation);
+        const type = options.type ??
+            (conversation.status === "waiting_for_openclaw" ? "answer" : "task");
+        const nativeTakeoverForSend = isRecord(conversation.native_session_takeover)
+            ? conversation.native_session_takeover
+            : undefined;
+        const forkTakeoverForSend = isRecord(conversation.fork_context_takeover)
+            ? conversation.fork_context_takeover
+            : undefined;
+        const needsNativeTakeoverBootstrap = nativeTakeoverForSend?.["needs_bootstrap"] === true;
+        const needsForkTakeoverBootstrap = forkTakeoverForSend?.["needs_bootstrap"] === true;
+        const message = createMessage({
+            conversation,
+            from: "openclaw",
+            to: executor.actor,
+            type,
+            body: messageBody,
+            metadata: {
+                executor_kind: executor.kind,
+                executor_session: executor.session
+            }
+        });
+        const previousModelSelection = isRecord(conversation.model_selection)
+            ? conversation.model_selection
+            : {};
+        const nextConversation = {
+            ...applyMessageToConversation(conversation, message),
+            executor,
+            claude_session: executor.kind === "claude"
+                ? executor.session
+                : conversation.claude_session,
+            executor_model: options.model ?? conversation.executor_model,
+            model_selection: conversation.status === "needs_model_selection"
+                ? {
+                    ...previousModelSelection,
+                    resolved_at: new Date().toISOString(),
+                    selected_model: options.model
+                }
+                : conversation.model_selection
+        };
+        saveState(statePath, nextConversation);
+        appendEvent(logPath, messageEvent(message));
+        runtimeLog("info", "message_created", {
+            conversation_id: conversation.conversation_id,
+            agent: executor.kind,
+            executor_session: executor.session,
+            message_type: type,
+            state_path: statePath,
+            event_log_path: logPath,
+            message: textSummary(messageBody)
+        });
+        return {
+            conversation,
+            executor,
+            nativeTakeoverForSend,
+            forkTakeoverForSend,
+            needsNativeTakeoverBootstrap,
+            needsForkTakeoverBootstrap,
+            message,
+            nextConversation
+        };
+    }
+    finally {
+        releaseLock();
+    }
+}
+async function runSend(options) {
+    const messageBody = required(options.message ?? options.request, "--message is required");
+    if (options.agentHardTimeoutMinutes !== undefined) {
+        positiveMinutes(options.agentHardTimeoutMinutes, "--agent-hard-timeout-minutes");
+    }
+    cleanupIdleConversations(storeDirFromOptions(options), options);
+    const terminalConversation = await resolveTerminalConversationFromOptions(options);
+    if (terminalConversation) {
+        if (options.background) {
+            const managed = createManagedTerminalConversationFromRawId({
+                options,
+                conversationId: terminalConversation.conversationId,
+                agent: terminalConversation.agent,
+                pid: terminalConversation.pid,
+                messageBody,
+                terminalControl: terminalConversation.terminalControl
+            });
+            await runTerminalControlSend({
+                options,
+                conversation: managed.conversation,
+                nextConversation: managed.nextConversation,
+                statePath: managed.statePath,
+                logPath: managed.logPath,
+                executor: managed.executor,
+                message: managed.message,
+                terminalControl: terminalConversation.terminalControl,
+                needsNativeTakeoverBootstrap: true
+            });
+            return;
         }
         await runTerminalConversationSend({
             options,
             conversationId: terminalConversation.conversationId,
             agent: terminalConversation.agent,
+            pid: terminalConversation.pid,
             messageBody,
             terminalControl: terminalConversation.terminalControl
         });
         return;
     }
-    const { conversation, statePath, logPath } = loadConversationFromOptions(options);
-    if (["done", "failed", "closed", "cancelled"].includes(conversation.status)) {
-        throw new Error(`cannot send to ${conversation.conversation_id}; conversation is ${conversation.status}`);
-    }
-    if (conversation.status === "needs_recovery") {
-        throw new Error(`cannot send to ${conversation.conversation_id}; choose recover, close, or delegate a new task first`);
-    }
-    if (conversation.status === "needs_model_selection" && !options.model) {
-        throw new Error(`cannot send to ${conversation.conversation_id}; choose a supported model with --model first`);
-    }
-    const executor = executorForConversation(conversation);
-    const type = options.type ?? (conversation.status === "waiting_for_openclaw" ? "answer" : "task");
-    const nativeTakeoverForSend = isRecord(conversation.native_session_takeover)
-        ? conversation.native_session_takeover
-        : undefined;
-    const forkTakeoverForSend = isRecord(conversation.fork_context_takeover)
-        ? conversation.fork_context_takeover
-        : undefined;
-    const needsNativeTakeoverBootstrap = nativeTakeoverForSend?.["needs_bootstrap"] === true;
-    const needsForkTakeoverBootstrap = forkTakeoverForSend?.["needs_bootstrap"] === true;
-    const message = createMessage({
-        conversation,
-        from: "openclaw",
-        to: executor.actor,
-        type,
-        body: messageBody,
-        metadata: {
-            executor_kind: executor.kind,
-            executor_session: executor.session
-        }
+    const loaded = loadConversationFromOptions(options);
+    const { statePath, logPath } = loaded;
+    await migrateLegacyTerminalAgentIdentity({
+        ...loaded,
+        options
     });
-    const previousModelSelection = isRecord(conversation.model_selection)
-        ? conversation.model_selection
-        : {};
-    const nextConversation = {
-        ...applyMessageToConversation(conversation, message),
-        executor,
-        claude_session: executor.kind === "claude" ? executor.session : conversation.claude_session,
-        executor_model: options.model ?? conversation.executor_model,
-        model_selection: conversation.status === "needs_model_selection"
-            ? {
-                ...previousModelSelection,
-                resolved_at: new Date().toISOString(),
-                selected_model: options.model
-            }
-            : conversation.model_selection
-    };
-    saveState(statePath, nextConversation);
-    appendEvent(logPath, messageEvent(message));
-    runtimeLog("info", "message_created", {
-        conversation_id: conversation.conversation_id,
-        agent: executor.kind,
-        executor_session: executor.session,
-        message_type: type,
-        state_path: statePath,
-        event_log_path: logPath,
-        message: textSummary(messageBody)
+    const prepared = prepareManagedSend({
+        options,
+        statePath,
+        logPath,
+        messageBody
     });
+    const { conversation, executor, nativeTakeoverForSend, forkTakeoverForSend, needsNativeTakeoverBootstrap, needsForkTakeoverBootstrap, message, nextConversation } = prepared;
     const executorEnv = environmentForExecutor(executor, {
         allProxy: options.allProxy ?? conversation.executor_all_proxy
     });
@@ -2125,7 +2805,7 @@ async function runSend(options) {
     const acpxArgs = buildAcpxPromptArgs({ executor, payload, model: executorModel });
     if (options.background) {
         const outputPath = path.join(path.dirname(logPath), `${executor.kind}-followup-output.log`);
-        const outputFd = fs.openSync(outputPath, "a");
+        const outputFd = openPrivateAppendFile(outputPath);
         const child = spawn(acpxPath, acpxArgs, {
             detached: true,
             stdio: ["ignore", outputFd, outputFd],
@@ -2297,11 +2977,17 @@ async function runApprove(options) {
             options,
             conversationId: terminalConversation.conversationId,
             agent: terminalConversation.agent,
-            terminalControl: terminalConversation.terminalControl
+            terminalControl: terminalConversation.terminalControl,
+            pid: terminalConversation.pid
         });
         return;
     }
-    const { conversation, statePath, logPath } = loadConversationFromOptions(options);
+    const loaded = loadConversationFromOptions(options);
+    const { statePath, logPath } = loaded;
+    const conversation = await migrateLegacyTerminalAgentIdentity({
+        ...loaded,
+        options
+    });
     const nativeTakeover = isRecord(conversation.native_session_takeover)
         ? conversation.native_session_takeover
         : undefined;
@@ -2318,11 +3004,67 @@ async function runApprove(options) {
     const autoApproved = options.autoApproved === true;
     const policyRuleId = stringValue(options.policyRuleId);
     const policyFingerprint = stringValue(options.policyFingerprint);
+    const autoApprovalPolicy = autoApproved
+        ? parseJsonOption(options.autoApprovalPolicyJson, "--auto-approval-policy-json")
+        : undefined;
+    const runtimeIdentity = terminalRuntimeIdentityForConversation(conversation, terminalControl);
+    let executorPolicyDecision;
     const approval = await createTerminalAgentBridge(options).approve(executor.kind, terminalControl, {
         expectedFingerprint,
-        scrollbackLines: Number(options.scrollbackLines ?? 120)
+        scrollbackLines: Number(options.scrollbackLines ?? 120),
+        runtime: runtimeIdentity,
+        requiredDecisionMode: autoApproved && executor.kind === "claude"
+            ? "structured"
+            : undefined,
+        authorize: autoApproved
+            ? ({ agent, terminalControl: currentTerminalControl, inspection, fingerprint }) => {
+                if (!autoApprovalPolicy) {
+                    return {
+                        approved: false,
+                        reason: "automatic approval requires an executor-side policy"
+                    };
+                }
+                const candidate = {
+                    agent,
+                    kind: inspection.approval.promptKind ?? "unknown",
+                    decisionMode: inspection.approval.approvable
+                        ? inspection.approval.action.mode ?? "keys"
+                        : undefined,
+                    command: inspection.approval.command,
+                    cwd: inspection.approval.cwd ?? currentTerminalControl.currentPath,
+                    fingerprint: fingerprint ?? "",
+                    terminalTarget: currentTerminalControl.target
+                };
+                executorPolicyDecision = evaluateApprovalPolicy({
+                    policy: autoApprovalPolicy,
+                    candidate
+                });
+                if (executorPolicyDecision.action !== "approve") {
+                    return {
+                        approved: false,
+                        reason: `executor-side auto-approval policy rejected the current request: ${executorPolicyDecision.reason}`
+                    };
+                }
+                if (policyRuleId && executorPolicyDecision.ruleId !== policyRuleId) {
+                    return {
+                        approved: false,
+                        reason: "executor-side auto-approval rule changed before execution"
+                    };
+                }
+                if (policyFingerprint &&
+                    executorPolicyDecision.policyFingerprint !== policyFingerprint) {
+                    return {
+                        approved: false,
+                        reason: "executor-side auto-approval policy changed before execution"
+                    };
+                }
+                return { approved: true };
+            }
+            : undefined
     });
     const actualFingerprint = approval.fingerprint;
+    const effectivePolicyRuleId = executorPolicyDecision?.ruleId ?? policyRuleId;
+    const effectivePolicyFingerprint = executorPolicyDecision?.policyFingerprint ?? policyFingerprint;
     if (!approval.approved) {
         if (autoApproved) {
             appendEvent(logPath, {
@@ -2334,8 +3076,8 @@ async function runApprove(options) {
                 terminal_control: terminalControl,
                 expected_fingerprint: expectedFingerprint,
                 actual_fingerprint: actualFingerprint,
-                policy_rule_id: policyRuleId,
-                policy_fingerprint: policyFingerprint
+                policy_rule_id: effectivePolicyRuleId,
+                policy_fingerprint: effectivePolicyFingerprint
             });
         }
         printJson({
@@ -2358,10 +3100,12 @@ async function runApprove(options) {
         key: approval.key,
         keys: approval.keys,
         label: approval.label,
+        decision_mode: approval.decisionMode,
+        request_id: approval.requestId,
         approval_fingerprint: actualFingerprint,
         auto_approved: autoApproved,
-        policy_rule_id: policyRuleId,
-        policy_fingerprint: policyFingerprint
+        policy_rule_id: effectivePolicyRuleId,
+        policy_fingerprint: effectivePolicyFingerprint
     });
     if (autoApproved) {
         appendEvent(logPath, {
@@ -2371,8 +3115,8 @@ async function runApprove(options) {
             action: "approved",
             terminal_control: terminalControl,
             approval_fingerprint: actualFingerprint,
-            policy_rule_id: policyRuleId,
-            policy_fingerprint: policyFingerprint
+            policy_rule_id: effectivePolicyRuleId,
+            policy_fingerprint: effectivePolicyFingerprint
         });
     }
     runtimeLog("info", "terminal_approval_send", {
@@ -2381,10 +3125,12 @@ async function runApprove(options) {
         key: approval.key,
         keys: approval.keys,
         label: approval.label,
+        decision_mode: approval.decisionMode,
+        request_id: approval.requestId,
         approval_fingerprint: actualFingerprint,
         auto_approved: autoApproved,
-        policy_rule_id: policyRuleId,
-        policy_fingerprint: policyFingerprint
+        policy_rule_id: effectivePolicyRuleId,
+        policy_fingerprint: effectivePolicyFingerprint
     });
     const nativeTakeoverForUpdate = isRecord(conversation.native_session_takeover)
         ? { ...conversation.native_session_takeover }
@@ -2400,6 +3146,7 @@ async function runApprove(options) {
         ...nativeTakeoverForUpdate,
         terminal_bridge_approval: undefined,
         terminal_bridge_approval_resolved_at: approvalResolvedAt,
+        terminal_bridge_monitor_lock_version: TERMINAL_BRIDGE_MONITOR_LOCK_VERSION,
         terminal_bridge_monitor_started_at: approvalResolvedAt,
         terminal_bridge_last_activity_at: approvalResolvedAt,
         terminal_bridge_last_activity_reason: "approval resolved",
@@ -2409,12 +3156,28 @@ async function runApprove(options) {
         terminal_bridge_hard_deadline_at: deadlineAt(stringValue(nativeTakeoverForUpdate.terminal_bridge_started_at) ?? approvalResolvedAt, agentHardTimeoutMinutes)
     };
     delete nextNativeTakeover.terminal_bridge_approval;
-    const nextConversation = {
+    let nextConversation = {
         ...conversation,
         status: terminalBridgeEnabled(conversation) ? "waiting_for_agent" : conversation.status,
         native_session_takeover: nextNativeTakeover,
         updated_at: approvalResolvedAt
     };
+    const approvalLeaseDeadlines = [
+        stringValue(nextNativeTakeover.terminal_bridge_inactivity_deadline_at),
+        stringValue(nextNativeTakeover.terminal_bridge_hard_deadline_at)
+    ].filter((value) => Boolean(value));
+    if (approvalLeaseDeadlines.length > 0) {
+        const renewedLease = renewClaudeHookLease(nextConversation, new Date(Math.min(...approvalLeaseDeadlines.map((value) => Date.parse(value)))).toISOString());
+        if (renewedLease) {
+            nextConversation = {
+                ...nextConversation,
+                native_session_takeover: {
+                    ...nextNativeTakeover,
+                    claude_hook_lease_id: renewedLease.id
+                }
+            };
+        }
+    }
     saveState(statePath, nextConversation);
     const bridgeMonitor = startTerminalBridgeMonitorForConversation({
         conversation: nextConversation,
@@ -2447,16 +3210,23 @@ async function runApprove(options) {
         key: approval.key,
         keys: approval.keys,
         label: approval.label,
+        decision_mode: approval.decisionMode,
+        request_id: approval.requestId,
         approval_fingerprint: actualFingerprint,
         auto_approved: autoApproved,
-        policy_rule_id: policyRuleId,
+        policy_rule_id: effectivePolicyRuleId,
         monitor_pid: bridgeMonitor?.pid ?? null
     });
 }
-async function runTerminalConversationApprove({ options, conversationId, agent, terminalControl }) {
+async function runTerminalConversationApprove({ options, conversationId, agent, terminalControl, pid }) {
     const approval = await createTerminalAgentBridge(options).approve(agent, terminalControl, {
         expectedFingerprint: stringValue(options.expectedApprovalFingerprint),
-        scrollbackLines: Number(options.scrollbackLines ?? 120)
+        scrollbackLines: Number(options.scrollbackLines ?? 120),
+        runtime: {
+            pid,
+            cwd: terminalControl.currentPath,
+            terminalTarget: terminalControl.target
+        }
     });
     if (!approval.approved) {
         printJson({
@@ -2476,7 +3246,9 @@ async function runTerminalConversationApprove({ options, conversationId, agent,
         terminal_target: terminalControl.target,
         key: approval.key,
         keys: approval.keys,
-        label: approval.label
+        label: approval.label,
+        decision_mode: approval.decisionMode,
+        request_id: approval.requestId
     });
     printJson({
         conversation_id: conversationId,
@@ -2486,12 +3258,32 @@ async function runTerminalConversationApprove({ options, conversationId, agent,
         key: approval.key,
         keys: approval.keys,
         label: approval.label,
-        approval_fingerprint: approval.fingerprint
+        approval_fingerprint: approval.fingerprint,
+        decision_mode: approval.decisionMode,
+        request_id: approval.requestId
     });
 }
-async function runTerminalConversationSend({ options, conversationId, agent, messageBody, terminalControl }) {
+async function runTerminalConversationSend({ options, conversationId, agent, pid, messageBody, terminalControl }) {
     const terminalPayload = terminalSubmissionPayload(String(messageBody));
-    await createTerminalAgentBridge(options).send(agent, terminalControl, terminalPayload);
+    const terminalBridge = createTerminalAgentBridge(options);
+    if (agent === "claude") {
+        const status = await terminalBridge.status(agent, terminalControl, {
+            scrollbackLines: Number(options.scrollbackLines ?? 120),
+            runtime: {
+                pid,
+                cwd: terminalControl.currentPath,
+                terminalTarget: terminalControl.target
+            }
+        });
+        assertSafeClaudeTerminalSend(status);
+    }
+    await terminalBridge.send(agent, terminalControl, terminalPayload, {
+        runtime: {
+            pid,
+            cwd: terminalControl.currentPath,
+            terminalTarget: terminalControl.target
+        }
+    });
     runtimeLog("info", "terminal_message_send", {
         conversation_id: conversationId,
         agent,
@@ -2552,19 +3344,62 @@ async function runTerminalControlSend({ options, conversation, nextConversation,
             forkTakeover: undefined
         }))
         : terminalSubmissionPayload(String(message.body ?? ""));
+    const preSendRuntime = {
+        ...terminalRuntimeIdentityForConversation(nextConversation, terminalControl),
+        messageId: message.id
+    };
     let preSendScreenFingerprint;
     if (bridge) {
         try {
             const status = await terminalBridge.status(executor.kind, terminalControl, {
-                scrollbackLines: Number(options.scrollbackLines ?? 120)
+                scrollbackLines: Number(options.scrollbackLines ?? 120),
+                runtime: preSendRuntime
             });
+            if (executor.kind === "claude") {
+                assertSafeClaudeTerminalSend(status);
+            }
             preSendScreenFingerprint = terminalBridgeScreenFingerprint(status.screen.excerpt);
         }
-        catch {
-            // Delivery can still succeed when capture is unavailable; prompt matching remains the fallback boundary.
+        catch (error) {
+            if (executor.kind === "claude") {
+                throw new Error(`refusing to send to Claude Code without a verified idle terminal: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            // Codex delivery can still use its established fallback when capture is unavailable.
+        }
+    }
+    if (bridge && executor.kind === "claude") {
+        releaseClaudeHookLeasesForTerminal({
+            storeDir: storeDirFromOptions(options),
+            terminalControl,
+            replacementConversationId: conversation.conversation_id
+        });
+        releaseClaudeHookLease(nextConversation);
+    }
+    const claudeHookLeaseState = bridge && executor.kind === "claude"
+        ? activateClaudeHookLease({
+            options,
+            conversation: nextConversation,
+            message,
+            terminalControl,
+            expiresAt: deadlineAt(bridgeStartedAt, agentTimeoutMinutes > 0
+                ? Math.min(agentTimeoutMinutes, agentHardTimeoutMinutes)
+                : agentHardTimeoutMinutes)
+        })
+        : undefined;
+    const conversationWithHookLease = claudeHookLeaseState
+        ? withClaudeHookLeaseState(nextConversation, claudeHookLeaseState)
+        : nextConversation;
+    try {
+        await terminalBridge.send(executor.kind, terminalControl, terminalPayload, {
+            runtime: preSendRuntime
+        });
+    }
+    catch (error) {
+        if (claudeHookLeaseState) {
+            releaseClaudeHookLease(conversationWithHookLease);
         }
+        throw error;
     }
-    await terminalBridge.send(executor.kind, terminalControl, terminalPayload);
     const supersededConversationIds = bridge
         ? supersedeTerminalBridgeConversations({
             storeDir: storeDirFromOptions(options),
@@ -2592,7 +3427,7 @@ async function runTerminalControlSend({ options, conversation, nextConversation,
     });
     const bridgeConversation = bridge
         ? withTerminalBridgeState({
-            conversation: nextConversation,
+            conversation: conversationWithHookLease,
             message,
             startedAt: bridgeStartedAt,
             agentTimeoutMinutes,
@@ -2654,7 +3489,7 @@ async function runTerminalControlSend({ options, conversation, nextConversation,
 function terminalSubmissionPayload(payload) {
     return payload.replace(/[\r\n]+$/u, "");
 }
-function createManagedTerminalConversationFromRawId({ options, conversationId, agent, messageBody, terminalControl }) {
+function createManagedTerminalConversationFromRawId({ options, conversationId, agent, pid, messageBody, terminalControl }) {
     const workspace = terminalControl.currentPath ?? process.cwd();
     const storeDir = expandHome(options.storeDir ?? options.logDir ?? defaultStoreDir(workspace));
     cleanupIdleConversations(storeDir, options);
@@ -2685,6 +3520,9 @@ function createManagedTerminalConversationFromRawId({ options, conversationId, a
             gatewaySession: options.gatewaySession,
             openclawBin: options.openclawBin ?? resolveOptionalExecutable("openclaw")
         });
+    const claudeAgent = agent === "claude"
+        ? loadClaudeAgentRows(options).find((row) => row.pid === pid)
+        : undefined;
     const attachedConversation = withStoragePaths({
         ...conversation,
         executor,
@@ -2701,6 +3539,8 @@ function createManagedTerminalConversationFromRawId({ options, conversationId, a
         native_session_takeover: {
             agent,
             native_session_id: conversationId,
+            terminal_agent_pid: pid,
+            terminal_agent_session_id: claudeAgent?.sessionId,
             source_cwd: workspace,
             source_title: `Terminal-controlled ${executor.display_name} ${terminalControl.target}`,
             strategy: "terminal_control",
@@ -2805,14 +3645,16 @@ function supersedeTerminalBridgeConversations({ storeDir, terminalControl, repla
                 continue;
             }
             const now = new Date().toISOString();
-            saveState(candidateStatePath, {
+            const closedConversation = {
                 ...current,
                 status: "closed",
                 closed_at: now,
                 close_reason: "terminal bridge superseded by a newer task on the same terminal",
                 superseded_by_conversation_id: replacementConversationId,
                 updated_at: now
-            });
+            };
+            saveState(candidateStatePath, closedConversation);
+            releaseClaudeHookLease(closedConversation);
             appendEvent(logPathForStatePath(candidateStatePath), {
                 ts: now,
                 conversation_id: current.conversation_id,
@@ -2854,7 +3696,7 @@ function runNativeCodexResumeSend({ options, conversation, nextConversation, sta
     });
     if (options.background) {
         const outputPath = path.join(path.dirname(logPath), `${executor.kind}-native-resume-output.log`);
-        const outputFd = fs.openSync(outputPath, "a");
+        const outputFd = openPrivateAppendFile(outputPath);
         const child = spawn(codexPath, codexArgs, {
             detached: true,
             stdio: ["ignore", outputFd, outputFd],
@@ -3073,28 +3915,36 @@ function markTakeoverBootstrapped({ conversation, statePath, logPath, executor,
     return nextConversation;
 }
 function markNativeSessionBootstrapped({ conversation, statePath, logPath, executor }) {
-    const nativeTakeover = isRecord(conversation.native_session_takeover)
-        ? conversation.native_session_takeover
-        : {};
     const now = new Date().toISOString();
-    const nextConversation = {
-        ...conversation,
-        native_session_takeover: {
-            ...nativeTakeover,
-            needs_bootstrap: false,
-            bootstrapped_at: now
-        },
-        updated_at: now
-    };
-    saveState(statePath, nextConversation);
+    const releaseLock = acquireFileLock(`${statePath}.lock`);
+    let nextConversation = conversation;
+    try {
+        const current = loadState(statePath);
+        const nativeTakeover = isRecord(current.native_session_takeover)
+            ? current.native_session_takeover
+            : {};
+        nextConversation = {
+            ...current,
+            native_session_takeover: {
+                ...nativeTakeover,
+                needs_bootstrap: false,
+                bootstrapped_at: now
+            },
+            updated_at: now
+        };
+        saveState(statePath, nextConversation);
+    }
+    finally {
+        releaseLock();
+    }
     appendEvent(logPath, {
         ts: now,
-        conversation_id: conversation.conversation_id,
+        conversation_id: nextConversation.conversation_id,
         event: "native_session_bootstrapped",
         executor
     });
     runtimeLog("info", "native_session_bootstrapped", {
-        conversation_id: conversation.conversation_id,
+        conversation_id: nextConversation.conversation_id,
         agent: executor.kind,
         executor_session: executor.session,
         state_path: statePath
@@ -3102,28 +3952,36 @@ function markNativeSessionBootstrapped({ conversation, statePath, logPath, execu
     return nextConversation;
 }
 function markForkSessionBootstrapped({ conversation, statePath, logPath, executor }) {
-    const forkTakeover = isRecord(conversation.fork_context_takeover)
-        ? conversation.fork_context_takeover
-        : {};
     const now = new Date().toISOString();
-    const nextConversation = {
-        ...conversation,
-        fork_context_takeover: {
-            ...forkTakeover,
-            needs_bootstrap: false,
-            bootstrapped_at: now
-        },
-        updated_at: now
-    };
-    saveState(statePath, nextConversation);
+    const releaseLock = acquireFileLock(`${statePath}.lock`);
+    let nextConversation = conversation;
+    try {
+        const current = loadState(statePath);
+        const forkTakeover = isRecord(current.fork_context_takeover)
+            ? current.fork_context_takeover
+            : {};
+        nextConversation = {
+            ...current,
+            fork_context_takeover: {
+                ...forkTakeover,
+                needs_bootstrap: false,
+                bootstrapped_at: now
+            },
+            updated_at: now
+        };
+        saveState(statePath, nextConversation);
+    }
+    finally {
+        releaseLock();
+    }
     appendEvent(logPath, {
         ts: now,
-        conversation_id: conversation.conversation_id,
+        conversation_id: nextConversation.conversation_id,
         event: "fork_session_bootstrapped",
         executor
     });
     runtimeLog("info", "fork_session_bootstrapped", {
-        conversation_id: conversation.conversation_id,
+        conversation_id: nextConversation.conversation_id,
         agent: executor.kind,
         executor_session: executor.session,
         state_path: statePath
@@ -3210,7 +4068,12 @@ function markConversationNeedsRecovery({ conversation, statePath, logPath, execu
     };
 }
 async function runRenew(options) {
-    const { conversation, statePath, logPath } = loadConversationFromOptions(options);
+    const loaded = loadConversationFromOptions(options);
+    const { statePath, logPath } = loaded;
+    const conversation = await migrateLegacyTerminalAgentIdentity({
+        ...loaded,
+        options
+    });
     if (conversation.status === "closed") {
         throw new Error(`cannot renew ${conversation.conversation_id}; conversation is closed`);
     }
@@ -3242,17 +4105,38 @@ async function runRenew(options) {
         throw new Error(`cannot renew ${conversation.conversation_id}; terminal bridge hard lifetime of ${hardTimeoutMinutes} minutes has elapsed`);
     }
     const now = new Date().toISOString();
+    const currentMessageId = stringValue(nativeTakeover?.terminal_bridge_message_id);
+    const hardDeadline = deadlineAt(startedAt ?? now, hardTimeoutMinutes) ??
+        new Date(Date.now() + hardTimeoutMinutes * 60 * 1000).toISOString();
+    const inactivityDeadline = deadlineAt(now, inactivityTimeoutMinutes) ??
+        new Date(Date.now() + inactivityTimeoutMinutes * 60 * 1000).toISOString();
+    const renewedLease = executorForConversation(conversation).kind === "claude" && currentMessageId
+        ? activateClaudeHookLease({
+            options,
+            conversation,
+            message: { id: currentMessageId },
+            terminalControl,
+            expiresAt: new Date(Math.min(Date.parse(hardDeadline), Date.parse(inactivityDeadline))).toISOString()
+        })
+        : undefined;
+    const renewedBase = renewedLease
+        ? withClaudeHookLeaseState(conversation, renewedLease)
+        : conversation;
+    const renewedNativeTakeover = isRecord(renewedBase.native_session_takeover)
+        ? renewedBase.native_session_takeover
+        : nativeTakeover;
     const renewed = {
-        ...conversation,
+        ...renewedBase,
         status: "waiting_for_agent",
         native_session_takeover: {
-            ...nativeTakeover,
+            ...renewedNativeTakeover,
+            terminal_bridge_monitor_lock_version: TERMINAL_BRIDGE_MONITOR_LOCK_VERSION,
             terminal_bridge_monitor_started_at: now,
             terminal_bridge_last_activity_at: now,
             terminal_bridge_inactivity_timeout_minutes: inactivityTimeoutMinutes,
             terminal_bridge_hard_timeout_minutes: hardTimeoutMinutes,
-            terminal_bridge_inactivity_deadline_at: deadlineAt(now, inactivityTimeoutMinutes),
-            terminal_bridge_hard_deadline_at: deadlineAt(startedAt ?? now, hardTimeoutMinutes),
+            terminal_bridge_inactivity_deadline_at: inactivityDeadline,
+            terminal_bridge_hard_deadline_at: hardDeadline,
             terminal_bridge_renewed_at: now
         },
         updated_at: now
@@ -3309,6 +4193,318 @@ async function runRenew(options) {
         monitor_pid: monitor?.pid ?? null
     });
 }
+async function runReconcileMonitors(options) {
+    const storeDir = storeDirFromOptions(options);
+    const conversations = listConversations(storeDir);
+    const items = [];
+    let ignored = 0;
+    let launched = 0;
+    let alreadyRunning = 0;
+    let skipped = 0;
+    let errors = 0;
+    for (const listedConversation of conversations) {
+        const listedNativeTakeover = isRecord(listedConversation.native_session_takeover)
+            ? listedConversation.native_session_takeover
+            : undefined;
+        if (listedNativeTakeover?.terminal_bridge !== true) {
+            ignored += 1;
+            continue;
+        }
+        const statePath = expandHome(stringValue(listedConversation.state_path) ??
+            statePathForConversationId(listedConversation.conversation_id, storeDir));
+        const logPath = expandHome(stringValue(listedConversation.event_log_path) ??
+            logPathForStatePath(statePath));
+        try {
+            const initialConversation = await migrateLegacyTerminalAgentIdentity({
+                conversation: loadState(statePath),
+                statePath,
+                logPath,
+                options
+            });
+            const initialEligibility = terminalBridgeReconciliationEligibility(initialConversation);
+            if (!initialEligibility.eligible) {
+                skipped += 1;
+                items.push({
+                    conversation_id: initialConversation.conversation_id,
+                    status: "skipped",
+                    reason: initialEligibility.reason
+                });
+                continue;
+            }
+            const activeOwner = activeTerminalBridgeMonitorOwner(statePath, initialEligibility.terminalMessageId);
+            if (activeOwner) {
+                alreadyRunning += 1;
+                items.push({
+                    conversation_id: initialConversation.conversation_id,
+                    status: "already_running",
+                    reason: "monitor_lock_owner_alive",
+                    monitor_owner_pid: activeOwner.ownerPid ?? null
+                });
+                continue;
+            }
+            const monitorLockVersion = Number(initialEligibility.nativeTakeover.terminal_bridge_monitor_lock_version);
+            if (monitorLockVersion !== TERMINAL_BRIDGE_MONITOR_LOCK_VERSION) {
+                if (Number.isFinite(monitorLockVersion)) {
+                    skipped += 1;
+                    items.push({
+                        conversation_id: initialConversation.conversation_id,
+                        status: "skipped",
+                        reason: "monitor_lock_version_unsupported",
+                        monitor_lock_version: monitorLockVersion
+                    });
+                    continue;
+                }
+                const legacyLaunchPid = latestTerminalBridgeMonitorLaunchPid(logPath);
+                if (legacyLaunchPid === undefined) {
+                    skipped += 1;
+                    items.push({
+                        conversation_id: initialConversation.conversation_id,
+                        status: "skipped",
+                        reason: "legacy_monitor_ownership_unknown"
+                    });
+                    continue;
+                }
+                if (isProcessAlive(legacyLaunchPid)) {
+                    alreadyRunning += 1;
+                    items.push({
+                        conversation_id: initialConversation.conversation_id,
+                        status: "already_running",
+                        reason: "legacy_monitor_launch_pid_alive",
+                        monitor_owner_pid: legacyLaunchPid
+                    });
+                    continue;
+                }
+            }
+            const prepared = prepareTerminalBridgeMonitorReconciliation({
+                statePath,
+                expectedMessageId: initialEligibility.terminalMessageId
+            });
+            if (!prepared.prepared) {
+                if (prepared.alreadyRunning) {
+                    alreadyRunning += 1;
+                    items.push({
+                        conversation_id: initialConversation.conversation_id,
+                        status: "already_running",
+                        reason: prepared.reason,
+                        monitor_owner_pid: prepared.ownerPid ?? null
+                    });
+                }
+                else {
+                    skipped += 1;
+                    items.push({
+                        conversation_id: initialConversation.conversation_id,
+                        status: "skipped",
+                        reason: prepared.reason
+                    });
+                }
+                continue;
+            }
+            const monitor = startTerminalBridgeMonitorForConversation({
+                conversation: prepared.conversation,
+                statePath,
+                logPath,
+                options
+            });
+            if (!monitor) {
+                skipped += 1;
+                items.push({
+                    conversation_id: prepared.conversation.conversation_id,
+                    status: "skipped",
+                    reason: "terminal_bridge_monitor_launch_disabled"
+                });
+                continue;
+            }
+            const launchedAt = new Date().toISOString();
+            appendEvent(logPath, {
+                ts: launchedAt,
+                conversation_id: prepared.conversation.conversation_id,
+                event: "terminal_bridge_monitor_launch",
+                pid: monitor.pid ?? null,
+                terminal_control: prepared.terminalControl,
+                reason: "startup_reconciliation",
+                agent_timeout_minutes: prepared.inactivityTimeoutMinutes,
+                agent_hard_timeout_minutes: prepared.hardTimeoutMinutes
+            });
+            runtimeLog("info", "terminal_bridge_monitor_reconciled", {
+                conversation_id: prepared.conversation.conversation_id,
+                monitor_pid: monitor.pid ?? null,
+                terminal_target: prepared.terminalControl.target
+            });
+            launched += 1;
+            items.push({
+                conversation_id: prepared.conversation.conversation_id,
+                status: "launched",
+                reason: "startup_reconciliation",
+                monitor_pid: monitor.pid ?? null
+            });
+        }
+        catch (error) {
+            errors += 1;
+            items.push({
+                conversation_id: listedConversation.conversation_id,
+                status: "error",
+                reason: error instanceof Error ? error.message : String(error)
+            });
+        }
+    }
+    printJson({
+        reconciled: true,
+        store_dir: storeDir,
+        checked: conversations.length,
+        ignored,
+        launched,
+        already_running: alreadyRunning,
+        skipped,
+        errors,
+        items
+    });
+}
+function terminalBridgeReconciliationEligibility(conversation) {
+    const nativeTakeover = isRecord(conversation?.native_session_takeover)
+        ? conversation.native_session_takeover
+        : undefined;
+    if (nativeTakeover?.terminal_bridge !== true) {
+        return { eligible: false, reason: "not_terminal_bridge" };
+    }
+    if (!conversation.gateway_method) {
+        return { eligible: false, reason: "gateway_method_missing" };
+    }
+    if (!stringValue(conversation.gateway_session) && !stringValue(conversation.openclaw_session)) {
+        return { eligible: false, reason: "gateway_session_missing" };
+    }
+    if (!isWaitingForAgent(conversation.status)) {
+        return {
+            eligible: false,
+            reason: `conversation_status_${String(conversation.status ?? "missing")}`
+        };
+    }
+    const terminalMessageId = stringValue(nativeTakeover.terminal_bridge_message_id);
+    const terminalControl = terminalControlFromTakeover(nativeTakeover);
+    if (!terminalMessageId || !terminalControl) {
+        return { eligible: false, reason: "terminal_bridge_identity_missing" };
+    }
+    const runtime = terminalRuntimeIdentityForConversation(conversation, terminalControl);
+    if (!Number.isInteger(runtime.pid) || Number(runtime.pid) <= 0 || !stringValue(runtime.cwd)) {
+        return { eligible: false, reason: "terminal_agent_identity_missing" };
+    }
+    const inactivityTimeoutMinutes = Number(nativeTakeover.terminal_bridge_inactivity_timeout_minutes);
+    const hardTimeoutMinutes = Number(nativeTakeover.terminal_bridge_hard_timeout_minutes);
+    const startedAtMs = validTimestampMs(nativeTakeover.terminal_bridge_started_at);
+    const lastActivityAtMs = validTimestampMs(nativeTakeover.terminal_bridge_last_activity_at);
+    const inactivityDeadlineAtMs = validTimestampMs(nativeTakeover.terminal_bridge_inactivity_deadline_at);
+    const hardDeadlineAtMs = validTimestampMs(nativeTakeover.terminal_bridge_hard_deadline_at);
+    if (!Number.isFinite(inactivityTimeoutMinutes) ||
+        inactivityTimeoutMinutes <= 0 ||
+        !Number.isFinite(hardTimeoutMinutes) ||
+        hardTimeoutMinutes <= 0 ||
+        startedAtMs === undefined ||
+        lastActivityAtMs === undefined ||
+        inactivityDeadlineAtMs === undefined ||
+        hardDeadlineAtMs === undefined) {
+        return { eligible: false, reason: "terminal_bridge_deadline_metadata_missing" };
+    }
+    return {
+        eligible: true,
+        nativeTakeover,
+        terminalMessageId,
+        terminalControl,
+        runtime,
+        inactivityTimeoutMinutes,
+        hardTimeoutMinutes,
+        inactivityDeadlineAtMs,
+        hardDeadlineAtMs
+    };
+}
+function latestTerminalBridgeMonitorLaunchPid(logPath) {
+    let events;
+    try {
+        events = readExistingEvents(logPath);
+    }
+    catch {
+        return undefined;
+    }
+    const launch = [...events].reverse().find((event) => event.event === "terminal_bridge_monitor_launch");
+    const pid = Number(launch?.pid);
+    return Number.isSafeInteger(pid) && pid > 1 ? pid : undefined;
+}
+function prepareTerminalBridgeMonitorReconciliation({ statePath, expectedMessageId }) {
+    const releaseStateLock = acquireFileLock(`${statePath}.lock`);
+    try {
+        const conversation = loadState(statePath);
+        const eligibility = terminalBridgeReconciliationEligibility(conversation);
+        if (!eligibility.eligible) {
+            return {
+                prepared: false,
+                alreadyRunning: false,
+                reason: eligibility.reason
+            };
+        }
+        if (eligibility.terminalMessageId !== expectedMessageId) {
+            return {
+                prepared: false,
+                alreadyRunning: false,
+                reason: "terminal_bridge_task_replaced"
+            };
+        }
+        const activeOwner = activeTerminalBridgeMonitorOwner(statePath, eligibility.terminalMessageId);
+        if (activeOwner) {
+            return {
+                prepared: false,
+                alreadyRunning: true,
+                reason: "monitor_lock_owner_alive",
+                ownerPid: activeOwner.ownerPid
+            };
+        }
+        let renewedLease;
+        if (executorForConversation(conversation).kind === "claude") {
+            const leaseDeadlineAtMs = Math.min(eligibility.inactivityDeadlineAtMs, eligibility.hardDeadlineAtMs);
+            if (leaseDeadlineAtMs <= Date.now()) {
+                return {
+                    prepared: false,
+                    alreadyRunning: false,
+                    reason: "claude_hook_lease_deadline_elapsed"
+                };
+            }
+            renewedLease = renewClaudeHookLease(conversation, new Date(leaseDeadlineAtMs).toISOString());
+            if (!renewedLease) {
+                return {
+                    prepared: false,
+                    alreadyRunning: false,
+                    reason: "claude_hook_lease_refresh_failed"
+                };
+            }
+        }
+        const nextNativeTakeover = {
+            ...eligibility.nativeTakeover,
+            terminal_bridge_monitor_lock_version: TERMINAL_BRIDGE_MONITOR_LOCK_VERSION,
+            ...(renewedLease ? { claude_hook_lease_id: renewedLease.id } : {})
+        };
+        const needsSave = eligibility.nativeTakeover.terminal_bridge_monitor_lock_version !==
+            TERMINAL_BRIDGE_MONITOR_LOCK_VERSION ||
+            (renewedLease !== undefined &&
+                eligibility.nativeTakeover.claude_hook_lease_id !== renewedLease.id);
+        const preparedConversation = needsSave
+            ? {
+                ...conversation,
+                native_session_takeover: nextNativeTakeover,
+                updated_at: new Date().toISOString()
+            }
+            : conversation;
+        if (needsSave) {
+            saveState(statePath, preparedConversation);
+        }
+        return {
+            prepared: true,
+            conversation: preparedConversation,
+            terminalControl: eligibility.terminalControl,
+            inactivityTimeoutMinutes: eligibility.inactivityTimeoutMinutes,
+            hardTimeoutMinutes: eligibility.hardTimeoutMinutes
+        };
+    }
+    finally {
+        releaseStateLock();
+    }
+}
 function positiveMinutes(value, optionName) {
     const parsed = Number(value);
     if (!Number.isFinite(parsed) || parsed <= 0) {
@@ -3324,11 +4520,17 @@ async function runCancel(options) {
             options,
             conversationId: terminalConversation.conversationId,
             agent: terminalConversation.agent,
-            terminalControl: terminalConversation.terminalControl
+            terminalControl: terminalConversation.terminalControl,
+            pid: terminalConversation.pid
         });
         return;
     }
-    const { conversation, statePath, logPath } = loadConversationFromOptions(options);
+    const loaded = loadConversationFromOptions(options);
+    const { statePath, logPath } = loaded;
+    const conversation = await migrateLegacyTerminalAgentIdentity({
+        ...loaded,
+        options
+    });
     if (["closed", "cancelled"].includes(conversation.status)) {
         throw new Error(`cannot cancel ${conversation.conversation_id}; conversation is ${conversation.status}`);
     }
@@ -3405,14 +4607,23 @@ async function runCancel(options) {
         budget: budgetAction(nextConversation)
     });
 }
-async function runTerminalConversationCancel({ options, conversationId, agent, terminalControl }) {
-    const cancellation = await createTerminalAgentBridge(options).cancel(agent, terminalControl);
+async function runTerminalConversationCancel({ options, conversationId, agent, terminalControl, pid }) {
+    const cancellation = await createTerminalAgentBridge(options).cancel(agent, terminalControl, {
+        runtime: {
+            pid,
+            cwd: terminalControl.currentPath,
+            terminalTarget: terminalControl.target
+        },
+        scrollbackLines: Number(options.scrollbackLines ?? 120)
+    });
     runtimeLog("info", "terminal_cancel_requested", {
         conversation_id: conversationId,
         agent,
         terminal_target: terminalControl.target,
         key: cancellation.key,
         keys: cancellation.keys,
+        denied_approval: cancellation.deniedApproval,
+        request_id: cancellation.requestId,
         cancel_requested: cancellation.cancelRequested,
         reason: cancellation.reason
     });
@@ -3423,11 +4634,16 @@ async function runTerminalConversationCancel({ options, conversationId, agent, t
         reason: cancellation.reason,
         terminal_control: terminalControl,
         key: cancellation.key,
-        keys: cancellation.keys
+        keys: cancellation.keys,
+        denied_approval: cancellation.deniedApproval,
+        request_id: cancellation.requestId
     });
 }
 async function runTerminalControlCancel({ options, conversation, statePath, logPath, agent, terminalControl }) {
-    const cancellation = await createTerminalAgentBridge(options).cancel(agent, terminalControl);
+    const cancellation = await createTerminalAgentBridge(options).cancel(agent, terminalControl, {
+        runtime: terminalRuntimeIdentityForConversation(conversation, terminalControl),
+        scrollbackLines: Number(options.scrollbackLines ?? 120)
+    });
     if (!cancellation.cancelRequested) {
         printJson({
             conversation,
@@ -3445,27 +4661,36 @@ async function runTerminalControlCancel({ options, conversation, statePath, logP
         event: "terminal_cancel_requested",
         terminal_control: terminalControl,
         key: cancellation.key,
-        keys: cancellation.keys
+        keys: cancellation.keys,
+        denied_approval: cancellation.deniedApproval,
+        request_id: cancellation.requestId
     });
     runtimeLog("info", "terminal_cancel_requested", {
         conversation_id: conversation.conversation_id,
         agent,
         terminal_target: terminalControl.target,
         key: cancellation.key,
-        keys: cancellation.keys
+        keys: cancellation.keys,
+        denied_approval: cancellation.deniedApproval,
+        request_id: cancellation.requestId
     });
     const nextConversation = {
         ...conversation,
+        status: "cancelled",
+        cancelled_at: now,
         terminal_cancel_requested_at: now,
         updated_at: now
     };
     saveState(statePath, nextConversation);
+    releaseClaudeHookLease(nextConversation);
     printJson({
         conversation: nextConversation,
         cancel_requested: true,
         terminal_control: terminalControl,
         key: cancellation.key,
         keys: cancellation.keys,
+        denied_approval: cancellation.deniedApproval,
+        request_id: cancellation.requestId,
         budget: budgetAction(nextConversation)
     });
 }
@@ -3536,7 +4761,7 @@ function runRecoveryDecision(options) {
     const acpxArgs = buildAcpxPromptArgs({ executor, payload, model: executorModel });
     if (options.background) {
         const outputPath = path.join(path.dirname(logPath), `${executor.kind}-${options.mode}-output.log`);
-        const outputFd = fs.openSync(outputPath, "a");
+        const outputFd = openPrivateAppendFile(outputPath);
         const child = spawn(acpxPath, acpxArgs, {
             detached: true,
             stdio: ["ignore", outputFd, outputFd],
@@ -3647,6 +4872,7 @@ function runClose(options) {
         updated_at: now
     };
     saveState(statePath, closed);
+    releaseClaudeHookLease(closed);
     appendEvent(logPath, {
         ts: now,
         conversation_id: conversation.conversation_id,
@@ -3812,7 +5038,7 @@ function startCallbackRetryMonitor({ statePath }) {
         detached: true,
         stdio: "ignore",
         cwd: process.cwd(),
-        env: process.env
+        env: environmentWithoutGatewayTokens()
     });
     child.unref();
     return child;
@@ -3868,10 +5094,46 @@ function runCallbackRetryMonitor(options) {
     }
 }
 async function runTerminalBridgeMonitor(options) {
+    const statePath = expandHome(required(options.state, "--state is required"));
+    const conversation = loadState(statePath);
+    const nativeTakeover = isRecord(conversation.native_session_takeover)
+        ? conversation.native_session_takeover
+        : undefined;
+    const terminalMessageId = stringValue(nativeTakeover?.terminal_bridge_message_id) ?? "missing-message-id";
+    const monitorLock = tryAcquireTerminalBridgeMonitorLock(statePath, terminalMessageId);
+    if (!monitorLock.acquired) {
+        runtimeLog("info", "terminal_bridge_monitor_already_running", {
+            conversation_id: conversation.conversation_id,
+            terminal_bridge_message_id: terminalMessageId,
+            monitor_owner_pid: monitorLock.ownerPid
+        });
+        printJson({
+            conversation,
+            monitored: false,
+            terminal_bridge: true,
+            already_running: true,
+            reason: "terminal_bridge_monitor_already_running",
+            monitor_owner_pid: monitorLock.ownerPid ?? null
+        });
+        return;
+    }
+    try {
+        await runTerminalBridgeMonitorWithLock(options);
+    }
+    finally {
+        monitorLock.release();
+    }
+}
+async function runTerminalBridgeMonitorWithLock(options) {
     const statePath = expandHome(required(options.state, "--state is required"));
     const logPath = expandHome(options.log ?? logPathForStatePath(statePath));
     const pollIntervalMs = Math.max(50, Number(options.pollIntervalMs ?? DEFAULT_MONITOR_POLL_INTERVAL_MS));
-    let conversation = loadState(statePath);
+    let conversation = await migrateLegacyTerminalAgentIdentity({
+        conversation: loadState(statePath),
+        statePath,
+        logPath,
+        options
+    });
     const initialNativeTakeover = isRecord(conversation.native_session_takeover)
         ? conversation.native_session_takeover
         : undefined;
@@ -3967,38 +5229,134 @@ async function runTerminalBridgeMonitor(options) {
                 }
             });
             printJson({
-                conversation: stalledConversation,
+                conversation: stalledConversation,
+                monitored: true,
+                terminal_bridge: true,
+                stalled: true,
+                reason: stalledConversation?.stalled_reason
+            });
+            return;
+        }
+        const requestText = String(nativeTakeover?.["terminal_bridge_request_text"] ?? conversation.user_request ?? "");
+        const startedAt = stringValue(nativeTakeover?.["terminal_bridge_started_at"]);
+        const terminalRuntime = terminalRuntimeIdentityForConversation(conversation, terminalControl);
+        const screenChangedSinceSend = preSendScreenFingerprint !== undefined &&
+            previousScreenFingerprint !== undefined &&
+            previousScreenFingerprint !== preSendScreenFingerprint;
+        const poll = await terminalBridge.monitorPoll({
+            agent: executor.kind,
+            terminalControl,
+            screenOptions: {
+                scrollbackLines: Number(options.scrollbackLines ?? 120),
+                requestText,
+                screenChangedSinceSend,
+                runtime: terminalRuntime
+            },
+            durableRequest: {
+                sessionId: terminalRuntime.sessionId,
+                cwd: stringValue(nativeTakeover?.["source_cwd"]),
+                requestText,
+                requestHash: stringValue(nativeTakeover?.["terminal_bridge_request_hash"]),
+                startedAt,
+                context: {
+                    conversation,
+                    nativeTakeover,
+                    ...terminalRuntime
+                }
+            }
+        });
+        const terminalStatus = poll.status;
+        const approval = terminalStatus.approval_state;
+        if (isRecord(approval) && approval.blocked === true && approval.approvable !== true) {
+            const approvalReason = stringValue(approval.reason) ??
+                "Claude Code permission state cannot be safely resolved through AKK";
+            appendEvent(logPath, {
+                ts: new Date().toISOString(),
+                conversation_id: conversation.conversation_id,
+                event: "terminal_bridge_approval_not_approvable",
+                terminal_control: terminalControl,
+                activity_state: terminalStatus.activity_state,
+                reason: approvalReason
+            });
+            if (/waiting for hook consumption/iu.test(approvalReason)) {
+                sleepSync(pollIntervalMs);
+                continue;
+            }
+            const fingerprint = terminalBridgeApprovalFingerprint({ terminalControl, terminalStatus });
+            const notification = recordTerminalBridgeApprovalNotification({
+                statePath,
+                logPath,
+                terminalControl,
+                terminalStatus,
+                fingerprint
+            });
+            if (notification.duplicate) {
+                printJson({
+                    conversation: notification.conversation,
+                    monitored: true,
+                    terminal_bridge: true,
+                    awaiting_approval: true,
+                    approvable: false,
+                    duplicate: true,
+                    reason: approvalReason,
+                    terminal_control: terminalControl,
+                    terminal_status: terminalStatus
+                });
+                return;
+            }
+            const callbackMessage = createMessage({
+                conversation: notification.conversation,
+                from: executor.actor,
+                to: "openclaw",
+                type: "blocked",
+                requiresResponse: true,
+                body: [
+                    `${executor.display_name} is waiting at a permission state that AKK cannot safely approve.`,
+                    approvalReason,
+                    "",
+                    `Conversation: ${notification.conversation.conversation_id}`,
+                    `Terminal: ${terminalControl.target}`,
+                    "Review and resolve this dialog in the terminal manually. AKK intentionally sends no key when the request identity cannot be revalidated."
+                ].join("\n"),
+                metadata: {
+                    source: "terminal_bridge",
+                    reason: "approval_not_approvable",
+                    terminal_control: terminalControl,
+                    terminal_status: terminalStatus,
+                    approval_fingerprint: fingerprint
+                }
+            });
+            if (notification.conversation.gateway_method) {
+                runLockedCallback({
+                    ...options,
+                    statePath,
+                    log: logPath,
+                    messageJson: JSON.stringify(callbackMessage),
+                    gatewayMethod: notification.conversation.gateway_method,
+                    gatewaySession: notification.conversation.gateway_session,
+                    openclawSession: notification.conversation.openclaw_session,
+                    openclawBin: notification.conversation.openclaw_bin,
+                    gatewayUrl: stringValue(notification.conversation.gateway_token)
+                        ? notification.conversation.gateway_url
+                        : undefined,
+                    token: stringValue(notification.conversation.gateway_token)
+                });
+                return;
+            }
+            printJson({
+                conversation: notification.conversation,
                 monitored: true,
                 terminal_bridge: true,
-                stalled: true,
-                reason: stalledConversation?.stalled_reason
+                awaiting_approval: true,
+                approvable: false,
+                delivered: false,
+                message: callbackMessage,
+                reason: "gateway_method_missing",
+                terminal_control: terminalControl,
+                terminal_status: terminalStatus
             });
             return;
         }
-        const requestText = String(nativeTakeover?.["terminal_bridge_request_text"] ?? conversation.user_request ?? "");
-        const startedAt = stringValue(nativeTakeover?.["terminal_bridge_started_at"]);
-        const screenChangedSinceSend = preSendScreenFingerprint !== undefined &&
-            previousScreenFingerprint !== undefined &&
-            previousScreenFingerprint !== preSendScreenFingerprint;
-        const poll = await terminalBridge.monitorPoll({
-            agent: executor.kind,
-            terminalControl,
-            screenOptions: {
-                scrollbackLines: Number(options.scrollbackLines ?? 120),
-                requestText,
-                screenChangedSinceSend
-            },
-            durableRequest: {
-                sessionId: stringValue(nativeTakeover?.["native_session_id"]),
-                cwd: stringValue(nativeTakeover?.["source_cwd"]),
-                requestText,
-                requestHash: stringValue(nativeTakeover?.["terminal_bridge_request_hash"]),
-                startedAt,
-                context: { conversation, nativeTakeover }
-            }
-        });
-        const terminalStatus = poll.status;
-        const approval = terminalStatus.approval_state;
         if (isRecord(approval) && approval.blocked === true) {
             const fingerprint = terminalBridgeApprovalFingerprint({ terminalControl, terminalStatus });
             appendEvent(logPath, {
@@ -4150,55 +5508,98 @@ async function runTerminalBridgeMonitor(options) {
             : undefined;
         const completionStable = completionFingerprint !== undefined && completionFingerprint === idleCompletionFingerprint;
         idleCompletionFingerprint = completionFingerprint;
-        if (completion && completionStable) {
-            appendEvent(logPath, {
-                ts: new Date().toISOString(),
-                conversation_id: conversation.conversation_id,
-                event: "terminal_bridge_completion_detected",
-                terminal_control: terminalControl,
-                match: completionMatch,
-                completion_source: completion.source,
-                completion_id: completion.id,
-                terminal_session: completionMetadata.session,
-                context_match: completionMetadata.context_match,
-                assistant_timestamp: completion?.timestamp,
-                rollout_turn_id: completion.source === "durable" ? completion.id : undefined,
-                terminal_bridge_message_id: currentMessageId
+        if (completion && completionStable && completionFingerprint) {
+            const completionOutcome = completion.outcome === "failure" ? "failure" : "success";
+            const callbackMessageId = deterministicTerminalCallbackMessageId({
+                conversationId: conversation.conversation_id,
+                terminalMessageId: currentMessageId,
+                completionFingerprint,
+                outcome: completionOutcome
             });
-            const callbackMessage = createMessage({
-                conversation,
-                from: executor.actor,
-                to: "openclaw",
-                type: "done",
-                requiresResponse: false,
-                body: completion?.text ?? "",
-                metadata: {
-                    source: "terminal_bridge",
+            const claim = claimTerminalBridgeCompletion({
+                statePath,
+                logPath,
+                terminalMessageId: currentMessageId,
+                completionFingerprint,
+                completionId: completion.id,
+                callbackMessageId,
+                outcome: completionOutcome
+            });
+            if (!claim.claimed) {
+                printJson({
+                    conversation: claim.conversation,
+                    monitored: true,
+                    terminal_bridge: true,
+                    completed: false,
+                    duplicate: true,
+                    reason: claim.reason
+                });
+                return;
+            }
+            try {
+                conversation = claim.conversation;
+                appendEvent(logPath, {
+                    ts: new Date().toISOString(),
+                    conversation_id: conversation.conversation_id,
+                    event: "terminal_bridge_completion_detected",
                     terminal_control: terminalControl,
-                    ...completionMetadata,
+                    match: completionMatch,
                     completion_source: completion.source,
+                    completion_outcome: completionOutcome,
                     completion_id: completion.id,
                     terminal_session: completionMetadata.session,
-                    confidence: completion.confidence,
-                    match: completionMatch,
+                    context_match: completionMetadata.context_match,
                     assistant_timestamp: completion?.timestamp,
                     rollout_turn_id: completion.source === "durable" ? completion.id : undefined,
-                    terminal_bridge_message_id: currentMessageId
-                }
-            });
-            runLockedCallback({
-                ...options,
-                statePath,
-                log: logPath,
-                closeTerminalBridgeOnDone: true,
-                messageJson: JSON.stringify(callbackMessage),
-                gatewayMethod: conversation.gateway_method,
-                gatewaySession: conversation.gateway_session,
-                openclawSession: conversation.openclaw_session,
-                openclawBin: conversation.openclaw_bin,
-                gatewayUrl: stringValue(conversation.gateway_token) ? conversation.gateway_url : undefined,
-                token: stringValue(conversation.gateway_token)
-            });
+                    terminal_bridge_message_id: currentMessageId,
+                    callback_message_id: callbackMessageId
+                });
+                const callbackMessage = {
+                    ...createMessage({
+                        conversation,
+                        from: executor.actor,
+                        to: "openclaw",
+                        type: completionOutcome === "failure" ? "error" : "done",
+                        requiresResponse: false,
+                        body: completion.text,
+                        metadata: {
+                            source: "terminal_bridge",
+                            terminal_control: terminalControl,
+                            ...completionMetadata,
+                            completion_source: completion.source,
+                            completion_outcome: completionOutcome,
+                            completion_id: completion.id,
+                            terminal_session: completionMetadata.session,
+                            confidence: completion.confidence,
+                            match: completionMatch,
+                            assistant_timestamp: completion?.timestamp,
+                            rollout_turn_id: completion.source === "durable" ? completion.id : undefined,
+                            terminal_bridge_message_id: currentMessageId
+                        }
+                    }),
+                    id: callbackMessageId
+                };
+                runLockedCallback({
+                    ...options,
+                    statePath,
+                    log: logPath,
+                    closeTerminalBridgeOnDone: completionOutcome === "success",
+                    trackCallbackDelivery: true,
+                    recoverTerminalCompletion: claim.resumed === true,
+                    preserveMessageId: true,
+                    messageJson: JSON.stringify(callbackMessage),
+                    gatewayMethod: conversation.gateway_method,
+                    gatewaySession: conversation.gateway_session,
+                    openclawSession: conversation.openclaw_session,
+                    openclawBin: conversation.openclaw_bin,
+                    gatewayUrl: stringValue(conversation.gateway_token) ? conversation.gateway_url : undefined,
+                    token: stringValue(conversation.gateway_token)
+                });
+            }
+            finally {
+                releaseClaudeHookLease(conversation);
+                claim.release();
+            }
             return;
         }
         // A concrete approval or completion observed on this poll wins over a timeout boundary.
@@ -4288,6 +5689,46 @@ function terminalBridgeScreenFingerprint(value) {
         ? createHash("sha256").update(value).digest("hex")
         : undefined;
 }
+function terminalBridgeMonitorLockPath(statePath, terminalMessageId) {
+    const messageKey = createHash("sha256")
+        .update(terminalMessageId)
+        .digest("hex")
+        .slice(0, 20);
+    return `${statePath}.terminal-bridge-monitor-${messageKey}.lock`;
+}
+function fileLockOwnerPid(lockPath) {
+    return readFileLockOwner(lockPath).pid;
+}
+function activeTerminalBridgeMonitorOwner(statePath, terminalMessageId) {
+    const lockPath = terminalBridgeMonitorLockPath(statePath, terminalMessageId);
+    if (!fs.existsSync(lockPath) || staleFileLock(lockPath)) {
+        return undefined;
+    }
+    return {
+        lockPath,
+        ownerPid: fileLockOwnerPid(lockPath)
+    };
+}
+function tryAcquireTerminalBridgeMonitorLock(statePath, terminalMessageId) {
+    const lockPath = terminalBridgeMonitorLockPath(statePath, terminalMessageId);
+    try {
+        return {
+            acquired: true,
+            lockPath,
+            release: acquireFileLock(lockPath, { timeoutMs: 0 })
+        };
+    }
+    catch (error) {
+        if (isRecord(error) && error.code === "LOCK_TIMEOUT") {
+            return {
+                acquired: false,
+                lockPath,
+                ownerPid: fileLockOwnerPid(lockPath)
+            };
+        }
+        throw error;
+    }
+}
 function terminalBridgeSendLockPath(storeDir, terminalControl) {
     const terminalKey = createHash("sha256")
         .update(JSON.stringify({
@@ -4302,6 +5743,111 @@ function terminalBridgeRequestFingerprint(value) {
     const text = String(value ?? "").replace(/\s+/gu, " ").trim();
     return text ? createHash("sha256").update(text).digest("hex") : undefined;
 }
+function deterministicTerminalCallbackMessageId({ conversationId, terminalMessageId, completionFingerprint, outcome }) {
+    const digest = createHash("sha256")
+        .update(JSON.stringify({
+        conversation_id: conversationId,
+        terminal_message_id: terminalMessageId,
+        completion_fingerprint: completionFingerprint,
+        outcome
+    }))
+        .digest("hex")
+        .slice(0, 32);
+    return `msg-terminal-${digest}`;
+}
+function claimTerminalBridgeCompletion({ statePath, logPath, terminalMessageId, completionFingerprint, completionId, callbackMessageId, outcome }) {
+    const release = acquireFileLock(`${statePath}.lock`);
+    try {
+        const conversation = loadState(statePath);
+        const nativeTakeover = isRecord(conversation.native_session_takeover)
+            ? conversation.native_session_takeover
+            : {};
+        if (!isWaitingForAgent(conversation.status)) {
+            release();
+            return {
+                claimed: false,
+                conversation,
+                reason: "conversation_no_longer_waiting"
+            };
+        }
+        if (stringValue(nativeTakeover.terminal_bridge_message_id) !== terminalMessageId) {
+            release();
+            return {
+                claimed: false,
+                conversation,
+                reason: "terminal_bridge_task_replaced"
+            };
+        }
+        const existing = isRecord(nativeTakeover.terminal_bridge_completion_claim)
+            ? nativeTakeover.terminal_bridge_completion_claim
+            : undefined;
+        if (existing) {
+            if (existing.callback_message_id === callbackMessageId &&
+                existing.terminal_bridge_message_id === terminalMessageId &&
+                existing.completion_fingerprint === completionFingerprint &&
+                existing.outcome === outcome) {
+                appendEvent(logPath, {
+                    ts: new Date().toISOString(),
+                    conversation_id: conversation.conversation_id,
+                    event: "terminal_bridge_completion_claim_resumed",
+                    terminal_bridge_message_id: terminalMessageId,
+                    completion_fingerprint: completionFingerprint,
+                    callback_message_id: callbackMessageId,
+                    outcome
+                });
+                return {
+                    claimed: true,
+                    resumed: true,
+                    conversation,
+                    release
+                };
+            }
+            release();
+            return {
+                claimed: false,
+                conversation,
+                reason: "terminal_bridge_completion_claim_conflict"
+            };
+        }
+        const claimedAt = new Date().toISOString();
+        const claimedConversation = {
+            ...conversation,
+            native_session_takeover: {
+                ...nativeTakeover,
+                terminal_bridge_completion_claim: {
+                    terminal_bridge_message_id: terminalMessageId,
+                    completion_fingerprint: completionFingerprint,
+                    completion_id: completionId,
+                    callback_message_id: callbackMessageId,
+                    outcome,
+                    claimed_at: claimedAt
+                }
+            },
+            updated_at: claimedAt
+        };
+        saveState(statePath, claimedConversation);
+        appendEvent(logPath, {
+            ts: claimedAt,
+            conversation_id: conversation.conversation_id,
+            event: "terminal_bridge_completion_claimed",
+            terminal_bridge_message_id: terminalMessageId,
+            completion_fingerprint: completionFingerprint,
+            completion_id: completionId,
+            callback_message_id: callbackMessageId,
+            outcome
+        });
+        return {
+            claimed: true,
+            resumed: false,
+            conversation: claimedConversation,
+            release
+        };
+    }
+    catch (error) {
+        release();
+        throw error;
+    }
+}
 function terminalBridgeActivityPersistIntervalMs(timeoutMinutes, pollIntervalMs) {
     if (!Number.isFinite(timeoutMinutes) || timeoutMinutes <= 0) {
         return 5 * 60 * 1000;
@@ -4330,6 +5876,13 @@ function persistTerminalBridgeActivity({ conversation, statePath, logPath, obser
         const inactivityDeadlineAt = Number.isFinite(timeoutMinutes) && timeoutMinutes > 0
             ? new Date(observedAtMs + timeoutMinutes * 60 * 1000).toISOString()
             : undefined;
+        const hardDeadlineAt = stringValue(nativeTakeover.terminal_bridge_hard_deadline_at);
+        const leaseDeadlineAt = inactivityDeadlineAt && hardDeadlineAt
+            ? new Date(Math.min(Date.parse(inactivityDeadlineAt), Date.parse(hardDeadlineAt))).toISOString()
+            : inactivityDeadlineAt ?? hardDeadlineAt;
+        const renewedLease = leaseDeadlineAt
+            ? renewClaudeHookLease(currentConversation, leaseDeadlineAt)
+            : undefined;
         const nextConversation = {
             ...currentConversation,
             native_session_takeover: {
@@ -4338,7 +5891,8 @@ function persistTerminalBridgeActivity({ conversation, statePath, logPath, obser
                 terminal_bridge_last_activity_reason: reason,
                 terminal_bridge_inactivity_deadline_at: inactivityDeadlineAt,
                 terminal_bridge_inactivity_timeout_minutes: timeoutMinutes,
-                terminal_bridge_hard_timeout_minutes: hardTimeoutMinutes
+                terminal_bridge_hard_timeout_minutes: hardTimeoutMinutes,
+                claude_hook_lease_id: renewedLease?.id ?? nativeTakeover.claude_hook_lease_id
             },
             updated_at: observedAt
         };
@@ -4380,9 +5934,12 @@ function terminalBridgeApprovalCandidate({ executor, terminalControl, terminalSt
         agent: executor.kind,
         kind: stringValue(approval.prompt_kind) ?? "unknown",
         command: stringValue(approval.command),
-        cwd: terminalControl.currentPath,
+        tool_name: stringValue(approval.tool_name),
+        request_detail: stringValue(approval.request_detail),
+        cwd: stringValue(approval.cwd) ?? terminalControl.currentPath,
         fingerprint,
-        terminal_target: terminalControl.target
+        terminal_target: terminalControl.target,
+        decision_mode: stringValue(approval.decision_mode)
     };
 }
 async function loadCodexTerminalContext({ conversation, nativeTakeover, options }) {
@@ -4481,6 +6038,11 @@ function resolveOptionalExecutable(command) {
 function packageRootDir() {
     return path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
 }
+function printVersion() {
+    const packageJsonPath = path.join(packageRootDir(), "package.json");
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+    process.stdout.write(`${packageJson.version}\n`);
+}
 function runCheckedCommand(command, args, { label }) {
     const result = spawnSync(command, args, {
         encoding: "utf8",
@@ -4519,18 +6081,18 @@ function buildCallbackCommand({ statePath, gatewayUrl, token, openclawSession, g
         "--state",
         shellQuote(statePath)
     ];
-    if (token) {
-        parts.push("--gateway-url", shellQuote(gatewayUrl), "--token", shellQuote(token), "--openclaw-session", shellQuote(openclawSession));
-    }
-    else if (!gatewayMethod) {
-        parts.push("--record-only");
-    }
     if (gatewayMethod) {
         parts.push("--gateway-method", shellQuote(gatewayMethod), "--gateway-session", shellQuote(gatewaySession ?? openclawSession));
         if (openclawBin) {
             parts.push("--openclaw-bin", shellQuote(openclawBin));
         }
     }
+    else if (token) {
+        parts.push("--gateway-url", shellQuote(gatewayUrl), "--token", shellQuote(token), "--openclaw-session", shellQuote(openclawSession));
+    }
+    else {
+        parts.push("--record-only");
+    }
     parts.push("--message-json", "'<structured-message-json>'");
     return parts.join(" ");
 }
@@ -4595,7 +6157,7 @@ function runLockedCallback(options) {
     const logPath = expandHome(options.log ?? logPathForStatePath(options.statePath));
     const conversation = loadState(options.statePath);
     const executor = executorForConversation(conversation);
-    const message = options.retryPending === true
+    const message = options.retryPending === true || options.preserveMessageId === true
         ? parseMessageJson(messageInput)
         : extractStructuredMessage({
             conversation,
@@ -4614,7 +6176,11 @@ function runLockedCallback(options) {
         isRecord(callbackDelivery?.message) &&
         callbackDelivery.message.id === message.id &&
         ["pending", "failed"].includes(String(callbackDelivery.status ?? ""));
-    if (isDuplicateMessage(existingEvents, message) && !retryingPending) {
+    const duplicateMessage = isDuplicateMessage(existingEvents, message);
+    const recoveringTerminalCompletion = options.recoverTerminalCompletion === true &&
+        duplicateMessage &&
+        isWaitingForAgent(conversation.status);
+    if (duplicateMessage && !retryingPending && !recoveringTerminalCompletion) {
         runtimeLog("info", "callback_duplicate", {
             conversation_id: conversation.conversation_id,
             agent: executor.kind,
@@ -4636,15 +6202,23 @@ function runLockedCallback(options) {
     }
     const closeTerminalBridgeOnDone = message.type === "done" &&
         options.closeTerminalBridgeOnDone === true;
+    const trackCallbackDelivery = closeTerminalBridgeOnDone ||
+        options.trackCallbackDelivery === true ||
+        callbackDelivery?.track_delivery === true;
     const requiresDelivery = Boolean(options.gatewayMethod) || options.recordOnly !== true;
     const deliveryAttempt = Number(callbackDelivery?.attempts ?? 0) + 1;
     let nextConversation = retryingPending
         ? conversation
         : applyMessageToConversation(conversation, message);
-    if (!retryingPending) {
+    const storedFinalStatus = stringValue(callbackDelivery?.final_status);
+    const finalStatus = storedFinalStatus &&
+        CONVERSATION_STATUSES.has(storedFinalStatus)
+        ? storedFinalStatus
+        : nextConversation.status;
+    if (!retryingPending && !recoveringTerminalCompletion) {
         appendEvent(logPath, messageEvent(message));
     }
-    if (closeTerminalBridgeOnDone && requiresDelivery) {
+    if (trackCallbackDelivery && requiresDelivery) {
         const now = new Date().toISOString();
         nextConversation = {
             ...nextConversation,
@@ -4659,7 +6233,9 @@ function runLockedCallback(options) {
                 gateway_session: options.gatewaySession ?? options.openclawSession ?? conversation.openclaw_session,
                 gateway_url: options.gatewayUrl ?? conversation.gateway_url,
                 openclaw_bin: options.openclawBin ?? conversation.openclaw_bin,
-                close_terminal_bridge_on_done: true
+                close_terminal_bridge_on_done: closeTerminalBridgeOnDone,
+                track_delivery: true,
+                final_status: finalStatus
             },
             updated_at: now
         };
@@ -4712,12 +6288,17 @@ function runLockedCallback(options) {
         });
         const deliveredAt = new Date().toISOString();
         let deliveredConversation = nextConversation;
-        if (closeTerminalBridgeOnDone) {
+        if (trackCallbackDelivery) {
+            const deliveredStatus = closeTerminalBridgeOnDone ? "closed" : finalStatus;
             deliveredConversation = {
                 ...nextConversation,
-                status: "closed",
-                closed_at: deliveredAt,
-                close_reason: "terminal bridge task completed",
+                status: deliveredStatus,
+                ...(closeTerminalBridgeOnDone
+                    ? {
+                        closed_at: deliveredAt,
+                        close_reason: "terminal bridge task completed"
+                    }
+                    : {}),
                 callback_delivery: {
                     ...(isRecord(nextConversation.callback_delivery) ? nextConversation.callback_delivery : {}),
                     status: "delivered",
@@ -4734,7 +6315,7 @@ function runLockedCallback(options) {
                 event: "callback_delivery_succeeded",
                 message_id: message.id,
                 attempt: deliveryAttempt,
-                status: "closed"
+                status: deliveredStatus
             });
         }
         printJson({
@@ -4747,7 +6328,7 @@ function runLockedCallback(options) {
         });
     }
     catch (error) {
-        if (closeTerminalBridgeOnDone) {
+        if (trackCallbackDelivery) {
             const failedAt = new Date().toISOString();
             const failedConversation = {
                 ...nextConversation,
@@ -4902,8 +6483,8 @@ function recordCallbackProcessDelivery({ logPath, conversation, message, event,
         round: message.round,
         ...detail,
         status: delivery.status,
-        stdout: delivery.stdout,
-        stderr: delivery.stderr
+        stdout: redactString(delivery.stdout),
+        stderr: redactString(delivery.stderr)
     });
     runtimeLog("info", runtimeEvent, {
         conversation_id: conversation.conversation_id,
@@ -4916,25 +6497,149 @@ function recordCallbackProcessDelivery({ logPath, conversation, message, event,
 }
 function acquireFileLock(lockPath, { timeoutMs = 5000, retryMs = 50 } = {}) {
     const started = Date.now();
+    const token = randomUUID();
     while (true) {
+        let fd;
         try {
-            const fd = fs.openSync(lockPath, "wx");
+            fd = fs.openSync(lockPath, fs.constants.O_CREAT |
+                fs.constants.O_EXCL |
+                fs.constants.O_WRONLY |
+                NO_FOLLOW_FLAG, PRIVATE_LOCK_FILE_MODE);
+            fs.fchmodSync(fd, PRIVATE_LOCK_FILE_MODE);
+            fs.writeFileSync(fd, `${JSON.stringify({
+                pid: process.pid,
+                token,
+                created_at: new Date().toISOString()
+            })}\n`, "utf8");
+            fs.fsyncSync(fd);
             fs.closeSync(fd);
-            return () => {
-                fs.rmSync(lockPath, { force: true });
-            };
+            fd = undefined;
+            return () => releaseFileLock(lockPath, token);
         }
         catch (error) {
-            if (error.code !== "EEXIST") {
+            if (fd !== undefined) {
+                fs.closeSync(fd);
+            }
+            if (!isRecord(error) || error.code !== "EEXIST") {
                 throw error;
             }
+            if (reclaimStaleFileLock(lockPath)) {
+                continue;
+            }
             if (Date.now() - started >= timeoutMs) {
-                throw new Error(`timed out waiting for file lock: ${lockPath}`);
+                throw Object.assign(new Error(`timed out waiting for file lock: ${lockPath}`), { code: "LOCK_TIMEOUT" });
             }
             sleepSync(retryMs);
         }
     }
 }
+function staleFileLock(lockPath) {
+    try {
+        const stat = fs.lstatSync(lockPath);
+        if (stat.isSymbolicLink() || !stat.isFile()) {
+            throw new Error(`file lock must be a regular file, not a symlink: ${lockPath}`);
+        }
+        const owner = readFileLockOwner(lockPath);
+        if (owner.pid !== undefined) {
+            try {
+                process.kill(owner.pid, 0);
+                return false;
+            }
+            catch (error) {
+                return isRecord(error) && error.code === "ESRCH";
+            }
+        }
+        return Date.now() - stat.mtimeMs > 30_000;
+    }
+    catch (error) {
+        return isRecord(error) && error.code === "ENOENT";
+    }
+}
+function reclaimStaleFileLock(lockPath) {
+    const reclaimPath = `${lockPath}.reclaim`;
+    let reclaimFd;
+    try {
+        reclaimFd = fs.openSync(reclaimPath, fs.constants.O_CREAT |
+            fs.constants.O_EXCL |
+            fs.constants.O_WRONLY |
+            NO_FOLLOW_FLAG, PRIVATE_LOCK_FILE_MODE);
+        fs.fchmodSync(reclaimFd, PRIVATE_LOCK_FILE_MODE);
+        fs.writeFileSync(reclaimFd, `${process.pid}\n`, "utf8");
+        fs.fsyncSync(reclaimFd);
+    }
+    catch (error) {
+        if (reclaimFd !== undefined) {
+            fs.closeSync(reclaimFd);
+        }
+        if (isRecord(error) && error.code === "EEXIST") {
+            return false;
+        }
+        throw error;
+    }
+    try {
+        if (!staleFileLock(lockPath)) {
+            return false;
+        }
+        try {
+            fs.unlinkSync(lockPath);
+            return true;
+        }
+        catch (error) {
+            return isRecord(error) && error.code === "ENOENT";
+        }
+    }
+    finally {
+        fs.closeSync(reclaimFd);
+        try {
+            fs.unlinkSync(reclaimPath);
+        }
+        catch (error) {
+            if (!isRecord(error) || error.code !== "ENOENT") {
+                throw error;
+            }
+        }
+    }
+}
+function releaseFileLock(lockPath, token) {
+    try {
+        if (readFileLockOwner(lockPath).token !== token) {
+            return;
+        }
+        fs.unlinkSync(lockPath);
+    }
+    catch (error) {
+        if (!isRecord(error) || error.code !== "ENOENT") {
+            throw error;
+        }
+    }
+}
+function readFileLockOwner(lockPath) {
+    try {
+        const text = fs.readFileSync(lockPath, "utf8").trim();
+        try {
+            const owner = JSON.parse(text);
+            if (isRecord(owner)) {
+                const pid = Number(owner.pid);
+                return {
+                    pid: Number.isSafeInteger(pid) && pid > 1 ? pid : undefined,
+                    token: stringValue(owner.token)
+                };
+            }
+        }
+        catch {
+            // Legacy locks contained only the owner PID.
+        }
+        const legacyPid = Number(text);
+        return {
+            pid: Number.isSafeInteger(legacyPid) && legacyPid > 1
+                ? legacyPid
+                : undefined
+        };
+    }
+    catch {
+        return {};
+    }
+}
 function sleepSync(ms) {
     Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
 }
@@ -5497,6 +7202,7 @@ function markConversationStalled({ statePath, logPath, reason, detail = {} }) {
             updated_at: now
         };
         saveState(statePath, stalledConversation);
+        releaseClaudeHookLease(stalledConversation);
         appendEvent(logPath, {
             ts: now,
             conversation_id: conversation.conversation_id,
@@ -5711,8 +7417,8 @@ function deliverStalledNotification({ statePath, logPath, conversation, message,
         method: conversation.gateway_method,
         message_id: message.id,
         status: delivery.status,
-        stdout: delivery.stdout,
-        stderr: delivery.stderr
+        stdout: redactString(delivery.stdout),
+        stderr: redactString(delivery.stderr)
     });
     runtimeLog("info", `${eventPrefix}_gateway_method_delivery`, {
         conversation_id: conversation.conversation_id,
@@ -5743,8 +7449,8 @@ function deliverStalledNotification({ statePath, logPath, conversation, message,
         event: `${eventPrefix}_chat_send_delivery`,
         message_id: message.id,
         status: chatSendDelivery.status,
-        stdout: chatSendDelivery.stdout,
-        stderr: chatSendDelivery.stderr
+        stdout: redactString(chatSendDelivery.stdout),
+        stderr: redactString(chatSendDelivery.stderr)
     });
     runtimeLog("info", `${eventPrefix}_chat_send_delivery`, {
         conversation_id: conversation.conversation_id,
@@ -5848,10 +7554,11 @@ function messageFingerprint(message) {
     });
 }
 function deliverToOpenClaw({ gatewayUrl, token, openclawSession, message }) {
-    const agent = `openclaw acp --url ${gatewayUrl} --token ${token} --session ${openclawSession}`;
+    const agent = `openclaw acp --url ${gatewayUrl} --session ${openclawSession}`;
     const result = spawnSync("acpx", ["--agent", agent, JSON.stringify(message)], {
         encoding: "utf8",
-        maxBuffer: 1024 * 1024 * 10
+        maxBuffer: 1024 * 1024 * 10,
+        env: openClawGatewayEnvironment(token)
     });
     if (result.error) {
         return {
@@ -5876,7 +7583,7 @@ function deliverToGatewayMethod({ method, openclawBin, gatewayUrl, token, sessio
             sessionKey,
             statePath,
             logPath,
-            conversation,
+            conversation: redactCliOutput(conversation),
             message
         }),
         "--json"
@@ -5884,12 +7591,10 @@ function deliverToGatewayMethod({ method, openclawBin, gatewayUrl, token, sessio
     if (gatewayUrl) {
         args.push("--url", gatewayUrl);
     }
-    if (token && token !== "<token>") {
-        args.push("--token", token);
-    }
     const result = spawnSync(openclawBin ?? "openclaw", args, {
         encoding: "utf8",
-        maxBuffer: 1024 * 1024 * 10
+        maxBuffer: 1024 * 1024 * 10,
+        env: openClawGatewayEnvironment(token)
     });
     if (result.error) {
         return {
@@ -5916,12 +7621,10 @@ function deliverToSessionSend({ openclawBin, gatewayUrl, token, params }) {
     if (gatewayUrl) {
         args.push("--url", gatewayUrl);
     }
-    if (token && token !== "<token>") {
-        args.push("--token", token);
-    }
     const result = spawnSync(openclawBin ?? "openclaw", args, {
         encoding: "utf8",
-        maxBuffer: 1024 * 1024 * 10
+        maxBuffer: 1024 * 1024 * 10,
+        env: openClawGatewayEnvironment(token)
     });
     if (result.error) {
         return {
@@ -5948,12 +7651,10 @@ function deliverToChatSend({ openclawBin, gatewayUrl, token, params }) {
     if (gatewayUrl) {
         args.push("--url", gatewayUrl);
     }
-    if (token && token !== "<token>") {
-        args.push("--token", token);
-    }
     const result = spawnSync(openclawBin ?? "openclaw", args, {
         encoding: "utf8",
-        maxBuffer: 1024 * 1024 * 10
+        maxBuffer: 1024 * 1024 * 10,
+        env: openClawGatewayEnvironment(token)
     });
     if (result.error) {
         return {
@@ -5968,6 +7669,15 @@ function deliverToChatSend({ openclawBin, gatewayUrl, token, params }) {
         stderr: result.stderr ?? ""
     };
 }
+function openClawGatewayEnvironment(token) {
+    if (!token || token === "<token>") {
+        return process.env;
+    }
+    return {
+        ...process.env,
+        OPENCLAW_GATEWAY_TOKEN: token
+    };
+}
 function captureJson(argv) {
     const result = spawnSync(process.execPath, [new URL(import.meta.url).pathname, ...argv], {
         encoding: "utf8"
@@ -6055,7 +7765,24 @@ function expandHome(filePath) {
     return filePath;
 }
 function printJson(value) {
-    process.stdout.write(`${JSON.stringify(value, null, 2)}\n`);
+    process.stdout.write(`${JSON.stringify(redactCliOutput(value), null, 2)}\n`);
+}
+function redactCliOutput(value) {
+    if (Array.isArray(value)) {
+        return value.map((item) => redactCliOutput(item));
+    }
+    if (isRecord(value)) {
+        return Object.fromEntries(Object.entries(value).flatMap(([key, item]) => {
+            if (key === "gateway_token" || key === "gatewayToken") {
+                return [];
+            }
+            if ((key === "callback_command" || key === "callbackCommand") && typeof item === "string") {
+                return [[key, redactString(item)]];
+            }
+            return [[key, redactCliOutput(item)]];
+        }));
+    }
+    return value;
 }
 function cleanProcessText(text) {
     const value = String(text ?? "").trim();
@@ -6121,6 +7848,24 @@ function readOutputTail(outputPath, maxBytes = 65536) {
         return "";
     }
 }
+function openPrivateAppendFile(filePath) {
+    if (fs.existsSync(filePath) && fs.lstatSync(filePath).isSymbolicLink()) {
+        throw new Error(`refusing agent output symlink: ${filePath}`);
+    }
+    const noFollow = typeof fs.constants.O_NOFOLLOW === "number"
+        ? fs.constants.O_NOFOLLOW
+        : 0;
+    const descriptor = fs.openSync(filePath, fs.constants.O_CREAT |
+        fs.constants.O_APPEND |
+        fs.constants.O_WRONLY |
+        noFollow, 0o600);
+    if (!fs.fstatSync(descriptor).isFile()) {
+        fs.closeSync(descriptor);
+        throw new Error(`agent output must be a regular file: ${filePath}`);
+    }
+    fs.fchmodSync(descriptor, 0o600);
+    return descriptor;
+}
 function detectModelSelectionError(text) {
     const cleaned = cleanProcessText(text);
     if (!cleaned) {
@@ -6194,6 +7939,8 @@ function withStoragePaths(conversation, paths) {
 function usage() {
     const agentList = EXECUTOR_KINDS.join("|");
     process.stdout.write(`Usage:
+  agent-knock-knock --help
+  agent-knock-knock --version
   agent-knock-knock new --request <text> [--agent ${agentList}] [--workspace <path>] [--store-dir <dir>]
   agent-knock-knock record --state <file> --message-json <json>
   agent-knock-knock bootstrap-prompt --callback-command <command> [--agent ${agentList}]
@@ -6205,10 +7952,12 @@ function usage() {
   agent-knock-knock approve --conversation <id>
   agent-knock-knock cancel --conversation <id> [--all-proxy <url>]
   agent-knock-knock renew --conversation <id> [--minutes <inactivity-minutes>]
+  agent-knock-knock reconcile-monitors [--store-dir <dir>]
   agent-knock-knock retry-callback --conversation <id> [--store-dir <dir>]
   agent-knock-knock recover --conversation <id> [--session <name>] [--all-proxy <url>]
   agent-knock-knock close --conversation <id> [--reason <text>]
   agent-knock-knock install-openclaw [--openclaw-bin <path>] [--skill-path <path>] [--skill-only] [--no-restart]
+  agent-knock-knock install-claude-hooks [--settings-path <path>] [--executable-path <path>] [--dry-run]
   agent-knock-knock doctor
   agent-knock-knock agent takeover --agent codex --session-id <id> --strategy terminate_then_resume|terminal_control|fork [--create-conversation]
   agent-knock-knock callback --state <file> --message-json <json> [--record-only]