@browserbasehq/convex-stagehand 0.0.3 → 0.1.1

package/dist/component/lib.js

@@ -4,22 +4,199 @@
  * AI-powered browser automation actions using the Stagehand REST API.
  * Supports both automatic session management and manual session control.
  */
-import { action } from "./_generated/server.js";
+import { action, internalMutation, internalQuery } from "./_generated/server.js";
+import { internal } from "./_generated/api.js";
 import { v } from "convex/values";
 import * as api from "./api.js";
+const DEFAULT_BROWSERBASE_REGION = "us-west-2";
+const browserbaseRegionValidator = v.union(v.literal("us-west-2"), v.literal("us-east-1"), v.literal("eu-central-1"), v.literal("ap-southeast-1"));
+const sessionStatusValidator = v.union(v.literal("active"), v.literal("completed"), v.literal("error"));
+const sessionOperationValidator = v.union(v.literal("extract"), v.literal("act"), v.literal("observe"), v.literal("workflow"));
 const observedActionValidator = v.object({
     description: v.string(),
     selector: v.string(),
-    method: v.string(),
+    method: v.optional(v.string()),
     arguments: v.optional(v.array(v.string())),
+    backendNodeId: v.optional(v.number()),
 });
 const waitUntilValidator = v.union(v.literal("load"), v.literal("domcontentloaded"), v.literal("networkidle"));
+/** Session-level config forwarded from the client's StagehandConfig for ephemeral sessions. */
+const sessionConfigValidator = v.optional(v.object({
+    domSettleTimeoutMs: v.optional(v.number()),
+    selfHeal: v.optional(v.boolean()),
+    systemPrompt: v.optional(v.string()),
+    verbose: v.optional(v.number()),
+    experimental: v.optional(v.boolean()),
+}));
+const modelValidator = v.optional(v.union(v.string(), v.object({
+    modelName: v.optional(v.string()),
+    apiKey: v.optional(v.string()),
+    baseURL: v.optional(v.string()),
+    provider: v.optional(v.string()),
+})));
+const variablesValidator = v.optional(v.record(v.string(), v.string()));
 const agentActionValidator = v.object({
     type: v.string(),
     action: v.optional(v.string()),
     reasoning: v.optional(v.string()),
     timeMs: v.optional(v.number()),
+    taskCompleted: v.optional(v.boolean()),
+    pageText: v.optional(v.string()),
+    pageUrl: v.optional(v.string()),
+    instruction: v.optional(v.string()),
 });
+function isBrowserbaseRegion(value) {
+    return (value === "us-west-2" ||
+        value === "us-east-1" ||
+        value === "eu-central-1" ||
+        value === "ap-southeast-1");
+}
+function getRequestedRegion(browserbaseSessionCreateParams) {
+    const maybeRegion = browserbaseSessionCreateParams?.region;
+    if (isBrowserbaseRegion(maybeRegion)) {
+        return maybeRegion;
+    }
+    return undefined;
+}
+function extractRegionFromError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const match = message.match(/Session is in region '([^']+)'/i);
+    const parsedRegion = match?.[1];
+    if (isBrowserbaseRegion(parsedRegion)) {
+        return parsedRegion;
+    }
+    return undefined;
+}
+export const upsertSessionMetadata = internalMutation({
+    args: {
+        sessionId: v.string(),
+        region: v.optional(browserbaseRegionValidator),
+        status: v.optional(sessionStatusValidator),
+        operation: v.optional(sessionOperationValidator),
+        url: v.optional(v.string()),
+        endedAt: v.optional(v.number()),
+        error: v.optional(v.string()),
+    },
+    returns: v.null(),
+    handler: async (ctx, args) => {
+        const existing = await ctx.db
+            .query("sessions")
+            .withIndex("by_sessionId", (q) => q.eq("sessionId", args.sessionId))
+            .first();
+        if (existing) {
+            const patch = {};
+            if (args.region !== undefined)
+                patch.region = args.region;
+            if (args.status !== undefined)
+                patch.status = args.status;
+            if (args.operation !== undefined)
+                patch.operation = args.operation;
+            if (args.url !== undefined)
+                patch.url = args.url;
+            if (args.endedAt !== undefined)
+                patch.endedAt = args.endedAt;
+            if (args.error !== undefined)
+                patch.error = args.error;
+            await ctx.db.patch(existing._id, patch);
+            return null;
+        }
+        await ctx.db.insert("sessions", {
+            sessionId: args.sessionId,
+            region: args.region,
+            startedAt: Date.now(),
+            endedAt: args.endedAt,
+            status: args.status ?? "active",
+            operation: args.operation ?? "workflow",
+            url: args.url ?? "",
+            error: args.error,
+        });
+        return null;
+    },
+});
+export const getSessionRegion = internalQuery({
+    args: {
+        sessionId: v.string(),
+    },
+    returns: v.union(browserbaseRegionValidator, v.null()),
+    handler: async (ctx, args) => {
+        const session = await ctx.db
+            .query("sessions")
+            .withIndex("by_sessionId", (q) => q.eq("sessionId", args.sessionId))
+            .first();
+        return session?.region ?? null;
+    },
+});
+async function resolveSessionRegion(ctx, sessionId, fallback) {
+    const storedRegion = await ctx.runQuery(internal.lib.getSessionRegion, {
+        sessionId,
+    });
+    return storedRegion ?? fallback ?? undefined;
+}
+async function persistSessionMetadata(ctx, args) {
+    await ctx.runMutation(internal.lib.upsertSessionMetadata, args);
+}
+async function runWithRegionRetry(ctx, args) {
+    try {
+        return await args.run(args.initialRegion);
+    }
+    catch (error) {
+        const parsedRegion = extractRegionFromError(error);
+        if (!parsedRegion || parsedRegion === args.initialRegion) {
+            throw error;
+        }
+        await persistSessionMetadata(ctx, {
+            sessionId: args.sessionId,
+            region: parsedRegion,
+            status: "active",
+        });
+        if (args.onRegionResolved) {
+            await args.onRegionResolved(parsedRegion);
+        }
+        return args.run(parsedRegion);
+    }
+}
+async function endSessionWithRouting(ctx, args) {
+    try {
+        let resolvedRegion = (await resolveSessionRegion(ctx, args.sessionId, args.fallbackRegion)) ??
+            DEFAULT_BROWSERBASE_REGION;
+        try {
+            await runWithRegionRetry(ctx, {
+                sessionId: args.sessionId,
+                initialRegion: resolvedRegion,
+                onRegionResolved: async (region) => {
+                    resolvedRegion = region;
+                },
+                run: async (region) => {
+                    await api.endSession(args.sessionId, args.config, region);
+                },
+            });
+            await persistSessionMetadata(ctx, {
+                sessionId: args.sessionId,
+                region: resolvedRegion,
+                status: "completed",
+                endedAt: Date.now(),
+            });
+            return true;
+        }
+        catch {
+            try {
+                await persistSessionMetadata(ctx, {
+                    sessionId: args.sessionId,
+                    region: resolvedRegion,
+                    status: "error",
+                    error: "Failed to end Stagehand session",
+                });
+            }
+            catch {
+                // Best-effort metadata persistence — don't mask the original failure.
+            }
+            return false;
+        }
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Start a new browser session.
  * Returns session info including cdpUrl for direct Playwright/Puppeteer connection.
@@ -31,22 +208,26 @@ export const startSession = action({
         modelApiKey: v.string(),
         modelName: v.optional(v.string()),
         url: v.string(),
-        browserbaseSessionId: v.optional(v.string()),
+        browserbaseSessionID: v.optional(v.string()),
         browserbaseSessionCreateParams: v.optional(v.any()),
+        model: modelValidator,
         options: v.optional(v.object({
             timeout: v.optional(v.number()),
             waitUntil: v.optional(waitUntilValidator),
             domSettleTimeoutMs: v.optional(v.number()),
             selfHeal: v.optional(v.boolean()),
             systemPrompt: v.optional(v.string()),
+            verbose: v.optional(v.number()),
+            experimental: v.optional(v.boolean()),
         })),
     },
     returns: v.object({
         sessionId: v.string(),
-        browserbaseSessionId: v.optional(v.string()),
         cdpUrl: v.optional(v.string()),
     }),
-    handler: async (_ctx, args) => {
+    handler: async (ctx, args) => {
+        let resolvedRegion = getRequestedRegion(args.browserbaseSessionCreateParams) ??
+            DEFAULT_BROWSERBASE_REGION;
         const config = {
             browserbaseApiKey: args.browserbaseApiKey,
             browserbaseProjectId: args.browserbaseProjectId,
@@ -54,25 +235,45 @@ export const startSession = action({
             modelName: args.modelName,
         };
         const session = await api.startSession(config, {
-            browserbaseSessionId: args.browserbaseSessionId,
+            browserbaseSessionID: args.browserbaseSessionID,
             browserbaseSessionCreateParams: args.browserbaseSessionCreateParams,
+            model: args.model,
             domSettleTimeoutMs: args.options?.domSettleTimeoutMs,
             selfHeal: args.options?.selfHeal,
             systemPrompt: args.options?.systemPrompt,
+            verbose: args.options?.verbose,
+            experimental: args.options?.experimental,
+        });
+        await persistSessionMetadata(ctx, {
+            sessionId: session.sessionId,
+            region: resolvedRegion,
+            status: "active",
+            operation: "workflow",
+            url: args.url,
         });
         try {
-            await api.navigate(session.sessionId, args.url, config, {
-                waitUntil: args.options?.waitUntil,
-                timeout: args.options?.timeout,
+            await runWithRegionRetry(ctx, {
+                sessionId: session.sessionId,
+                initialRegion: resolvedRegion,
+                onRegionResolved: async (region) => {
+                    resolvedRegion = region;
+                },
+                run: async (region) => api.navigate(session.sessionId, args.url, config, {
+                    waitUntil: args.options?.waitUntil,
+                    timeout: args.options?.timeout,
+                }, region),
             });
             return {
                 sessionId: session.sessionId,
-                browserbaseSessionId: session.browserbaseSessionId,
-                cdpUrl: session.cdpUrl,
+                cdpUrl: session.cdpUrl ?? undefined,
             };
         }
         catch (error) {
-            await api.endSession(session.sessionId, config);
+            await endSessionWithRouting(ctx, {
+                sessionId: session.sessionId,
+                config,
+                fallbackRegion: resolvedRegion,
+            });
             throw error;
         }
     },
@@ -85,17 +286,22 @@ export const endSession = action({
         browserbaseApiKey: v.string(),
         browserbaseProjectId: v.string(),
         modelApiKey: v.string(),
+        modelName: v.optional(v.string()),
         sessionId: v.string(),
     },
     returns: v.object({ success: v.boolean() }),
-    handler: async (_ctx, args) => {
+    handler: async (ctx, args) => {
         const config = {
             browserbaseApiKey: args.browserbaseApiKey,
             browserbaseProjectId: args.browserbaseProjectId,
             modelApiKey: args.modelApiKey,
+            modelName: args.modelName,
         };
-        await api.endSession(args.sessionId, config);
-        return { success: true };
+        const success = await endSessionWithRouting(ctx, {
+            sessionId: args.sessionId,
+            config,
+        });
+        return { success };
     },
 });
 /**
@@ -114,13 +320,16 @@ export const extract = action({
         instruction: v.string(),
         schema: v.any(),
         browserbaseSessionCreateParams: v.optional(v.any()),
+        model: modelValidator,
+        sessionConfig: sessionConfigValidator,
         options: v.optional(v.object({
             timeout: v.optional(v.number()),
             waitUntil: v.optional(waitUntilValidator),
+            selector: v.optional(v.string()),
         })),
     },
     returns: v.any(),
-    handler: async (_ctx, args) => {
+    handler: async (ctx, args) => {
         if (!args.sessionId && !args.url) {
             throw new Error("Either sessionId or url must be provided");
         }
@@ -132,28 +341,73 @@ export const extract = action({
         };
         const ownSession = !args.sessionId;
         let sessionId = args.sessionId;
+        let resolvedRegion;
         if (ownSession) {
+            resolvedRegion =
+                getRequestedRegion(args.browserbaseSessionCreateParams) ??
+                    DEFAULT_BROWSERBASE_REGION;
             const session = await api.startSession(config, {
                 browserbaseSessionCreateParams: args.browserbaseSessionCreateParams,
+                model: args.model,
+                ...args.sessionConfig,
             });
             sessionId = session.sessionId;
+            await persistSessionMetadata(ctx, {
+                sessionId,
+                region: resolvedRegion,
+                status: "active",
+                operation: "extract",
+                url: args.url,
+            });
+        }
+        if (!sessionId) {
+            throw new Error("Failed to initialize session");
+        }
+        if (!ownSession) {
+            resolvedRegion = await resolveSessionRegion(ctx, sessionId, resolvedRegion);
         }
         try {
             if (ownSession && args.url) {
-                await api.navigate(sessionId, args.url, config, {
-                    waitUntil: args.options?.waitUntil,
-                    timeout: args.options?.timeout,
+                await runWithRegionRetry(ctx, {
+                    sessionId,
+                    initialRegion: resolvedRegion,
+                    onRegionResolved: async (region) => {
+                        resolvedRegion = region;
+                    },
+                    run: async (region) => api.navigate(sessionId, args.url, config, {
+                        waitUntil: args.options?.waitUntil,
+                        timeout: args.options?.timeout,
+                    }, region),
                 });
             }
-            const result = await api.extract(sessionId, args.instruction, args.schema, config);
+            const result = await runWithRegionRetry(ctx, {
+                sessionId,
+                initialRegion: resolvedRegion,
+                onRegionResolved: async (region) => {
+                    resolvedRegion = region;
+                },
+                run: async (region) => api.extract(sessionId, args.instruction, args.schema, config, {
+                    model: args.model,
+                    timeout: args.options?.timeout,
+                    selector: args.options?.selector,
+                }, region),
+            });
             if (ownSession) {
-                await api.endSession(sessionId, config);
+                await endSessionWithRouting(ctx, {
+                    sessionId,
+                    config,
+                    fallbackRegion: resolvedRegion,
+                });
             }
             return result.result;
         }
         catch (error) {
             if (ownSession) {
-                await api.endSession(sessionId, config);
+                await endSessionWithRouting(ctx, {
+                    sessionId,
+                    config,
+                    fallbackRegion: resolvedRegion,
+                });
             }
             throw error;
         }
@@ -174,9 +428,12 @@ export const act = action({
         url: v.optional(v.string()),
         action: v.string(),
         browserbaseSessionCreateParams: v.optional(v.any()),
+        model: modelValidator,
+        sessionConfig: sessionConfigValidator,
         options: v.optional(v.object({
             timeout: v.optional(v.number()),
             waitUntil: v.optional(waitUntilValidator),
+            variables: variablesValidator,
         })),
     },
     returns: v.object({
@@ -184,7 +441,7 @@ export const act = action({
         message: v.string(),
         actionDescription: v.string(),
     }),
-    handler: async (_ctx, args) => {
+    handler: async (ctx, args) => {
         if (!args.sessionId && !args.url) {
             throw new Error("Either sessionId or url must be provided");
         }
@@ -196,22 +453,63 @@ export const act = action({
         };
         const ownSession = !args.sessionId;
         let sessionId = args.sessionId;
+        let resolvedRegion;
         if (ownSession) {
+            resolvedRegion =
+                getRequestedRegion(args.browserbaseSessionCreateParams) ??
+                    DEFAULT_BROWSERBASE_REGION;
             const session = await api.startSession(config, {
                 browserbaseSessionCreateParams: args.browserbaseSessionCreateParams,
+                model: args.model,
+                ...args.sessionConfig,
             });
             sessionId = session.sessionId;
+            await persistSessionMetadata(ctx, {
+                sessionId,
+                region: resolvedRegion,
+                status: "active",
+                operation: "act",
+                url: args.url,
+            });
+        }
+        if (!sessionId) {
+            throw new Error("Failed to initialize session");
+        }
+        if (!ownSession) {
+            resolvedRegion = await resolveSessionRegion(ctx, sessionId, resolvedRegion);
         }
         try {
             if (ownSession && args.url) {
-                await api.navigate(sessionId, args.url, config, {
-                    waitUntil: args.options?.waitUntil,
-                    timeout: args.options?.timeout,
+                await runWithRegionRetry(ctx, {
+                    sessionId,
+                    initialRegion: resolvedRegion,
+                    onRegionResolved: async (region) => {
+                        resolvedRegion = region;
+                    },
+                    run: async (region) => api.navigate(sessionId, args.url, config, {
+                        waitUntil: args.options?.waitUntil,
+                        timeout: args.options?.timeout,
+                    }, region),
                 });
             }
-            const result = await api.act(sessionId, args.action, config);
+            const result = await runWithRegionRetry(ctx, {
+                sessionId,
+                initialRegion: resolvedRegion,
+                onRegionResolved: async (region) => {
+                    resolvedRegion = region;
+                },
+                run: async (region) => api.act(sessionId, args.action, config, {
+                    model: args.model,
+                    variables: args.options?.variables,
+                    timeout: args.options?.timeout,
+                }, region),
+            });
             if (ownSession) {
-                await api.endSession(sessionId, config);
+                await endSessionWithRouting(ctx, {
+                    sessionId,
+                    config,
+                    fallbackRegion: resolvedRegion,
+                });
             }
             return {
                 success: result.result.success,
@@ -221,7 +519,11 @@ export const act = action({
         }
         catch (error) {
             if (ownSession) {
-                await api.endSession(sessionId, config);
+                await endSessionWithRouting(ctx, {
+                    sessionId,
+                    config,
+                    fallbackRegion: resolvedRegion,
+                });
             }
             throw error;
         }
@@ -242,13 +544,16 @@ export const observe = action({
         url: v.optional(v.string()),
         instruction: v.string(),
         browserbaseSessionCreateParams: v.optional(v.any()),
+        model: modelValidator,
+        sessionConfig: sessionConfigValidator,
         options: v.optional(v.object({
             timeout: v.optional(v.number()),
             waitUntil: v.optional(waitUntilValidator),
+            selector: v.optional(v.string()),
         })),
     },
     returns: v.array(observedActionValidator),
-    handler: async (_ctx, args) => {
+    handler: async (ctx, args) => {
         if (!args.sessionId && !args.url) {
             throw new Error("Either sessionId or url must be provided");
         }
@@ -260,33 +565,79 @@ export const observe = action({
         };
         const ownSession = !args.sessionId;
         let sessionId = args.sessionId;
+        let resolvedRegion;
         if (ownSession) {
+            resolvedRegion =
+                getRequestedRegion(args.browserbaseSessionCreateParams) ??
+                    DEFAULT_BROWSERBASE_REGION;
             const session = await api.startSession(config, {
                 browserbaseSessionCreateParams: args.browserbaseSessionCreateParams,
+                model: args.model,
+                ...args.sessionConfig,
             });
             sessionId = session.sessionId;
+            await persistSessionMetadata(ctx, {
+                sessionId,
+                region: resolvedRegion,
+                status: "active",
+                operation: "observe",
+                url: args.url,
+            });
+        }
+        if (!sessionId) {
+            throw new Error("Failed to initialize session");
+        }
+        if (!ownSession) {
+            resolvedRegion = await resolveSessionRegion(ctx, sessionId, resolvedRegion);
         }
         try {
             if (ownSession && args.url) {
-                await api.navigate(sessionId, args.url, config, {
-                    waitUntil: args.options?.waitUntil,
-                    timeout: args.options?.timeout,
+                await runWithRegionRetry(ctx, {
+                    sessionId,
+                    initialRegion: resolvedRegion,
+                    onRegionResolved: async (region) => {
+                        resolvedRegion = region;
+                    },
+                    run: async (region) => api.navigate(sessionId, args.url, config, {
+                        waitUntil: args.options?.waitUntil,
+                        timeout: args.options?.timeout,
+                    }, region),
                 });
             }
-            const result = await api.observe(sessionId, args.instruction, config);
+            const result = await runWithRegionRetry(ctx, {
+                sessionId,
+                initialRegion: resolvedRegion,
+                onRegionResolved: async (region) => {
+                    resolvedRegion = region;
+                },
+                run: async (region) => api.observe(sessionId, args.instruction, config, {
+                    model: args.model,
+                    timeout: args.options?.timeout,
+                    selector: args.options?.selector,
+                }, region),
+            });
             if (ownSession) {
-                await api.endSession(sessionId, config);
+                await endSessionWithRouting(ctx, {
+                    sessionId,
+                    config,
+                    fallbackRegion: resolvedRegion,
+                });
             }
             return result.result.map((action) => ({
                 description: action.description,
                 selector: action.selector,
                 method: action.method,
                 arguments: action.arguments,
+                backendNodeId: action.backendNodeId,
             }));
         }
         catch (error) {
             if (ownSession) {
-                await api.endSession(sessionId, config);
+                await endSessionWithRouting(ctx, {
+                    sessionId,
+                    config,
+                    fallbackRegion: resolvedRegion,
+                });
             }
             throw error;
         }
@@ -308,12 +659,19 @@ export const agent = action({
         url: v.optional(v.string()),
         instruction: v.string(),
         browserbaseSessionCreateParams: v.optional(v.any()),
+        model: modelValidator,
+        sessionConfig: sessionConfigValidator,
         options: v.optional(v.object({
             cua: v.optional(v.boolean()),
+            mode: v.optional(v.string()),
             maxSteps: v.optional(v.number()),
             systemPrompt: v.optional(v.string()),
             timeout: v.optional(v.number()),
             waitUntil: v.optional(waitUntilValidator),
+            executionModel: modelValidator,
+            provider: v.optional(v.string()),
+            highlightCursor: v.optional(v.boolean()),
+            shouldCache: v.optional(v.boolean()),
         })),
     },
     returns: v.object({
@@ -321,8 +679,16 @@ export const agent = action({
         completed: v.boolean(),
         message: v.string(),
         success: v.boolean(),
+        metadata: v.optional(v.any()),
+        usage: v.optional(v.object({
+            input_tokens: v.number(),
+            output_tokens: v.number(),
+            reasoning_tokens: v.optional(v.number()),
+            cached_input_tokens: v.optional(v.number()),
+            inference_time_ms: v.number(),
+        })),
     }),
-    handler: async (_ctx, args) => {
+    handler: async (ctx, args) => {
         if (!args.sessionId && !args.url) {
             throw new Error("Either sessionId or url must be provided");
         }
@@ -334,34 +700,107 @@ export const agent = action({
         };
         const ownSession = !args.sessionId;
         let sessionId = args.sessionId;
+        let resolvedRegion;
         if (ownSession) {
+            resolvedRegion =
+                getRequestedRegion(args.browserbaseSessionCreateParams) ??
+                    DEFAULT_BROWSERBASE_REGION;
             const session = await api.startSession(config, {
                 browserbaseSessionCreateParams: args.browserbaseSessionCreateParams,
+                model: args.model,
+                ...args.sessionConfig,
             });
             sessionId = session.sessionId;
+            await persistSessionMetadata(ctx, {
+                sessionId,
+                region: resolvedRegion,
+                status: "active",
+                operation: "workflow",
+                url: args.url,
+            });
+        }
+        if (!sessionId) {
+            throw new Error("Failed to initialize session");
+        }
+        if (!ownSession) {
+            resolvedRegion = await resolveSessionRegion(ctx, sessionId, resolvedRegion);
         }
         try {
             if (ownSession && args.url) {
-                await api.navigate(sessionId, args.url, config, {
-                    waitUntil: args.options?.waitUntil,
-                    timeout: args.options?.timeout,
+                await runWithRegionRetry(ctx, {
+                    sessionId,
+                    initialRegion: resolvedRegion,
+                    onRegionResolved: async (region) => {
+                        resolvedRegion = region;
+                    },
+                    run: async (region) => api.navigate(sessionId, args.url, config, {
+                        waitUntil: args.options?.waitUntil,
+                        timeout: args.options?.timeout,
+                    }, region),
                 });
             }
-            const result = await api.agentExecute(sessionId, {
-                cua: args.options?.cua,
-                systemPrompt: args.options?.systemPrompt,
-            }, {
-                instruction: args.instruction,
-                maxSteps: args.options?.maxSteps,
-            }, config);
+            const result = await runWithRegionRetry(ctx, {
+                sessionId,
+                initialRegion: resolvedRegion,
+                onRegionResolved: async (region) => {
+                    resolvedRegion = region;
+                },
+                run: async (region) => api.agentExecute(sessionId, {
+                    cua: args.options?.cua,
+                    mode: args.options?.mode,
+                    model: args.model,
+                    systemPrompt: args.options?.systemPrompt,
+                    executionModel: args.options?.executionModel,
+                    provider: args.options?.provider,
+                }, {
+                    instruction: args.instruction,
+                    maxSteps: args.options?.maxSteps,
+                    highlightCursor: args.options?.highlightCursor,
+                }, config, args.options?.shouldCache, region),
+            });
             if (ownSession) {
-                await api.endSession(sessionId, config);
+                await endSessionWithRouting(ctx, {
+                    sessionId,
+                    config,
+                    fallbackRegion: resolvedRegion,
+                });
             }
-            return result.result;
+            // Strip passthrough fields to match the Convex return validator.
+            // The API may return extra fields (e.g. timestamp, messages) not in the validator.
+            const r = result.result;
+            return {
+                actions: r.actions.map((a) => ({
+                    type: a.type,
+                    action: a.action,
+                    reasoning: a.reasoning,
+                    timeMs: a.timeMs,
+                    taskCompleted: a.taskCompleted,
+                    pageText: a.pageText,
+                    pageUrl: a.pageUrl,
+                    instruction: a.instruction,
+                })),
+                completed: r.completed,
+                message: r.message,
+                success: r.success,
+                metadata: r.metadata,
+                usage: r.usage
+                    ? {
+                        input_tokens: r.usage.input_tokens,
+                        output_tokens: r.usage.output_tokens,
+                        reasoning_tokens: r.usage.reasoning_tokens,
+                        cached_input_tokens: r.usage.cached_input_tokens,
+                        inference_time_ms: r.usage.inference_time_ms,
+                    }
+                    : undefined,
+            };
         }
         catch (error) {
             if (ownSession) {
-                await api.endSession(sessionId, config);
+                await endSessionWithRouting(ctx, {
+                    sessionId,
+                    config,
+                    fallbackRegion: resolvedRegion,
+                });
             }
             throw error;
         }