@jskit-ai/assistant-core 0.1.141 → 0.1.143

package/src/server/lib/serviceToolCatalog.js

@@ -1,15 +1,156 @@
 import { requireAuth } from "@jskit-ai/kernel/server/runtime";
 import { normalizeSurfaceId } from "@jskit-ai/kernel/shared/surface/registry";
 import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
-import { resolveStructuredSchemaTransportSchema } from "@jskit-ai/kernel/shared/validators";
+import {
+  resolveStructuredSchemaTransportSchema,
+  validateSchemaPayload
+} from "@jskit-ai/kernel/shared/validators";
 import { resolveWorkspaceSlug } from "./resolveWorkspaceSlug.js";
 
 const AUTOMATION_CHANNEL = "automation";
+const DEFAULT_MAX_DIRECT_TOOLS = 32;
+const DEFAULT_DISCOVERY_PAGE_SIZE = 10;
+const MAX_DISCOVERY_PAGE_SIZE = 20;
+const DEFAULT_MAX_TOOL_ARGUMENT_BYTES = 32 * 1024;
+const DEFAULT_MAX_TOOL_RESULT_BYTES = 48 * 1024;
+const DISCOVERY_TOOL_NAMES = Object.freeze({
+  search: "assistant_action_search",
+  contract: "assistant_action_contract",
+  execute: "assistant_action_execute"
+});
+
+const OPEN_OBJECT_SCHEMA = Object.freeze({
+  type: "object",
+  additionalProperties: true
+});
+
+const ACTION_SEARCH_PARAMETERS = Object.freeze({
+  type: "object",
+  additionalProperties: false,
+  properties: {
+    query: {
+      type: "string",
+      maxLength: 200,
+      description: "Optional words or action-id fragments to match."
+    },
+    cursor: {
+      type: "string",
+      maxLength: 1000,
+      description: "Opaque cursor returned by the previous search page."
+    },
+    limit: {
+      type: "integer",
+      minimum: 1,
+      maximum: MAX_DISCOVERY_PAGE_SIZE,
+      description: "Maximum compact matches to return."
+    }
+  }
+});
+
+const ACTION_SEARCH_OUTPUT_SCHEMA = Object.freeze({
+  type: "object",
+  additionalProperties: false,
+  required: ["items", "nextCursor", "total"],
+  properties: {
+    items: {
+      type: "array",
+      maxItems: MAX_DISCOVERY_PAGE_SIZE,
+      items: {
+        type: "object",
+        additionalProperties: false,
+        required: ["actionId", "version", "kind", "description"],
+        properties: {
+          actionId: { type: "string" },
+          version: { type: "integer", minimum: 1 },
+          kind: { type: "string" },
+          description: { type: "string" }
+        }
+      }
+    },
+    nextCursor: {
+      anyOf: [{ type: "string" }, { type: "null" }]
+    },
+    total: { type: "integer", minimum: 0 }
+  }
+});
+
+const ACTION_CONTRACT_PARAMETERS = Object.freeze({
+  type: "object",
+  additionalProperties: false,
+  required: ["actionId"],
+  properties: {
+    actionId: { type: "string", minLength: 1, maxLength: 300 },
+    version: { type: "integer", minimum: 1 }
+  }
+});
+
+const ACTION_CONTRACT_OUTPUT_SCHEMA = Object.freeze({
+  type: "object",
+  additionalProperties: false,
+  required: ["actionId", "version", "kind", "description", "inputSchema", "outputSchema"],
+  properties: {
+    actionId: { type: "string" },
+    version: { type: "integer", minimum: 1 },
+    kind: { type: "string" },
+    description: { type: "string" },
+    inputSchema: OPEN_OBJECT_SCHEMA,
+    outputSchema: OPEN_OBJECT_SCHEMA
+  }
+});
+
+const ACTION_EXECUTE_PARAMETERS = Object.freeze({
+  type: "object",
+  additionalProperties: false,
+  required: ["actionId", "input"],
+  properties: {
+    actionId: { type: "string", minLength: 1, maxLength: 300 },
+    version: { type: "integer", minimum: 1 },
+    input: OPEN_OBJECT_SCHEMA
+  }
+});
+
+const ACTION_EXECUTE_OUTPUT_SCHEMA = Object.freeze({
+  type: "object",
+  additionalProperties: false,
+  required: ["actionId", "version", "result"],
+  properties: {
+    actionId: { type: "string" },
+    version: { type: "integer", minimum: 1 },
+    result: {}
+  }
+});
+
+const DISCOVERY_TOOL_DESCRIPTORS = Object.freeze([
+  Object.freeze({
+    name: DISCOVERY_TOOL_NAMES.search,
+    description: "Search the actions available to the current user and surface. Returns compact paged matches without schemas.",
+    parameters: ACTION_SEARCH_PARAMETERS,
+    outputSchema: ACTION_SEARCH_OUTPUT_SCHEMA
+  }),
+  Object.freeze({
+    name: DISCOVERY_TOOL_NAMES.contract,
+    description: "Load the exact input and output contract for one available action before executing it.",
+    parameters: ACTION_CONTRACT_PARAMETERS,
+    outputSchema: ACTION_CONTRACT_OUTPUT_SCHEMA
+  }),
+  Object.freeze({
+    name: DISCOVERY_TOOL_NAMES.execute,
+    description: "Execute one available action after loading its exact contract in this turn. The action result is returned in result.",
+    parameters: ACTION_EXECUTE_PARAMETERS,
+    outputSchema: ACTION_EXECUTE_OUTPUT_SCHEMA
+  })
+]);
 
 function normalizeAssistantExtension(value) {
   const source = value && typeof value === "object" && !Array.isArray(value) ? value : {};
+  if (source.transformResult != null && typeof source.transformResult !== "function") {
+    throw new TypeError("extensions.assistant.transformResult must be a function when provided.");
+  }
+
   return Object.freeze({
-    description: normalizeText(source.description)
+    description: normalizeText(source.description),
+    output: Object.hasOwn(source, "output") ? source.output : null,
+    transformResult: typeof source.transformResult === "function" ? source.transformResult : null
   });
 }
 
@@ -142,6 +283,107 @@ function parseToolPayload(argumentsText) {
   }
 }
 
+function normalizeNonNegativeInteger(value, fallback) {
+  const parsed = Number(value);
+  return Number.isInteger(parsed) && parsed >= 0 ? parsed : fallback;
+}
+
+function normalizePositiveInteger(value, fallback) {
+  const parsed = Number(value);
+  return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
+}
+
+function serializedByteLength(value) {
+  const serialized = JSON.stringify(value);
+  if (serialized === undefined) {
+    return Buffer.byteLength("null", "utf8");
+  }
+  return Buffer.byteLength(serialized, "utf8");
+}
+
+function createToolError(status, code, message) {
+  const error = new Error(message);
+  error.status = status;
+  error.statusCode = status;
+  error.code = code;
+  return error;
+}
+
+function ensureSerializedSize(value, maxBytes, { code = "assistant_tool_result_too_large", label = "Tool result" } = {}) {
+  let byteLength = 0;
+  try {
+    byteLength = serializedByteLength(value);
+  } catch {
+    throw createToolError(500, "assistant_tool_result_unserializable", "Tool result could not be serialized.");
+  }
+
+  if (byteLength > maxBytes) {
+    throw createToolError(
+      413,
+      code,
+      `${label} exceeds the assistant size limit. Narrow the request and try again.`
+    );
+  }
+}
+
+function ensureToolArgumentsSize(argumentsText, maxBytes) {
+  const source = String(argumentsText || "");
+  if (Buffer.byteLength(source, "utf8") > maxBytes) {
+    throw createToolError(
+      413,
+      "assistant_tool_arguments_too_large",
+      "Tool arguments exceed the assistant size limit. Narrow the request and try again."
+    );
+  }
+}
+
+function normalizeActionLookupKey(actionId, version) {
+  const normalizedActionId = normalizeText(actionId).toLowerCase();
+  const normalizedVersion = Number(version);
+  if (!normalizedActionId || !Number.isInteger(normalizedVersion) || normalizedVersion < 1) {
+    return "";
+  }
+  return `${normalizedActionId}@${normalizedVersion}`;
+}
+
+function normalizeDiscoveryQuery(value) {
+  return normalizeText(value).toLowerCase().slice(0, 200);
+}
+
+function encodeDiscoveryCursor(offset, query) {
+  return Buffer.from(JSON.stringify({ v: 1, offset, query }), "utf8").toString("base64url");
+}
+
+function decodeDiscoveryCursor(value, query) {
+  const normalizedCursor = normalizeText(value);
+  if (!normalizedCursor) {
+    return 0;
+  }
+
+  try {
+    const parsed = JSON.parse(Buffer.from(normalizedCursor, "base64url").toString("utf8"));
+    if (
+      parsed?.v !== 1 ||
+      normalizeDiscoveryQuery(parsed?.query) !== query ||
+      !Number.isInteger(parsed?.offset) ||
+      parsed.offset < 0
+    ) {
+      throw new Error("invalid cursor");
+    }
+    return parsed.offset;
+  } catch {
+    throw createToolError(400, "assistant_action_cursor_invalid", "Action search cursor is invalid for this query.");
+  }
+}
+
+function truncateDescription(value, maxLength = 240) {
+  const description = normalizeText(value);
+  if (description.length <= maxLength) {
+    return description;
+  }
+  return `${description.slice(0, Math.max(1, maxLength - 1))}…`;
+}
+
 function canInvokeMethod(permission, context) {
   const permissionSpec = normalizePermissionSpec(permission);
 
@@ -243,53 +485,57 @@ function resolveActionBackedToolEntries(actions) {
   }
   const entriesByActionId = new Map();
   for (const action of actions.listDefinitions()) {
-      if (!action || typeof action !== "object") {
-        continue;
-      }
-      if (!hasAutomationChannel(action)) {
-        continue;
-      }
+    if (!action || typeof action !== "object") {
+      continue;
+    }
+    if (!hasAutomationChannel(action)) {
+      continue;
+    }
 
-      const actionId = normalizeText(action.id);
-      if (!actionId) {
-        continue;
-      }
+    const actionId = normalizeText(action.id);
+    if (!actionId) {
+      continue;
+    }
 
-      let assistantExtension = null;
-      try {
-        assistantExtension = normalizeAssistantActionExtension(action);
-      } catch {
-        continue;
-      }
+    let assistantExtension = null;
+    try {
+      assistantExtension = normalizeAssistantActionExtension(action);
+    } catch {
+      continue;
+    }
 
-      const inputSchema = resolveStructuredSchemaTransportSchema(action.input, {
-        context: `Action definition "${actionId}" input`,
-        defaultMode: "patch"
-      }) || null;
-      const outputSchema = resolveStructuredSchemaTransportSchema(action.output, {
-        context: `Action definition "${actionId}" output`,
-        defaultMode: "replace"
-      }) || null;
-      if (!inputSchema || !outputSchema) {
-        continue;
-      }
+    const outputDefinition = assistantExtension.output || action.output;
+    const inputSchema = resolveStructuredSchemaTransportSchema(action.input, {
+      context: `Action definition "${actionId}" input`,
+      defaultMode: "patch"
+    }) || null;
+    const outputSchema = resolveStructuredSchemaTransportSchema(outputDefinition, {
+      context: `Action definition "${actionId}" assistant output`,
+      defaultMode: "replace"
+    }) || null;
+    if (!inputSchema || !outputSchema) {
+      continue;
+    }
 
-      const actionVersion = Number(action.version) || 1;
-      const actionKey = actionId.toLowerCase();
-      const nextEntry = Object.freeze({
-        actionId,
-        actionVersion,
-        toolBaseName: actionId,
-        description: assistantExtension.description || `Run ${actionId}.`,
-        inputSchema,
-        outputSchema,
-        permission: normalizePermissionSpec(action.permission),
-        surfaces: normalizeSurfaceList(action.surfaces)
-      });
-      const existing = entriesByActionId.get(actionKey);
-      if (!existing || actionVersion >= Number(existing.actionVersion || 0)) {
-        entriesByActionId.set(actionKey, nextEntry);
-      }
+    const actionVersion = Number(action.version) || 1;
+    const actionKey = actionId.toLowerCase();
+    const nextEntry = Object.freeze({
+      actionId,
+      actionVersion,
+      kind: normalizeText(action.kind).toLowerCase() || "command",
+      toolBaseName: actionId,
+      description: assistantExtension.description || `Run ${actionId}.`,
+      inputSchema,
+      outputDefinition,
+      outputSchema,
+      transformResult: assistantExtension.transformResult,
+      permission: normalizePermissionSpec(action.permission),
+      surfaces: normalizeSurfaceList(action.surfaces)
+    });
+    const existing = entriesByActionId.get(actionKey);
+    if (!existing || actionVersion >= Number(existing.actionVersion || 0)) {
+      entriesByActionId.set(actionKey, nextEntry);
+    }
   }
 
   return entriesByActionId;
@@ -331,6 +577,9 @@ function resolveActionToolEntries(
           parameters: actionEntry.inputSchema,
           outputSchema: actionEntry.outputSchema
         }),
+        kind: actionEntry.kind,
+        outputDefinition: actionEntry.outputDefinition,
+        transformResult: actionEntry.transformResult,
         permission: actionEntry.permission,
         surfaces: actionEntry.surfaces
       })
@@ -342,7 +591,14 @@ function resolveActionToolEntries(
 
 function createServiceToolCatalog(
   actions,
-  { barredActionIds = [], skipActionPrefixes = [] } = {}
+  {
+    barredActionIds = [],
+    skipActionPrefixes = [],
+    maxDirectTools: rawMaxDirectTools = DEFAULT_MAX_DIRECT_TOOLS,
+    discoveryPageSize: rawDiscoveryPageSize = DEFAULT_DISCOVERY_PAGE_SIZE,
+    maxToolArgumentBytes: rawMaxToolArgumentBytes = DEFAULT_MAX_TOOL_ARGUMENT_BYTES,
+    maxToolResultBytes: rawMaxToolResultBytes = DEFAULT_MAX_TOOL_RESULT_BYTES
+  } = {}
 ) {
   if (!actions || typeof actions.listDefinitions !== "function" || typeof actions.execute !== "function") {
     throw new TypeError("createServiceToolCatalog requires runtime.actions.");
@@ -351,6 +607,17 @@ function createServiceToolCatalog(
   const normalizedSkipPrefixes = (Array.isArray(skipActionPrefixes) ? skipActionPrefixes : [skipActionPrefixes])
     .map((entry) => normalizeText(entry).toLowerCase())
     .filter(Boolean);
+  const maxDirectTools = normalizeNonNegativeInteger(rawMaxDirectTools, DEFAULT_MAX_DIRECT_TOOLS);
+  const discoveryPageSize = Math.min(
+    MAX_DISCOVERY_PAGE_SIZE,
+    normalizePositiveInteger(rawDiscoveryPageSize, DEFAULT_DISCOVERY_PAGE_SIZE)
+  );
+  const maxToolArgumentBytes = normalizePositiveInteger(
+    rawMaxToolArgumentBytes,
+    DEFAULT_MAX_TOOL_ARGUMENT_BYTES
+  );
+  const maxToolResultBytes = normalizePositiveInteger(rawMaxToolResultBytes, DEFAULT_MAX_TOOL_RESULT_BYTES);
+  const toolSetStates = new WeakMap();
   let methodEntries = null;
 
   function resolveOrCreateMethodEntries() {
@@ -365,9 +632,8 @@ function createServiceToolCatalog(
     return methodEntries;
   }
 
-  function resolveToolSet(context = {}) {
-    const tools = [];
-    const byName = new Map();
+  function resolveAuthorizedEntries(context = {}) {
+    const entries = [];
     for (const entry of resolveOrCreateMethodEntries()) {
       if (!canUseToolOnSurface(entry, context)) {
         continue;
@@ -376,19 +642,49 @@ function createServiceToolCatalog(
         continue;
       }
 
-      const descriptor = Object.freeze({
-        ...entry.descriptor,
-        parameters: stripWorkspaceSlugFromSchema(entry.descriptor.parameters, context)
-      });
+      entries.push(Object.freeze({
+        ...entry,
+        descriptor: Object.freeze({
+          ...entry.descriptor,
+          parameters: stripWorkspaceSlugFromSchema(entry.descriptor.parameters, context)
+        })
+      }));
+    }
+
+    return Object.freeze(entries.sort((left, right) => left.descriptor.actionId.localeCompare(right.descriptor.actionId)));
+  }
 
-      tools.push(descriptor);
+  function resolveToolSet(context = {}) {
+    const actionEntries = resolveAuthorizedEntries(context);
+    const useDiscovery = actionEntries.length > maxDirectTools;
+    const tools = useDiscovery
+      ? DISCOVERY_TOOL_DESCRIPTORS.slice()
+      : actionEntries.map((entry) => entry.descriptor);
+    const byName = new Map();
+    for (const descriptor of tools) {
       byName.set(descriptor.name, descriptor);
     }
 
-    return Object.freeze({
+    const toolSet = Object.freeze({
       tools: Object.freeze(tools),
       byName
     });
+    const actionEntriesById = new Map();
+    const directEntriesByToolName = new Map();
+    for (const entry of actionEntries) {
+      actionEntriesById.set(entry.descriptor.actionId.toLowerCase(), entry);
+      if (!useDiscovery) {
+        directEntriesByToolName.set(entry.descriptor.name, entry);
+      }
+    }
+    toolSetStates.set(toolSet, {
+      mode: useDiscovery ? "discovery" : "direct",
+      actionEntries,
+      actionEntriesById,
+      directEntriesByToolName,
+      contractedActionKeys: new Set()
+    });
+    return toolSet;
   }
 
   function toOpenAiToolSchema(tool) {
@@ -402,9 +698,151 @@ function createServiceToolCatalog(
     };
   }
 
+  function requireActionEntry(state, payload = {}) {
+    const actionId = normalizeText(payload.actionId);
+    const entry = actionId ? state.actionEntriesById.get(actionId.toLowerCase()) : null;
+    const requestedVersion = payload.version == null ? null : Number(payload.version);
+    if (
+      !entry ||
+      (requestedVersion != null && requestedVersion !== Number(entry.descriptor.actionVersion))
+    ) {
+      throw createToolError(404, "assistant_action_unknown", "Action is not available.");
+    }
+    return entry;
+  }
+
+  function searchActionEntries(state, payload = {}) {
+    const query = normalizeDiscoveryQuery(payload.query);
+    const terms = query.split(/\s+/u).filter(Boolean);
+    const matches = terms.length < 1
+      ? state.actionEntries
+      : state.actionEntries.filter((entry) => {
+          const searchable = [
+            entry.descriptor.actionId,
+            entry.kind,
+            entry.descriptor.description
+          ].join(" ").toLowerCase();
+          return terms.every((term) => searchable.includes(term));
+        });
+    const offset = decodeDiscoveryCursor(payload.cursor, query);
+    const requestedLimit = normalizePositiveInteger(payload.limit, discoveryPageSize);
+    const limit = Math.min(MAX_DISCOVERY_PAGE_SIZE, requestedLimit);
+    const page = matches.slice(offset, offset + limit);
+    const nextOffset = offset + page.length;
+    const result = {
+      items: page.map((entry) => ({
+        actionId: entry.descriptor.actionId,
+        version: entry.descriptor.actionVersion,
+        kind: entry.kind,
+        description: truncateDescription(entry.descriptor.description)
+      })),
+      nextCursor: nextOffset < matches.length ? encodeDiscoveryCursor(nextOffset, query) : null,
+      total: matches.length
+    };
+    ensureSerializedSize(result, maxToolResultBytes);
+    return result;
+  }
+
+  function resolveActionContract(state, payload = {}) {
+    const entry = requireActionEntry(state, payload);
+    const contract = {
+      actionId: entry.descriptor.actionId,
+      version: entry.descriptor.actionVersion,
+      kind: entry.kind,
+      description: entry.descriptor.description,
+      inputSchema: entry.descriptor.parameters,
+      outputSchema: entry.descriptor.outputSchema
+    };
+    ensureSerializedSize(contract, maxToolResultBytes, {
+      code: "assistant_tool_contract_too_large",
+      label: "Action contract"
+    });
+    state.contractedActionKeys.add(
+      normalizeActionLookupKey(entry.descriptor.actionId, entry.descriptor.actionVersion)
+    );
+    return contract;
+  }
+
+  function createActionInput(value, context = {}) {
+    const actionInput = value && typeof value === "object" && !Array.isArray(value) ? { ...value } : {};
+    const trustedWorkspaceSlug = resolveWorkspaceSlug(context);
+    if (trustedWorkspaceSlug) {
+      actionInput.workspaceSlug = trustedWorkspaceSlug;
+    }
+    return actionInput;
+  }
+
+  async function executeActionEntry(entry, input = {}, context = {}) {
+    const actionInput = createActionInput(input, context);
+    const executionContext = {
+      ...context,
+      channel: AUTOMATION_CHANNEL
+    };
+    const rawResult = await actions.execute({
+      actionId: entry.descriptor.actionId,
+      version: entry.descriptor.actionVersion || null,
+      input: actionInput,
+      context: executionContext
+    });
+    const transformedResult = entry.transformResult
+      ? await entry.transformResult(rawResult, Object.freeze({
+          actionId: entry.descriptor.actionId,
+          version: entry.descriptor.actionVersion,
+          input: Object.freeze({ ...actionInput }),
+          context: executionContext
+        }))
+      : rawResult;
+
+    let result = transformedResult;
+    try {
+      result = validateSchemaPayload(entry.outputDefinition, transformedResult, {
+        phase: "output",
+        context: `Assistant tool "${entry.descriptor.actionId}" output`
+      });
+    } catch {
+      throw createToolError(500, "assistant_tool_output_invalid", "Assistant tool output validation failed.");
+    }
+    ensureSerializedSize(result, maxToolResultBytes);
+    return result;
+  }
+
+  async function executeDiscoveredAction(state, payload = {}, context = {}) {
+    const entry = requireActionEntry(state, payload);
+    const actionKey = normalizeActionLookupKey(entry.descriptor.actionId, entry.descriptor.actionVersion);
+    if (!state.contractedActionKeys.has(actionKey)) {
+      throw createToolError(
+        409,
+        "assistant_action_contract_required",
+        "Load this action's exact contract before executing it."
+      );
+    }
+    const result = await executeActionEntry(entry, payload.input, context);
+    const response = {
+      actionId: entry.descriptor.actionId,
+      version: entry.descriptor.actionVersion,
+      result
+    };
+    ensureSerializedSize(response, maxToolResultBytes);
+    return response;
+  }
+
+  function resolveToolFailure(error) {
+    const status = Number(error?.status || error?.statusCode || 500);
+    return {
+      ok: false,
+      error: {
+        code: String(error?.code || "assistant_tool_failed").trim() || "assistant_tool_failed",
+        message: status >= 500 ? "Tool call failed." : String(error?.message || "Tool call failed."),
+        status: Number.isInteger(status) ? status : 500
+      }
+    };
+  }
+
   async function executeToolCall({ toolName = "", argumentsText = "", context = {}, toolSet = null } = {}) {
     const normalizedToolName = normalizeText(toolName);
-    const resolvedToolSet = toolSet && typeof toolSet === "object" ? toolSet : resolveToolSet(context);
+    const suppliedState = toolSet && typeof toolSet === "object" ? toolSetStates.get(toolSet) : null;
+    const resolvedToolSet = suppliedState ? toolSet : resolveToolSet(context);
+    const state = suppliedState || toolSetStates.get(resolvedToolSet);
     const descriptor = normalizedToolName ? resolvedToolSet.byName.get(normalizedToolName) : null;
 
     if (!descriptor) {
@@ -418,38 +856,31 @@ function createServiceToolCatalog(
     }
 
     try {
-      const actionInput = parseToolPayload(argumentsText);
-      if (actionInput && typeof actionInput === "object" && !Array.isArray(actionInput)) {
-        const workspaceSlug = resolveWorkspaceSlug(context, actionInput);
-        if (workspaceSlug && !Object.hasOwn(actionInput, "workspaceSlug")) {
-          actionInput.workspaceSlug = workspaceSlug;
+      ensureToolArgumentsSize(argumentsText, maxToolArgumentBytes);
+      const payload = parseToolPayload(argumentsText);
+      if (state.mode === "discovery") {
+        if (normalizedToolName === DISCOVERY_TOOL_NAMES.search) {
+          return { ok: true, result: searchActionEntries(state, payload) };
+        }
+        if (normalizedToolName === DISCOVERY_TOOL_NAMES.contract) {
+          return { ok: true, result: resolveActionContract(state, payload) };
+        }
+        if (normalizedToolName === DISCOVERY_TOOL_NAMES.execute) {
+          return { ok: true, result: await executeDiscoveredAction(state, payload, context) };
         }
       }
-      const executionContext = {
-        ...context,
-        channel: AUTOMATION_CHANNEL
-      };
 
-      const result = await actions.execute({
-        actionId: descriptor.actionId,
-        version: descriptor.actionVersion || null,
-        input: actionInput,
-        context: executionContext
-      });
+      const entry = state.directEntriesByToolName.get(normalizedToolName);
+      if (!entry) {
+        throw createToolError(404, "assistant_tool_unknown", "Unknown tool.");
+      }
+      const result = await executeActionEntry(entry, payload, context);
       return {
         ok: true,
         result
       };
     } catch (error) {
-      const status = Number(error?.status || error?.statusCode || 500);
-      return {
-        ok: false,
-        error: {
-          code: String(error?.code || "assistant_tool_failed").trim() || "assistant_tool_failed",
-          message: status >= 500 ? "Tool call failed." : String(error?.message || "Tool call failed."),
-          status: Number.isInteger(status) ? status : 500
-        }
-      };
+      return resolveToolFailure(error);
     }
   }