@iqai/adk 0.1.8 → 0.1.10

package/dist/index.mjs

@@ -25,14 +25,14 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/helpers/logger.ts
+// src/logger/index.ts
 import chalk from "chalk";
 function isDebugEnabled() {
   return process.env.NODE_ENV === "development" || process.env.ADK_DEBUG === "true";
 }
 var Logger;
 var init_logger = __esm({
-  "src/helpers/logger.ts"() {
+  "src/logger/index.ts"() {
     Logger = class {
       name;
       isDebugEnabled = isDebugEnabled();
@@ -3685,6 +3685,139 @@ __export(events_exports, {
 // src/flows/llm-flows/base-llm-flow.ts
 init_logger();
 
+// src/logger/log-formatter.ts
+var LogFormatter = class _LogFormatter {
+  /**
+   * Formats function calls for display in logs.
+   * Returns a comma-separated string of function names with argument previews.
+   *
+   * @param functionCalls Array of Parts containing function calls
+   * @returns Formatted string representation of function calls
+   */
+  static formatFunctionCalls(functionCalls) {
+    if (!functionCalls || functionCalls.length === 0) {
+      return "none";
+    }
+    return functionCalls.filter((part) => part.functionCall).map((part) => {
+      const fc = part.functionCall;
+      const argsPreview = fc.args ? JSON.stringify(fc.args).substring(0, 50) + (JSON.stringify(fc.args).length > 50 ? "..." : "") : "{}";
+      return `${fc.name}(${argsPreview})`;
+    }).join(", ");
+  }
+  /**
+   * Formats content preview for debug logging.
+   * Uses a consistent format for displaying content in logs.
+   *
+   * @param content Content object to format
+   * @returns Formatted string representation of content
+   */
+  static formatContentPreview(content) {
+    if (!content) return "none";
+    if (content.parts && Array.isArray(content.parts)) {
+      const textParts = content.parts.filter((part) => part.text).map((part) => part.text).join(" ");
+      return textParts.length > 80 ? `${textParts.substring(0, 80)}...` : textParts || "no text content";
+    }
+    const stringified = JSON.stringify(content);
+    return stringified.length > 80 ? `${stringified.substring(0, 80)}...` : stringified;
+  }
+  /**
+   * Formats response content preview for debug logging.
+   * Specifically handles LlmResponse content structure.
+   *
+   * @param llmResponse LlmResponse object to format
+   * @returns Formatted string representation of response content
+   */
+  static formatResponsePreview(llmResponse) {
+    if (!llmResponse.content) return "none";
+    return _LogFormatter.formatContentPreview(llmResponse.content);
+  }
+  /**
+   * Formats a single function call for detailed logging.
+   * Provides more detailed formatting than formatFunctionCalls for individual calls.
+   *
+   * @param functionCall FunctionCall object to format
+   * @returns Formatted string representation of the function call
+   */
+  static formatSingleFunctionCall(functionCall) {
+    const argsStr = functionCall.args ? JSON.stringify(functionCall.args, null, 2) : "{}";
+    return `${functionCall.name}(
+${argsStr}
+)`;
+  }
+  /**
+   * Formats function response for detailed logging.
+   * Provides detailed formatting for function response objects.
+   *
+   * @param part Part containing function response
+   * @returns Formatted string representation of the function response
+   */
+  static formatFunctionResponse(part) {
+    if (!part.functionResponse) return "none";
+    const response = part.functionResponse;
+    const responseStr = response.response ? JSON.stringify(response.response, null, 2) : "{}";
+    return `${response.name} -> ${responseStr}`;
+  }
+  /**
+   * Formats content parts for detailed inspection.
+   * Shows the structure and content of all parts in a Content object.
+   *
+   * @param content Content object with parts to format
+   * @returns Array of formatted strings, one per part
+   */
+  static formatContentParts(content) {
+    if (!content.parts) return ["no parts"];
+    return content.parts.map((part, index) => {
+      const partType = _LogFormatter.getPartType(part);
+      const preview = _LogFormatter.getPartPreview(part);
+      return `[${index}] ${partType}: ${preview}`;
+    });
+  }
+  /**
+   * Gets the type of a Part for logging purposes.
+   *
+   * @param part Part object to analyze
+   * @returns String describing the part type
+   */
+  static getPartType(part) {
+    if (part.text !== void 0) return "text";
+    if (part.functionCall !== void 0) return "function_call";
+    if (part.functionResponse !== void 0) return "function_response";
+    if (part.fileData !== void 0) return "file_data";
+    if (part.executableCode !== void 0) return "executable_code";
+    if (part.codeExecutionResult !== void 0) return "code_execution_result";
+    return "unknown";
+  }
+  /**
+   * Gets a preview of Part content for logging purposes.
+   *
+   * @param part Part object to preview
+   * @returns String preview of the part content
+   */
+  static getPartPreview(part) {
+    if (part.text !== void 0) {
+      return part.text.length > 50 ? `"${part.text.substring(0, 50)}..."` : `"${part.text}"`;
+    }
+    if (part.functionCall !== void 0) {
+      return _LogFormatter.formatSingleFunctionCall(part.functionCall);
+    }
+    if (part.functionResponse !== void 0) {
+      return _LogFormatter.formatFunctionResponse(part);
+    }
+    if (part.fileData !== void 0) {
+      return `file: ${part.fileData.mimeType || "unknown type"}`;
+    }
+    if (part.executableCode !== void 0) {
+      const code = part.executableCode.code || "";
+      return code.length > 50 ? `"${code.substring(0, 50)}..."` : `"${code}"`;
+    }
+    if (part.codeExecutionResult !== void 0) {
+      const outcome = part.codeExecutionResult.outcome || "unknown";
+      return `execution result: ${outcome}`;
+    }
+    return "unknown content";
+  }
+};
+
 // src/tools/index.ts
 var tools_exports = {};
 __export(tools_exports, {
@@ -3701,6 +3834,7 @@ __export(tools_exports, {
   McpAtp: () => McpAtp,
   McpBamm: () => McpBamm,
   McpCoinGecko: () => McpCoinGecko,
+  McpDiscord: () => McpDiscord,
   McpError: () => McpError,
   McpErrorType: () => McpErrorType,
   McpFilesystem: () => McpFilesystem,
@@ -3721,6 +3855,7 @@ __export(tools_exports, {
   buildFunctionDeclaration: () => buildFunctionDeclaration,
   createFunctionTool: () => createFunctionTool,
   createSamplingHandler: () => createSamplingHandler,
+  createTool: () => createTool,
   getMcpTools: () => getMcpTools,
   jsonSchemaToDeclaration: () => jsonSchemaToDeclaration,
   mcpSchemaToParameters: () => mcpSchemaToParameters,
@@ -3728,6 +3863,68 @@ __export(tools_exports, {
 });
 init_base_tool();
 
+// src/tools/base/create-tool.ts
+init_base_tool();
+import * as z from "zod/v4";
+var CreatedTool = class extends BaseTool {
+  func;
+  schema;
+  functionDeclaration;
+  constructor(config) {
+    super({
+      name: config.name,
+      description: config.description,
+      isLongRunning: config.isLongRunning ?? false,
+      shouldRetryOnFailure: config.shouldRetryOnFailure ?? false,
+      maxRetryAttempts: config.maxRetryAttempts ?? 3
+    });
+    this.func = config.fn;
+    this.schema = config.schema;
+    this.functionDeclaration = this.buildDeclaration();
+  }
+  /**
+   * Executes the tool function with validation
+   */
+  async runAsync(args, context) {
+    try {
+      const validatedArgs = this.schema.parse(args);
+      const result = await Promise.resolve(
+        this.func.length > 1 ? this.func(validatedArgs, context) : this.func(validatedArgs)
+      );
+      return result ?? {};
+    } catch (error) {
+      if (error instanceof z.ZodError) {
+        return {
+          error: `Invalid arguments for ${this.name}: ${z.prettifyError(error)}`
+        };
+      }
+      return {
+        error: `Error executing ${this.name}: ${error instanceof Error ? error.message : String(error)}`
+      };
+    }
+  }
+  /**
+   * Returns the function declaration for this tool
+   */
+  getDeclaration() {
+    return this.functionDeclaration;
+  }
+  /**
+   * Builds the function declaration from the Zod schema
+   */
+  buildDeclaration() {
+    const parameters = z.toJSONSchema(this.schema);
+    return {
+      name: this.name,
+      description: this.description,
+      parameters
+    };
+  }
+};
+function createTool(config) {
+  return new CreatedTool(config);
+}
+
 // src/tools/tool-context.ts
 var ToolContext = class extends CallbackContext {
   /**
@@ -4761,13 +4958,17 @@ var McpSamplingHandler = class {
    */
   convertADKResponseToMcp(adkResponse, model) {
     let responseText = "";
-    if (adkResponse.content) {
-      if (typeof adkResponse.content === "string") {
-        responseText = adkResponse.content;
-      } else if (adkResponse.content.parts) {
-        responseText = adkResponse.content.parts.map((part) => {
-          return typeof part.text === "string" ? part.text : "";
-        }).join("");
+    if (typeof adkResponse === "string") {
+      responseText = adkResponse;
+    } else {
+      if (adkResponse.content) {
+        if (typeof adkResponse.content === "string") {
+          responseText = adkResponse.content;
+        } else if (adkResponse.content.parts) {
+          responseText = adkResponse.content.parts.map((part) => {
+            return typeof part.text === "string" ? part.text : "";
+          }).join("");
+        }
       }
     }
     const mcpResponse = {
@@ -5275,7 +5476,7 @@ function mcpSchemaToParameters(mcpTool) {
 }
 
 // src/tools/mcp/create-tool.ts
-async function createTool(mcpTool, client) {
+async function createTool2(mcpTool, client) {
   try {
     return new McpToolAdapter(mcpTool, client);
   } catch (error) {
@@ -5473,6 +5674,14 @@ function McpTelegram(config = {}) {
   );
   return new McpToolset(mcpConfig);
 }
+function McpDiscord(config = {}) {
+  const mcpConfig = createMcpConfig(
+    "Discord MCP Client",
+    "@iqai/mcp-discord",
+    config
+  );
+  return new McpToolset(mcpConfig);
+}
 function McpCoinGecko(config = {}) {
   const mcpConfig = createMcpConfig(
     "CoinGecko MCP Client",
@@ -5601,7 +5810,7 @@ var McpToolset = class {
       for (const mcpTool of toolsResponse.tools) {
         if (this.isSelected(mcpTool, context)) {
           try {
-            const tool = await createTool(mcpTool, client);
+            const tool = await createTool2(mcpTool, client);
             tools.push(tool);
           } catch (toolError) {
             console.error(
@@ -6137,7 +6346,7 @@ var BaseLlmFlow = class {
     }).join(", ");
     const systemInstruction = llmRequest.getSystemInstructionText() || "";
     const truncatedSystemInstruction = systemInstruction.length > 100 ? `${systemInstruction.substring(0, 100)}...` : systemInstruction;
-    const contentPreview = llmRequest.contents?.length > 0 ? this._formatContentPreview(llmRequest.contents[0]) : "none";
+    const contentPreview = llmRequest.contents?.length > 0 ? LogFormatter.formatContentPreview(llmRequest.contents[0]) : "none";
     this.logger.debugStructured("\u{1F4E4} LLM Request", {
       Model: llm.model,
       Agent: invocationContext.agent.name,
@@ -6161,12 +6370,13 @@ var BaseLlmFlow = class {
         llmResponse
       );
       const tokenCount = llmResponse.usageMetadata?.totalTokenCount || "unknown";
-      const functionCallCount = llmResponse.content?.parts?.filter((part) => part.functionCall).length || 0;
-      const responsePreview = this._formatResponsePreview(llmResponse);
+      const functionCalls = llmResponse.content?.parts?.filter((part) => part.functionCall) || [];
+      const functionCallsDisplay = LogFormatter.formatFunctionCalls(functionCalls);
+      const responsePreview = LogFormatter.formatResponsePreview(llmResponse);
       this.logger.debugStructured("\u{1F4E5} LLM Response", {
         Model: llm.model,
         "Token Count": tokenCount,
-        "Function Calls": functionCallCount,
+        "Function Calls": functionCallsDisplay,
         "Response Preview": responsePreview,
         "Finish Reason": llmResponse.finishReason || "unknown",
         "Response #": responseCount,
@@ -6252,34 +6462,6 @@ var BaseLlmFlow = class {
     }
     return event;
   }
-  /**
-   * Logs data in a visually appealing format that works well in any terminal size.
-   * Uses vertical layout for better readability and respects debug settings.
-   */
-  _formatContentPreview(content) {
-    if (!content) return "none";
-    if (content.parts && Array.isArray(content.parts)) {
-      const textParts = content.parts.filter((part) => part.text).map((part) => part.text).join(" ");
-      return textParts.length > 80 ? `${textParts.substring(0, 80)}...` : textParts || "no text content";
-    }
-    if (typeof content === "string") {
-      return content.length > 80 ? `${content.substring(0, 80)}...` : content;
-    }
-    const stringified = JSON.stringify(content);
-    return stringified.length > 80 ? `${stringified.substring(0, 80)}...` : stringified;
-  }
-  /**
-   * Formats response content preview for debug logging
-   */
-  _formatResponsePreview(llmResponse) {
-    if (!llmResponse.content) return "none";
-    if (llmResponse.content.parts && Array.isArray(llmResponse.content.parts)) {
-      const textParts = llmResponse.content.parts.filter((part) => part.text).map((part) => part.text).join(" ");
-      return textParts.length > 80 ? `${textParts.substring(0, 80)}...` : textParts || "no text content";
-    }
-    const stringified = JSON.stringify(llmResponse.content);
-    return stringified.length > 80 ? `${stringified.substring(0, 80)}...` : stringified;
-  }
   __getLlm(invocationContext) {
     const llm = invocationContext.agent.canonicalModel;
     return llm;
@@ -9967,7 +10149,7 @@ var AgentBuilder = class _AgentBuilder {
     const sessionConfig = this.sessionConfig;
     return {
       async ask(message) {
-        const fullMessage = typeof message === "string" ? { parts: [{ text: message }] } : message;
+        const newMessage = typeof message === "string" ? { parts: [{ text: message }] } : typeof message === "object" && "contents" in message ? { parts: message.contents[message.contents.length - 1].parts } : message;
         let response = "";
         if (!sessionConfig) {
           throw new Error("Session configuration is required");
@@ -9975,7 +10157,7 @@ var AgentBuilder = class _AgentBuilder {
         for await (const event of baseRunner.runAsync({
           userId: sessionConfig.userId,
           sessionId: session.id,
-          newMessage: fullMessage
+          newMessage
         })) {
           if (event.content?.parts && Array.isArray(event.content.parts)) {
             const content = event.content.parts.map(
@@ -11049,6 +11231,7 @@ export {
   McpAtp,
   McpBamm,
   McpCoinGecko,
+  McpDiscord,
   McpError,
   McpErrorType,
   McpFilesystem,
@@ -11102,6 +11285,7 @@ export {
   createPostgresSessionService,
   createSamplingHandler,
   createSqliteSessionService,
+  createTool,
   generateAuthEvent,
   generateClientFunctionCallId,
   getLongRunningFunctionCalls,

package/package.json

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