@ddwang/magnitude-core 0.3.1-ddwang.17 → 0.3.1-ddwang.18

package/dist/agent/errors.d.ts

@@ -26,3 +26,7 @@ export declare class PlannerTimeoutError extends AgentError {
     readonly timeoutMs: number;
     constructor(timeoutMs: number);
 }
+export declare class ExtractTimeoutError extends AgentError {
+    readonly timeoutMs: number;
+    constructor(timeoutMs: number);
+}

package/dist/agent/errors.js

@@ -63,6 +63,14 @@ export class PlannerTimeoutError extends AgentError {
         this.name = 'PlannerTimeoutError';
     }
 }
+export class ExtractTimeoutError extends AgentError {
+    timeoutMs;
+    constructor(timeoutMs) {
+        super(`Extract call exceeded its ${timeoutMs} ms request budget`, { variant: 'extract_timeout' });
+        this.timeoutMs = timeoutMs;
+        this.name = 'ExtractTimeoutError';
+    }
+}
 // // Agent will only throw these types of errors
 // import { ActionIngredient } from "./recipe/types";
 // import { WebAction } from "./web/types";

package/dist/agent/index.d.ts

@@ -4,7 +4,7 @@ import { Action } from "@/actions/types";
 import { AgentEvents } from "@/common/events";
 import { AgentConnector } from '@/connectors';
 import { RenderableContent } from '@/memory/observation';
-import { LLMClient, type PlannerOptions } from "@/ai/types";
+import { LLMClient, type TimeoutPolicy } from "@/ai/types";
 import { type OperationDiagnostics, type OperationKind, type OperationOptions } from '@/common/operation';
 import { AgentMemory, MemoryRenderOptions } from "@/memory";
 import { ActionDefinition } from "@/actions";
@@ -17,7 +17,9 @@ export interface AgentOptions {
     telemetry?: boolean;
     maxActions?: number;
     /** Omitted preserves existing planner retry behavior without a per-call timeout. */
-    planner?: PlannerOptions;
+    planner?: TimeoutPolicy;
+    /** Omitted runs extract() without a per-call timeout. */
+    extract?: TimeoutPolicy;
 }
 export interface ActOptions extends OperationOptions {
     prompt?: string;

package/dist/agent/index.js

@@ -98,7 +98,7 @@ export class Agent {
             }
         }
         //this.model = new ModelHarness({ llm: this.options.llm });
-        this.models = new MultiModelHarness(llms, this.options.planner);
+        this.models = new MultiModelHarness(llms, { planner: this.options.planner, extract: this.options.extract });
         this.models.events.on('tokensUsed', (usage) => this.events.emit('tokensUsed', usage), this);
         this.doneActing = false;
         this._paused = false;

package/dist/ai/modelHarness.d.ts

@@ -1,6 +1,6 @@
 import { AgentContext } from "@/ai/baml_client";
 import { ClientRegistry } from "@boundaryml/baml";
-import { LLMClient, ModelUsage, type PlannerOptions } from "@/ai/types";
+import { LLMClient, ModelUsage, type TimeoutPolicy } from "@/ai/types";
 import { ActionDefinition } from "@/actions";
 import { Schema, z } from 'zod';
 import { Image } from '@/memory/image';
@@ -9,7 +9,8 @@ import { MultiMediaContentPart } from "@/memory/rendering";
 import { type PlannerResponse } from './plannerResponse';
 interface ModelHarnessOptions {
     llm: LLMClient;
-    planner?: PlannerOptions;
+    planner?: TimeoutPolicy;
+    extract?: TimeoutPolicy;
 }
 export interface ModelHarnessEvents {
     'tokensUsed': (usage: ModelUsage) => {};
@@ -33,6 +34,12 @@ export declare class ModelHarness {
     private _withUsage;
     private _reportCallUsage;
     partialAct<T>(context: AgentContext, task: string, data: MultiMediaContentPart[], actionVocabulary: ActionDefinition<T>[]): Promise<PlannerResponse>;
+    /**
+     * Runs one model call under an optional timeout policy: abort at timeoutMs, wait for the request to
+     * settle, then retry up to maxRetries times. Caller cancellation and deadlines take precedence.
+     * Planner calls are also recorded in the operation's plannerCalls.
+     */
+    private withTimeout;
     private partialActAttempt;
     extract<T extends Schema>(instructions: string, schema: T, screenshot: Image, domContent: string): Promise<z.infer<T>>;
     query<T extends Schema>(context: AgentContext, query: string, schema: T): Promise<z.infer<T>>;

package/dist/ai/modelHarness.js

@@ -12,7 +12,7 @@ import { anthropicOutputFormat, BASETEN_ENFORCED, plannerSchema, usesStructuredO
 import { ModelResponseError } from './modelResponseError';
 import { DEFAULT_BASETEN_MODEL } from './baseten';
 import { beginOperationPhase, checkOperation, currentOperation, operationOptions } from '@/common/operation';
-import { OperationDeadlineError, PlannerTimeoutError } from '@/agent/errors';
+import { ExtractTimeoutError, OperationDeadlineError, PlannerTimeoutError } from '@/agent/errors';
 export class ModelHarness {
     /**
      * Strong reasoning agent for high level strategy and planning.
@@ -25,17 +25,21 @@ export class ModelHarness {
     logger;
     planner;
     constructor(options) {
-        if (options.planner) {
-            if (!Number.isInteger(options.planner.timeoutMs) || options.planner.timeoutMs <= 0 || options.planner.timeoutMs > 2_147_483_647) {
-                throw new TypeError('planner.timeoutMs must be an integer between 1 and 2147483647');
+        for (const name of ['planner', 'extract']) {
+            const policy = options[name];
+            if (!policy)
+                continue;
+            if (!Number.isInteger(policy.timeoutMs) || policy.timeoutMs <= 0 || policy.timeoutMs > 2_147_483_647) {
+                throw new TypeError(`${name}.timeoutMs must be an integer between 1 and 2147483647`);
             }
-            if (!Number.isSafeInteger(options.planner.maxRetries ?? 1) || (options.planner.maxRetries ?? 1) < 0) {
-                throw new TypeError('planner.maxRetries must be a non-negative safe integer');
+            if (!Number.isSafeInteger(policy.maxRetries ?? 1) || (policy.maxRetries ?? 1) < 0) {
+                throw new TypeError(`${name}.maxRetries must be a non-negative safe integer`);
             }
         }
         this.options = {
             llm: options.llm,
             planner: options.planner && { ...options.planner },
+            extract: options.extract && { ...options.extract },
         };
         this.logger = logger.child({ name: 'llm' });
     }
@@ -279,11 +283,19 @@ export class ModelHarness {
         return usage;
     }
     async partialAct(context, task, data, actionVocabulary) {
-        const policy = this.options.planner;
+        return this.withTimeout(this.options.planner, timeoutMs => new PlannerTimeoutError(timeoutMs), (checkRequest, callId) => this.partialActAttempt(context, task, data, actionVocabulary, checkRequest, callId), true);
+    }
+    /**
+     * Runs one model call under an optional timeout policy: abort at timeoutMs, wait for the request to
+     * settle, then retry up to maxRetries times. Caller cancellation and deadlines take precedence.
+     * Planner calls are also recorded in the operation's plannerCalls.
+     */
+    async withTimeout(policy, timeoutError, call, plannerCall = false) {
         for (let attempt = 1;; attempt++) {
             checkOperation();
             const operation = currentOperation();
             const controller = new AbortController();
+            const timeout = policy && timeoutError(policy.timeoutMs);
             const abortFromParent = () => controller.abort(operation.signal.reason);
             const started = performance.now();
             const checkRequest = () => {
@@ -291,17 +303,17 @@ export class ModelHarness {
                 // Synchronous validation can occupy the event loop past the
                 // timer's due time, on either success or failure.
                 if (policy && performance.now() - started >= policy.timeoutMs)
-                    controller.abort(new PlannerTimeoutError(policy.timeoutMs));
+                    controller.abort(timeout);
                 controller.signal.throwIfAborted();
                 return controller.signal;
             };
             let timer;
-            const callId = operation?.startPlannerCall({
+            const callId = plannerCall ? operation?.startPlannerCall({
                 attempt, provider: this.options.llm.provider,
                 model: (this.options.llm.options.model ?? 'unknown').slice(0, 200),
                 ...(policy ? { timeoutMs: policy.timeoutMs } : {}),
-            });
-            const abortOutcome = () => controller.signal.reason instanceof PlannerTimeoutError ? 'timeout'
+            }) : undefined;
+            const abortOutcome = () => controller.signal.reason === timeout ? 'timeout'
                 : controller.signal.reason instanceof OperationDeadlineError ? 'deadline' : 'cancelled';
             controller.signal.addEventListener('abort', () => {
                 if (callId)
@@ -311,28 +323,28 @@ export class ModelHarness {
             if (operation?.signal.aborted)
                 abortFromParent();
             if (policy)
-                timer = setTimeout(() => controller.abort(new PlannerTimeoutError(policy.timeoutMs)), policy.timeoutMs);
+                timer = setTimeout(() => controller.abort(timeout), policy.timeoutMs);
             let outcome = 'failed';
             try {
                 checkRequest();
                 // Await native settlement, not a Promise.race: a timeout must
                 // never release ownership or overlap a still-running request.
-                let plan;
+                let result;
                 try {
-                    plan = await this.partialActAttempt(context, task, data, actionVocabulary, checkRequest, callId);
+                    result = await call(checkRequest, callId);
                 }
                 finally {
                     checkRequest();
                 }
                 outcome = 'succeeded';
-                return plan;
+                return result;
             }
             catch (error) {
                 checkOperation();
                 if (!controller.signal.aborted)
                     throw error;
                 outcome = abortOutcome();
-                if (!(controller.signal.reason instanceof PlannerTimeoutError) || attempt > (policy?.maxRetries ?? 1)) {
+                if (controller.signal.reason !== timeout || attempt > (policy?.maxRetries ?? 1)) {
                     throw controller.signal.reason;
                 }
             }
@@ -419,7 +431,7 @@ export class ModelHarness {
         // }
         const clientRegistry = this.clientForSchema(schema instanceof z.ZodObject ? schema : z.object({ data: schema }));
         const bamlScreenshot = await screenshot.toBaml();
-        const resp = await this._withUsage(collector => this.baml.ExtractData(instructions, bamlScreenshot, domContent, this.options.llm.provider === 'claude-code', { tb, collector, clientRegistry, signal: operationOptions().signal }));
+        const resp = await this.withTimeout(this.options.extract, timeoutMs => new ExtractTimeoutError(timeoutMs), checkRequest => this._withUsage(collector => this.baml.ExtractData(instructions, bamlScreenshot, domContent, this.options.llm.provider === 'claude-code', { tb, collector, clientRegistry, signal: checkRequest() })));
         return schema.parse(schema instanceof z.ZodObject ? resp : resp.data);
     }
     // ^ extract could prob be a subset of query w trimmed mem

package/dist/ai/multiModelHarness.d.ts

@@ -1,6 +1,6 @@
 import { MultiMediaContentPart } from "@/memory/rendering";
 import { ModelHarnessEvents } from "./modelHarness";
-import { LLMClient, type PlannerOptions } from "./types";
+import { LLMClient, type TimeoutPolicy } from "./types";
 import { ActionDefinition } from "@/actions";
 import { AgentContext } from "./baml_client";
 import { Image } from '@/memory/image';
@@ -14,7 +14,10 @@ export declare class MultiModelHarness {
     private roles;
     private uniqueModels;
     readonly events: EventEmitter<ModelHarnessEvents>;
-    constructor(clients: LLMClient[], planner?: PlannerOptions);
+    constructor(clients: LLMClient[], policies?: {
+        planner?: TimeoutPolicy;
+        extract?: TimeoutPolicy;
+    });
     setup(): Promise<void>;
     describe(): string;
     partialAct<T>(context: AgentContext, task: string, data: MultiMediaContentPart[], actionVocabulary: ActionDefinition<T>[]): Promise<PlannerResponse>;

package/dist/ai/multiModelHarness.js

@@ -10,11 +10,11 @@ export class MultiModelHarness {
     roles = {};
     uniqueModels = [];
     events = new EventEmitter();
-    constructor(clients, planner) {
+    constructor(clients, policies = {}) {
         // Sort by specificity (from least specific to most specific)
         const sortedClients = [...clients].sort((a, b) => (b.roles ? b.roles.length : 9999) - (a.roles ? a.roles.length : 9999));
         for (const client of sortedClients) {
-            const harness = new ModelHarness({ llm: client, planner });
+            const harness = new ModelHarness({ llm: client, ...policies });
             this.uniqueModels.push(harness);
             if (client.roles) {
                 for (const role of client.roles) {

package/dist/ai/types.d.ts

@@ -1,12 +1,14 @@
 export type BrowserAgentRole = 'act' | 'extract' | 'query';
 export declare const allBrowserAgentRoles: BrowserAgentRole[];
-/** Optional request budget for act() planning, not extraction or query. */
-export interface PlannerOptions {
-    /** Includes transport retries and format correction within one planner invocation. */
+/** Optional request budget for one model call, used for act() planning and for extract(). */
+export interface TimeoutPolicy {
+    /** Includes transport retries and format correction within one invocation. */
     timeoutMs: number;
     /** Retries after timeout, once the previous invocation settles. Default: 1. */
     maxRetries?: number;
 }
+/** The published name for the planner's policy, kept for existing imports. */
+export type PlannerOptions = TimeoutPolicy;
 export type LLMClient = (AnthropicClient | ClaudeCodeClient | BedrockClient | GoogleAIClient | GoogleVertexClient | OpenAIClient | BasetenClient | OpenAIGenericClient | AzureOpenAIClient) & {
     roles?: BrowserAgentRole[];
 };

package/dist/index.cjs

@@ -1157,6 +1157,13 @@ class PlannerTimeoutError extends AgentError {
     this.name = "PlannerTimeoutError";
   }
 }
+class ExtractTimeoutError extends AgentError {
+  constructor(timeoutMs) {
+    super(`Extract call exceeded its ${timeoutMs} ms request budget`, { variant: "extract_timeout" });
+    this.timeoutMs = timeoutMs;
+    this.name = "ExtractTimeoutError";
+  }
+}
 
 function attachOperationDiagnostics(error, diagnostics) {
   if (!(error instanceof Error)) return;
@@ -3628,17 +3635,20 @@ class ModelHarness {
   logger;
   planner;
   constructor(options) {
-    if (options.planner) {
-      if (!Number.isInteger(options.planner.timeoutMs) || options.planner.timeoutMs <= 0 || options.planner.timeoutMs > 2147483647) {
-        throw new TypeError("planner.timeoutMs must be an integer between 1 and 2147483647");
+    for (const name of ["planner", "extract"]) {
+      const policy = options[name];
+      if (!policy) continue;
+      if (!Number.isInteger(policy.timeoutMs) || policy.timeoutMs <= 0 || policy.timeoutMs > 2147483647) {
+        throw new TypeError(`${name}.timeoutMs must be an integer between 1 and 2147483647`);
       }
-      if (!Number.isSafeInteger(options.planner.maxRetries ?? 1) || (options.planner.maxRetries ?? 1) < 0) {
-        throw new TypeError("planner.maxRetries must be a non-negative safe integer");
+      if (!Number.isSafeInteger(policy.maxRetries ?? 1) || (policy.maxRetries ?? 1) < 0) {
+        throw new TypeError(`${name}.maxRetries must be a non-negative safe integer`);
       }
     }
     this.options = {
       llm: options.llm,
-      planner: options.planner && { ...options.planner }
+      planner: options.planner && { ...options.planner },
+      extract: options.extract && { ...options.extract }
     };
     this.logger = logger.child({ name: "llm" });
   }
@@ -3842,49 +3852,62 @@ class ModelHarness {
     return usage;
   }
   async partialAct(context, task, data, actionVocabulary) {
-    const policy = this.options.planner;
+    return this.withTimeout(
+      this.options.planner,
+      (timeoutMs) => new PlannerTimeoutError(timeoutMs),
+      (checkRequest, callId) => this.partialActAttempt(context, task, data, actionVocabulary, checkRequest, callId),
+      true
+    );
+  }
+  /**
+   * Runs one model call under an optional timeout policy: abort at timeoutMs, wait for the request to
+   * settle, then retry up to maxRetries times. Caller cancellation and deadlines take precedence.
+   * Planner calls are also recorded in the operation's plannerCalls.
+   */
+  async withTimeout(policy, timeoutError, call, plannerCall = false) {
     for (let attempt = 1; ; attempt++) {
       checkOperation();
       const operation = currentOperation();
       const controller = new AbortController();
+      const timeout = policy && timeoutError(policy.timeoutMs);
       const abortFromParent = () => controller.abort(operation.signal.reason);
       const started = performance.now();
       const checkRequest = () => {
         checkOperation();
-        if (policy && performance.now() - started >= policy.timeoutMs) controller.abort(new PlannerTimeoutError(policy.timeoutMs));
+        if (policy && performance.now() - started >= policy.timeoutMs) controller.abort(timeout);
         controller.signal.throwIfAborted();
         return controller.signal;
       };
       let timer;
-      const callId = operation?.startPlannerCall({
+      const callId = plannerCall ? operation?.startPlannerCall({
         attempt,
         provider: this.options.llm.provider,
         model: (this.options.llm.options.model ?? "unknown").slice(0, 200),
         ...policy ? { timeoutMs: policy.timeoutMs } : {}
-      });
-      const abortOutcome = () => controller.signal.reason instanceof PlannerTimeoutError ? "timeout" : controller.signal.reason instanceof OperationDeadlineError ? "deadline" : "cancelled";
+      }) : void 0;
+      const abortOutcome = () => controller.signal.reason === timeout ? "timeout" : controller.signal.reason instanceof OperationDeadlineError ? "deadline" : "cancelled";
       controller.signal.addEventListener("abort", () => {
         if (callId) operation.updatePlannerCall(callId, abortOutcome(), "draining");
       }, { once: true });
       operation?.signal.addEventListener("abort", abortFromParent, { once: true });
       if (operation?.signal.aborted) abortFromParent();
-      if (policy) timer = setTimeout(() => controller.abort(new PlannerTimeoutError(policy.timeoutMs)), policy.timeoutMs);
+      if (policy) timer = setTimeout(() => controller.abort(timeout), policy.timeoutMs);
       let outcome = "failed";
       try {
         checkRequest();
-        let plan;
+        let result;
         try {
-          plan = await this.partialActAttempt(context, task, data, actionVocabulary, checkRequest, callId);
+          result = await call(checkRequest, callId);
         } finally {
           checkRequest();
         }
         outcome = "succeeded";
-        return plan;
+        return result;
       } catch (error) {
         checkOperation();
         if (!controller.signal.aborted) throw error;
         outcome = abortOutcome();
-        if (!(controller.signal.reason instanceof PlannerTimeoutError) || attempt > (policy?.maxRetries ?? 1)) {
+        if (controller.signal.reason !== timeout || attempt > (policy?.maxRetries ?? 1)) {
           throw controller.signal.reason;
         }
       } finally {
@@ -3957,13 +3980,17 @@ class ModelHarness {
     }
     const clientRegistry = this.clientForSchema(schema instanceof z.z.ZodObject ? schema : z.z.object({ data: schema }));
     const bamlScreenshot = await screenshot.toBaml();
-    const resp = await this._withUsage((collector) => this.baml.ExtractData(
-      instructions,
-      bamlScreenshot,
-      domContent,
-      this.options.llm.provider === "claude-code",
-      { tb, collector, clientRegistry, signal: operationOptions().signal }
-    ));
+    const resp = await this.withTimeout(
+      this.options.extract,
+      (timeoutMs) => new ExtractTimeoutError(timeoutMs),
+      (checkRequest) => this._withUsage((collector) => this.baml.ExtractData(
+        instructions,
+        bamlScreenshot,
+        domContent,
+        this.options.llm.provider === "claude-code",
+        { tb, collector, clientRegistry, signal: checkRequest() }
+      ))
+    );
     return schema.parse(schema instanceof z.z.ZodObject ? resp : resp.data);
   }
   // ^ extract could prob be a subset of query w trimmed mem
@@ -4066,10 +4093,10 @@ class MultiModelHarness {
   roles = {};
   uniqueModels = [];
   events = new EventEmitter();
-  constructor(clients, planner) {
+  constructor(clients, policies = {}) {
     const sortedClients = [...clients].sort((a, b) => (b.roles ? b.roles.length : 9999) - (a.roles ? a.roles.length : 9999));
     for (const client of sortedClients) {
-      const harness = new ModelHarness({ llm: client, planner });
+      const harness = new ModelHarness({ llm: client, ...policies });
       this.uniqueModels.push(harness);
       if (client.roles) {
         for (const role of client.roles) {
@@ -4549,7 +4576,7 @@ class Agent {
         }
       }
     }
-    this.models = new MultiModelHarness(llms, this.options.planner);
+    this.models = new MultiModelHarness(llms, { planner: this.options.planner, extract: this.options.extract });
     this.models.events.on("tokensUsed", (usage) => this.events.emit("tokensUsed", usage), this);
     this.doneActing = false;
     this._paused = false;
@@ -8292,6 +8319,7 @@ exports.BrowserBlockedError = BrowserBlockedError;
 exports.BrowserConnector = BrowserConnector;
 exports.BrowserProvider = BrowserProvider;
 exports.DesktopConnector = DesktopConnector;
+exports.ExtractTimeoutError = ExtractTimeoutError;
 exports.Observation = Observation;
 exports.OperationCancelledError = OperationCancelledError;
 exports.OperationDeadlineError = OperationDeadlineError;

package/dist/index.d.cts

@@ -83,13 +83,15 @@ interface CheckIntent {
 
 type BrowserAgentRole = 'act' | 'extract' | 'query';
 declare const allBrowserAgentRoles: BrowserAgentRole[];
-/** Optional request budget for act() planning, not extraction or query. */
-interface PlannerOptions {
-    /** Includes transport retries and format correction within one planner invocation. */
+/** Optional request budget for one model call, used for act() planning and for extract(). */
+interface TimeoutPolicy {
+    /** Includes transport retries and format correction within one invocation. */
     timeoutMs: number;
     /** Retries after timeout, once the previous invocation settles. Default: 1. */
     maxRetries?: number;
 }
+/** The published name for the planner's policy, kept for existing imports. */
+type PlannerOptions = TimeoutPolicy;
 type LLMClient = (AnthropicClient | ClaudeCodeClient | BedrockClient | GoogleAIClient | GoogleVertexClient | OpenAIClient | BasetenClient | OpenAIGenericClient | AzureOpenAIClient) & {
     roles?: BrowserAgentRole[];
 };
@@ -558,7 +560,10 @@ declare class MultiModelHarness {
     private roles;
     private uniqueModels;
     readonly events: EventEmitter<ModelHarnessEvents>;
-    constructor(clients: LLMClient[], planner?: PlannerOptions);
+    constructor(clients: LLMClient[], policies?: {
+        planner?: TimeoutPolicy;
+        extract?: TimeoutPolicy;
+    });
     setup(): Promise<void>;
     describe(): string;
     partialAct<T>(context: AgentContext, task: string, data: MultiMediaContentPart[], actionVocabulary: ActionDefinition<T>[]): Promise<PlannerResponse>;
@@ -575,7 +580,9 @@ interface AgentOptions {
     telemetry?: boolean;
     maxActions?: number;
     /** Omitted preserves existing planner retry behavior without a per-call timeout. */
-    planner?: PlannerOptions;
+    planner?: TimeoutPolicy;
+    /** Omitted runs extract() without a per-call timeout. */
+    extract?: TimeoutPolicy;
 }
 interface ActOptions extends OperationOptions {
     prompt?: string;
@@ -1012,6 +1019,10 @@ declare class PlannerTimeoutError extends AgentError {
     readonly timeoutMs: number;
     constructor(timeoutMs: number);
 }
+declare class ExtractTimeoutError extends AgentError {
+    readonly timeoutMs: number;
+    constructor(timeoutMs: number);
+}
 
 /**
  * Represents any reason why a test case could have failed, for example:
@@ -1151,5 +1162,5 @@ declare function buildDefaultBrowserAgentOptions({ agentOptions, browserOptions
 
 declare const logger: pino.Logger<never, boolean>;
 
-export { ActionLimitError, Agent, AgentBusyError, AgentError, AgentMemory, BrowserAgent, BrowserBlockedError, BrowserConnector, BrowserProvider, DesktopConnector, Observation, OperationCancelledError, OperationDeadlineError, PlannerTimeoutError, WebHarness, allBrowserAgentRoles, buildDefaultBrowserAgentOptions, createAction, createId, deepEquals, getCodebaseId, getMachineId, logger, mergeMessages, posthog, retryOnError, retryOnErrorIsSuccess, sendTelemetry, startBrowserAgent };
-export type { ActOptions, Action, ActionContext, ActionDefinition, ActionIntent, ActionPayload, AgentConnector, AgentErrorOptions, AgentEvents, AgentMemoryOptions, AgentOptions, AnthropicClient, ApiKeyFailure, AzureOpenAIClient, Base64Image, BasetenClient, BedrockClient, BlockReason, BrowserAgentRole, BrowserBlock, BrowserClickDiagnostics, BrowserConnectorOptions, BrowserConnectorStateData, BrowserFailure, BrowserOptions, BugDetectedFailure, BugSeverity, CancelledFailure, CheckIntent, ClaudeCodeClient, ClickIntent, ClickWebAction, DesktopConnectorOptions, DesktopInterface, FailedTestCaseResult, FailureDescriptor, GoogleAIClient, GoogleVertexClient, HoverIntent, HoverWebAction, HttpDiagnostic, Intent, LLMClient, LLMClientIdentifier, MemoryRenderOptions, MisalignmentFailure, ModelUsage, NavigateWebAction, NetworkFailure, ObservableDataArray, ObservableDataObject, ObservableDataPrimitive, ObservationRetentionOptions, ObservationRole, ObservationSource, OpenAIClient, OpenAIGenericClient, OperationDiagnostics, OperationKind, OperationOptions, OperationPhase, OperationTiming, PixelCoordinate, PlannerCallDiagnostics, PlannerOptions, ProviderAttemptDiagnostics, RateLimitFailure, RecoveryOptions, RenderableContent, RetryMode, RetryOptions, RetryParams, ScrollIntent, ScrollWebAction, SerializedAgentMemory, SuccessfulTestCaseResult, SwitchTabIntent, SwitchTabWebAction, TestCaseDefinition, TestCaseResult, TestData, TestDataEntry, TestStepDefinition, TypeIntent, TypeWebAction, UnknownFailure, WebAction, WebHarnessEvents, WebHarnessOptions };
+export { ActionLimitError, Agent, AgentBusyError, AgentError, AgentMemory, BrowserAgent, BrowserBlockedError, BrowserConnector, BrowserProvider, DesktopConnector, ExtractTimeoutError, Observation, OperationCancelledError, OperationDeadlineError, PlannerTimeoutError, WebHarness, allBrowserAgentRoles, buildDefaultBrowserAgentOptions, createAction, createId, deepEquals, getCodebaseId, getMachineId, logger, mergeMessages, posthog, retryOnError, retryOnErrorIsSuccess, sendTelemetry, startBrowserAgent };
+export type { ActOptions, Action, ActionContext, ActionDefinition, ActionIntent, ActionPayload, AgentConnector, AgentErrorOptions, AgentEvents, AgentMemoryOptions, AgentOptions, AnthropicClient, ApiKeyFailure, AzureOpenAIClient, Base64Image, BasetenClient, BedrockClient, BlockReason, BrowserAgentRole, BrowserBlock, BrowserClickDiagnostics, BrowserConnectorOptions, BrowserConnectorStateData, BrowserFailure, BrowserOptions, BugDetectedFailure, BugSeverity, CancelledFailure, CheckIntent, ClaudeCodeClient, ClickIntent, ClickWebAction, DesktopConnectorOptions, DesktopInterface, FailedTestCaseResult, FailureDescriptor, GoogleAIClient, GoogleVertexClient, HoverIntent, HoverWebAction, HttpDiagnostic, Intent, LLMClient, LLMClientIdentifier, MemoryRenderOptions, MisalignmentFailure, ModelUsage, NavigateWebAction, NetworkFailure, ObservableDataArray, ObservableDataObject, ObservableDataPrimitive, ObservationRetentionOptions, ObservationRole, ObservationSource, OpenAIClient, OpenAIGenericClient, OperationDiagnostics, OperationKind, OperationOptions, OperationPhase, OperationTiming, PixelCoordinate, PlannerCallDiagnostics, PlannerOptions, ProviderAttemptDiagnostics, RateLimitFailure, RecoveryOptions, RenderableContent, RetryMode, RetryOptions, RetryParams, ScrollIntent, ScrollWebAction, SerializedAgentMemory, SuccessfulTestCaseResult, SwitchTabIntent, SwitchTabWebAction, TestCaseDefinition, TestCaseResult, TestData, TestDataEntry, TestStepDefinition, TimeoutPolicy, TypeIntent, TypeWebAction, UnknownFailure, WebAction, WebHarnessEvents, WebHarnessOptions };

package/dist/index.mjs

@@ -1134,6 +1134,13 @@ class PlannerTimeoutError extends AgentError {
     this.name = "PlannerTimeoutError";
   }
 }
+class ExtractTimeoutError extends AgentError {
+  constructor(timeoutMs) {
+    super(`Extract call exceeded its ${timeoutMs} ms request budget`, { variant: "extract_timeout" });
+    this.timeoutMs = timeoutMs;
+    this.name = "ExtractTimeoutError";
+  }
+}
 
 function attachOperationDiagnostics(error, diagnostics) {
   if (!(error instanceof Error)) return;
@@ -3605,17 +3612,20 @@ class ModelHarness {
   logger;
   planner;
   constructor(options) {
-    if (options.planner) {
-      if (!Number.isInteger(options.planner.timeoutMs) || options.planner.timeoutMs <= 0 || options.planner.timeoutMs > 2147483647) {
-        throw new TypeError("planner.timeoutMs must be an integer between 1 and 2147483647");
+    for (const name of ["planner", "extract"]) {
+      const policy = options[name];
+      if (!policy) continue;
+      if (!Number.isInteger(policy.timeoutMs) || policy.timeoutMs <= 0 || policy.timeoutMs > 2147483647) {
+        throw new TypeError(`${name}.timeoutMs must be an integer between 1 and 2147483647`);
       }
-      if (!Number.isSafeInteger(options.planner.maxRetries ?? 1) || (options.planner.maxRetries ?? 1) < 0) {
-        throw new TypeError("planner.maxRetries must be a non-negative safe integer");
+      if (!Number.isSafeInteger(policy.maxRetries ?? 1) || (policy.maxRetries ?? 1) < 0) {
+        throw new TypeError(`${name}.maxRetries must be a non-negative safe integer`);
       }
     }
     this.options = {
       llm: options.llm,
-      planner: options.planner && { ...options.planner }
+      planner: options.planner && { ...options.planner },
+      extract: options.extract && { ...options.extract }
     };
     this.logger = logger.child({ name: "llm" });
   }
@@ -3819,49 +3829,62 @@ class ModelHarness {
     return usage;
   }
   async partialAct(context, task, data, actionVocabulary) {
-    const policy = this.options.planner;
+    return this.withTimeout(
+      this.options.planner,
+      (timeoutMs) => new PlannerTimeoutError(timeoutMs),
+      (checkRequest, callId) => this.partialActAttempt(context, task, data, actionVocabulary, checkRequest, callId),
+      true
+    );
+  }
+  /**
+   * Runs one model call under an optional timeout policy: abort at timeoutMs, wait for the request to
+   * settle, then retry up to maxRetries times. Caller cancellation and deadlines take precedence.
+   * Planner calls are also recorded in the operation's plannerCalls.
+   */
+  async withTimeout(policy, timeoutError, call, plannerCall = false) {
     for (let attempt = 1; ; attempt++) {
       checkOperation();
       const operation = currentOperation();
       const controller = new AbortController();
+      const timeout = policy && timeoutError(policy.timeoutMs);
       const abortFromParent = () => controller.abort(operation.signal.reason);
       const started = performance.now();
       const checkRequest = () => {
         checkOperation();
-        if (policy && performance.now() - started >= policy.timeoutMs) controller.abort(new PlannerTimeoutError(policy.timeoutMs));
+        if (policy && performance.now() - started >= policy.timeoutMs) controller.abort(timeout);
         controller.signal.throwIfAborted();
         return controller.signal;
       };
       let timer;
-      const callId = operation?.startPlannerCall({
+      const callId = plannerCall ? operation?.startPlannerCall({
         attempt,
         provider: this.options.llm.provider,
         model: (this.options.llm.options.model ?? "unknown").slice(0, 200),
         ...policy ? { timeoutMs: policy.timeoutMs } : {}
-      });
-      const abortOutcome = () => controller.signal.reason instanceof PlannerTimeoutError ? "timeout" : controller.signal.reason instanceof OperationDeadlineError ? "deadline" : "cancelled";
+      }) : void 0;
+      const abortOutcome = () => controller.signal.reason === timeout ? "timeout" : controller.signal.reason instanceof OperationDeadlineError ? "deadline" : "cancelled";
       controller.signal.addEventListener("abort", () => {
         if (callId) operation.updatePlannerCall(callId, abortOutcome(), "draining");
       }, { once: true });
       operation?.signal.addEventListener("abort", abortFromParent, { once: true });
       if (operation?.signal.aborted) abortFromParent();
-      if (policy) timer = setTimeout(() => controller.abort(new PlannerTimeoutError(policy.timeoutMs)), policy.timeoutMs);
+      if (policy) timer = setTimeout(() => controller.abort(timeout), policy.timeoutMs);
       let outcome = "failed";
       try {
         checkRequest();
-        let plan;
+        let result;
         try {
-          plan = await this.partialActAttempt(context, task, data, actionVocabulary, checkRequest, callId);
+          result = await call(checkRequest, callId);
         } finally {
           checkRequest();
         }
         outcome = "succeeded";
-        return plan;
+        return result;
       } catch (error) {
         checkOperation();
         if (!controller.signal.aborted) throw error;
         outcome = abortOutcome();
-        if (!(controller.signal.reason instanceof PlannerTimeoutError) || attempt > (policy?.maxRetries ?? 1)) {
+        if (controller.signal.reason !== timeout || attempt > (policy?.maxRetries ?? 1)) {
           throw controller.signal.reason;
         }
       } finally {
@@ -3934,13 +3957,17 @@ class ModelHarness {
     }
     const clientRegistry = this.clientForSchema(schema instanceof z.ZodObject ? schema : z.object({ data: schema }));
     const bamlScreenshot = await screenshot.toBaml();
-    const resp = await this._withUsage((collector) => this.baml.ExtractData(
-      instructions,
-      bamlScreenshot,
-      domContent,
-      this.options.llm.provider === "claude-code",
-      { tb, collector, clientRegistry, signal: operationOptions().signal }
-    ));
+    const resp = await this.withTimeout(
+      this.options.extract,
+      (timeoutMs) => new ExtractTimeoutError(timeoutMs),
+      (checkRequest) => this._withUsage((collector) => this.baml.ExtractData(
+        instructions,
+        bamlScreenshot,
+        domContent,
+        this.options.llm.provider === "claude-code",
+        { tb, collector, clientRegistry, signal: checkRequest() }
+      ))
+    );
     return schema.parse(schema instanceof z.ZodObject ? resp : resp.data);
   }
   // ^ extract could prob be a subset of query w trimmed mem
@@ -4043,10 +4070,10 @@ class MultiModelHarness {
   roles = {};
   uniqueModels = [];
   events = new EventEmitter();
-  constructor(clients, planner) {
+  constructor(clients, policies = {}) {
     const sortedClients = [...clients].sort((a, b) => (b.roles ? b.roles.length : 9999) - (a.roles ? a.roles.length : 9999));
     for (const client of sortedClients) {
-      const harness = new ModelHarness({ llm: client, planner });
+      const harness = new ModelHarness({ llm: client, ...policies });
       this.uniqueModels.push(harness);
       if (client.roles) {
         for (const role of client.roles) {
@@ -4526,7 +4553,7 @@ class Agent {
         }
       }
     }
-    this.models = new MultiModelHarness(llms, this.options.planner);
+    this.models = new MultiModelHarness(llms, { planner: this.options.planner, extract: this.options.extract });
     this.models.events.on("tokensUsed", (usage) => this.events.emit("tokensUsed", usage), this);
     this.doneActing = false;
     this._paused = false;
@@ -8255,4 +8282,4 @@ class DesktopConnector {
 process.env.BAML_LOG = "off";
 setLogLevel("OFF");
 
-export { ActionLimitError, Agent, AgentBusyError, AgentError, AgentMemory, BrowserAgent, BrowserBlockedError, BrowserConnector, BrowserProvider, DesktopConnector, Observation, OperationCancelledError, OperationDeadlineError, PlannerTimeoutError, WebHarness, allBrowserAgentRoles, buildDefaultBrowserAgentOptions, createAction, createId, deepEquals, getCodebaseId, getMachineId, logger, mergeMessages, posthog, retryOnError, retryOnErrorIsSuccess, sendTelemetry, startBrowserAgent };
+export { ActionLimitError, Agent, AgentBusyError, AgentError, AgentMemory, BrowserAgent, BrowserBlockedError, BrowserConnector, BrowserProvider, DesktopConnector, ExtractTimeoutError, Observation, OperationCancelledError, OperationDeadlineError, PlannerTimeoutError, WebHarness, allBrowserAgentRoles, buildDefaultBrowserAgentOptions, createAction, createId, deepEquals, getCodebaseId, getMachineId, logger, mergeMessages, posthog, retryOnError, retryOnErrorIsSuccess, sendTelemetry, startBrowserAgent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddwang/magnitude-core",
-  "version": "0.3.1-ddwang.17",
+  "version": "0.3.1-ddwang.18",
   "description": "Magnitude e2e testing agent",
   "publishConfig": {
     "access": "public"