@scotthuang/agent-knock-knock 0.13.14 → 0.13.16

package/dist/src/terminal-permission-control.js

@@ -0,0 +1,217 @@
+import { createHash } from "node:crypto";
+import { terminalPhysicalBindingToken } from "./terminal-control-ref.js";
+/** Permission writes have their own reviewed UI contract, separate from reads/model control. */
+export function terminalPermissionControlProfileFor(version) {
+    return ["0.159.2", "0.159.3"].includes(version)
+        ? { agentVersion: version, behaviorProfile: "codex-permissions-fullscreen-v1", scope: "current_session" }
+        : undefined;
+}
+export function terminalPermissionControlBindingToken(value) {
+    const profile = terminalPermissionControlProfileFor(value.agentVersion);
+    if (!profile || profile.behaviorProfile !== value.behaviorProfile) {
+        throw new Error("unsupported native permission-control profile");
+    }
+    return digest({
+        authority: "terminal_permission_control", version: 1,
+        physical: terminalPhysicalBindingToken({ ...value, agent: "codex" }),
+        agentVersion: value.agentVersion, behaviorProfile: value.behaviorProfile
+    });
+}
+/** A transport failure may have delivered input; no cleanup or retry follows it. */
+export class TerminalPermissionInputUncertainError extends Error {
+    doNotRetry = true;
+}
+export function permissionModeFromStatus(value) {
+    if (value === "Full Access")
+        return "full_access";
+    if (value === "Workspace (Ask for approval)")
+        return "ask_for_approval";
+    if (value === "Workspace (Approve for me)")
+        return "approve_for_me";
+    if (value === "Read Only (Ask for approval)" || value === "Read Only")
+        return "read_only";
+    return undefined;
+}
+async function waitFor(ports, state) {
+    for (let attempt = 0; attempt < 35; attempt += 1) {
+        const captured = await ports.capture();
+        if (captured.state === state)
+            return captured;
+        await ports.sleep(100);
+    }
+    throw new Error(`Codex permission control did not prove its ${state} postcondition`);
+}
+async function openPicker(ports) {
+    const empty = await ports.capture();
+    if (empty.state !== "idle")
+        throw new Error("permission control requires an idle, exactly empty Codex Composer");
+    await ports.input("command", empty);
+    await ports.input("C-m", await waitFor(ports, "command"));
+    return await waitFor(ports, "picker");
+}
+async function dismiss(ports, picker) {
+    await ports.input("Escape", picker);
+    await waitFor(ports, "idle");
+}
+function catalog(profile, status, picker) {
+    const current = picker.rows.filter((row) => row.current);
+    if (current.length > 1 || current.length === 1 && current[0].id !== status.mode ||
+        current.length === 0 && picker.rows.some((row) => row.id === status.mode)) {
+        throw new Error("native permission menu and fresh /status disagree about current permissions");
+    }
+    const choices = picker.rows.map(({ id, label, description }) => ({
+        id, label, description
+    }));
+    return {
+        agent: "codex", ...profile, current: status.mode, choices,
+        catalogFingerprint: digest({ ...profile, threadId: status.threadId, current: status.mode, choices })
+    };
+}
+/** Only clean up a freshly re-proven surface owned by this operation. */
+async function cleanup(ports) {
+    const frame = await ports.capture();
+    if (frame.state === "picker")
+        return dismiss(ports, frame);
+    if (frame.state === "command") {
+        await ports.input("Escape", frame);
+        const bare = await waitFor(ports, "bare_command");
+        await ports.input("C-u", bare);
+        await waitFor(ports, "idle");
+    }
+    else if (frame.state === "bare_command") {
+        await ports.input("C-u", frame);
+        await waitFor(ports, "idle");
+    }
+    else if (frame.state !== "idle") {
+        throw new TerminalPermissionInputUncertainError("permission cleanup cannot prove an empty Composer; do not retry automatically");
+    }
+}
+export async function discoverTerminalPermissionOptions(profile, ports) {
+    // Fresh status binds the catalog to a native thread, including paginated sessions
+    // with no open rollout. No app-server write or persistent AKK Session is needed.
+    const status = await ports.inspectStatus();
+    try {
+        const picker = await openPicker(ports);
+        const result = catalog(profile, status, picker);
+        await dismiss(ports, picker);
+        return result;
+    }
+    catch (error) {
+        if (!(error instanceof TerminalPermissionInputUncertainError)) {
+            try {
+                await cleanup(ports);
+            }
+            catch (cause) {
+                throw new TerminalPermissionInputUncertainError("native permission cleanup is uncertain; do not retry automatically", { cause });
+            }
+        }
+        throw error;
+    }
+}
+export async function switchTerminalPermissions(profile, mode, expectedCatalogFingerprint, ports) {
+    if (!["ask_for_approval", "approve_for_me", "full_access", "read_only"].includes(mode)) {
+        throw new Error("permission mode must come from the current native permission catalog");
+    }
+    let status;
+    try {
+        status = await ports.inspectStatus();
+    }
+    catch (error) {
+        if (error instanceof TerminalPermissionInputUncertainError)
+            return uncertain(mode);
+        throw error;
+    }
+    let selectionAttempted = false;
+    try {
+        let picker = await openPicker(ports);
+        const offered = catalog(profile, status, picker);
+        if (offered.catalogFingerprint !== expectedCatalogFingerprint) {
+            throw new Error("native thread or permission catalog changed; refresh permission-options");
+        }
+        const target = picker.rows.find((row) => row.id === mode);
+        if (!target)
+            throw new Error("requested permission mode is not available in this native menu");
+        if (mode === offered.current) {
+            await dismiss(ports, picker);
+            return success("already_effective", mode);
+        }
+        picker = await selectPermissionRow(profile, status, picker, target.index, offered.catalogFingerprint, ports);
+        selectionAttempted = true;
+        await ports.input("C-m", picker);
+        if (mode === "full_access")
+            await confirmFullAccess(ports);
+        await verifyPermissionSelection(profile, status, mode, ports);
+        return success("changed", mode);
+    }
+    catch (error) {
+        if (selectionAttempted || error instanceof TerminalPermissionInputUncertainError) {
+            return uncertain(mode);
+        }
+        try {
+            await cleanup(ports);
+        }
+        catch {
+            return uncertain(mode);
+        }
+        throw error;
+    }
+}
+async function selectPermissionRow(profile, status, initial, targetIndex, fingerprint, ports) {
+    let picker = initial;
+    for (let moves = 0; picker.selectedIndex !== targetIndex; moves += 1) {
+        if (moves >= picker.rows.length)
+            throw new Error("native permission selection did not converge");
+        const expectedIndex = picker.selectedIndex + (picker.selectedIndex < targetIndex ? 1 : -1);
+        await ports.input(picker.selectedIndex < targetIndex ? "Down" : "Up", picker);
+        picker = await waitForSelection(ports, "picker", expectedIndex);
+        if (catalog(profile, status, picker).catalogFingerprint !== fingerprint) {
+            throw new Error("native permission catalog changed during selection");
+        }
+    }
+    return picker;
+}
+async function confirmFullAccess(ports) {
+    let confirmation = await waitFor(ports, "full_access_confirmation");
+    if (confirmation.state !== "full_access_confirmation")
+        throw new Error("full-access confirmation is unavailable");
+    if (confirmation.selectedIndex !== 0) {
+        await ports.input("Up", confirmation);
+        confirmation = await waitForSelection(ports, "full_access_confirmation", 0);
+    }
+    await ports.input("C-m", confirmation);
+}
+async function verifyPermissionSelection(profile, previous, mode, ports) {
+    await waitFor(ports, "idle");
+    // A request echo is not completion. Fresh /status plus a reopened current
+    // menu marker must independently agree about this same native thread.
+    const effective = await ports.inspectStatus();
+    if (effective.threadId !== previous.threadId || effective.mode !== mode) {
+        throw new Error("native permission update was not proven on the original thread");
+    }
+    const verified = await openPicker(ports);
+    if (catalog(profile, effective, verified).current !== mode ||
+        !verified.rows.some((row) => row.id === mode && row.current)) {
+        throw new Error("native permission menu did not confirm the requested current mode");
+    }
+    await dismiss(ports, verified);
+}
+async function waitForSelection(ports, state, index) {
+    for (let attempt = 0; attempt < 35; attempt += 1) {
+        const frame = await ports.capture();
+        if (frame.state === state && frame.selectedIndex === index)
+            return frame;
+        await ports.sleep(100);
+    }
+    throw new Error("Codex permission selection did not match its expected row");
+}
+function success(outcome, mode) {
+    return { outcome, requested: { mode }, effective: { mode }, scope: "current_session", defaultsChanged: false, doNotRetry: false };
+}
+function uncertain(mode) {
+    return { outcome: "uncertain", requested: { mode }, scope: "current_session", defaultsChanged: false,
+        doNotRetry: true, reason: "Native permission input or its postcondition is uncertain; inspect the terminal and refresh permissions before another deliberate action." };
+}
+function digest(value) {
+    return createHash("sha256").update(JSON.stringify(value)).digest("hex");
+}
+//# sourceMappingURL=terminal-permission-control.js.map

package/dist/src/terminal-permission-control.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal-permission-control.js","sourceRoot":"","sources":["../../src/terminal-permission-control.ts"],"names":[],"mappings":"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"}

package/dist/src/terminal-send-watch-policy.js

@@ -1,17 +1,12 @@
-import { isCodexPaginatedVersion } from "./codex-lifecycle-compatibility.js";
-const CODEX_PAGINATED_DEFAULT_HISTORY_VERSIONS = new Set([
-    "0.157.0",
-    "0.157.1",
-    "0.158.0",
-    "0.159.0",
-    "0.159.2"
-]);
+import { isCodexPaginatedReadCandidate } from "./codex-lifecycle-compatibility.js";
+const CODEX_PRE_READ_CONTRACT_PAGINATED_VERSIONS = new Set(["0.157.0", "0.157.1"]);
 /** New physical Sends can acquire a paginated task anchor before task input. */
 export function codexPhysicalSendUsesPaginatedWatch(agentVersion) {
-    return isCodexPaginatedVersion(agentVersion);
+    return isCodexPaginatedReadCandidate(agentVersion);
 }
 export function codexManagedSendRequiresLegacyHistory(agentVersion) {
-    return CODEX_PAGINATED_DEFAULT_HISTORY_VERSIONS.has(agentVersion ?? "");
+    return isCodexPaginatedReadCandidate(agentVersion) ||
+        CODEX_PRE_READ_CONTRACT_PAGINATED_VERSIONS.has(agentVersion ?? "");
 }
 /** Managed Monitor still consumes legacy rollouts, never paginated thread data. */
 export function assertCodexManagedSendHasLegacyHistory(input) {
@@ -29,7 +24,7 @@ export function assertCodexManagedSendHasLegacyHistory(input) {
 export function selectCodexUserExplicitSendWatchSource(input) {
     if (input.paginatedAnchorAvailable)
         return { source: "codex_paginated" };
-    if (CODEX_PAGINATED_DEFAULT_HISTORY_VERSIONS.has(input.agentVersion ?? "") &&
+    if (codexManagedSendRequiresLegacyHistory(input.agentVersion) &&
         !(Number.isSafeInteger(input.legacyRootCount) &&
             Number(input.legacyRootCount) > 0)) {
         return {
@@ -37,7 +32,9 @@ export function selectCodexUserExplicitSendWatchSource(input) {
             reasonCode: "codex_paginated_history_anchor_unavailable",
             warning: `Codex ${input.agentVersion} has no verified legacy root ` +
                 "rollout or exact paginated history anchor. The message can still be " +
-                "sent, but no automatic completion callback Watch can be attached."
+                "sent, but no exact-task completion callback can be established. " +
+                "A best-effort terminal-activity Watch may still be attached after " +
+                "physical identity and screen-status validation."
         };
     }
     return { source: "codex_rollout" };

package/dist/src/terminal-send-watch-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-send-watch-policy.js","sourceRoot":"","sources":["../../src/terminal-send-watch-policy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-send-watch-policy.js","sourceRoot":"","sources":["../../src/terminal-send-watch-policy.ts"],"names":[],"mappings":"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"}

package/dist/src/terminal-watch-cli-adapter.d.ts

@@ -1,3 +1,4 @@
+import { type UserExplicitFallbackWatchReceipt } from "./terminal-watch-send-activity.js";
 import { readCodexPaginatedTaskSnapshot } from "./codex-paginated-observation.js";
 import { type CodexPaginatedTaskAnchor } from "./codex-paginated-task.js";
 import { capturePaginatedWatchAnchor as capturePaginatedAnchor } from "./codex-paginated-watch.js";
@@ -9,7 +10,7 @@ import { type Conversation } from "./protocol.js";
 import { type TerminalDispatchOwnership } from "./terminal-action-projection.js";
 import type { TerminalControlEvidence, TerminalControlRef } from "./terminal-control-ref.js";
 import { type TerminalWatchCallbackCliAdapter } from "./terminal-watch-callback-cli-adapter.js";
-import { type TerminalWatchTerminalIdentity, type UserExplicitFallbackWatchAnchor } from "./terminal-watch-store.js";
+import { type TerminalWatchTerminalIdentity, type TerminalActivityWatchAnchor, type UserExplicitFallbackWatchAnchor } from "./terminal-watch-store.js";
 export interface TerminalWatchCliOptions {
     callbackRoute?: CallbackRouteV1;
     /** Private Host-adapter authority describing how a route template is bound. */
@@ -42,15 +43,10 @@ export interface PreparedUserExplicitFallbackWatch {
     openclawSession: string;
     openclawBin: string;
     timeoutMs: number;
-    anchor: UserExplicitFallbackWatchAnchor | CodexPaginatedTaskAnchor;
-}
-export interface UserExplicitFallbackWatchReceipt {
-    callback_expected: true;
-    callback_mode: "terminal_watch";
-    watch_id: string;
-    watch_mode?: "exact_task" | "terminal_activity";
-    confidence?: "exact" | "best_effort";
+    anchor: UserExplicitFallbackWatchAnchor | CodexPaginatedTaskAnchor | TerminalActivityWatchAnchor;
+    warnings?: string[];
 }
+export type { UserExplicitFallbackWatchReceipt } from "./terminal-watch-send-activity.js";
 type ExactTerminalWatchObservation = {
     state: "available";
     rawTerminal: Record<string, unknown>;
@@ -120,4 +116,3 @@ export interface TerminalWatchCliFacade {
     };
 }
 export declare function createTerminalWatchCliAdapter(dependencies: TerminalWatchCliDependencies): TerminalWatchCliFacade;
-export {};

package/dist/src/terminal-watch-cli-adapter.js

@@ -1,10 +1,11 @@
-import { isCodexPaginatedVersion } from "./codex-lifecycle-compatibility.js";
+import { assertAutomaticActivityWatchIdentity, automaticSendWatchReceipt, createAutomaticActivityWatchAnchor, isAutomaticSendWatch, unsafeFallbackWatchPreparation } from "./terminal-watch-send-activity.js";
+import { isCodexPaginatedReadCandidate } from "./codex-lifecycle-compatibility.js";
 import { respondCodexPaginatedAsyncQuestion } from "./codex-paginated-async-response.js";
 import { publicTerminalWatch, terminalWatchCapturedAgentVersion } from "./terminal-watch-presentation.js";
 import { createHash } from "node:crypto";
 import path from "node:path";
 import { CodexLegacyThreadHistoryError } from "./codex-paginated-observation.js";
-import { capturePaginatedWatchAnchor as capturePaginatedAnchor, isPaginatedSendWatch, paginatedWatchProcessMatches, observePaginatedWatch, refreshPaginatedResponseForeground } from "./codex-paginated-watch.js";
+import { capturePaginatedWatchAnchor as capturePaginatedAnchor, paginatedWatchProcessMatches, observePaginatedWatch, refreshPaginatedResponseForeground } from "./codex-paginated-watch.js";
 import { observeCodexPaginatedBlockingQuestion, respondCodexPaginatedBlockingQuestion } from "./codex-paginated-questionnaire-runtime.js";
 import { selectCodexUserExplicitSendWatchSource } from "./terminal-send-watch-policy.js";
 import { callbackRouteFingerprint } from "./callback-route-authority.js";
@@ -117,17 +118,39 @@ export function createTerminalWatchCliAdapter(dependencies) {
         });
     }
     async function prepareUserExplicitFallbackWatch(input) {
-        const callbackRoute = callbackRouteForUserExplicitFallback(input.options);
+        let callbackRoute = callbackRouteForUserExplicitFallback(input.options);
         if (!callbackRoute)
             return undefined;
         await bestEffortStabilizePriorFallbackWatch(input.options, input.terminal.conversationId, input.requestHash);
         const observed = await exactTerminalForWatch(input.terminal.conversationId, input.options, dependencies);
         const rawTerminal = observed.rawTerminal;
         assertSameUserExplicitFallbackTerminal(input.terminal, rawTerminal);
-        const agentVersion = requiredString(rawTerminal.agent_version, "running coding-agent version");
-        const anchor = input.terminal.agent === "codex"
-            ? await captureCodexFallbackWatchAnchor(input, rawTerminal, agentVersion, dependencies)
-            : captureClaudeFallbackWatchAnchor(input, rawTerminal, agentVersion, dependencies);
+        const warnings = [];
+        let anchor;
+        try {
+            const agentVersion = requiredString(rawTerminal.agent_version, "running coding-agent version");
+            anchor = input.terminal.agent === "codex"
+                ? await captureCodexFallbackWatchAnchor(input, rawTerminal, agentVersion, dependencies)
+                : captureClaudeFallbackWatchAnchor(input, rawTerminal, agentVersion, dependencies);
+        }
+        catch (error) {
+            // A failed/uncertain native-input transaction is not an observation
+            // failure. Never turn it into permission to dispatch the user's task.
+            if (unsafeFallbackWatchPreparation(error))
+                throw error;
+            const current = await exactTerminalForWatch(input.terminal.conversationId, input.options, dependencies);
+            assertSameUserExplicitFallbackTerminal(input.terminal, current.rawTerminal);
+            anchor = createAutomaticActivityWatchAnchor({
+                capturedAt: dependencies.now(), terminalId: input.terminal.conversationId,
+                pid: input.terminal.pid, requestHash: input.requestHash,
+                before: rawTerminal, current: current.rawTerminal,
+                previousWorkspace: terminalWorkspace(rawTerminal),
+                currentWorkspace: terminalWorkspace(current.rawTerminal),
+                control: terminalControlForWatch(current.rawTerminal)
+            });
+            callbackRoute = terminalWatchNotificationOnlyRoute(callbackRoute);
+            warnings.push(`exact_task_anchor_unavailable: ${safeDiagnostic(error)}`, "terminal_activity_fallback: observing post-Send terminal/process activity; stable idle is not exact task completion");
+        }
         return {
             watchId: terminalUserExplicitFallbackWatchId({
                 messageId: input.messageId,
@@ -144,6 +167,7 @@ export function createTerminalWatchCliAdapter(dependencies) {
             callbackRoute,
             openclawSession: callbackRoute.controller_session_id,
             openclawBin: stringValue(input.options.openclawBin) ?? "openclaw",
+            ...(warnings.length > 0 ? { warnings } : {}),
             timeoutMs: positiveMinutes(input.options.hardTimeoutMinutes ??
                 input.options.agentHardTimeoutMinutes, DEFAULT_TERMINAL_WATCH_HARD_TIMEOUT_MINUTES) * 60_000,
             anchor
@@ -159,15 +183,16 @@ export function createTerminalWatchCliAdapter(dependencies) {
         }
         catch {
             // Observation itself is best effort after the user's physical Send.
-            // Persist the exact pre-Send identity and let the durable provider
-            // artifact settle or invalidate the Watch.
+            // Persist the exact pre-Send identity: native evidence may recover a
+            // result; activity Watches must wait for a matching live observation.
         }
         if (observed?.state === "available") {
             assertPreparedFallbackTerminal(input.prepared, observed.rawTerminal);
         }
         // An absent or temporarily unavailable terminal after Enter is not a
-        // callback veto. The immutable pre-Send provider anchor and terminal
-        // identity remain sufficient to recover a completion already on disk.
+        // callback veto. Exact anchors may recover an on-disk completion;
+        // activity anchors preserve their process fence and can only report loss
+        // or resume observation, never infer completion from disappearance.
         const service = serviceFor(input.options);
         let watch;
         try {
@@ -176,6 +201,7 @@ export function createTerminalWatchCliAdapter(dependencies) {
                 agent: input.prepared.agent,
                 terminal: input.prepared.terminalIdentity,
                 anchor: input.prepared.anchor,
+                warnings: input.prepared.warnings,
                 callback_route: input.prepared.callbackRoute,
                 openclaw_session: input.prepared.openclawSession,
                 openclaw_bin: input.prepared.openclawBin,
@@ -185,20 +211,14 @@ export function createTerminalWatchCliAdapter(dependencies) {
         catch (error) {
             const existing = service.list().find((candidate) => candidate.watch_id === input.prepared.watchId);
             if (!existing ||
-                !(isUserExplicitFallbackWatch(existing) || isPaginatedSendWatch(existing)) ||
+                !isAutomaticSendWatch(existing) ||
                 existing.anchor.anchor_fingerprint !==
                     input.prepared.anchor.anchor_fingerprint) {
                 throw error;
             }
             watch = existing;
         }
-        return {
-            callback_expected: true,
-            callback_mode: "terminal_watch",
-            watch_id: watch.watch_id,
-            watch_mode: "exact_task",
-            confidence: "exact"
-        };
+        return automaticSendWatchReceipt(watch);
     }
     async function bestEffortStabilizePriorFallbackWatch(options, terminalId, requestHash) {
         try {
@@ -224,16 +244,10 @@ export function createTerminalWatchCliAdapter(dependencies) {
     function userExplicitFallbackWatchReceipt(input) {
         try {
             const watch = serviceFor(input.options).get(input.watchId);
-            if (!(isUserExplicitFallbackWatch(watch) || isPaginatedSendWatch(watch)) || !watch.callback_route) {
+            if (!isAutomaticSendWatch(watch) || !watch.callback_route) {
                 return undefined;
             }
-            return {
-                callback_expected: true,
-                callback_mode: "terminal_watch",
-                watch_id: watch.watch_id,
-                watch_mode: "exact_task",
-                confidence: "exact"
-            };
+            return automaticSendWatchReceipt(watch);
         }
         catch {
             return undefined;
@@ -257,7 +271,7 @@ export function createTerminalWatchCliAdapter(dependencies) {
         const warnings = [];
         let anchor;
         try {
-            anchor = agent === "codex" && isCodexPaginatedVersion(rawTerminal.agent_version)
+            anchor = agent === "codex" && isCodexPaginatedReadCandidate(rawTerminal.agent_version)
                 ? await capturePaginatedWatchAnchorWithLock(rawTerminal, options, dependencies)
                 : captureTerminalWatchAnchor(agent, rawTerminal, options, dependencies);
         }
@@ -697,6 +711,9 @@ function assertPreparedFallbackTerminal(prepared, observed) {
         !sameTerminalControlEvidenceIncarnation(prepared.terminalEndpoint, observed.terminal_control)) {
         throw new Error("terminal changed before the user-explicit fallback Watch was attached");
     }
+    if (isTerminalActivityWatch(prepared)) {
+        assertAutomaticActivityWatchIdentity(prepared.anchor, observed, terminalWorkspace(observed), prepared.terminalIdentity.workspace);
+    }
 }
 async function exactTerminalForWatch(terminalId, options, dependencies) {
     const observation = await dependencies.observeExactTerminal({
@@ -773,7 +790,9 @@ function sameManualWatchAnchorTarget(left, right) {
     }
     if (left.schema === "agent-knock-knock/terminal-activity-watch-anchor" &&
         right.schema === left.schema) {
-        return left.pid === right.pid &&
+        return left.origin === right.origin &&
+            left.request_hash === right.request_hash &&
+            left.pid === right.pid &&
             optionalIdentityCompatible(left.native_process_uuid, right.native_process_uuid) &&
             optionalIdentityCompatible(left.native_process_birth, right.native_process_birth);
     }
@@ -819,7 +838,7 @@ function terminalControlForWatch(terminal) {
 async function captureCodexFallbackWatchAnchor(input, rawTerminal, agentVersion, dependencies) {
     let inventory = rawTerminal._codex_open_root_rollout_inventory;
     let paginated;
-    if (isCodexPaginatedVersion(agentVersion)) {
+    if (isCodexPaginatedReadCandidate(agentVersion)) {
         try {
             paginated = await capturePaginatedWatchAnchor(rawTerminal, input.options, dependencies, input.requestText === undefined ? input.requestHash
                 : createHash("sha256").update(input.requestText.replace(/\r\n?/gu, "\n").trim()).digest("hex"));
@@ -936,8 +955,8 @@ async function observeTerminalWatch(watch, options, dependencies) {
                     ? terminalWatchResponseDecision({ ...watch, observation_checkpoint: checkpoint }, rawTerminal, surfaceId, fingerprint, options, dependencies)
                     : { executable: false, suppress: false }
             }),
-            questionnaire: (checkpoint, questions) => exactTerminal.state === "available"
-                ? terminalWatchQuestionnaireObservation({ watch, observedAt, options, dependencies,
+            questionnaire: (checkpoint, questions, allowResponses) => exactTerminal.state === "available"
+                ? terminalWatchQuestionnaireObservation({ watch: allowResponses ? watch : { ...watch, interaction_policy: "notify_only" }, observedAt, options, dependencies,
                     rawTerminal, projectedTerminal: exactTerminal.terminal, terminalMatches,
                     observationCheckpoint: checkpoint, codexAsyncQuestionEvidence: questions })
                 : undefined });