@cargo-ai/cdk 1.0.11 → 1.0.12

package/build/src/deploy/pull/print.d.ts

@@ -0,0 +1,9 @@
+import { type GeneratedAsset } from "./ir.js";
+import { type ResolvedResource } from "./resolve.js";
+export type GeneratedSource = {
+    readonly path: string;
+    readonly source: string;
+};
+export type GeneratedFile = GeneratedSource | GeneratedAsset;
+export declare function printResource(resource: ResolvedResource): GeneratedSource;
+//# sourceMappingURL=print.d.ts.map

package/build/src/deploy/pull/print.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../../../../src/deploy/pull/print.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,cAAc,EAAgB,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAa,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAsChE,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAGF,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG,cAAc,CAAC;AAE7D,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,eAAe,CAoBzE"}

package/build/src/deploy/pull/print.js

@@ -0,0 +1,59 @@
+// TS source printer. Turns a ResolvedResource into a `<dir>/<slug>.ts` module:
+// the import header followed by `export const <id> = define<Kind>("slug", {…})`.
+// Formatting is cosmetic — the content hash is computed from the runtime spec,
+// not the source text — but output is deterministic so re-pulls diff cleanly.
+import { isCallMarker } from "./ir.js";
+import { isRawExpr } from "./resolve.js";
+const IDENT = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
+function printKey(key) {
+    return IDENT.test(key) ? key : JSON.stringify(key);
+}
+function printValue(value, indent) {
+    if (isRawExpr(value))
+        return value.__expr;
+    if (isCallMarker(value)) {
+        const args = value.args.map((arg) => printValue(arg, indent));
+        return `${value.fn}(${args.join(", ")})`;
+    }
+    if (value === null)
+        return "null";
+    if (typeof value === "string")
+        return JSON.stringify(value);
+    if (typeof value === "number" || typeof value === "boolean") {
+        return String(value);
+    }
+    if (Array.isArray(value)) {
+        if (value.length === 0)
+            return "[]";
+        const inner = indent + "  ";
+        const items = value.map((item) => `${inner}${printValue(item, inner)}`);
+        return `[\n${items.join(",\n")},\n${indent}]`;
+    }
+    if (typeof value === "object") {
+        const entries = Object.entries(value).filter(([, v]) => v !== undefined);
+        if (entries.length === 0)
+            return "{}";
+        const inner = indent + "  ";
+        const lines = entries.map(([key, v]) => `${inner}${printKey(key)}: ${printValue(v, inner)}`);
+        return `{\n${lines.join(",\n")},\n${indent}}`;
+    }
+    // undefined / functions — should never reach here for a mapped spec.
+    return "undefined";
+}
+export function printResource(resource) {
+    const header = [
+        `import { ${resource.cdkImports.join(", ")} } from "@cargo-ai/cdk";`,
+    ];
+    if (resource.localImports.length > 0) {
+        header.push("");
+        for (const imp of resource.localImports) {
+            header.push(`import { ${imp.identifier} } from ${JSON.stringify(imp.from)};`);
+        }
+    }
+    const args = resource.singleton
+        ? printValue(resource.spec, "")
+        : `${JSON.stringify(resource.slug)}, ${printValue(resource.spec, "")}`;
+    const body = `export const ${resource.identifier} = ${resource.defineFn}(${args});`;
+    const source = `${header.join("\n")}\n\n${body}\n`;
+    return { path: `${resource.dir}/${resource.slug}.ts`, source };
+}

package/build/src/deploy/pull/resolve.d.ts

@@ -0,0 +1,24 @@
+import { type IRResource } from "./ir.js";
+export type RawExpr = {
+    readonly __expr: string;
+};
+export declare function rawExpr(code: string): RawExpr;
+export declare function isRawExpr(value: unknown): value is RawExpr;
+export type LocalImport = {
+    readonly identifier: string;
+    readonly from: string;
+};
+export type ResolvedResource = {
+    readonly kind: IRResource["kind"];
+    readonly slug: string;
+    readonly uuid: string;
+    readonly identifier: string;
+    readonly defineFn: string;
+    readonly dir: string;
+    readonly singleton: boolean;
+    readonly cdkImports: readonly string[];
+    readonly localImports: readonly LocalImport[];
+    readonly spec: Record<string, unknown>;
+};
+export declare function resolveResources(resources: readonly IRResource[]): ResolvedResource[];
+//# sourceMappingURL=resolve.d.ts.map

package/build/src/deploy/pull/resolve.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../../src/deploy/pull/resolve.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEL,KAAK,UAAU,EAMhB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,OAAO,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAElD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7C;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,CAM1D;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAEvC,QAAQ,CAAC,YAAY,EAAE,SAAS,WAAW,EAAE,CAAC;IAE9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxC,CAAC;AA6BF,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,UAAU,EAAE,GAC/B,gBAAgB,EAAE,CAsEpB"}

package/build/src/deploy/pull/resolve.js

@@ -0,0 +1,113 @@
+// Cross-reference resolution. Given all pulled IR resources, rewrite every
+// RefMarker into either a code handle (when the target is also being pulled —
+// the preferred form, which auto-wires the deploy dependency) or a literal
+// `xxRef("uuid")` (when it isn't). SecretMarkers become `secret("NAME")` —
+// core's `secret()` takes the env-var NAME, read at apply time.
+// The output carries the exact import set each generated file needs.
+//
+// Export identifiers are assigned globally and uniquely: slugs are only unique
+// per kind (and distinct slugs can camelCase identically), so a colliding
+// identifier gets a deterministic numeric suffix — otherwise a folder named
+// like its model would shadow it (duplicate binding / silently mis-wired
+// import).
+//
+// Markers are replaced by `RawExpr` nodes ({ __expr }) so the printer emits them
+// verbatim instead of quoting them as JSON.
+import { isCallMarker, isRefMarker, isSecretMarker, KIND_META, toIdentifier, } from "./ir.js";
+export function rawExpr(code) {
+    return { __expr: code };
+}
+export function isRawExpr(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        typeof value.__expr === "string");
+}
+// Relative import path from one resource file to another (each resource is its
+// own `<dir>/<slug>.ts`). Same dir → "./slug"; else "../otherDir/slug".
+function importPath(fromDir, toDir, toSlug) {
+    return fromDir === toDir ? `./${toSlug}` : `../${toDir}/${toSlug}`;
+}
+// One unique identifier per resource, in input order: the first taker keeps
+// the plain camelCased slug, later collisions get `<identifier>2`, `…3`.
+function assignIdentifiers(resources) {
+    const byUuid = new Map();
+    const used = new Set();
+    for (const resource of resources) {
+        const base = toIdentifier(resource.slug);
+        let identifier = base;
+        let n = 1;
+        while (used.has(identifier)) {
+            n += 1;
+            identifier = `${base}${String(n)}`;
+        }
+        used.add(identifier);
+        byUuid.set(resource.uuid, identifier);
+    }
+    return byUuid;
+}
+export function resolveResources(resources) {
+    const byUuid = new Map();
+    for (const resource of resources)
+        byUuid.set(resource.uuid, resource);
+    const identifiers = assignIdentifiers(resources);
+    return resources.map((resource) => {
+        const meta = KIND_META[resource.kind];
+        if (meta === undefined) {
+            throw new Error(`cdk pull: unsupported kind "${resource.kind}"`);
+        }
+        const cdkImports = new Set([meta.defineFn]);
+        const localImports = new Map();
+        const walk = (value) => {
+            if (isSecretMarker(value)) {
+                cdkImports.add("secret");
+                return rawExpr(`secret(${JSON.stringify(value.envName)})`);
+            }
+            if (isRefMarker(value)) {
+                const target = byUuid.get(value.uuid);
+                if (target !== undefined && target.uuid !== resource.uuid) {
+                    const targetMeta = KIND_META[target.kind];
+                    if (targetMeta !== undefined) {
+                        const identifier = identifiers.get(target.uuid);
+                        localImports.set(identifier, importPath(meta.dir, targetMeta.dir, target.slug));
+                        const accessor = value.accessor === undefined ? "" : value.accessor;
+                        return rawExpr(`${identifier}${accessor}`);
+                    }
+                }
+                return walk(value.fallback);
+            }
+            if (isCallMarker(value)) {
+                cdkImports.add(value.fn);
+                const marker = {
+                    __call: true,
+                    fn: value.fn,
+                    args: value.args.map(walk),
+                };
+                return marker;
+            }
+            if (Array.isArray(value))
+                return value.map(walk);
+            if (typeof value === "object" && value !== null) {
+                const out = {};
+                for (const [key, inner] of Object.entries(value))
+                    out[key] = walk(inner);
+                return out;
+            }
+            return value;
+        };
+        const spec = walk(resource.spec);
+        return {
+            kind: resource.kind,
+            slug: resource.slug,
+            uuid: resource.uuid,
+            identifier: identifiers.get(resource.uuid),
+            defineFn: meta.defineFn,
+            dir: meta.dir,
+            singleton: meta.singleton === true,
+            cdkImports: [...cdkImports].sort(),
+            localImports: [...localImports.entries()]
+                .map(([identifier, from]) => ({ identifier, from }))
+                .sort((a, b) => a.from.localeCompare(b.from)),
+            spec,
+        };
+    });
+}

package/build/src/deploy/pull/untar.d.ts

@@ -0,0 +1,6 @@
+export type ArchiveFile = {
+    path: string;
+    bytes: Uint8Array;
+};
+export declare function untarGz(archive: Uint8Array): ArchiveFile[];
+//# sourceMappingURL=untar.d.ts.map

package/build/src/deploy/pull/untar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"untar.d.ts","sourceRoot":"","sources":["../../../../src/deploy/pull/untar.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAAC;AA2B9D,wBAAgB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,WAAW,EAAE,CA6D1D"}

package/build/src/deploy/pull/untar.js

@@ -0,0 +1,84 @@
+// Minimal tar.gz extraction for pulled worker/app source archives. The backend
+// builds them with archiver's tar-stream (USTAR headers, PAX extended headers
+// only for >100-char paths), so a small reader covers the format: 512-byte
+// header blocks, octal size, `prefix` field, and PAX `path=` overrides.
+import { gunzipSync } from "node:zlib";
+const BLOCK = 512;
+function readString(block, offset, length) {
+    const slice = block.subarray(offset, offset + length);
+    const end = slice.indexOf(0);
+    return new TextDecoder().decode(end === -1 ? slice : slice.subarray(0, end));
+}
+function readOctal(block, offset, length) {
+    const text = readString(block, offset, length).trim();
+    return text.length === 0 ? 0 : parseInt(text, 8);
+}
+// Parse a PAX extended header body: lines of `<len> <key>=<value>\n`.
+function paxPath(body) {
+    const text = new TextDecoder().decode(body);
+    for (const line of text.split("\n")) {
+        const space = line.indexOf(" ");
+        if (space === -1)
+            continue;
+        const entry = line.slice(space + 1);
+        if (entry.startsWith("path="))
+            return entry.slice("path=".length);
+    }
+    return undefined;
+}
+export function untarGz(archive) {
+    const tar = gunzipSync(archive);
+    const files = [];
+    let offset = 0;
+    let overridePath;
+    while (offset + BLOCK <= tar.length) {
+        const header = tar.subarray(offset, offset + BLOCK);
+        // Two all-zero blocks mark the end of the archive.
+        if (header.every((byte) => byte === 0))
+            break;
+        const size = readOctal(header, 124, 12);
+        const typeflag = String.fromCharCode(header[156] ?? 0);
+        const dataStart = offset + BLOCK;
+        const dataEnd = dataStart + size;
+        offset = dataStart + Math.ceil(size / BLOCK) * BLOCK;
+        // PAX extended header ('x') — may carry a long `path=` for the NEXT entry.
+        if (typeflag === "x" || typeflag === "g") {
+            const pathFromPax = paxPath(tar.subarray(dataStart, dataEnd));
+            if (typeflag === "x" && pathFromPax !== undefined) {
+                overridePath = pathFromPax;
+            }
+            continue;
+        }
+        // GNU long-name entry ('L') — the data IS the next entry's name.
+        if (typeflag === "L") {
+            overridePath = new TextDecoder()
+                .decode(tar.subarray(dataStart, dataEnd))
+                .replace(/\0+$/, "");
+            continue;
+        }
+        // Regular file ('0' or NUL); everything else (dirs, links) is skipped.
+        if (typeflag === "0" || typeflag === "\0") {
+            const name = readString(header, 0, 100);
+            const prefix = readString(header, 345, 155);
+            const rawPath = overridePath !== undefined
+                ? overridePath
+                : prefix.length > 0
+                    ? `${prefix}/${name}`
+                    : name;
+            overridePath = undefined;
+            // Normalize away leading ./ and /; reject traversal. The `..` check is
+            // segment-wise so legitimate names like `CHANGELOG..md` survive, and a
+            // backslash anywhere is rejected (a path separator on Windows).
+            const path = rawPath.replace(/^\.\//, "").replace(/^\/+/, "");
+            if (path.length === 0 ||
+                path.includes("\\") ||
+                path.split("/").includes("..")) {
+                continue;
+            }
+            files.push({ path, bytes: tar.subarray(dataStart, dataEnd) });
+            continue;
+        }
+        overridePath = undefined;
+    }
+    return files;
+}

package/build/src/deploy/readers.live.d.ts

@@ -1,4 +1,7 @@
 import type { Api } from "@cargo-ai/api";
 import { type LiveReaders } from "./refresh.js";
+export declare const VOLATILE: Set<string>;
+export declare function deepOmit(value: unknown, isLeaf?: (value: unknown) => boolean): unknown;
+export declare function isNotFound(error: unknown): boolean;
 export declare function liveReaders(api: Api): LiveReaders;
 //# sourceMappingURL=readers.live.d.ts.map

package/build/src/deploy/readers.live.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readers.live.d.ts","sourceRoot":"","sources":["../../../src/deploy/readers.live.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAA8B,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAoD5E,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAoUjD"}
+{"version":3,"file":"readers.live.d.ts","sourceRoot":"","sources":["../../../src/deploy/readers.live.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAA8B,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAO5E,eAAO,MAAM,QAAQ,aAOnB,CAAC;AAIH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,GACnC,OAAO,CAYT;AAMD,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKlD;AAeD,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAqUjD"}

package/build/src/deploy/readers.live.js

@@ -8,8 +8,9 @@
 import { fingerprint } from "./refresh.js";
 const GONE = { exists: false };
 // Keys stripped anywhere in a projection before hashing: per-resource volatile
-// ids and canvas coordinates that change without being user edits.
-const VOLATILE = new Set([
+// ids and canvas coordinates that change without being user edits. Shared with
+// the pull mappers, whose generated specs must hash-match this projection.
+export const VOLATILE = new Set([
     "temporalScheduleWorkflowId",
     "temporalWorkflowId",
     "position",
@@ -17,15 +18,19 @@ const VOLATILE = new Set([
     "updatedAt",
     "deletedAt",
 ]);
-function deepOmit(value) {
+// Deep-copy dropping VOLATILE keys. `isLeaf` stops descent (pull passes its
+// marker guard so embedded markers ship verbatim).
+export function deepOmit(value, isLeaf) {
+    if (isLeaf !== undefined && isLeaf(value))
+        return value;
     if (Array.isArray(value))
-        return value.map(deepOmit);
+        return value.map((item) => deepOmit(item, isLeaf));
     if (value !== null && typeof value === "object") {
         const out = {};
         for (const [key, inner] of Object.entries(value)) {
             if (VOLATILE.has(key))
                 continue;
-            out[key] = deepOmit(inner);
+            out[key] = deepOmit(inner, isLeaf);
         }
         return out;
     }
@@ -34,7 +39,7 @@ function deepOmit(value) {
 function present(config) {
     return { exists: true, fingerprint: fingerprint(deepOmit(config)) };
 }
-function isNotFound(error) {
+export function isNotFound(error) {
     const reason = error.reason;
     if (typeof reason === "string" && /notfound/i.test(reason))
         return true;
@@ -132,6 +137,7 @@ export function liveReaders(api) {
                     "config",
                     "schedule",
                     "unification",
+                    "additionalColumns",
                     "folderUuid",
                     "kind",
                     "connectorUuid",

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 { ExtractorColumns, ExtractorConfigs, ExtractorSlugs, ModelColumns, ModelHandle, ModelSpec, UnificationColumnSpec, UnificationParentSpec, UnificationSpec, } from "./resources/model.js";
+export type { ExtractorColumns, ExtractorConfigs, ExtractorSlugs, ModelAdditionalColumnSpec, ModelAdditionalColumnSpecBase, ModelColumns, ModelComputedColumnSpec, ModelCustomColumnSpec, ModelHandle, ModelLookupColumnSpec, ModelMetricColumnSpec, ModelSpec, ModelUnificationColumnSpec, ModelUnificationParentSpec, ModelUnificationSpec, } from "./resources/model.js";
 export { defineModel } from "./resources/model.js";
 export type { PlayHandle, PlaySpec } from "./resources/play.js";
 export { definePlay } from "./resources/play.js";
@@ -34,7 +34,7 @@ export { createWorker, OpenAPIRoute } from "@cargo-ai/worker-sdk";
 export { agentRef, defineWorkflow, defineWorkflowFromNodes, toolRef, type WorkflowFromNodes, type WorkflowResourceRef, } from "@cargo-ai/workflow-sdk";
 export type { EncryptionRef, ResourceKind, ResourceNode, SecretRef, Token, } from "./core.js";
 export { env, isSecret, isToken, resolveSecrets, secret, token, } from "./core.js";
-export type { AgentRef, ConnectorActionRef, ConnectorRef, DatasetRef, FolderRef, MemberRef, ModelRef, PlayRef, ResourceRef, SegmentRef, ToolRef, } from "./refs.js";
-export { connectorActionRef, connectorRef, datasetRef, folderRef, memberRef, modelRef, playRef, refUuid, segmentRef, } from "./refs.js";
+export type { AgentRef, ConnectorActionRef, ConnectorRef, DatasetRef, FolderRef, MemberRef, ModelRef, PlayRef, RelationshipRef, ResourceRef, SegmentRef, ToolRef, WorkerRef, } from "./refs.js";
+export { connectorActionRef, connectorRef, datasetRef, folderRef, memberRef, modelRef, playRef, refUuid, relationshipRef, segmentRef, workerRef, } from "./refs.js";
 export * from "./deploy/index.js";
 //# sourceMappingURL=index.d.ts.map

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/index.js

@@ -30,6 +30,6 @@ export { createWorker, OpenAPIRoute } from "@cargo-ai/worker-sdk";
 // types stay in `@cargo-ai/workflow-sdk`.
 export { agentRef, defineWorkflow, defineWorkflowFromNodes, toolRef, } from "@cargo-ai/workflow-sdk";
 export { env, isSecret, isToken, resolveSecrets, secret, token, } from "./core.js";
-export { connectorActionRef, connectorRef, datasetRef, folderRef, memberRef, modelRef, playRef, refUuid, segmentRef, } from "./refs.js";
+export { connectorActionRef, connectorRef, datasetRef, folderRef, memberRef, modelRef, playRef, refUuid, relationshipRef, segmentRef, workerRef, } from "./refs.js";
 // ── deployment: plan + apply ─────────────────────────────────────────────────
 export * from "./deploy/index.js";

package/build/src/refs.d.ts

@@ -1,5 +1,5 @@
 import type { Token } from "./core.js";
-export type ResourceKindRef = "connector" | "dataset" | "model" | "folder" | "play" | "tool" | "agent" | "member" | "segment";
+export type ResourceKindRef = "connector" | "dataset" | "model" | "folder" | "play" | "tool" | "agent" | "member" | "segment" | "relationship" | "worker";
 export type ResourceRef<K extends ResourceKindRef = ResourceKindRef> = {
     readonly uuid: Token | string;
     readonly resource: K;
@@ -13,6 +13,8 @@ export type ToolRef = ResourceRef<"tool">;
 export type AgentRef = ResourceRef<"agent">;
 export type MemberRef = ResourceRef<"member">;
 export type SegmentRef = ResourceRef<"segment">;
+export type RelationshipRef = ResourceRef<"relationship">;
+export type WorkerRef = ResourceRef<"worker">;
 /** Reference a connector by uuid (e.g. an adopted OAuth connector). */
 export declare const connectorRef: (uuid: string) => ConnectorRef;
 /** Reference a connector's auto-created dataset by uuid, for `defineModel`. */
@@ -27,6 +29,10 @@ export declare const playRef: (uuid: string) => PlayRef;
 export declare const memberRef: (uuid: string) => MemberRef;
 /** Reference a segment by uuid. */
 export declare const segmentRef: (uuid: string) => SegmentRef;
+/** Reference a model relationship by uuid (e.g. for a metric column). */
+export declare const relationshipRef: (uuid: string) => RelationshipRef;
+/** Reference a hosting worker by uuid (e.g. a custom integration's backend). */
+export declare const workerRef: (uuid: string) => WorkerRef;
 /**
  * A reference to one action of a connector (e.g. an enrichment endpoint), for an
  * agent's / MCP server's `uses`. Produced by accessing the action off a connector

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

@@ -1 +1 @@
-{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../src/refs.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAEvC,MAAM,MAAM,eAAe,GACvB,WAAW,GACX,SAAS,GACT,OAAO,GACP,QAAQ,GACR,MAAM,GACN,MAAM,GACN,OAAO,GACP,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,IAAI;IACrE,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;AACpD,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;AAChD,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAC5C,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC9C,MAAM,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAC1C,MAAM,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAC1C,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAC5C,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC9C,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;AAEhD,uEAAuE;AACvE,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,YAG1C,CAAC;AACH,+EAA+E;AAC/E,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,UAGxC,CAAC;AACH,sCAAsC;AACtC,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,QAGtC,CAAC;AACH,kCAAkC;AAClC,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,SAGvC,CAAC;AACH,+EAA+E;AAC/E,eAAO,MAAM,OAAO,SAAU,MAAM,KAAG,OAAuC,CAAC;AAC/E,gFAAgF;AAChF,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,SAGvC,CAAC;AACH,mCAAmC;AACnC,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,UAGxC,CAAC;AAKH;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,aAAa,EAAE,KAAK,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,cAClB;IAAE,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,cACjD,MAAM,gBACJ,MAAM,KACnB,kBAUD,CAAC;AAEH,iEAAiE;AACjE,eAAO,MAAM,OAAO,QAAS;IAAE,IAAI,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,KAAG,KAAK,GAAG,MACtD,CAAC"}
+{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../src/refs.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAEvC,MAAM,MAAM,eAAe,GACvB,WAAW,GACX,SAAS,GACT,OAAO,GACP,QAAQ,GACR,MAAM,GACN,MAAM,GACN,OAAO,GACP,QAAQ,GACR,SAAS,GACT,cAAc,GACd,QAAQ,CAAC;AAEb,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,IAAI;IACrE,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;AACpD,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;AAChD,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAC5C,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC9C,MAAM,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAC1C,MAAM,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAC1C,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAC5C,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC9C,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;AAChD,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;AAC1D,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAE9C,uEAAuE;AACvE,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,YAG1C,CAAC;AACH,+EAA+E;AAC/E,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,UAGxC,CAAC;AACH,sCAAsC;AACtC,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,QAGtC,CAAC;AACH,kCAAkC;AAClC,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,SAGvC,CAAC;AACH,+EAA+E;AAC/E,eAAO,MAAM,OAAO,SAAU,MAAM,KAAG,OAAuC,CAAC;AAC/E,gFAAgF;AAChF,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,SAGvC,CAAC;AACH,mCAAmC;AACnC,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,UAGxC,CAAC;AACH,yEAAyE;AACzE,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,eAG7C,CAAC;AACH,gFAAgF;AAChF,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,SAGvC,CAAC;AAKH;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,aAAa,EAAE,KAAK,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,cAClB;IAAE,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,cACjD,MAAM,gBACJ,MAAM,KACnB,kBAUD,CAAC;AAEH,iEAAiE;AACjE,eAAO,MAAM,OAAO,QAAS;IAAE,IAAI,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,KAAG,KAAK,GAAG,MACtD,CAAC"}

package/build/src/refs.js

@@ -38,6 +38,16 @@ export const segmentRef = (uuid) => ({
     uuid,
     resource: "segment",
 });
+/** Reference a model relationship by uuid (e.g. for a metric column). */
+export const relationshipRef = (uuid) => ({
+    uuid,
+    resource: "relationship",
+});
+/** Reference a hosting worker by uuid (e.g. a custom integration's backend). */
+export const workerRef = (uuid) => ({
+    uuid,
+    resource: "worker",
+});
 /**
  * Reference a connector action by an explicit connector + action slug — the
  * escape hatch when you don't have a typed connector handle (`connector.actions.<slug>`

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

@@ -1,8 +1,9 @@
 import { type Token } from "../core.js";
+import { type WorkerRef } from "../refs.js";
 import type { WorkerHandle } from "./worker.js";
 export type CustomIntegrationSpec = {
-    /** The worker serving the Custom Integration HTTP contract. */
-    worker: WorkerHandle;
+    /** The worker serving the Custom Integration HTTP contract — a handle or `workerRef(uuid)`. */
+    worker: WorkerHandle | WorkerRef;
 };
 export type CustomIntegrationHandle = {
     readonly slug: string;

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

@@ -1 +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"}
+{"version":3,"file":"customIntegration.d.ts","sourceRoot":"","sources":["../../../src/resources/customIntegration.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,KAAK,KAAK,EAAS,MAAM,YAAY,CAAC;AACrE,OAAO,EAAW,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,qBAAqB,GAAG;IAClC,+FAA+F;IAC/F,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;CAClC,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/model.d.ts

@@ -1,8 +1,9 @@
-import type { SegmentationTypes, StorageTypes } from "@cargo-ai/types";
+import type { ExpressionTypes, SegmentationTypes, StorageTypes } from "@cargo-ai/types";
 import { type Token } from "../core.js";
-import { type DatasetRef, type FolderRef, type ModelRef } from "../refs.js";
+import { type DatasetRef, type FolderRef, type ModelRef, type RelationshipRef } from "../refs.js";
 import type { ConnectorHandle } from "./connector.js";
 import type { FolderHandle } from "./folder.js";
+import type { RelationshipHandle } from "./relationship.js";
 export type ScheduleSpec = {
     type: "cron";
     cron: string;
@@ -10,11 +11,11 @@ export type ScheduleSpec = {
     type: "dbt";
     jobId: string;
 };
-export type UnificationColumnSpec = {
+export type ModelUnificationColumnSpec = {
     slug: string;
     reference: string;
 };
-export type UnificationParentSpec = {
+export type ModelUnificationParentSpec = {
     kind: "model";
     columnSlug: string;
     parent: ModelHandle | ModelRef;
@@ -23,20 +24,60 @@ export type UnificationParentSpec = {
     columnSlug: string;
     reference: string;
 };
-export type UnificationSpec = {
+export type ModelUnificationSpec = {
     source: "integration";
 } | {
     source: "custom";
     type: StorageTypes.ModelUnificationType;
-    uniqueColumns: UnificationColumnSpec[];
+    uniqueColumns: ModelUnificationColumnSpec[];
     /** Columns exposed on the unified model (defaults to all). */
     selectedColumnSlugs?: string[];
     /** Column carrying the event timestamp (event unification types only). */
     timeColumnSlug?: string;
-    parent?: UnificationParentSpec;
+    parent?: ModelUnificationParentSpec;
     /** Restrict which rows take part in unification (defaults to all rows). */
     filter?: SegmentationTypes.Filter;
 };
+export type ModelAdditionalColumnSpecBase = {
+    slug: string;
+    type: StorageTypes.ColumnType;
+    /** Display name. Defaults to the title-cased slug. */
+    label?: string;
+    description?: string;
+    properties?: string[];
+};
+/** A manually-filled column (values written per record, no formula). */
+export type ModelCustomColumnSpec = ModelAdditionalColumnSpecBase & {
+    kind: "custom";
+};
+/** A formula column evaluated per record. */
+export type ModelComputedColumnSpec = ModelAdditionalColumnSpecBase & {
+    kind: "computed";
+    expression: ExpressionTypes.Expression;
+    columnsUsed?: string[];
+};
+/** An aggregation over the records a relationship joins to. */
+export type ModelMetricColumnSpec = ModelAdditionalColumnSpecBase & {
+    kind: "metric";
+    relationship: RelationshipHandle | RelationshipRef;
+    aggregation: {
+        function: StorageTypes.AggregationFunction;
+        columnSlug: string;
+    };
+    filter?: SegmentationTypes.Filter;
+};
+/** A value copied from a matching record of another model. */
+export type ModelLookupColumnSpec = ModelAdditionalColumnSpecBase & {
+    kind: "lookup";
+    join: {
+        model: ModelHandle | ModelRef;
+        fromColumnSlug: string;
+        toColumnSlug: string;
+    };
+    extractColumnSlug: string;
+    filter?: SegmentationTypes.Filter;
+};
+export type ModelAdditionalColumnSpec = ModelCustomColumnSpec | ModelComputedColumnSpec | ModelMetricColumnSpec | ModelLookupColumnSpec;
 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>;
@@ -81,7 +122,14 @@ export type ModelSpec<S extends string = string, E extends LiteralUnion<Extracto
      * via an update once the model exists, so it also covers models the deploy
      * adopts.
      */
-    unification?: UnificationSpec;
+    unification?: ModelUnificationSpec;
+    /**
+     * Columns added on top of the extracted schema (custom / computed / metric /
+     * lookup). When declared, the list is authoritative: deploy creates missing
+     * columns, updates changed ones, and removes additional columns no longer
+     * listed. Omit to leave the model's live additional columns untouched.
+     */
+    additionalColumns?: ModelAdditionalColumnSpec[];
 };
 export type ModelHandle<Slug extends string = string, S extends string = string, E extends string = string> = {
     readonly slug: string;

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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"}