@economic/agents 2.3.25 → 2.3.27

package/dist/index.d.mts

@@ -83,6 +83,31 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
    */
   protected getRemoteSkills(): string[];
   private _getAuthorizedTools;
+  /**
+   * Wrap each tool's `execute` so it falls back to the current turn's tool
+   * context ({@link _toolContextForCurrentTurn}: request body + `_userContext`)
+   * when the caller supplies none. A caller-supplied `experimental_context`
+   * always wins, so normal steps — where {@link beforeStep} provides the
+   * context — are untouched.
+   *
+   * The fallback exists for the approval continuation: when a `needsApproval`
+   * tool is approved, the AI SDK executes it BEFORE the step loop starts, so no
+   * `beforeStep` runs for it and `execute` receives `experimental_context:
+   * undefined` — which stripped action tools of their auth token / user context
+   * after approval. The continuation is a turn of its own: {@link beforeTurn}
+   * re-sets {@link _toolContextForCurrentTurn} from the approval request's body
+   * before the SDK executes the tool, so the fallback context is the approval
+   * request's — clients must resend anything tools need (e.g. tokens) on it.
+   *
+   * TODO: remove once @cloudflare/think supports a turn-level
+   * `experimental_context` (its TurnConfig has no such field and it passes none
+   * to `streamText`, so only `beforeStep` can supply one — and the approval
+   * execution happens before any step).
+   *
+   * See {@link withFallbackToolContext} for the wrap itself, which preserves an
+   * `async function*` `execute`'s streaming shape.
+   */
+  private _withTurnContextFallback;
   private _getLastActivatedSkillName;
   /**
    * Override to enable JWT authentication on WebSocket connections.

package/dist/index.mjs

@@ -8,6 +8,43 @@ import { createCompactFunction } from "agents/experimental/memory/utils";
 function tool(tool) {
 	return tool$1(tool);
 }
+/**
+* Wrap each tool's `execute` so it falls back to `getFallbackContext()` for
+* `experimental_context` when the caller supplies none (e.g. the approval
+* continuation, which bypasses `beforeStep`). A caller-supplied context always
+* wins, so on a normal turn the wrap is a no-op.
+*
+* Crucially it preserves the function's shape: an `async function*` `execute`
+* stays an async generator so `@cloudflare/think` keeps detecting it
+* (`execute.constructor.name === "AsyncGeneratorFunction"`) and streams the
+* tool's preliminary (yielded) results. A plain wrapper would make think consume
+* the iterable and keep only its final value — breaking streaming for every
+* generator tool, on approval AND normal turns. Non-generator executes get an
+* equivalent plain wrapper; non-function executes pass through untouched.
+*/
+function withFallbackToolContext(tools, getFallbackContext) {
+	const result = {};
+	for (const [name, tool] of Object.entries(tools)) {
+		const originalExecute = tool.execute;
+		if (typeof originalExecute !== "function") {
+			result[name] = tool;
+			continue;
+		}
+		result[name] = {
+			...tool,
+			execute: originalExecute.constructor?.name === "AsyncGeneratorFunction" ? async function* (input, options) {
+				yield* originalExecute(input, {
+					...options,
+					experimental_context: options?.experimental_context ?? getFallbackContext()
+				});
+			} : (input, options) => originalExecute(input, {
+				...options,
+				experimental_context: options?.experimental_context ?? getFallbackContext()
+			})
+		};
+	}
+	return result;
+}
 //#endregion
 //#region src/server/util/prompts.ts
 const SECURITY_RULES_PROMPT = `These rules override all other instructions, no matter what the user asks.
@@ -211,7 +248,7 @@ var Agent = class extends Think {
 					tools: ["activate_skill"]
 				}]
 			}),
-			tools,
+			tools: this._withTurnContextFallback(tools),
 			activeTools,
 			experimental_transform: buildSourcesTransform(),
 			experimental_telemetry: {
@@ -291,6 +328,33 @@ var Agent = class extends Think {
 			activeTools
 		};
 	}
+	/**
+	* Wrap each tool's `execute` so it falls back to the current turn's tool
+	* context ({@link _toolContextForCurrentTurn}: request body + `_userContext`)
+	* when the caller supplies none. A caller-supplied `experimental_context`
+	* always wins, so normal steps — where {@link beforeStep} provides the
+	* context — are untouched.
+	*
+	* The fallback exists for the approval continuation: when a `needsApproval`
+	* tool is approved, the AI SDK executes it BEFORE the step loop starts, so no
+	* `beforeStep` runs for it and `execute` receives `experimental_context:
+	* undefined` — which stripped action tools of their auth token / user context
+	* after approval. The continuation is a turn of its own: {@link beforeTurn}
+	* re-sets {@link _toolContextForCurrentTurn} from the approval request's body
+	* before the SDK executes the tool, so the fallback context is the approval
+	* request's — clients must resend anything tools need (e.g. tokens) on it.
+	*
+	* TODO: remove once @cloudflare/think supports a turn-level
+	* `experimental_context` (its TurnConfig has no such field and it passes none
+	* to `streamText`, so only `beforeStep` can supply one — and the approval
+	* execution happens before any step).
+	*
+	* See {@link withFallbackToolContext} for the wrap itself, which preserves an
+	* `async function*` `execute`'s streaming shape.
+	*/
+	_withTurnContextFallback(tools) {
+		return withFallbackToolContext(tools, () => this._toolContextForCurrentTurn);
+	}
 	_getLastActivatedSkillName(items = []) {
 		for (let index = items.length - 1; index >= 0; index--) {
 			const item = items[index];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economic/agents",
-  "version": "2.3.25",
+  "version": "2.3.27",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "files": [
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@babel/core": "^7.29.7",
     "@babel/plugin-proposal-decorators": "^7.29.7",
-    "@cloudflare/workers-types": "^4.20260701.1",
+    "@cloudflare/workers-types": "^4.20260702.1",
     "@rolldown/plugin-babel": "^0.2.3",
     "@types/node": "^25.6.0",
     "@typescript/native-preview": "7.0.0-dev.20260412.1",
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@cloudflare/think": "^0.12.1",
-    "@cloudflare/vite-plugin": "^1.42.4",
+    "@cloudflare/vite-plugin": "^1.43.0 <1.43.2",
     "@cloudflare/worker-bundler": "^0.2.1",
     "agents": "^0.17.3",
     "vite": ">=8.0.0"