@superatomai/sdk-node 0.0.42-mds → 0.0.43-mds

package/dist/index.mjs

@@ -360,8 +360,10 @@ var ToolSchema = z3.object({
   fullSchema: z3.string().optional(),
   params: z3.record(z3.string()),
   fn: z3.function().args(z3.any()).returns(z3.any()),
-  outputSchema: OutputSchema.optional()
+  outputSchema: OutputSchema.optional(),
   // Optional: describes the data structure returned by this tool
+  /** Cache policy. `false` = never cache (live data, write ops). Mirrors HTTP `Cache-Control: no-store`. */
+  cache: z3.union([z3.literal(false), z3.object({ ttlMs: z3.number().optional() })]).optional()
 });
 var UserQueryFiltersSchema = z3.object({
   username: z3.string().optional(),
@@ -2021,6 +2023,21 @@ function formatResultAsString(formattedResult) {
   return JSON.stringify(formattedResult, null, 2);
 }
 
+// src/utils/cache-key.ts
+function stableStringify(value) {
+  if (value === null || typeof value !== "object") {
+    return JSON.stringify(value);
+  }
+  if (Array.isArray(value)) {
+    return "[" + value.map(stableStringify).join(",") + "]";
+  }
+  const keys = Object.keys(value).sort();
+  return "{" + keys.map((k) => JSON.stringify(k) + ":" + stableStringify(value[k])).join(",") + "}";
+}
+function buildDirectToolCacheKey(toolId, parameters) {
+  return `et-direct:${toolId}:${stableStringify(parameters || {})}`;
+}
+
 // src/handlers/data-request.ts
 function getQueryCacheKey(query) {
   if (typeof query === "string") {
@@ -2034,16 +2051,6 @@ function getQueryCacheKey(query) {
   }
   return "";
 }
-function stableStringify(value) {
-  if (value === null || typeof value !== "object") {
-    return JSON.stringify(value);
-  }
-  if (Array.isArray(value)) {
-    return "[" + value.map(stableStringify).join(",") + "]";
-  }
-  const keys = Object.keys(value).sort();
-  return "{" + keys.map((k) => JSON.stringify(k) + ":" + stableStringify(value[k])).join(",") + "}";
-}
 function getCacheKey(collection, op, params, tools) {
   if (collection === "database" && op === "execute" && params?.sql) {
     return getQueryCacheKey(params.sql);
@@ -14520,17 +14527,45 @@ function formatComponentsForPrompt(components) {
    Props Structure: ${propsPreview}`;
   }).join("\n\n");
 }
+function classifyTool(tool) {
+  if (tool.toolType === "direct") return "direct";
+  if (tool.id.endsWith("_query")) return "sql";
+  if (tool.id.endsWith("_call")) return "rest";
+  if (tool.id.endsWith("_graphql")) return "graphql";
+  return "direct";
+}
 function formatToolsForPrompt(tools) {
   if (!tools || tools.length === 0) {
     return "No external tools available.";
   }
-  return tools.map((tool, idx) => {
+  const directTools = [];
+  const sourceTools = [];
+  for (const t of tools) {
+    (classifyTool(t) === "direct" ? directTools : sourceTools).push(t);
+  }
+  const renderTool = (tool, idx, label) => {
     const paramsStr = Object.entries(tool.params || {}).map(([key, type]) => `${key}: ${type}`).join(", ");
-    return `${idx + 1}. ID: ${tool.id}
+    return `${idx + 1}. [${label}] ID: ${tool.id}
    Name: ${tool.name}
    Description: ${tool.description}
    Parameters: { ${paramsStr} }`;
-  }).join("\n\n");
+  };
+  const sections = [];
+  if (directTools.length > 0) {
+    const body = directTools.map((t, i) => renderTool(t, i, "DIRECT \u2014 PREFER")).join("\n\n");
+    sections.push(`### Direct Tools (try these first \u2014 they answer most questions without SQL)
+${body}`);
+  }
+  if (sourceTools.length > 0) {
+    const body = sourceTools.map((t, i) => {
+      const kind = classifyTool(t);
+      const label = kind === "sql" ? "SQL" : kind === "rest" ? "REST" : "GRAPHQL";
+      return renderTool(t, i, label);
+    }).join("\n\n");
+    sections.push(`### Source Tools (fallback \u2014 use only when no direct tool fits)
+${body}`);
+  }
+  return sections.join("\n\n");
 }
 function formatExistingComponentsForPrompt(existingComponents) {
   if (!existingComponents || existingComponents.length === 0) {
@@ -14945,6 +14980,18 @@ Fixed SQL query:`;
       logger.info(`[DASH_COMP_REQ] Replaced direct query with queryId: ${queryId}`);
     }
     finalComponent = { ...finalComponent, props };
+    const ext = finalComponent.props?.externalTool;
+    if (ext?.toolId && !ext?.parameters?.sql) {
+      const matchedTool = tools?.find((t) => t.id === ext.toolId);
+      if (matchedTool && matchedTool.cache !== false) {
+        const match = executedTools.find((t) => t.id === ext.toolId);
+        if (match) {
+          const cacheKey = buildDirectToolCacheKey(ext.toolId, ext.parameters);
+          queryCache.set(cacheKey, { success: true, data: match.result });
+          logger.info(`[DASH_COMP_REQ] Pre-populated et-direct cache for ${ext.toolId}`);
+        }
+      }
+    }
     if (parsedResult.props.query) {
       logger.info(`[DASH_COMP_REQ] Data source: Database query`);
     }
@@ -15116,7 +15163,35 @@ async function createFilterWithLLM(prompt, components, existingComponents, anthr
     const updatedComponents = result.updatedComponents || [];
     for (const comp of updatedComponents) {
       const extTool = comp.props?.externalTool;
-      if (!extTool?.parameters?.sql || !extTool?.toolId) continue;
+      if (!extTool?.toolId) continue;
+      const isDirectTool = !extTool?.parameters?.sql;
+      if (isDirectTool) {
+        const directTool = tools?.find((t) => t.id === extTool.toolId);
+        if (!directTool) {
+          logger.warn(`[DASH_COMP_REQ:FILTER] direct tool ${extTool.toolId} not found in tool registry`);
+          continue;
+        }
+        const declared = new Set(Object.keys(directTool.params || {}));
+        const sentKeys = Object.keys(extTool.parameters || {});
+        const unknown = sentKeys.filter((k) => !declared.has(k));
+        if (unknown.length > 0) {
+          logger.warn(`[DASH_COMP_REQ:FILTER] dropping unknown params on ${extTool.toolId}: ${unknown.join(", ")}`);
+          unknown.forEach((k) => delete extTool.parameters[k]);
+        }
+        if (directTool.cache !== false) {
+          try {
+            const directResult = await directTool.fn(extTool.parameters || {});
+            const cacheKey2 = buildDirectToolCacheKey(extTool.toolId, extTool.parameters);
+            queryCache.set(cacheKey2, { success: true, data: directResult });
+            logger.info(`[DASH_COMP_REQ:FILTER] direct tool ${extTool.toolId} validated and cached for component: ${comp.id}`);
+          } catch (err) {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            logger.warn(`[DASH_COMP_REQ:FILTER] direct tool validation failed for ${extTool.toolId} on component ${comp.id}: ${errMsg}`);
+          }
+        }
+        continue;
+      }
+      if (!extTool?.parameters?.sql) continue;
       let sql = extTool.parameters.sql;
       const defaultParams = extTool.parameters.params || {};
       const toolId = extTool.toolId;