@cargo-ai/cdk 1.0.3 → 1.0.5

package/build/src/cli/version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/cli/version.ts"],"names":[],"mappings":"AAOA,wBAAgB,cAAc,IAAI,MAAM,CAkBvC"}

package/build/src/cli/version.js

@@ -0,0 +1,25 @@
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+// Read this package's version by walking up to the nearest `@cargo-ai/cdk`
+// package.json — a walk (not a fixed relative path) so it's independent of build
+// layout depth.
+export function packageVersion() {
+    let cursor = dirname(fileURLToPath(import.meta.url));
+    for (let i = 0; i < 8; i += 1) {
+        try {
+            const pkg = JSON.parse(readFileSync(join(cursor, "package.json"), "utf-8"));
+            if (pkg.name === "@cargo-ai/cdk" && typeof pkg.version === "string") {
+                return pkg.version;
+            }
+        }
+        catch {
+            // no package.json here (or unreadable) — keep walking up
+        }
+        const parent = dirname(cursor);
+        if (parent === cursor)
+            break;
+        cursor = parent;
+    }
+    return "0.0.0";
+}

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":"AAWA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AA4BrD,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CAkqBjD"}
+{"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;AA4BrD,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CA4qBjD"}

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

@@ -2,6 +2,8 @@
 // Each executor receives the token-resolved spec (real uuids in place of tokens)
 // and the prior state entry, and decides: prior uuid → update; else (connector/
 // model, which have addressable slugs) exists-by-slug → adopt; else create.
+// Explicit connector adopt (`adopt: true`) links the integration's default
+// connector first, falling back to a slug match.
 //
 // This is the only file that imports @cargo-ai/api. Workspace is implicit — the
 // authenticated client already sends the selected-workspace-uuid header.
@@ -61,15 +63,25 @@ export function liveExecutors(api) {
                 }
                 return out;
             }
-            const adopt = spec["adopt"] === true ||
+            const explicitAdopt = spec["adopt"] === true;
+            const adopt = explicitAdopt ||
                 (await api.connection.connector.existsBySlug({ slug })).exists;
             if (adopt) {
                 const { connectors } = await api.connection.connector.list({
                     integrationSlug,
                 });
-                const found = connectors.find((c) => c.slug === slug);
+                // Explicit adopt (the OAuth escape hatch) links whatever connector the
+                // workspace already treats as default for this integration, falling back
+                // to a slug match. Implicit adopt (a same-slug connector already exists)
+                // recovers that exact slot, so it stays a strict slug match.
+                const found = explicitAdopt
+                    ? (connectors.find((c) => c.isDefault === true) ??
+                        connectors.find((c) => c.slug === slug))
+                    : connectors.find((c) => c.slug === slug);
                 if (found === undefined) {
-                    throw new Error(`connector "${slug}" reported to exist but was not found`);
+                    throw new Error(explicitAdopt
+                        ? `no connector found to adopt for integration "${integrationSlug}"`
+                        : `connector "${slug}" reported to exist but was not found`);
                 }
                 // Mark as adopted — the CDK linked an existing connector it didn't
                 // create, so destroy must release it rather than delete it.

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

@@ -7,9 +7,11 @@ export declare function readBundle(root: string): SourceFile[];
 /**
  * Fail at define time (not after a multi-minute server build) when a worker/app
  * bundle is missing a file the hosting build requires. `label` names the kind in
- * the error message.
+ * the error message. When `anyOf` is provided, at least one of those files must
+ * also exist — used for entrypoints that may live at more than one path (e.g. a
+ * worker's `src/index.ts` TS source or a pre-built `index.js`).
  */
-export declare function assertBundleFiles(root: string, label: string, required: string[]): void;
+export declare function assertBundleFiles(root: string, label: string, required: string[], anyOf?: string[]): void;
 /** A content hash over the whole bundle — changes when any file changes. */
 export declare function bundleHash(root: string): string;
 //# sourceMappingURL=bundle.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/resources/bundle.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAmB3D,0EAA0E;AAC1E,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,CAOrD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAAE,GACjB,IAAI,CAYN;AAED,4EAA4E;AAC5E,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS/C"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/resources/bundle.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAmB3D,0EAA0E;AAC1E,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,CAOrD;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAAE,EAClB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,IAAI,CAqBN;AAED,4EAA4E;AAC5E,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS/C"}

package/build/src/resources/bundle.js

@@ -35,9 +35,11 @@ export function readBundle(root) {
 /**
  * Fail at define time (not after a multi-minute server build) when a worker/app
  * bundle is missing a file the hosting build requires. `label` names the kind in
- * the error message.
+ * the error message. When `anyOf` is provided, at least one of those files must
+ * also exist — used for entrypoints that may live at more than one path (e.g. a
+ * worker's `src/index.ts` TS source or a pre-built `index.js`).
  */
-export function assertBundleFiles(root, label, required) {
+export function assertBundleFiles(root, label, required, anyOf) {
     const base = isAbsolute(root) ? root : resolve(process.cwd(), root);
     if (!existsSync(base)) {
         throw new Error(`${label} code path not found: ${base}`);
@@ -47,6 +49,13 @@ export function assertBundleFiles(root, label, required) {
         throw new Error(`${label} bundle at "${root}" is missing required file(s): ${missing.join(", ")}. ` +
             `A ${label} bundle must contain ${required.join(", ")} at its root.`);
     }
+    if (anyOf !== undefined && anyOf.length > 0) {
+        const hasEntrypoint = anyOf.some((file) => existsSync(join(base, file)));
+        if (!hasEntrypoint) {
+            throw new Error(`${label} bundle at "${root}" is missing an entrypoint. ` +
+                `Expected one of: ${anyOf.join(", ")}.`);
+        }
+    }
 }
 /** A content hash over the whole bundle — changes when any file changes. */
 export function bundleHash(root) {

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

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

package/build/src/resources/connector.js

@@ -6,8 +6,9 @@
 // slug is known at define time, so it's a plain value on the handle.
 //
 // Two modes: create (config-based integrations, secrets via env) or adopt
-// (`adopt: true`) to link an already-authenticated connector by slug — the
-// escape hatch for OAuth integrations whose tokens can't live in a repo.
+// (`adopt: true`) to link an already-authenticated connector — the escape hatch
+// for OAuth integrations whose tokens can't live in a repo. Adopt links the
+// integration's default connector first, falling back to a slug match.
 import { register, resourceId, token } from "../core.js";
 export function defineConnector(slug, spec) {
     const id = resourceId("connector", slug);

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;AAWhD,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,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"}

package/build/src/resources/worker.js

@@ -5,17 +5,24 @@
 import { register, resourceId, token } from "../core.js";
 import { refUuid } from "../refs.js";
 import { assertBundleFiles, bundleHash } from "./bundle.js";
-// Files the hosting worker build requires at the bundle root: a built entry
-// (esbuild bundles it — no TS transpile), a manifest, and an npm-ci'able project.
-const WORKER_REQUIRED = [
+// Files the hosting worker build always requires at the bundle root: a manifest
+// and an npm-ci'able project. Like an app, a worker is uploaded as *source* and
+// built server-side — the hosting build runs `npm ci` then esbuilds the
+// entrypoint (esbuild transpiles TypeScript natively).
+const WORKER_REQUIRED = ["manifest.json", "package.json", "package-lock.json"];
+// The entrypoint may be authored in TypeScript (`src/index.ts`) — the same way
+// an app ships `src/main.tsx` and is built with Vite — or shipped pre-built as
+// `index.js`. At least one of these must exist; the hosting build resolves them
+// in this order.
+const WORKER_ENTRYPOINTS = [
+    "src/index.ts",
+    "src/index.js",
+    "index.ts",
     "index.js",
-    "manifest.json",
-    "package.json",
-    "package-lock.json",
 ];
 export function defineWorker(slug, spec) {
     const id = resourceId("worker", slug);
-    assertBundleFiles(spec.path, "worker", WORKER_REQUIRED);
+    assertBundleFiles(spec.path, "worker", WORKER_REQUIRED, WORKER_ENTRYPOINTS);
     register({
         id,
         kind: "worker",