@iqai/adk 0.1.6 → 0.1.7

package/dist/index.mjs

@@ -674,6 +674,8 @@ __export(agents_exports, {
   RunConfig: () => RunConfig,
   SequentialAgent: () => SequentialAgent,
   StreamingMode: () => StreamingMode,
+  createBranchContextForSubAgent: () => createBranchContextForSubAgent,
+  mergeAgentRun: () => mergeAgentRun,
   newInvocationContextId: () => newInvocationContextId
 });
 
@@ -8870,6 +8872,9 @@ var LangGraphAgent = class extends BaseAgent {
   }
 };
 
+// src/agents/agent-builder.ts
+import { generateId } from "ai";
+
 // src/runners.ts
 import { SpanStatusCode } from "@opentelemetry/api";
 
@@ -9812,10 +9817,10 @@ var AgentBuilder = class _AgentBuilder {
     return this;
   }
   /**
-   * Configure session management
+   * Configure session management with optional smart defaults
    * @param service Session service to use
-   * @param userId User identifier
-   * @param appName Application name
+   * @param userId User identifier (optional, defaults to agent-based ID)
+   * @param appName Application name (optional, defaults to agent-based name)
    * @param memoryService Optional memory service
    * @param artifactService Optional artifact service
    * @returns This builder instance for chaining
@@ -9823,17 +9828,18 @@ var AgentBuilder = class _AgentBuilder {
   withSession(service, userId, appName, memoryService, artifactService) {
     this.sessionConfig = {
       service,
-      userId,
-      appName,
+      userId: userId || this.generateDefaultUserId(),
+      appName: appName || this.generateDefaultAppName(),
       memoryService,
       artifactService
     };
     return this;
   }
   /**
-   * Configure with an in-memory session (for quick setup)
-   * @param appName Application name
-   * @param userId User identifier
+   * Configure with an in-memory session with custom IDs
+   * Note: In-memory sessions are created automatically by default, use this only if you need custom appName/userId
+   * @param appName Application name (optional, defaults to agent-based name)
+   * @param userId User identifier (optional, defaults to agent-based ID)
    * @returns This builder instance for chaining
    */
   withQuickSession(appName, userId) {
@@ -9847,6 +9853,9 @@ var AgentBuilder = class _AgentBuilder {
     const agent = this.createAgent();
     let runner;
     let session;
+    if (!this.sessionConfig) {
+      this.withQuickSession();
+    }
     if (this.sessionConfig) {
       session = await this.sessionConfig.service.createSession(
         this.sessionConfig.appName,
@@ -9855,49 +9864,26 @@ var AgentBuilder = class _AgentBuilder {
       const runnerConfig = {
         appName: this.sessionConfig.appName,
         agent,
-        sessionService: this.sessionConfig.service
+        sessionService: this.sessionConfig.service,
+        memoryService: this.sessionConfig.memoryService,
+        artifactService: this.sessionConfig.artifactService
       };
-      if (this.sessionConfig.memoryService) {
-        runnerConfig.memoryService = this.sessionConfig.memoryService;
-      }
-      if (this.sessionConfig.artifactService) {
-        runnerConfig.artifactService = this.sessionConfig.artifactService;
-      }
-      runner = new Runner(runnerConfig);
+      const baseRunner = new Runner(runnerConfig);
+      runner = this.createEnhancedRunner(baseRunner, session);
     }
     return { agent, runner, session };
   }
   /**
    * Quick execution helper - build and run a message
-   * @param message Message to send to the agent
+   * @param message Message to send to the agent (string or full message object)
    * @returns Agent response
    */
   async ask(message) {
-    if (!this.sessionConfig) {
-      const userId = `user-${this.config.name}`;
-      const appName = `session-${this.config.name}`;
-      this.withQuickSession(appName, userId);
-    }
-    const { runner, session } = await this.build();
-    if (!runner || !session) {
-      throw new Error("Failed to create runner and session");
-    }
-    let response = "";
-    for await (const event of runner.runAsync({
-      userId: this.sessionConfig.userId,
-      sessionId: session.id,
-      newMessage: {
-        parts: [{ text: message }]
-      }
-    })) {
-      if (event.content?.parts) {
-        const content = event.content.parts.map((part) => part.text || "").join("");
-        if (content) {
-          response += content;
-        }
-      }
+    const { runner } = await this.build();
+    if (!runner) {
+      throw new Error("Failed to create runner");
     }
-    return response;
+    return runner.ask(message);
   }
   /**
    * Create the appropriate agent type based on configuration
@@ -9920,7 +9906,7 @@ var AgentBuilder = class _AgentBuilder {
         });
       }
       case "sequential":
-        if (!this.config.subAgents) {
+        if (!this.config.subAgents || !Array.isArray(this.config.subAgents) || this.config.subAgents.length === 0) {
           throw new Error("Sub-agents required for sequential agent");
         }
         return new SequentialAgent({
@@ -9929,7 +9915,7 @@ var AgentBuilder = class _AgentBuilder {
           subAgents: this.config.subAgents
         });
       case "parallel":
-        if (!this.config.subAgents) {
+        if (!this.config.subAgents || !Array.isArray(this.config.subAgents) || this.config.subAgents.length === 0) {
           throw new Error("Sub-agents required for parallel agent");
         }
         return new ParallelAgent({
@@ -9938,7 +9924,7 @@ var AgentBuilder = class _AgentBuilder {
           subAgents: this.config.subAgents
         });
       case "loop":
-        if (!this.config.subAgents) {
+        if (!this.config.subAgents || !Array.isArray(this.config.subAgents) || this.config.subAgents.length === 0) {
           throw new Error("Sub-agents required for loop agent");
         }
         return new LoopAgent({
@@ -9948,7 +9934,7 @@ var AgentBuilder = class _AgentBuilder {
           maxIterations: this.config.maxIterations || 3
         });
       case "langgraph":
-        if (!this.config.nodes || !this.config.rootNode) {
+        if (!this.config.nodes || !Array.isArray(this.config.nodes) || this.config.nodes.length === 0 || !this.config.rootNode || typeof this.config.rootNode !== "string") {
           throw new Error("Nodes and root node required for LangGraph agent");
         }
         return new LangGraphAgent({
@@ -9959,6 +9945,57 @@ var AgentBuilder = class _AgentBuilder {
         });
     }
   }
+  /**
+   * Generate default user ID based on agent name and id
+   * @returns Generated user ID
+   */
+  generateDefaultUserId() {
+    const id = generateId();
+    return `user-${this.config.name}-${id}`;
+  }
+  /**
+   * Generate default app name based on agent name
+   * @returns Generated app name
+   */
+  generateDefaultAppName() {
+    return `app-${this.config.name}`;
+  }
+  /**
+   * Create enhanced runner with simplified API
+   * @param baseRunner The base runner instance
+   * @param session The session instance
+   * @returns Enhanced runner with simplified API
+   */
+  createEnhancedRunner(baseRunner, session) {
+    const sessionConfig = this.sessionConfig;
+    return {
+      async ask(message) {
+        const fullMessage = typeof message === "string" ? { parts: [{ text: message }] } : message;
+        let response = "";
+        if (!sessionConfig) {
+          throw new Error("Session configuration is required");
+        }
+        for await (const event of baseRunner.runAsync({
+          userId: sessionConfig.userId,
+          sessionId: session.id,
+          newMessage: fullMessage
+        })) {
+          if (event.content?.parts && Array.isArray(event.content.parts)) {
+            const content = event.content.parts.map(
+              (part) => (part && typeof part === "object" && "text" in part ? part.text : "") || ""
+            ).join("");
+            if (content) {
+              response += content;
+            }
+          }
+        }
+        return response;
+      },
+      runAsync(params) {
+        return baseRunner.runAsync(params);
+      }
+    };
+  }
 };
 
 // src/memory/index.ts
@@ -11052,6 +11089,7 @@ export {
   UserInteractionTool,
   VERSION,
   VertexAiSessionService,
+  _findFunctionCallEventIfLastEventIsFunctionResponse,
   adkToMcpToolType,
   requestProcessor8 as agentTransferRequestProcessor,
   requestProcessor2 as basicRequestProcessor,
@@ -11060,6 +11098,7 @@ export {
   responseProcessor as codeExecutionResponseProcessor,
   requestProcessor4 as contentRequestProcessor,
   createAuthToolArguments,
+  createBranchContextForSubAgent,
   createDatabaseSessionService,
   createFunctionTool,
   createMysqlSessionService,
@@ -11079,6 +11118,7 @@ export {
   isEnhancedAuthConfig,
   jsonSchemaToDeclaration,
   mcpSchemaToParameters,
+  mergeAgentRun,
   mergeParallelFunctionResponseEvents,
   newInvocationContextId,
   requestProcessor7 as nlPlanningRequestProcessor,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iqai/adk",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Agent Development Kit for TypeScript with multi-provider LLM support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",