@adminforth/agent 1.52.6 → 1.53.1

package/apiBasedTools.ts

@@ -480,6 +480,15 @@ function normalizeDateTimeInputsToUtc(
 }
 
 const METHODS_WITHOUT_REQUEST_BODY = new Set<string>(['GET', 'HEAD']);
+const TOOL_HANDLER_TIMEOUT_MS = 15_000;
+const EMPTY_HANDLER_RESPONSE_ERROR = {
+  error: 'EMPTY_HANDLER_RESPONSE',
+  message: 'Tool handler completed without returning a response.',
+};
+const TOOL_HANDLER_TIMEOUT_ERROR = {
+  error: 'TOOL_HANDLER_TIMEOUT',
+  message: `Tool handler timed out after ${TOOL_HANDLER_TIMEOUT_MS / 1000} seconds.`,
+};
 
 function createDirectToolResponse(): IAdminForthHttpResponse & {
   headers: Array<[string, string]>;
@@ -514,6 +523,30 @@ function validationErrorResponse(
   };
 }
 
+async function withToolHandlerTimeout<T>(callback: (abortSignal: AbortSignal) => T | Promise<T>, abortSignal?: AbortSignal) {
+  const controller = new AbortController();
+  const abortHandler = () => controller.abort();
+  let timeout: ReturnType<typeof setTimeout>;
+  const timeoutPromise = new Promise<typeof TOOL_HANDLER_TIMEOUT_ERROR>((resolve) => {
+    timeout = setTimeout(() => {
+      controller.abort();
+      resolve(TOOL_HANDLER_TIMEOUT_ERROR);
+    }, TOOL_HANDLER_TIMEOUT_MS);
+  });
+
+  abortSignal?.addEventListener('abort', abortHandler, { once: true });
+
+  try {
+    return await Promise.race([
+      callback(controller.signal),
+      timeoutPromise,
+    ]);
+  } finally {
+    clearTimeout(timeout!);
+    abortSignal?.removeEventListener('abort', abortHandler);
+  }
+}
+
 async function callOpenApiSchema(params: {
   adminforth: IAdminForth;
   adminUser?: AdminUser;
@@ -549,19 +582,21 @@ async function callOpenApiSchema(params: {
     trParams: unknown,
     pluralizationNumber?: number,
   ) => adminforth.tr(msg, category, lang, trParams, pluralizationNumber);
-  const output = await schema.handler({
-    body,
-    query,
-    headers: {},
-    cookies: [],
-    adminUser,
-    response,
-    requestUrl: schema.path,
-    abortSignal: abortSignal ?? new AbortController().signal,
-    _raw_express_req: undefined as never,
-    _raw_express_res: undefined as never,
-    tr,
-  });
+  const output = await withToolHandlerTimeout((handlerAbortSignal) => schema.handler({
+      body,
+      query,
+      headers: {},
+      cookies: [],
+      adminUser,
+      response,
+      requestUrl: schema.path,
+      abortSignal: handlerAbortSignal,
+      _raw_express_req: undefined as never,
+      _raw_express_res: undefined as never,
+      tr,
+    }),
+    abortSignal,
+  );
 
   if (response.message) {
     return response.status >= 400
@@ -573,6 +608,10 @@ async function callOpenApiSchema(params: {
       : response.message;
   }
 
+  if (output === undefined) {
+    return EMPTY_HANDLER_RESPONSE_ERROR;
+  }
+
   if (output === null) {
     return { status: response.status };
   }
@@ -592,6 +631,10 @@ async function callOpenApiSchema(params: {
     : output;
 }
 
+function stringifyToolOutput(output: unknown): string {
+  return YAML.stringify(output === undefined ? EMPTY_HANDLER_RESPONSE_ERROR : output);
+}
+
 export function prepareApiBasedTools(
   adminforth: IAdminForth,
   hiddenResourceIds: Iterable<string> = [],
@@ -624,7 +667,7 @@ export function prepareApiBasedTools(
       agent: schema.agent,
       call: async ({ adminUser, adminuser, abortSignal, inputs, userTimeZone, acceptLanguage } = {}) => {
         if (isHiddenResourceCall(hiddenResourceIdSet, inputs)) {
-          return YAML.stringify({
+          return stringifyToolOutput({
             error: 'RESOURCE_NOT_AVAILABLE',
             message: 'This resource is not available to the agent.',
           });
@@ -650,7 +693,7 @@ export function prepareApiBasedTools(
           userTimeZone,
         });
 
-        return YAML.stringify(processedOutput);
+        return stringifyToolOutput(processedOutput);
       },
     };
   }

package/build.log

@@ -63,5 +63,5 @@ custom/speech_recognition_frontend/voiceActivityDetection.ts
 custom/speech_recognition_frontend/types/
 custom/speech_recognition_frontend/types/voice-activity-detection.d.ts
 
-sent 1,683,211 bytes  received 940 bytes  3,368,302.00 bytes/sec
+sent 1,683,270 bytes  received 940 bytes  3,368,420.00 bytes/sec
 total size is 1,679,042  speedup is 1.00

package/dist/apiBasedTools.js

@@ -316,6 +316,15 @@ function normalizeDateTimeInputsToUtc(body, adminforth, userTimeZone) {
     return normalizeValue(body);
 }
 const METHODS_WITHOUT_REQUEST_BODY = new Set(['GET', 'HEAD']);
+const TOOL_HANDLER_TIMEOUT_MS = 15000;
+const EMPTY_HANDLER_RESPONSE_ERROR = {
+    error: 'EMPTY_HANDLER_RESPONSE',
+    message: 'Tool handler completed without returning a response.',
+};
+const TOOL_HANDLER_TIMEOUT_ERROR = {
+    error: 'TOOL_HANDLER_TIMEOUT',
+    message: `Tool handler timed out after ${TOOL_HANDLER_TIMEOUT_MS / 1000} seconds.`,
+};
 function createDirectToolResponse() {
     const headers = [];
     return {
@@ -339,6 +348,30 @@ function validationErrorResponse(error, details) {
         details,
     };
 }
+function withToolHandlerTimeout(callback, abortSignal) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const controller = new AbortController();
+        const abortHandler = () => controller.abort();
+        let timeout;
+        const timeoutPromise = new Promise((resolve) => {
+            timeout = setTimeout(() => {
+                controller.abort();
+                resolve(TOOL_HANDLER_TIMEOUT_ERROR);
+            }, TOOL_HANDLER_TIMEOUT_MS);
+        });
+        abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', abortHandler, { once: true });
+        try {
+            return yield Promise.race([
+                callback(controller.signal),
+                timeoutPromise,
+            ]);
+        }
+        finally {
+            clearTimeout(timeout);
+            abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', abortHandler);
+        }
+    });
+}
 function callOpenApiSchema(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const { adminforth, adminUser, abortSignal, inputs, schema, toolName, userTimeZone, acceptLanguage } = params;
@@ -355,7 +388,7 @@ function callOpenApiSchema(params) {
         logger.info(`Calling OpenAPI tool "${toolName}" with direct handler`);
         const lang = acceptLanguage !== null && acceptLanguage !== void 0 ? acceptLanguage : "en";
         const tr = (msg, category, trParams, pluralizationNumber) => adminforth.tr(msg, category, lang, trParams, pluralizationNumber);
-        const output = yield schema.handler({
+        const output = yield withToolHandlerTimeout((handlerAbortSignal) => schema.handler({
             body,
             query,
             headers: {},
@@ -363,11 +396,11 @@ function callOpenApiSchema(params) {
             adminUser,
             response,
             requestUrl: schema.path,
-            abortSignal: abortSignal !== null && abortSignal !== void 0 ? abortSignal : new AbortController().signal,
+            abortSignal: handlerAbortSignal,
             _raw_express_req: undefined,
             _raw_express_res: undefined,
             tr,
-        });
+        }), abortSignal);
         if (response.message) {
             return response.status >= 400
                 ? {
@@ -377,6 +410,9 @@ function callOpenApiSchema(params) {
                 }
                 : response.message;
         }
+        if (output === undefined) {
+            return EMPTY_HANDLER_RESPONSE_ERROR;
+        }
         if (output === null) {
             return { status: response.status };
         }
@@ -393,6 +429,9 @@ function callOpenApiSchema(params) {
             : output;
     });
 }
+function stringifyToolOutput(output) {
+    return YAML.stringify(output === undefined ? EMPTY_HANDLER_RESPONSE_ERROR : output);
+}
 export function prepareApiBasedTools(adminforth, hiddenResourceIds = []) {
     const apiBasedTools = {};
     const openApiSchemas = adminforth.openApi.registeredSchemas;
@@ -413,7 +452,7 @@ export function prepareApiBasedTools(adminforth, hiddenResourceIds = []) {
             agent: schema.agent,
             call: (...args_1) => __awaiter(this, [...args_1], void 0, function* ({ adminUser, adminuser, abortSignal, inputs, userTimeZone, acceptLanguage } = {}) {
                 if (isHiddenResourceCall(hiddenResourceIdSet, inputs)) {
-                    return YAML.stringify({
+                    return stringifyToolOutput({
                         error: 'RESOURCE_NOT_AVAILABLE',
                         message: 'This resource is not available to the agent.',
                     });
@@ -436,7 +475,7 @@ export function prepareApiBasedTools(adminforth, hiddenResourceIds = []) {
                     toolName,
                     userTimeZone,
                 });
-                return YAML.stringify(processedOutput);
+                return stringifyToolOutput(processedOutput);
             }),
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.52.6",
+  "version": "1.53.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -25,7 +25,7 @@
   "description": "AI agent plugin for AdminForth with tool-based workflows and persistent chat sessions",
   "devDependencies": {
     "@types/node": "latest",
-    "adminforth": "3.0.1",
+    "adminforth": "3.1.1",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
     "typescript": "^5.7.3"
@@ -67,6 +67,6 @@
     }
   ],
   "peerDependencies": {
-    "adminforth": "3.0.1"
+    "adminforth": "3.1.1"
   }
 }