pi-agent-browser-native 0.3.0 → 0.6.5

package/dist/extensions/agent-browser/lib/results/presentation/batch.js

@@ -1,12 +1,15 @@
+import { isCloseCommand } from "../../command-taxonomy.js";
 import { isRecord } from "../../parsing.js";
-import { extractCommandTokens, parseCommandInfo, redactInvocationArgs, redactSensitiveText, redactSensitiveValue } from "../../runtime.js";
+import { getAgentBrowserSessionIdentityKey } from "../../argv-grammar.js";
+import { extractUpstreamCommandTokens, parseCommandInfo, redactInvocationArgs, redactSensitiveText, redactSensitiveValue } from "../../runtime.js";
 import { buildAgentBrowserNextActions } from "../action-recommendations.js";
-import { formatSessionArtifactRetentionSummary } from "../artifact-manifest.js";
+import { buildPendingWebMcpNextActions } from "../recovery-next-actions.js";
+import { formatSessionArtifactRetentionSummary, isPendingRecordingArtifact } from "../artifact-manifest.js";
 import { classifyAgentBrowserFailureCategory } from "../categories.js";
 import { detectConfirmationRequired } from "../confirmation.js";
 import { applyNetworkRouteRecords, buildNetworkRouteDiagnostics } from "../network-routes.js";
-import { applyNamespaceToNextActions, withOptionalSessionArgs } from "../next-actions.js";
-import { stringifyModelFacing } from "./common.js";
+import { appendUniqueAgentBrowserNextActions, applyNamespaceToNextActions, withOptionalSessionArgs } from "../next-actions.js";
+import { extractAgentBrowserLifecycle, stringifyModelFacing } from "./common.js";
 import { buildArtifactVerificationSummary, classifyPresentationSuccessCategory, manifestHasNewNoticeWorthyEntries } from "./artifacts.js";
 import { formatBatchStepCommand, getPresentationImages, getPresentationPaths, getPresentationText, isStringArray } from "./content.js";
 import { buildPageChangeSummary } from "./navigation.js";
@@ -62,7 +65,7 @@ function hasModelFacingArgRedaction(args) {
 function getStatefulCommandSensitiveValues(command) {
     if (!command)
         return [];
-    const tokens = extractCommandTokens(command);
+    const tokens = extractUpstreamCommandTokens(command);
     const values = [];
     if (tokens[0] === "cookies" && tokens[1] === "set" && tokens[3])
         values.push(tokens[3]);
@@ -92,6 +95,11 @@ function redactExactValues(value, sensitiveValues) {
         return value;
     return redactSensitiveValue(Object.fromEntries(Object.entries(value).map(([key, entryValue]) => [key, redactExactValues(entryValue, sensitiveValues)])));
 }
+export function redactBatchStepErrorData(command, value) {
+    return command?.[0] === "clipboard"
+        ? redactSensitiveValue(redactClipboardPermissionErrorValue({ command: "clipboard", subcommand: command[1] }, value, getClipboardWritePayloadCandidates(command)))
+        : redactExactValues(value, getStatefulCommandSensitiveValues(command));
+}
 function getTypedTextLength(command) {
     return command?.[0] === "keyboard" && command[1] === "type" && typeof command[2] === "string"
         ? Array.from(command[2]).length
@@ -181,14 +189,13 @@ function formatBatchStepsText(steps) {
     return lines.join("\n\n");
 }
 async function buildBatchStepPresentation(options) {
-    const { artifactManifest, artifactRequest, buildNestedToolPresentation, cwd, index, item, namespace, networkRoutes, persistentArtifactStore, sessionName } = options;
+    const { artifactManifest, artifactMaxUpdatedAtMs, artifactMinUpdatedAtMs, artifactRequest, buildNestedToolPresentation, cwd, index, item, namespace, networkRoutes, persistentArtifactStore, sessionName } = options;
     const command = isStringArray(item.command) ? item.command : undefined;
     const redactedCommand = command ? redactInvocationArgs(command) : undefined;
     const commandText = formatBatchStepCommand(hasModelFacingArgRedaction(redactedCommand) ? redactedCommand : command, index);
+    const lifecycle = extractAgentBrowserLifecycle(item.result);
     if (item.success === false) {
-        const redactedErrorData = command?.[0] === "clipboard"
-            ? redactSensitiveValue(redactClipboardPermissionErrorValue({ command: "clipboard", subcommand: command[1] }, item.error, getClipboardWritePayloadCandidates(command)))
-            : redactExactValues(item.error, getStatefulCommandSensitiveValues(command));
+        const redactedErrorData = redactBatchStepErrorData(command, item.error);
         const errorText = formatBatchStepError(redactedErrorData);
         const failureCategory = classifyAgentBrowserFailureCategory({
             args: command,
@@ -196,13 +203,15 @@ async function buildBatchStepPresentation(options) {
             errorText,
         });
         const confirmationRequired = detectConfirmationRequired(item.error);
-        const nextActions = applyNamespaceToNextActions(mergePresentationNextActions(buildAgentBrowserNextActions({
+        const nextActions = applyNamespaceToNextActions(mergePresentationNextActions(isWaitTextAssertionCommand(command) ? [buildWaitTextAssertionFailureNextAction(sessionName)] : undefined, buildAgentBrowserNextActions({
             args: command,
             command: command?.[0],
             confirmationId: confirmationRequired?.id,
             failureCategory,
             resultCategory: "failure",
-        }), isWaitTextAssertionCommand(command) ? [buildWaitTextAssertionFailureNextAction(sessionName)] : undefined), namespace);
+            sessionName,
+            subcommand: command?.[1],
+        })), namespace);
         const presentation = {
             content: [{ type: "text", text: errorText }],
             failureCategory,
@@ -219,6 +228,7 @@ async function buildBatchStepPresentation(options) {
                 data: redactedErrorData,
                 failureCategory,
                 index,
+                lifecycle,
                 nextActions,
                 resultCategory: "failure",
                 success: false,
@@ -235,12 +245,15 @@ async function buildBatchStepPresentation(options) {
         : undefined;
     const presentation = await buildNestedToolPresentation({
         artifactManifest,
+        artifactMaxUpdatedAtMs,
+        artifactMinUpdatedAtMs,
         artifactRequest,
         commandInfo: commandInfoWithTokens,
         cwd,
         args: command,
         envelope: { data: item.result, success: true },
         networkRouteDiagnostics,
+        namespace,
         persistentArtifactStore,
         sessionName,
     });
@@ -254,13 +267,20 @@ async function buildBatchStepPresentation(options) {
     });
     const text = getPresentationText(presentation) || presentation.summary;
     const stepSucceeded = presentation.resultCategory !== "failure";
-    const nextActions = applyNamespaceToNextActions(presentation.nextActions ?? buildAgentBrowserNextActions({
+    const pendingWebMcpMutation = stepSucceeded
+        && commandInfo.command === "webmcp"
+        && ["invoke", "result"].includes(commandInfo.subcommand ?? "")
+        && isRecord(presentation.data)
+        && presentation.data.status === "pending";
+    const nextActions = applyNamespaceToNextActions(pendingWebMcpMutation ? buildPendingWebMcpNextActions(sessionName) : presentation.nextActions ?? buildAgentBrowserNextActions({
         artifacts: presentation.artifacts,
         args: command,
         command: command?.[0],
         failureCategory: presentation.failureCategory,
         resultCategory: stepSucceeded ? "success" : "failure",
         savedFilePath: presentation.savedFilePath,
+        sessionName,
+        subcommand: command?.[1],
         successCategory: presentation.successCategory,
     }), namespace);
     const pageChangeSummary = buildPageChangeSummary({
@@ -284,6 +304,7 @@ async function buildBatchStepPresentation(options) {
             imagePath: imagePaths[0],
             imagePaths: imagePaths.length > 0 ? imagePaths : undefined,
             index,
+            lifecycle,
             networkRouteDiagnostics: presentation.networkRouteDiagnostics,
             nextActions,
             pageChangeSummary,
@@ -298,6 +319,42 @@ async function buildBatchStepPresentation(options) {
         presentation,
     };
 }
+function abandonedRecordingArtifact(artifact) {
+    const { recordingState: _recordingState, willExistOnStop: _willExistOnStop, ...terminal } = artifact;
+    return { ...terminal, exists: false, status: "missing", subcommand: "close-abandoned" };
+}
+function coalesceTerminalBatchRecordingArtifacts(steps, sessionName, namespace) {
+    const artifacts = [];
+    const pendingIndexesBySession = new Map();
+    const removedPendingIndexes = new Set();
+    for (const step of steps) {
+        for (const artifact of step.presentation.artifacts ?? []) {
+            const index = artifacts.push(artifact) - 1;
+            if (artifact.command !== "record" || artifact.kind !== "video")
+                continue;
+            const session = artifact.session ? getAgentBrowserSessionIdentityKey(artifact.session, artifact.namespace) : "";
+            if (isPendingRecordingArtifact(artifact)) {
+                const pendingIndexes = pendingIndexesBySession.get(session) ?? [];
+                pendingIndexes.push(index);
+                pendingIndexesBySession.set(session, pendingIndexes);
+                continue;
+            }
+            const pendingIndex = pendingIndexesBySession.get(session)?.pop();
+            if (pendingIndex !== undefined)
+                removedPendingIndexes.add(pendingIndex);
+        }
+        const command = step.details.command;
+        if (step.details.success !== true || !command || !isCloseCommand(extractUpstreamCommandTokens(command)[0]))
+            continue;
+        const session = sessionName ? getAgentBrowserSessionIdentityKey(sessionName, namespace) : "";
+        for (const pendingIndex of pendingIndexesBySession.get(session) ?? []) {
+            const pending = artifacts[pendingIndex];
+            if (pending && !removedPendingIndexes.has(pendingIndex))
+                artifacts[pendingIndex] = abandonedRecordingArtifact(pending);
+        }
+    }
+    return artifacts.filter((_, index) => !removedPendingIndexes.has(index));
+}
 export async function buildBatchPresentation(options) {
     const { artifactRequests, buildNestedToolPresentation, cwd, data, namespace, networkRoutes, persistentArtifactStore, sessionName, summary } = options;
     const steps = [];
@@ -307,6 +364,8 @@ export async function buildBatchPresentation(options) {
     for (const [index, item] of data.entries()) {
         const step = await buildBatchStepPresentation({
             artifactManifest: currentArtifactManifest,
+            artifactMaxUpdatedAtMs: options.artifactMaxUpdatedAtMs,
+            artifactMinUpdatedAtMs: options.artifactMinUpdatedAtMs,
             artifactRequest: artifactRequests?.[index],
             buildNestedToolPresentation,
             cwd,
@@ -319,7 +378,7 @@ export async function buildBatchPresentation(options) {
         });
         steps.push(step);
         currentArtifactManifest = step.presentation.artifactManifest ?? currentArtifactManifest;
-        currentNetworkRoutes = applyNetworkRouteRecords(currentNetworkRoutes, isStringArray(item.command) ? extractCommandTokens(item.command) : undefined, item.success !== false && step.details.success);
+        currentNetworkRoutes = applyNetworkRouteRecords(currentNetworkRoutes, isStringArray(item.command) ? extractUpstreamCommandTokens(item.command) : undefined, item.success !== false && step.details.success);
         protectedPersistentPaths.push(...getPresentationPaths({
             primaryPath: step.presentation.fullOutputPath,
             secondaryPaths: step.presentation.fullOutputPaths,
@@ -327,7 +386,7 @@ export async function buildBatchPresentation(options) {
     }
     const batchFailure = getBatchFailureDetails(steps);
     const images = steps.flatMap((step) => getPresentationImages(step.presentation));
-    const artifacts = steps.flatMap((step) => step.presentation.artifacts ?? []);
+    const artifacts = coalesceTerminalBatchRecordingArtifacts(steps, sessionName, namespace);
     const artifactVerification = buildArtifactVerificationSummary(artifacts);
     const fullOutputPaths = steps.flatMap((step) => getPresentationPaths({
         primaryPath: step.presentation.fullOutputPath,
@@ -340,6 +399,10 @@ export async function buildBatchPresentation(options) {
     const redactedBatchData = steps.map(({ details }) => (details.success
         ? { command: details.command, result: details.data, success: true }
         : { command: details.command, error: details.text, success: false }));
+    const unverifiedMutationCount = steps.filter((step) => step.details.pageChangeSummary?.changeType === "mutation" && step.details.pageChangeSummary.observed === false).length;
+    const mutationEvidenceText = unverifiedMutationCount > 0
+        ? `Mutation evidence: ${unverifiedMutationCount} action result${unverifiedMutationCount === 1 ? " proves" : "s prove"} dispatch only, not application state change. Use explicit later assertions or external receipts as postconditions; fixed waits are not postconditions.`
+        : undefined;
     const stepText = formatBatchStepsText(steps);
     const batchSummary = batchFailure === undefined
         ? summary
@@ -351,15 +414,17 @@ export async function buildBatchPresentation(options) {
             `First failing step: ${batchFailure.failedStep.index + 1} — ${batchFailure.failedStep.commandText}`,
             batchFailure.failureCount > 1 ? `${batchFailure.failureCount} steps failed. See the per-step results below.` : "See the per-step results below.",
         ].join("\n");
-    const text = failureHeader ? `${failureHeader}\n\n${stepText}` : stepText;
+    const text = [failureHeader, mutationEvidenceText, stepText].filter((line) => line !== undefined).join("\n\n");
     const artifactRetentionSummary = currentArtifactManifest ? formatSessionArtifactRetentionSummary(currentArtifactManifest) : undefined;
     const contentText = artifactRetentionSummary && manifestHasNewNoticeWorthyEntries(options.artifactManifest, currentArtifactManifest)
         ? `${text}\n\n${artifactRetentionSummary}`
         : text;
+    const artifactLifecycleActions = applyNamespaceToNextActions(buildAgentBrowserNextActions({ artifacts, command: "batch", resultCategory: batchFailure ? "failure" : "success", sessionName }), namespace);
     const nextActions = batchFailure
-        ? batchFailure.failedStep.nextActions
-        : buildAgentBrowserNextActions({ artifacts, command: "batch", resultCategory: "success" });
+        ? appendUniqueAgentBrowserNextActions([...(batchFailure.failedStep.nextActions ?? [])], artifactLifecycleActions)
+        : artifactLifecycleActions;
     const changedSteps = steps.map((step) => step.details).filter((details) => details.pageChangeSummary !== undefined);
+    const observedChangeCount = changedSteps.filter((details) => details.pageChangeSummary?.observed === true).length;
     const pageChangeSummary = artifacts.length > 0
         ? buildPageChangeSummary({
             artifacts,
@@ -373,7 +438,10 @@ export async function buildBatchPresentation(options) {
                 changeType: "mutation",
                 command: "batch",
                 nextActionIds: nextActions?.map((action) => action.id),
-                summary: `batch → mutation → ${changedSteps.length} changed step${changedSteps.length === 1 ? "" : "s"}`,
+                observed: observedChangeCount > 0,
+                summary: observedChangeCount > 0
+                    ? `batch → ${observedChangeCount} observed change${observedChangeCount === 1 ? "" : "s"}${unverifiedMutationCount > 0 ? `; ${unverifiedMutationCount} dispatched action${unverifiedMutationCount === 1 ? "" : "s"} unverified` : ""}`
+                    : `batch → ${unverifiedMutationCount} action${unverifiedMutationCount === 1 ? "" : "s"} dispatched → application change unverified`,
             }
             : undefined;
     return {

package/dist/extensions/agent-browser/lib/results/presentation/common.js

@@ -1,6 +1,7 @@
-import { containsManagedSessionRestoreKey } from "../../managed-session-capabilities.js";
+import { isRecord } from "../../parsing.js";
 import { redactSensitiveText, redactSensitiveValue } from "../../runtime.js";
 import { stringifyUnknown, truncateText } from "../text.js";
+const UNTITLED_PAGE_SUMMARY = "(untitled page)";
 export function stringifyModelFacing(value) {
     return stringifyUnknown(redactSensitiveValue(value));
 }
@@ -23,7 +24,7 @@ export function redactModelFacingText(text) {
     return redactSensitiveText(text);
 }
 export function redactModelFacingTextIfSensitive(text) {
-    return containsManagedSessionRestoreKey(text) || /(?:@|\b(?:access[_-]?key|api[_-]?key|auth|authorization|basic|bearer|connection[_-]?string|cookie|database[_-]?url|db[_-]?url|mongo(?:db)?[_-]?uri|pass(?:word)?|private[_-]?key|redis[_-]?url|secret|session[_-]?id|token)\b)/i.test(text)
+    return /(?:@|\b(?:access[_-]?key|api[_-]?key|auth|authorization|basic|bearer|connection[_-]?string|cookie|database[_-]?url|db[_-]?url|mongo(?:db)?[_-]?uri|pass(?:word)?|private[_-]?key|redis[_-]?url|secret|session[_-]?id|token)\b)/i.test(text)
         ? redactModelFacingText(text)
         : text;
 }
@@ -34,6 +35,41 @@ export function getStringField(data, key) {
     const value = data[key];
     return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
+// `lifecycle` is upstream launch/reuse bookkeeping, never page content, so it must not be the
+// answer an agent reads when a command has no dedicated presenter.
+export function extractAgentBrowserLifecycle(result) {
+    if (Array.isArray(result)) {
+        let latest;
+        for (const row of result) {
+            const nested = isRecord(row) ? row.result ?? row.data ?? row : row;
+            latest = extractAgentBrowserLifecycle(nested) ?? latest;
+        }
+        return latest;
+    }
+    if (!isRecord(result))
+        return undefined;
+    if (isRecord(result.lifecycle) && isRecord(result.lifecycle.effectiveLaunch)) {
+        const browserLaunched = result.lifecycle.effectiveLaunch.browserLaunched;
+        if (typeof browserLaunched === "boolean")
+            return { effectiveLaunch: { browserLaunched } };
+    }
+    return extractAgentBrowserLifecycle(result.result ?? result.data);
+}
+export function omitUpstreamLifecycle(data) {
+    const { lifecycle: _lifecycle, ...rest } = data;
+    return rest;
+}
+export function getPageSummary(data) {
+    const title = typeof data.title === "string" ? data.title : undefined;
+    const url = typeof data.url === "string" ? data.url : undefined;
+    if (title === undefined && url === undefined)
+        return undefined;
+    if (title && url)
+        return `${title}\n${url}`;
+    if (url)
+        return url;
+    return title || UNTITLED_PAGE_SUMMARY;
+}
 export function formatCount(count, singular, plural = `${singular}s`) {
     return `${count} ${count === 1 ? singular : plural}`;
 }

package/dist/extensions/agent-browser/lib/results/presentation/diagnostics.js

@@ -4,7 +4,6 @@ import { classifyNetworkRequestFailure, isApiLikeNetworkRequest, isNetworkArtifa
 import { withOptionalSessionArgs } from "../next-actions.js";
 import { stringifyUnknown, truncateText } from "../text.js";
 import { firstLine, formatCount, getArrayField, getStringField, parseJsonPreviewString, redactModelFacingText, redactModelFacingTextIfSensitive, stringifyModelFacing, } from "./common.js";
-import { filterCallerOwnedSessionListItems, filterCallerOwnedStateListItems, filterManagedSessionListRows, filterManagedStateListRows, } from "./managed-list-filter.js";
 const DIAGNOSTIC_REQUEST_PREVIEW_LIMIT = 40;
 const DIAGNOSTIC_LOG_PREVIEW_LIMIT = 80;
 const NETWORK_BODY_PREVIEW_MAX_CHARS = 280;
@@ -61,7 +60,9 @@ export function getTabSummary(data) {
                     ? String(tab.index)
                     : String(index);
         const labelText = label && label !== tabSelector ? ` label=${redactModelFacingText(label)}` : "";
-        return `${marker} [${tabSelector}]${labelText} ${title} — ${url}`;
+        const targetId = typeof tab.targetId === "string" && tab.targetId.trim().length > 0 ? tab.targetId.trim() : undefined;
+        const targetText = targetId && targetId !== tabSelector ? ` target=${redactModelFacingText(targetId)}` : "";
+        return `${marker} [${tabSelector}]${labelText}${targetText} ${title} — ${url}`;
     });
     return lines.join("\n");
 }
@@ -110,7 +111,7 @@ export function formatDiagnosticSummary(commandInfo, data) {
     if (commandInfo.command === "session") {
         const sessions = getArrayField(data, "sessions");
         if (sessions)
-            return `Sessions: ${filterCallerOwnedSessionListItems(sessions).length}`;
+            return `Sessions: ${sessions.length}`;
         const session = getStringField(data, "session");
         if (session)
             return `Session: ${session}`;
@@ -168,10 +169,8 @@ export function formatDiagnosticSummary(commandInfo, data) {
     }
     if (commandInfo.command === "state") {
         const states = getArrayField(data, "states") ?? getArrayField(data, "files");
-        if (states) {
-            const visibleStates = commandInfo.subcommand === "list" ? filterCallerOwnedStateListItems(states) : states;
-            return `States: ${visibleStates.length}`;
-        }
+        if (states)
+            return `States: ${states.length}`;
         if (commandInfo.subcommand === "load")
             return undefined;
         const stateName = getStringField(data, "name") ?? getStringField(data, "file") ?? getStringField(data, "filename") ?? getStringField(data, "path") ?? commandInfo.subcommand;
@@ -259,10 +258,9 @@ export function formatDiagnosticSummary(commandInfo, data) {
 function formatSessionText(data) {
     const sessions = getArrayField(data, "sessions");
     if (sessions) {
-        const visibleSessions = filterCallerOwnedSessionListItems(sessions);
-        if (visibleSessions.length === 0)
-            return sessions.length === 0 ? "No active sessions." : "No caller-owned active sessions.";
-        return visibleSessions
+        if (sessions.length === 0)
+            return "No active sessions.";
+        return sessions
             .map((item, index) => {
             if (!isRecord(item))
                 return `${index + 1}. ${stringifyModelFacing(item)}`;
@@ -348,6 +346,8 @@ function formatNetworkRequestLine(item, index) {
 }
 function formatNetworkRequestsText(data, commandInfo) {
     const requests = getArrayField(data, "requests");
+    if (isClearDiagnosticCommand(commandInfo) && data.cleared === true && !requests)
+        return "Network request buffer cleared.";
     if (!requests)
         return undefined;
     if (isClearDiagnosticCommand(commandInfo)) {
@@ -593,6 +593,8 @@ export function buildStreamNextActions(commandInfo, data, sessionName) {
 }
 function formatConsoleText(data, commandInfo) {
     const messages = getArrayField(data, "messages");
+    if (isClearDiagnosticCommand(commandInfo) && data.cleared === true && !messages)
+        return "Console buffer cleared.";
     if (!messages)
         return undefined;
     if (isClearDiagnosticCommand(commandInfo)) {
@@ -926,10 +928,9 @@ function formatStateText(data, subcommand) {
     }
     const states = getArrayField(data, "states") ?? getArrayField(data, "files");
     if (states) {
-        const visibleStates = filterCallerOwnedStateListItems(states);
-        if (visibleStates.length === 0)
-            return "No caller-owned saved states.";
-        return visibleStates
+        if (states.length === 0)
+            return "No saved states.";
+        return states
             .map((item, index) => {
             if (!isRecord(item))
                 return `${index + 1}. ${redactModelFacingTextIfSensitive(stringifyModelFacing(item))}`;
@@ -973,9 +974,9 @@ export function redactPresentationData(commandInfo, data) {
     if (commandInfo.command === "storage")
         return redactStorageData(data);
     if (commandInfo.command === "session" && commandInfo.subcommand === "list")
-        return redactStructuredPresentationValue(filterManagedSessionListRows(data));
+        return redactStructuredPresentationValue(data);
     if (commandInfo.command === "state" && commandInfo.subcommand === "list")
-        return redactStructuredPresentationValue(filterManagedStateListRows(data));
+        return redactStructuredPresentationValue(data);
     if (commandInfo.command === "state" && commandInfo.subcommand === "show")
         return redactStatefulValues(data, new Set(["value"]));
     return redactStructuredPresentationValue(data);

package/dist/extensions/agent-browser/lib/results/presentation/errors.js

@@ -189,11 +189,12 @@ export function buildErrorPresentation(options) {
     const nextActions = [
         ...(buildUnknownCommandSuggestionActions(unknownCommandSuggestions, sessionName) ?? []),
         ...(browserProfileConfigRecovery?.actions ?? []),
-        ...(buildAgentBrowserNextActions({
+        ...(browserProfileConfigRecovery ? [] : buildAgentBrowserNextActions({
             args,
             command: commandInfo.command,
             failureCategory: categoryDetails.failureCategory,
             resultCategory: "failure",
+            sessionName,
         }) ?? []),
     ];
     return {

package/dist/extensions/agent-browser/lib/results/presentation/navigation.js

@@ -1,16 +1,31 @@
-import { isNavigationObservableCommandName, isPageChangeSummaryCommand } from "../../command-taxonomy.js";
+import { isNavigationObservableCommandName, isOpenNavigationCommand, isPageChangeSummaryCommand } from "../../command-taxonomy.js";
 import { isRecord } from "../../parsing.js";
 import { detectConfirmationRequired } from "../confirmation.js";
-import { redactModelFacingText, stringifyModelFacing } from "./common.js";
+import { omitUpstreamLifecycle, redactModelFacingText, stringifyModelFacing } from "./common.js";
 const NAVIGATION_SUMMARY_FIELD = "navigationSummary";
-function getScalarExtractionResult(data) {
-    const { result } = data;
-    if (typeof result === "string") {
-        return result.trim().length > 0 ? result : undefined;
-    }
-    if (typeof result === "number" || typeof result === "boolean") {
+const GET_RESULT_FIELDS = {
+    attr: "value",
+    count: "count",
+    html: "html",
+    text: "text",
+    title: "title",
+    url: "url",
+    value: "value",
+};
+function getScalarExtractionResult(commandInfo, data) {
+    const fallbackField = commandInfo.command === "get" && commandInfo.subcommand ? GET_RESULT_FIELDS[commandInfo.subcommand] ?? "" : "";
+    const resultField = Object.hasOwn(data, "result") ? "result" : fallbackField.length > 0 && Object.hasOwn(data, fallbackField) ? fallbackField : undefined;
+    if (resultField === undefined)
+        return undefined;
+    const result = data[resultField];
+    if (typeof result === "string")
+        return result.trim().length > 0 ? result : "(empty string)";
+    if (typeof result === "number" || typeof result === "boolean")
         return String(result);
-    }
+    if (result === null || result === undefined)
+        return "null";
+    if (typeof result === "object")
+        return JSON.stringify(result);
     return undefined;
 }
 function getExtractionOrigin(data) {
@@ -32,7 +47,7 @@ function formatGetSummaryLabel(subcommand) {
     return `${subcommand.slice(0, 1).toUpperCase()}${subcommand.slice(1)}`;
 }
 export function formatExtractionSummary(commandInfo, data) {
-    const scalarResult = getScalarExtractionResult(data);
+    const scalarResult = getScalarExtractionResult(commandInfo, data);
     if (!scalarResult) {
         return undefined;
     }
@@ -50,7 +65,7 @@ export function formatExtractionText(commandInfo, data) {
     if (commandInfo.command !== "get" && commandInfo.command !== "eval") {
         return undefined;
     }
-    const scalarResult = getScalarExtractionResult(data);
+    const scalarResult = getScalarExtractionResult(commandInfo, data);
     if (!scalarResult) {
         return undefined;
     }
@@ -59,8 +74,8 @@ export function formatExtractionText(commandInfo, data) {
     const safeOrigin = origin ? redactModelFacingText(origin) : undefined;
     return safeOrigin && safeOrigin !== safeScalarResult ? `${safeScalarResult}\n\nOrigin: ${safeOrigin}` : safeScalarResult;
 }
-export function isNavigationObservableCommand(command) {
-    return isNavigationObservableCommandName(command);
+export function isNavigationObservableCommand(command, subcommand) {
+    return isNavigationObservableCommandName(command, subcommand);
 }
 function isNavigationSummary(value) {
     return isRecord(value) && (typeof value.title === "string" || typeof value.url === "string");
@@ -80,7 +95,7 @@ function getTopLevelNavigationSummary(data) {
 function getNormalizedNavigationSummary(summary) {
     const title = typeof summary?.title === "string" && summary.title.trim().length > 0 ? summary.title.trim() : undefined;
     const url = typeof summary?.url === "string" && summary.url.trim().length > 0 ? summary.url.trim() : undefined;
-    return title || url ? { title, url } : undefined;
+    return title || url ? { title, url, ...(typeof summary?.urlChanged === "boolean" ? { urlChanged: summary.urlChanged } : {}) } : undefined;
 }
 export function formatNavigationSummary(summary) {
     const normalized = getNormalizedNavigationSummary(summary);
@@ -94,20 +109,22 @@ export function buildPageChangeSummary(options) {
     const { artifacts, commandInfo, data, nextActions, savedFilePath } = options;
     const artifactCount = artifacts?.length ?? 0;
     const navigation = isRecord(data)
-        ? getNormalizedNavigationSummary(getNavigationSummary(data) ?? (isPageChangeSummaryCommand(commandInfo.command) ? getTopLevelNavigationSummary(data) : undefined))
+        ? getNormalizedNavigationSummary(getNavigationSummary(data) ?? (isPageChangeSummaryCommand(commandInfo.command, commandInfo.subcommand) ? getTopLevelNavigationSummary(data) : undefined))
         : undefined;
     const confirmationRequired = detectConfirmationRequired(data) !== undefined;
-    if (!navigation && !confirmationRequired && artifactCount === 0 && !savedFilePath && !isPageChangeSummaryCommand(commandInfo.command)) {
+    if (!navigation && !confirmationRequired && artifactCount === 0 && !savedFilePath && !isPageChangeSummaryCommand(commandInfo.command, commandInfo.subcommand)) {
         return undefined;
     }
+    const navigationObserved = navigation && (navigation.urlChanged === true || isOpenNavigationCommand(commandInfo.command) || ["back", "forward", "pushstate", "reload"].includes(commandInfo.command ?? ""));
     const changeType = savedFilePath || artifactCount > 0
         ? "artifact"
-        : navigation
+        : navigationObserved
             ? "navigation"
             : confirmationRequired
                 ? "confirmation"
                 : "mutation";
-    const parts = [commandInfo.command ?? "agent-browser", changeType];
+    const observed = changeType !== "mutation";
+    const parts = [commandInfo.command ?? "agent-browser", observed ? changeType : "action dispatched"];
     if (navigation?.title)
         parts.push(navigation.title);
     if (navigation?.url)
@@ -121,8 +138,9 @@ export function buildPageChangeSummary(options) {
         changeType,
         ...(commandInfo.command ? { command: commandInfo.command } : {}),
         ...(nextActions ? { nextActionIds: nextActions.map((action) => action.id) } : {}),
+        observed,
         ...(savedFilePath ? { savedFilePath } : {}),
-        summary: parts.join(" → "),
+        summary: `${parts.join(" → ")}${observed ? "" : " → application change unverified"}`,
         ...(navigation?.title ? { title: navigation.title } : {}),
         ...(navigation?.url ? { url: navigation.url } : {}),
     };
@@ -132,7 +150,7 @@ function stripNavigationSummary(data) {
     return rest;
 }
 export function formatNavigationActionResult(data) {
-    const actionData = stripNavigationSummary(data);
+    const actionData = omitUpstreamLifecycle(stripNavigationSummary(data));
     const lines = [];
     if (typeof actionData.clicked === "string" || typeof actionData.clicked === "boolean") {
         lines.push(`Clicked: ${String(actionData.clicked)}`);