@cargo-ai/cdk 1.0.10 → 1.0.12

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2CzC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,GAAG,GAChB,IAAI,CA2lBN"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+CzC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,GAAG,GAChB,IAAI,CAuuBN"}

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

@@ -1,4 +1,4 @@
-import { acquireLock, appendAudit, apply, compile, destroy, detectDrift, emptyState, formatPlan, importResource, liveExecutors, liveReaders, loadResources, newRunId, plan, readState, reconcileDrift, removeResources, restoreSnapshot, snapshotState, writeState, } from "../../deploy/index.js";
+import { acquireLock, appendAudit, apply, compile, destroy, detectDrift, emptyState, formatPlan, importResource, liveExecutors, liveReaders, loadResources, newRunId, plan, pull, readState, reconcileDrift, removeResources, restoreSnapshot, SKIP_REASONS, snapshotState, SUPPORTED_KINDS, writeState, } from "../../deploy/index.js";
 import { getConfig } from "../auth.js";
 import { colors, confirm, ExitCodes, failWith, info, outputJson, startSpinner, success, } from "../io.js";
 // `plan / deploy / refresh / import / rollback / destroy` — the reconcile
@@ -301,6 +301,110 @@ export function registerDeployCommands(parent, getApi) {
         else
             success(`Imported ${id} → ${uuid} (${result.kind}).`);
     });
+    parent
+        .command("pull")
+        .description("Generate define* source from a live workspace and adopt it into " +
+        "cargo.state.json (so the next deploy is a no-op, not a duplicate-create).")
+        .option("--dir <path>", "Repo root to write into (default: cwd)")
+        .option("--types <kinds>", `Comma-separated kinds to pull (default: all supported — ${SUPPORTED_KINDS.join(", ")})`)
+        .option("--dry-run", "Print what would be generated without writing or adopting")
+        .option("--no-adopt", "Write files but skip state adoption (leaves a repo whose deploy would duplicate — advanced)")
+        .option("--force", "Steal the state lock held by another run")
+        .option("--json", "Output the result as JSON")
+        .action(async (opts) => {
+        if (opts.dir !== undefined)
+            process.chdir(opts.dir);
+        const root = ".";
+        let kinds;
+        if (opts.types !== undefined) {
+            const requested = opts.types.split(",").map((k) => k.trim());
+            const unknown = requested.filter((k) => !SUPPORTED_KINDS.includes(k));
+            if (unknown.length > 0) {
+                failWith(`Unsupported --types: ${unknown.join(", ")}. Supported: ${SUPPORTED_KINDS.join(", ")}.`, { code: ExitCodes.InvalidUsage });
+            }
+            kinds = requested;
+        }
+        const workspaceUuid = await resolveWorkspaceUuid(getApi);
+        const api = getApi();
+        const runId = newRunId();
+        if (opts.dryRun !== true) {
+            try {
+                acquireLock(root, "pull", opts.force === true);
+            }
+            catch (error) {
+                failWith(message(error), { code: ExitCodes.GenericError });
+            }
+            snapshotState(root); // enable `cdk rollback`
+        }
+        let result;
+        try {
+            result = await pull(root, api, workspaceUuid, {
+                kinds,
+                dryRun: opts.dryRun === true,
+                noAdopt: opts.adopt === false,
+            });
+        }
+        catch (error) {
+            appendAudit(root, {
+                runId,
+                at: new Date().toISOString(),
+                command: "pull",
+                workspaceUuid,
+                ok: false,
+                error: message(error),
+            });
+            failWith(`Pull failed: ${message(error)}`, {
+                code: ExitCodes.GenericError,
+                extra: { runId },
+            });
+        }
+        appendAudit(root, {
+            runId,
+            at: new Date().toISOString(),
+            command: "pull",
+            workspaceUuid,
+            ok: true,
+            summary: {
+                files: result.files.length,
+                adopted: result.adopted,
+                counts: result.counts,
+                skipped: result.skipped,
+            },
+        });
+        if (opts.json === true) {
+            // Binary assets would JSON.stringify as one numeric key per byte —
+            // report their path + size instead of the content.
+            outputJson({
+                ...result,
+                files: result.files.map((file) => "source" in file
+                    ? file
+                    : { path: file.path, byteLength: file.bytes.byteLength }),
+            });
+            return;
+        }
+        const summary = Object.entries(result.counts)
+            .map(([kind, n]) => `${String(n)} ${kind}`)
+            .join(", ");
+        const skipped = Object.entries(result.skipped)
+            .map(([kind, n]) => {
+            const reason = SKIP_REASONS[kind];
+            return `${String(n)} ${kind}${reason === undefined ? "" : ` (${reason})`}`;
+        })
+            .join(", ");
+        if (skipped.length > 0) {
+            info(`Skipped: ${skipped}.`);
+        }
+        if (result.envNames.length > 0) {
+            info(`${String(result.envNames.length)} env var(s) hold masked secrets` +
+                `${opts.dryRun === true ? "" : " (see .env.example)"}: ${result.envNames.join(", ")}.`);
+        }
+        if (opts.dryRun === true) {
+            success(`Would generate ${String(result.files.length)} file(s): ${summary || "nothing"}.`);
+        }
+        else {
+            success(`Generated ${String(result.files.length)} file(s) (${summary || "nothing"}); adopted ${String(result.adopted)} into state.`);
+        }
+    });
     parent
         .command("rollback")
         .description("Restore cargo.state.json from the snapshot taken before the last deploy/destroy/import.")

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

@@ -23,6 +23,13 @@ export declare function printJsonSchemaType(schema: unknown): string;
  * would not.
  */
 export declare function printJsonSchemaOutput(schema: unknown): string | undefined;
+/**
+ * The top-level property names of an object JSON Schema — e.g. the column
+ * slugs an extractor's `columns.schema` declares. `allOf`/`anyOf`/`oneOf`
+ * members contribute the union of their keys; anything that isn't
+ * object-shaped contributes none.
+ */
+export declare function jsonSchemaPropertyKeys(schema: unknown): string[];
 /**
  * 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":"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"}
+{"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;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,EAAE,CAGhE;AAgVD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAU5E"}

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

@@ -65,6 +65,29 @@ export function printJsonSchemaOutput(schema) {
         ? undefined
         : printed;
 }
+/**
+ * The top-level property names of an object JSON Schema — e.g. the column
+ * slugs an extractor's `columns.schema` declares. `allOf`/`anyOf`/`oneOf`
+ * members contribute the union of their keys; anything that isn't
+ * object-shaped contributes none.
+ */
+export function jsonSchemaPropertyKeys(schema) {
+    if (schema === null || typeof schema !== "object")
+        return [];
+    return [...collectPropertyKeys(schema)];
+}
+function collectPropertyKeys(schema) {
+    const keys = new Set(schema.properties === undefined ? [] : Object.keys(schema.properties));
+    for (const members of [schema.allOf, schema.anyOf, schema.oneOf]) {
+        if (members === undefined)
+            continue;
+        for (const member of members) {
+            for (const key of collectPropertyKeys(member))
+                keys.add(key);
+        }
+    }
+    return keys;
+}
 // 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).

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;AAsIzC,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,IAAI,CAkE7E"}
+{"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;AAoJzC,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,IAAI,CAoE7E"}

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, printJsonSchemaOutput, printJsonSchemaType, } from "./inputTypes.js";
+import { jsonSchemaPropertyKeys, 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`
@@ -69,7 +69,7 @@ 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.modelColumns.length)} model column set(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.extractorColumns.reduce((n, e) => n + e.extractors.length, 0))} extractor column set(s), ${String(payload.integrations.length)} integration(s), ${String(payload.native.length)} native action(s).`);
     });
 }
 async function fetchWorkspaceSurface(api) {
@@ -82,6 +82,7 @@ async function fetchWorkspaceSurface(api) {
     const connectorConfigs = collectConnectorConfigs(rawIntegrations);
     const extractorConfigs = collectExtractorConfigs(rawIntegrations);
     const extractorSlugs = collectExtractorSlugs(rawIntegrations);
+    const extractorColumns = collectExtractorColumns(rawIntegrations);
     const agentTriggerConfigs = collectAgentTriggerConfigs(rawIntegrations);
     const modelColumns = collectModelColumns(modelsResult.models);
     return {
@@ -90,6 +91,7 @@ async function fetchWorkspaceSurface(api) {
         connectorConfigs,
         extractorConfigs,
         extractorSlugs,
+        extractorColumns,
         agentTriggerConfigs,
         modelColumns,
     };
@@ -180,6 +182,33 @@ function collectExtractorSlugs(integrations) {
     out.sort((a, b) => a.integrationSlug.localeCompare(b.integrationSlug));
     return out;
 }
+// integrationSlug → the column slugs each of its extractors statically
+// declares (`extractor.columns.schema`, one property per column). Skips
+// extractors without a declared schema — most compute their columns from the
+// fetched records — and integrations left with none.
+function collectExtractorColumns(integrations) {
+    return integrations
+        .map((integration) => ({
+        integrationSlug: integration.slug,
+        extractors: collectDeclaredColumns(integration),
+    }))
+        .filter((entry) => entry.extractors.length > 0)
+        .sort((a, b) => a.integrationSlug.localeCompare(b.integrationSlug));
+}
+// One `{ slug, columns }` entry per extractor that declares a non-empty
+// `columns.schema`, extractors and columns both sorted.
+function collectDeclaredColumns(integration) {
+    const { extractors = {} } = integration;
+    return Object.entries(extractors)
+        .map(([slug, { columns }]) => ({
+        slug,
+        columns: columns === undefined
+            ? []
+            : jsonSchemaPropertyKeys(columns.schema).sort((a, b) => a.localeCompare(b)),
+    }))
+        .filter((extractor) => extractor.columns.length > 0)
+        .sort((a, b) => a.slug.localeCompare(b.slug));
+}
 // 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
@@ -298,6 +327,18 @@ function renderTypes(payload) {
         }
         cdkLines.push(`  }`);
     }
+    if (payload.extractorColumns.length > 0) {
+        cdkLines.push(`  interface ExtractorColumns {`);
+        for (const e of payload.extractorColumns) {
+            cdkLines.push(`    ${jsonKey(e.integrationSlug)}: {`);
+            for (const x of e.extractors) {
+                const union = x.columns.map((c) => JSON.stringify(c)).join(" | ");
+                cdkLines.push(`      ${jsonKey(x.slug)}: ${union};`);
+            }
+            cdkLines.push(`    };`);
+        }
+        cdkLines.push(`  }`);
+    }
     if (payload.modelColumns.length > 0) {
         cdkLines.push(`  interface ModelColumns {`);
         for (const m of payload.modelColumns) {

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

@@ -1 +1 @@
-{"version":3,"file":"executors.live.d.ts","sourceRoot":"","sources":["../../../src/deploy/executors.live.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AA4NrD,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CA8oBjD"}
+{"version":3,"file":"executors.live.d.ts","sourceRoot":"","sources":["../../../src/deploy/executors.live.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAiPrD,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CAgsBjD"}

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

@@ -182,6 +182,22 @@ async function readContextFile(api, path) {
         return undefined; // new file — read 404s
     }
 }
+// Does every field the code declares match the live value? Keys the code omits
+// (server-filled defaults like `columnsUsed`) are not compared, mirroring the
+// "include iff defined" rule — so an omitted optional never forces an update.
+function declaredMatchesLive(declared, live) {
+    if (Array.isArray(declared)) {
+        return (Array.isArray(live) &&
+            declared.length === live.length &&
+            declared.every((item, i) => declaredMatchesLive(item, live[i])));
+    }
+    if (typeof declared === "object" && declared !== null) {
+        if (typeof live !== "object" || live === null)
+            return false;
+        return Object.entries(declared).every(([key, value]) => value === undefined || declaredMatchesLive(value, live[key]));
+    }
+    return declared === live;
+}
 export function liveExecutors(api) {
     // Resolve the dataset uuid auto-created alongside a connector — needed when a
     // connector is ADOPTED (create returns it directly; list/adopt does not).
@@ -193,6 +209,31 @@ export function liveExecutors(api) {
         }
         return match.uuid;
     }
+    // Make a model's live additional columns match the declared list: create
+    // missing, update changed, remove undeclared. Only runs when the spec declares
+    // `additionalColumns` — an omitted field leaves live columns untouched.
+    // `liveColumns` skips the model fetch when the caller already knows them
+    // (a just-created model has none).
+    async function reconcileAdditionalColumns(modelUuid, declared, liveColumns) {
+        const live = liveColumns !== undefined
+            ? liveColumns
+            : (await api.storage.model.get(modelUuid)).model.additionalColumns;
+        const liveBySlug = new Map(live.map((column) => [column.slug, column]));
+        for (const column of declared) {
+            const live = liveBySlug.get(column.slug);
+            if (live === undefined) {
+                await api.storage.column.create({ modelUuid, column });
+                continue;
+            }
+            liveBySlug.delete(column.slug);
+            if (!declaredMatchesLive(column, live)) {
+                await api.storage.column.update({ modelUuid, column });
+            }
+        }
+        for (const slug of liveBySlug.keys()) {
+            await api.storage.column.remove({ modelUuid, columnSlug: slug });
+        }
+    }
     return {
         async connector(spec, prior) {
             const slug = str(spec["slug"]);
@@ -270,7 +311,13 @@ export function liveExecutors(api) {
             // `undefined` when the spec omits it, so the source's default (integration
             // mapping for connector models) is preserved.
             const unification = spec["unification"];
+            // Columns are reconciled BEFORE the unification update on every path, so a
+            // unification can reference a just-declared additional column.
+            const additionalColumns = spec["additionalColumns"];
             if (prior !== undefined) {
+                if (additionalColumns !== undefined) {
+                    await reconcileAdditionalColumns(prior.uuid, additionalColumns);
+                }
                 // No extractorSlug — a model's extractor is immutable post-create
                 // (it's not part of UpdateModelPayload).
                 await api.storage.model.update({
@@ -294,8 +341,12 @@ export function liveExecutors(api) {
                 if (found === undefined) {
                     throw new Error(`model "${slug}" reported to exist but was not found`);
                 }
-                // Adopted an existing model — apply the declared unification (create
-                // skips it), then release on destroy rather than delete.
+                // Adopted an existing model — reconcile columns and apply the declared
+                // unification (create skips it), then release on destroy rather than
+                // delete.
+                if (additionalColumns !== undefined) {
+                    await reconcileAdditionalColumns(found.uuid, additionalColumns);
+                }
                 if (unification !== undefined) {
                     await api.storage.model.update({ uuid: found.uuid, unification });
                 }
@@ -311,6 +362,9 @@ export function liveExecutors(api) {
                 schedule,
                 folderUuid: optStr(spec["folderUuid"]),
             });
+            if (additionalColumns !== undefined) {
+                await reconcileAdditionalColumns(created.model.uuid, additionalColumns, []);
+            }
             // CreateModelPayload has no unification field, so a declared unification
             // is applied with a follow-up update once the model exists.
             if (unification !== undefined) {

package/build/src/deploy/import.d.ts

@@ -10,4 +10,16 @@ export type ImportResult = {
  * the live resource is reachable, then writes/overwrites its state entry.
  */
 export declare function importResource(root: string, api: Api, workspaceUuid: string, id: string, uuid: string, nodes?: readonly ResourceNode[]): Promise<ImportResult>;
+export type AdoptTarget = {
+    id: string;
+    uuid: string;
+};
+/**
+ * Batch import for `cdk pull` adoption: the same per-resource contract as
+ * importResource, but the graph is compiled once, the workspace listings
+ * importOutputs consults are fetched at most once, resources are processed
+ * concurrently, and the state file is written once at the end — so adoption is
+ * atomic (a mid-batch failure commits nothing) instead of N read/fsync cycles.
+ */
+export declare function adoptResources(root: string, api: Api, workspaceUuid: string, targets: readonly AdoptTarget[], nodes: readonly ResourceNode[]): Promise<number>;
 //# sourceMappingURL=import.d.ts.map

package/build/src/deploy/import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../src/deploy/import.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM7D,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AA2CF;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EAGZ,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,GAC9B,OAAO,CAAC,YAAY,CAAC,CAoCvB"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../src/deploy/import.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM7D,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAmFF;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EAGZ,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,GAC9B,OAAO,CAAC,YAAY,CAAC,CAuBvB;AAsCD,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAiBvD;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,SAAS,WAAW,EAAE,EAC/B,KAAK,EAAE,SAAS,YAAY,EAAE,GAC7B,OAAO,CAAC,MAAM,CAAC,CAyBjB"}

package/build/src/deploy/import.js

@@ -10,26 +10,53 @@ import { compile } from "./compile.js";
 import { loadResources } from "./load.js";
 import { liveReaders } from "./readers.live.js";
 import { emptyState, readState, writeState } from "./state.js";
+function workspaceListings(api) {
+    const cache = {};
+    const lazy = (key, fetch) => {
+        return () => {
+            const hit = cache[key];
+            if (hit !== undefined)
+                return hit;
+            const miss = fetch();
+            cache[key] = miss;
+            return miss;
+        };
+    };
+    return {
+        datasets: lazy("datasets", async () => {
+            const { datasets } = await api.storage.dataset.all();
+            return datasets;
+        }),
+        plays: lazy("plays", async () => {
+            const { plays } = await api.orchestration.play.list();
+            return plays;
+        }),
+        tools: lazy("tools", async () => {
+            const { tools } = await api.orchestration.tool.all();
+            return tools;
+        }),
+    };
+}
 // Reconstruct the outputs an apply would have produced for this kind, so tokens
 // its dependents reference (connector.datasetUuid, tool/play.workflowUuid,
 // worker/app.url) still resolve.
-async function importOutputs(api, kind, uuid) {
+async function importOutputs(api, kind, uuid, listings) {
     const outputs = { uuid };
     if (kind === "connector") {
-        const { datasets } = await api.storage.dataset.all();
+        const datasets = await listings.datasets();
         const match = datasets.find((d) => d["kind"] === "connector" && d["connectorUuid"] === uuid);
         if (match !== undefined)
             outputs["datasetUuid"] = match["uuid"];
     }
     else if (kind === "play") {
-        const { plays } = await api.orchestration.play.list();
+        const plays = await listings.plays();
         const play = plays.find((p) => p["uuid"] === uuid);
         const wf = play === undefined ? undefined : play["workflowUuid"];
         if (typeof wf === "string")
             outputs["workflowUuid"] = wf;
     }
     else if (kind === "tool") {
-        const { tools } = await api.orchestration.tool.all();
+        const tools = await listings.tools();
         const tool = tools.find((t) => t["uuid"] === uuid);
         const wf = tool === undefined ? undefined : tool["workflowUuid"];
         if (typeof wf === "string")
@@ -64,11 +91,20 @@ nodes) {
         throw new Error(`no resource "${id}" found in code — import targets a code resource id like "agent:sdr".`);
     }
     const kind = entry.kind;
-    const outputs = await importOutputs(api, kind, uuid);
+    const stateEntry = await buildStateEntry(api, kind, uuid, entry.hash, workspaceListings(api));
+    const state = readValidatedState(root, workspaceUuid);
+    state.resources[id] = stateEntry;
+    writeState(root, state);
+    return { kind, outputs: stateEntry.outputs };
+}
+// Outputs + adopted marker + live existence check + drift baseline — the
+// per-resource half of an import, shared by importResource and adoptResources.
+async function buildStateEntry(api, kind, uuid, hash, listings) {
+    const outputs = await importOutputs(api, kind, uuid, listings);
     // Imported resources are treated as adopted: a later `destroy` releases them
     // (drops from state) rather than deleting infra the CDK didn't create.
     outputs["adopted"] = "true";
-    const stateEntry = { hash: entry.hash, uuid, outputs };
+    const stateEntry = { hash, uuid, outputs };
     // Confirm it's actually there (and capture a drift baseline).
     const live = await liveReaders(api)[kind](stateEntry);
     if (live.exists === false) {
@@ -76,12 +112,46 @@ nodes) {
     }
     if (live.fingerprint !== undefined)
         stateEntry.live = live.fingerprint;
+    return stateEntry;
+}
+function readValidatedState(root, workspaceUuid) {
     const prior = readState(root);
-    const state = prior !== undefined ? prior : emptyState(workspaceUuid);
     if (prior !== undefined && prior.workspaceUuid !== workspaceUuid) {
         throw new Error(`cargo.state.json belongs to workspace ${prior.workspaceUuid}, not the selected ${workspaceUuid}.`);
     }
-    state.resources[id] = stateEntry;
+    return prior !== undefined ? prior : emptyState(workspaceUuid);
+}
+// Concurrency-capped map — adoption fans out 1-3 API calls per resource, so a
+// full-workspace pull stays polite to the backend.
+async function inChunks(items, size, fn) {
+    const out = [];
+    for (let index = 0; index < items.length; index += size) {
+        const chunk = items.slice(index, index + size);
+        out.push(...(await Promise.all(chunk.map(fn))));
+    }
+    return out;
+}
+/**
+ * Batch import for `cdk pull` adoption: the same per-resource contract as
+ * importResource, but the graph is compiled once, the workspace listings
+ * importOutputs consults are fetched at most once, resources are processed
+ * concurrently, and the state file is written once at the end — so adoption is
+ * atomic (a mid-batch failure commits nothing) instead of N read/fsync cycles.
+ */
+export async function adoptResources(root, api, workspaceUuid, targets, nodes) {
+    const plan = new Map(compile({ nodes }).plan.map((entry) => [entry.id, entry]));
+    const listings = workspaceListings(api);
+    const entries = await inChunks(targets, 8, async ({ id, uuid }) => {
+        const entry = plan.get(id);
+        if (entry === undefined) {
+            throw new Error(`no resource "${id}" found in the generated code.`);
+        }
+        const stateEntry = await buildStateEntry(api, entry.kind, uuid, entry.hash, listings);
+        return [id, stateEntry];
+    });
+    const state = readValidatedState(root, workspaceUuid);
+    for (const [id, stateEntry] of entries)
+        state.resources[id] = stateEntry;
     writeState(root, state);
-    return { kind, outputs };
+    return entries.length;
 }

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

@@ -15,6 +15,8 @@ export { loadResources } from "./load.js";
 export type { Lock } from "./lock.js";
 export { acquireLock } from "./lock.js";
 export { formatPlan } from "./plan.js";
+export type { PullOptions, PullResult } from "./pull/index.js";
+export { pull, SKIP_REASONS, SUPPORTED_KINDS } from "./pull/index.js";
 export { liveReaders } from "./readers.live.js";
 export type { DriftEntry, DriftStatus, LiveRead, LiveReader, LiveReaders, } from "./refresh.js";
 export { detectDrift, fingerprint, reconcileDrift } from "./refresh.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/deploy/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAW,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAIvE,YAAY,EACV,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,GACR,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnD,YAAY,EACV,UAAU,EACV,YAAY,EACZ,aAAa,EACb,SAAS,EACT,KAAK,EACL,UAAU,EACV,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,YAAY,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,YAAY,EACV,UAAU,EACV,WAAW,EACX,QAAQ,EACR,UAAU,EACV,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EACL,UAAU,EACV,SAAS,EACT,eAAe,EACf,aAAa,EACb,UAAU,GACX,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAG/D;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,MAAM,CAC1B,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,YAAY,CAAC,CAyBvB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/deploy/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAW,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAIvE,YAAY,EACV,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,GACR,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnD,YAAY,EACV,UAAU,EACV,YAAY,EACZ,aAAa,EACb,SAAS,EACT,KAAK,EACL,UAAU,EACV,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,YAAY,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,YAAY,EACV,UAAU,EACV,WAAW,EACX,QAAQ,EACR,UAAU,EACV,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EACL,UAAU,EACV,SAAS,EACT,eAAe,EACf,aAAa,EACb,UAAU,GACX,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAG/D;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,MAAM,CAC1B,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,YAAY,CAAC,CAyBvB"}

package/build/src/deploy/index.js

@@ -13,6 +13,7 @@ export { importResource } from "./import.js";
 export { loadResources } from "./load.js";
 export { acquireLock } from "./lock.js";
 export { formatPlan } from "./plan.js";
+export { pull, SKIP_REASONS, SUPPORTED_KINDS } from "./pull/index.js";
 export { liveReaders } from "./readers.live.js";
 export { detectDrift, fingerprint, reconcileDrift } from "./refresh.js";
 export { emptyState, readState, restoreSnapshot, snapshotState, writeState, } from "./state.js";

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

@@ -0,0 +1,8 @@
+import type { Api } from "@cargo-ai/api";
+import type { ResourceKind } from "../../core.js";
+export type EnumeratedRow = {
+    readonly kind: ResourceKind;
+    readonly row: Record<string, unknown>;
+};
+export declare function enumerateWorkspace(api: Api, kinds: readonly ResourceKind[]): Promise<EnumeratedRow[]>;
+//# sourceMappingURL=enumerate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"enumerate.d.ts","sourceRoot":"","sources":["../../../../src/deploy/pull/enumerate.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAKlD,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAI5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC,CAAC;AAqCF,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,SAAS,YAAY,EAAE,GAC7B,OAAO,CAAC,aAAa,EAAE,CAAC,CAkQ1B"}