effect-agent 0.1.0-beta.156 → 0.1.0-beta.157

package/src/core/Agent.ts

@@ -6,7 +6,7 @@ import {
   type Model,
   type Prompt,
   Tool,
-  type Toolkit,
+  Toolkit,
 } from "effect/unstable/ai";
 
 import type { AgentInputError, AgentOutputError, AgentRunDispositionError } from "./AgentError.ts";
@@ -569,9 +569,23 @@ export function make(
     completionNames.add(declaration.tool);
   }
 
+  const tools = Object.values(options.toolkit.tools);
+
+  const readonlyTools = tools.map((tool) =>
+    Tool.isProviderDefined(tool) &&
+    !tool.requiresHandler &&
+    ["web_search", "web_search_preview", "file_search"].includes(tool.providerName)
+      ? tool.annotate(Tool.Readonly, true)
+      : tool,
+  );
+
+  const toolkit = readonlyTools.some((tool, index) => tool !== tools[index])
+    ? Toolkit.make(...readonlyTools)
+    : options.toolkit;
+
   return Object.freeze({
     ...options,
-    toolkit: withUpdateTool(options.toolkit, options.updates),
+    toolkit: withUpdateTool(toolkit, options.updates),
     policy: AgentPolicy.resolve(options.policy),
     policyOverrides: Object.freeze({ ...options.policy }),
     toolExposure:

package/src/core/Usage.ts

@@ -68,6 +68,8 @@ export class ModelCallUsage extends Schema.Class<ModelCallUsage>(
   pricingStatus: Schema.optionalKey(Schema.Literals(["estimated", "unknown"])),
   inputTokens: InputTokenUsage,
   outputTokens: OutputTokenUsage,
+  /** Observed hosted web searches; excludes OpenAI page/find actions. Absent in legacy records. */
+  webSearchCalls: Schema.optionalKey(Schema.Natural),
   costMicrousd: Schema.Natural,
 }) {}
 
@@ -80,6 +82,8 @@ export class RunTotals extends Schema.Class<RunTotals>("@effect-agent/core/RunTo
   modelCalls: Schema.Natural,
   inputTokens: Schema.Natural,
   outputTokens: Schema.Natural,
+  /** Observed hosted web searches; excludes OpenAI page/find actions. Absent in legacy records. */
+  webSearchCalls: Schema.optionalKey(Schema.Natural),
   costMicrousd: Schema.Natural,
   usageStatus: Schema.optionalKey(UsageCompleteness),
   pricingStatus: Schema.optionalKey(UsageCompleteness),
@@ -104,6 +108,7 @@ export class ChildRunUsage extends Schema.Class<ChildRunUsage>("@effect-agent/co
 export const emptyRunTotals = (): RunTotals =>
   RunTotals.make({
     modelCalls: 0,
+    webSearchCalls: 0,
     inputTokens: 0,
     outputTokens: 0,
     costMicrousd: 0,
@@ -133,6 +138,8 @@ export class ModelUsageGroup extends Schema.Class<ModelUsageGroup>(
   modelCalls: Schema.Natural.check(Schema.isGreaterThan(0)),
   inputTokens: InputTokenUsage,
   outputTokens: OutputTokenUsage,
+  /** Observed hosted web searches; excludes OpenAI page/find actions. Absent in legacy records. */
+  webSearchCalls: Schema.optionalKey(Schema.Natural),
   costMicrousd: Schema.Natural,
 }) {}
 
@@ -140,6 +147,8 @@ const RunUsageSummaryFields = Schema.Struct({
   modelCalls: Schema.Natural,
   inputTokens: InputTokenUsage,
   outputTokens: OutputTokenUsage,
+  /** Observed hosted web searches; excludes OpenAI page/find actions. Absent in legacy records. */
+  webSearchCalls: Schema.optionalKey(Schema.Natural),
   costMicrousd: Schema.Natural,
   byModel: Schema.Array(ModelUsageGroup),
   /** Coverage of recorded calls only; interruptions can make the Run less complete. */
@@ -162,6 +171,11 @@ const RunUsageSummaryFields = Schema.Struct({
 
       return (
         new Set(identities).size === identities.length &&
+        (summary.webSearchCalls === undefined ||
+          hasAdditiveTotal(
+            summary.webSearchCalls,
+            summary.byModel.map((group) => group.webSearchCalls ?? 0),
+          )) &&
         hasAdditiveTotal(
           summary.modelCalls,
           summary.byModel.map((group) => group.modelCalls),
@@ -219,6 +233,7 @@ interface MutableUsageGroup {
   readonly serviceTier?: string | undefined;
   readonly pricingVersion?: string | undefined;
   modelCalls: number;
+  webSearchCalls: number | undefined;
   inputTokens: {
     total: number;
     uncached: number;
@@ -267,6 +282,7 @@ export const sumRunTotals = Effect.fn("sumRunTotals")(function* (
   contributions: ReadonlyArray<RunTotals>,
 ): Effect.fn.Return<RunTotals, UsageAggregationError> {
   let modelCalls = 0;
+  let webSearchCalls: number | undefined = 0;
   let inputTokens = 0;
   let outputTokens = 0;
   let costMicrousd = 0;
@@ -282,6 +298,13 @@ export const sumRunTotals = Effect.fn("sumRunTotals")(function* (
     );
 
     modelCalls = yield* checkedAdd("modelCalls", modelCalls, value.modelCalls);
+    if (value.webSearchCalls === undefined && value.modelCalls > 0) webSearchCalls = undefined;
+    else if (webSearchCalls !== undefined)
+      webSearchCalls = yield* checkedAdd(
+        "webSearchCalls",
+        webSearchCalls,
+        value.webSearchCalls ?? 0,
+      );
     inputTokens = yield* checkedAdd("inputTokens", inputTokens, value.inputTokens);
     outputTokens = yield* checkedAdd("outputTokens", outputTokens, value.outputTokens);
     costMicrousd = yield* checkedAdd("costMicrousd", costMicrousd, value.costMicrousd);
@@ -316,6 +339,7 @@ export const sumRunTotals = Effect.fn("sumRunTotals")(function* (
 
   return RunTotals.make({
     modelCalls,
+    ...(webSearchCalls === undefined ? {} : { webSearchCalls }),
     inputTokens,
     outputTokens,
     costMicrousd,
@@ -329,6 +353,7 @@ export const sumRunTotals = Effect.fn("sumRunTotals")(function* (
 export const runTotalsFromSummary = (summary: RunUsageSummary): RunTotals =>
   RunTotals.make({
     modelCalls: summary.modelCalls,
+    ...(summary.webSearchCalls === undefined ? {} : { webSearchCalls: summary.webSearchCalls }),
     inputTokens: summary.inputTokens.total,
     outputTokens: summary.outputTokens.total,
     costMicrousd: summary.costMicrousd,
@@ -363,6 +388,10 @@ export const summarizeModelUsage = Effect.fn("summarizeModelUsage")(function* (
   const outputTokens = initial === undefined ? emptyOutputTokens() : { ...initial.outputTokens };
   const groups = new Map<string, MutableUsageGroup>();
   let modelCalls = initial?.modelCalls ?? 0;
+
+  let webSearchCalls =
+    initial === undefined || initial.modelCalls === 0 ? 0 : initial.webSearchCalls;
+
   let costMicrousd = initial?.costMicrousd ?? 0;
   const hasSeedCalls = modelCalls > 0;
 
@@ -387,6 +416,7 @@ export const summarizeModelUsage = Effect.fn("summarizeModelUsage")(function* (
 
     groups.set(key, {
       ...group,
+      webSearchCalls: group.webSearchCalls,
       inputTokens: { ...group.inputTokens },
       outputTokens: { ...group.outputTokens },
     });
@@ -398,6 +428,10 @@ export const summarizeModelUsage = Effect.fn("summarizeModelUsage")(function* (
     allPricingUnknown &&= call.pricingStatus !== "estimated";
     allPricingComplete &&= call.pricingStatus === "estimated";
     modelCalls = yield* checkedAdd("modelCalls", modelCalls, 1);
+    webSearchCalls =
+      webSearchCalls === undefined || call.webSearchCalls === undefined
+        ? undefined
+        : yield* checkedAdd("webSearchCalls", webSearchCalls, call.webSearchCalls);
     inputTokens.total = yield* checkedAdd(
       "inputTokens.total",
       inputTokens.total,
@@ -453,6 +487,7 @@ export const summarizeModelUsage = Effect.fn("summarizeModelUsage")(function* (
         ...(call.serviceTier === undefined ? {} : { serviceTier: call.serviceTier }),
         ...(call.pricingVersion === undefined ? {} : { pricingVersion: call.pricingVersion }),
         modelCalls: 0,
+        webSearchCalls: 0,
         inputTokens: emptyInputTokens(),
         outputTokens: emptyOutputTokens(),
         costMicrousd: 0,
@@ -460,6 +495,10 @@ export const summarizeModelUsage = Effect.fn("summarizeModelUsage")(function* (
       groups.set(key, group);
     }
     group.modelCalls = yield* checkedAdd("byModel.modelCalls", group.modelCalls, 1);
+    group.webSearchCalls =
+      group.webSearchCalls === undefined || call.webSearchCalls === undefined
+        ? undefined
+        : yield* checkedAdd("byModel.webSearchCalls", group.webSearchCalls, call.webSearchCalls);
     group.inputTokens.total = yield* checkedAdd(
       "byModel.inputTokens.total",
       group.inputTokens.total,
@@ -504,6 +543,7 @@ export const summarizeModelUsage = Effect.fn("summarizeModelUsage")(function* (
 
   return RunUsageSummary.make({
     modelCalls,
+    ...(webSearchCalls === undefined ? {} : { webSearchCalls }),
     inputTokens: InputTokenUsage.make(inputTokens),
     outputTokens: OutputTokenUsage.make(outputTokens),
     costMicrousd,
@@ -520,6 +560,7 @@ export const summarizeModelUsage = Effect.fn("summarizeModelUsage")(function* (
         ...(group.serviceTier === undefined ? {} : { serviceTier: group.serviceTier }),
         ...(group.pricingVersion === undefined ? {} : { pricingVersion: group.pricingVersion }),
         modelCalls: group.modelCalls,
+        ...(group.webSearchCalls === undefined ? {} : { webSearchCalls: group.webSearchCalls }),
         inputTokens: InputTokenUsage.make(group.inputTokens),
         outputTokens: OutputTokenUsage.make(group.outputTokens),
         costMicrousd: group.costMicrousd,

package/src/durable/DurableAgentRuntime.ts

@@ -4559,6 +4559,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
     ctx: AttemptAppendContext,
     submission: SubmissionSnapshot,
     tokenRef: Ref.Ref<OwnershipToken>,
+    renewAtRef: Ref.Ref<number>,
     records: ReadonlyArray<CanonicalRecordEnvelope>,
     canonical: Stream.Stream<CanonicalRecordEnvelope, ThreadStoreError | ThreadNotMaterialized>,
     canonicalThrough: CanonicalSequence,
@@ -5258,6 +5259,9 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
           );
 
           return RunUsageSummary.make({
+            ...(legacyCalls === 0 && detailed.webSearchCalls !== undefined
+              ? { webSearchCalls: detailed.webSearchCalls }
+              : {}),
             modelCalls,
             inputTokens: InputTokenUsage.make({
               total: inputTokens,
@@ -7798,18 +7802,33 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
       // Liveness only: the lease keeps the claim visible; correctness stays with the epoch fence.
       // OwnershipLost ends the race and interrupts the Run fiber cleanly.
       const renewal = halt(
-        Effect.repeat(
-          Effect.gen(function* () {
-            const ownershipToken = yield* Ref.get(tokenRef);
+        Effect.gen(function* () {
+          // Binding selection and preparation consume the acquired lease too. Carry the next
+          // deadline across model continuations; an overdue first renewal must run immediately.
+          const renewAt = yield* Ref.get(renewAtRef);
+          const now = yield* Clock.currentTimeMillis;
 
-            const renewal = yield* ledger.renewOwnership(
-              RenewOwnershipRequest.make({ submissionId, ownershipToken }),
-            );
+          yield* Effect.sleep(Math.max(0, renewAt - now));
+          yield* Effect.repeat(
+            Effect.gen(function* () {
+              const ownershipToken = yield* Ref.get(tokenRef);
+              const renewingAt = yield* Clock.currentTimeMillis;
+
+              const renewal = yield* ledger.renewOwnership(
+                RenewOwnershipRequest.make({ submissionId, ownershipToken }),
+              );
 
-            yield* Ref.set(tokenRef, renewal.ownershipToken);
-          }).pipe(Effect.uninterruptible),
-          { schedule: Schedule.spaced(config.leaseRenewalInterval) },
-        ).pipe(Effect.andThen(Effect.never)),
+              yield* Ref.set(tokenRef, renewal.ownershipToken);
+              yield* Ref.set(
+                renewAtRef,
+                renewingAt + Duration.toMillis(config.leaseRenewalInterval),
+              );
+            }).pipe(Effect.uninterruptible),
+            { schedule: Schedule.spaced(config.leaseRenewalInterval) },
+          );
+
+          return yield* Effect.never;
+        }),
       );
 
       const execution = Effect.raceFirst(consume, Effect.raceFirst(abortWatcher, renewal));
@@ -8031,6 +8050,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
     threadId: ThreadId,
     claim: Claim,
     tokenRef: Ref.Ref<OwnershipToken>,
+    renewAtRef: Ref.Ref<number>,
     resumeAfterRetention: () => void,
     onHandoff: (nextSubmissionId: SubmissionId) => void,
     yieldAfter?: DateTime.Utc,
@@ -8467,6 +8487,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
           ctx,
           submission,
           tokenRef,
+          renewAtRef,
           currentRecords,
           canonical,
           tail.tailSequence,
@@ -8647,6 +8668,8 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
     threadId: ThreadId,
     handoff?: ClaimHandoff,
   ) {
+    const acquiringAt = yield* Clock.currentTimeMillis;
+
     const claimed = yield* ledger.claim(
       ClaimRequest.make({
         threadId,
@@ -8659,6 +8682,10 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
     const claim = claimed.value;
     const tokenRef = yield* Ref.make(claim.ownershipToken);
 
+    const renewAtRef = yield* Ref.make(
+      acquiringAt + Duration.toMillis(config.leaseRenewalInterval),
+    );
+
     yield* Effect.addFinalizer(() =>
       Ref.get(tokenRef).pipe(
         Effect.flatMap((ownershipToken) =>
@@ -8681,7 +8708,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
         message: "The submission adapter did not honor the requested handoff",
       });
 
-    return Option.some({ claim, tokenRef });
+    return Option.some({ claim, tokenRef, renewAtRef });
   }, Effect.uninterruptible);
 
   const processThreadHead = (
@@ -8701,7 +8728,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
           const claimed = yield* acquireClaim(threadId, handoff);
 
           if (Option.isNone(claimed)) return Option.none();
-          const { claim, tokenRef } = claimed.value;
+          const { claim, tokenRef, renewAtRef } = claimed.value;
 
           const attributes = {
             threadId,
@@ -8781,6 +8808,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
                 attemptThreadId,
                 attemptClaim,
                 tokenRef,
+                renewAtRef,
                 () => {
                   resumeAfterRetention = true;
                 },

package/src/durable/LifecyclePublication.ts

@@ -146,10 +146,13 @@ export type LifecyclePublicationBatch = typeof LifecyclePublicationBatch.Type;
 
 /** Native recovery state, independent of Attempts. Hosts serialize drains per storage owner. */
 export interface LifecyclePublicationStorage {
-  /** Select up to `limit` due owners, with a bounded pending prefix for each selected owner. */
+  /** Select up to `limit` due owners, with a bounded pending prefix for each selected owner.
+   * `retainedOnly` excludes unmaterialized source facts, for a precommitted start prefix.
+   */
   readonly pending: (
     nowMillis: number,
     limit: number,
+    options?: { readonly retainedOnly?: boolean },
   ) => Effect.Effect<ReadonlyArray<LifecyclePublicationBatch>, LifecyclePublicationError>;
   /** Atomically acknowledge the exact batch, retaining its identities and fingerprints. */
   readonly acknowledge: (
@@ -166,6 +169,15 @@ export interface LifecyclePublicationStorage {
     timeoutMillis: number,
   ) => Effect.Effect<boolean, LifecyclePublicationError>;
   readonly pendingDeadline: Effect.Effect<Option.Option<number>, LifecyclePublicationError>;
+  /**
+   * Deadline for `pending(..., { retainedOnly: true })`, excluding unmaterialized source facts.
+   * Source-backed stores provide this when `pendingDeadline` also includes source intent.
+   * Otherwise `pendingDeadline` already describes retained work.
+   */
+  readonly retainedPendingDeadline?: Effect.Effect<
+    Option.Option<number>,
+    LifecyclePublicationError
+  >;
   /** Explicit operator retry after repairing a parked owner's destination. */
   readonly retryParked: (
     ownerThreadId: ThreadId,
@@ -259,9 +271,10 @@ export const drainLifecyclePublications = Effect.fn("LifecyclePublication.drain"
   storage: LifecyclePublicationStorage,
   timeoutMillis = 10_000,
   limit = 4,
+  options?: { readonly retainedOnly?: boolean },
 ) {
   const handler = yield* LifecyclePublicationHandler;
-  const pending = yield* storage.pending(yield* Clock.currentTimeMillis, limit);
+  const pending = yield* storage.pending(yield* Clock.currentTimeMillis, limit, options);
 
   let failures: Cause.Cause<LifecyclePublicationError> = Cause.empty;
 

package/src/durable/internal/agent-registration.ts

@@ -111,6 +111,17 @@ export const toolReplayContracts = Effect.fn("AgentRegistration.toolReplayContra
           name: tool.name,
           contract: {
             version,
+            ...(Tool.isProviderDefined(tool)
+              ? {
+                  provider: {
+                    id: tool.id,
+                    providerName: tool.providerName,
+                    args: Schema.decodeUnknownSync(Schema.Json)(tool.args ?? null),
+                    requiresHandler: tool.requiresHandler,
+                  },
+                  readonly: Context.get(tool.annotations, Tool.Readonly),
+                }
+              : {}),
             parameters: jsonSchema(tool.parametersSchema),
             success: jsonSchema(tool.successSchema),
             failure: jsonSchema(tool.failureSchema),

package/src/engine/RunOptions.ts

@@ -348,6 +348,8 @@ export type RunCostEstimateValue = number | RunCostEstimate;
 
 /** Model identity presented beside the legacy raw-usage estimator argument. */
 export interface RunCostEstimateRequest {
+  /** Observed hosted web search calls, separately billed from tokens. */
+  readonly webSearchCalls?: number | undefined;
   readonly provider: string;
   /** Configured binding identity; only response.model identifies the returned model. */
   readonly model: string;
@@ -816,6 +818,7 @@ export type RunTurnResumeSettledCall = typeof RunTurnResumeSettledCallSchema.Typ
 export const RunResumeUsageSchema = Schema.Struct({
   ...RunPolicyUsage.fields,
   modelCalls: Schema.Natural,
+  webSearchCalls: Schema.optionalKey(Schema.Natural),
   inputTokens: Schema.Natural,
   outputTokens: Schema.Natural,
   lastInputTokens: Schema.Natural,

package/src/engine/internal/agent-runtime.ts

@@ -392,6 +392,7 @@ export const AgentResultSchema = <Output extends Schema.Top>(output: Output) =>
 const runTotalsOf = (context: RunContext): RunTotals =>
   RunTotals.make({
     modelCalls: context.modelCalls,
+    ...(context.webSearchCalls === undefined ? {} : { webSearchCalls: context.webSearchCalls }),
     inputTokens: context.inputTokens,
     outputTokens: context.outputTokens,
     costMicrousd: context.costMicrousd,
@@ -560,6 +561,7 @@ interface RunContext {
   usageStatus: typeof UsageCompleteness.Type;
   pricingStatus: typeof UsageCompleteness.Type;
   unobservedModelCalls: number;
+  webSearchCalls: number | undefined;
   readonly childUsage: Map<RunId, Effect.Effect<RunUsageReport>>;
   readonly liveChildren: Set<RunId>;
   consecutiveToolFailures: number;
@@ -1439,6 +1441,7 @@ const decodeResumeUsage = Effect.fn("AgentRuntime.decodeResumeUsage")((input: un
               "unobservedModelCalls",
               "children",
               "modelRestarts",
+              "webSearchCalls",
             ] as const
           )
             .map((key) => [key, read(key, true)])
@@ -3310,6 +3313,12 @@ interface ConsumedUsage {
   readonly modelUsage: ModelCallUsage;
 }
 
+const isWebSearchAction = Schema.is(
+  Schema.Struct({
+    action: Schema.Struct({ type: Schema.Literal("search") }),
+  }),
+);
+
 const ProviderUsage = Schema.Struct({
   inputTokens: Schema.Struct({
     uncached: Schema.optional(Schema.Natural),
@@ -3339,7 +3348,10 @@ const consumeUsage = <AgentValue extends Agent.Any, HookError, HookRequirements>
   toolCallCount: number,
   turn: number,
   options: RunOptions<HookError, HookRequirements>,
-  response: Pick<RunCostEstimateRequest, "response" | "finishMetadata" | "purpose"> = {},
+  response: Pick<
+    RunCostEstimateRequest,
+    "response" | "finishMetadata" | "purpose" | "webSearchCalls"
+  > = {},
 ): Effect.Effect<
   ConsumedUsage,
   AgentPolicyError | ModelProtocolError | HookError,
@@ -3353,6 +3365,8 @@ const consumeUsage = <AgentValue extends Agent.Any, HookError, HookRequirements>
       });
     }
 
+    const webSearchCalls = yield* decodeProviderUsageTotal(response.webSearchCalls ?? 0);
+
     const providerUsage = yield* Schema.decodeEffect(ProviderUsage)(usage).pipe(
       Effect.mapError(() => invalidProviderUsage()),
     );
@@ -3457,7 +3471,13 @@ const consumeUsage = <AgentValue extends Agent.Any, HookError, HookRequirements>
     const estimate =
       options.estimateCostMicrousd === undefined
         ? 0
-        : yield* options.estimateCostMicrousd(usage, { provider, model, usage, ...response });
+        : yield* options.estimateCostMicrousd(usage, {
+            provider,
+            model,
+            usage,
+            ...response,
+            webSearchCalls,
+          });
 
     const costMicrousd = typeof estimate === "number" ? estimate : estimate.costMicrousd;
 
@@ -3488,6 +3508,7 @@ const consumeUsage = <AgentValue extends Agent.Any, HookError, HookRequirements>
     }
 
     const modelUsage = ModelCallUsage.make({
+      webSearchCalls,
       provider,
       model,
       ...(response.response === undefined
@@ -3526,6 +3547,11 @@ const consumeUsage = <AgentValue extends Agent.Any, HookError, HookRequirements>
 
     const modelCalls = yield* decodeProviderUsageTotal(context.modelCalls + 1);
 
+    const cumulativeWebSearchCalls =
+      context.webSearchCalls === undefined
+        ? undefined
+        : yield* decodeProviderUsageTotal(context.webSearchCalls + webSearchCalls);
+
     const cumulativeInputTokens = yield* decodeProviderUsageTotal(
       context.inputTokens + inputTokens,
     );
@@ -3555,6 +3581,7 @@ const consumeUsage = <AgentValue extends Agent.Any, HookError, HookRequirements>
       pricingStatus === "estimated" ? "complete" : "unknown",
     );
     context.modelCalls = modelCalls;
+    context.webSearchCalls = cumulativeWebSearchCalls;
     context.inputTokens = cumulativeInputTokens;
     context.outputTokens = cumulativeOutputTokens;
     context.lastInputTokens = inputTokens;
@@ -4862,6 +4889,12 @@ const eventsForPart = Effect.fnUntraced(function* <Tools extends Record<string,
       const toolCallId = yield* decodeToolCallId(part.id);
       const tool = tools[part.name] as ToolUnion<Tools>;
 
+      if (Tool.isProviderDefined(tool) && !tool.requiresHandler && !part.providerExecuted) {
+        return yield* ModelProtocolError.make({
+          message: `Tool ${part.name} must execute at the provider`,
+        });
+      }
+
       const decoded = yield* Effect.result(
         decodeToolCallParameters<Tools>(tool, part.name, part.params, "model"),
       );
@@ -6216,6 +6249,30 @@ const makeTurn = <
           return consumeUsage(agent, context, trace.usage, toolCallCount, turn, options, {
             response: trace.response,
             finishMetadata: trace.finishMetadata,
+            webSearchCalls: new Set(
+              trace.parts.flatMap((part) => {
+                if (
+                  (part.type !== "tool-call" && part.type !== "tool-result") ||
+                  !part.providerExecuted
+                )
+                  return [];
+                const tool = agent.definition.toolkit.tools[part.name];
+
+                if (
+                  tool === undefined ||
+                  !Tool.isProviderDefined(tool) ||
+                  !["web_search", "web_search_preview"].includes(tool.providerName)
+                )
+                  return [];
+
+                // OpenAI bills search actions, not opening/finding within returned pages.
+                // Preview tools carry the action on results rather than call parameters.
+                return !tool.id.startsWith("openai.") ||
+                  isWebSearchAction(part.type === "tool-call" ? part.params : part.result)
+                  ? [part.id]
+                  : [];
+              }),
+            ).size,
             purpose: "turn",
           }).pipe(
             withCallModel,
@@ -7092,13 +7149,15 @@ const makeTurn = <
 
       // Only the model stream is cancellable. It resolves no application Tools and
       // closes its waiter before continuation can commit a response or start a Handler.
-      // Provider-defined Tools may execute remotely before reporting a part: fail closed
-      // for the whole call when any are exposed.
+      // Hosted effects may happen before reporting a part. Only Tools explicitly
+      // annotated Readonly are safe to discard and repeat.
       const restartSignal =
         policy.restartOnJoinedInput === true &&
         context.modelRestarts < 2 &&
         (options.durability === undefined || options.durability.commitModelRestart !== undefined) &&
-        !Object.values(modelToolkit.tools).some(Tool.isProviderDefined)
+        !Object.values(modelToolkit.tools).some(
+          (tool) => Tool.isProviderDefined(tool) && !Context.get(tool.annotations, Tool.Readonly),
+        )
           ? options.input?.awaitJoin
           : undefined;
 
@@ -8248,6 +8307,10 @@ function streamWithCompletion<
             // canonical response records so token budgets and the compaction
             // trigger keep accounting across ownership changes.
             modelCalls: resumeUsage?.modelCalls ?? 0,
+            webSearchCalls:
+              resumeUsage === undefined || resumeUsage.modelCalls === 0
+                ? 0
+                : resumeUsage.webSearchCalls,
             modelRestarts: resumeUsage?.modelRestarts ?? 0,
             usageStatus:
               resumeUsage?.usageStatus ?? (resumeUsage === undefined ? "complete" : "unknown"),

package/dist/Agent-1DMSO_Fl.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Agent-1DMSO_Fl.mjs","names":[],"sources":["../src/core/internal/agent-updates.ts","../src/core/Agent.ts"],"sourcesContent":["import { Schema } from \"effect\";\nimport { Tool, Toolkit } from \"effect/unstable/ai\";\n\nimport { Emitter, UpdateError } from \"../AgentUpdates.ts\";\n\n/** Definition-owned native Tool. Runtime supplies its handler under the same identity. */\nexport const updateTool = <S extends Schema.Top>(schema: S) =>\n  Tool.make(\"emit_update\", {\n    description:\n      \"Emit a structured intermediate update. Success acknowledges acceptance by this Run; \" +\n      \"parent delivery and processing are separate. This does not complete the task.\",\n    parameters: Schema.Struct({ value: schema }),\n    success: Schema.Struct({ emitted: Schema.Literal(true) }),\n    failure: UpdateError,\n    failureMode: \"return\",\n  }).addDependency(Emitter);\n\nexport type UpdateToolkit<\n  T extends Toolkit.Any,\n  S extends Schema.Top | undefined,\n> = S extends Schema.Top\n  ? Toolkit.Toolkit<T[\"tools\"] & { readonly emit_update: ReturnType<typeof updateTool<S>> }>\n  : T;\n\nexport const withUpdateTool = (\n  toolkit: Toolkit.Any,\n  schema: Schema.Top | undefined,\n): Toolkit.Any => {\n  if (schema === undefined) return toolkit;\n  if (Object.hasOwn(toolkit.tools, \"emit_update\"))\n    throw new TypeError(\"emit_update is reserved for Agent updates\");\n\n  return Toolkit.make(...Object.values(toolkit.tools), updateTool(schema));\n};\n","import type { Effect, Layer, Option, Schema } from \"effect\";\nimport * as S from \"effect/Schema\";\nimport {\n  type AiError,\n  type LanguageModel,\n  type Model,\n  type Prompt,\n  Tool,\n  type Toolkit,\n} from \"effect/unstable/ai\";\n\nimport type { AgentInputError, AgentOutputError, AgentRunDispositionError } from \"./AgentError.ts\";\nimport { AgentPolicy, type AgentPolicyInput } from \"./AgentPolicy.ts\";\nimport { AgentId } from \"./Identifiers.ts\";\nimport { type UpdateToolkit, withUpdateTool } from \"./internal/agent-updates.ts\";\nimport type { Configuration } from \"./ToolExposure.ts\";\n\n/** Prompt input produced directly or by an Effect that preserves its failure and requirements. */\nexport type InstructionResult<E = never, R = never> =\n  | Prompt.RawInput\n  | Effect.Effect<Prompt.RawInput, E, R>;\n\n/** Static prompt input or an input-dependent source evaluated once while preparing a run. */\nexport type InstructionSource<Input, E = never, R = never> =\n  | Prompt.RawInput\n  | ((input: Input) => InstructionResult<E, R>);\n\n/** Definition-owned projection from decoded Agent input to model-visible prompt content. */\nexport type InputPromptSource<Input, E = never, R = never> = (\n  input: Input,\n) => InstructionResult<E, R>;\n\n/** Native services needed to execute and identify model calls. */\nexport type ModelServices = LanguageModel.LanguageModel | Model.ProviderName | Model.ModelName;\n\n/**\n * An optional capability on a provided LanguageModel service. The runtime supplies\n * only model-visible task context and eligible Tool descriptions after validating input.\n * The resolver owns retaining one choice per Thread, including across Runs and\n * recovery; it captures client requirements and returns a closed native Layer\n * that the interpreter acquires for the Run. Context hooks may prepare prompts\n * but cannot replace this model through a per-Turn modelCall.\n * Selection failures remain AiError values and all selector/client services stay in R.\n */\nexport interface ModelResolver extends LanguageModel.LanguageModel {\n  readonly resolve: (request: {\n    readonly threadId: string;\n    readonly state: Schema.JsonObject;\n  }) => Effect.Effect<Layer.Layer<ModelServices>, AiError.AiError>;\n}\n\n/** Detect the deferred resolver capability on a trusted, host-provided model service. */\nexport const isModelResolver = (model: LanguageModel.LanguageModel): model is ModelResolver =>\n  \"resolve\" in model && typeof model.resolve === \"function\";\n\n/** Accepts native model Layers that provide generation and model identity. */\nexport type NativeModel<ModelValue> =\n  ModelValue extends Layer.Layer<infer Provides, never, infer _Requires>\n    ? ModelServices extends Provides\n      ? ModelValue\n      : never\n    : never;\n\n/** Definition-owned boundary for selecting and validating an application run disposition. */\nexport interface RunDispositionDeclaration<Output, DispositionSchema extends Schema.Top> {\n  /**\n   * Opt background workers into one retained assignment. The encoded disposition must be\n   * Worker.AssignmentDisposition: completed seals the worker, waiting leaves it steerable.\n   * Failures and exhausted Runs seal as failed; aborting an active Run seals as cancelled.\n   * The worker origin retains this choice. Omission preserves reusable workers.\n   */\n  readonly workerLifecycle?: \"assignment\" | undefined;\n  /** Canonical Schema used to validate and encode the selected disposition. */\n  readonly schema: DispositionSchema;\n  /** Pure selection from decoded output. `undefined` declares none, except for assignments. */\n  readonly fromOutput: (output: Output) => unknown;\n}\n\n/** Values available to a Definition-owned completion Tool projector after canonical decoding. */\nexport interface CompletionProjectionInput<Parameters = unknown, Result = unknown> {\n  readonly parameters: Parameters;\n  readonly result: Result;\n}\n\n/**\n * One application Tool whose successful result can complete its owning Agent when it is the\n * only application call. Provider-executed calls may accompany it only with terminal results.\n * Mixed, wholly unexecuted application batches are rejected with failed Tool results so the\n * model can correct them within ordinary Run budgets; completed provider results are retained.\n * Missing provider results and invalid pending resumed batches fail closed. The completion\n * designation never permits side-effect replay.\n */\nexport interface CompletionToolDeclaration<\n  Parameters = unknown,\n  Result = unknown,\n  Output = unknown,\n> {\n  readonly tool: string;\n  /** Require native Tool use on every model Turn and this Tool for final completion. */\n  readonly required?: boolean | undefined;\n  readonly project: (input: CompletionProjectionInput<Parameters, Result>) => Output;\n}\n\ntype CompletionToolFor<ToolkitValue extends Toolkit.Any, Output> = {\n  readonly [Name in keyof ToolkitValue[\"tools\"] & string]: CompletionToolDeclaration<\n    Tool.Parameters<ToolkitValue[\"tools\"][Name]>,\n    Tool.Success<ToolkitValue[\"tools\"][Name]>,\n    Output\n  > & { readonly tool: Name };\n}[keyof ToolkitValue[\"tools\"] & string];\n\n/**\n * An ordinary action Tool whose canonical success may satisfy the whole request.\n * Projectors must be pure and deterministic: recovery re-evaluates them. None preserves\n * ordinary continuation; Some is validated as the Agent output. These Tools must be the sole\n * application call; terminal provider results may accompany them. They never receive the\n * required completion Tool's exhaustion allowance.\n */\nexport interface CompletionFromToolDeclaration<\n  Parameters = unknown,\n  Result = unknown,\n  Output = unknown,\n> {\n  readonly tool: string;\n  readonly project: (input: CompletionProjectionInput<Parameters, Result>) => Option.Option<Output>;\n}\n\ntype CompletionFromToolFor<ToolkitValue extends Toolkit.Any, Output> = {\n  readonly [Name in keyof ToolkitValue[\"tools\"] & string]: CompletionFromToolDeclaration<\n    Tool.Parameters<ToolkitValue[\"tools\"][Name]>,\n    Tool.Success<ToolkitValue[\"tools\"][Name]>,\n    Output\n  > & { readonly tool: Name };\n}[keyof ToolkitValue[\"tools\"] & string];\n\n/** Immutable, model-agnostic schemas, behavior, tools, and bounds for an agent. */\nexport interface Definition<\n  InputSchema extends Schema.Top,\n  OutputSchema extends Schema.Top,\n  Instructions,\n  ToolkitValue extends Toolkit.Any,\n  RunDispositionValue = undefined,\n  InputPromptValue = undefined,\n  UpdatesSchema extends Schema.Top | undefined = undefined,\n> {\n  /** Stable agent identity; changing it creates a distinct definition identity. */\n  readonly id: AgentId;\n  /** Canonical Schema for intermediate updates emitted by this Agent. */\n  readonly updates?: UpdatesSchema;\n  /** Canonical schema used to decode and encode run input. */\n  readonly input: InputSchema;\n  /** Canonical schema used to decode the final model output. */\n  readonly output: OutputSchema;\n  /**\n   * Evaluated once while preparing each Run. OpenAI, xAI and native adapters advertising support\n   * preserve chronological system messages, omitting exact repeats only when no distinct system\n   * instruction intervenes. The actual selected model determines support on each call. Other\n   * adapters group systems first and keep the last exact repeat, including provider options;\n   * Anthropic requires an upstream adapter with mid-conversation system-message support.\n   * Stored history is unchanged.\n   */\n  readonly instructions: Instructions;\n  /** Optional projection from decoded input to model-visible native Effect AI prompt content. */\n  readonly inputPrompt?: InputPromptValue | undefined;\n  /** Native Effect AI toolkit whose failures and requirements remain visible. */\n  readonly toolkit: ToolkitValue;\n  readonly toolExposure?: Configuration | undefined;\n  /** Finite execution bounds enforced by the runtime. */\n  readonly policy: AgentPolicy;\n  /** Explicit policy fields, retained so delegated runs can inherit omitted fields. */\n  readonly policyOverrides?: Partial<AgentPolicyInput> | undefined;\n  /** Optional successful Tool result that projects directly to the Agent output and settles. */\n  readonly completion?: CompletionToolDeclaration | undefined;\n  readonly completionFromTools?: ReadonlyArray<CompletionFromToolDeclaration> | undefined;\n  readonly runDisposition?: RunDispositionValue | undefined;\n  readonly description?: string | undefined;\n  readonly metadata?: Readonly<Record<string, string>> | undefined;\n}\n\n/** Options for a model-agnostic agent definition. */\nexport interface DefinitionOptions<\n  InputSchema extends Schema.Top,\n  OutputSchema extends Schema.Top,\n  Instructions extends InstructionSource<InputSchema[\"Type\"], unknown, unknown>,\n  ToolkitValue extends Toolkit.Any,\n  RunDispositionValue extends\n    | RunDispositionDeclaration<OutputSchema[\"Type\"], Schema.Top>\n    | undefined = undefined,\n  InputPromptValue extends InputPromptSource<InputSchema[\"Type\"], unknown, unknown> | undefined =\n    undefined,\n  UpdatesSchema extends Schema.Top | undefined = undefined,\n> {\n  readonly updates?: UpdatesSchema;\n  readonly input: InputSchema;\n  readonly output: OutputSchema;\n  readonly instructions: Instructions;\n  readonly inputPrompt?: InputPromptValue | undefined;\n  readonly toolkit: ToolkitValue;\n  readonly toolExposure?: Configuration | undefined;\n  readonly policy?: Partial<AgentPolicyInput> | undefined;\n  readonly completion?: CompletionToolFor<ToolkitValue, OutputSchema[\"Type\"]> | undefined;\n  readonly completionFromTools?:\n    | ReadonlyArray<CompletionFromToolFor<ToolkitValue, OutputSchema[\"Type\"]>>\n    | undefined;\n  readonly runDisposition?: RunDispositionValue | undefined;\n  readonly description?: string | undefined;\n  readonly metadata?: Readonly<Record<string, string>> | undefined;\n}\n\ntype AnyDefinitionShape = Definition<\n  Schema.Top,\n  Schema.Top,\n  unknown,\n  Toolkit.Any,\n  RunDispositionDeclaration<never, Schema.Top> | undefined,\n  unknown,\n  Schema.Top | undefined\n>;\n\n/** Immutable pairing of an agent definition with a native model Layer or thread resolver. */\nexport interface Binding<DefinitionValue extends AnyDefinitionShape, ModelValue> {\n  readonly definition: DefinitionValue;\n  readonly model: NativeModel<ModelValue>;\n}\n\ntype InstructionEffect<Instructions, Input> = Instructions extends (input: Input) => infer Result\n  ? Result\n  : Instructions;\n\ntype InputPromptEffect<InputPrompt, Input> = InputPrompt extends (input: Input) => infer Result\n  ? Result\n  : never;\n\ntype EffectError<Value> =\n  Value extends Effect.Effect<infer _Success, infer Error, infer _Services> ? Error : never;\n\ntype EffectServices<Value> =\n  Value extends Effect.Effect<infer _Success, infer _Error, infer Services> ? Services : never;\n\ntype ModelRequirements<Value> =\n  Value extends Layer.Layer<infer _Provides, infer _Error, infer Services> ? Services : never;\n\n/** Constructors and type projections for definitions and runnable model bindings. */\n\n/** Type-erased definition used at generic framework boundaries. */\nexport type AnyDefinition = AnyDefinitionShape;\n\n/** Read-only interpreter program or binding used at inspection and projection boundaries. */\nexport interface Any {\n  readonly definition: AnyDefinition;\n  readonly model?: unknown;\n}\n\n/** Native Tool configuration for inspection; it does not predict an invocation's outcome. */\nexport const ToolInspection = S.Struct({\n  name: S.String,\n  failureMode: S.Literals([\"error\", \"return\"]),\n  /** False for provider-executed Tools, whose results do not pass through local handlers. */\n  requiresHandler: S.Boolean,\n});\n\nexport type ToolInspection = typeof ToolInspection.Type;\n\n/**\n * Inspect registered native Tools in declaration order without acquiring handlers or a Model.\n * This is the full Definition toolkit, before run-specific visibility or exposure filtering.\n * `failureMode` is Effect AI's configured mode, including its `\"error\"` default. Handler-level\n * recovery, programmatic invocation and Subagent containment can change where failures go;\n * consult execution diagnostics for the actual route. No arguments, results or services are read.\n */\nexport const inspectTools = (agent: AnyDefinition | Any): ReadonlyArray<ToolInspection> => {\n  const definition = \"definition\" in agent ? agent.definition : agent;\n\n  return Object.values(definition.toolkit.tools).map((tool) =>\n    ToolInspection.make({\n      name: tool.name,\n      failureMode: tool.failureMode,\n      requiresHandler: !Tool.isProviderDefined(tool) || tool.requiresHandler,\n    }),\n  );\n};\n\ntype DefinitionOf<AgentValue extends AnyDefinition | Any> = AgentValue extends {\n  readonly definition: infer DefinitionValue extends AnyDefinition;\n}\n  ? DefinitionValue\n  : AgentValue;\n\ntype RunDispositionSchemaOf<DefinitionValue extends AnyDefinition> = [\n  Exclude<DefinitionValue[\"runDisposition\"], undefined>,\n] extends [never]\n  ? never\n  : Exclude<DefinitionValue[\"runDisposition\"], undefined> extends RunDispositionDeclaration<\n        never,\n        infer DispositionSchema\n      >\n    ? DispositionSchema\n    : never;\n\n/** Literal Agent ID, retained by Agent.make. */\nexport type Name<A extends AnyDefinition | Any> = DefinitionOf<A>[\"id\"] extends AgentId &\n  (infer N extends string)\n  ? N\n  : string;\n\n/** Declared update Schema, or never for Agents without updates. */\nexport type UpdatesSchema<A extends AnyDefinition | Any> = Exclude<\n  DefinitionOf<A>[\"updates\"],\n  undefined\n>;\n\n/** Decoded intermediate update value. */\nexport type Update<A extends AnyDefinition | Any> = UpdatesSchema<A>[\"Type\"];\n\n/** Decoded input type of a definition or binding. */\nexport type Input<AgentValue extends AnyDefinition | Any> =\n  DefinitionOf<AgentValue>[\"input\"][\"Type\"];\n\n/** Encoded input accepted by the primary execution operations. */\nexport type EncodedInput<AgentValue extends AnyDefinition | Any> =\n  DefinitionOf<AgentValue>[\"input\"][\"Encoded\"];\n\n/** Decoded output type of a definition or binding. */\nexport type Output<AgentValue extends AnyDefinition | Any> =\n  DefinitionOf<AgentValue>[\"output\"][\"Type\"];\n\n/** Input Schema carried by a definition or binding. */\nexport type InputSchema<AgentValue extends AnyDefinition | Any> = DefinitionOf<AgentValue>[\"input\"];\n\n/** Output Schema carried by a definition or binding. */\nexport type OutputSchema<AgentValue extends AnyDefinition | Any> =\n  DefinitionOf<AgentValue>[\"output\"];\n\n/** Application run-disposition Schema carried by a definition or binding, or `never`. */\nexport type RunDispositionSchema<AgentValue extends AnyDefinition | Any> = RunDispositionSchemaOf<\n  DefinitionOf<AgentValue>\n>;\n\n/** Decoded application run disposition declared by a definition or binding. */\nexport type RunDisposition<AgentValue extends AnyDefinition | Any> = [\n  RunDispositionSchema<AgentValue>,\n] extends [never]\n  ? never\n  : RunDispositionSchema<AgentValue>[\"Type\"];\n\n/** Validation failure admitted only by definitions that declare a run disposition. */\nexport type RunDispositionFailure<AgentValue extends AnyDefinition | Any> = [\n  RunDispositionSchemaOf<DefinitionOf<AgentValue>>,\n] extends [never]\n  ? never\n  : AgentRunDispositionError;\n\n/** Effect AI tool map carried by a definition or binding. */\nexport type Tools<AgentValue extends AnyDefinition | Any> = Toolkit.Tools<\n  DefinitionOf<AgentValue>[\"toolkit\"]\n>;\n\ntype ApplicationTools<A extends AnyDefinition> = [UpdatesSchema<A>] extends [never]\n  ? Tools<A>\n  : Omit<Tools<A>, \"emit_update\">;\n\ntype ToolMapValues<ToolMap extends Record<string, Tool.Any>> = ToolMap extends unknown\n  ? ToolMap[keyof ToolMap]\n  : never;\n\n/** All possible tools, including keys present in only one definition or binding branch. */\nexport type ToolUnion<AgentValue extends AnyDefinition | Any> = ToolMapValues<Tools<AgentValue>>;\n\n/** Instruction, tool-handler, and Schema services required before a Model is bound. */\nexport type DefinitionRequirements<DefinitionValue extends AnyDefinition> =\n  DefinitionValue extends unknown\n    ?\n        | EffectServices<InstructionEffect<DefinitionValue[\"instructions\"], Input<DefinitionValue>>>\n        | EffectServices<InputPromptEffect<DefinitionValue[\"inputPrompt\"], Input<DefinitionValue>>>\n        | Tool.HandlersFor<ApplicationTools<DefinitionValue>>\n        | Tool.HandlerServices<ToolMapValues<ApplicationTools<DefinitionValue>>>\n        // The interpreter canonically re-encodes decoded Tool parameters before recording them.\n        | Tool.ParametersSchema<ToolUnion<DefinitionValue>>[\"EncodingServices\"]\n        | Tool.SuccessSchema<ToolUnion<DefinitionValue>>[\"DecodingServices\"]\n        | DefinitionValue[\"input\"][\"DecodingServices\"]\n        | DefinitionValue[\"input\"][\"EncodingServices\"]\n        | DefinitionValue[\"output\"][\"DecodingServices\"]\n        | DefinitionValue[\"output\"][\"EncodingServices\"]\n        | UpdatesSchema<DefinitionValue>[\"DecodingServices\"]\n        | UpdatesSchema<DefinitionValue>[\"EncodingServices\"]\n        | RunDispositionSchemaOf<DefinitionValue>[\"DecodingServices\"]\n        | RunDispositionSchemaOf<DefinitionValue>[\"EncodingServices\"]\n    : never;\n\n/** Definition services plus native model services, or a binding's model Layer requirements. */\nexport type Requirements<AgentValue extends AnyDefinition | Any> =\n  | DefinitionRequirements<DefinitionOf<AgentValue>>\n  | (AgentValue extends { readonly model: infer ModelValue }\n      ? ModelRequirements<ModelValue>\n      : ModelServices);\n\n// Distribute after unwrapping bindings too: withModel may itself contain a definition union.\ntype DefinitionFailure<DefinitionValue extends AnyDefinition> = DefinitionValue extends unknown\n  ?\n      | EffectError<InstructionEffect<DefinitionValue[\"instructions\"], Input<DefinitionValue>>>\n      | EffectError<InputPromptEffect<DefinitionValue[\"inputPrompt\"], Input<DefinitionValue>>>\n      | Tool.HandlerError<ToolUnion<DefinitionValue>>\n  : never;\n\n/** Failures from every possible definition, preserving each branch's instruction input type. */\nexport type Failure<AgentValue extends AnyDefinition | Any> =\n  | DefinitionFailure<DefinitionOf<AgentValue>>\n  | AiError.AiError\n  | AgentInputError\n  | AgentOutputError\n  | RunDispositionFailure<AgentValue>;\n\n/** Validate an agent ID and return a shallowly frozen, model-agnostic definition. */\nexport function make<\n  const Name extends string,\n  InputSchema extends Schema.Top,\n  OutputSchema extends Schema.Top,\n  Instructions extends InstructionSource<InputSchema[\"Type\"], unknown, unknown>,\n  ToolkitValue extends Toolkit.Any,\n  DispositionSchema extends Schema.Top,\n  InputPromptValue extends InputPromptSource<InputSchema[\"Type\"], unknown, unknown> | undefined,\n  UpdatesSchema extends Schema.Top | undefined = undefined,\n>(\n  id: Name,\n  options: DefinitionOptions<\n    InputSchema,\n    OutputSchema,\n    Instructions,\n    ToolkitValue,\n    RunDispositionDeclaration<OutputSchema[\"Type\"], DispositionSchema>,\n    InputPromptValue,\n    UpdatesSchema\n  > & {\n    readonly runDisposition: RunDispositionDeclaration<OutputSchema[\"Type\"], DispositionSchema>;\n    readonly inputPrompt: InputPromptValue;\n  },\n): Definition<\n  InputSchema,\n  OutputSchema,\n  Instructions,\n  UpdateToolkit<ToolkitValue, NoInfer<UpdatesSchema>>,\n  RunDispositionDeclaration<OutputSchema[\"Type\"], DispositionSchema>,\n  InputPromptValue,\n  NoInfer<UpdatesSchema>\n> & { readonly id: AgentId & Name };\n\nexport function make<\n  const Name extends string,\n  InputSchema extends Schema.Top,\n  OutputSchema extends Schema.Top,\n  Instructions extends InstructionSource<InputSchema[\"Type\"], unknown, unknown>,\n  ToolkitValue extends Toolkit.Any,\n  DispositionSchema extends Schema.Top,\n  UpdatesSchema extends Schema.Top | undefined = undefined,\n>(\n  id: Name,\n  options: DefinitionOptions<\n    InputSchema,\n    OutputSchema,\n    Instructions,\n    ToolkitValue,\n    RunDispositionDeclaration<OutputSchema[\"Type\"], DispositionSchema>,\n    undefined,\n    UpdatesSchema\n  > & {\n    readonly runDisposition: RunDispositionDeclaration<OutputSchema[\"Type\"], DispositionSchema>;\n    readonly inputPrompt?: undefined;\n  },\n): Definition<\n  InputSchema,\n  OutputSchema,\n  Instructions,\n  UpdateToolkit<ToolkitValue, NoInfer<UpdatesSchema>>,\n  RunDispositionDeclaration<OutputSchema[\"Type\"], DispositionSchema>,\n  undefined,\n  NoInfer<UpdatesSchema>\n> & { readonly id: AgentId & Name };\n\nexport function make<\n  const Name extends string,\n  InputSchema extends Schema.Top,\n  OutputSchema extends Schema.Top,\n  Instructions extends InstructionSource<InputSchema[\"Type\"], unknown, unknown>,\n  ToolkitValue extends Toolkit.Any,\n  InputPromptValue extends InputPromptSource<InputSchema[\"Type\"], unknown, unknown> | undefined,\n  UpdatesSchema extends Schema.Top | undefined = undefined,\n>(\n  id: Name,\n  options: DefinitionOptions<\n    InputSchema,\n    OutputSchema,\n    Instructions,\n    ToolkitValue,\n    undefined,\n    InputPromptValue,\n    UpdatesSchema\n  > & {\n    readonly inputPrompt: InputPromptValue;\n    readonly runDisposition?: undefined;\n  },\n): Definition<\n  InputSchema,\n  OutputSchema,\n  Instructions,\n  UpdateToolkit<ToolkitValue, NoInfer<UpdatesSchema>>,\n  undefined,\n  InputPromptValue,\n  NoInfer<UpdatesSchema>\n> & { readonly id: AgentId & Name };\n\nexport function make<\n  const Name extends string,\n  InputSchema extends Schema.Top,\n  OutputSchema extends Schema.Top,\n  Instructions extends InstructionSource<InputSchema[\"Type\"], unknown, unknown>,\n  ToolkitValue extends Toolkit.Any,\n  UpdatesSchema extends Schema.Top | undefined = undefined,\n>(\n  id: Name,\n  options: DefinitionOptions<\n    InputSchema,\n    OutputSchema,\n    Instructions,\n    ToolkitValue,\n    undefined,\n    undefined,\n    UpdatesSchema\n  > & {\n    readonly inputPrompt?: undefined;\n    readonly runDisposition?: undefined;\n  },\n): Definition<\n  InputSchema,\n  OutputSchema,\n  Instructions,\n  UpdateToolkit<ToolkitValue, NoInfer<UpdatesSchema>>,\n  undefined,\n  undefined,\n  NoInfer<UpdatesSchema>\n> & { readonly id: AgentId & Name };\n\nexport function make(\n  id: string,\n  options: {\n    readonly updates?: Schema.Top | undefined;\n    readonly input: Schema.Top;\n    readonly output: Schema.Top;\n    readonly instructions: unknown;\n    readonly inputPrompt?: unknown;\n    readonly toolkit: Toolkit.Any;\n    readonly toolExposure?: Configuration | undefined;\n    readonly policy?: Partial<AgentPolicyInput> | undefined;\n    readonly completion?: CompletionToolDeclaration | undefined;\n    readonly completionFromTools?: ReadonlyArray<CompletionFromToolDeclaration> | undefined;\n    readonly runDisposition?: RunDispositionDeclaration<never, Schema.Top> | undefined;\n    readonly description?: string | undefined;\n    readonly metadata?: Readonly<Record<string, string>> | undefined;\n  },\n): AnyDefinition {\n  const completionNames = new Set<string>();\n\n  for (const declaration of options.completionFromTools ?? []) {\n    if (declaration.tool === options.completion?.tool || completionNames.has(declaration.tool)) {\n      throw new Error(`Tool ${declaration.tool} has more than one completion declaration`);\n    }\n    if (!Object.hasOwn(options.toolkit.tools, declaration.tool)) {\n      throw new Error(`Unknown completion Tool ${declaration.tool}`);\n    }\n    completionNames.add(declaration.tool);\n  }\n\n  return Object.freeze({\n    ...options,\n    toolkit: withUpdateTool(options.toolkit, options.updates),\n    policy: AgentPolicy.resolve(options.policy),\n    policyOverrides: Object.freeze({ ...options.policy }),\n    toolExposure:\n      options.toolExposure === undefined\n        ? undefined\n        : Object.freeze({\n            ...options.toolExposure,\n            initialToolNames: Object.freeze([...(options.toolExposure.initialToolNames ?? [])]),\n          }),\n    id: S.decodeSync(AgentId)(id),\n    metadata: options.metadata === undefined ? undefined : Object.freeze({ ...options.metadata }),\n    completion:\n      options.completion === undefined ? undefined : Object.freeze({ ...options.completion }),\n    completionFromTools:\n      options.completionFromTools === undefined\n        ? undefined\n        : Object.freeze(\n            options.completionFromTools.map((declaration) => Object.freeze({ ...declaration })),\n          ),\n    runDisposition:\n      options.runDisposition === undefined\n        ? undefined\n        : Object.freeze({ ...options.runDisposition }),\n  });\n}\n\n/** Bind a native model or thread resolver without acquiring or hiding its requirements. */\nexport const withModel = <DefinitionValue extends AnyDefinition, ModelValue>(\n  definition: DefinitionValue,\n  model: NativeModel<ModelValue>,\n): Binding<DefinitionValue, ModelValue> =>\n  Object.freeze({\n    definition,\n    model,\n  });\n"],"mappings":";;;;;;;;;AAMA,MAAa,cAAoC,WAC/C,KAAK,KAAK,eAAe;CACvB,aACE;CAEF,YAAY,OAAO,OAAO,EAAE,OAAO,OAAO,CAAC;CAC3C,SAAS,OAAO,OAAO,EAAE,SAAS,OAAO,QAAQ,IAAI,EAAE,CAAC;CACxD,SAAS;CACT,aAAa;AACf,CAAC,CAAC,CAAC,cAAc,OAAO;AAS1B,MAAa,kBACX,SACA,WACgB;CAChB,IAAI,WAAW,KAAA,GAAW,OAAO;CACjC,IAAI,OAAO,OAAO,QAAQ,OAAO,aAAa,GAC5C,MAAM,IAAI,UAAU,2CAA2C;CAEjE,OAAO,QAAQ,KAAK,GAAG,OAAO,OAAO,QAAQ,KAAK,GAAG,WAAW,MAAM,CAAC;AACzE;;;;;;;;;;;ACmBA,MAAa,mBAAmB,UAC9B,aAAa,SAAS,OAAO,MAAM,YAAY;;AAyMjD,MAAa,iBAAiB,EAAE,OAAO;CACrC,MAAM,EAAE;CACR,aAAa,EAAE,SAAS,CAAC,SAAS,QAAQ,CAAC;;CAE3C,iBAAiB,EAAE;AACrB,CAAC;;;;;;;;AAWD,MAAa,gBAAgB,UAA8D;CACzF,MAAM,aAAa,gBAAgB,QAAQ,MAAM,aAAa;CAE9D,OAAO,OAAO,OAAO,WAAW,QAAQ,KAAK,CAAC,CAAC,KAAK,SAClD,eAAe,KAAK;EAClB,MAAM,KAAK;EACX,aAAa,KAAK;EAClB,iBAAiB,CAAC,KAAK,kBAAkB,IAAI,KAAK,KAAK;CACzD,CAAC,CACH;AACF;AAqQA,SAAgB,KACd,IACA,SAee;CACf,MAAM,kCAAkB,IAAI,IAAY;CAExC,KAAK,MAAM,eAAe,QAAQ,uBAAuB,CAAC,GAAG;EAC3D,IAAI,YAAY,SAAS,QAAQ,YAAY,QAAQ,gBAAgB,IAAI,YAAY,IAAI,GACvF,MAAM,IAAI,MAAM,QAAQ,YAAY,KAAK,0CAA0C;EAErF,IAAI,CAAC,OAAO,OAAO,QAAQ,QAAQ,OAAO,YAAY,IAAI,GACxD,MAAM,IAAI,MAAM,2BAA2B,YAAY,MAAM;EAE/D,gBAAgB,IAAI,YAAY,IAAI;CACtC;CAEA,OAAO,OAAO,OAAO;EACnB,GAAG;EACH,SAAS,eAAe,QAAQ,SAAS,QAAQ,OAAO;EACxD,QAAQ,YAAY,QAAQ,QAAQ,MAAM;EAC1C,iBAAiB,OAAO,OAAO,EAAE,GAAG,QAAQ,OAAO,CAAC;EACpD,cACE,QAAQ,iBAAiB,KAAA,IACrB,KAAA,IACA,OAAO,OAAO;GACZ,GAAG,QAAQ;GACX,kBAAkB,OAAO,OAAO,CAAC,GAAI,QAAQ,aAAa,oBAAoB,CAAC,CAAE,CAAC;EACpF,CAAC;EACP,IAAI,EAAE,WAAW,OAAO,CAAC,CAAC,EAAE;EAC5B,UAAU,QAAQ,aAAa,KAAA,IAAY,KAAA,IAAY,OAAO,OAAO,EAAE,GAAG,QAAQ,SAAS,CAAC;EAC5F,YACE,QAAQ,eAAe,KAAA,IAAY,KAAA,IAAY,OAAO,OAAO,EAAE,GAAG,QAAQ,WAAW,CAAC;EACxF,qBACE,QAAQ,wBAAwB,KAAA,IAC5B,KAAA,IACA,OAAO,OACL,QAAQ,oBAAoB,KAAK,gBAAgB,OAAO,OAAO,EAAE,GAAG,YAAY,CAAC,CAAC,CACpF;EACN,gBACE,QAAQ,mBAAmB,KAAA,IACvB,KAAA,IACA,OAAO,OAAO,EAAE,GAAG,QAAQ,eAAe,CAAC;CACnD,CAAC;AACH;;AAGA,MAAa,aACX,YACA,UAEA,OAAO,OAAO;CACZ;CACA;AACF,CAAC"}