skedyul 1.2.19 → 1.2.21

package/dist/cli/index.js

@@ -2891,10 +2891,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;
@@ -2907,9 +2908,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`);
   }
@@ -2951,67 +2952,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) {
@@ -3028,19 +3002,7 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
           return;
         }
         if (pathname === "/config" && req.method === "GET") {
-          let appConfig = config.appConfig;
-          if (!appConfig && config.appConfigLoader) {
-            const loaded = await config.appConfigLoader();
-            appConfig = loaded.default;
-          }
-          if (!appConfig) {
-            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) {
@@ -3569,7 +3531,7 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
       const finalPort = listenPort ?? port;
       return new Promise((resolve8, reject) => {
         httpServer.listen(finalPort, () => {
-          printStartupLog(config, tools, webhookRegistry, finalPort);
+          printStartupLog(config, tools, finalPort);
           resolve8();
         });
         httpServer.once("error", reject);
@@ -3580,13 +3542,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 {
@@ -4131,19 +4095,7 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer, reg
           return createResponse(200, state.getHealthStatus(), headers);
         }
         if (path14 === "/config" && method === "GET") {
-          let appConfig = config.appConfig;
-          if (!appConfig && config.appConfigLoader) {
-            const loaded = await config.appConfigLoader();
-            appConfig = loaded.default;
-          }
-          if (!appConfig) {
-            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 (path14 === "/mcp" && method === "POST") {
           let body;
@@ -4361,9 +4313,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);
@@ -4375,7 +4329,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()");
@@ -4388,8 +4342,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 = () => {
@@ -4517,13 +4471,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;
 }
@@ -4922,18 +4874,14 @@ Built config for sync:`);
   } catch (error) {
     console.warn(`Could not load install handler: ${error instanceof Error ? error.message : String(error)}`);
   }
-  const server2 = createSkedyulServer(
-    {
-      computeLayer: "dedicated",
-      metadata: {
-        name: serverName,
-        version: serverVersion
-      },
-      defaultPort: port,
-      hooks: installHandler ? { install: installHandler } : void 0
-    },
-    registry
-  );
+  const server2 = createSkedyulServer({
+    name: serverName,
+    version: serverVersion,
+    computeLayer: "dedicated",
+    defaultPort: port,
+    tools: registry,
+    hooks: installHandler ? { install: installHandler } : void 0
+  });
   const dedicatedServer = server2;
   try {
     await dedicatedServer.listen(port);

package/dist/config/app-config.d.ts

@@ -4,6 +4,8 @@
  * This module defines the main configuration interfaces for Skedyul apps.
  */
 import type { ToolRegistry, WebhookRegistry, ToolMetadata, WebhookMetadata } from '../types';
+import type { ServerHooks } from '../types/handlers';
+import type { CoreApiConfig } from '../core/types';
 import type { EnvSchema, ComputeLayer, ModelDefinition, RelationshipDefinition, ChannelDefinition, WorkflowDefinition, PageDefinition, NavigationConfig, AgentDefinition } from './types';
 /**
  * Install configuration - defines per-install env vars and SHARED models.
@@ -44,8 +46,18 @@ export interface BuildConfig {
     /** External dependencies to exclude from bundling (e.g., ['twilio', 'stripe']) */
     external?: string[];
 }
+/**
+ * CORS configuration options.
+ */
+export interface CorsOptions {
+    allowOrigin?: string;
+    allowMethods?: string;
+    allowHeaders?: string;
+}
 /**
  * Main Skedyul app configuration.
+ * This is the unified config type used for both declarative config (skedyul.config.ts)
+ * and runtime server creation (server.create()).
  */
 export interface SkedyulConfig {
     /** App name */
@@ -56,8 +68,16 @@ export interface SkedyulConfig {
     description?: string;
     /** Compute layer: 'serverless' (Lambda) or 'dedicated' (ECS/Docker) */
     computeLayer?: ComputeLayer;
-    /** Build configuration for the integration */
-    build?: BuildConfig;
+    /** Default port for dedicated mode HTTP server */
+    defaultPort?: number;
+    /** Maximum requests before shutdown (serverless mode) */
+    maxRequests?: number | null;
+    /** TTL extension in seconds */
+    ttlExtendSeconds?: number;
+    /** CORS configuration */
+    cors?: CorsOptions;
+    /** Core API configuration */
+    coreApi?: CoreApiConfig;
     /** Tool registry - direct object or dynamic import */
     tools?: ToolRegistry | Promise<{
         toolRegistry: ToolRegistry;
@@ -66,6 +86,8 @@ export interface SkedyulConfig {
     webhooks?: WebhookRegistry | Promise<{
         webhookRegistry: WebhookRegistry;
     }>;
+    /** Lifecycle hooks for install, provision, uninstall, and oauth_callback */
+    hooks?: ServerHooks;
     /** Provision configuration - direct object or dynamic import */
     provision?: ProvisionConfig | Promise<{
         default: ProvisionConfig;
@@ -76,6 +98,8 @@ export interface SkedyulConfig {
     }>;
     /** Agent definitions - multi-tenant agents with tool bindings */
     agents?: AgentDefinition[];
+    /** Build configuration for the integration */
+    build?: BuildConfig;
 }
 /**
  * Serializable config (for database storage).

package/dist/config/index.d.ts

@@ -9,9 +9,8 @@
  * - All definition types extend BaseDefinition
  */
 export * from './types';
-export type { InstallConfig, ProvisionConfig, BuildConfig, SkedyulConfig, SerializableSkedyulConfig, } from './app-config';
+export type { InstallConfig, ProvisionConfig, BuildConfig, CorsOptions, SkedyulConfig, SerializableSkedyulConfig, } from './app-config';
 export { defineConfig } from './app-config';
 export { defineModel, defineChannel, definePage, defineWorkflow, defineAgent, defineEnv, defineNavigation, } from './define';
 export { CONFIG_FILE_NAMES, loadConfig, validateConfig } from './loader';
-export { resolveConfig, createMinimalConfig } from './resolve';
 export { getAllEnvKeys, getRequiredInstallEnvKeys } from './utils';

package/dist/dedicated/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,19 +820,7 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
           return;
         }
         if (pathname === "/config" && req.method === "GET") {
-          let appConfig = config.appConfig;
-          if (!appConfig && config.appConfigLoader) {
-            const loaded = await config.appConfigLoader();
-            appConfig = loaded.default;
-          }
-          if (!appConfig) {
-            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) {
@@ -1387,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);
@@ -1398,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 {
@@ -1949,19 +1913,7 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer, reg
           return createResponse(200, state.getHealthStatus(), headers);
         }
         if (path === "/config" && method === "GET") {
-          let appConfig = config.appConfig;
-          if (!appConfig && config.appConfigLoader) {
-            const loaded = await config.appConfigLoader();
-            appConfig = loaded.default;
-          }
-          if (!appConfig) {
-            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;
@@ -2179,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);
@@ -2193,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()");
@@ -2206,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 = () => {
@@ -2335,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;
 }