@iqai/adk 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @iqai/adk
 
+## 0.2.4
+
+### Patch Changes
+
+- dc2c3eb: Fix database session service to use consistent state prefixes with in-memory service
+
+  The database session service was using hardcoded prefix strings ("app*", "user*", "temp\_") instead of the proper State constants (State.APP_PREFIX, State.USER_PREFIX, State.TEMP_PREFIX) that are used by the in-memory session service. This inconsistency could cause state handling issues when switching between session service implementations.
+
+## 0.2.3
+
+### Patch Changes
+
+- 298edf1: `convertMcpToolToBaseTool` now takes in a optional toolHandler for more modularity
+
 ## 0.2.2
 
 ### Patch Changes

package/dist/index.d.mts

@@ -4,7 +4,7 @@ import { LanguageModel } from 'ai';
 import * as zod from 'zod';
 import { z } from 'zod';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { CreateMessageRequestSchema, CreateMessageResultSchema, Tool } from '@modelcontextprotocol/sdk/types.js';
+import { CreateMessageRequestSchema, CreateMessageResultSchema, Tool, CallToolResult } from '@modelcontextprotocol/sdk/types.js';
 import { Kysely, Generated } from 'kysely';
 import { StorageOptions } from '@google-cloud/storage';
 import { Tracer } from '@opentelemetry/api';
@@ -2079,7 +2079,12 @@ declare class McpClientService {
     removeSamplingHandler(): void;
 }
 
-declare function convertMcpToolToBaseTool(mcpTool: Tool, client?: Client): Promise<BaseTool>;
+type ConvertMcpToolTooBaseToolParams = {
+    mcpTool: Tool;
+    client?: Client;
+    toolHandler?: (name: string, args: unknown) => Promise<CallToolResult>;
+};
+declare function convertMcpToolToBaseTool(params: ConvertMcpToolTooBaseToolParams): Promise<BaseTool>;
 
 /**
  * Converts an ADK-style BaseTool to an MCP tool format

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { LanguageModel } from 'ai';
 import * as zod from 'zod';
 import { z } from 'zod';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { CreateMessageRequestSchema, CreateMessageResultSchema, Tool } from '@modelcontextprotocol/sdk/types.js';
+import { CreateMessageRequestSchema, CreateMessageResultSchema, Tool, CallToolResult } from '@modelcontextprotocol/sdk/types.js';
 import { Kysely, Generated } from 'kysely';
 import { StorageOptions } from '@google-cloud/storage';
 import { Tracer } from '@opentelemetry/api';
@@ -2079,7 +2079,12 @@ declare class McpClientService {
     removeSamplingHandler(): void;
 }
 
-declare function convertMcpToolToBaseTool(mcpTool: Tool, client?: Client): Promise<BaseTool>;
+type ConvertMcpToolTooBaseToolParams = {
+    mcpTool: Tool;
+    client?: Client;
+    toolHandler?: (name: string, args: unknown) => Promise<CallToolResult>;
+};
+declare function convertMcpToolToBaseTool(params: ConvertMcpToolTooBaseToolParams): Promise<BaseTool>;
 
 /**
  * Converts an ADK-style BaseTool to an MCP tool format

package/dist/index.js

@@ -5816,9 +5816,13 @@ function mcpSchemaToParameters(mcpTool) {
 }
 
 // src/tools/mcp/create-tool.ts
-async function convertMcpToolToBaseTool(mcpTool, client) {
+async function convertMcpToolToBaseTool(params) {
   try {
-    return new McpToolAdapter(mcpTool, client);
+    return new McpToolAdapter(
+      params.mcpTool,
+      params.client,
+      params.toolHandler
+    );
   } catch (error) {
     if (!(error instanceof McpError)) {
       throw new McpError(
@@ -5834,8 +5838,9 @@ var McpToolAdapter = (_class23 = class extends BaseTool {
   
   
   __init37() {this.clientService = null}
+  
   __init38() {this.logger = new Logger({ name: "McpToolAdapter" })}
-  constructor(mcpTool, client) {
+  constructor(mcpTool, client, handler) {
     const metadata = mcpTool.metadata || {};
     super({
       name: mcpTool.name || `mcp_${Date.now()}`,
@@ -5846,6 +5851,7 @@ var McpToolAdapter = (_class23 = class extends BaseTool {
     });_class23.prototype.__init37.call(this);_class23.prototype.__init38.call(this);;
     this.mcpTool = mcpTool;
     this.client = client;
+    this.toolHandler = handler;
     if (client && client.reinitialize && typeof client.reinitialize === "function") {
       this.clientService = client;
     }
@@ -5900,6 +5906,9 @@ var McpToolAdapter = (_class23 = class extends BaseTool {
         });
         return result;
       }
+      if (this.toolHandler) {
+        return await this.toolHandler(this.name, args);
+      }
       throw new McpError(
         `Cannot execute MCP tool ${this.name}: No execution method found`,
         "tool_execution_error" /* TOOL_EXECUTION_ERROR */
@@ -6158,10 +6167,10 @@ var McpToolset = (_class24 = class {
       for (const mcpTool of toolsResponse.tools) {
         if (this.isSelected(mcpTool, context4)) {
           try {
-            const tool = await convertMcpToolToBaseTool(
+            const tool = await convertMcpToolToBaseTool({
               mcpTool,
               client
-            );
+            });
             tools.push(tool);
           } catch (toolError) {
             console.error(
@@ -11510,11 +11519,11 @@ var DatabaseSessionService = (_class34 = class extends BaseSessionService {
     const sessionStateDelta = {};
     if (state) {
       for (const [key, value] of Object.entries(state)) {
-        if (key.startsWith("app_")) {
-          appStateDelta[key.substring(4)] = value;
-        } else if (key.startsWith("user_")) {
-          userStateDelta[key.substring(5)] = value;
-        } else if (!key.startsWith("temp_")) {
+        if (key.startsWith(State.APP_PREFIX)) {
+          appStateDelta[key.substring(State.APP_PREFIX.length)] = value;
+        } else if (key.startsWith(State.USER_PREFIX)) {
+          userStateDelta[key.substring(State.USER_PREFIX.length)] = value;
+        } else if (!key.startsWith(State.TEMP_PREFIX)) {
           sessionStateDelta[key] = value;
         }
       }
@@ -11527,10 +11536,10 @@ var DatabaseSessionService = (_class34 = class extends BaseSessionService {
   mergeState(appState, userState, sessionState) {
     const mergedState = { ...sessionState };
     for (const [key, value] of Object.entries(appState)) {
-      mergedState[`app_${key}`] = value;
+      mergedState[`${State.APP_PREFIX}${key}`] = value;
     }
     for (const [key, value] of Object.entries(userState)) {
-      mergedState[`user_${key}`] = value;
+      mergedState[`${State.USER_PREFIX}${key}`] = value;
     }
     return mergedState;
   }
@@ -11612,7 +11621,7 @@ var DatabaseSessionService = (_class34 = class extends BaseSessionService {
       return;
     }
     for (const [key, value] of Object.entries(event.actions.stateDelta)) {
-      if (!key.startsWith("temp_")) {
+      if (!key.startsWith(State.TEMP_PREFIX)) {
         session.state[key] = value;
       }
     }

package/dist/index.mjs

@@ -5816,9 +5816,13 @@ function mcpSchemaToParameters(mcpTool) {
 }
 
 // src/tools/mcp/create-tool.ts
-async function convertMcpToolToBaseTool(mcpTool, client) {
+async function convertMcpToolToBaseTool(params) {
   try {
-    return new McpToolAdapter(mcpTool, client);
+    return new McpToolAdapter(
+      params.mcpTool,
+      params.client,
+      params.toolHandler
+    );
   } catch (error) {
     if (!(error instanceof McpError)) {
       throw new McpError(
@@ -5834,8 +5838,9 @@ var McpToolAdapter = class extends BaseTool {
   mcpTool;
   client;
   clientService = null;
+  toolHandler;
   logger = new Logger({ name: "McpToolAdapter" });
-  constructor(mcpTool, client) {
+  constructor(mcpTool, client, handler) {
     const metadata = mcpTool.metadata || {};
     super({
       name: mcpTool.name || `mcp_${Date.now()}`,
@@ -5846,6 +5851,7 @@ var McpToolAdapter = class extends BaseTool {
     });
     this.mcpTool = mcpTool;
     this.client = client;
+    this.toolHandler = handler;
     if (client && client.reinitialize && typeof client.reinitialize === "function") {
       this.clientService = client;
     }
@@ -5900,6 +5906,9 @@ var McpToolAdapter = class extends BaseTool {
         });
         return result;
       }
+      if (this.toolHandler) {
+        return await this.toolHandler(this.name, args);
+      }
       throw new McpError(
         `Cannot execute MCP tool ${this.name}: No execution method found`,
         "tool_execution_error" /* TOOL_EXECUTION_ERROR */
@@ -6158,10 +6167,10 @@ var McpToolset = class {
       for (const mcpTool of toolsResponse.tools) {
         if (this.isSelected(mcpTool, context4)) {
           try {
-            const tool = await convertMcpToolToBaseTool(
+            const tool = await convertMcpToolToBaseTool({
               mcpTool,
               client
-            );
+            });
             tools.push(tool);
           } catch (toolError) {
             console.error(
@@ -11510,11 +11519,11 @@ var DatabaseSessionService = class extends BaseSessionService {
     const sessionStateDelta = {};
     if (state) {
       for (const [key, value] of Object.entries(state)) {
-        if (key.startsWith("app_")) {
-          appStateDelta[key.substring(4)] = value;
-        } else if (key.startsWith("user_")) {
-          userStateDelta[key.substring(5)] = value;
-        } else if (!key.startsWith("temp_")) {
+        if (key.startsWith(State.APP_PREFIX)) {
+          appStateDelta[key.substring(State.APP_PREFIX.length)] = value;
+        } else if (key.startsWith(State.USER_PREFIX)) {
+          userStateDelta[key.substring(State.USER_PREFIX.length)] = value;
+        } else if (!key.startsWith(State.TEMP_PREFIX)) {
           sessionStateDelta[key] = value;
         }
       }
@@ -11527,10 +11536,10 @@ var DatabaseSessionService = class extends BaseSessionService {
   mergeState(appState, userState, sessionState) {
     const mergedState = { ...sessionState };
     for (const [key, value] of Object.entries(appState)) {
-      mergedState[`app_${key}`] = value;
+      mergedState[`${State.APP_PREFIX}${key}`] = value;
     }
     for (const [key, value] of Object.entries(userState)) {
-      mergedState[`user_${key}`] = value;
+      mergedState[`${State.USER_PREFIX}${key}`] = value;
     }
     return mergedState;
   }
@@ -11612,7 +11621,7 @@ var DatabaseSessionService = class extends BaseSessionService {
       return;
     }
     for (const [key, value] of Object.entries(event.actions.stateDelta)) {
-      if (!key.startsWith("temp_")) {
+      if (!key.startsWith(State.TEMP_PREFIX)) {
         session.state[key] = value;
       }
     }

package/package.json

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