terse-cli 0.3.7 → 0.3.8

package/dist/codegen.js

@@ -19,6 +19,82 @@ function sectionHeader(name) {
 function escapeString(s) {
     return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
+function toGeneratedIdentifier(raw, fallback) {
+    let name = toPascalCase(raw || fallback);
+    if (!name)
+        name = fallback;
+    if (/^\d/.test(name))
+        name = `_${name}`;
+    return name;
+}
+function isProbablyAttioMultiValue(attr) {
+    const slug = (attr.api_slug || "").toLowerCase();
+    const type = (attr.type || "").toLowerCase();
+    return (type.includes("multi") ||
+        type.includes("array") ||
+        type.includes("list") ||
+        slug === "email_addresses" ||
+        slug === "domains" ||
+        slug === "phone_numbers" ||
+        slug === "social_profiles" ||
+        slug === "links" ||
+        slug === "tags" ||
+        slug.endsWith("_addresses") ||
+        slug.endsWith("_ids"));
+}
+function attioAttributeBaseType(attr) {
+    const slug = (attr.api_slug || "").toLowerCase();
+    const type = (attr.type || "").toLowerCase();
+    if (type.includes("checkbox") || type.includes("boolean"))
+        return "boolean";
+    if (type.includes("number") || type.includes("currency") || type.includes("rating") || type.includes("percent"))
+        return "number";
+    if (type.includes("date") || type.includes("time"))
+        return "string";
+    if (type.includes("email") ||
+        type.includes("domain") ||
+        type.includes("phone") ||
+        type.includes("url") ||
+        type.includes("select") ||
+        type.includes("status") ||
+        type.includes("text") ||
+        type.includes("string") ||
+        type.includes("name")) {
+        return "string";
+    }
+    if (type.includes("location") ||
+        type.includes("address") ||
+        type.includes("reference") ||
+        type.includes("record") ||
+        type.includes("actor")) {
+        return "Record<string, unknown>";
+    }
+    if (slug === "email_addresses" || slug === "domains" || slug === "phone_numbers" || slug === "name") {
+        return "string";
+    }
+    return "unknown";
+}
+function attioAttributeInputTsType(attr) {
+    const baseType = attioAttributeBaseType(attr);
+    if (!isProbablyAttioMultiValue(attr))
+        return baseType;
+    return baseType.includes("|") ? `(${baseType})[]` : `${baseType}[]`;
+}
+function attioAttributeRecordTsType(attr) {
+    const baseType = attioAttributeBaseType(attr);
+    if (!isProbablyAttioMultiValue(attr))
+        return baseType;
+    return baseType.includes("|") ? `(${baseType})[]` : `${baseType}[]`;
+}
+function renderAttioObjectValueShape(attributes, mode) {
+    if (attributes.length === 0)
+        return "Record<string, unknown>";
+    const lines = attributes.map(attr => {
+        const valueType = mode === "input" ? attioAttributeInputTsType(attr) : attioAttributeRecordTsType(attr);
+        return `    "${escapeString(attr.api_slug || "")}"?: ${valueType}`;
+    });
+    return `{\n${lines.join("\n")}\n}`;
+}
 /** Map a tool's integration key back to the IntegrationType enum value used by ConfigInstance. */
 function toolIntegrationToIntegrationType(toolIntegration) {
     switch (toolIntegration) {
@@ -29,6 +105,19 @@ function toolIntegrationToIntegrationType(toolIntegration) {
             return toolIntegration;
     }
 }
+function renderStringLiteralUnion(values) {
+    if (values.length === 0)
+        return "never";
+    return values.map(value => `"${escapeString(value)}"`).join(" | ");
+}
+function buildSkillToolTypeForIntegration(tools, integrationType) {
+    const toolNames = tools
+        .filter(tool => toolIntegrationToIntegrationType(tool.integration.toLowerCase()) === integrationType)
+        .filter(tool => !tool.isReadOnly || tool.supportsApproval)
+        .map(tool => tool.name)
+        .sort();
+    return renderStringLiteralUnion(toolNames);
+}
 function generateResourceClass(className, fields, staticNameField, items) {
     const lines = [];
     lines.push(`export class ${className} {`);
@@ -57,13 +146,14 @@ function generateResourceClass(className, fields, staticNameField, items) {
     return lines.join("\n");
 }
 // ── GitHub ────────────────────────────────────────────────────────────
-function generateGitHubSection(instances) {
+function generateGitHubSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
     const imports = new Set(["GitHubConfig"]);
     const parts = [sectionHeader("GitHub"), ""];
     const id = inst.integration.id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "github");
     const toStaticName = (raw, fallback) => {
         let name = toPascalCase(raw || fallback);
         if (!name)
@@ -125,6 +215,7 @@ function generateGitHubSection(instances) {
     parts.push("");
     imports.add("GitHubEventType");
     imports.add("TypedTrigger");
+    imports.add("TypedSkill");
     imports.add("GithubPRInputEvent");
     imports.add("GithubPushInputEvent");
     imports.add("GithubInputEvent");
@@ -155,20 +246,21 @@ function generateGitHubSection(instances) {
     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(`    skill(opts: { repos: Repos[] }): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new GitHubConfig("${id}", opts.repos.map(r => r.repositoryId)) as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Gmail ─────────────────────────────────────────────────────────────
-function generateGmailSection(instances) {
+function generateGmailSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
-    const imports = new Set(["GmailConfig", "GmailOutputConfig", "GmailDraftOutputConfig"]);
+    const imports = new Set(["GmailConfig", "GmailOutputConfig", "GmailDraftOutputConfig", "TypedSkill"]);
     const parts = [sectionHeader("Gmail"), ""];
     const id = instances[0].id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "gmail");
     imports.add("GmailEventType");
     parts.push("export const Gmail = {");
     parts.push(`    /** Trigger when a new email is received */`);
@@ -180,25 +272,26 @@ function generateGmailSection(instances) {
     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(`    skill(): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new GmailOutputConfig("${id}") as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push(`    /** Use in \`skills[]\` — creates draft emails */`);
-    parts.push(`    draftSkill(): GmailDraftOutputConfig {`);
-    parts.push(`        return new GmailDraftOutputConfig("${id}")`);
+    parts.push(`    draftSkill(): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new GmailDraftOutputConfig("${id}") as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Slack ──────────────────────────────────────────────────────────────
-function generateSlackSection(instances) {
+function generateSlackSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
-    const imports = new Set(["SlackConfig", "SlackOutputConfig"]);
+    const imports = new Set(["SlackConfig", "SlackOutputConfig", "TypedSkill"]);
     const parts = [sectionHeader("Slack"), ""];
     const id = inst.id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "slack");
     parts.push(generateResourceClass("SlackChannel", [
         { classField: "channelId", type: "string", sourceField: "id" },
         { classField: "name", type: "string", sourceField: "name" },
@@ -220,8 +313,8 @@ function generateSlackSection(instances) {
     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(`    skill(opts?: { channel?: SlackChannel; userIds?: string[]; userNames?: string[]; listenToUserDms?: boolean }): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new SlackOutputConfig("${id}", opts?.channel?.channelId, opts?.channel?.name, opts?.userIds, opts?.userNames, opts?.listenToUserDms) as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
@@ -249,13 +342,14 @@ function generateFigmaSection(instances) {
     return { code: parts.join("\n"), imports };
 }
 // ── Linear ────────────────────────────────────────────────────────────
-function generateLinearSection(instances) {
+function generateLinearSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
-    const imports = new Set(["LinearInputConfig", "LinearOutputConfig"]);
+    const imports = new Set(["LinearInputConfig", "LinearOutputConfig", "TypedSkill"]);
     const parts = [sectionHeader("Linear"), ""];
     const id = inst.id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "linear");
     parts.push(generateResourceClass("LinearTeam", [
         { classField: "teamId", type: "string", sourceField: "id" },
         { classField: "name", type: "string", sourceField: "name" },
@@ -281,21 +375,22 @@ function generateLinearSection(instances) {
     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(`    skill(opts?: { team?: LinearTeam; projectId?: string; projectName?: string }): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new LinearOutputConfig("${id}", opts?.team?.teamId, opts?.team?.name, opts?.projectId, opts?.projectName) as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Jira & Confluence (Atlassian) ─────────────────────────────────────
-function generateAtlassianSection(instances) {
+function generateAtlassianSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
-    const imports = new Set(["JiraConfig", "ConfluenceConfig"]);
+    const imports = new Set(["JiraConfig", "ConfluenceConfig", "TypedSkill"]);
     const parts = [sectionHeader("Jira & Confluence"), ""];
     const id = inst.id;
+    const atlassianSkillToolType = buildSkillToolTypeForIntegration(tools, "atlassian");
     parts.push(generateResourceClass("JiraProject", [
         { classField: "projectKey", type: "string", sourceField: "key" },
         { classField: "projectId", type: "string", sourceField: "id" },
@@ -324,28 +419,29 @@ function generateAtlassianSection(instances) {
     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(`    skill(opts?: { project?: JiraProject }): TypedSkill<${atlassianSkillToolType}> {`);
+    parts.push(`        return new JiraConfig("${id}", opts?.project?.projectKey, opts?.project?.projectId) as TypedSkill<${atlassianSkillToolType}>`);
     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(`    skill(opts: { page: ConfluencePage }): TypedSkill<${atlassianSkillToolType}> {`);
+    parts.push(`        return new ConfluenceConfig("${id}", opts.page.spaceName, opts.page.spaceId, opts.page.pageId, opts.page.title) as TypedSkill<${atlassianSkillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Notion ────────────────────────────────────────────────────────────
-function generateNotionSection(instances) {
+function generateNotionSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
-    const imports = new Set(["NotionConfig"]);
+    const imports = new Set(["NotionConfig", "TypedSkill"]);
     const parts = [sectionHeader("Notion"), ""];
     const id = inst.id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "notion");
     parts.push(generateResourceClass("NotionDatabase", [
         { classField: "databaseId", type: "string", sourceField: "id" },
         { classField: "title", type: "string", sourceField: "title" },
@@ -358,23 +454,24 @@ function generateNotionSection(instances) {
     parts.push("");
     parts.push("export const Notion = {");
     parts.push(`    /** Use in \`skills[]\` */`);
-    parts.push(`    skill(opts?: { databases?: NotionDatabase[]; pages?: NotionPage[] }): NotionConfig {`);
+    parts.push(`    skill(opts?: { databases?: NotionDatabase[]; pages?: NotionPage[] }): TypedSkill<${skillToolType}> {`);
     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(`            opts?.pages?.map(p => p.pageId), opts?.pages?.map(p => p.title)) as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── PostHog ───────────────────────────────────────────────────────────
-function generatePosthogSection(instances) {
+function generatePosthogSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
-    const imports = new Set(["PosthogConfig"]);
+    const imports = new Set(["PosthogConfig", "TypedSkill"]);
     const parts = [sectionHeader("PostHog"), ""];
     const id = inst.id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "posthog");
     parts.push(generateResourceClass("PosthogProject", [
         { classField: "projectId", type: "string", sourceField: "id" },
         { classField: "name", type: "string", sourceField: "name" },
@@ -382,42 +479,44 @@ function generatePosthogSection(instances) {
     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(`    skill(opts: { project: PosthogProject }): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new PosthogConfig("${id}", opts.project.projectId, opts.project.name) as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Datadog ───────────────────────────────────────────────────────────
-function generateDatadogSection(instances) {
+function generateDatadogSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
-    const imports = new Set(["DatadogConfig"]);
+    const imports = new Set(["DatadogConfig", "TypedSkill"]);
     const parts = [sectionHeader("Datadog"), ""];
     const id = inst.id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "datadog");
     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(`    skill(opts?: { indexes?: DatadogIndex[] }): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new DatadogConfig("${id}", opts?.indexes?.map(i => i.name)) as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── LaunchDarkly ──────────────────────────────────────────────────────
-function generateLaunchDarklySection(instances) {
+function generateLaunchDarklySection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
-    const imports = new Set(["LaunchDarklyConfig"]);
+    const imports = new Set(["LaunchDarklyConfig", "TypedSkill"]);
     const parts = [sectionHeader("LaunchDarkly"), ""];
     const id = inst.id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "launchdarkly");
     parts.push(generateResourceClass("LaunchDarklyProject", [
         { classField: "projectKey", type: "string", sourceField: "key" },
         { classField: "name", type: "string", sourceField: "name" },
@@ -425,70 +524,160 @@ function generateLaunchDarklySection(instances) {
     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(`    skill(opts: { project: LaunchDarklyProject; environmentKeys: string[] }): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new LaunchDarklyConfig("${id}", opts.project.projectKey, opts.environmentKeys) as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── WorkOS ────────────────────────────────────────────────────────────
-function generateWorkOSSection(instances) {
+function generateWorkOSSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
-    const imports = new Set(["WorkOSInputConfig", "WorkOSOutputConfig", "WorkOSEventType"]);
+    const imports = new Set(["WorkOSInputConfig", "WorkOSOutputConfig", "WorkOSEventType", "TypedSkill"]);
     const parts = [sectionHeader("WorkOS"), ""];
     const id = instances[0].id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "workos");
+    imports.add("TypedTrigger");
+    imports.add("WorkOSInputEvent");
+    imports.add("WorkOSUserInputEvent");
+    imports.add("WorkOSMembershipInputEvent");
+    imports.add("WorkOSInvitationInputEvent");
+    imports.add("WorkOSOrganizationInputEvent");
     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(`    onUserCreated(): TypedTrigger<WorkOSUserInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.USER_CREATED]) as TypedTrigger<WorkOSUserInputEvent>`);
     parts.push("    },");
     parts.push(`    /** Trigger on user update */`);
-    parts.push(`    onUserUpdated(): WorkOSInputConfig {`);
-    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.USER_UPDATED])`);
+    parts.push(`    onUserUpdated(): TypedTrigger<WorkOSUserInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.USER_UPDATED]) as TypedTrigger<WorkOSUserInputEvent>`);
     parts.push("    },");
     parts.push(`    /** Trigger on user deletion */`);
-    parts.push(`    onUserDeleted(): WorkOSInputConfig {`);
-    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.USER_DELETED])`);
+    parts.push(`    onUserDeleted(): TypedTrigger<WorkOSUserInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.USER_DELETED]) as TypedTrigger<WorkOSUserInputEvent>`);
     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(`    onMembershipChanged(): TypedTrigger<WorkOSMembershipInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.ORGANIZATION_MEMBERSHIP_CREATED, WorkOSEventType.ORGANIZATION_MEMBERSHIP_UPDATED, WorkOSEventType.ORGANIZATION_MEMBERSHIP_DELETED]) as TypedTrigger<WorkOSMembershipInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when an invitation is sent */`);
+    parts.push(`    onInvitationSent(): TypedTrigger<WorkOSInvitationInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.INVITATION_CREATED, WorkOSEventType.INVITATION_RESENT]) as TypedTrigger<WorkOSInvitationInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when an invitation is first created */`);
+    parts.push(`    onInvitationCreated(): TypedTrigger<WorkOSInvitationInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.INVITATION_CREATED]) as TypedTrigger<WorkOSInvitationInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when an invitation is resent */`);
+    parts.push(`    onInvitationResent(): TypedTrigger<WorkOSInvitationInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.INVITATION_RESENT]) as TypedTrigger<WorkOSInvitationInputEvent>`);
     parts.push("    },");
     parts.push(`    /** Trigger on invitation accepted */`);
-    parts.push(`    onInvitationAccepted(): WorkOSInputConfig {`);
-    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.INVITATION_ACCEPTED])`);
+    parts.push(`    onInvitationAccepted(): TypedTrigger<WorkOSInvitationInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.INVITATION_ACCEPTED]) as TypedTrigger<WorkOSInvitationInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger when an invitation is revoked */`);
+    parts.push(`    onInvitationRevoked(): TypedTrigger<WorkOSInvitationInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.INVITATION_REVOKED]) as TypedTrigger<WorkOSInvitationInputEvent>`);
+    parts.push("    },");
+    parts.push(`    /** Trigger on organization creation */`);
+    parts.push(`    onOrganizationCreated(): TypedTrigger<WorkOSOrganizationInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", [WorkOSEventType.ORGANIZATION_CREATED]) as TypedTrigger<WorkOSOrganizationInputEvent>`);
     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(`    trigger(opts?: { eventTypes?: WorkOSEventType[] }): TypedTrigger<WorkOSInputEvent | WorkOSUserInputEvent | WorkOSMembershipInputEvent | WorkOSInvitationInputEvent | WorkOSOrganizationInputEvent> {`);
+    parts.push(`        return new WorkOSInputConfig("${id}", opts?.eventTypes) as TypedTrigger<WorkOSInputEvent | WorkOSUserInputEvent | WorkOSMembershipInputEvent | WorkOSInvitationInputEvent | WorkOSOrganizationInputEvent>`);
     parts.push("    },");
     parts.push(`    /** Use in \`skills[]\` */`);
-    parts.push(`    skill(): WorkOSOutputConfig {`);
-    parts.push(`        return new WorkOSOutputConfig("${id}")`);
+    parts.push(`    skill(): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new WorkOSOutputConfig("${id}") as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
     return { code: parts.join("\n"), imports };
 }
 // ── Attio ─────────────────────────────────────────────────────────────
-function generateAttioSection(instances) {
+function generateAttioSection(instances, tools) {
     if (instances.length === 0)
         return EMPTY_SECTION;
     const inst = instances[0];
-    const imports = new Set(["AttioOutputConfig"]);
+    const imports = new Set(["AttioOutputConfig", "TypedSkill"]);
     const parts = [sectionHeader("Attio"), ""];
     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));
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "attio");
+    parts.push("export type AttioAttributeDefinition<TSlug extends string = string, TType extends string = string> = {");
+    parts.push("    apiSlug: TSlug");
+    parts.push("    title?: string");
+    parts.push("    type?: TType");
+    parts.push("    isRequired?: boolean");
+    parts.push("    isUnique?: boolean");
+    parts.push("}");
+    parts.push("");
+    parts.push("export class AttioObject<");
+    parts.push("    TSlug extends string = string,");
+    parts.push("    TRecordValues extends Record<string, unknown> = Record<string, unknown>,");
+    parts.push("    TInputValues extends Record<string, unknown> = TRecordValues");
+    parts.push("> {");
+    parts.push("    constructor(");
+    parts.push("        public readonly apiSlug: TSlug,");
+    parts.push("        public readonly name: string,");
+    parts.push("        public readonly attributes: readonly AttioAttributeDefinition[] = []");
+    parts.push("    ) {}");
+    parts.push("");
+    parts.push("    declare readonly __recordValues: TRecordValues");
+    parts.push("    declare readonly __inputValues: TInputValues");
+    if (inst.objects.length > 0) {
+        parts.push("");
+        const usedNames = new Set();
+        for (const object of inst.objects) {
+            let staticName = toGeneratedIdentifier(object.singular_noun || object.api_slug || "Object", "AttioObject");
+            while (usedNames.has(staticName))
+                staticName += "_";
+            usedNames.add(staticName);
+            const attributes = (object.attributes || []).filter((attr) => !!attr.api_slug);
+            const attributeSource = attributes.length === 0
+                ? "[]"
+                : `[\n${attributes.map(attr => {
+                    const fields = [
+                        `apiSlug: "${escapeString(attr.api_slug)}"`,
+                        attr.title ? `title: "${escapeString(attr.title)}"` : undefined,
+                        attr.type ? `type: "${escapeString(attr.type)}"` : undefined,
+                        attr.is_required !== undefined ? `isRequired: ${attr.is_required ? "true" : "false"}` : undefined,
+                        attr.is_unique !== undefined ? `isUnique: ${attr.is_unique ? "true" : "false"}` : undefined,
+                    ].filter(Boolean).join(", ");
+                    return `        { ${fields} }`;
+                }).join(",\n")}\n    ]`;
+            const recordValuesType = renderAttioObjectValueShape(attributes, "record");
+            const inputValuesType = renderAttioObjectValueShape(attributes, "input");
+            parts.push(`    static ${staticName} = new AttioObject<"${escapeString(object.api_slug)}", ${recordValuesType}, ${inputValuesType}>("${escapeString(object.api_slug)}", "${escapeString(object.singular_noun)}", ${attributeSource})`);
+        }
+    }
+    parts.push("}");
     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(`    skill(opts: { object: AttioObject<any> }): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new AttioOutputConfig("${id}", opts.object.apiSlug) as TypedSkill<${skillToolType}>`);
+    parts.push("    },");
+    parts.push("}");
+    parts.push("");
+    return { code: parts.join("\n"), imports };
+}
+// ── Snowflake ─────────────────────────────────────────────────────────
+function generateSnowflakeSection(instances, tools) {
+    if (instances.length === 0)
+        return EMPTY_SECTION;
+    const inst = instances[0];
+    const imports = new Set(["SnowflakeOutputConfig", "TypedSkill"]);
+    const parts = [sectionHeader("Snowflake"), ""];
+    const id = inst.id;
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "snowflake");
+    parts.push("export const Snowflake = {");
+    parts.push(`    /** Use in \`skills[]\` */`);
+    parts.push(`    skill(): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new SnowflakeOutputConfig("${id}") as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
@@ -584,6 +773,7 @@ function generateToolsSection(tools, input) {
     instanceMap.set("launchdarkly", input.launchdarkly.map(l => ({ id: l.id, displayName: l.displayName })));
     instanceMap.set("workos", input.workos.map(w => ({ id: w.id, displayName: w.displayName })));
     instanceMap.set("attio", input.attio.map(a => ({ id: a.id, displayName: a.displayName })));
+    instanceMap.set("snowflake", input.snowflake.map(s => ({ id: s.id, displayName: s.name })));
     // Group tools by integration
     const byIntegration = new Map();
     for (const tool of tools) {
@@ -625,8 +815,178 @@ function generateToolsSection(tools, input) {
                 return "params";
         }
     };
+    const isAttioTool = (tool) => tool.integration.toLowerCase() === "attio";
+    const attioObjects = input.attio[0]?.objects ?? [];
+    const attioGeneratedObjects = (() => {
+        const usedNames = new Set();
+        return attioObjects.map(object => {
+            let staticName = toGeneratedIdentifier(object.singular_noun || object.api_slug || "Object", "AttioObject");
+            while (usedNames.has(staticName))
+                staticName += "_";
+            usedNames.add(staticName);
+            return {
+                ...object,
+                staticName,
+                attributes: (object.attributes || []).filter((attr) => !!attr.api_slug),
+            };
+        });
+    })();
+    if (tools.some(isAttioTool)) {
+        parts.push("type __AttioPrimitive = string | number | boolean | null");
+        parts.push("type __AttioStructuredValue = Record<string, unknown>");
+        parts.push("type __AttioValue = __AttioPrimitive | __AttioStructuredValue | (__AttioPrimitive | __AttioStructuredValue)[]");
+        parts.push("type __AttioFilterShorthand<T> = T extends (infer U)[] ? U | T : T");
+        parts.push('type __AttioFilterValue<T> = __AttioFilterShorthand<T> | { $eq?: __AttioFilterShorthand<T>; $contains?: string; $starts_with?: string; $ends_with?: string } | Record<string, unknown>');
+        parts.push('type __AttioFilterExpression<TValues extends Record<string, unknown>> = Partial<{ [K in keyof TValues]: __AttioFilterValue<TValues[K]> }> & { $and?: Array<__AttioFilterExpression<TValues>>; $or?: Array<__AttioFilterExpression<TValues>> }');
+        parts.push('type __AttioRecordBase = NonNullable<NonNullable<ToolOutputByName["attio_upsert_record"]["records"]>[number]>');
+        parts.push('type __AttioRecordWithValues<TValues extends Record<string, unknown>> = Omit<__AttioRecordBase, "values"> & TValues & { values: TValues; attributes: TValues }');
+        parts.push("");
+        if (attioGeneratedObjects.length > 0) {
+            parts.push("export type GeneratedAttioObject =");
+            for (const object of attioGeneratedObjects) {
+                parts.push(`    | typeof AttioObject.${object.staticName}`);
+            }
+            parts.push("");
+            parts.push("export type AttioInputValuesByObject = {");
+            for (const object of attioGeneratedObjects) {
+                const inputShape = object.attributes.length === 0 ? "Record<string, __AttioValue>" : renderAttioObjectValueShape(object.attributes, "input");
+                parts.push(`    "${escapeString(object.api_slug)}": ${inputShape}`);
+            }
+            parts.push("}");
+            parts.push("");
+            parts.push("export type AttioRecordValuesByObject = {");
+            for (const object of attioGeneratedObjects) {
+                const recordShape = object.attributes.length === 0 ? "Record<string, __AttioValue>" : renderAttioObjectValueShape(object.attributes, "record");
+                parts.push(`    "${escapeString(object.api_slug)}": ${recordShape}`);
+            }
+            parts.push("}");
+            parts.push("");
+            parts.push("export type AttioFilterByObject = {");
+            for (const object of attioGeneratedObjects) {
+                parts.push(`    "${escapeString(object.api_slug)}": __AttioFilterExpression<AttioRecordValuesByObject["${escapeString(object.api_slug)}"]>`);
+            }
+            parts.push("}");
+            parts.push("");
+            parts.push("export type AttioRecordByObject = {");
+            for (const object of attioGeneratedObjects) {
+                parts.push(`    "${escapeString(object.api_slug)}": __AttioRecordWithValues<AttioRecordValuesByObject["${escapeString(object.api_slug)}"]>`);
+            }
+            parts.push("}");
+        }
+        else {
+            parts.push("export type GeneratedAttioObject = AttioObject<string, Record<string, __AttioValue>, Record<string, __AttioValue>>");
+            parts.push('export type AttioInputValuesByObject = Record<string, Record<string, __AttioValue>>');
+            parts.push('export type AttioRecordValuesByObject = Record<string, Record<string, __AttioValue>>');
+            parts.push('export type AttioFilterByObject = Record<string, __AttioFilterExpression<Record<string, __AttioValue>>>');
+            parts.push('export type AttioRecordByObject = Record<string, __AttioRecordWithValues<Record<string, __AttioValue>>>');
+        }
+        parts.push("");
+        parts.push('export type AttioValuesFor<TObject extends GeneratedAttioObject = GeneratedAttioObject> = TObject extends { __inputValues: infer TInputValues } ? TInputValues : AttioInputValuesByObject[TObject["apiSlug"]]');
+        parts.push('export type AttioRecordValuesFor<TObject extends GeneratedAttioObject = GeneratedAttioObject> = TObject extends { __recordValues: infer TRecordValues } ? TRecordValues : AttioRecordValuesByObject[TObject["apiSlug"]]');
+        parts.push('export type AttioAttributeSlug<TObject extends GeneratedAttioObject = GeneratedAttioObject> = Extract<keyof AttioValuesFor<TObject>, string>');
+        parts.push('export type AttioFilterFor<TObject extends GeneratedAttioObject = GeneratedAttioObject> = __AttioFilterExpression<AttioRecordValuesFor<TObject>>');
+        parts.push('export type AttioRecordFor<TObject extends GeneratedAttioObject = GeneratedAttioObject> = __AttioRecordWithValues<AttioRecordValuesFor<TObject>>');
+        parts.push('export type AttioQueryRecordsParams<TObject extends GeneratedAttioObject = GeneratedAttioObject> = { object: TObject; filter?: AttioFilterFor<TObject> | null; limit?: number | null }');
+        parts.push('export type AttioUpsertRecordParams<TObject extends GeneratedAttioObject = GeneratedAttioObject> = { object: TObject; matchingAttribute: AttioAttributeSlug<TObject>; records: AttioValuesFor<TObject>[] }');
+        parts.push("export type AttioListObjectsParams = Record<string, never>");
+        parts.push('export type AttioQueryRecordsResult<TObject extends GeneratedAttioObject = GeneratedAttioObject> = Omit<ToolOutputByName["attio_query_records"], "records"> & { records: Array<AttioRecordFor<TObject>> }');
+        parts.push('export type AttioUpsertRecordResult<TObject extends GeneratedAttioObject = GeneratedAttioObject> = Omit<ToolOutputByName["attio_upsert_record"], "records"> & { records?: Array<AttioRecordFor<TObject>> }');
+        parts.push("");
+        parts.push("const __attioMetadataKeys = new Set([");
+        parts.push('    "active_from",');
+        parts.push('    "active_until",');
+        parts.push('    "attribute_type",');
+        parts.push('    "created_by_actor",');
+        parts.push("])");
+        parts.push("");
+        parts.push("const __attioMultiValueAttributeSlugsByObject: Record<string, readonly string[]> = {");
+        for (const object of attioGeneratedObjects) {
+            const multiValueSlugs = object.attributes.filter(isProbablyAttioMultiValue).map(attr => `"${escapeString(attr.api_slug)}"`).join(", ");
+            parts.push(`    "${escapeString(object.api_slug)}": [${multiValueSlugs}],`);
+        }
+        parts.push("}");
+        parts.push("");
+        parts.push("function __normalizeAttioObjectSlug(object: unknown): string {");
+        parts.push('    if (object && typeof object === "object" && "apiSlug" in (object as Record<string, unknown>)) {');
+        parts.push('        const apiSlug = (object as { apiSlug?: unknown }).apiSlug');
+        parts.push('        if (typeof apiSlug === "string" && apiSlug.length > 0) return apiSlug');
+        parts.push("    }");
+        parts.push('    return typeof object === "string" ? object : ""');
+        parts.push("}");
+        parts.push("");
+        parts.push("function __serializeAttioFilter(filter: unknown): string | null {");
+        parts.push("    if (filter === undefined || filter === null) return null");
+        parts.push("    return JSON.stringify(filter)");
+        parts.push("}");
+        parts.push("");
+        parts.push("function __serializeAttioRecords(records: unknown): string {");
+        parts.push("    if (!Array.isArray(records)) return JSON.stringify([])");
+        parts.push('    return JSON.stringify(records.filter((record): record is Record<string, unknown> => typeof record === "object" && record !== null && !Array.isArray(record)))');
+        parts.push("}");
+        parts.push("");
+        parts.push("function __isAttioMultiValueAttribute(objectSlug: string, attributeSlug: string): boolean {");
+        parts.push("    return (__attioMultiValueAttributeSlugsByObject[objectSlug] || []).includes(attributeSlug)");
+        parts.push("}");
+        parts.push("");
+        parts.push("function __flattenAttioLeafValue(value: unknown): unknown {");
+        parts.push("    if (value === null || value === undefined) return value");
+        parts.push("    if (Array.isArray(value)) return value.map(entry => __flattenAttioLeafValue(entry))");
+        parts.push('    if (typeof value !== "object") return value');
+        parts.push("    const rawObject = value as Record<string, unknown>");
+        parts.push('    if (typeof rawObject.full_name === "string") return rawObject.full_name');
+        parts.push('    if (typeof rawObject.email_address === "string") return rawObject.email_address');
+        parts.push('    if (typeof rawObject.domain === "string") return rawObject.domain');
+        parts.push('    if (typeof rawObject.phone_number === "string") return rawObject.phone_number');
+        parts.push('    if ("value" in rawObject) return __flattenAttioLeafValue(rawObject.value)');
+        parts.push("    const dataEntries = Object.entries(rawObject).filter(([key]) => !__attioMetadataKeys.has(key))");
+        parts.push("    if (dataEntries.length === 0) return rawObject");
+        parts.push("    if (dataEntries.length === 1) return __flattenAttioLeafValue(dataEntries[0][1])");
+        parts.push("    return Object.fromEntries(dataEntries.map(([key, entryValue]) => [key, __flattenAttioLeafValue(entryValue)]))");
+        parts.push("}");
+        parts.push("");
+        parts.push("function __flattenAttioAttributeValue(rawValue: unknown, preferArray: boolean): unknown {");
+        parts.push("    if (!Array.isArray(rawValue)) return __flattenAttioLeafValue(rawValue)");
+        parts.push("    const flattened = rawValue");
+        parts.push("        .map(entry => __flattenAttioLeafValue(entry))");
+        parts.push("        .filter(entry => entry !== undefined)");
+        parts.push("    return preferArray ? flattened : flattened[0]");
+        parts.push("}");
+        parts.push("");
+        parts.push("function __getAttioRecordValues<TValues extends Record<string, unknown>>(objectSlug: string, record: unknown): TValues {");
+        parts.push('    const rawValues = record && typeof record === "object" ? (record as { values?: unknown }).values : undefined');
+        parts.push('    if (!rawValues || typeof rawValues !== "object" || Array.isArray(rawValues)) return {} as TValues');
+        parts.push("    const flattenedValues: Record<string, unknown> = {}");
+        parts.push("    for (const [attributeSlug, rawValue] of Object.entries(rawValues)) {");
+        parts.push("        flattenedValues[attributeSlug] = __flattenAttioAttributeValue(rawValue, __isAttioMultiValueAttribute(objectSlug, attributeSlug))");
+        parts.push("    }");
+        parts.push("    return flattenedValues as TValues");
+        parts.push("}");
+        parts.push("");
+        parts.push("function __enhanceAttioRecord<TObject extends GeneratedAttioObject>(object: TObject, record: unknown): __AttioRecordWithValues<AttioRecordValuesFor<TObject>> | undefined {");
+        parts.push('    if (!record || typeof record !== "object") return undefined');
+        parts.push("    const values = __getAttioRecordValues<AttioRecordValuesFor<TObject>>(__normalizeAttioObjectSlug(object), record)");
+        parts.push('    return { ...values, ...(record as __AttioRecordBase), values, attributes: values } as __AttioRecordWithValues<AttioRecordValuesFor<TObject>>');
+        parts.push("}");
+        parts.push("");
+        parts.push('function __enhanceAttioQueryResult<TObject extends GeneratedAttioObject>(object: TObject, result: ToolOutputByName["attio_query_records"]): AttioQueryRecordsResult<TObject> {');
+        parts.push("    return {");
+        parts.push("        ...result,");
+        parts.push("        records: (result.records || []).map(record => __enhanceAttioRecord(object, record)).filter(Boolean) as Array<AttioRecordFor<TObject>>,");
+        parts.push("    }");
+        parts.push("}");
+        parts.push("");
+        parts.push('function __enhanceAttioUpsertResult<TObject extends GeneratedAttioObject>(object: TObject, result: ToolOutputByName["attio_upsert_record"]): AttioUpsertRecordResult<TObject> {');
+        parts.push("    return {");
+        parts.push("        ...result,");
+        parts.push("        records: (result.records || []).map(record => __enhanceAttioRecord(object, record)).filter(Boolean) as Array<AttioRecordFor<TObject>>,");
+        parts.push("    }");
+        parts.push("}");
+        parts.push("");
+    }
     // Generate per-tool param types (with integrationId omitted where applicable)
     for (const tool of tools) {
+        if (isAttioTool(tool))
+            continue;
         const typeName = toolNameToInterfaceName(tool.name);
         const schema = hasAutoFillId(tool) ? omitIntegrationId(tool.parameters) : tool.parameters;
         const tsType = jsonSchemaToTs(schema, 0);
@@ -700,7 +1060,18 @@ function generateToolsSection(tools, input) {
             if (tool.description) {
                 parts.push(`        /** ${tool.description} */`);
             }
-            parts.push(`        ${methodName}(params: ${paramsType}): Promise<ToolOutputByName["${escapeString(tool.name)}"]>`);
+            if (group.integration === "attio" && tool.name === "attio_query_records") {
+                parts.push(`        ${methodName}<TObject extends GeneratedAttioObject>(params: AttioQueryRecordsParams<TObject>): Promise<AttioQueryRecordsResult<TObject>>`);
+            }
+            else if (group.integration === "attio" && tool.name === "attio_upsert_record") {
+                parts.push(`        ${methodName}<TObject extends GeneratedAttioObject>(params: AttioUpsertRecordParams<TObject>): Promise<AttioUpsertRecordResult<TObject>>`);
+            }
+            else if (group.integration === "attio" && tool.name === "attio_list_objects") {
+                parts.push(`        ${methodName}(params?: AttioListObjectsParams): Promise<ToolOutputByName["${escapeString(tool.name)}"]>`);
+            }
+            else {
+                parts.push(`        ${methodName}(params: ${paramsType}): Promise<ToolOutputByName["${escapeString(tool.name)}"]>`);
+            }
         }
         parts.push("    }");
     }
@@ -725,7 +1096,19 @@ function generateToolsSection(tools, input) {
             const methodName = toCamelCase(tool.displayName);
             const paramsType = toolNameToInterfaceName(tool.name);
             const normalizedParamsExpr = group.integration === "github" ? normalizeGitHubReposParams(tool.name) : "params";
-            if (group.integrationId && hasAutoFillId(tool)) {
+            if (group.integration === "attio" && tool.name === "attio_query_records" && group.integrationId) {
+                parts.push(`            ${methodName}: <TObject extends GeneratedAttioObject>(params: AttioQueryRecordsParams<TObject>) =>`);
+                parts.push(`                agent.executeTool<ToolOutputByName["${escapeString(tool.name)}"]>("${escapeString(tool.name)}", { objectSlug: __normalizeAttioObjectSlug(params.object), filter: __serializeAttioFilter(params.filter), limit: params.limit ?? null, integrationId: "${escapeString(group.integrationId)}" }).then(result => __enhanceAttioQueryResult(params.object, result)),`);
+            }
+            else if (group.integration === "attio" && tool.name === "attio_upsert_record" && group.integrationId) {
+                parts.push(`            ${methodName}: <TObject extends GeneratedAttioObject>(params: AttioUpsertRecordParams<TObject>) =>`);
+                parts.push(`                agent.executeTool<ToolOutputByName["${escapeString(tool.name)}"]>("${escapeString(tool.name)}", { objectSlug: __normalizeAttioObjectSlug(params.object), matchingAttribute: params.matchingAttribute, records: __serializeAttioRecords(params.records), integrationId: "${escapeString(group.integrationId)}" }).then(result => __enhanceAttioUpsertResult(params.object, result)),`);
+            }
+            else if (group.integration === "attio" && tool.name === "attio_list_objects" && group.integrationId) {
+                parts.push(`            ${methodName}: (params: AttioListObjectsParams = {}) =>`);
+                parts.push(`                agent.executeTool<ToolOutputByName["${escapeString(tool.name)}"]>("${escapeString(tool.name)}", { ...params, integrationId: "${escapeString(group.integrationId)}" }),`);
+            }
+            else 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)}" }),`);
             }
@@ -745,9 +1128,10 @@ function generateToolsSection(tools, input) {
     return { code: parts.join("\n"), imports };
 }
 // ── System (always included) ──────────────────────────────────────────
-function generateSystemSection() {
-    const imports = new Set(["TimeTriggerConfig", "TerseConfig"]);
+function generateSystemSection(tools) {
+    const imports = new Set(["TimeTriggerConfig", "TerseConfig", "TypedSkill"]);
     const parts = [];
+    const skillToolType = buildSkillToolTypeForIntegration(tools, "terse");
     parts.push(sectionHeader("Schedule"));
     parts.push("");
     parts.push("export const Schedule = {");
@@ -761,8 +1145,8 @@ function generateSystemSection() {
     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(`    skill(): TypedSkill<${skillToolType}> {`);
+    parts.push(`        return new TerseConfig() as TypedSkill<${skillToolType}>`);
     parts.push("    },");
     parts.push("}");
     parts.push("");
@@ -773,20 +1157,21 @@ export function generateCode(input) {
     const allImports = new Set();
     const sections = [];
     const sectionGenerators = [
-        generateGitHubSection(input.github),
-        generateGmailSection(input.gmail),
-        generateSlackSection(input.slack),
+        generateGitHubSection(input.github, input.tools),
+        generateGmailSection(input.gmail, input.tools),
+        generateSlackSection(input.slack, input.tools),
         generateFigmaSection(input.figma),
-        generateLinearSection(input.linear),
-        generateAtlassianSection(input.atlassian),
-        generateNotionSection(input.notion),
-        generatePosthogSection(input.posthog),
-        generateDatadogSection(input.datadog),
-        generateLaunchDarklySection(input.launchdarkly),
-        generateWorkOSSection(input.workos),
-        generateAttioSection(input.attio),
+        generateLinearSection(input.linear, input.tools),
+        generateAtlassianSection(input.atlassian, input.tools),
+        generateNotionSection(input.notion, input.tools),
+        generatePosthogSection(input.posthog, input.tools),
+        generateDatadogSection(input.datadog, input.tools),
+        generateLaunchDarklySection(input.launchdarkly, input.tools),
+        generateWorkOSSection(input.workos, input.tools),
+        generateAttioSection(input.attio, input.tools),
+        generateSnowflakeSection(input.snowflake, input.tools),
         generateToolsSection(input.tools, input),
-        generateSystemSection(),
+        generateSystemSection(input.tools),
     ];
     for (const section of sectionGenerators) {
         if (section.code) {