Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): dynamic tools - support destructuring defaults (#2380)

Andrew Barba4da95bb36c36
diff --git a/.changeset/quiet-callbacks-forward.md b/.changeset/quiet-callbacks-forward.md
new file mode 100644
index 000000000..f1ee8c2c7
--- /dev/null
+++ b/.changeset/quiet-callbacks-forward.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Fix dynamic tool builds when callback parameters use destructuring defaults by forwarding the original arguments through the durable callback wrapper.
diff --git a/packages/eve/src/internal/workflow-bundle/dynamic-tool-transform.test.ts b/packages/eve/src/internal/workflow-bundle/dynamic-tool-transform.test.ts
index 898dd9fad..9bfe0bc47 100644
--- a/packages/eve/src/internal/workflow-bundle/dynamic-tool-transform.test.ts
+++ b/packages/eve/src/internal/workflow-bundle/dynamic-tool-transform.test.ts
@@ -245,6 +245,42 @@ export default defineDynamic({
});
});
+ it("forwards destructured parameters with defaults", async () => {
+ const source = `
+import { defineDynamic, defineTool } from "eve/tools";
+
+export default defineDynamic({
+ events: {
+ "session.started": async () => ({
+ tool: defineTool({
+ description: "T",
+ inputSchema: { type: "object" },
+ async execute({ dryRun = false }, ctx) {
+ return { dryRun, requestId: ctx.requestId };
+ },
+ }),
+ }),
+ },
+});
+`;
+
+ const { callHandler, code } = await transformAndEval("tools/default-param.ts", source);
+ const tools = await callHandler();
+ const execute = (tools.tool as Record<string, unknown>).execute as Function;
+
+ expect(code).toMatch(
+ /async \(\.\.\.__args\) => await __eve_dynamic_exec_\d+\(\{\}, \.\.\.__args\)/,
+ );
+ await expect(execute({}, { requestId: "req-123" })).resolves.toEqual({
+ dryRun: false,
+ requestId: "req-123",
+ });
+ await expect(execute({ dryRun: true }, { requestId: "req-456" })).resolves.toEqual({
+ dryRun: true,
+ requestId: "req-456",
+ });
+ });
+
it("__closureVars captures a snapshot at resolver return time", async () => {
const source = `
import { defineDynamic, defineTool } from "eve/tools";
@@ -2337,14 +2373,14 @@ import { defineDynamic, defineTool } from "eve/tools";
export default defineDynamic({
events: {
- "session.started": async () => {
+ "session.started": async (_input, ctx) => {
const tag = "typed";
return {
tool: defineTool({
description: "T",
inputSchema: { type: "object" },
execute(_input: Record<string, unknown>, ctx: import("eve/tools").ToolContext) {
- return { tag, hasCtx: ctx !== undefined };
+ return { tag, input: _input, hasCtx: ctx !== undefined };
},
}),
};
@@ -2357,14 +2393,7 @@ export default defineDynamic({
expect(result).not.toBeNull();
const code = result!.code;
- // The wrapper call args should be `{ tag }, _input, ctx` — NOT
- // `{ tag }, _input, unknown>, ctx` which the old naive comma split
- // would have produced.
- const wrapperCallMatch = code.match(/__eve_dynamic_exec_\d+\(([^)]+)\)/);
- expect(wrapperCallMatch).not.toBeNull();
- const wrapperArgs = wrapperCallMatch![1]!;
- expect(wrapperArgs).not.toMatch(/\bunknown>\b/);
- // Should have the hoisted function
- expect(code).toContain("__eve_dynamic_exec_");
+ expect(code).toContain("const { tag } = __vars");
+ expect(code).toMatch(/\(\.\.\.__args\) => __eve_dynamic_exec_\d+\(\{ tag \}, \.\.\.__args\)/);
});
});
diff --git a/packages/eve/src/internal/workflow-bundle/dynamic-tool-transform.ts b/packages/eve/src/internal/workflow-bundle/dynamic-tool-transform.ts
index fe89b30f0..85ddd9800 100644
--- a/packages/eve/src/internal/workflow-bundle/dynamic-tool-transform.ts
+++ b/packages/eve/src/internal/workflow-bundle/dynamic-tool-transform.ts
@@ -314,19 +314,12 @@ function createLiveWrapper(callback: CallbackInfo, hoistedName: string, closure:
if (callback.isReference) {
return `(...__args) => ${hoistedName}(${closure}, ...__args)`;
}
- const params = callback.params;
- const bindings = params
- ? splitParamsTopLevel(params)
- .map((parameter) => extractParamBindingName(parameter))
- .join(", ")
- : "";
- const args = bindings ? `${closure}, ${bindings}` : closure;
const asyncPrefix = callback.isAsync ? "async " : "";
if (callback.isGenerator) {
- return `${asyncPrefix}function* (${params}) { yield* ${hoistedName}(${args}); }`;
+ return `${asyncPrefix}function* (...__args) { yield* ${hoistedName}(${closure}, ...__args); }`;
}
const awaitPrefix = callback.isAsync ? "await " : "";
- return `${asyncPrefix}(${params}) => ${awaitPrefix}${hoistedName}(${args})`;
+ return `${asyncPrefix}(...__args) => ${awaitPrefix}${hoistedName}(${closure}, ...__args)`;
}
function stableModuleId(filename: string): string {