@adminforth/agent 1.22.2 → 1.24.0

package/apiBasedTools.ts

@@ -65,10 +65,11 @@ type ToolHttpResponse = IAdminForthHttpResponse & {
 type ToolOverrideCallParams = Pick<ApiBasedToolCallParams, 'httpExtra' | 'inputs' | 'userTimeZone'>;
 
 type ToolOverrideContext = {
-  output: unknown;
+  output?: unknown;
   adminUser?: AdminUser;
   httpExtra?: Partial<HttpExtra>;
   inputs?: Record<string, unknown>;
+  resourceLabel?: string;
   userTimeZone?: string;
   invokeTool: (toolName: string, params?: ToolOverrideCallParams) => Promise<unknown>;
 };
@@ -94,8 +95,46 @@ type GetResourceDataToolResponse = {
   options?: Record<string, unknown>;
 };
 
+type DateTimeColumnType = AdminForthDataTypes.DATETIME | AdminForthDataTypes.TIME;
+
 const DEFAULT_USER_TIME_ZONE = 'UTC';
 
+function getInputString(inputs: Record<string, unknown> | undefined, key: string) {
+  const value = inputs?.[key];
+
+  return typeof value === 'string' && value ? value : undefined;
+}
+
+function getInputArrayLength(inputs: Record<string, unknown> | undefined, key: string) {
+  const value = inputs?.[key];
+
+  return Array.isArray(value) ? value.length : undefined;
+}
+
+function resourceLabel(adminforth: IAdminForth, inputs: Record<string, unknown> | undefined) {
+  const resourceId = getInputString(inputs, 'resourceId');
+  const resource = adminforth.config.resources.find((res) => res.resourceId === resourceId);
+
+  return resource?.label ?? resourceId ?? 'resource';
+}
+
+function getDataPrefix(inputs: Record<string, unknown> | undefined) {
+  const offset = typeof inputs?.offset === 'number' ? inputs.offset : undefined;
+  const limit = typeof inputs?.limit === 'number' ? inputs.limit : undefined;
+
+  if (offset !== undefined && limit !== undefined) {
+    return `${offset}-${offset + limit} `;
+  }
+
+  return limit === undefined ? '' : `${limit} `;
+}
+
+function actionText(inputs: Record<string, unknown> | undefined) {
+  const actionId = getInputString(inputs, 'actionId');
+
+  return actionId ? ` action ${actionId}` : ' action';
+}
+
 const TOOL_OVERRIDES: Record<string, ToolOverride> = {
   get_resource: {
     wipe_frontend_specific_data: [
@@ -104,11 +143,12 @@ const TOOL_OVERRIDES: Record<string, ToolOverride> = {
       'resource.options.actions[].customComponent',
       'resource.options.pageInjections',
     ],
-    format_tool: async ({ }) => {
-      return "get resource Apartments"
-    }
+    format_tool: ({ resourceLabel }) => `Get ${resourceLabel} resource`,
   },
   get_resource_data: {
+    format_tool: ({ inputs, resourceLabel }) => (
+      `Get ${getDataPrefix(inputs)}${resourceLabel}`
+    ),
     post_process_response: async ({ output, inputs, invokeTool, userTimeZone }) => {
       if (hasToolError(output)) {
         return output;
@@ -130,9 +170,37 @@ const TOOL_OVERRIDES: Record<string, ToolOverride> = {
 
       return response;
     },
-    format_tool: async ({ }) => {
-      return "get 1-20 Apartment filtered listed=yes"
-    }
+  },
+  aggregate: {
+    format_tool: ({ resourceLabel }) => `Aggregate ${resourceLabel}`,
+  },
+  start_custom_action: {
+    format_tool: ({ inputs, resourceLabel }) => `Run ${resourceLabel}${actionText(inputs)}`,
+  },
+  start_custom_bulk_action: {
+    format_tool: ({ inputs, resourceLabel }) => {
+      const recordCount = getInputArrayLength(inputs, 'recordIds');
+      const recordsText = recordCount === undefined ? '' : ` for ${recordCount} records`;
+
+      return `Run ${resourceLabel}${actionText(inputs)}${recordsText}`;
+    },
+  },
+  start_bulk_action: {
+    format_tool: ({ inputs, resourceLabel }) => {
+      const recordCount = getInputArrayLength(inputs, 'recordIds');
+      const recordsText = recordCount === undefined ? '' : ` for ${recordCount} records`;
+
+      return `Run ${resourceLabel}${actionText(inputs)}${recordsText}`;
+    },
+  },
+  create_record: {
+    format_tool: ({ resourceLabel }) => `Create ${resourceLabel}`,
+  },
+  update_record: {
+    format_tool: ({ resourceLabel }) => `Update ${resourceLabel}`,
+  },
+  delete_record: {
+    format_tool: ({ resourceLabel }) => `Delete ${resourceLabel}`,
   },
 };
 
@@ -373,6 +441,7 @@ async function applyToolOverride(params: {
         adminUser,
         inputs: nestedInputs,
         httpExtra: nestedHttpExtra,
+        userTimeZone: nestedUserTimeZone,
       });
 
       return applyToolOverride({
@@ -398,7 +467,31 @@ function endpointPathToToolName(path: string) {
     .replace(/^_+|_+$/g, '');
 }
 
-function normalizeCookies(cookies?: Partial<HttpExtra>['cookies']): CookieItem[] {
+export async function formatApiBasedToolCall(params: {
+  adminforth: IAdminForth;
+  adminUser?: AdminUser;
+  httpExtra?: Partial<HttpExtra>;
+  inputs?: Record<string, unknown>;
+  toolName: string;
+  userTimeZone?: string;
+}) {
+  const formatTool = TOOL_OVERRIDES[params.toolName]?.format_tool;
+
+  return await formatTool?.({
+    adminUser: params.adminUser,
+    httpExtra: params.httpExtra,
+    inputs: params.inputs,
+    resourceLabel: resourceLabel(params.adminforth, params.inputs),
+    userTimeZone: params.userTimeZone,
+    invokeTool: async () => {
+      throw new Error('Tool info formatting cannot invoke tools');
+    },
+  });
+}
+
+function normalizeCookies(
+  cookies?: Partial<HttpExtra>['cookies'] | Record<string, string>,
+): CookieItem[] {
   if (!cookies) {
     return [];
   }
@@ -488,20 +581,104 @@ function createRawExpressResponse(response: ToolHttpResponse) {
   return rawResponse;
 }
 
+function normalizeDateTimeInputsToUtc(
+  body: Record<string, unknown>,
+  adminforth: IAdminForth,
+  userTimeZone?: string,
+): Record<string, unknown> {
+  if (!userTimeZone || typeof body.resourceId !== 'string') {
+    return body;
+  }
+
+  const resource = adminforth.config.resources.find((res) => res.resourceId === body.resourceId);
+
+  if (!resource) {
+    return body;
+  }
+
+  const columnsByName = new Map(resource.dataSourceColumns.map((column) => [column.name, column]));
+
+  const normalizeColumnValue = (
+    value: unknown,
+    columnType: DateTimeColumnType,
+  ): unknown => {
+    if (Array.isArray(value)) {
+      return value.map((item) => normalizeColumnValue(item, columnType));
+    }
+
+    if (typeof value !== 'string' || value === '') {
+      return value;
+    }
+
+    if (columnType === AdminForthDataTypes.DATETIME) {
+      return dayjs.tz(value, userTimeZone).utc().toISOString();
+    }
+
+    if (columnType === AdminForthDataTypes.TIME) {
+      const userDate = dayjs().tz(userTimeZone).format('YYYY-MM-DD');
+      return dayjs.tz(`${userDate}T${value}`, userTimeZone).utc().format('HH:mm:ss');
+    }
+  };
+
+  const normalizeValue = (value: unknown, key?: string): unknown => {
+    const column = key ? columnsByName.get(key) : undefined;
+
+    if (column?.type === AdminForthDataTypes.DATETIME || column?.type === AdminForthDataTypes.TIME) {
+      return normalizeColumnValue(value, column.type);
+    }
+
+    if (Array.isArray(value)) {
+      return value.map((item) => normalizeValue(item));
+    }
+
+    if (!value || typeof value !== 'object') {
+      return value;
+    }
+
+    const record = value as Record<string, unknown>;
+    const filterColumn = typeof record.field === 'string' ? columnsByName.get(record.field) : undefined;
+
+    if (
+      'value' in record &&
+      (filterColumn?.type === AdminForthDataTypes.DATETIME || filterColumn?.type === AdminForthDataTypes.TIME)
+    ) {
+      return {
+        ...record,
+        value: normalizeColumnValue(record.value, filterColumn.type),
+      };
+    }
+
+    return Object.fromEntries(
+      Object.entries(record).map(([nestedKey, nestedValue]) => [
+        nestedKey,
+        normalizeValue(nestedValue, nestedKey),
+      ]),
+    );
+  };
+
+  return normalizeValue(body) as Record<string, unknown>;
+}
+
 async function callCapturedEndpoint(params: {
   adminforth: IAdminForth;
   adminUser?: AdminUser;
   endpoint: CapturedEndpoint;
   httpExtra?: Partial<HttpExtra>;
   inputs?: Record<string, unknown>;
+  userTimeZone?: string;
 }) {
-  const { adminforth, adminUser, endpoint, httpExtra, inputs } = params;
+  const { adminforth, adminUser, endpoint, httpExtra, inputs, userTimeZone } = params;
   const response = createToolResponse(httpExtra?.response);
   const headers = {
     'content-type': 'application/json',
+    'X-TimeZone': userTimeZone,
     ...(httpExtra?.headers ?? {}),
   };
-  const body = (inputs ?? httpExtra?.body ?? {}) as Record<string, unknown>;
+  const body = normalizeDateTimeInputsToUtc(
+    (inputs ?? httpExtra?.body ?? {}) as Record<string, unknown>,
+    adminforth,
+    headers['X-TimeZone'],
+  );
   const query = httpExtra?.query ?? {};
   const cookies = normalizeCookies(httpExtra?.cookies);
   const requestUrl = httpExtra?.requestUrl ?? `${adminforth.config.baseUrl}/adminapi/v1${endpoint.path}`;
@@ -596,6 +773,7 @@ export function prepareApiBasedTools(adminforth: IAdminForth): Record<string, Ap
           adminUser: adminUser ?? adminuser,
           inputs,
           httpExtra,
+          userTimeZone,
         });
 
         const processedOutput = await applyToolOverride({
@@ -629,4 +807,4 @@ export function serializeApiBasedTool(tool: ApiBasedTool | undefined) {
     output_schema: tool.output_schema,
     call: '[Function]',
   };
-}
+}

package/build.log

@@ -38,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 199,703 bytes  received 562 bytes  400,530.00 bytes/sec
-total size is 197,399  speedup is 0.99
+sent 200,003 bytes  received 562 bytes  401,130.00 bytes/sec
+total size is 197,699  speedup is 0.99

package/custom/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
-  "author": "",
+  "author": "DevForth (https://devforth.io)",
   "license": "ISC",
   "packageManager": "pnpm@10.33.0",
   "dependencies": {

package/custom/skills/mutate_data/SKILL.md

@@ -73,8 +73,7 @@ Are you sure?
 ## Updating
 
 You can use tool `update_record` tool it updates fields of record. To update `allowedActions.edit` should be set to true and 
-`updated` column `showIn.edit` should be true at the same time. If one of this condition is not met, explain to user that is 
-not allowed to edit
+`updated` column `showIn.edit` should be true at the same time. If one of this condition is not met, explain to user that is not allowed to edit
 
 In addition to instructions above show user the table of edits (old value/new value)
 
@@ -126,6 +125,10 @@ After creation of new record also show user a link to this record. If several re
 
 Omit any pictures or file paths, you are not capable of doing it. If they are not required all is good, if they are required, explain to user that you are not able to create record because of this reason.
 
+### Working with dates 
+
+When you create or update date or datetime fields, please use ISO format for this. For example, "2024-01-01" for date and "2024-01-01T12:00:00Z" for datetime. If user provides date in different format, try to parse it and convert to ISO format.
+
 ### Example
 
 

package/dist/agent/middleware/apiBasedTools.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { ToolMessage } from "@langchain/core/messages";
 import { createMiddleware } from "langchain";
 import { logger } from "adminforth";
+import { formatApiBasedToolCall, } from "../../apiBasedTools.js";
 import { createToolCallTracker, } from "../toolCallEvents.js";
 import { ALWAYS_AVAILABLE_API_TOOL_NAMES } from "../tools/index.js";
 import { createApiTool } from "../tools/apiTool.js";
@@ -40,7 +41,7 @@ function getEnabledApiToolNames(messages) {
     }
     return enabledToolNames;
 }
-export function createApiBasedToolsMiddleware(apiBasedTools) {
+export function createApiBasedToolsMiddleware(apiBasedTools, adminforth) {
     const alwaysAvailableApiToolNames = new Set(ALWAYS_AVAILABLE_API_TOOL_NAMES);
     const dynamicTools = Object.fromEntries(Object.entries(apiBasedTools).map(([toolName, apiBasedTool]) => [
         toolName,
@@ -62,12 +63,30 @@ export function createApiBasedToolsMiddleware(apiBasedTools) {
                 var _a, _b, _c, _d;
                 const startedAt = Date.now();
                 const toolInput = JSON.stringify((_a = request.toolCall.args) !== null && _a !== void 0 ? _a : {});
-                const { emitToolCallEvent } = request.runtime.context;
+                const { adminUser, emitToolCallEvent, userTimeZone } = request.runtime.context;
+                const toolArgs = ((_b = request.toolCall.args) !== null && _b !== void 0 ? _b : {});
+                let toolInfo;
+                if (request.toolCall.name === "fetch_skill") {
+                    toolInfo = `Load ${toolArgs.skillName.split("_").join(" ")} skill`;
+                }
+                else if (request.toolCall.name === "fetch_tool_schema") {
+                    toolInfo = `Load ${toolArgs.toolName.split("_").join(" ")} tool `;
+                }
+                else {
+                    toolInfo = yield formatApiBasedToolCall({
+                        adminforth,
+                        adminUser,
+                        inputs: toolArgs,
+                        toolName: request.toolCall.name,
+                        userTimeZone,
+                    });
+                }
                 const toolCallTracker = createToolCallTracker({
                     emit: emitToolCallEvent,
                     toolCallId: request.toolCall.id,
                     toolName: request.toolCall.name,
-                    input: ((_b = request.toolCall.args) !== null && _b !== void 0 ? _b : {}),
+                    toolInfo,
+                    input: toolArgs,
                     startedAt,
                 });
                 toolCallTracker.start();

package/dist/agent/middleware/sequenceDebug.js

@@ -66,15 +66,31 @@ function finalizeSequenceDebug(sequence) {
         resultType: (_a = sequence.resultType) !== null && _a !== void 0 ? _a : "final_text",
     };
 }
+function getDebugModelName(model) {
+    return typeof model.getName === "function" ? model.getName() : undefined;
+}
+function supportsOpenAiResponseDebug(model) {
+    return (getDebugModelName(model) === "ChatOpenAI" &&
+        typeof model.model === "string" &&
+        typeof model.invocationParams === "function");
+}
 function stringifyPromptForDebug(params) {
-    var _a;
+    var _a, _b, _c, _d;
     const { model, systemMessage, messages, tools, toolChoice, modelSettings } = params;
+    if (!supportsOpenAiResponseDebug(model)) {
+        return YAML.stringify(Object.assign(Object.assign(Object.assign({ model: {
+                name: (_a = getDebugModelName(model)) !== null && _a !== void 0 ? _a : null,
+                provider: (_c = (_b = model._defaultConfig) === null || _b === void 0 ? void 0 : _b.modelProvider) !== null && _c !== void 0 ? _c : null,
+                configuredModel: typeof model.model === "string" ? model.model : null,
+            }, systemMessage,
+            messages }, (tools.length > 0 ? { tools } : {})), (toolChoice !== undefined ? { toolChoice } : {})), (modelSettings ? { modelSettings } : {})));
+    }
     return YAML.stringify(Object.assign({ input: convertMessagesToResponsesInput({
             messages: [
                 ...(systemMessage.text === "" ? [] : [systemMessage]),
                 ...messages,
             ],
-            zdrEnabled: (_a = model.zdrEnabled) !== null && _a !== void 0 ? _a : false,
+            zdrEnabled: (_d = model.zdrEnabled) !== null && _d !== void 0 ? _d : false,
             model: model.model,
         }) }, model.invocationParams(Object.assign(Object.assign(Object.assign({}, (modelSettings !== null && modelSettings !== void 0 ? modelSettings : {})), (tools.length > 0 ? { tools } : {})), (toolChoice !== undefined ? { tool_choice: toolChoice } : {})))));
 }

package/dist/agent/simpleAgent.js

@@ -8,10 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { createAgent, summarizationMiddleware } from "langchain";
-import { logger } from "adminforth";
+import { MODEL_PROVIDER_CONFIG, getChatModelByClassName, } from "langchain/chat_models/universal";
+import { logger, } from "adminforth";
 import { BaseCallbackHandler } from "@langchain/core/callbacks/base";
 import { z } from "zod";
-import { ChatOpenAI } from "@langchain/openai";
 import { createAgentTools } from "./tools/index.js";
 import { createApiBasedToolsMiddleware } from "./middleware/apiBasedTools.js";
 import { createSequenceDebugMiddleware, } from "./middleware/sequenceDebug.js";
@@ -23,6 +23,149 @@ export const contextSchema = z.object({
     turnId: z.string(),
     emitToolCallEvent: z.custom(),
 });
+function isRecord(value) {
+    return typeof value === "object" && value !== null;
+}
+function normalizeProvider(value) {
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const normalized = value.toLowerCase().replace(/[_\s]+/g, "-");
+    if (["openai", "open-ai"].includes(normalized)) {
+        return "openai";
+    }
+    if (["anthropic", "claude"].includes(normalized)) {
+        return "anthropic";
+    }
+    if ([
+        "google",
+        "gemini",
+        "google-genai",
+        "google-gemini",
+        "google-generative-ai",
+        "google-generativeai",
+    ].includes(normalized)) {
+        return "google-genai";
+    }
+    return undefined;
+}
+function detectProviderFromConstructorName(constructorName) {
+    const normalized = constructorName === null || constructorName === void 0 ? void 0 : constructorName.toLowerCase();
+    if (!normalized) {
+        return undefined;
+    }
+    if (normalized.includes("openai")) {
+        return "openai";
+    }
+    if (normalized.includes("anthropic") || normalized.includes("claude")) {
+        return "anthropic";
+    }
+    if (normalized.includes("gemini") || normalized.includes("google")) {
+        return "google-genai";
+    }
+    return undefined;
+}
+function detectProviderFromModelName(model) {
+    const normalized = model === null || model === void 0 ? void 0 : model.toLowerCase();
+    if (!normalized) {
+        return undefined;
+    }
+    if (normalized.startsWith("claude")) {
+        return "anthropic";
+    }
+    if (normalized.startsWith("gemini")) {
+        return "google-genai";
+    }
+    if (/^(gpt|o[1-9]|chatgpt)/.test(normalized)) {
+        return "openai";
+    }
+    return undefined;
+}
+function detectAgentModelProvider(adapter) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    const options = (_a = adapter.options) !== null && _a !== void 0 ? _a : {};
+    return ((_j = (_h = (_g = (_f = (_e = (_c = (_b = normalizeProvider(options.modelProvider)) !== null && _b !== void 0 ? _b : normalizeProvider(options.provider)) !== null && _c !== void 0 ? _c : detectProviderFromConstructorName((_d = adapter.constructor) === null || _d === void 0 ? void 0 : _d.name)) !== null && _e !== void 0 ? _e : (options.openAiApiKey || options.openAIApiKey
+        ? "openai"
+        : undefined)) !== null && _f !== void 0 ? _f : (options.anthropicApiKey ? "anthropic" : undefined)) !== null && _g !== void 0 ? _g : (options.geminiApiKey ||
+        options.googleApiKey ||
+        options.googleGenAiApiKey ||
+        options.googleGenerativeAiApiKey
+        ? "google-genai"
+        : undefined)) !== null && _h !== void 0 ? _h : detectProviderFromModelName(options.model)) !== null && _j !== void 0 ? _j : (() => {
+        throw new Error("Could not infer completion adapter provider. Set options.modelProvider to openai, anthropic, or google-genai.");
+    })());
+}
+function getProviderApiKey(provider, options) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    switch (provider) {
+        case "openai":
+            return (_b = (_a = options === null || options === void 0 ? void 0 : options.openAiApiKey) !== null && _a !== void 0 ? _a : options === null || options === void 0 ? void 0 : options.openAIApiKey) !== null && _b !== void 0 ? _b : options === null || options === void 0 ? void 0 : options.apiKey;
+        case "anthropic":
+            return (_c = options === null || options === void 0 ? void 0 : options.anthropicApiKey) !== null && _c !== void 0 ? _c : options === null || options === void 0 ? void 0 : options.apiKey;
+        case "google-genai":
+            return ((_g = (_f = (_e = (_d = options === null || options === void 0 ? void 0 : options.geminiApiKey) !== null && _d !== void 0 ? _d : options === null || options === void 0 ? void 0 : options.googleApiKey) !== null && _e !== void 0 ? _e : options === null || options === void 0 ? void 0 : options.googleGenAiApiKey) !== null && _f !== void 0 ? _f : options === null || options === void 0 ? void 0 : options.googleGenerativeAiApiKey) !== null && _g !== void 0 ? _g : options === null || options === void 0 ? void 0 : options.apiKey);
+    }
+}
+function getProviderModel(provider, options) {
+    if (options === null || options === void 0 ? void 0 : options.model) {
+        return options.model;
+    }
+    if (provider === "openai") {
+        return "gpt-5-nano";
+    }
+    if (provider === "google-genai") {
+        return "gemini-3-flash-preview";
+    }
+    throw new Error(`CompletionAdapter for provider ${provider} must expose options.model`);
+}
+function buildChatModelConfig(params) {
+    var _a, _b;
+    const { provider, options, maxTokens } = params;
+    const apiKey = getProviderApiKey(provider, options);
+    if (!apiKey) {
+        const optionName = provider === "openai"
+            ? "options.openAiApiKey"
+            : provider === "anthropic"
+                ? "options.anthropicApiKey"
+                : "options.geminiApiKey";
+        throw new Error(`CompletionAdapter must expose ${optionName} for ${provider} agent mode`);
+    }
+    const model = getProviderModel(provider, options);
+    const baseURL = (_a = options === null || options === void 0 ? void 0 : options.baseURL) !== null && _a !== void 0 ? _a : options === null || options === void 0 ? void 0 : options.baseUrl;
+    const extraRequestBodyParameters = Object.assign({}, ((_b = options === null || options === void 0 ? void 0 : options.extraRequestBodyParameters) !== null && _b !== void 0 ? _b : {}));
+    if (provider === "openai" && isRecord(extraRequestBodyParameters.reasoning)) {
+        extraRequestBodyParameters.reasoning = Object.assign(Object.assign({}, extraRequestBodyParameters.reasoning), { summary: "auto" });
+    }
+    const config = Object.assign({ model,
+        apiKey,
+        maxTokens, streaming: true }, extraRequestBodyParameters);
+    if (typeof (options === null || options === void 0 ? void 0 : options.timeoutMs) === "number") {
+        config.timeout = options.timeoutMs;
+    }
+    if (baseURL) {
+        config.baseURL = baseURL;
+        config.baseUrl = baseURL;
+        config.configuration = {
+            baseURL,
+        };
+    }
+    if (provider === "openai") {
+        config.openAIApiKey = apiKey;
+        config.useResponsesApi = true;
+        config.outputVersion = "v1";
+        config.promptCacheKey = `adminforth-agent:${model}:system-v1:tools-v1`;
+        config.promptCacheRetention = "in_memory";
+    }
+    if (provider === "anthropic") {
+        config.anthropicApiKey = apiKey;
+    }
+    if (provider === "google-genai") {
+        config.geminiApiKey = apiKey;
+        config.googleApiKey = apiKey;
+        config.maxOutputTokens = maxTokens;
+    }
+    return { model, config };
+}
 function getFiniteNumber(value) {
     return typeof value === "number" && Number.isFinite(value)
         ? value
@@ -102,38 +245,35 @@ function createAgentLlmMetricsLogger() {
     return new AgentLlmMetricsLogger();
 }
 export function createAgentChatModel(params) {
-    var _a, _b, _c, _d;
-    const adapter = params.adapter;
-    const options = (_a = adapter.options) !== null && _a !== void 0 ? _a : {};
-    if (!options.openAiApiKey) {
-        throw new Error("CompletionAdapter must expose options.openAiApiKey for ChatOpenAI");
-    }
-    const model = (_b = options.model) !== null && _b !== void 0 ? _b : "gpt-5-nano";
-    const baseURL = (_c = options.baseURL) !== null && _c !== void 0 ? _c : options.baseUrl;
-    const reasoning = (_d = options.extraRequestBodyParameters) === null || _d === void 0 ? void 0 : _d.reasoning;
-    const reasoningConfig = reasoning
-        ? Object.assign(Object.assign({}, reasoning), { summary: "auto" }) : undefined;
-    // @ts-ignore
-    return new ChatOpenAI(Object.assign(Object.assign(Object.assign({ apiKey: options.openAiApiKey, model, maxTokens: params.maxTokens, useResponsesApi: true, outputVersion: "v1", streaming: true, promptCacheKey: `adminforth-agent:${model}:system-v1:tools-v1`, promptCacheRetention: "in_memory" }, (reasoningConfig ? { reasoning: reasoningConfig } : {})), (typeof options.timeoutMs === "number"
-        ? { timeout: options.timeoutMs }
-        : {})), (baseURL
-        ? {
-            configuration: {
-                baseURL,
-            },
-        }
-        : {})));
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const adapter = params.adapter;
+        const options = (_a = adapter.options) !== null && _a !== void 0 ? _a : {};
+        const provider = detectAgentModelProvider(adapter);
+        const { config } = buildChatModelConfig({
+            provider,
+            options,
+            maxTokens: params.maxTokens,
+        });
+        const className = MODEL_PROVIDER_CONFIG[provider].className;
+        const ChatModelClass = yield getChatModelByClassName(className, provider);
+        return {
+            model: new ChatModelClass(config),
+            provider,
+        };
+    });
 }
 export function callAgent(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { name, model, summaryModel, checkpointer, messages, adminUser, apiBasedTools, customComponentsDir, sessionId, turnId, userTimeZone, emitToolCallEvent, sequenceDebugSink, } = params;
+        const { name, model, summaryModel, modelProvider, checkpointer, messages, adminUser, adminforth, apiBasedTools, customComponentsDir, sessionId, turnId, userTimeZone, emitToolCallEvent, sequenceDebugSink, } = params;
         const tools = yield createAgentTools(customComponentsDir, apiBasedTools);
-        const apiBasedToolsMiddleware = createApiBasedToolsMiddleware(apiBasedTools);
-        const openAiResponsesContinuationMiddleware = createOpenAiResponsesContinuationMiddleware();
+        const apiBasedToolsMiddleware = createApiBasedToolsMiddleware(apiBasedTools, adminforth);
         const sequenceDebugMiddleware = createSequenceDebugMiddleware(sequenceDebugSink);
         const middleware = [
             apiBasedToolsMiddleware,
-            openAiResponsesContinuationMiddleware,
+            ...(modelProvider === "openai"
+                ? [createOpenAiResponsesContinuationMiddleware()]
+                : []),
             sequenceDebugMiddleware,
             summarizationMiddleware({
                 model: summaryModel,

package/dist/agent/toolCallEvents.js

@@ -39,6 +39,7 @@ export function createToolCallTracker(params) {
             params.emit({
                 toolCallId,
                 toolName: params.toolName,
+                toolInfo: params.toolInfo,
                 phase: "start",
                 input: YAML.stringify((_a = params.input) !== null && _a !== void 0 ? _a : {}),
             });