@adminforth/agent 1.26.7 → 1.26.9

package/apiBasedTools.ts

@@ -23,6 +23,7 @@ type CookieItem = {
 type ToolOverrideCallParams = Pick<ApiBasedToolCallParams, 'httpExtra' | 'inputs' | 'userTimeZone'>;
 
 type ToolOverrideContext = {
+  adminforth: IAdminForth;
   output?: unknown;
   adminUser?: AdminUser;
   httpExtra?: Partial<HttpExtra>;
@@ -38,15 +39,6 @@ type ToolOverride = {
   post_process_response?: (params: ToolOverrideContext) => Promise<unknown> | unknown;
 };
 
-type GetResourceToolResponse = {
-  resource: {
-    columns: Array<{
-      name: string;
-      type?: string;
-    }>;
-  };
-};
-
 type GetResourceDataToolResponse = {
   data: Array<Record<string, unknown>>;
   total?: number;
@@ -107,26 +99,28 @@ const TOOL_OVERRIDES: Record<string, ToolOverride> = {
     format_tool: ({ inputs, resourceLabel }) => (
       `Get ${getDataPrefix(inputs)}${resourceLabel}`
     ),
-    post_process_response: async ({ output, inputs, invokeTool, userTimeZone }) => {
+    post_process_response: async ({ adminforth, output, inputs, userTimeZone }) => {
       if (hasToolError(output)) {
         return output;
       }
 
-      const resourceId = inputs?.resourceId as string;
-      const getResourceOutput = await invokeTool('get_resource', {
-        inputs: { resourceId },
-      });
-      const dateTimeColumnNames = getDateTimeColumnNames(getResourceOutput);
+      const dateTimeColumnNames = getDateTimeColumnNames(adminforth, inputs);
 
       if (dateTimeColumnNames.length === 0) {
         return output;
       }
 
+      if (!hasGetResourceDataRows(output)) {
+        logger.warn(
+          `Skipping datetime formatting for get_resource_data because response.data is not an array for resource ${getInputString(inputs, 'resourceId') ?? 'unknown'}`,
+        );
+        return output;
+      }
+
       const localizedTimeZone = userTimeZone ?? DEFAULT_USER_TIME_ZONE;
-      const response = output as GetResourceDataToolResponse;
-      formatDateTimeColumns(response.data, dateTimeColumnNames, localizedTimeZone);
+      formatDateTimeColumns(output.data, dateTimeColumnNames, localizedTimeZone);
 
-      return response;
+      return output;
     },
   },
   aggregate: {
@@ -300,10 +294,26 @@ function hasToolError(output: unknown): output is { error: unknown } {
   return typeof output === 'object' && output !== null && 'error' in output;
 }
 
-function getDateTimeColumnNames(output: unknown): string[] {
-  const resource = (output as GetResourceToolResponse).resource;
+function hasGetResourceDataRows(output: unknown): output is GetResourceDataToolResponse {
+  if (typeof output !== 'object' || output === null || !('data' in output)) {
+    return false;
+  }
+
+  return Array.isArray((output as { data?: unknown }).data);
+}
+
+function getDateTimeColumnNames(
+  adminforth: IAdminForth,
+  inputs: Record<string, unknown> | undefined,
+): string[] {
+  const resourceId = getInputString(inputs, 'resourceId');
+  const resource = adminforth.config.resources.find((res) => res.resourceId === resourceId);
 
-  return resource.columns
+  if (!resource) {
+    return [];
+  }
+
+  return resource.dataSourceColumns
     .filter((column) => column.type === AdminForthDataTypes.DATETIME)
     .map((column) => column.name);
 }
@@ -378,6 +388,7 @@ async function applyToolOverride(params: {
   }
 
   const postProcessedOutput = await override.post_process_response({
+    adminforth,
     output: sanitizedOutput,
     adminUser,
     httpExtra,
@@ -450,6 +461,7 @@ export async function formatApiBasedToolCall(params: {
   const formatTool = TOOL_OVERRIDES[params.toolName]?.format_tool;
 
   return await formatTool?.({
+    adminforth: params.adminforth,
     adminUser: params.adminUser,
     httpExtra: params.httpExtra,
     inputs: params.inputs,

package/build.log

@@ -38,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 207,935 bytes  received 562 bytes  416,994.00 bytes/sec
+sent 207,931 bytes  received 558 bytes  416,978.00 bytes/sec
 total size is 205,621  speedup is 0.99

package/dist/apiBasedTools.js

@@ -54,22 +54,22 @@ const TOOL_OVERRIDES = {
     },
     get_resource_data: {
         format_tool: ({ inputs, resourceLabel }) => (`Get ${getDataPrefix(inputs)}${resourceLabel}`),
-        post_process_response: (_a) => __awaiter(void 0, [_a], void 0, function* ({ output, inputs, invokeTool, userTimeZone }) {
+        post_process_response: (_a) => __awaiter(void 0, [_a], void 0, function* ({ adminforth, output, inputs, userTimeZone }) {
+            var _b;
             if (hasToolError(output)) {
                 return output;
             }
-            const resourceId = inputs === null || inputs === void 0 ? void 0 : inputs.resourceId;
-            const getResourceOutput = yield invokeTool('get_resource', {
-                inputs: { resourceId },
-            });
-            const dateTimeColumnNames = getDateTimeColumnNames(getResourceOutput);
+            const dateTimeColumnNames = getDateTimeColumnNames(adminforth, inputs);
             if (dateTimeColumnNames.length === 0) {
                 return output;
             }
+            if (!hasGetResourceDataRows(output)) {
+                logger.warn(`Skipping datetime formatting for get_resource_data because response.data is not an array for resource ${(_b = getInputString(inputs, 'resourceId')) !== null && _b !== void 0 ? _b : 'unknown'}`);
+                return output;
+            }
             const localizedTimeZone = userTimeZone !== null && userTimeZone !== void 0 ? userTimeZone : DEFAULT_USER_TIME_ZONE;
-            const response = output;
-            formatDateTimeColumns(response.data, dateTimeColumnNames, localizedTimeZone);
-            return response;
+            formatDateTimeColumns(output.data, dateTimeColumnNames, localizedTimeZone);
+            return output;
         }),
     },
     aggregate: {
@@ -196,9 +196,19 @@ function wipePath(target, pathParts) {
 function hasToolError(output) {
     return typeof output === 'object' && output !== null && 'error' in output;
 }
-function getDateTimeColumnNames(output) {
-    const resource = output.resource;
-    return resource.columns
+function hasGetResourceDataRows(output) {
+    if (typeof output !== 'object' || output === null || !('data' in output)) {
+        return false;
+    }
+    return Array.isArray(output.data);
+}
+function getDateTimeColumnNames(adminforth, inputs) {
+    const resourceId = getInputString(inputs, 'resourceId');
+    const resource = adminforth.config.resources.find((res) => res.resourceId === resourceId);
+    if (!resource) {
+        return [];
+    }
+    return resource.dataSourceColumns
         .filter((column) => column.type === AdminForthDataTypes.DATETIME)
         .map((column) => column.name);
 }
@@ -242,6 +252,7 @@ function applyToolOverride(params) {
             return sanitizedOutput;
         }
         const postProcessedOutput = yield override.post_process_response({
+            adminforth,
             output: sanitizedOutput,
             adminUser,
             httpExtra,
@@ -301,6 +312,7 @@ export function formatApiBasedToolCall(params) {
         var _a;
         const formatTool = (_a = TOOL_OVERRIDES[params.toolName]) === null || _a === void 0 ? void 0 : _a.format_tool;
         return yield (formatTool === null || formatTool === void 0 ? void 0 : formatTool({
+            adminforth: params.adminforth,
             adminUser: params.adminUser,
             httpExtra: params.httpExtra,
             inputs: params.inputs,

package/package.json

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