@cargo-ai/cdk 1.0.5 → 1.0.7

package/build/src/resources/capacity.js

@@ -5,8 +5,22 @@
 // revenue-organization `CreateCapacityPayload`.
 import { register, resourceId, token } from "../core.js";
 import { refUuid } from "../refs.js";
+/**
+ * The `{{member.ids.<connector_slug>}}` expression for a capacity filter —
+ * resolved by the backend at allocation time to the members' user ids in that
+ * connector. Use it as the `values` of a `kind: "string"`, `operator: "is"`
+ * condition on the column holding each record's owner id. Pass a connector
+ * handle, or a raw workspace connector slug for a connector not defined in
+ * code (e.g. an adopted OAuth connector whose actual slug differs from the
+ * CDK slug).
+ */
+export function memberIds(connector) {
+    const slug = typeof connector === "string" ? connector : connector.slug;
+    return `{{member.ids.${slug}}}`;
+}
 export function defineCapacity(slug, spec) {
     const id = resourceId("capacity", slug);
+    validateCapacityFilter(slug, spec);
     register({
         id,
         kind: "capacity",
@@ -28,6 +42,73 @@ export function defineCapacity(slug, spec) {
     });
     return { slug, uuid: token(id, "uuid"), resource: "capacity" };
 }
+// Mirrors the backend's capacity-filter rules (create/update reject the payload
+// otherwise): a model-mapped capacity needs id/time columns and a filter with at
+// least one member-ids condition, and every member-ids condition must be a
+// single-valued `is` on a string column of the capacity's own model.
+const MEMBER_IDS = /{{\s*member\.ids\.[a-z0-9_-]+\s*}}/;
+const MEMBERS_IDS_TYPO = /{{\s*members\.ids\./;
+function fail(slug, message) {
+    throw new Error(`capacity "${slug}" — ${message}`);
+}
+function validateCapacityFilter(slug, spec) {
+    const conditions = spec.filter === undefined
+        ? []
+        : spec.filter.groups.flatMap((group) => group.conditions);
+    const memberIdsConditions = conditions.filter((condition) => {
+        const strings = stringsIn(condition);
+        if (strings.some((value) => MEMBERS_IDS_TYPO.test(value))) {
+            fail(slug, 'filter references "{{members.ids.…}}" — the expression root is singular; use memberIds(connector) → "{{member.ids.<connector_slug>}}".');
+        }
+        return strings.some((value) => MEMBER_IDS.test(value));
+    });
+    for (const condition of memberIdsConditions) {
+        if (condition.kind !== "string") {
+            fail(slug, `a member-ids expression must live on a { kind: "string" } condition, got kind "${condition.kind}".`);
+        }
+        if (condition.operator !== "is") {
+            fail(slug, `member-ids conditions only support the "is" operator, got "${condition.operator}".`);
+        }
+        if (Array.isArray(condition.values)) {
+            fail(slug, "member-ids conditions take a single value — pass values: memberIds(connector), not an array.");
+        }
+        if (condition.relatedModelUuid !== undefined) {
+            fail(slug, "member-ids conditions on a related model are not supported — reference a column of the capacity's own model.");
+        }
+    }
+    if (spec.model === undefined)
+        return;
+    if (spec.filter === undefined) {
+        fail(slug, "a capacity with a model needs a filter mapping records to members — add a condition with values: memberIds(connector).");
+    }
+    if (spec.idColumnSlug === undefined) {
+        fail(slug, "idColumnSlug is required when model is set.");
+    }
+    if (spec.timeColumnSlug === undefined) {
+        fail(slug, "timeColumnSlug is required when model is set.");
+    }
+    if (memberIdsConditions.length === 0) {
+        fail(slug, 'the filter must map records to members — add { kind: "string", columnSlug: "<owner column>", operator: "is", values: memberIds(connector) }.');
+    }
+}
+/** Every string reachable in a condition (values live at different keys per kind). */
+function stringsIn(value, acc = []) {
+    if (typeof value === "string") {
+        acc.push(value);
+        return acc;
+    }
+    if (Array.isArray(value)) {
+        for (const item of value)
+            stringsIn(item, acc);
+        return acc;
+    }
+    if (value !== null && typeof value === "object") {
+        for (const item of Object.values(value))
+            stringsIn(item, acc);
+        return acc;
+    }
+    return acc;
+}
 function toTitle(slug) {
     return slug
         .split(/[-_]/)

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

@@ -1,4 +1,6 @@
+import type { Integrations } from "@cargo-ai/workflow-sdk";
 import { type Token } from "../core.js";
+import type { ConnectorActionRef } from "../refs.js";
 export type RateLimitSpec = {
     unit: "day" | "hour" | "minute" | "second";
     max: number;
@@ -15,6 +17,11 @@ export type ConnectorSpec<S extends string = string> = {
     cacheTtlMilliseconds?: number;
     adopt?: boolean;
 };
+type ConnectorActions<S extends string> = S extends keyof Integrations ? {
+    readonly [A in keyof Integrations[S] & string]: ConnectorActionRef;
+} : {
+    readonly [actionSlug: string]: ConnectorActionRef;
+};
 export type ConnectorHandle<S extends string = string> = {
     readonly slug: string;
     readonly integrationSlug: S;
@@ -24,6 +31,9 @@ export type ConnectorHandle<S extends string = string> = {
      *  dataset, via `defineModel`) is referenced. Carries the integration slug `S`
      *  so `defineModel({ dataset })` can type extractor config. */
     readonly resource: "connector";
+    /** This connector's actions — `connector.actions.<actionSlug>` — for an
+     *  agent's / MCP server's `uses`. */
+    readonly actions: ConnectorActions<S>;
 };
 export declare function defineConnector<S extends string>(slug: string, spec: ConnectorSpec<S>): ConnectorHandle<S>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../../src/resources/connector.ts"],"names":[],"mappings":"AAYA,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AAErE,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC9B,CAAC;AAQF,MAAM,WAAW,gBAAgB;CAAG;AAEpC,KAAK,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,MAAM,gBAAgB,GACxE,gBAAgB,CAAC,CAAC,CAAC,GACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IACrD,WAAW,EAAE,CAAC,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAC/B,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;IAC5B;;mEAE+D;IAC/D,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;CAChC,CAAC;AAEF,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAC9C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,GACrB,eAAe,CAAC,CAAC,CAAC,CAuBpB"}
+{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../../src/resources/connector.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC9B,CAAC;AAQF,MAAM,WAAW,gBAAgB;CAAG;AAEpC,KAAK,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,MAAM,gBAAgB,GACxE,gBAAgB,CAAC,CAAC,CAAC,GACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IACrD,WAAW,EAAE,CAAC,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAC/B,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAOF,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,MAAM,YAAY,GAClE;IAAE,QAAQ,EAAE,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,kBAAkB;CAAE,GACtE;IAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,GAAG,kBAAkB,CAAA;CAAE,CAAC;AAE1D,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;IAC5B;;mEAE+D;IAC/D,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B;yCACqC;IACrC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CACvC,CAAC;AAEF,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAC9C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,GACrB,eAAe,CAAC,CAAC,CAAC,CAuCpB"}

package/build/src/resources/connector.js

@@ -26,12 +26,29 @@ export function defineConnector(slug, spec) {
             adopt: spec.adopt === undefined ? false : spec.adopt,
         },
     });
+    const uuid = token(id, "uuid");
+    // A small Proxy: `connector.actions.<slug>` → a `ConnectorActionRef` pinned to
+    // this connector. The handle itself stays a plain object; only this dedicated
+    // `actions` namespace is proxied (symbols and `then` pass through as undefined).
+    const actions = new Proxy({}, {
+        get(_target, prop) {
+            if (typeof prop !== "string" || prop === "then")
+                return undefined;
+            return {
+                resource: "connectorAction",
+                connectorUuid: uuid,
+                integration: spec.integration,
+                actionSlug: prop,
+            };
+        },
+    });
     return {
         slug,
         integrationSlug: spec.integration,
-        uuid: token(id, "uuid"),
+        uuid,
         datasetUuid: token(id, "datasetUuid"),
         resource: "connector",
+        actions,
     };
 }
 function toTitle(slug) {

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

@@ -0,0 +1,12 @@
+import { type Token } from "../core.js";
+import type { WorkerHandle } from "./worker.js";
+export type CustomIntegrationSpec = {
+    /** The worker serving the Custom Integration HTTP contract. */
+    worker: WorkerHandle;
+};
+export type CustomIntegrationHandle = {
+    readonly slug: string;
+    readonly uuid: Token;
+};
+export declare function defineCustomIntegration(slug: string, spec: CustomIntegrationSpec): CustomIntegrationHandle;
+//# sourceMappingURL=customIntegration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"customIntegration.d.ts","sourceRoot":"","sources":["../../../src/resources/customIntegration.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,qBAAqB,GAAG;IAClC,+DAA+D;IAC/D,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;CACtB,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,qBAAqB,GAC1B,uBAAuB,CAWzB"}

package/build/src/resources/customIntegration.js

@@ -0,0 +1,18 @@
+// defineCustomIntegration — registers a worker-backed custom integration in
+// the workspace's connector catalog. The worker serves the Custom Integration
+// HTTP contract (`createCustomIntegration` from @cargo-ai/worker-sdk); Cargo
+// reads its `GET /manifest` once the worker is deployed and promoted.
+import { register, resourceId, token } from "../core.js";
+import { refUuid } from "../refs.js";
+export function defineCustomIntegration(slug, spec) {
+    const id = resourceId("customIntegration", slug);
+    register({
+        id,
+        kind: "customIntegration",
+        slug,
+        spec: {
+            workerUuid: refUuid(spec.worker),
+        },
+    });
+    return { slug, uuid: token(id, "uuid") };
+}

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

@@ -1,19 +1,17 @@
 import { type Token } from "../core.js";
 import { type FolderRef } from "../refs.js";
-import { type AgentUse, type ConnectorActionSpec, type ToolUse } from "./actions.js";
-import { type ModelUse } from "./agent.js";
+import { type AgentUse } from "./actions.js";
 import type { FolderHandle } from "./folder.js";
 export type McpServerSpec = {
     name?: string;
     description?: string;
-    /** Tools the server exposes (become tool actions). */
-    tools?: ToolUse[];
-    /** Agents the server exposes (become agent actions). */
-    agents?: AgentUse[];
-    /** Connector actions the server exposes. */
-    connectorActions?: ConnectorActionSpec[];
-    /** Data models the server serves. */
-    models?: ModelUse[];
+    /**
+     * Everything the server exposes, in one array — tools, agents, connector
+     * actions, and data models. Each entry is a handle (bare or `{ ref, …options }`):
+     * a `defineTool` / `defineAgent` / `defineModel` handle, or a connector action
+     * `connector.<actionSlug>`. See `AgentUse`.
+     */
+    uses?: AgentUse[];
     folder?: FolderHandle | FolderRef;
 };
 export type McpServerHandle = {

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

@@ -1 +1 @@
-{"version":3,"file":"mcpServer.d.ts","sourceRoot":"","sources":["../../../src/resources/mcpServer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,KAAK,SAAS,EAAW,MAAM,YAAY,CAAC;AACrD,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,mBAAmB,EAIxB,KAAK,OAAO,EACb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,QAAQ,EAAmB,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAClB,wDAAwD;IACxD,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;IACpB,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACzC,qCAAqC;IACrC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;CAChC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,GAClB,eAAe,CAmBjB"}
+{"version":3,"file":"mcpServer.d.ts","sourceRoot":"","sources":["../../../src/resources/mcpServer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,KAAK,SAAS,EAAW,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,KAAK,QAAQ,EAAiB,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;CAChC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,GAClB,eAAe,CAiBjB"}

package/build/src/resources/mcpServer.js

@@ -4,8 +4,7 @@
 // `CreateMcpServerPayload`. Uuid-only identity (no slug) — state-tracked.
 import { register, resourceId, token } from "../core.js";
 import { refUuid } from "../refs.js";
-import { normalizeConnectorActions, normalizeSubAgents, normalizeTools, } from "./actions.js";
-import { normalizeModels } from "./agent.js";
+import { normalizeUses } from "./actions.js";
 export function defineMcpServer(slug, spec) {
     const id = resourceId("mcpServer", slug);
     register({
@@ -17,11 +16,9 @@ export function defineMcpServer(slug, spec) {
             name: spec.name === undefined ? toTitle(slug) : spec.name,
             description: spec.description === undefined ? null : spec.description,
             folderUuid: spec.folder === undefined ? undefined : refUuid(spec.folder),
-            // resolved → AiTypes.Action[] / Resource[] by the apply executor
-            tools: normalizeTools(spec.tools),
-            subAgents: normalizeSubAgents(spec.agents),
-            connectorActions: normalizeConnectorActions(spec.connectorActions),
-            models: normalizeModels(spec.models, true),
+            // `uses` splits into the four buckets the executor resolves →
+            // AiTypes.Action[] / Resource[].
+            ...normalizeUses(spec.uses),
         },
     });
     return { slug, uuid: token(id, "uuid"), resource: "mcpServer" };

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

@@ -1,5 +1,6 @@
+import type { SegmentationTypes, StorageTypes } from "@cargo-ai/types";
 import { type Token } from "../core.js";
-import { type DatasetRef, type FolderRef } from "../refs.js";
+import { type DatasetRef, type FolderRef, type ModelRef } from "../refs.js";
 import type { ConnectorHandle } from "./connector.js";
 import type { FolderHandle } from "./folder.js";
 export type ScheduleSpec = {
@@ -9,26 +10,68 @@ export type ScheduleSpec = {
     type: "dbt";
     jobId: string;
 };
+export type UnificationColumnSpec = {
+    slug: string;
+    reference: string;
+};
+export type UnificationParentSpec = {
+    kind: "model";
+    columnSlug: string;
+    parent: ModelHandle | ModelRef;
+} | {
+    kind: "reference";
+    columnSlug: string;
+    reference: string;
+};
+export type UnificationSpec = {
+    source: "integration";
+} | {
+    source: "custom";
+    type: StorageTypes.ModelUnificationType;
+    uniqueColumns: UnificationColumnSpec[];
+    /** Columns exposed on the unified model (defaults to all). */
+    selectedColumnSlugs?: string[];
+    /** Column carrying the event timestamp (event unification types only). */
+    timeColumnSlug?: string;
+    parent?: UnificationParentSpec;
+    /** Restrict which rows take part in unification (defaults to all rows). */
+    filter?: SegmentationTypes.Filter;
+};
 export interface ExtractorConfigs {
 }
 type ExtractorConfigFor<S extends string, E extends string> = S extends keyof ExtractorConfigs ? E extends keyof ExtractorConfigs[S] ? ExtractorConfigs[S][E] : Record<string, unknown> : Record<string, unknown>;
-export type ModelSpec<S extends string = string, E extends string = string> = {
+export interface ExtractorSlugs {
+}
+type ExtractorSlugFor<S extends string> = S extends keyof ExtractorSlugs ? ExtractorSlugs[S] & 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;
     description?: string;
     /** Source dataset — a connector handle (its dataset) or a `datasetRef(uuid)`. */
     dataset: ConnectorHandle<S> | DatasetRef;
-    /** An extractor the source's integration exposes, e.g. "fetchRecords". */
+    /**
+     * An extractor the source's integration exposes, e.g. "fetchRecords". After
+     * `cargo-ai cdk types`, editors autocomplete the connector's known extractors;
+     * an unsynced/newer slug is still accepted.
+     */
     extractSlug: E;
     /** Extractor config — validated against the extractor's schema on apply. */
     config?: ExtractorConfigFor<S, E>;
     schedule?: ScheduleSpec;
     folder?: FolderHandle | FolderRef;
+    /**
+     * How this model participates in unification. Omit to keep the source's
+     * default (a connector model defaults to its integration's mapping). Applied
+     * via an update once the model exists, so it also covers models the deploy
+     * adopts.
+     */
+    unification?: UnificationSpec;
 };
 export type ModelHandle = {
     readonly slug: string;
     readonly uuid: Token;
     readonly resource: "model";
 };
-export declare function defineModel<S extends string, E extends string>(slug: string, spec: ModelSpec<S, E>): ModelHandle;
+export declare function defineModel<S extends string, E extends LiteralUnion<ExtractorSlugFor<S>>>(slug: string, spec: ModelSpec<S, E>): ModelHandle;
 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":"AAYA,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAW,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAUnC,MAAM,WAAW,gBAAgB;CAAG;AAEpC,KAAK,kBAAkB,CACrB,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,IACd,CAAC,SAAS,MAAM,gBAAgB,GAChC,CAAC,SAAS,MAAM,gBAAgB,CAAC,CAAC,CAAC,GACjC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IAC5E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iFAAiF;IACjF,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC;IACzC,0EAA0E;IAC1E,WAAW,EAAE,CAAC,CAAC;IACf,4EAA4E;IAC5E,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B,CAAC;AAQF,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC5D,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GACpB,WAAW,CAkBb"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/resources/model.ts"],"names":[],"mappings":"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"}

package/build/src/resources/model.js

@@ -10,7 +10,7 @@
 //
 // Compiles to the storage `CreateModelPayload` once tokens are resolved.
 import { register, resourceId, token } from "../core.js";
-import { refUuid } from "../refs.js";
+import { refUuid, } from "../refs.js";
 // A connector handle references its auto-created dataset (`.datasetUuid`); a
 // `datasetRef` references the dataset directly (`.uuid`).
 function datasetUuidOf(dataset) {
@@ -31,10 +31,47 @@ export function defineModel(slug, spec) {
             config: spec.config === undefined ? {} : spec.config,
             schedule: spec.schedule,
             folderUuid: spec.folder === undefined ? undefined : refUuid(spec.folder),
+            unification: spec.unification === undefined
+                ? undefined
+                : compileUnification(spec.unification),
         },
     });
     return { slug, uuid: token(id, "uuid"), resource: "model" };
 }
+// Lower a `UnificationSpec` to the wire shape `StorageTypes.ModelUnification`.
+// The only reshaping is the parent link: a `model` parent carries a handle/ref
+// in code (so the dependency shows up in the graph), which becomes a
+// `parentModelUuid` token resolved at apply time.
+function compileUnification(unification) {
+    if (unification.source === "integration") {
+        return { source: "integration" };
+    }
+    return {
+        source: "custom",
+        type: unification.type,
+        uniqueColumns: unification.uniqueColumns,
+        selectedColumnSlugs: unification.selectedColumnSlugs,
+        timeColumnSlug: unification.timeColumnSlug,
+        parent: unification.parent === undefined
+            ? undefined
+            : compileUnificationParent(unification.parent),
+        filter: unification.filter,
+    };
+}
+function compileUnificationParent(parent) {
+    if (parent.kind === "model") {
+        return {
+            kind: "model",
+            columnSlug: parent.columnSlug,
+            parentModelUuid: refUuid(parent.parent),
+        };
+    }
+    return {
+        kind: "reference",
+        columnSlug: parent.columnSlug,
+        reference: parent.reference,
+    };
+}
 function toTitle(slug) {
     return slug
         .split(/[-_]/)

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

@@ -0,0 +1,21 @@
+import { type Token } from "../core.js";
+import { type ModelRef } from "../refs.js";
+import type { ModelHandle } from "./model.js";
+export type RelationshipRelation = "oneToOne" | "oneToMany" | "manyToOne";
+export type RelationshipEndpointSpec = {
+    model: ModelHandle | ModelRef;
+    column: string;
+    property?: string;
+};
+export type RelationshipSpec = {
+    from: RelationshipEndpointSpec;
+    to: RelationshipEndpointSpec;
+    relation: RelationshipRelation;
+};
+export type RelationshipHandle = {
+    readonly slug: string;
+    readonly uuid: Token;
+    readonly resource: "relationship";
+};
+export declare function defineRelationship(slug: string, spec: RelationshipSpec): RelationshipHandle;
+//# sourceMappingURL=relationship.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"relationship.d.ts","sourceRoot":"","sources":["../../../src/resources/relationship.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,KAAK,QAAQ,EAAW,MAAM,YAAY,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC;AAK1E,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,wBAAwB,CAAC;IAC/B,EAAE,EAAE,wBAAwB,CAAC;IAC7B,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;CACnC,CAAC;AAEF,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,gBAAgB,GACrB,kBAAkB,CAmBpB"}

package/build/src/resources/relationship.js

@@ -0,0 +1,39 @@
+// defineRelationship — a join between two data models in the SAME dataset (a
+// `StorageTypes.Relationship`). It links a column on a `from` model to a column
+// on a `to` model with a cardinality (`oneToOne` / `oneToMany` / `manyToOne`),
+// optionally navigating into a JSON column via a property slug:
+//
+//   const accounts = defineModel("accounts", { ... });
+//   const contacts = defineModel("contacts", { ... });
+//   defineRelationship("contact-account", {
+//     from: { model: contacts, column: "account_id" },
+//     to: { model: accounts, column: "id" },
+//     relation: "manyToOne",
+//   });
+//
+// Both models must live in the same dataset (the server derives the dataset from
+// the `from` model at deploy). Relationships have no server-side slug, so the
+// `slug` is a local identifier only; identity is tracked by the state uuid. The
+// backend `set` endpoint is a per-dataset declarative replace, so the executor
+// read-merges the dataset's live relationships around this one.
+import { register, resourceId, token } from "../core.js";
+import { refUuid } from "../refs.js";
+export function defineRelationship(slug, spec) {
+    const id = resourceId("relationship", slug);
+    register({
+        id,
+        kind: "relationship",
+        slug,
+        spec: {
+            slug,
+            fromModelUuid: refUuid(spec.from.model),
+            fromColumnSlug: spec.from.column,
+            fromPropertySlug: spec.from.property === undefined ? null : spec.from.property,
+            toModelUuid: refUuid(spec.to.model),
+            toColumnSlug: spec.to.column,
+            toPropertySlug: spec.to.property === undefined ? null : spec.to.property,
+            relation: spec.relation,
+        },
+    });
+    return { slug, uuid: token(id, "uuid"), resource: "relationship" };
+}

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

@@ -1,12 +1,24 @@
-import { type Token } from "../core.js";
+import { type SecretRef, type Token } from "../core.js";
 import { type FolderRef } from "../refs.js";
 import type { FolderHandle } from "./folder.js";
+export type WorkerTrigger = {
+    name?: string;
+    description?: string;
+    cron: string;
+    path: string;
+    method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+    data?: Record<string, unknown>;
+    headers?: Record<string, string>;
+};
 export type WorkerSpec = {
     /** Path to the worker's code directory (uploaded + built on deploy). */
     path: string;
     name?: string;
     description?: string;
     folder?: FolderHandle | FolderRef;
+    triggers?: WorkerTrigger[];
+    /** Env vars baked into the build. Use `secret("NAME")` for secret values. */
+    env?: Record<string, string | SecretRef>;
 };
 export type WorkerHandle = {
     readonly slug: string;

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

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/resources/worker.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,KAAK,SAAS,EAAW,MAAM,YAAY,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAmBhD,MAAM,MAAM,UAAU,GAAG;IACvB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,2DAA2D;IAC3D,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC;CACrB,CAAC;AAEF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,YAAY,CAkBzE"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/resources/worker.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,KAAK,EAEX,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,SAAS,EAAW,MAAM,YAAY,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAqBhD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;IACrD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAC3B,6EAA6E;IAC7E,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,2DAA2D;IAC3D,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC;CACrB,CAAC;AAEF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,YAAY,CAoBzE"}

package/build/src/resources/worker.js

@@ -2,7 +2,7 @@
 // directory. Distinct from @cargo-ai/worker-sdk's `createWorker`, which is the
 // worker's *runtime code* (the Hono app at <path>/src/index.ts). On deploy the
 // reconciler creates the worker slot, uploads the bundle, and promotes it.
-import { register, resourceId, token } from "../core.js";
+import { register, resourceId, token, } from "../core.js";
 import { refUuid } from "../refs.js";
 import { assertBundleFiles, bundleHash } from "./bundle.js";
 // Files the hosting worker build always requires at the bundle root: a manifest
@@ -35,6 +35,8 @@ export function defineWorker(slug, spec) {
             // hash the code now so editing it shows as drift on the next deploy
             contentHash: bundleHash(spec.path),
             folderUuid: spec.folder === undefined ? undefined : refUuid(spec.folder),
+            triggers: spec.triggers === undefined ? [] : spec.triggers,
+            env: spec.env === undefined ? {} : spec.env,
         },
     });
     return { slug, uuid: token(id, "uuid"), url: token(id, "url") };