skedyul 1.2.40 → 1.2.43

package/dist/dedicated/server.js

@@ -319,16 +319,20 @@ function createContextLogger() {
 // src/server/tool-handler.ts
 function buildToolMetadata(registry) {
   return Object.values(registry).map((tool) => {
-    const timeout = typeof tool.timeout === "number" && tool.timeout > 0 ? tool.timeout : 1e4;
-    const retries = typeof tool.retries === "number" && tool.retries >= 1 ? tool.retries : 1;
+    const toolConfig = tool.config ?? {};
+    const timeout = typeof toolConfig.timeout === "number" && toolConfig.timeout > 0 ? toolConfig.timeout : 1e4;
+    const retries = typeof toolConfig.retries === "number" && toolConfig.retries >= 1 ? toolConfig.retries : 1;
     return {
       name: tool.name,
       displayName: tool.label || tool.name,
       description: tool.description,
       inputSchema: getJsonSchemaFromToolSchema(tool.inputSchema),
       outputSchema: getJsonSchemaFromToolSchema(tool.outputSchema),
-      timeout,
-      retries
+      config: {
+        timeout,
+        retries,
+        completionHints: toolConfig.completionHints
+      }
     };
   });
 }
@@ -800,8 +804,8 @@ function serializeConfig(config) {
     tools: registry ? Object.entries(registry).map(([key, tool]) => ({
       name: tool.name || key,
       description: tool.description,
-      timeout: tool.timeout,
-      retries: tool.retries
+      timeout: tool.config?.timeout,
+      retries: tool.config?.retries
     })) : [],
     webhooks: webhookRegistry ? Object.values(webhookRegistry).map((w) => ({
       name: w.name,
@@ -1546,28 +1550,69 @@ async function handleMcpToolsCall(params, id, ctx) {
       invocation: toolInvocation
     });
     let result;
-    if (toolResult.error) {
-      const errorOutput = { error: toolResult.error };
+    const isNewShapeFailure = "success" in toolResult && toolResult.success === false;
+    const isLegacyErrorFailure = "error" in toolResult && toolResult.error != null;
+    const isLegacyMetaFailure = "meta" in toolResult && toolResult.meta != null && typeof toolResult.meta === "object" && "success" in toolResult.meta && toolResult.meta.success === false;
+    const isFailure = isNewShapeFailure || isLegacyErrorFailure || isLegacyMetaFailure;
+    if (isFailure) {
+      let errorOutput;
+      if (isNewShapeFailure && "error" in toolResult) {
+        errorOutput = {
+          error: toolResult.error,
+          retry: "retry" in toolResult ? toolResult.retry : void 0
+        };
+      } else if (isLegacyErrorFailure && "error" in toolResult) {
+        errorOutput = { error: toolResult.error };
+      } else if (isLegacyMetaFailure && "meta" in toolResult && toolResult.meta) {
+        const meta = toolResult.meta;
+        errorOutput = {
+          error: {
+            code: "TOOL_FAILED",
+            message: meta.message ?? "Tool execution failed",
+            category: "internal"
+          }
+        };
+      } else {
+        errorOutput = {
+          error: {
+            code: "TOOL_FAILED",
+            message: "Tool execution failed",
+            category: "internal"
+          }
+        };
+      }
       result = {
         content: [{ type: "text", text: JSON.stringify(errorOutput) }],
         structuredContent: hasOutputSchema ? void 0 : errorOutput,
         isError: true,
-        billing: toolResult.billing
+        billing: "billing" in toolResult ? toolResult.billing : void 0
       };
     } else {
-      const outputData = toolResult.output;
+      const outputData = "output" in toolResult ? toolResult.output : null;
+      const effect = "effect" in toolResult ? toolResult.effect : void 0;
+      const warnings = "warnings" in toolResult ? toolResult.warnings : void 0;
+      const pagination = "pagination" in toolResult ? toolResult.pagination : void 0;
       let structuredContent;
       if (outputData) {
-        structuredContent = { ...outputData, __effect: toolResult.effect };
-      } else if (toolResult.effect) {
-        structuredContent = { __effect: toolResult.effect };
+        structuredContent = {
+          ...outputData,
+          __effect: effect,
+          __warnings: warnings,
+          __pagination: pagination
+        };
+      } else if (effect || warnings || pagination) {
+        structuredContent = {
+          __effect: effect,
+          __warnings: warnings,
+          __pagination: pagination
+        };
       } else if (hasOutputSchema) {
         structuredContent = {};
       }
       result = {
-        content: [{ type: "text", text: JSON.stringify(toolResult.output) }],
+        content: [{ type: "text", text: JSON.stringify(outputData) }],
         structuredContent,
-        billing: toolResult.billing
+        billing: "billing" in toolResult ? toolResult.billing : void 0
       };
     }
     return {