@deepagents/agent 4.2.1 → 5.0.0

package/dist/index.d.ts

@@ -5,4 +5,5 @@ export * from './lib/prompts.ts';
 export * from './lib/repair.ts';
 export * from './lib/stream_utils.ts';
 export * from './lib/swarm.ts';
+export * from './lib/tool-output.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC"}

package/dist/index.js

@@ -4,8 +4,8 @@ import {
   Output as Output3,
   dynamicTool,
   generateText as generateText3,
+  isStepCount as isStepCount2,
   jsonSchema,
-  stepCountIs as stepCountIs2,
   tool
 } from "ai";
 import chalk3 from "chalk";
@@ -308,7 +308,7 @@ async function streamWrite(response) {
   response.consumeStream();
   const writeStream = createWriteStream("blog_writer_output.md");
   Readable.fromWeb(response.textStream).pipe(writeStream);
-  console.log(await response.totalUsage);
+  console.log(await response.usage);
 }
 function printChunk(chunk, options, state) {
   const {
@@ -375,7 +375,7 @@ var printer = {
         state
       );
     }
-    console.log(await response.totalUsage);
+    console.log(await response.usage);
   },
   mermaid: flow(visualizeMermaid, console.log),
   semantic: flow(visualizeSemantic, console.log),
@@ -442,7 +442,12 @@ function toOutput(result) {
   return isPromise(result) ? result.then((res) => res.output) : last(result.partialOutputStream);
 }
 function toState(options) {
-  return options.experimental_context;
+  return options.context;
+}
+function toToolsContext(tools, context) {
+  return Object.fromEntries(
+    Object.keys(tools).map((toolName) => [toolName, context])
+  );
 }
 
 // packages/agent/src/lib/swarm.ts
@@ -452,31 +457,33 @@ import {
   createUIMessageStream,
   generateId as generateId2,
   generateText as generateText2,
+  isStepCount,
   smoothStream,
-  stepCountIs,
   streamText
 } from "ai";
 import chalk2 from "chalk";
 import dedent2 from "dedent";
 async function generate(agent2, messages, contextVariables, config) {
+  const tools = agent2.toToolset();
   return generateText2({
     abortSignal: config?.abortSignal,
     providerOptions: agent2.providerOptions ?? config?.providerOptions,
     model: agent2.model,
-    system: agent2.instructions(contextVariables),
+    instructions: agent2.instructions(contextVariables),
     messages: await convertToModelMessages(
       Array.isArray(messages) ? messages : [user(messages)],
-      { ignoreIncompleteToolCalls: true }
+      { ignoreIncompleteToolCalls: true, tools }
     ),
-    experimental_repairToolCall: agent2.repairToolCall(config?.abortSignal),
-    stopWhen: stepCountIs(25),
-    tools: agent2.toToolset(),
+    repairToolCall: agent2.repairToolCall(config?.abortSignal),
+    stopWhen: isStepCount(25),
+    tools,
     activeTools: agent2.toolsNames,
-    experimental_context: contextVariables,
+    runtimeContext: contextVariables,
+    toolsContext: toToolsContext(tools, contextVariables),
     toolChoice: agent2.toolChoice,
     output: agent2.output ? Output2.object({ schema: agent2.output }) : void 0,
-    // onStepFinish: (step) => tagAgents(step, agent.handoff.name),
-    onStepFinish: (step) => {
+    // onStepEnd: (step) => tagAgents(step, agent.handoff.name),
+    onStepEnd: (step) => {
       const toolCall = step.toolCalls.at(-1);
       if (toolCall) {
         console.log(
@@ -485,29 +492,31 @@ async function generate(agent2, messages, contextVariables, config) {
       }
     },
     prepareStep: prepareStep(agent2, agent2.model, contextVariables)
-    // onFinish: (result) => {
+    // onEnd: (result) => {
     //   (contextVariables as any).content = result.content;
     // },
   });
 }
 async function execute(agent2, messages, contextVariables, config) {
   const runId = generateId2();
+  const tools = agent2.toToolset();
   const stream2 = streamText({
     abortSignal: config?.abortSignal,
     providerOptions: config?.providerOptions,
     model: agent2.model,
-    system: agent2.instructions(contextVariables),
+    instructions: agent2.instructions(contextVariables),
     messages: await convertToModelMessages(
       Array.isArray(messages) ? messages : [user(messages)],
-      { ignoreIncompleteToolCalls: true }
+      { ignoreIncompleteToolCalls: true, tools }
     ),
-    stopWhen: stepCountIs(25),
+    stopWhen: isStepCount(25),
     experimental_transform: config?.transform ?? smoothStream(),
-    tools: agent2.toToolset(),
+    tools,
     activeTools: agent2.toolsNames,
-    experimental_context: contextVariables,
+    runtimeContext: contextVariables,
+    toolsContext: toToolsContext(tools, contextVariables),
     toolChoice: agent2.toolChoice,
-    experimental_repairToolCall: agent2.repairToolCall(config?.abortSignal),
+    repairToolCall: agent2.repairToolCall(config?.abortSignal),
     onError: (error) => {
       console.error(
         chalk2.red(
@@ -518,8 +527,8 @@ async function execute(agent2, messages, contextVariables, config) {
       console.dir(error, { depth: null });
     },
     output: agent2.output ? Output2.object({ schema: agent2.output }) : void 0,
-    // onStepFinish: (step) => tagAgents(step, agent.handoff.name),
-    onStepFinish: (step) => {
+    // onStepEnd: (step) => tagAgents(step, agent.handoff.name),
+    onStepEnd: (step) => {
       const toolCall = step.toolCalls.at(-1);
       if (toolCall) {
         console.log(
@@ -528,7 +537,7 @@ async function execute(agent2, messages, contextVariables, config) {
       }
     },
     prepareStep: prepareStep(agent2, agent2.model, contextVariables)
-    // onFinish: (result) => {
+    // onEnd: (result) => {
     //   (contextVariables as any).content = result.content;
     // },
   });
@@ -574,13 +583,13 @@ function swarm(agent2, messages, contextVariables, abortSignal) {
         stream2.toUIMessageStream({
           sendFinish: false,
           sendStart: true,
-          onFinish: (event) => {
+          onEnd: (event) => {
             parts.push(...event.responseMessage.parts);
           }
         })
       );
       await stream2.consumeStream({ onError: console.error });
-      await last(stream2.fullStream);
+      await last(stream2.stream);
       if (!agent2.prepareEnd) return;
       while (true) {
         const state = contextVariables;
@@ -609,13 +618,13 @@ function swarm(agent2, messages, contextVariables, abortSignal) {
           stream3.toUIMessageStream({
             sendFinish: false,
             sendStart: false,
-            onFinish: (event) => {
+            onEnd: (event) => {
               parts.push(...event.responseMessage.parts);
             }
           })
         );
         await stream3.consumeStream({ onError: console.error });
-        await last(stream3.fullStream);
+        await last(stream3.stream);
       }
       writer.write({ type: "finish" });
     }
@@ -626,7 +635,7 @@ async function prepareAgent(defaultModel, agent2, messages, contextVariables) {
   await agent2.prepareHandoff?.(messages);
   const stepModel = agent2.model ?? defaultModel;
   return {
-    system: agent2.instructions(contextVariables),
+    instructions: agent2.instructions(contextVariables),
     activeTools: agent2.toolsNames,
     model: stepModel,
     messages,
@@ -640,6 +649,25 @@ function findAgent(agent2, agentName) {
   );
 }
 
+// packages/agent/src/lib/tool-output.ts
+function withHostOnlyToolMetadata(tools) {
+  const wrapped = {};
+  for (const [name, tool2] of Object.entries(tools)) {
+    wrapped[name] = tool2.toModelOutput !== void 0 ? tool2 : {
+      ...tool2,
+      toModelOutput: ({ output }) => defaultToolModelOutput(output)
+    };
+  }
+  return wrapped;
+}
+function defaultToolModelOutput(output) {
+  if (typeof output === "object" && output !== null && !Array.isArray(output) && Object.hasOwn(output, "meta")) {
+    const { meta: _meta, ...visible } = output;
+    return { type: "json", value: visible };
+  }
+  return typeof output === "string" ? { type: "text", value: output } : { type: "json", value: output ?? null };
+}
+
 // packages/agent/src/lib/agent.ts
 function agent(config) {
   return new Agent(config);
@@ -671,7 +699,7 @@ var Agent = class _Agent {
     this.handoff = {
       name: this.internalName,
       instructions: config.prompt,
-      tools: config.tools ?? {},
+      tools: withHostOnlyToolMetadata(config.tools ?? {}),
       handoffDescription: config.handoffDescription
     };
     this.handoffToolName = `transfer_to_${this.internalName}`;
@@ -756,9 +784,10 @@ var Agent = class _Agent {
       }),
       execute: async ({ input: input2, output }, options) => {
         try {
+          const contextVariables = options.context;
           const result = await generateText3({
             model: this.model,
-            system: this.#prepareInstructions(),
+            instructions: this.#prepareInstructions(),
             prompt: `
               <Input>
               ${input2}
@@ -770,13 +799,17 @@ ${output}
             temperature: 0,
             tools: this.handoff.tools,
             abortSignal: options.abortSignal,
-            stopWhen: stepCountIs2(25),
-            experimental_repairToolCall: this.repairToolCall(
-              options.abortSignal
+            stopWhen: isStepCount2(25),
+            repairToolCall: this.repairToolCall(options.abortSignal),
+            runtimeContext: contextVariables,
+            toolsContext: Object.fromEntries(
+              Object.keys(this.handoff.tools).map((toolName) => [
+                toolName,
+                contextVariables
+              ])
             ),
-            experimental_context: options.experimental_context,
             output: this.output ? Output3.object({ schema: this.output }) : void 0,
-            onStepFinish: (step) => {
+            onStepEnd: (step) => {
               const toolCall = step.toolCalls.at(-1);
               if (toolCall && this.logging) {
                 console.log(
@@ -784,21 +817,21 @@ ${output}
                 );
               }
             },
-            prepareStep: prepareStep(
-              this,
-              this.model,
-              options.experimental_context
-            )
+            prepareStep: prepareStep(this, this.model, contextVariables)
           });
           if (props?.outputExtractor) {
             return await props.outputExtractor(result);
           }
-          return result.steps.map((it) => it.toolResults).flat();
+          return result.text;
         } catch (error) {
+          if (error instanceof Error && error.name === "AbortError") {
+            throw error;
+          }
           console.error(error);
+          const details = error instanceof Error ? error.message : JSON.stringify(error);
           return `An error thrown from a tool call. 
 <ErrorDetails>
-${JSON.stringify(error)}
+${details}
 </ErrorDetails>`;
         }
       }
@@ -1065,7 +1098,7 @@ function pipe(state, ...processes) {
               result.toUIMessageStream({
                 generateMessageId: generateId3,
                 originalMessages: state.messages,
-                onFinish: async ({
+                onEnd: async ({
                   responseMessage
                 }) => {
                   state.messages.push(responseMessage);
@@ -1141,6 +1174,8 @@ export {
   thirdPersonPrompt,
   toOutput,
   toState,
-  user
+  toToolsContext,
+  user,
+  withHostOnlyToolMetadata
 };
 //# sourceMappingURL=index.js.map