@sweny-ai/core 0.1.50 → 0.1.52

package/dist/mcp.test.js

@@ -665,4 +665,71 @@ describe("buildSkillMcpServers", () => {
         });
         expect(result["betterstack"]?.headers?.Authorization).toBe("Bearer primary");
     });
+    // ── Skill-declared MCP servers ──────────────────────────────────────
+    it("includes skill-declared MCP servers", () => {
+        const result = buildSkillMcpServers({
+            referencedSkills: new Set(["our-crm"]),
+            credentials: {},
+            skillMcpServers: {
+                "our-crm": {
+                    type: "stdio",
+                    command: "npx",
+                    args: ["-y", "@company/crm-server"],
+                    env: { API_KEY: "test-key" },
+                },
+            },
+        });
+        expect(result["our-crm"]).toBeDefined();
+        expect(result["our-crm"].command).toBe("npx");
+    });
+    it("skill-declared MCP is only included when skill is referenced", () => {
+        const result = buildSkillMcpServers({
+            referencedSkills: new Set(["github"]),
+            credentials: { GITHUB_TOKEN: "ghp_test" },
+            skillMcpServers: {
+                "our-crm": {
+                    type: "stdio",
+                    command: "npx",
+                    args: ["-y", "@company/crm-server"],
+                },
+            },
+        });
+        expect(result["github"]).toBeDefined();
+        expect(result["our-crm"]).toBeUndefined();
+    });
+    it("user-supplied servers win over skill-declared", () => {
+        const result = buildSkillMcpServers({
+            referencedSkills: new Set(["our-crm"]),
+            credentials: {},
+            skillMcpServers: {
+                "our-crm": {
+                    type: "stdio",
+                    command: "npx",
+                    args: ["-y", "@company/crm-server"],
+                },
+            },
+            userMcpServers: {
+                "our-crm": {
+                    type: "http",
+                    url: "https://override.example.com",
+                },
+            },
+        });
+        expect(result["our-crm"].url).toBe("https://override.example.com");
+    });
+    it("skill-declared and auto-wired MCPs coexist", () => {
+        const result = buildSkillMcpServers({
+            referencedSkills: new Set(["github", "our-crm"]),
+            credentials: { GITHUB_TOKEN: "ghp_test" },
+            skillMcpServers: {
+                "our-crm": {
+                    type: "stdio",
+                    command: "npx",
+                    args: ["-y", "@company/crm-server"],
+                },
+            },
+        });
+        expect(result["github"]).toBeDefined();
+        expect(result["our-crm"]).toBeDefined();
+    });
 });

package/dist/schema.d.ts

@@ -7,6 +7,7 @@
  * parsing untrusted input (JSON/YAML import, Studio editor).
  */
 import { z } from "zod";
+import type { Workflow } from "./types.js";
 export declare const jsonSchemaZ: z.ZodRecord<z.ZodString, z.ZodUnknown>;
 export declare const configFieldZ: z.ZodObject<{
     description: z.ZodString;
@@ -40,12 +41,137 @@ export declare const toolZ: z.ZodObject<{
     input_schema: Record<string, unknown>;
 }>;
 export declare const skillCategoryZ: z.ZodEnum<["git", "observability", "tasks", "notification", "general"]>;
-export declare const skillZ: z.ZodObject<{
+export declare const mcpServerConfigZ: z.ZodEffects<z.ZodObject<{
+    type: z.ZodOptional<z.ZodEnum<["stdio", "http"]>>;
+    command: z.ZodOptional<z.ZodString>;
+    args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    url: z.ZodOptional<z.ZodString>;
+    headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+}, "strip", z.ZodTypeAny, {
+    type?: "stdio" | "http" | undefined;
+    url?: string | undefined;
+    headers?: Record<string, string> | undefined;
+    env?: Record<string, string> | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
+}, {
+    type?: "stdio" | "http" | undefined;
+    url?: string | undefined;
+    headers?: Record<string, string> | undefined;
+    env?: Record<string, string> | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
+}>, {
+    type?: "stdio" | "http" | undefined;
+    url?: string | undefined;
+    headers?: Record<string, string> | undefined;
+    env?: Record<string, string> | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
+}, {
+    type?: "stdio" | "http" | undefined;
+    url?: string | undefined;
+    headers?: Record<string, string> | undefined;
+    env?: Record<string, string> | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
+}>;
+export declare const skillDefinitionZ: z.ZodEffects<z.ZodObject<{
+    name: z.ZodOptional<z.ZodString>;
+    description: z.ZodOptional<z.ZodString>;
+    instruction: z.ZodOptional<z.ZodString>;
+    mcp: z.ZodOptional<z.ZodEffects<z.ZodObject<{
+        type: z.ZodOptional<z.ZodEnum<["stdio", "http"]>>;
+        command: z.ZodOptional<z.ZodString>;
+        args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        url: z.ZodOptional<z.ZodString>;
+        headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    }, "strip", z.ZodTypeAny, {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    }, {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    }>, {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    }, {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    instruction?: string | undefined;
+    name?: string | undefined;
+    description?: string | undefined;
+    mcp?: {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    } | undefined;
+}, {
+    instruction?: string | undefined;
+    name?: string | undefined;
+    description?: string | undefined;
+    mcp?: {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    } | undefined;
+}>, {
+    instruction?: string | undefined;
+    name?: string | undefined;
+    description?: string | undefined;
+    mcp?: {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    } | undefined;
+}, {
+    instruction?: string | undefined;
+    name?: string | undefined;
+    description?: string | undefined;
+    mcp?: {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    } | undefined;
+}>;
+export declare const skillZ: z.ZodEffects<z.ZodObject<{
     id: z.ZodString;
     name: z.ZodString;
     description: z.ZodString;
     category: z.ZodEnum<["git", "observability", "tasks", "notification", "general"]>;
-    config: z.ZodRecord<z.ZodString, z.ZodObject<{
+    config: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         description: z.ZodString;
         required: z.ZodOptional<z.ZodBoolean>;
         env: z.ZodOptional<z.ZodString>;
@@ -57,8 +183,8 @@ export declare const skillZ: z.ZodObject<{
         description: string;
         required?: boolean | undefined;
         env?: string | undefined;
-    }>>;
-    tools: z.ZodArray<z.ZodObject<{
+    }>>>;
+    tools: z.ZodDefault<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
         description: z.ZodString;
         input_schema: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -70,10 +196,47 @@ export declare const skillZ: z.ZodObject<{
         name: string;
         description: string;
         input_schema: Record<string, unknown>;
-    }>, "many">;
+    }>, "many">>;
+    instruction: z.ZodOptional<z.ZodString>;
+    mcp: z.ZodOptional<z.ZodEffects<z.ZodObject<{
+        type: z.ZodOptional<z.ZodEnum<["stdio", "http"]>>;
+        command: z.ZodOptional<z.ZodString>;
+        args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        url: z.ZodOptional<z.ZodString>;
+        headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    }, "strip", z.ZodTypeAny, {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    }, {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    }>, {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    }, {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    }>>;
 }, "strip", z.ZodTypeAny, {
-    id: string;
     name: string;
+    id: string;
     description: string;
     category: "git" | "observability" | "tasks" | "notification" | "general";
     config: Record<string, {
@@ -86,9 +249,42 @@ export declare const skillZ: z.ZodObject<{
         description: string;
         input_schema: Record<string, unknown>;
     }[];
+    instruction?: string | undefined;
+    mcp?: {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    } | undefined;
 }, {
+    name: string;
     id: string;
+    description: string;
+    category: "git" | "observability" | "tasks" | "notification" | "general";
+    instruction?: string | undefined;
+    mcp?: {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    } | undefined;
+    config?: Record<string, {
+        description: string;
+        required?: boolean | undefined;
+        env?: string | undefined;
+    }> | undefined;
+    tools?: {
+        name: string;
+        description: string;
+        input_schema: Record<string, unknown>;
+    }[] | undefined;
+}>, {
     name: string;
+    id: string;
     description: string;
     category: "git" | "observability" | "tasks" | "notification" | "general";
     config: Record<string, {
@@ -101,6 +297,39 @@ export declare const skillZ: z.ZodObject<{
         description: string;
         input_schema: Record<string, unknown>;
     }[];
+    instruction?: string | undefined;
+    mcp?: {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    } | undefined;
+}, {
+    name: string;
+    id: string;
+    description: string;
+    category: "git" | "observability" | "tasks" | "notification" | "general";
+    instruction?: string | undefined;
+    mcp?: {
+        type?: "stdio" | "http" | undefined;
+        url?: string | undefined;
+        headers?: Record<string, string> | undefined;
+        env?: Record<string, string> | undefined;
+        command?: string | undefined;
+        args?: string[] | undefined;
+    } | undefined;
+    config?: Record<string, {
+        description: string;
+        required?: boolean | undefined;
+        env?: string | undefined;
+    }> | undefined;
+    tools?: {
+        name: string;
+        description: string;
+        input_schema: Record<string, unknown>;
+    }[] | undefined;
 }>;
 export declare const nodeZ: z.ZodObject<{
     name: z.ZodString;
@@ -108,15 +337,15 @@ export declare const nodeZ: z.ZodObject<{
     skills: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
     output: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 }, "strip", z.ZodTypeAny, {
-    skills: string[];
     instruction: string;
     name: string;
+    skills: string[];
     output?: Record<string, unknown> | undefined;
 }, {
     instruction: string;
     name: string;
-    skills?: string[] | undefined;
     output?: Record<string, unknown> | undefined;
+    skills?: string[] | undefined;
 }>;
 export declare const edgeZ: z.ZodObject<{
     from: z.ZodString;
@@ -144,15 +373,15 @@ export declare const workflowZ: z.ZodObject<{
         skills: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
         output: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
     }, "strip", z.ZodTypeAny, {
-        skills: string[];
         instruction: string;
         name: string;
+        skills: string[];
         output?: Record<string, unknown> | undefined;
     }, {
         instruction: string;
         name: string;
-        skills?: string[] | undefined;
         output?: Record<string, unknown> | undefined;
+        skills?: string[] | undefined;
     }>>;
     edges: z.ZodArray<z.ZodObject<{
         from: z.ZodString;
@@ -171,14 +400,116 @@ export declare const workflowZ: z.ZodObject<{
         max_iterations?: number | undefined;
     }>, "many">;
     entry: z.ZodString;
+    skills: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodObject<{
+        name: z.ZodOptional<z.ZodString>;
+        description: z.ZodOptional<z.ZodString>;
+        instruction: z.ZodOptional<z.ZodString>;
+        mcp: z.ZodOptional<z.ZodEffects<z.ZodObject<{
+            type: z.ZodOptional<z.ZodEnum<["stdio", "http"]>>;
+            command: z.ZodOptional<z.ZodString>;
+            args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            url: z.ZodOptional<z.ZodString>;
+            headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+            env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        }, "strip", z.ZodTypeAny, {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        }, {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        }>, {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        }, {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        instruction?: string | undefined;
+        name?: string | undefined;
+        description?: string | undefined;
+        mcp?: {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        } | undefined;
+    }, {
+        instruction?: string | undefined;
+        name?: string | undefined;
+        description?: string | undefined;
+        mcp?: {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        } | undefined;
+    }>, {
+        instruction?: string | undefined;
+        name?: string | undefined;
+        description?: string | undefined;
+        mcp?: {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        } | undefined;
+    }, {
+        instruction?: string | undefined;
+        name?: string | undefined;
+        description?: string | undefined;
+        mcp?: {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        } | undefined;
+    }>>>;
 }, "strip", z.ZodTypeAny, {
-    id: string;
     name: string;
+    id: string;
     description: string;
+    skills: Record<string, {
+        instruction?: string | undefined;
+        name?: string | undefined;
+        description?: string | undefined;
+        mcp?: {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        } | undefined;
+    }>;
     nodes: Record<string, {
-        skills: string[];
         instruction: string;
         name: string;
+        skills: string[];
         output?: Record<string, unknown> | undefined;
     }>;
     edges: {
@@ -189,13 +520,13 @@ export declare const workflowZ: z.ZodObject<{
     }[];
     entry: string;
 }, {
-    id: string;
     name: string;
+    id: string;
     nodes: Record<string, {
         instruction: string;
         name: string;
-        skills?: string[] | undefined;
         output?: Record<string, unknown> | undefined;
+        skills?: string[] | undefined;
     }>;
     edges: {
         to: string;
@@ -205,16 +536,42 @@ export declare const workflowZ: z.ZodObject<{
     }[];
     entry: string;
     description?: string | undefined;
+    skills?: Record<string, {
+        instruction?: string | undefined;
+        name?: string | undefined;
+        description?: string | undefined;
+        mcp?: {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        } | undefined;
+    }> | undefined;
 }>;
 /** Parse + validate a raw object as a Workflow. Throws on invalid input. */
 export declare function parseWorkflow(raw: unknown): {
-    id: string;
     name: string;
+    id: string;
     description: string;
+    skills: Record<string, {
+        instruction?: string | undefined;
+        name?: string | undefined;
+        description?: string | undefined;
+        mcp?: {
+            type?: "stdio" | "http" | undefined;
+            url?: string | undefined;
+            headers?: Record<string, string> | undefined;
+            env?: Record<string, string> | undefined;
+            command?: string | undefined;
+            args?: string[] | undefined;
+        } | undefined;
+    }>;
     nodes: Record<string, {
-        skills: string[];
         instruction: string;
         name: string;
+        skills: string[];
         output?: Record<string, unknown> | undefined;
     }>;
     edges: {
@@ -226,7 +583,7 @@ export declare function parseWorkflow(raw: unknown): {
     entry: string;
 };
 export interface WorkflowError {
-    code: "MISSING_ENTRY" | "UNKNOWN_EDGE_SOURCE" | "UNKNOWN_EDGE_TARGET" | "UNREACHABLE_NODE" | "UNKNOWN_SKILL" | "SELF_LOOP" | "UNBOUNDED_CYCLE";
+    code: "MISSING_ENTRY" | "UNKNOWN_EDGE_SOURCE" | "UNKNOWN_EDGE_TARGET" | "UNREACHABLE_NODE" | "UNKNOWN_SKILL" | "SELF_LOOP" | "UNBOUNDED_CYCLE" | "INVALID_INLINE_SKILL";
     message: string;
     nodeId?: string;
 }
@@ -244,7 +601,7 @@ export interface WorkflowError {
  * Note: nodes with no outgoing edges are valid terminal nodes — the executor
  * returns null when it reaches one, ending the workflow cleanly.
  */
-export declare function validateWorkflow(workflow: z.infer<typeof workflowZ>, knownSkills?: Set<string>): WorkflowError[];
+export declare function validateWorkflow(workflow: Workflow | z.infer<typeof workflowZ>, knownSkills?: Set<string>): WorkflowError[];
 /**
  * Static JSON Schema for the Workflow type.
  * Use this for external validation (YAML files, Studio import, CI checks).
@@ -331,5 +688,58 @@ export declare const workflowJsonSchema: {
                 };
             };
         };
+        readonly skills: {
+            readonly type: "object";
+            readonly description: "Inline skill definitions scoped to this workflow";
+            readonly additionalProperties: {
+                readonly type: "object";
+                readonly properties: {
+                    readonly name: {
+                        readonly type: "string";
+                    };
+                    readonly description: {
+                        readonly type: "string";
+                    };
+                    readonly instruction: {
+                        readonly type: "string";
+                        readonly description: "Natural language expertise injected into the node prompt";
+                    };
+                    readonly mcp: {
+                        readonly type: "object";
+                        readonly description: "External MCP server definition";
+                        readonly properties: {
+                            readonly type: {
+                                readonly type: "string";
+                                readonly enum: readonly ["stdio", "http"];
+                            };
+                            readonly command: {
+                                readonly type: "string";
+                            };
+                            readonly args: {
+                                readonly type: "array";
+                                readonly items: {
+                                    readonly type: "string";
+                                };
+                            };
+                            readonly url: {
+                                readonly type: "string";
+                            };
+                            readonly headers: {
+                                readonly type: "object";
+                                readonly additionalProperties: {
+                                    readonly type: "string";
+                                };
+                            };
+                            readonly env: {
+                                readonly type: "object";
+                                readonly additionalProperties: {
+                                    readonly type: "string";
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
     };
 };