@cargo-ai/cdk 1.0.8 → 1.0.10

package/build/src/cli/commands/inputTypes.d.ts

@@ -15,6 +15,14 @@ export declare function printJsonSchemaInput(schema: unknown): string;
  * workflow builder Refs). Used by `cargo-ai cdk types`.
  */
 export declare function printJsonSchemaType(schema: unknown): string;
+/**
+ * Print an integration action's static output JSON Schema as a plain TS type —
+ * no `Ref<T> | T` widening and no `EncryptionRef`. Returns `undefined` when
+ * the schema is missing or too loose to be useful; the caller falls back to
+ * `any`, which stays usable everywhere a nested `Ref<Record<string, unknown>>`
+ * would not.
+ */
+export declare function printJsonSchemaOutput(schema: unknown): string | undefined;
 /**
  * Print a tool release's `formFields` as a TS input type. Returns
  * `undefined` when the fields can't be interpreted (caller falls back to

package/build/src/cli/commands/inputTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inputTypes.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/inputTypes.ts"],"names":[],"mappings":"AAmCA;;;GAGG;AACH,eAAO,MAAM,oBAAoB,QAE+D,CAAC;AAEjG;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAM5D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAQ3D;AAmTD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAU5E"}
+{"version":3,"file":"inputTypes.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/inputTypes.ts"],"names":[],"mappings":"AAqCA;;;GAGG;AACH,eAAO,MAAM,oBAAoB,QAE+D,CAAC;AAEjG;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAM5D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAQ3D;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAQzE;AAmUD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAU5E"}

package/build/src/cli/commands/inputTypes.js

@@ -1,17 +1,19 @@
-// TypeScript input-type printers for `cargo-ai workflow sync` codegen.
+// TypeScript type printers for `cargo-ai workflow sync` codegen.
 //
-// Three sources of truth, three printers:
+// Sources of truth:
 //   - Integration actions expose their config as JSON Schema on
-//     `connection.integration.list` (`action.config.schema`).
+//     `connection.integration.list` (`action.config.schema`), and — for
+//     actions with a static output — their output as `action.output.schema`.
 //   - Workspace tools expose their input as `formFields` on the tool
 //     workflow's deployed release (`orchestration.release.getDeployed`).
 //   - Agent nodes accept a single global shape (`{ prompt, output? }`) —
 //     the engine validates every agent node against `AiUtils.agentConfig`.
 //
-// All printers run in "input mode": each top-level property is widened to
-// `Ref<T> | T` so callers can pass either a builder Ref or a literal.
-// Anything unrecognized falls back to `unknown` — codegen must never abort
-// on a schema edge case.
+// Input printers run in "input mode": each top-level property is widened to
+// `Ref<T> | T` so callers can pass either a builder Ref or a literal. The
+// output printer emits plain types (outputs come back as a `Ref` the caller
+// dot-accesses). Anything unrecognized falls back to `unknown` — codegen must
+// never abort on a schema edge case.
 //
 // Mirrors `packages/workflow-sdk/scripts/lib/jsonSchemaToTs.ts` (which is a
 // build-time-only script the CLI can't import).
@@ -47,6 +49,22 @@ export function printJsonSchemaType(schema) {
     const printed = printSchema(schema, false, true);
     return printed === "unknown" ? "Record<string, unknown>" : printed;
 }
+/**
+ * Print an integration action's static output JSON Schema as a plain TS type —
+ * no `Ref<T> | T` widening and no `EncryptionRef`. Returns `undefined` when
+ * the schema is missing or too loose to be useful; the caller falls back to
+ * `any`, which stays usable everywhere a nested `Ref<Record<string, unknown>>`
+ * would not.
+ */
+export function printJsonSchemaOutput(schema) {
+    if (schema === null || typeof schema !== "object") {
+        return undefined;
+    }
+    const printed = printSchema(schema, false, false);
+    return printed === "unknown" || printed === "Record<string, unknown>"
+        ? undefined
+        : printed;
+}
 // The platform's shared `encryption` schema definition: an object with a `type`
 // const/enum of "encryption" plus `isEncrypted` and `value`. In CDK config types
 // these positions become `EncryptionRef` (see printObject).
@@ -65,6 +83,10 @@ function isEncryptionSchema(schema) {
 }
 function printSchema(schema, topLevel, encRef) {
     if (Array.isArray(schema.type)) {
+        // zod's `z.any()` lowers to the full list of JSON types; print `unknown`
+        // instead of a noisy 7-member union.
+        if (isAnyTypeList(schema.type))
+            return "unknown";
         return uniqueUnion(schema.type.map((t) => printPrimitive(t, schema, false, encRef)));
     }
     if (schema.enum !== undefined && schema.enum.length > 0) {
@@ -103,6 +125,17 @@ function printSchema(schema, topLevel, encRef) {
         return "unknown";
     return printPrimitive(schema.type, schema, topLevel, encRef);
 }
+const ANY_TYPE_LIST = [
+    "string",
+    "number",
+    "boolean",
+    "object",
+    "array",
+    "null",
+];
+function isAnyTypeList(types) {
+    return ANY_TYPE_LIST.every((t) => types.includes(t));
+}
 function printPrimitive(type, schema, topLevel, encRef) {
     switch (type) {
         case "string":

package/build/src/cli/commands/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/types.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiHzC,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,IAAI,CAgE7E"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/types.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsIzC,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,IAAI,CAkE7E"}

package/build/src/cli/commands/types.js

@@ -1,7 +1,7 @@
 import { mkdirSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { handleApiCall, info, success } from "../io.js";
-import { printJsonSchemaInput, printJsonSchemaType } from "./inputTypes.js";
+import { printJsonSchemaInput, printJsonSchemaOutput, printJsonSchemaType, } from "./inputTypes.js";
 // Composite natives surfaced via dedicated SDK syntax / scope helpers —
 // excluded so we don't double-register them. Mirrors the codegen exclusion
 // list in `packages/workflow-sdk/scripts/generateNativeIntegration.ts`
@@ -37,7 +37,7 @@ const BUNDLED_NATIVE = new Set([
 export function registerTypesCommand(parent, getApi) {
     parent
         .command("types")
-        .description("Generate per-workspace TypeScript types for the Cargo CDK — typed defineConnector/defineModel config + integration actions in workflow bodies")
+        .description("Generate per-workspace TypeScript types for the Cargo CDK — typed defineConnector/defineModel config, model columns + integration actions in workflow bodies")
         .option("--dir <path>", "Repo root the generated files are written into (default: cwd)")
         .option("--out <dir>", "Output subdirectory for generated files (default: .cargo-ai)", ".cargo-ai")
         .action(async (opts) => {
@@ -69,12 +69,13 @@ export function registerTypesCommand(parent, getApi) {
         ].join("\n"));
         info(``);
         const extractorCount = payload.extractorConfigs.reduce((n, e) => n + e.extractors.length, 0);
-        info(`Typed ${String(payload.connectorConfigs.length)} connector config(s), ${String(extractorCount)} extractor config(s), ${String(payload.agentTriggerConfigs.length)} agent trigger config(s), ${String(payload.integrations.length)} integration(s), ${String(payload.native.length)} native action(s).`);
+        info(`Typed ${String(payload.connectorConfigs.length)} connector config(s), ${String(extractorCount)} extractor config(s), ${String(payload.agentTriggerConfigs.length)} agent trigger config(s), ${String(payload.modelColumns.length)} model column set(s), ${String(payload.integrations.length)} integration(s), ${String(payload.native.length)} native action(s).`);
     });
 }
 async function fetchWorkspaceSurface(api) {
     const integrationsResult = await handleApiCall(() => api.connection.integration.list({}));
     const nativeIntegrationResult = await handleApiCall(() => api.connection.nativeIntegration.get());
+    const modelsResult = await handleApiCall(() => api.storage.model.all());
     const rawIntegrations = integrationsResult.integrations;
     const integrations = collectIntegrations(rawIntegrations);
     const native = collectNative(nativeIntegrationResult.nativeIntegration.actions);
@@ -82,6 +83,7 @@ async function fetchWorkspaceSurface(api) {
     const extractorConfigs = collectExtractorConfigs(rawIntegrations);
     const extractorSlugs = collectExtractorSlugs(rawIntegrations);
     const agentTriggerConfigs = collectAgentTriggerConfigs(rawIntegrations);
+    const modelColumns = collectModelColumns(modelsResult.models);
     return {
         integrations,
         native,
@@ -89,6 +91,7 @@ async function fetchWorkspaceSurface(api) {
         extractorConfigs,
         extractorSlugs,
         agentTriggerConfigs,
+        modelColumns,
     };
 }
 // integrationSlug → connector config type. Skips integrations whose schema
@@ -177,6 +180,30 @@ function collectExtractorSlugs(integrations) {
     out.sort((a, b) => a.integrationSlug.localeCompare(b.integrationSlug));
     return out;
 }
+// modelSlug → every column slug it exposes. Additional columns are addressed
+// with their kind as a storage prefix (`computed__score`, `custom__notes`, …) —
+// the same slugs `/storage/columns/list` returns — while original columns stay
+// bare. Models whose columns haven't been inferred yet are skipped; two models
+// sharing a slug (across datasets) merge their column sets so the generated
+// union accepts either.
+function collectModelColumns(models) {
+    const bySlug = new Map();
+    for (const model of models) {
+        const previous = bySlug.get(model.slug);
+        bySlug.set(model.slug, [
+            ...(previous === undefined ? [] : previous),
+            ...model.columns.map((column) => column.slug),
+            ...model.additionalColumns.map((column) => `${column.kind}__${column.slug}`),
+        ]);
+    }
+    return [...bySlug]
+        .filter(([, slugs]) => slugs.length > 0)
+        .map(([modelSlug, slugs]) => ({
+        modelSlug,
+        columns: [...new Set(slugs)].sort((a, b) => a.localeCompare(b)),
+    }))
+        .sort((a, b) => a.modelSlug.localeCompare(b.modelSlug));
+}
 function collectIntegrations(integrations) {
     const out = [];
     for (const integration of integrations) {
@@ -186,12 +213,13 @@ function collectIntegrations(integrations) {
             continue;
         const actions = actionEntries.map(([slug, raw]) => {
             const meta = raw;
-            const { config } = meta;
+            const { config, output } = meta;
             return {
                 slug,
                 name: trimOrUndefined(meta.name),
                 description: trimOrUndefined(meta.description),
                 inputTypeSrc: printJsonSchemaInput(config !== undefined ? config.schema : undefined),
+                outputTypeSrc: printJsonSchemaOutput(output !== undefined ? output.schema : undefined),
             };
         });
         out.push({
@@ -270,6 +298,14 @@ function renderTypes(payload) {
         }
         cdkLines.push(`  }`);
     }
+    if (payload.modelColumns.length > 0) {
+        cdkLines.push(`  interface ModelColumns {`);
+        for (const m of payload.modelColumns) {
+            const union = m.columns.map((c) => JSON.stringify(c)).join(" | ");
+            cdkLines.push(`    ${jsonKey(m.modelSlug)}: ${union};`);
+        }
+        cdkLines.push(`  }`);
+    }
     if (payload.agentTriggerConfigs.length > 0) {
         cdkLines.push(`  interface AgentTriggerConfigs {`);
         for (const t of payload.agentTriggerConfigs) {
@@ -308,10 +344,12 @@ function renderTypes(payload) {
                 }, "      ");
                 if (actionDoc !== "")
                     wfLines.push(actionDoc.trimEnd());
-                // Action outputs aren't schema-typed, so `any` (not `Record<string,
+                // Actions with a static output schema get a real output type; the rest
+                // (dynamic or absent outputs) fall back to `any` (not `Record<string,
                 // unknown>`, which lowers to an unusable nested `Ref`) — the result is
                 // then usable as a string, an object, or in any typed slot.
-                wfLines.push(`      ${jsonKey(action.slug)}: IntegrationAction<${action.inputTypeSrc}, any>;`);
+                const outputSrc = action.outputTypeSrc !== undefined ? action.outputTypeSrc : "any";
+                wfLines.push(`      ${jsonKey(action.slug)}: IntegrationAction<${action.inputTypeSrc}, ${outputSrc}>;`);
             }
             wfLines.push(`    };`);
         }

package/build/src/index.d.ts

@@ -16,7 +16,7 @@ export type { FolderHandle, FolderKind, FolderSpec, } from "./resources/folder.j
 export { defineFolder } from "./resources/folder.js";
 export type { McpServerHandle, McpServerSpec } from "./resources/mcpServer.js";
 export { defineMcpServer } from "./resources/mcpServer.js";
-export type { ExtractorConfigs, ExtractorSlugs, ModelHandle, ModelSpec, UnificationColumnSpec, UnificationParentSpec, UnificationSpec, } from "./resources/model.js";
+export type { ExtractorConfigs, ExtractorSlugs, ModelColumns, ModelHandle, ModelSpec, UnificationColumnSpec, UnificationParentSpec, UnificationSpec, } from "./resources/model.js";
 export { defineModel } from "./resources/model.js";
 export type { PlayHandle, PlaySpec } from "./resources/play.js";
 export { definePlay } from "./resources/play.js";

package/build/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/build/src/resources/model.d.ts

@@ -43,6 +43,15 @@ type ExtractorConfigFor<S extends string, E extends string> = S extends keyof Ex
 export interface ExtractorSlugs {
 }
 type ExtractorSlugFor<S extends string> = S extends keyof ExtractorSlugs ? ExtractorSlugs[S] & string : string;
+export interface ModelColumns {
+}
+type ModelColumnsAccessor<Slug extends string> = Slug extends keyof ModelColumns ? {
+    readonly [C in ModelColumns[Slug] & string]: C;
+} & {
+    readonly [columnSlug: string]: string;
+} : {
+    readonly [columnSlug: string]: string;
+};
 type LiteralUnion<T extends string> = T | (string & {});
 export type ModelSpec<S extends string = string, E extends LiteralUnion<ExtractorSlugFor<S>> = LiteralUnion<ExtractorSlugFor<S>>> = {
     name?: string;
@@ -67,11 +76,14 @@ export type ModelSpec<S extends string = string, E extends LiteralUnion<Extracto
      */
     unification?: UnificationSpec;
 };
-export type ModelHandle = {
+export type ModelHandle<Slug extends string = string> = {
     readonly slug: string;
     readonly uuid: Token;
     readonly resource: "model";
+    /** This model's columns — `model.columns.<columnSlug>` yields the slug
+     *  string, for relationships, unification, and segment column lists. */
+    readonly columns: ModelColumnsAccessor<Slug>;
 };
-export declare function defineModel<S extends string, E extends LiteralUnion<ExtractorSlugFor<S>>>(slug: string, spec: ModelSpec<S, E>): ModelHandle;
+export declare function defineModel<Slug extends string, S extends string, E extends LiteralUnion<ExtractorSlugFor<S>>>(slug: Slug, spec: ModelSpec<S, E>): ModelHandle<Slug>;
 export {};
 //# sourceMappingURL=model.d.ts.map

package/build/src/resources/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/resources/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/resources/model.ts"],"names":[],"mappings":"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"}

package/build/src/resources/model.js

@@ -36,7 +36,18 @@ export function defineModel(slug, spec) {
                 : compileUnification(spec.unification),
         },
     });
-    return { slug, uuid: token(id, "uuid"), resource: "model" };
+    // A small Proxy mirroring `connector.actions`: `model.columns.<columnSlug>`
+    // echoes the slug back as a plain string. No server knowledge is needed —
+    // columns are slug-addressed, so the accessor works before the model exists
+    // (symbols and `then` pass through as undefined).
+    const columns = new Proxy({}, {
+        get(_target, prop) {
+            if (typeof prop !== "string" || prop === "then")
+                return undefined;
+            return prop;
+        },
+    });
+    return { slug, uuid: token(id, "uuid"), resource: "model", columns };
 }
 // Lower a `UnificationSpec` to the wire shape `StorageTypes.ModelUnification`.
 // The only reshaping is the parent link: a `model` parent carries a handle/ref