terse-cli 0.1.0 → 0.1.2

package/dist/codegen.js

@@ -19,9 +19,6 @@ function sectionHeader(name) {
 function escapeString(s) {
     return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
-function suffix(instances, i) {
-    return instances.length > 1 ? toPascalCase(instances[i].displayName || `Instance${i + 1}`) : "";
-}
 /** Map a tool's integration key back to the IntegrationType enum value used by ConfigInstance. */
 function toolIntegrationToIntegrationType(toolIntegration) {
     switch (toolIntegration) {
@@ -63,90 +60,106 @@ function generateResourceClass(className, fields, staticNameField, items) {
 function generateGitHubSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["GitHubConfig"]);
     const parts = [sectionHeader("GitHub"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = instances.length > 1
-            ? toPascalCase(inst.integration.account_name || `Instance${i + 1}`)
-            : "";
-        const ownerClass = `GithubOwner${sfx}`;
-        const repoClass = `Repository${sfx}`;
-        const id = inst.integration.id;
-        const toStaticName = (raw, fallback) => {
-            let name = toPascalCase(raw || fallback);
-            if (!name)
-                name = fallback;
-            if (/^\d/.test(name))
-                name = `_${name}`;
-            return name;
-        };
-        const repositoriesWithFullName = inst.repositories.map(repo => {
-            const owner = repo.owner || "UnknownOwner";
-            const fullName = repo.owner && repo.name ? `${repo.owner}/${repo.name}` : repo.name;
-            return { ...repo, owner, fullName };
-        });
-        const ownerEntries = new Map();
-        const usedOwnerNames = new Set();
-        for (const repo of repositoriesWithFullName) {
-            if (!ownerEntries.has(repo.owner)) {
-                let ownerStaticName = toStaticName(repo.owner, "UnknownOwner");
-                while (usedOwnerNames.has(ownerStaticName))
-                    ownerStaticName += "_";
-                usedOwnerNames.add(ownerStaticName);
-                ownerEntries.set(repo.owner, { staticName: ownerStaticName, repos: [] });
-            }
-            ownerEntries.get(repo.owner).repos.push(repo);
-        }
-        parts.push(`export class ${ownerClass} {`);
-        parts.push(`    constructor(public readonly name: string) {}`);
-        if (ownerEntries.size > 0) {
-            parts.push("");
-            for (const [owner, data] of ownerEntries) {
-                parts.push(`    static ${data.staticName} = new ${ownerClass}("${escapeString(owner)}")`);
-            }
+    const id = inst.integration.id;
+    const toStaticName = (raw, fallback) => {
+        let name = toPascalCase(raw || fallback);
+        if (!name)
+            name = fallback;
+        if (/^\d/.test(name))
+            name = `_${name}`;
+        return name;
+    };
+    const repositoriesWithFullName = inst.repositories.map(repo => {
+        const owner = repo.owner || "UnknownOwner";
+        const fullName = repo.owner && repo.name ? `${repo.owner}/${repo.name}` : repo.name;
+        return { ...repo, owner, fullName };
+    });
+    const ownerEntries = new Map();
+    const usedOwnerNames = new Set();
+    for (const repo of repositoriesWithFullName) {
+        if (!ownerEntries.has(repo.owner)) {
+            let ownerStaticName = toStaticName(repo.owner, "UnknownOwner");
+            while (usedOwnerNames.has(ownerStaticName))
+                ownerStaticName += "_";
+            usedOwnerNames.add(ownerStaticName);
+            ownerEntries.set(repo.owner, { staticName: ownerStaticName, repos: [] });
         }
-        parts.push("}");
+        ownerEntries.get(repo.owner).repos.push(repo);
+    }
+    parts.push("export class GithubOwner {");
+    parts.push("    constructor(public readonly name: string) {}");
+    if (ownerEntries.size > 0) {
         parts.push("");
-        parts.push(`export class ${repoClass} {`);
-        parts.push(`    constructor(`);
-        parts.push(`        public readonly repositoryId: number,`);
-        parts.push(`        public readonly name: string,`);
-        parts.push(`        public readonly owner: ${ownerClass},`);
-        parts.push(`        public readonly fullName: string`);
-        parts.push(`    ) {}`);
-        if (ownerEntries.size > 0) {
-            parts.push("");
-            for (const [owner, data] of ownerEntries) {
-                const usedRepoNames = new Set();
-                parts.push(`    static ${data.staticName} = {`);
-                for (const repo of data.repos) {
-                    let repoStaticName = toStaticName(repo.name, "Repository");
-                    while (usedRepoNames.has(repoStaticName))
-                        repoStaticName += "_";
-                    usedRepoNames.add(repoStaticName);
-                    parts.push(`        ${repoStaticName}: new ${repoClass}(${repo.id}, "${escapeString(repo.name)}", ${ownerClass}.${data.staticName}, "${escapeString(repo.fullName)}"),`);
-                }
-                parts.push("    } as const");
+        for (const [owner, data] of ownerEntries) {
+            parts.push(`    static ${data.staticName} = new GithubOwner("${escapeString(owner)}")`);
+        }
+    }
+    parts.push("}");
+    parts.push("");
+    parts.push("export class Repos {");
+    parts.push("    constructor(");
+    parts.push("        public readonly repositoryId: number,");
+    parts.push("        public readonly name: string,");
+    parts.push("        public readonly owner: GithubOwner,");
+    parts.push("        public readonly fullName: string");
+    parts.push("    ) {}");
+    if (ownerEntries.size > 0) {
+        parts.push("");
+        for (const [, data] of ownerEntries) {
+            const usedRepoNames = new Set();
+            parts.push(`    static ${data.staticName} = {`);
+            for (const repo of data.repos) {
+                let repoStaticName = toStaticName(repo.name, "Repos");
+                while (usedRepoNames.has(repoStaticName))
+                    repoStaticName += "_";
+                usedRepoNames.add(repoStaticName);
+                parts.push(`        ${repoStaticName}: new Repos(${repo.id}, "${escapeString(repo.name)}", GithubOwner.${data.staticName}, "${escapeString(repo.fullName)}"),`);
             }
+            parts.push("    } as const");
         }
-        parts.push("}");
-        parts.push("");
-        parts.push(`/** Use in \`triggers[]\` */`);
-        parts.push(`export class GithubTrigger${sfx} extends GitHubConfig {`);
-        parts.push(`    constructor(repositories: ${repoClass}[]) {`);
-        parts.push(`        super("${id}", repositories.map(r => r.repositoryId))`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class GithubSkill${sfx} extends GitHubConfig {`);
-        parts.push(`    constructor(repositories: ${repoClass}[]) {`);
-        parts.push(`        super("${id}", repositories.map(r => r.repositoryId))`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
     }
+    parts.push("}");
+    parts.push("");
+    imports.add("GitHubEventType");
+    imports.add("TypedTrigger");
+    imports.add("GithubPRInputEvent");
+    imports.add("GithubPushInputEvent");
+    imports.add("GithubInputEvent");
+    // Namespace object with typed event triggers
+    parts.push("export const GitHub = {");
+    parts.push(`    /** Trigger on push to a repository */`);
+    parts.push(`    onPush(opts: { repo: Repos }): TypedTrigger<GithubPushInputEvent> {`);
+    parts.push(`        return new GitHubConfig("${id}", [opts.repo.repositoryId], [GitHubEventType.PUSH]) as TypedTrigger<GithubPushInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when a pull request is opened */`);
+    parts.push(`    onPROpened(opts: { repo: Repos }): TypedTrigger<GithubPRInputEvent> {`);
+    parts.push(`        return new GitHubConfig("${id}", [opts.repo.repositoryId], [GitHubEventType.PR_OPENED]) as TypedTrigger<GithubPRInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when a pull request is merged */`);
+    parts.push(`    onPRMerged(opts: { repo: Repos }): TypedTrigger<GithubPRInputEvent> {`);
+    parts.push(`        return new GitHubConfig("${id}", [opts.repo.repositoryId], [GitHubEventType.PR_MERGED]) as TypedTrigger<GithubPRInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when a pull request is closed */`);
+    parts.push(`    onPRClosed(opts: { repo: Repos }): TypedTrigger<GithubPRInputEvent> {`);
+    parts.push(`        return new GitHubConfig("${id}", [opts.repo.repositoryId], [GitHubEventType.PR_CLOSED]) as TypedTrigger<GithubPRInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on any pull request event */`);
+    parts.push(`    onPR(opts: { repo: Repos }): TypedTrigger<GithubPRInputEvent> {`);
+    parts.push(`        return new GitHubConfig("${id}", [opts.repo.repositoryId], [GitHubEventType.PR_OPENED, GitHubEventType.PR_MERGED, GitHubEventType.PR_CLOSED, GitHubEventType.PR_SYNCHRONIZE]) as TypedTrigger<GithubPRInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on specific GitHub events for the given repositories */`);
+    parts.push(`    trigger(opts: { repos: Repos[]; eventTypes?: GitHubEventType[] }): TypedTrigger<GithubInputEvent> {`);
+    parts.push(`        return new GitHubConfig("${id}", opts.repos.map(r => r.repositoryId), opts.eventTypes) as TypedTrigger<GithubInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts: { repos: Repos[] }): GitHubConfig {`);
+    parts.push(`        return new GitHubConfig("${id}", opts.repos.map(r => r.repositoryId))`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Gmail ─────────────────────────────────────────────────────────────
@@ -155,57 +168,63 @@ function generateGmailSection(instances) {
         return EMPTY_SECTION;
     const imports = new Set(["GmailConfig", "GmailOutputConfig", "GmailDraftOutputConfig"]);
     const parts = [sectionHeader("Gmail"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const sfx = suffix(instances, i);
-        const id = instances[i].id;
-        parts.push(`/** Use in \`triggers[]\` */`);
-        parts.push(`export class GmailTrigger${sfx} extends GmailConfig {`);
-        parts.push(`    constructor() { super("${id}") }`);
-        parts.push("}");
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class GmailSkill${sfx} extends GmailOutputConfig {`);
-        parts.push(`    constructor() { super("${id}") }`);
-        parts.push("}");
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` — creates draft emails */`);
-        parts.push(`export class GmailDraftSkill${sfx} extends GmailDraftOutputConfig {`);
-        parts.push(`    constructor() { super("${id}") }`);
-        parts.push("}");
-        parts.push("");
-    }
+    const id = instances[0].id;
+    imports.add("GmailEventType");
+    parts.push("export const Gmail = {");
+    parts.push(`    /** Trigger when a new email is received */`);
+    parts.push(`    onEmail(): GmailConfig {`);
+    parts.push(`        return new GmailConfig("${id}", [GmailEventType.EMAIL_RECEIVED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on all Gmail events */`);
+    parts.push(`    trigger(opts?: { eventTypes?: GmailEventType[] }): GmailConfig {`);
+    parts.push(`        return new GmailConfig("${id}", opts?.eventTypes)`);
+    parts.push("    },");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(): GmailOutputConfig {`);
+    parts.push(`        return new GmailOutputConfig("${id}")`);
+    parts.push("    },");
+    parts.push(`    /** Use in \`skills[]\` — creates draft emails */`);
+    parts.push(`    draftSkill(): GmailDraftOutputConfig {`);
+    parts.push(`        return new GmailDraftOutputConfig("${id}")`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Slack ──────────────────────────────────────────────────────────────
 function generateSlackSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["SlackConfig", "SlackOutputConfig"]);
     const parts = [sectionHeader("Slack"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = suffix(instances, i);
-        const channelClass = `SlackChannel${sfx}`;
-        parts.push(generateResourceClass(channelClass, [
-            { classField: "channelId", type: "string", sourceField: "id" },
-            { classField: "name", type: "string", sourceField: "name" },
-        ], "name", inst.channels));
-        parts.push("");
-        parts.push(`/** Use in \`triggers[]\` */`);
-        parts.push(`export class SlackTrigger${sfx} extends SlackConfig {`);
-        parts.push(`    constructor(channel?: ${channelClass}, listenToUserDms?: boolean, userIds?: string[]) {`);
-        parts.push(`        super("${inst.id}", channel?.channelId, channel?.name, listenToUserDms, userIds)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class SlackSkill${sfx} extends SlackOutputConfig {`);
-        parts.push(`    constructor(channel?: ${channelClass}, userIds?: string[], userNames?: string[], listenToUserDms?: boolean) {`);
-        parts.push(`        super("${inst.id}", channel?.channelId, channel?.name, userIds, userNames, listenToUserDms)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = inst.id;
+    parts.push(generateResourceClass("SlackChannel", [
+        { classField: "channelId", type: "string", sourceField: "id" },
+        { classField: "name", type: "string", sourceField: "name" },
+    ], "name", inst.channels));
+    parts.push("");
+    imports.add("SlackEventType");
+    // Namespace object with typed event triggers
+    parts.push("export const Slack = {");
+    parts.push(`    /** Trigger on any message in a channel */`);
+    parts.push(`    onMessage(opts: { channel: SlackChannel; userIds?: string[] }): SlackConfig {`);
+    parts.push(`        return new SlackConfig("${id}", opts.channel.channelId, opts.channel.name, false, opts.userIds, [SlackEventType.MESSAGE])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on direct messages to the bot */`);
+    parts.push(`    onDm(opts?: { userIds?: string[] }): SlackConfig {`);
+    parts.push(`        return new SlackConfig("${id}", undefined, undefined, true, opts?.userIds, [SlackEventType.MESSAGE])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on all Slack events (messages + DMs) for a channel */`);
+    parts.push(`    trigger(opts?: { channel?: SlackChannel; listenToUserDms?: boolean; userIds?: string[]; eventTypes?: SlackEventType[] }): SlackConfig {`);
+    parts.push(`        return new SlackConfig("${id}", opts?.channel?.channelId, opts?.channel?.name, opts?.listenToUserDms, opts?.userIds, opts?.eventTypes)`);
+    parts.push("    },");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts?: { channel?: SlackChannel; userIds?: string[]; userNames?: string[]; listenToUserDms?: boolean }): SlackOutputConfig {`);
+    parts.push(`        return new SlackOutputConfig("${id}", opts?.channel?.channelId, opts?.channel?.name, opts?.userIds, opts?.userNames, opts?.listenToUserDms)`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Figma ─────────────────────────────────────────────────────────────
@@ -214,255 +233,265 @@ function generateFigmaSection(instances) {
         return EMPTY_SECTION;
     const imports = new Set(["FigmaConfig"]);
     const parts = [sectionHeader("Figma"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const sfx = suffix(instances, i);
-        parts.push(`/** Use in \`triggers[]\` */`);
-        parts.push(`export class FigmaTrigger${sfx} extends FigmaConfig {`);
-        parts.push(`    constructor(fileKey: string, fileName: string, teamId: string) {`);
-        parts.push(`        super("${instances[i].id}", fileKey, fileName, teamId)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = instances[0].id;
+    imports.add("FigmaEventType");
+    parts.push("export const Figma = {");
+    parts.push(`    /** Trigger when a comment is added to a Figma file */`);
+    parts.push(`    onComment(opts: { fileKey: string; fileName: string; teamId: string }): FigmaConfig {`);
+    parts.push(`        return new FigmaConfig("${id}", opts.fileKey, opts.fileName, opts.teamId, [FigmaEventType.FILE_COMMENT])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on all Figma events */`);
+    parts.push(`    trigger(opts: { fileKey: string; fileName: string; teamId: string; eventTypes?: FigmaEventType[] }): FigmaConfig {`);
+    parts.push(`        return new FigmaConfig("${id}", opts.fileKey, opts.fileName, opts.teamId, opts.eventTypes)`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Linear ────────────────────────────────────────────────────────────
 function generateLinearSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["LinearInputConfig", "LinearOutputConfig"]);
     const parts = [sectionHeader("Linear"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = suffix(instances, i);
-        const teamClass = `LinearTeam${sfx}`;
-        parts.push(generateResourceClass(teamClass, [
-            { classField: "teamId", type: "string", sourceField: "id" },
-            { classField: "name", type: "string", sourceField: "name" },
-            { classField: "key", type: "string", sourceField: "key" },
-        ], "name", inst.teams));
-        parts.push("");
-        parts.push(`/** Use in \`triggers[]\` */`);
-        parts.push(`export class LinearTrigger${sfx} extends LinearInputConfig {`);
-        parts.push(`    constructor(projectId?: string, projectName?: string) {`);
-        parts.push(`        super("${inst.id}", projectId, projectName)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class LinearSkill${sfx} extends LinearOutputConfig {`);
-        parts.push(`    constructor(team?: ${teamClass}, projectId?: string, projectName?: string) {`);
-        parts.push(`        super("${inst.id}", team?.teamId, team?.name, projectId, projectName)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = inst.id;
+    parts.push(generateResourceClass("LinearTeam", [
+        { classField: "teamId", type: "string", sourceField: "id" },
+        { classField: "name", type: "string", sourceField: "name" },
+        { classField: "key", type: "string", sourceField: "key" },
+    ], "name", inst.teams));
+    parts.push("");
+    imports.add("LinearEventType");
+    parts.push("export const Linear = {");
+    parts.push(`    /** Trigger when a new issue is created */`);
+    parts.push(`    onIssueCreated(opts?: { projectId?: string; projectName?: string }): LinearInputConfig {`);
+    parts.push(`        return new LinearInputConfig("${id}", opts?.projectId, opts?.projectName, [LinearEventType.ISSUE_CREATED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when an issue is updated */`);
+    parts.push(`    onIssueUpdated(opts?: { projectId?: string; projectName?: string }): LinearInputConfig {`);
+    parts.push(`        return new LinearInputConfig("${id}", opts?.projectId, opts?.projectName, [LinearEventType.ISSUE_UPDATED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when a comment is added to an issue */`);
+    parts.push(`    onComment(opts?: { projectId?: string; projectName?: string }): LinearInputConfig {`);
+    parts.push(`        return new LinearInputConfig("${id}", opts?.projectId, opts?.projectName, [LinearEventType.COMMENT_CREATED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on all Linear events */`);
+    parts.push(`    trigger(opts?: { projectId?: string; projectName?: string; eventTypes?: LinearEventType[] }): LinearInputConfig {`);
+    parts.push(`        return new LinearInputConfig("${id}", opts?.projectId, opts?.projectName, opts?.eventTypes)`);
+    parts.push("    },");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts?: { team?: LinearTeam; projectId?: string; projectName?: string }): LinearOutputConfig {`);
+    parts.push(`        return new LinearOutputConfig("${id}", opts?.team?.teamId, opts?.team?.name, opts?.projectId, opts?.projectName)`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Jira & Confluence (Atlassian) ─────────────────────────────────────
 function generateAtlassianSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["JiraConfig", "ConfluenceConfig"]);
     const parts = [sectionHeader("Jira & Confluence"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = suffix(instances, i);
-        const projectClass = `JiraProject${sfx}`;
-        const pageClass = `ConfluencePage${sfx}`;
-        // Jira projects
-        parts.push(generateResourceClass(projectClass, [
-            { classField: "projectKey", type: "string", sourceField: "key" },
-            { classField: "projectId", type: "string", sourceField: "id" },
-            { classField: "name", type: "string", sourceField: "name" },
-        ], "name", inst.jiraProjects));
-        parts.push("");
-        parts.push(`/** Use in \`triggers[]\` */`);
-        parts.push(`export class JiraTrigger${sfx} extends JiraConfig {`);
-        parts.push(`    constructor(project?: ${projectClass}) {`);
-        parts.push(`        super("${inst.id}", project?.projectKey, project?.projectId)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class JiraSkill${sfx} extends JiraConfig {`);
-        parts.push(`    constructor(project?: ${projectClass}) {`);
-        parts.push(`        super("${inst.id}", project?.projectKey, project?.projectId)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-        // Confluence pages
-        parts.push(generateResourceClass(pageClass, [
-            { classField: "pageId", type: "string", sourceField: "id" },
-            { classField: "title", type: "string", sourceField: "title" },
-            { classField: "spaceId", type: "string", sourceField: "spaceId" },
-            { classField: "spaceName", type: "string", sourceField: "spaceName" },
-        ], "title", inst.confluencePages));
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class ConfluenceSkill${sfx} extends ConfluenceConfig {`);
-        parts.push(`    constructor(page: ${pageClass}) {`);
-        parts.push(`        super("${inst.id}", page.spaceName, page.spaceId, page.pageId, page.title)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = inst.id;
+    parts.push(generateResourceClass("JiraProject", [
+        { classField: "projectKey", type: "string", sourceField: "key" },
+        { classField: "projectId", type: "string", sourceField: "id" },
+        { classField: "name", type: "string", sourceField: "name" },
+    ], "name", inst.jiraProjects));
+    parts.push("");
+    parts.push(generateResourceClass("ConfluencePage", [
+        { classField: "pageId", type: "string", sourceField: "id" },
+        { classField: "title", type: "string", sourceField: "title" },
+        { classField: "spaceId", type: "string", sourceField: "spaceId" },
+        { classField: "spaceName", type: "string", sourceField: "spaceName" },
+    ], "title", inst.confluencePages));
+    parts.push("");
+    imports.add("JiraEventType");
+    parts.push("export const Jira = {");
+    parts.push(`    /** Trigger when a Jira issue is created */`);
+    parts.push(`    onIssueCreated(opts?: { project?: JiraProject }): JiraConfig {`);
+    parts.push(`        return new JiraConfig("${id}", opts?.project?.projectKey, opts?.project?.projectId, [JiraEventType.ISSUE_CREATED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when a Jira issue is updated */`);
+    parts.push(`    onIssueUpdated(opts?: { project?: JiraProject }): JiraConfig {`);
+    parts.push(`        return new JiraConfig("${id}", opts?.project?.projectKey, opts?.project?.projectId, [JiraEventType.ISSUE_UPDATED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on all Jira events */`);
+    parts.push(`    trigger(opts?: { project?: JiraProject; eventTypes?: JiraEventType[] }): JiraConfig {`);
+    parts.push(`        return new JiraConfig("${id}", opts?.project?.projectKey, opts?.project?.projectId, opts?.eventTypes)`);
+    parts.push("    },");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts?: { project?: JiraProject }): JiraConfig {`);
+    parts.push(`        return new JiraConfig("${id}", opts?.project?.projectKey, opts?.project?.projectId)`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
+    parts.push("export const Confluence = {");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts: { page: ConfluencePage }): ConfluenceConfig {`);
+    parts.push(`        return new ConfluenceConfig("${id}", opts.page.spaceName, opts.page.spaceId, opts.page.pageId, opts.page.title)`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Notion ────────────────────────────────────────────────────────────
 function generateNotionSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["NotionConfig"]);
     const parts = [sectionHeader("Notion"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = suffix(instances, i);
-        const dbClass = `NotionDatabase${sfx}`;
-        const pageClass = `NotionPage${sfx}`;
-        parts.push(generateResourceClass(dbClass, [
-            { classField: "databaseId", type: "string", sourceField: "id" },
-            { classField: "title", type: "string", sourceField: "title" },
-        ], "title", inst.databases));
-        parts.push("");
-        parts.push(generateResourceClass(pageClass, [
-            { classField: "pageId", type: "string", sourceField: "id" },
-            { classField: "title", type: "string", sourceField: "title" },
-        ], "title", inst.pages));
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class NotionSkill${sfx} extends NotionConfig {`);
-        parts.push(`    constructor(databases?: ${dbClass}[], pages?: ${pageClass}[]) {`);
-        parts.push(`        super("${inst.id}",`);
-        parts.push(`            databases?.map(d => d.databaseId), databases?.map(d => d.title),`);
-        parts.push(`            pages?.map(p => p.pageId), pages?.map(p => p.title))`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = inst.id;
+    parts.push(generateResourceClass("NotionDatabase", [
+        { classField: "databaseId", type: "string", sourceField: "id" },
+        { classField: "title", type: "string", sourceField: "title" },
+    ], "title", inst.databases));
+    parts.push("");
+    parts.push(generateResourceClass("NotionPage", [
+        { classField: "pageId", type: "string", sourceField: "id" },
+        { classField: "title", type: "string", sourceField: "title" },
+    ], "title", inst.pages));
+    parts.push("");
+    parts.push("export const Notion = {");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts?: { databases?: NotionDatabase[]; pages?: NotionPage[] }): NotionConfig {`);
+    parts.push(`        return new NotionConfig("${id}",`);
+    parts.push(`            opts?.databases?.map(d => d.databaseId), opts?.databases?.map(d => d.title),`);
+    parts.push(`            opts?.pages?.map(p => p.pageId), opts?.pages?.map(p => p.title))`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── PostHog ───────────────────────────────────────────────────────────
 function generatePosthogSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["PosthogConfig"]);
     const parts = [sectionHeader("PostHog"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = suffix(instances, i);
-        const projClass = `PosthogProject${sfx}`;
-        parts.push(generateResourceClass(projClass, [
-            { classField: "projectId", type: "string", sourceField: "id" },
-            { classField: "name", type: "string", sourceField: "name" },
-        ], "name", inst.projects));
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class PosthogSkill${sfx} extends PosthogConfig {`);
-        parts.push(`    constructor(project: ${projClass}) {`);
-        parts.push(`        super("${inst.id}", project.projectId, project.name)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = inst.id;
+    parts.push(generateResourceClass("PosthogProject", [
+        { classField: "projectId", type: "string", sourceField: "id" },
+        { classField: "name", type: "string", sourceField: "name" },
+    ], "name", inst.projects));
+    parts.push("");
+    parts.push("export const Posthog = {");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts: { project: PosthogProject }): PosthogConfig {`);
+    parts.push(`        return new PosthogConfig("${id}", opts.project.projectId, opts.project.name)`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Datadog ───────────────────────────────────────────────────────────
 function generateDatadogSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["DatadogConfig"]);
     const parts = [sectionHeader("Datadog"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = suffix(instances, i);
-        const indexClass = `DatadogIndex${sfx}`;
-        parts.push(generateResourceClass(indexClass, [
-            { classField: "name", type: "string", sourceField: "name" },
-        ], "name", inst.indexes));
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class DatadogSkill${sfx} extends DatadogConfig {`);
-        parts.push(`    constructor(indexes?: ${indexClass}[]) {`);
-        parts.push(`        super("${inst.id}", indexes?.map(i => i.name))`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = inst.id;
+    parts.push(generateResourceClass("DatadogIndex", [
+        { classField: "name", type: "string", sourceField: "name" },
+    ], "name", inst.indexes));
+    parts.push("");
+    parts.push("export const Datadog = {");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts?: { indexes?: DatadogIndex[] }): DatadogConfig {`);
+    parts.push(`        return new DatadogConfig("${id}", opts?.indexes?.map(i => i.name))`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── LaunchDarkly ──────────────────────────────────────────────────────
 function generateLaunchDarklySection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["LaunchDarklyConfig"]);
     const parts = [sectionHeader("LaunchDarkly"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = suffix(instances, i);
-        const projClass = `LaunchDarklyProject${sfx}`;
-        parts.push(generateResourceClass(projClass, [
-            { classField: "projectKey", type: "string", sourceField: "key" },
-            { classField: "name", type: "string", sourceField: "name" },
-        ], "name", inst.projects));
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class LaunchDarklySkill${sfx} extends LaunchDarklyConfig {`);
-        parts.push(`    constructor(project: ${projClass}, environmentKeys: string[]) {`);
-        parts.push(`        super("${inst.id}", project.projectKey, environmentKeys)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = inst.id;
+    parts.push(generateResourceClass("LaunchDarklyProject", [
+        { classField: "projectKey", type: "string", sourceField: "key" },
+        { classField: "name", type: "string", sourceField: "name" },
+    ], "name", inst.projects));
+    parts.push("");
+    parts.push("export const LaunchDarkly = {");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts: { project: LaunchDarklyProject; environmentKeys: string[] }): LaunchDarklyConfig {`);
+    parts.push(`        return new LaunchDarklyConfig("${id}", opts.project.projectKey, opts.environmentKeys)`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── WorkOS ────────────────────────────────────────────────────────────
 function generateWorkOSSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
-    const imports = new Set(["WorkOSInputConfig", "WorkOSOutputConfig"]);
+    const imports = new Set(["WorkOSInputConfig", "WorkOSOutputConfig", "WorkOSEventType"]);
     const parts = [sectionHeader("WorkOS"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const sfx = suffix(instances, i);
-        const id = instances[i].id;
-        parts.push(`/** Use in \`triggers[]\` */`);
-        parts.push(`export class WorkOSTrigger${sfx} extends WorkOSInputConfig {`);
-        parts.push(`    constructor(eventTypes?: string[]) {`);
-        parts.push(`        super("${id}", eventTypes)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class WorkOSSkill${sfx} extends WorkOSOutputConfig {`);
-        parts.push(`    constructor() { super("${id}") }`);
-        parts.push("}");
-        parts.push("");
-    }
+    const id = instances[0].id;
+    parts.push("export const WorkOS = {");
+    parts.push(`    /** Trigger on user creation */`);
+    parts.push(`    onUserCreated(): WorkOSInputConfig {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.USER_CREATED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on user update */`);
+    parts.push(`    onUserUpdated(): WorkOSInputConfig {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.USER_UPDATED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on user deletion */`);
+    parts.push(`    onUserDeleted(): WorkOSInputConfig {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.USER_DELETED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on organization membership change */`);
+    parts.push(`    onMembershipChanged(): WorkOSInputConfig {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.ORGANIZATION_MEMBERSHIP_CREATED, WorkOSEventType.ORGANIZATION_MEMBERSHIP_UPDATED, WorkOSEventType.ORGANIZATION_MEMBERSHIP_DELETED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on invitation accepted */`);
+    parts.push(`    onInvitationAccepted(): WorkOSInputConfig {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.INVITATION_ACCEPTED])`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on specific WorkOS event types */`);
+    parts.push(`    trigger(opts?: { eventTypes?: WorkOSEventType[] }): WorkOSInputConfig {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", opts?.eventTypes)`);
+    parts.push("    },");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(): WorkOSOutputConfig {`);
+    parts.push(`        return new WorkOSOutputConfig("${id}")`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Attio ─────────────────────────────────────────────────────────────
 function generateAttioSection(instances) {
     if (instances.length === 0)
         return EMPTY_SECTION;
+    const inst = instances[0];
     const imports = new Set(["AttioOutputConfig"]);
     const parts = [sectionHeader("Attio"), ""];
-    for (let i = 0; i < instances.length; i++) {
-        const inst = instances[i];
-        const sfx = suffix(instances, i);
-        const objClass = `AttioObject${sfx}`;
-        parts.push(generateResourceClass(objClass, [
-            { classField: "apiSlug", type: "string", sourceField: "api_slug" },
-            { classField: "name", type: "string", sourceField: "singular_noun" },
-        ], "singular_noun", inst.objects));
-        parts.push("");
-        parts.push(`/** Use in \`skills[]\` */`);
-        parts.push(`export class AttioSkill${sfx} extends AttioOutputConfig {`);
-        parts.push(`    constructor(object?: ${objClass}) {`);
-        parts.push(`        super("${inst.id}", object?.apiSlug)`);
-        parts.push("    }");
-        parts.push("}");
-        parts.push("");
-    }
+    const id = inst.id;
+    parts.push(generateResourceClass("AttioObject", [
+        { classField: "apiSlug", type: "string", sourceField: "api_slug" },
+        { classField: "name", type: "string", sourceField: "singular_noun" },
+    ], "singular_noun", inst.objects));
+    parts.push("");
+    parts.push("export const Attio = {");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(opts?: { object?: AttioObject }): AttioOutputConfig {`);
+    parts.push(`        return new AttioOutputConfig("${id}", opts?.object?.apiSlug)`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Typed Tools ───────────────────────────────────────────────────────
@@ -578,20 +607,20 @@ function generateToolsSection(tools, input) {
     };
     // Ensure GitHub repository params are full "owner/repo".
     // Supports:
-    // - Repository objects (uses .fullName)
+    // - Repos objects (uses .fullName)
     // - full string "owner/repo" (passthrough)
     // - short repo name string "repo" (resolved via known generated repositories when unique)
-    const normalizeGitHubRepositoryParams = (toolName) => {
+    const normalizeGitHubReposParams = (toolName) => {
         switch (toolName) {
             case "readGitHubFile":
             case "listGitHubPullRequests":
             case "listGitHubDirectory":
             case "listGitHubCommits":
             case "summarizeGitHubPullRequestDiff":
-                return "{ ...params, repository: __normalizeGitHubRepository((params as any).repository) }";
+                return "{ ...params, repository: __normalizeGitHubRepos((params as any).repository) }";
             case "searchGitHubCode":
             case "grepGitHubCode":
-                return "{ ...params, repositoryNames: __normalizeGitHubRepositoryNames((params as any).repositoryNames) }";
+                return "{ ...params, repositoryNames: __normalizeGitHubReposNames((params as any).repositoryNames) }";
             default:
                 return "params";
         }
@@ -608,18 +637,14 @@ function generateToolsSection(tools, input) {
         parts.push(`export type ${typeName} = ${tsType}`);
         parts.push("");
     }
-    // Build tool groups: each group has a key, raw integration, tools, and optional baked-in integrationId
     const groups = [];
     for (const [integration, integrationTools] of byIntegration) {
         const needsAutoFill = integrationTools.some(hasAutoFillId);
         if (needsAutoFill) {
             const instances = instanceMap.get(integration) || [];
             if (instances.length === 0)
-                continue; // Skip tools with no matching instances
-            for (let i = 0; i < instances.length; i++) {
-                const sfx = suffix(instances, i);
-                groups.push({ key: integration + sfx, integration, tools: integrationTools, integrationId: instances[i].id });
-            }
+                continue;
+            groups.push({ key: integration, integration, tools: integrationTools, integrationId: instances[0].id });
         }
         else {
             groups.push({ key: integration, integration, tools: integrationTools });
@@ -647,7 +672,7 @@ function generateToolsSection(tools, input) {
         }
         parts.push(`])`);
         parts.push("");
-        parts.push(`function __normalizeGitHubRepository(repo: unknown): string {`);
+        parts.push(`function __normalizeGitHubRepos(repo: unknown): string {`);
         parts.push(`    if (repo && typeof repo === "object" && "fullName" in (repo as Record<string, unknown>)) {`);
         parts.push(`        const fullName = (repo as { fullName?: unknown }).fullName`);
         parts.push(`        if (typeof fullName === "string" && fullName.length > 0) return fullName`);
@@ -659,9 +684,9 @@ function generateToolsSection(tools, input) {
         parts.push(`    return String(repo ?? "")`);
         parts.push(`}`);
         parts.push("");
-        parts.push(`function __normalizeGitHubRepositoryNames(repositories: unknown): string[] {`);
+        parts.push(`function __normalizeGitHubReposNames(repositories: unknown): string[] {`);
         parts.push(`    if (!Array.isArray(repositories)) return []`);
-        parts.push(`    return repositories.map(repo => __normalizeGitHubRepository(repo))`);
+        parts.push(`    return repositories.map(repo => __normalizeGitHubRepos(repo))`);
         parts.push(`}`);
         parts.push("");
     }
@@ -699,7 +724,7 @@ function generateToolsSection(tools, input) {
         for (const tool of group.tools) {
             const methodName = toCamelCase(tool.displayName);
             const paramsType = toolNameToInterfaceName(tool.name);
-            const normalizedParamsExpr = group.integration === "github" ? normalizeGitHubRepositoryParams(tool.name) : "params";
+            const normalizedParamsExpr = group.integration === "github" ? normalizeGitHubReposParams(tool.name) : "params";
             if (group.integrationId && hasAutoFillId(tool)) {
                 parts.push(`            ${methodName}: (params: ${paramsType}) =>`);
                 parts.push(`                agent.executeTool<ToolOutputByName["${escapeString(tool.name)}"]>("${escapeString(tool.name)}", { ...(${normalizedParamsExpr}), integrationId: "${escapeString(group.integrationId)}" }),`);
@@ -725,20 +750,20 @@ function generateSystemSection() {
     const parts = [];
     parts.push(sectionHeader("Schedule"));
     parts.push("");
-    parts.push(`/** Use in \`triggers[]\` — run on a cron schedule */`);
-    parts.push("export class ScheduleTrigger extends TimeTriggerConfig {");
-    parts.push("    constructor(cronExpression: string) {");
-    parts.push("        super(cronExpression)");
-    parts.push("    }");
+    parts.push("export const Schedule = {");
+    parts.push(`    /** Use in \`triggers[]\` — run on a cron schedule */`);
+    parts.push("    cron(opts: { expression: string }): TimeTriggerConfig {");
+    parts.push("        return new TimeTriggerConfig(opts.expression)");
+    parts.push("    },");
     parts.push("}");
     parts.push("");
     parts.push(sectionHeader("Terse"));
     parts.push("");
-    parts.push(`/** Use in \`skills[]\` — built-in web search */`);
-    parts.push("export class TerseSkill extends TerseConfig {");
-    parts.push("    constructor() {");
-    parts.push("        super()");
-    parts.push("    }");
+    parts.push("export const Terse = {");
+    parts.push(`    /** Use in \`skills[]\` — built-in web search */`);
+    parts.push("    skill(): TerseConfig {");
+    parts.push("        return new TerseConfig()");
+    parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };