skedyul 1.2.18 → 1.2.21

package/dist/server.js

@@ -709,10 +709,11 @@ function padEnd(str, length) {
   }
   return str + " ".repeat(length - str.length);
 }
-function printStartupLog(config, tools, webhookRegistry, port) {
+function printStartupLog(config, tools, port) {
   if (process.env.NODE_ENV === "test") {
     return;
   }
+  const webhookRegistry = config.webhooks;
   const webhookCount = webhookRegistry ? Object.keys(webhookRegistry).length : 0;
   const webhookNames = webhookRegistry ? Object.keys(webhookRegistry) : [];
   const maxRequests = config.maxRequests ?? parseNumberEnv(process.env.MCP_MAX_REQUESTS) ?? null;
@@ -725,9 +726,9 @@ function printStartupLog(config, tools, webhookRegistry, port) {
   console.log(`\u2551  \u{1F680} Skedyul MCP Server Starting                                      \u2551`);
   console.log(`\u2560${divider}\u2563`);
   console.log(`\u2551                                                                      \u2551`);
-  console.log(`\u2551  \u{1F4E6} Server:       ${padEnd(config.metadata.name, 49)}\u2551`);
-  console.log(`\u2551  \u{1F3F7}\uFE0F  Version:      ${padEnd(config.metadata.version, 49)}\u2551`);
-  console.log(`\u2551  \u26A1 Compute:      ${padEnd(config.computeLayer, 49)}\u2551`);
+  console.log(`\u2551  \u{1F4E6} Server:       ${padEnd(config.name, 49)}\u2551`);
+  console.log(`\u2551  \u{1F3F7}\uFE0F  Version:      ${padEnd(config.version ?? "N/A", 49)}\u2551`);
+  console.log(`\u2551  \u26A1 Compute:      ${padEnd(config.computeLayer ?? "serverless", 49)}\u2551`);
   if (port) {
     console.log(`\u2551  \u{1F310} Port:         ${padEnd(String(port), 49)}\u2551`);
   }
@@ -769,67 +770,40 @@ function printStartupLog(config, tools, webhookRegistry, port) {
   console.log("");
 }
 
-// src/config/resolve.ts
-async function resolveDynamicImport(value) {
-  if (value === void 0 || value === null) {
-    return void 0;
-  }
-  if (value instanceof Promise) {
-    const resolved = await value;
-    if (resolved && typeof resolved === "object" && "default" in resolved) {
-      return resolved.default;
-    }
-    return resolved;
-  }
-  return value;
-}
-function serializeTools(registry) {
-  return Object.entries(registry).map(([key, tool]) => ({
-    name: tool.name || key,
-    displayName: tool.label,
-    description: tool.description,
-    timeout: tool.timeout,
-    retries: tool.retries
-  }));
-}
-function serializeWebhooks(registry) {
-  return Object.values(registry).map((webhook) => ({
-    name: webhook.name,
-    description: webhook.description,
-    methods: webhook.methods ?? ["POST"],
-    type: webhook.type ?? "WEBHOOK"
-  }));
-}
-async function resolveConfig(config, registry, webhookRegistry) {
-  const provision = await resolveDynamicImport(
-    config.provision
-  );
-  const install = await resolveDynamicImport(
-    config.install
-  );
-  const tools = serializeTools(registry);
-  const webhooks = webhookRegistry ? serializeWebhooks(webhookRegistry) : [];
+// src/server/config-serializer.ts
+function serializeConfig(config) {
+  const registry = config.tools;
+  const webhookRegistry = config.webhooks;
   return {
     name: config.name,
     version: config.version,
     description: config.description,
     computeLayer: config.computeLayer,
-    tools,
-    webhooks,
-    provision,
+    tools: registry ? Object.entries(registry).map(([key, tool]) => ({
+      name: tool.name || key,
+      description: tool.description,
+      timeout: tool.timeout,
+      retries: tool.retries
+    })) : [],
+    webhooks: webhookRegistry ? Object.values(webhookRegistry).map((w) => ({
+      name: w.name,
+      description: w.description,
+      methods: w.methods ?? ["POST"],
+      type: w.type ?? "WEBHOOK"
+    })) : [],
+    provision: isProvisionConfig(config.provision) ? config.provision : void 0,
     agents: config.agents
   };
 }
-function createMinimalConfig(name, version) {
-  return {
-    name,
-    version
-  };
+function isProvisionConfig(value) {
+  return value !== void 0 && value !== null && !(value instanceof Promise);
 }
 
 // src/server/dedicated.ts
-function createDedicatedServerInstance(config, tools, callTool, state, mcpServer, registry, webhookRegistry) {
+function createDedicatedServerInstance(config, tools, callTool, state, mcpServer) {
   const port = getListeningPort(config);
+  const registry = config.tools;
+  const webhookRegistry = config.webhooks;
   const httpServer = import_http2.default.createServer(
     async (req, res) => {
       function sendCoreResult(result) {
@@ -846,12 +820,7 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
           return;
         }
         if (pathname === "/config" && req.method === "GET") {
-          const appConfig = config.appConfig ?? createMinimalConfig(
-            config.metadata.name,
-            config.metadata.version
-          );
-          const serializedConfig = await resolveConfig(appConfig, registry, webhookRegistry);
-          sendJSON(res, 200, serializedConfig);
+          sendJSON(res, 200, serializeConfig(config));
           return;
         }
         if (pathname.startsWith("/webhooks/") && webhookRegistry) {
@@ -1380,7 +1349,7 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
       const finalPort = listenPort ?? port;
       return new Promise((resolve, reject) => {
         httpServer.listen(finalPort, () => {
-          printStartupLog(config, tools, webhookRegistry, finalPort);
+          printStartupLog(config, tools, finalPort);
           resolve();
         });
         httpServer.once("error", reject);
@@ -1391,13 +1360,15 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
 }
 
 // src/server/serverless.ts
-function createServerlessInstance(config, tools, callTool, state, mcpServer, registry, webhookRegistry) {
+function createServerlessInstance(config, tools, callTool, state, mcpServer) {
   const headers = getDefaultHeaders(config.cors);
+  const registry = config.tools;
+  const webhookRegistry = config.webhooks;
   let hasLoggedStartup = false;
   return {
     async handler(event) {
       if (!hasLoggedStartup) {
-        printStartupLog(config, tools, webhookRegistry);
+        printStartupLog(config, tools);
         hasLoggedStartup = true;
       }
       try {
@@ -1942,12 +1913,7 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer, reg
           return createResponse(200, state.getHealthStatus(), headers);
         }
         if (path === "/config" && method === "GET") {
-          const appConfig = config.appConfig ?? createMinimalConfig(
-            config.metadata.name,
-            config.metadata.version
-          );
-          const serializedConfig = await resolveConfig(appConfig, registry, webhookRegistry);
-          return createResponse(200, serializedConfig, headers);
+          return createResponse(200, serializeConfig(config), headers);
         }
         if (path === "/mcp" && method === "POST") {
           let body;
@@ -2165,9 +2131,11 @@ console.log("[skedyul-node/server] All imports complete");
 console.log("[skedyul-node/server] Installing context logger...");
 installContextLogger();
 console.log("[skedyul-node/server] Context logger installed");
-function createSkedyulServer(config, registry, webhookRegistry) {
+function createSkedyulServer(config) {
   console.log("[createSkedyulServer] Step 1: mergeRuntimeEnv()");
   mergeRuntimeEnv();
+  const registry = config.tools;
+  const webhookRegistry = config.webhooks;
   console.log("[createSkedyulServer] Step 2: coreApi setup");
   if (config.coreApi?.service) {
     coreApiService.register(config.coreApi.service);
@@ -2179,7 +2147,7 @@ function createSkedyulServer(config, registry, webhookRegistry) {
   const tools = buildToolMetadata(registry);
   console.log("[createSkedyulServer] Step 3 done, tools:", tools.length);
   const toolNames = Object.values(registry).map((tool) => tool.name);
-  const runtimeLabel = config.computeLayer;
+  const runtimeLabel = config.computeLayer ?? "serverless";
   const maxRequests = config.maxRequests ?? parseNumberEnv(process.env.MCP_MAX_REQUESTS) ?? null;
   const ttlExtendSeconds = config.ttlExtendSeconds ?? parseNumberEnv(process.env.MCP_TTL_EXTEND) ?? 3600;
   console.log("[createSkedyulServer] Step 4: createRequestState()");
@@ -2192,8 +2160,8 @@ function createSkedyulServer(config, registry, webhookRegistry) {
   console.log("[createSkedyulServer] Step 4 done");
   console.log("[createSkedyulServer] Step 5: new McpServer()");
   const mcpServer = new import_mcp.McpServer({
-    name: config.metadata.name,
-    version: config.metadata.version
+    name: config.name,
+    version: config.version ?? "0.0.0"
   });
   console.log("[createSkedyulServer] Step 5 done");
   const dedicatedShutdown = () => {
@@ -2321,13 +2289,11 @@ function createSkedyulServer(config, registry, webhookRegistry) {
       tools,
       callTool,
       state,
-      mcpServer,
-      registry,
-      webhookRegistry
+      mcpServer
     );
   }
   console.log("[createSkedyulServer] Creating serverless instance");
-  const serverlessInstance = createServerlessInstance(config, tools, callTool, state, mcpServer, registry, webhookRegistry);
+  const serverlessInstance = createServerlessInstance(config, tools, callTool, state, mcpServer);
   console.log("[createSkedyulServer] Serverless instance created successfully");
   return serverlessInstance;
 }

package/dist/serverless/server.mjs

@@ -648,10 +648,11 @@ function padEnd(str, length) {
   }
   return str + " ".repeat(length - str.length);
 }
-function printStartupLog(config, tools, webhookRegistry, port) {
+function printStartupLog(config, tools, port) {
   if (process.env.NODE_ENV === "test") {
     return;
   }
+  const webhookRegistry = config.webhooks;
   const webhookCount = webhookRegistry ? Object.keys(webhookRegistry).length : 0;
   const webhookNames = webhookRegistry ? Object.keys(webhookRegistry) : [];
   const maxRequests = config.maxRequests ?? parseNumberEnv(process.env.MCP_MAX_REQUESTS) ?? null;
@@ -664,9 +665,9 @@ function printStartupLog(config, tools, webhookRegistry, port) {
   console.log(`\u2551  \u{1F680} Skedyul MCP Server Starting                                      \u2551`);
   console.log(`\u2560${divider}\u2563`);
   console.log(`\u2551                                                                      \u2551`);
-  console.log(`\u2551  \u{1F4E6} Server:       ${padEnd(config.metadata.name, 49)}\u2551`);
-  console.log(`\u2551  \u{1F3F7}\uFE0F  Version:      ${padEnd(config.metadata.version, 49)}\u2551`);
-  console.log(`\u2551  \u26A1 Compute:      ${padEnd(config.computeLayer, 49)}\u2551`);
+  console.log(`\u2551  \u{1F4E6} Server:       ${padEnd(config.name, 49)}\u2551`);
+  console.log(`\u2551  \u{1F3F7}\uFE0F  Version:      ${padEnd(config.version ?? "N/A", 49)}\u2551`);
+  console.log(`\u2551  \u26A1 Compute:      ${padEnd(config.computeLayer ?? "serverless", 49)}\u2551`);
   if (port) {
     console.log(`\u2551  \u{1F310} Port:         ${padEnd(String(port), 49)}\u2551`);
   }
@@ -708,67 +709,40 @@ function printStartupLog(config, tools, webhookRegistry, port) {
   console.log("");
 }
 
-// src/config/resolve.ts
-async function resolveDynamicImport(value) {
-  if (value === void 0 || value === null) {
-    return void 0;
-  }
-  if (value instanceof Promise) {
-    const resolved = await value;
-    if (resolved && typeof resolved === "object" && "default" in resolved) {
-      return resolved.default;
-    }
-    return resolved;
-  }
-  return value;
-}
-function serializeTools(registry) {
-  return Object.entries(registry).map(([key, tool]) => ({
-    name: tool.name || key,
-    displayName: tool.label,
-    description: tool.description,
-    timeout: tool.timeout,
-    retries: tool.retries
-  }));
-}
-function serializeWebhooks(registry) {
-  return Object.values(registry).map((webhook) => ({
-    name: webhook.name,
-    description: webhook.description,
-    methods: webhook.methods ?? ["POST"],
-    type: webhook.type ?? "WEBHOOK"
-  }));
-}
-async function resolveConfig(config, registry, webhookRegistry) {
-  const provision = await resolveDynamicImport(
-    config.provision
-  );
-  const install = await resolveDynamicImport(
-    config.install
-  );
-  const tools = serializeTools(registry);
-  const webhooks = webhookRegistry ? serializeWebhooks(webhookRegistry) : [];
+// src/server/config-serializer.ts
+function serializeConfig(config) {
+  const registry = config.tools;
+  const webhookRegistry = config.webhooks;
   return {
     name: config.name,
     version: config.version,
     description: config.description,
     computeLayer: config.computeLayer,
-    tools,
-    webhooks,
-    provision,
+    tools: registry ? Object.entries(registry).map(([key, tool]) => ({
+      name: tool.name || key,
+      description: tool.description,
+      timeout: tool.timeout,
+      retries: tool.retries
+    })) : [],
+    webhooks: webhookRegistry ? Object.values(webhookRegistry).map((w) => ({
+      name: w.name,
+      description: w.description,
+      methods: w.methods ?? ["POST"],
+      type: w.type ?? "WEBHOOK"
+    })) : [],
+    provision: isProvisionConfig(config.provision) ? config.provision : void 0,
     agents: config.agents
   };
 }
-function createMinimalConfig(name, version) {
-  return {
-    name,
-    version
-  };
+function isProvisionConfig(value) {
+  return value !== void 0 && value !== null && !(value instanceof Promise);
 }
 
 // src/server/dedicated.ts
-function createDedicatedServerInstance(config, tools, callTool, state, mcpServer, registry, webhookRegistry) {
+function createDedicatedServerInstance(config, tools, callTool, state, mcpServer) {
   const port = getListeningPort(config);
+  const registry = config.tools;
+  const webhookRegistry = config.webhooks;
   const httpServer = http.createServer(
     async (req, res) => {
       function sendCoreResult(result) {
@@ -785,12 +759,7 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
           return;
         }
         if (pathname === "/config" && req.method === "GET") {
-          const appConfig = config.appConfig ?? createMinimalConfig(
-            config.metadata.name,
-            config.metadata.version
-          );
-          const serializedConfig = await resolveConfig(appConfig, registry, webhookRegistry);
-          sendJSON(res, 200, serializedConfig);
+          sendJSON(res, 200, serializeConfig(config));
           return;
         }
         if (pathname.startsWith("/webhooks/") && webhookRegistry) {
@@ -1319,7 +1288,7 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
       const finalPort = listenPort ?? port;
       return new Promise((resolve, reject) => {
         httpServer.listen(finalPort, () => {
-          printStartupLog(config, tools, webhookRegistry, finalPort);
+          printStartupLog(config, tools, finalPort);
           resolve();
         });
         httpServer.once("error", reject);
@@ -1330,13 +1299,15 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
 }
 
 // src/server/serverless.ts
-function createServerlessInstance(config, tools, callTool, state, mcpServer, registry, webhookRegistry) {
+function createServerlessInstance(config, tools, callTool, state, mcpServer) {
   const headers = getDefaultHeaders(config.cors);
+  const registry = config.tools;
+  const webhookRegistry = config.webhooks;
   let hasLoggedStartup = false;
   return {
     async handler(event) {
       if (!hasLoggedStartup) {
-        printStartupLog(config, tools, webhookRegistry);
+        printStartupLog(config, tools);
         hasLoggedStartup = true;
       }
       try {
@@ -1881,12 +1852,7 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer, reg
           return createResponse(200, state.getHealthStatus(), headers);
         }
         if (path === "/config" && method === "GET") {
-          const appConfig = config.appConfig ?? createMinimalConfig(
-            config.metadata.name,
-            config.metadata.version
-          );
-          const serializedConfig = await resolveConfig(appConfig, registry, webhookRegistry);
-          return createResponse(200, serializedConfig, headers);
+          return createResponse(200, serializeConfig(config), headers);
         }
         if (path === "/mcp" && method === "POST") {
           let body;
@@ -2104,9 +2070,11 @@ console.log("[skedyul-node/server] All imports complete");
 console.log("[skedyul-node/server] Installing context logger...");
 installContextLogger();
 console.log("[skedyul-node/server] Context logger installed");
-function createSkedyulServer(config, registry, webhookRegistry) {
+function createSkedyulServer(config) {
   console.log("[createSkedyulServer] Step 1: mergeRuntimeEnv()");
   mergeRuntimeEnv();
+  const registry = config.tools;
+  const webhookRegistry = config.webhooks;
   console.log("[createSkedyulServer] Step 2: coreApi setup");
   if (config.coreApi?.service) {
     coreApiService.register(config.coreApi.service);
@@ -2118,7 +2086,7 @@ function createSkedyulServer(config, registry, webhookRegistry) {
   const tools = buildToolMetadata(registry);
   console.log("[createSkedyulServer] Step 3 done, tools:", tools.length);
   const toolNames = Object.values(registry).map((tool) => tool.name);
-  const runtimeLabel = config.computeLayer;
+  const runtimeLabel = config.computeLayer ?? "serverless";
   const maxRequests = config.maxRequests ?? parseNumberEnv(process.env.MCP_MAX_REQUESTS) ?? null;
   const ttlExtendSeconds = config.ttlExtendSeconds ?? parseNumberEnv(process.env.MCP_TTL_EXTEND) ?? 3600;
   console.log("[createSkedyulServer] Step 4: createRequestState()");
@@ -2131,8 +2099,8 @@ function createSkedyulServer(config, registry, webhookRegistry) {
   console.log("[createSkedyulServer] Step 4 done");
   console.log("[createSkedyulServer] Step 5: new McpServer()");
   const mcpServer = new McpServer({
-    name: config.metadata.name,
-    version: config.metadata.version
+    name: config.name,
+    version: config.version ?? "0.0.0"
   });
   console.log("[createSkedyulServer] Step 5 done");
   const dedicatedShutdown = () => {
@@ -2260,13 +2228,11 @@ function createSkedyulServer(config, registry, webhookRegistry) {
       tools,
       callTool,
       state,
-      mcpServer,
-      registry,
-      webhookRegistry
+      mcpServer
     );
   }
   console.log("[createSkedyulServer] Creating serverless instance");
-  const serverlessInstance = createServerlessInstance(config, tools, callTool, state, mcpServer, registry, webhookRegistry);
+  const serverlessInstance = createServerlessInstance(config, tools, callTool, state, mcpServer);
   console.log("[createSkedyulServer] Serverless instance created successfully");
   return serverlessInstance;
 }

package/dist/types/index.d.ts

@@ -11,7 +11,7 @@ export type { ToolTrigger, ProvisionToolContext, FieldChangeToolContext, PageAct
 export { isProvisionContext, isRuntimeContext } from './tool-context';
 export type { ProvisionToolInput, BillingInfo, ToolResponseMeta, ToolEffect, ToolError, ToolExecutionResult, ToolSchemaWithJson, ToolSchema, ToolHandler, ToolDefinition, ToolRegistryEntry, ToolRegistry, ToolName, ToolMetadata, ToolCallResponse, } from './tool';
 export { ToolResponseMetaSchema } from './tool';
-export type { HealthStatus, ComputeLayer, ServerMetadata, CorsOptions, SkedyulServerConfig, DedicatedServerInstance, ServerlessServerInstance, SkedyulServerInstance, } from './server';
+export type { HealthStatus, ComputeLayer, DedicatedServerInstance, ServerlessServerInstance, SkedyulServerInstance, } from './server';
 export type { InstallHandlerContext, InstallHandlerResponseOAuth, InstallHandlerResponseStandard, HasOAuthCallback, InstallHandlerResult, InstallHandler, UninstallHandlerContext, UninstallHandlerResult, UninstallHandler, OAuthCallbackContext, OAuthCallbackResult, OAuthCallbackHandler, ProvisionHandlerContext, ProvisionHandlerResult, ProvisionHandler, ServerHooksWithOAuth, ServerHooksWithoutOAuth, ServerHooks, } from './handlers';
 export type { APIGatewayProxyEvent, APIGatewayProxyResult } from './aws';
 export type { HandlerRawRequest, WebhookRequest, WebhookResponse, ProvisionWebhookContext, RuntimeWebhookContext, WebhookContext, WebhookHandler, WebhookLifecycleContext, CommunicationChannelLifecycleContext, WebhookLifecycleResult, WebhookLifecycleHook, WebhookType, WebhookDefinition, WebhookRegistry, WebhookName, WebhookMetadata, } from './webhook';

package/dist/types/server.d.ts

@@ -1,8 +1,5 @@
-import type { CoreApiConfig } from '../core/types';
-import type { ServerHooks } from './handlers';
 import type { APIGatewayProxyEvent, APIGatewayProxyResult } from './aws';
 import type { ComputeLayer } from '../config/types/compute';
-import type { SkedyulConfig } from '../config/app-config';
 export interface HealthStatus {
     status: 'running';
     requests: number;
@@ -14,28 +11,6 @@ export interface HealthStatus {
     tools: string[];
 }
 export type { ComputeLayer };
-export interface ServerMetadata {
-    name: string;
-    version: string;
-}
-export interface CorsOptions {
-    allowOrigin?: string;
-    allowMethods?: string;
-    allowHeaders?: string;
-}
-export interface SkedyulServerConfig {
-    computeLayer: ComputeLayer;
-    metadata: ServerMetadata;
-    defaultPort?: number;
-    maxRequests?: number | null;
-    ttlExtendSeconds?: number;
-    cors?: CorsOptions;
-    coreApi?: CoreApiConfig;
-    /** Lifecycle hooks for install and provision handlers */
-    hooks?: ServerHooks;
-    /** Original app config from skedyul.config.ts for /config endpoint serialization */
-    appConfig?: SkedyulConfig;
-}
 export interface DedicatedServerInstance {
     listen(port?: number): Promise<void>;
     getHealthStatus(): HealthStatus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skedyul",
-  "version": "1.2.18",
+  "version": "1.2.21",
   "description": "The Skedyul SDK for Node.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/config/resolve.d.ts

@@ -1,27 +0,0 @@
-/**
- * Config resolution utilities.
- *
- * This module provides functions to resolve dynamic imports in SkedyulConfig
- * and convert it to a serializable format for the /config endpoint.
- */
-import type { SkedyulConfig, SerializableSkedyulConfig } from './app-config';
-import type { ToolRegistry, WebhookRegistry } from '../types';
-/**
- * Resolves all dynamic imports in a SkedyulConfig and returns a serializable version.
- *
- * This function:
- * 1. Resolves dynamic imports for tools, webhooks, provision, and install
- * 2. Serializes tool and webhook registries to metadata arrays
- * 3. Returns a plain object suitable for JSON serialization
- *
- * @param config - The original SkedyulConfig (may contain dynamic imports)
- * @param registry - The resolved tool registry (already loaded by mcp_server.ts)
- * @param webhookRegistry - The resolved webhook registry (if any)
- * @returns A fully resolved and serializable config
- */
-export declare function resolveConfig(config: SkedyulConfig, registry: ToolRegistry, webhookRegistry?: WebhookRegistry): Promise<SerializableSkedyulConfig>;
-/**
- * Creates a minimal SkedyulConfig from server metadata.
- * Used as a fallback when appConfig is not provided.
- */
-export declare function createMinimalConfig(name: string, version?: string): SkedyulConfig;