@axiom-lattice/core 2.0.0 → 2.0.2

package/dist/index.mjs

@@ -560,7 +560,7 @@ registerToolLattice(
   {
     name: "internet_search",
     description: "Run a web search",
-    needUserApprove: true,
+    needUserApprove: false,
     schema: z2.object({
       query: z2.string().describe("The search query"),
       maxResults: z2.number().optional().default(5).describe("Maximum number of results to return"),
@@ -591,7 +591,16 @@ registerToolLattice(
 import {
   AgentType,
   AgentConfig,
-  GraphBuildOptions
+  ReactAgentConfig,
+  DeepAgentConfig,
+  PlanExecuteAgentConfig,
+  SequentialAgentConfig,
+  AgentConfigWithTools,
+  GraphBuildOptions,
+  hasTools,
+  isDeepAgentConfig,
+  getToolsFromConfig,
+  getSubAgentsFromConfig
 } from "@axiom-lattice/protocols";
 
 // src/agent_lattice/builders/ReActAgentGraphBuilder.ts
@@ -724,7 +733,6 @@ import {
   getCurrentTaskInput as getCurrentTaskInput2,
   GraphInterrupt
 } from "@langchain/langgraph";
-import { createReactAgent as createReactAgent2 } from "@langchain/langgraph/prebuilt";
 import { z as z5 } from "zod";
 
 // src/deep_agent/tools.ts
@@ -1156,6 +1164,10 @@ var editFile = tool2(
 );
 
 // src/deep_agent/subAgent.ts
+import {
+  getToolsFromConfig as getToolsFromConfig2,
+  hasTools as hasTools2
+} from "@axiom-lattice/protocols";
 var BUILTIN_TOOLS = {
   write_todos: writeTodos,
   read_file: readFile,
@@ -1177,30 +1189,28 @@ function createTaskTool(inputs) {
   const allTools = { ...BUILTIN_TOOLS, ...tools };
   const agentsMap = /* @__PURE__ */ new Map();
   for (const subagent of subagents) {
-    const subagentTools = [];
-    if (subagent.tools) {
-      for (const toolName of subagent.tools) {
-        const resolvedTool = allTools[toolName];
-        if (resolvedTool) {
-          subagentTools.push(resolvedTool);
-        } else {
-          console.warn(
-            `Warning: Tool '${toolName}' not found for agent '${subagent.name}'`
-          );
+    let reactAgent;
+    const agentLattice = getAgentLattice(subagent.key);
+    if (agentLattice) {
+      reactAgent = agentLattice.client;
+    } else {
+      const subagentTools = [];
+      if (hasTools2(subagent)) {
+        for (const toolName of getToolsFromConfig2(subagent)) {
+          const resolvedTool = allTools[toolName];
+          if (resolvedTool) {
+            subagentTools.push(resolvedTool);
+          } else {
+            console.warn(
+              `Warning: Tool '${toolName}' not found for agent '${subagent.name}'`
+            );
+          }
         }
+      } else {
+        subagentTools.push(...Object.values(allTools));
       }
-    } else {
-      subagentTools.push(...Object.values(allTools));
-    }
-    const reactAgent = createReactAgent2({
-      llm: model,
-      tools: subagentTools,
-      stateSchema,
-      messageModifier: subagent.prompt,
-      // checkpointer: false,
-      checkpointer: getCheckpointSaver("default"),
-      postModelHook
-    });
+      reactAgent = createAgentClientFromAgentLattice({ config: subagent });
+    }
     agentsMap.set(subagent.name, reactAgent);
   }
   return tool3(
@@ -1304,7 +1314,7 @@ var DeepAgentState = MessagesZodState2.extend({
 });
 
 // src/deep_agent/graph.ts
-import { createReactAgent as createReactAgent3 } from "@langchain/langgraph/prebuilt";
+import { createReactAgent as createReactAgent2 } from "@langchain/langgraph/prebuilt";
 var BASE_PROMPT = `You have access to a number of standard tools
 
 ## \`write_todos\`
@@ -1351,7 +1361,7 @@ function createDeepAgent(params = {}) {
     allTools.push(taskTool);
   }
   const finalInstructions = instructions ? instructions + BASE_PROMPT : BASE_PROMPT;
-  return createReactAgent3({
+  return createReactAgent2({
     llm: model,
     tools: allTools,
     stateSchema,
@@ -1377,13 +1387,9 @@ var DeepAgentGraphBuilder = class {
     return createDeepAgent({
       tools,
       model: params.model,
+      stateSchema: params.stateSchema,
       instructions: params.prompt,
-      subagents: params.subAgents.map((sa) => ({
-        name: sa.key,
-        description: sa.config.description,
-        prompt: sa.config.prompt,
-        tools: sa.config.tools || []
-      }))
+      subagents: params.subAgents.map((sa) => sa.config)
     });
   }
 };
@@ -1613,7 +1619,7 @@ _MemoryManager.instance = memory2;
 var MemoryManager = _MemoryManager;
 
 // src/createPlanExecuteAgent.ts
-import { createReactAgent as createReactAgent4 } from "@langchain/langgraph/prebuilt";
+import { createReactAgent as createReactAgent3 } from "@langchain/langgraph/prebuilt";
 var PlanExecuteState = Annotation.Root({
   // 输入
   input: Annotation({
@@ -1670,7 +1676,7 @@ function createPlanExecuteAgent(config) {
     maxSteps,
     toolsCount: executorTools.length
   });
-  const agentExecutor = createReactAgent4({
+  const agentExecutor = createReactAgent3({
     tools: executorTools,
     llm
   });
@@ -1772,7 +1778,7 @@ ${executorTools.map((tool5) => tool5.name).join("\n")}
       returnDirect: true
     }
   );
-  const replanAgent = createReactAgent4({
+  const replanAgent = createReactAgent3({
     tools: [responseTool, planTool],
     llm
   });
@@ -1995,6 +2001,11 @@ var AgentGraphBuilderFactory = class _AgentGraphBuilderFactory {
 };
 
 // src/agent_lattice/builders/AgentParamsBuilder.ts
+import {
+  getToolsFromConfig as getToolsFromConfig3,
+  getSubAgentsFromConfig as getSubAgentsFromConfig2,
+  isDeepAgentConfig as isDeepAgentConfig2
+} from "@axiom-lattice/protocols";
 var AgentParamsBuilder = class {
   /**
    * constructor
@@ -2012,7 +2023,7 @@ var AgentParamsBuilder = class {
    * @returns Agent build parameters
    */
   buildParams(agentLattice, options) {
-    const toolKeys = options?.overrideTools || agentLattice.config.tools || [];
+    const toolKeys = options?.overrideTools || getToolsFromConfig3(agentLattice.config);
     const tools = toolKeys.map((toolKey) => {
       const toolLattice = toolLatticeManager.getToolLattice(toolKey);
       if (!toolLattice) {
@@ -2029,7 +2040,7 @@ var AgentParamsBuilder = class {
     if (!model) {
       throw new Error(`Model "${modelKey}" does not exist`);
     }
-    const subAgentKeys = agentLattice.config.subAgents || [];
+    const subAgentKeys = getSubAgentsFromConfig2(agentLattice.config);
     const subAgents = subAgentKeys.map((agentKey) => {
       const subAgentLattice = this.getAgentLatticeFunc(agentKey);
       if (!subAgentLattice) {
@@ -2041,10 +2052,17 @@ var AgentParamsBuilder = class {
         client: subAgentLattice.client
       };
     });
+    let internalSubAgents = [];
+    if (isDeepAgentConfig2(agentLattice.config)) {
+      internalSubAgents = agentLattice.config.internalSubAgents?.map((i) => ({
+        key: i.key,
+        config: i
+      })) || [];
+    }
     return {
       tools,
       model,
-      subAgents,
+      subAgents: [...subAgents, ...internalSubAgents],
       prompt: agentLattice.config.prompt,
       stateSchema: agentLattice.config.schema
     };
@@ -2147,11 +2165,25 @@ var AgentLatticeManager = class _AgentLatticeManager extends BaseLatticeManager
    * @returns 返回Agent构建参数
    */
   buildAgentParams(agentLattice, options) {
-    const paramsBuilder = new AgentParamsBuilder(
-      (key) => this.getAgentLattice(key)
-    );
+    const paramsBuilder = new AgentParamsBuilder((key) => {
+      this.initializeClient(key);
+      return this.getAgentLattice(key);
+    });
     return paramsBuilder.buildParams(agentLattice, options);
   }
+  /**
+   * Create an AgentClient from AgentLattice config
+   *
+   * @param agentLattice Agent Lattice object
+   * @param options Build options
+   * @returns AgentClient instance
+   */
+  createAgentClientFromConfig(agentLattice, options) {
+    const factory = AgentGraphBuilderFactory.getInstance();
+    const builder = factory.getBuilder(agentLattice.config.type);
+    const params = this.buildAgentParams(agentLattice, options);
+    return builder.build(agentLattice, params);
+  }
   /**
    * 初始化Agent客户端
    *
@@ -2169,10 +2201,7 @@ var AgentLatticeManager = class _AgentLatticeManager extends BaseLatticeManager
     if (agentLattice.client) {
       return agentLattice.client;
     }
-    const factory = AgentGraphBuilderFactory.getInstance();
-    const builder = factory.getBuilder(agentLattice.config.type);
-    const params = this.buildAgentParams(agentLattice, options);
-    const graph = builder.build(agentLattice, params);
+    const graph = this.createAgentClientFromConfig(agentLattice, options);
     agentLattice.client = graph;
     return graph;
   }
@@ -2190,7 +2219,8 @@ var getAgentLattice = (key) => agentLatticeManager.getAgentLattice(key);
 var getAgentConfig = (key) => agentLatticeManager.getAgentConfig(key);
 var getAllAgentConfigs = () => agentLatticeManager.getAllAgentConfigs();
 var validateAgentInput = (key, input) => agentLatticeManager.validateAgentInput(key, input);
-var getAgentClient = (key, options) => agentLatticeManager.initializeClient(key, options);
+var getAgentClient2 = (key, options) => agentLatticeManager.initializeClient(key, options);
+var createAgentClientFromAgentLattice = (agentLattice, options) => agentLatticeManager.createAgentClientFromConfig(agentLattice, options);
 
 // src/chunk_buffer_lattice/ChunkBuffer.ts
 var ChunkBuffer = class {
@@ -2520,7 +2550,7 @@ export {
   ThreadStatus,
   ToolLatticeManager,
   agentLatticeManager,
-  getAgentClient,
+  getAgentClient2 as getAgentClient,
   getAgentConfig,
   getAgentLattice,
   getAllAgentConfigs,