@adminforth/agent 1.48.1 → 1.49.0

package/agent/middleware/apiBasedTools.ts

@@ -47,6 +47,70 @@ function getEnabledApiToolNames(messages: unknown[]) {
   return enabledToolNames;
 }
 
+const loadedApiToolNamesBySession = new Map<string, Set<string>>();
+
+function getSessionLoadedApiToolNames(sessionId: string) {
+  let toolNames = loadedApiToolNamesBySession.get(sessionId);
+
+  if (!toolNames) {
+    toolNames = new Set<string>();
+    loadedApiToolNamesBySession.set(sessionId, toolNames);
+  }
+
+  return toolNames;
+}
+
+function getEnabledApiToolNamesForSession(messages: unknown[], sessionId?: string) {
+  const enabledToolNames = getEnabledApiToolNames(messages);
+
+  if (!sessionId) {
+    return enabledToolNames;
+  }
+
+  for (const toolName of getSessionLoadedApiToolNames(sessionId)) {
+    enabledToolNames.add(toolName);
+  }
+
+  return enabledToolNames;
+}
+
+function getToolMessageContent(message: unknown) {
+  if (!ToolMessage.isInstance(message)) {
+    return "";
+  }
+
+  return typeof message.content === "string"
+    ? message.content
+    : Array.isArray(message.content)
+      ? message.content
+          .map((block) =>
+            typeof block === "string"
+              ? block
+              : "text" in block
+                ? block.text
+                : "",
+          )
+          .join("")
+      : "";
+}
+
+function rememberLoadedToolFromFetchResult(sessionId: string, result: unknown) {
+  if (!ToolMessage.isInstance(result) || result.name !== "fetch_tool_schema") {
+    return;
+  }
+
+  try {
+    const parsed = JSON.parse(getToolMessageContent(result)) as {
+      status?: number;
+      name?: string;
+    };
+
+    if (parsed.status === 200 && parsed.name) {
+      getSessionLoadedApiToolNames(sessionId).add(parsed.name);
+    }
+  } catch {}
+}
+
 export function createApiBasedToolsMiddleware(
   apiBasedTools: Record<string, ApiBasedTool>,
   adminforth: IAdminForth,
@@ -62,7 +126,11 @@ export function createApiBasedToolsMiddleware(
   return createMiddleware({
     name: "ApiBasedToolsMiddleware",
     async wrapModelCall(request, handler) {
-      const enabledApiToolNames = getEnabledApiToolNames(request.state.messages);
+      const { sessionId } = request.runtime.context as { sessionId?: string };
+      const enabledApiToolNames = getEnabledApiToolNamesForSession(
+        request.state.messages,
+        sessionId,
+      );
       const tools = [...enabledApiToolNames]
         .filter((toolName) => !alwaysAvailableApiToolNames.has(toolName))
         .map((toolName) => dynamicTools[toolName]);
@@ -80,9 +148,10 @@ export function createApiBasedToolsMiddleware(
     async wrapToolCall(request, handler) {
       const startedAt = Date.now();
       const toolInput = JSON.stringify(request.toolCall.args ?? {});
-      const { adminUser, emitToolCallEvent, userTimeZone } = request.runtime.context as {
+      const { adminUser, emitToolCallEvent, sessionId, userTimeZone } = request.runtime.context as {
         adminUser: AdminUser;
         emitToolCallEvent: ToolCallEventSink;
+        sessionId: string;
         userTimeZone: string;
       };
       const toolArgs = (request.toolCall.args ?? {}) as Record<string, unknown>;
@@ -120,7 +189,10 @@ export function createApiBasedToolsMiddleware(
         if (request.tool) {
           result = await handler(request);
         } else {
-          const enabledApiToolNames = getEnabledApiToolNames(request.state.messages);
+          const enabledApiToolNames = getEnabledApiToolNamesForSession(
+            request.state.messages,
+            sessionId,
+          );
 
           if (enabledApiToolNames.has(request.toolCall.name)) {
             result = await handler({
@@ -137,6 +209,10 @@ export function createApiBasedToolsMiddleware(
           }
         }
 
+        if (sessionId) {
+          rememberLoadedToolFromFetchResult(sessionId, result);
+        }
+
         toolCallTracker.finishSuccess(result);
         return result;
       } catch (error) {

package/build.log

@@ -62,5 +62,5 @@ custom/speech_recognition_frontend/voiceActivityDetection.ts
 custom/speech_recognition_frontend/types/
 custom/speech_recognition_frontend/types/voice-activity-detection.d.ts
 
-sent 1,668,700 bytes  received 905 bytes  3,339,210.00 bytes/sec
+sent 1,668,700 bytes  received 921 bytes  3,339,242.00 bytes/sec
 total size is 1,664,547  speedup is 1.00

package/dist/agent/middleware/apiBasedTools.js

@@ -41,6 +41,53 @@ function getEnabledApiToolNames(messages) {
     }
     return enabledToolNames;
 }
+const loadedApiToolNamesBySession = new Map();
+function getSessionLoadedApiToolNames(sessionId) {
+    let toolNames = loadedApiToolNamesBySession.get(sessionId);
+    if (!toolNames) {
+        toolNames = new Set();
+        loadedApiToolNamesBySession.set(sessionId, toolNames);
+    }
+    return toolNames;
+}
+function getEnabledApiToolNamesForSession(messages, sessionId) {
+    const enabledToolNames = getEnabledApiToolNames(messages);
+    if (!sessionId) {
+        return enabledToolNames;
+    }
+    for (const toolName of getSessionLoadedApiToolNames(sessionId)) {
+        enabledToolNames.add(toolName);
+    }
+    return enabledToolNames;
+}
+function getToolMessageContent(message) {
+    if (!ToolMessage.isInstance(message)) {
+        return "";
+    }
+    return typeof message.content === "string"
+        ? message.content
+        : Array.isArray(message.content)
+            ? message.content
+                .map((block) => typeof block === "string"
+                ? block
+                : "text" in block
+                    ? block.text
+                    : "")
+                .join("")
+            : "";
+}
+function rememberLoadedToolFromFetchResult(sessionId, result) {
+    if (!ToolMessage.isInstance(result) || result.name !== "fetch_tool_schema") {
+        return;
+    }
+    try {
+        const parsed = JSON.parse(getToolMessageContent(result));
+        if (parsed.status === 200 && parsed.name) {
+            getSessionLoadedApiToolNames(sessionId).add(parsed.name);
+        }
+    }
+    catch (_a) { }
+}
 export function createApiBasedToolsMiddleware(apiBasedTools, adminforth) {
     const alwaysAvailableApiToolNames = new Set(ALWAYS_AVAILABLE_API_TOOL_NAMES);
     const dynamicTools = Object.fromEntries(Object.entries(apiBasedTools).map(([toolName, apiBasedTool]) => [
@@ -51,7 +98,8 @@ export function createApiBasedToolsMiddleware(apiBasedTools, adminforth) {
         name: "ApiBasedToolsMiddleware",
         wrapModelCall(request, handler) {
             return __awaiter(this, void 0, void 0, function* () {
-                const enabledApiToolNames = getEnabledApiToolNames(request.state.messages);
+                const { sessionId } = request.runtime.context;
+                const enabledApiToolNames = getEnabledApiToolNamesForSession(request.state.messages, sessionId);
                 const tools = [...enabledApiToolNames]
                     .filter((toolName) => !alwaysAvailableApiToolNames.has(toolName))
                     .map((toolName) => dynamicTools[toolName]);
@@ -65,7 +113,7 @@ export function createApiBasedToolsMiddleware(apiBasedTools, adminforth) {
                 var _a, _b, _c, _d;
                 const startedAt = Date.now();
                 const toolInput = JSON.stringify((_a = request.toolCall.args) !== null && _a !== void 0 ? _a : {});
-                const { adminUser, emitToolCallEvent, userTimeZone } = request.runtime.context;
+                const { adminUser, emitToolCallEvent, sessionId, userTimeZone } = request.runtime.context;
                 const toolArgs = ((_b = request.toolCall.args) !== null && _b !== void 0 ? _b : {});
                 let toolInfo;
                 if (request.toolCall.name === "fetch_skill") {
@@ -99,7 +147,7 @@ export function createApiBasedToolsMiddleware(apiBasedTools, adminforth) {
                         result = yield handler(request);
                     }
                     else {
-                        const enabledApiToolNames = getEnabledApiToolNames(request.state.messages);
+                        const enabledApiToolNames = getEnabledApiToolNamesForSession(request.state.messages, sessionId);
                         if (enabledApiToolNames.has(request.toolCall.name)) {
                             result = yield handler(Object.assign(Object.assign({}, request), { tool: dynamicTools[request.toolCall.name] }));
                         }
@@ -112,6 +160,9 @@ export function createApiBasedToolsMiddleware(apiBasedTools, adminforth) {
                             });
                         }
                     }
+                    if (sessionId) {
+                        rememberLoadedToolFromFetchResult(sessionId, result);
+                    }
                     toolCallTracker.finishSuccess(result);
                     return result;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.48.1",
+  "version": "1.49.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",