@adminforth/agent 1.24.10 → 1.24.12

package/apiBasedTools.ts

@@ -5,6 +5,7 @@ import {
   type IAdminForth,
   type IAdminForthHttpResponse,
   type IHttpServer,
+  type IRegisteredApiSchema,
 } from 'adminforth';
 import dayjs from 'dayjs';
 import timezone from 'dayjs/plugin/timezone.js';
@@ -467,6 +468,25 @@ function endpointPathToToolName(path: string) {
     .replace(/^_+|_+$/g, '');
 }
 
+function stripAdminApiPrefix(path: string, adminforth: IAdminForth) {
+  const configuredBaseUrl = adminforth.config.baseUrl || '';
+  const normalizedBaseUrl = configuredBaseUrl.endsWith('/')
+    ? configuredBaseUrl.slice(0, -1)
+    : configuredBaseUrl;
+  const apiPrefix = `${normalizedBaseUrl}/adminapi/v1`;
+
+  if (path.startsWith(apiPrefix)) {
+    const strippedPath = path.slice(apiPrefix.length);
+    return strippedPath.startsWith('/') ? strippedPath : `/${strippedPath}`;
+  }
+
+  return path;
+}
+
+function openApiSchemaPathToToolName(path: string, adminforth: IAdminForth) {
+  return endpointPathToToolName(stripAdminApiPrefix(path, adminforth));
+}
+
 export async function formatApiBasedToolCall(params: {
   adminforth: IAdminForth;
   adminUser?: AdminUser;
@@ -739,15 +759,10 @@ export function prepareApiBasedTools(adminforth: IAdminForth): Record<string, Ap
   const captureServer: IHttpServer = {
     setupSpaServer() {},
     endpoint: ((options: EndpointWithSchemas) => {
-      const normalizedResponseSchema = options.response_schema ?? options.responce_schema;
-      if (!options.request_schema && !normalizedResponseSchema) {
-        return;
-      }
-
       capturedEndpoints.push({
         ...options,
-        response_schema: normalizedResponseSchema,
-        normalizedResponseSchema,
+        response_schema: options.response_schema ?? options.responce_schema,
+        normalizedResponseSchema: options.response_schema ?? options.responce_schema,
       });
     }) as IHttpServer['endpoint'],
   };
@@ -758,15 +773,30 @@ export function prepareApiBasedTools(adminforth: IAdminForth): Record<string, Ap
   const capturedEndpointsByToolName = Object.fromEntries(
     capturedEndpoints.map((endpoint) => [endpointPathToToolName(endpoint.path), endpoint]),
   );
+  const openApiSchemas = adminforth.openApi.registeredSchemas.filter(
+    (schema) => schema.request_schema || schema.response_schema,
+  );
+  const openApiSchemasByToolName = new Map<string, IRegisteredApiSchema>();
 
-  for (const endpoint of capturedEndpoints) {
-    const toolName = endpointPathToToolName(endpoint.path);
+  for (const schema of openApiSchemas) {
+    const toolName = openApiSchemaPathToToolName(schema.path, adminforth);
+    openApiSchemasByToolName.set(toolName, schema);
+  }
+
+  for (const [toolName, schema] of openApiSchemasByToolName.entries()) {
+    const endpoint = capturedEndpointsByToolName[toolName];
     apiBasedTools[toolName] = {
-      description: endpoint.description,
-      input_schema: endpoint.request_schema,
-      input_schma: endpoint.request_schema,
-      output_schema: endpoint.normalizedResponseSchema,
+      description: schema.description,
+      input_schema: schema.request_schema,
+      input_schma: schema.request_schema,
+      output_schema: schema.response_schema,
       call: async ({ adminUser, adminuser, inputs, httpExtra, userTimeZone } = {}) => {
+        if (!endpoint) {
+          throw new Error(
+            `Tool "${toolName}" is defined in OpenAPI but has no callable AdminForth endpoint handler.`,
+          );
+        }
+
         const output = await callCapturedEndpoint({
           adminforth,
           endpoint,

package/build.log

@@ -38,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 201,337 bytes  received 558 bytes  403,790.00 bytes/sec
+sent 201,341 bytes  received 562 bytes  403,806.00 bytes/sec
 total size is 199,037  speedup is 0.99

package/custom/conversation_area/ToolRenderer.vue

@@ -49,9 +49,9 @@
           <header class="border-b border-black/5 px-3 py-2 text-[0.7rem] font-semibold uppercase tracking-[0.22em] text-gray-500 dark:border-white/10 dark:text-gray-400">
             {{ section.label }}
           </header>
-          <div class="grid grid-cols-[auto,1fr] gap-x-3 gap-y-1 px-3 py-3 font-mono text-xs leading-5 text-gray-700 dark:text-gray-200">
+          <div class="select-all grid grid-cols-[auto,1fr] gap-x-3 gap-y-1 px-3 py-3 font-mono text-xs leading-5 text-gray-700 dark:text-gray-200">
             <template v-for="line in section.lines" :key="`${section.label}-${line.number}`">
-              <span class="select-none text-[0.7rem] text-gray-400 dark:text-gray-500">{{ line.number }}</span>
+              <span class=" text-[0.7rem] text-gray-400 dark:text-gray-500">{{ line.number }}</span>
               <span class="whitespace-pre-wrap break-words">{{ line.content || ' ' }}</span>
             </template>
           </div>

package/dist/apiBasedTools.js

@@ -286,6 +286,21 @@ function endpointPathToToolName(path) {
         .replace(/[^a-zA-Z0-9_]+/g, '_')
         .replace(/^_+|_+$/g, '');
 }
+function stripAdminApiPrefix(path, adminforth) {
+    const configuredBaseUrl = adminforth.config.baseUrl || '';
+    const normalizedBaseUrl = configuredBaseUrl.endsWith('/')
+        ? configuredBaseUrl.slice(0, -1)
+        : configuredBaseUrl;
+    const apiPrefix = `${normalizedBaseUrl}/adminapi/v1`;
+    if (path.startsWith(apiPrefix)) {
+        const strippedPath = path.slice(apiPrefix.length);
+        return strippedPath.startsWith('/') ? strippedPath : `/${strippedPath}`;
+    }
+    return path;
+}
+function openApiSchemaPathToToolName(path, adminforth) {
+    return endpointPathToToolName(stripAdminApiPrefix(path, adminforth));
+}
 export function formatApiBasedToolCall(params) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -478,25 +493,30 @@ export function prepareApiBasedTools(adminforth) {
     const captureServer = {
         setupSpaServer() { },
         endpoint: ((options) => {
-            var _a;
-            const normalizedResponseSchema = (_a = options.response_schema) !== null && _a !== void 0 ? _a : options.responce_schema;
-            if (!options.request_schema && !normalizedResponseSchema) {
-                return;
-            }
-            capturedEndpoints.push(Object.assign(Object.assign({}, options), { response_schema: normalizedResponseSchema, normalizedResponseSchema }));
+            var _a, _b;
+            capturedEndpoints.push(Object.assign(Object.assign({}, options), { response_schema: (_a = options.response_schema) !== null && _a !== void 0 ? _a : options.responce_schema, normalizedResponseSchema: (_b = options.response_schema) !== null && _b !== void 0 ? _b : options.responce_schema }));
         }),
     };
     adminforth.setupEndpoints(captureServer);
     const apiBasedTools = {};
     const capturedEndpointsByToolName = Object.fromEntries(capturedEndpoints.map((endpoint) => [endpointPathToToolName(endpoint.path), endpoint]));
-    for (const endpoint of capturedEndpoints) {
-        const toolName = endpointPathToToolName(endpoint.path);
+    const openApiSchemas = adminforth.openApi.registeredSchemas.filter((schema) => schema.request_schema || schema.response_schema);
+    const openApiSchemasByToolName = new Map();
+    for (const schema of openApiSchemas) {
+        const toolName = openApiSchemaPathToToolName(schema.path, adminforth);
+        openApiSchemasByToolName.set(toolName, schema);
+    }
+    for (const [toolName, schema] of openApiSchemasByToolName.entries()) {
+        const endpoint = capturedEndpointsByToolName[toolName];
         apiBasedTools[toolName] = {
-            description: endpoint.description,
-            input_schema: endpoint.request_schema,
-            input_schma: endpoint.request_schema,
-            output_schema: endpoint.normalizedResponseSchema,
+            description: schema.description,
+            input_schema: schema.request_schema,
+            input_schma: schema.request_schema,
+            output_schema: schema.response_schema,
             call: (...args_1) => __awaiter(this, [...args_1], void 0, function* ({ adminUser, adminuser, inputs, httpExtra, userTimeZone } = {}) {
+                if (!endpoint) {
+                    throw new Error(`Tool "${toolName}" is defined in OpenAPI but has no callable AdminForth endpoint handler.`);
+                }
                 const output = yield callCapturedEndpoint({
                     adminforth,
                     endpoint,

package/dist/custom/conversation_area/ToolRenderer.vue

@@ -49,9 +49,9 @@
           <header class="border-b border-black/5 px-3 py-2 text-[0.7rem] font-semibold uppercase tracking-[0.22em] text-gray-500 dark:border-white/10 dark:text-gray-400">
             {{ section.label }}
           </header>
-          <div class="grid grid-cols-[auto,1fr] gap-x-3 gap-y-1 px-3 py-3 font-mono text-xs leading-5 text-gray-700 dark:text-gray-200">
+          <div class="select-all grid grid-cols-[auto,1fr] gap-x-3 gap-y-1 px-3 py-3 font-mono text-xs leading-5 text-gray-700 dark:text-gray-200">
             <template v-for="line in section.lines" :key="`${section.label}-${line.number}`">
-              <span class="select-none text-[0.7rem] text-gray-400 dark:text-gray-500">{{ line.number }}</span>
+              <span class=" text-[0.7rem] text-gray-400 dark:text-gray-500">{{ line.number }}</span>
               <span class="whitespace-pre-wrap break-words">{{ line.content || ' ' }}</span>
             </template>
           </div>

package/package.json

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