pi-agent-browser-native 0.9.2 → 0.9.3

package/dist/extensions/agent-browser/lib/orchestration/browser-run/managed-session-daemon-policy.js

@@ -9,6 +9,7 @@ import { readProcessStartIdentity } from "../../process-identity.js";
 import { getAgentBrowserProcessEnvironment, withAgentBrowserProcessEnvironment } from "../../process-environment.js";
 import { runAgentBrowserProcess, withAttachedBrowserSessionContext } from "../../process.js";
 import { getAgentBrowserErrorText, parseAgentBrowserEnvelope } from "../../results/envelope.js";
+import { detectConfirmationRequired } from "../../results/confirmation.js";
 import { redactInvocationArgs } from "../../runtime.js";
 import { runSessionCommandData } from "./session-state.js";
 const MANAGED_SESSION_DAEMON_INSPECTION_TIMEOUT_MS = 35_000;
@@ -158,7 +159,7 @@ export async function acquireOwnedManagedSessionDaemonPolicy(options) {
     }
 }
 export async function closeManagedSession(options) {
-    return withAgentBrowserProcessEnvironment(options.socketDir ? { PI_AGENT_BROWSER_SOCKET_DIR: options.socketDir } : {}, async () => {
+    return withAgentBrowserProcessEnvironment({ AGENT_BROWSER_CONFIRM_ACTIONS: options.confirmActions, ...(options.socketDir ? { PI_AGENT_BROWSER_SOCKET_DIR: options.socketDir } : {}) }, async () => {
         const controller = new AbortController();
         let phase = "policy coordination";
         let phaseStartedAt = Date.now();
@@ -209,28 +210,33 @@ export async function closeManagedSession(options) {
             });
             clearTimeout(timer);
             stdoutSpillPath = processResult.stdoutSpillPath;
+            const parsed = await parseAgentBrowserEnvelope({ stdout: processResult.stdout, stdoutPath: processResult.stdoutSpillPath });
             if (!processResult.aborted && !processResult.spawnError && processResult.exitCode === 0) {
-                const parsed = await parseAgentBrowserEnvelope({ stdout: processResult.stdout, stdoutPath: processResult.stdoutSpillPath });
-                const data = parsed.envelope?.success === true && isRecord(parsed.envelope.data) ? parsed.envelope.data : undefined;
-                options.restoreState.clear(options.sessionName, options.namespace);
-                pruneOwnedManagedSessionRestoreSnapshots({
-                    cwd: options.cwd,
-                    namespace: options.namespace,
-                    restoreKey: ownedRestoreKey,
-                    statePath: typeof data?.statePath === "string" ? data.statePath : undefined,
-                });
+                const data = parsed.envelope?.success === true && isRecord(parsed.envelope.data) && parsed.envelope.data.closed === true ? parsed.envelope.data : undefined;
+                if (data) {
+                    options.restoreState.clear(options.sessionName, options.namespace);
+                    pruneOwnedManagedSessionRestoreSnapshots({
+                        cwd: options.cwd,
+                        namespace: options.namespace,
+                        restoreKey: ownedRestoreKey,
+                        statePath: typeof data.statePath === "string" ? data.statePath : undefined,
+                    });
+                }
             }
-            return timeoutError ?? getAgentBrowserErrorText({
+            const pending = detectConfirmationRequired(parsed.envelope?.data);
+            return timeoutError ?? (pending ? `Native close requires confirmation (${pending.id}); the session remains wrapper-owned.` : getAgentBrowserErrorText({
                 aborted: processResult.aborted,
                 command: "close",
                 effectiveArgs: redactInvocationArgs(closeArgs),
+                envelope: parsed.envelope,
                 exitCode: processResult.exitCode,
+                parseError: parsed.parseError,
                 plainTextInspection: false,
                 spawnError: processResult.spawnError,
                 stderr: processResult.stderr,
                 timedOut: processResult.timedOut,
                 timeoutMs: processResult.timeoutMs,
-            });
+            }));
         }
         catch (error) {
             return timeoutError ?? (error instanceof Error ? error.message : String(error));

package/dist/extensions/agent-browser/lib/orchestration/browser-run/prepare.js

@@ -15,6 +15,7 @@ import { tryContainerScroll, tryPageScrollTo } from "./prepare/scroll-shims.js";
 import { trySnapshotFilter } from "./prepare/snapshot-filter.js";
 import { commandTimeoutNeedsActivePageUrl, getCommandAwareProcessTimeoutMs } from "./prepare/wait-timeouts.js";
 import { getPersistentSessionArtifactStore } from "./session-state.js";
+import { isBrowserIndependentConfirmation, suppressConfirmationPageHelpers } from "../../read-confirmation.js";
 import { buildAgentBrowserResultCategoryDetails } from "../../results/categories.js";
 import { applyNamespaceToNextActions } from "../../results/next-actions.js";
 import { buildSessionAwareStaleRefNextActions, buildSessionTabRecoveryNextActions } from "../../results/recovery-next-actions.js";
@@ -145,7 +146,7 @@ async function prepareBatchScreenshotPaths(args, stdin, cwd) {
     return changed
         ? {
             args,
-            batchScreenshotPathRequests,
+            batchScreenshotPathRequests: parsed.steps.flatMap((step, index) => Array.isArray(step) && step.length === 0 ? [] : [batchScreenshotPathRequests[index]]),
             stdin: JSON.stringify(preparedSteps),
         }
         : undefined;
@@ -325,19 +326,12 @@ function canResolveSemanticVisibleRef(compiled) {
 function requiresResolvedSemanticVisibleRef(compiled) {
     return compiled?.action === "select" && compiled.locator !== undefined;
 }
-function resolveSemanticActionVisibleRefArgsFromSnapshot(compiled, snapshotData) {
-    if (!canResolveSemanticVisibleRef(compiled))
-        return undefined;
-    const resolution = resolveVisibleRefActionFromSnapshot({ allowFill: true, compiledAction: compiled, snapshotData });
-    if (!resolution)
-        return undefined;
-    return { args: [...getCompiledSemanticActionSessionPrefix(compiled), ...resolution.args], snapshot: resolution.snapshot };
-}
 async function resolveSemanticActionVisibleRefArgs(options) {
-    if (!options.compiled || !options.sessionName)
+    if (!canResolveSemanticVisibleRef(options.compiled) || !options.sessionName)
         return undefined;
-    const snapshotData = await runSessionCommandData({ args: ["snapshot", "-i"], cwd: options.cwd, namespace: options.namespace, sessionName: options.sessionName, signal: options.signal });
-    return resolveSemanticActionVisibleRefArgsFromSnapshot(options.compiled, snapshotData);
+    const snapshotData = options.refSnapshot ? undefined : await runSessionCommandData({ args: ["snapshot", "-i"], cwd: options.cwd, namespace: options.namespace, sessionName: options.sessionName, signal: options.signal });
+    const resolution = resolveVisibleRefActionFromSnapshot({ allowFill: true, compiledAction: options.compiled, refSnapshot: options.refSnapshot, snapshotData });
+    return resolution ? { args: [...getCompiledSemanticActionSessionPrefix(options.compiled), ...resolution.args], snapshot: resolution.snapshot } : undefined;
 }
 export async function prepareBrowserRun(options) {
     const { cwd, onUpdate, params, signal, state } = options;
@@ -423,9 +417,10 @@ export async function prepareBrowserRun(options) {
                     isError: true,
                 } };
         }
-        const userRequestedJson = runtimeToolArgs.includes("--json");
-        const routedReadConfirmation = state.sessionPageState.findReadConfirmation(preparedArgs.args, resolveAgentBrowserNamespace(preparedArgs.args, agentBrowserProcessEnv.AGENT_BROWSER_NAMESPACE));
-        const readConfirmation = routedReadConfirmation?.capabilities?.readRequiresConfirmation === true ? routedReadConfirmation : undefined;
+        const userRequestedJson = getBooleanFlagValue(runtimeToolArgs, "--json") === true;
+        const routedReadConfirmation = state.sessionPageState.findReadConfirmation(preparedArgs.args, resolveAgentBrowserNamespace(preparedArgs.args, agentBrowserProcessEnv.AGENT_BROWSER_NAMESPACE), runtimeToolStdin);
+        const readConfirmation = suppressConfirmationPageHelpers(routedReadConfirmation) ? routedReadConfirmation : undefined;
+        const browserIndependentConfirmation = isBrowserIndependentConfirmation(readConfirmation);
         let executionPlan = buildExecutionPlan(preparedArgs.args, {
             freshSessionName,
             managedSessionActive: state.managedSessionActive,
@@ -434,13 +429,14 @@ export async function prepareBrowserRun(options) {
             managedSessionNamespace: state.managedSessionNamespace,
             sessionMode,
             stdin: runtimeToolStdin,
-            browserIndependentReadConfirmation: readConfirmation !== undefined,
+            browserIndependentReadConfirmation: browserIndependentConfirmation,
         });
-        const browserIndependent = readConfirmation !== undefined || isBrowserIndependentRead(extractUpstreamCommandTokens(preparedArgs.args), runtimeToolStdin)
+        const browserIndependent = browserIndependentConfirmation || isBrowserIndependentRead(extractUpstreamCommandTokens(preparedArgs.args), runtimeToolStdin)
             || (executionPlan.commandInfo.command === "session" && executionPlan.commandInfo.subcommand === "info");
         const ownedSessionKey = getSessionContextKey(executionPlan.sessionName, executionPlan.namespace);
         const plannedSessionPageState = sessionPageState.get(ownedSessionKey);
-        const pageTargetError = readConfirmation ? undefined : getPageTargetValidationError({
+        const pageTargetError = readConfirmation && executionPlan.commandInfo.command !== "batch" ? undefined : getPageTargetValidationError({
+            allowFirstBatchConfirmation: readConfirmation !== undefined,
             args: executionPlan.effectiveArgs,
             currentPageUrl: plannedSessionPageState.tabTarget?.url,
             pageUrlUnknown: plannedSessionPageState.tabTargetUnknown === true,
@@ -571,6 +567,15 @@ export async function prepareBrowserRun(options) {
             const sessionTabPinningReason = priorSessionPageState.pinningReason;
             let priorRefSnapshotState = priorSessionPageState.refSnapshot;
             let priorRefSnapshotInvalidation = priorSessionPageState.refSnapshotInvalidation;
+            const confirmedCapture = sessionStateKey ? sessionPageState.getReadConfirmation(sessionStateKey) : undefined;
+            // ponytail: reuse the approved capture for one call; DOM-only renames after that sample are not resampled on this use.
+            const reuseConfirmedCapture = confirmedCapture?.refSnapshotFresh === true;
+            if (reuseConfirmedCapture && confirmedCapture) {
+                const consumed = { ...confirmedCapture };
+                delete consumed.refSnapshotFresh;
+                sessionPageState.applyReadConfirmation(consumed, options.sessionPageStateUpdate);
+                state.observedBrowserEffects = { ...state.observedBrowserEffects, readConfirmation: consumed };
+            }
             let nativeGenerationChanged = false;
             if (!browserIndependent && !isCloseCommand(executionPlan.commandInfo.command) && priorRefSnapshotState?.refIds.length && sessionStateKey && executionPlan.sessionName) {
                 const daemon = await inspectManagedSessionDaemon({ cwd, namespace: executionPlan.namespace, sessionName: executionPlan.sessionName, signal, includeGeneration: true, headedManagedAutosaveInterval: ownedManagedSession?.headedManagedAutosaveInterval ?? (ownedManagedSession?.headedManagedAutosaveDisabled ? "0" : undefined), timeoutMs: params.timeoutMs });
@@ -651,7 +656,7 @@ export async function prepareBrowserRun(options) {
             const isCallerOwnedExplicitSession = () => executionPlan.sessionName !== undefined
                 && executionPlan.usedImplicitSession === false
                 && ownedManagedSession === undefined;
-            const requiresLivePageVerification = () => !readConfirmation && (isCallerOwnedExplicitSession() || options.preserveAttachedBrowserSession === true);
+            const requiresLivePageVerification = () => !readConfirmation && (reuseConfirmedCapture || isCallerOwnedExplicitSession() || options.preserveAttachedBrowserSession === true);
             const verifyLivePage = async (request) => {
                 if (!request.requirement || !executionPlan.sessionName)
                     return;
@@ -690,7 +695,9 @@ export async function prepareBrowserRun(options) {
                     return;
                 }
                 livePageVerified = true;
-                priorSessionTabTarget ??= { url: liveUrl };
+                priorSessionTabTarget = priorSessionTabTarget?.url === liveUrl
+                    ? { ...priorSessionTabTarget, url: liveUrl }
+                    : { url: liveUrl };
                 priorSessionTabTargetUnknown = undefined;
             };
             const hasPotentialLiveSemanticSession = state.managedSessionActive || priorSessionTabTarget !== undefined || isCallerOwnedExplicitSession() || options.preserveAttachedBrowserSession === true;
@@ -706,6 +713,7 @@ export async function prepareBrowserRun(options) {
                     compiled: compiledSemanticAction,
                     cwd,
                     namespace: executionPlan.namespace,
+                    refSnapshot: reuseConfirmedCapture && !priorSessionTabTargetUnknown && !priorRefSnapshotInvalidation ? priorRefSnapshotState : undefined,
                     sessionName: executionPlan.sessionName,
                     signal,
                 });
@@ -872,6 +880,7 @@ export async function prepareBrowserRun(options) {
             const staleRefPreflight = buildStaleRefPreflight({
                 commandTokens,
                 currentTarget: priorSessionTabTarget,
+                requireExactTargetUrl: reuseConfirmedCapture,
                 refSnapshot: resolvedSemanticActionRefSnapshot ?? priorRefSnapshotState,
                 refSnapshotInvalidation: resolvedSemanticActionRefSnapshot ? undefined : priorRefSnapshotInvalidation,
                 stdin: runtimeToolStdin,
@@ -899,7 +908,7 @@ export async function prepareBrowserRun(options) {
                 commandTokens,
                 cwd,
                 currentTarget: priorSessionTabTarget,
-                previousSnapshot: resolvedSemanticActionRefSnapshot ? undefined : priorRefSnapshotState,
+                previousSnapshot: resolvedSemanticActionRefSnapshot || reuseConfirmedCapture ? undefined : priorRefSnapshotState,
                 stdin: runtimeToolStdin,
                 namespace: executionPlan.namespace,
                 sessionName: executionPlan.sessionName,
@@ -1032,9 +1041,6 @@ export async function prepareBrowserRun(options) {
             }
             const processArgs = executionPlan.effectiveArgs;
             const processStdin = preparedArgs.stdin ?? runtimeToolStdin;
-            const clickDispatchProbe = compiledElectron === undefined
-                ? await prepareClickDispatchProbe({ commandTokens, cwd, namespace: executionPlan.namespace, refSnapshot: promptRefSnapshot, sessionName: executionPlan.sessionName, signal })
-                : undefined;
             let readTimeoutPageUrl = priorSessionTabTarget?.url;
             if (options.params.timeoutMs === undefined && readTimeoutPageUrl === undefined && executionPlan.sessionName && commandTimeoutNeedsActivePageUrl(commandTokens, processStdin)) {
                 try {
@@ -1044,6 +1050,9 @@ export async function prepareBrowserRun(options) {
                 catch { }
             }
             const processTimeoutMs = options.params.timeoutMs ?? getDialogAwareProcessTimeoutMs(commandTokens, promptRefSnapshot, processStdin) ?? getCommandAwareProcessTimeoutMs(commandTokens, processStdin, readTimeoutPageUrl);
+            const clickDispatchProbe = compiledElectron === undefined
+                ? await prepareClickDispatchProbe({ commandTokens, cwd, namespace: executionPlan.namespace, refSnapshot: promptRefSnapshot, sessionName: executionPlan.sessionName, signal, timeoutMs: processTimeoutMs })
+                : undefined;
             const redactedProcessArgs = redactInvocationArgs(prepareAgentBrowserSpawnArgs(processArgs, ownedManagedSession?.compatibilityUserAgent, options.preserveAttachedBrowserSession, chromeStartupArgs));
             const scrollAmount = Number(commandTokens.find((token) => /^\d+(?:\.\d+)?$/.test(token)));
             const shouldProbeScrollNoop = executionPlan.commandInfo.command === "scroll" && executionPlan.startupScopedFlags.length === 0 && (state.managedSessionActive || sessionMode === "fresh") && (!Number.isFinite(scrollAmount) || scrollAmount >= 500);