@cargo-ai/cli 1.0.77 → 1.0.80

package/build/utils/cdkState.js

@@ -8,6 +8,7 @@ import { existsSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { dependenciesOf, readState, resolveTokens } from "@cargo-ai/cdk";
+import { cdkProjectDir, cdkProjectRoot } from "@cargo-ai/cdk/cli";
 import { ExitCodes, failWith } from "../commands/runHandler.js";
 // Peel the extra interop layer tsx adds when a TS source is transpiled to CJS:
 // the ESM namespace's `default` is then the CJS `module.exports`
@@ -27,10 +28,10 @@ export function resolveDefaultExport(mod) {
  * Load a `.ts`/`.js` module through the tsx ESM loader (so `.ts` sources and
  * their imports of `@cargo-ai/*` / `zod` are transpiled on the fly) and return
  * its resolved default export. Shared by both `--file` loaders: the workflow
- * loader validates the result as a compiled workflow; the agent loader reads the
- * agent back out of the CDK registry that loading populated (so it must
- * `resetRegistry()` BEFORE calling this). `subject` labels the file in errors
- * (e.g. "Workflow", "Agent").
+ * loader validates the result as a compiled workflow; the agent loader reads
+ * the exported handle to learn which agent the file declares, then loads the
+ * whole project for the nodes. `subject` labels the file in errors (e.g.
+ * "Workflow", "Agent").
  */
 export async function importModuleDefault(file, subject) {
     const absPath = isAbsolute(file) ? file : resolve(process.cwd(), file);
@@ -49,6 +50,27 @@ export async function importModuleDefault(file, subject) {
     }
     return { absPath, defaultExport: resolveDefaultExport(mod) };
 }
+/**
+ * The CDK project directory a `--file` module belongs to — the directory `cdk
+ * plan` and `cdk deploy` run in, which is what a harness agent's inferred
+ * `rootDirectory` is measured from. Walk up to the repo, then back down to the
+ * project (`infra/` in a scaffolded repo); a file in no recognisable project
+ * answers its own directory.
+ *
+ * Deliberately NOT the nearest cargo.state.json. That file's position is
+ * incidental — a repo deployed before `cdk deploy` ran from the project has one
+ * at the repo root — so measuring from it would report no `rootDirectory` and
+ * clone the repo root, while the deployed agent clones `infra/`.
+ */
+export function cdkProjectDirFor(file) {
+    const absPath = isAbsolute(file) ? file : resolve(process.cwd(), file);
+    const fileDir = dirname(absPath);
+    const repoRoot = cdkProjectRoot(fileDir);
+    if (repoRoot === undefined)
+        return fileDir;
+    const project = cdkProjectDir(repoRoot);
+    return project === undefined ? repoRoot : project;
+}
 // Walk up from `startDir` looking for a directory that holds cargo.state.json.
 function findStateRoot(startDir) {
     let dir = startDir;

package/build/utils/loadCompiledAgent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadCompiledAgent.d.ts","sourceRoot":"","sources":["../../src/utils/loadCompiledAgent.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,aAAa,EAInB,MAAM,eAAe,CAAC;AAKvB,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAqCnD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA6C5E;AAQD,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,MAAM,GACX,aAAa,CAQf"}
+{"version":3,"file":"loadCompiledAgent.d.ts","sourceRoot":"","sources":["../../src/utils/loadCompiledAgent.ts"],"names":[],"mappings":"AAUA,OAAO,EAGL,KAAK,aAAa,EAKnB,MAAM,eAAe,CAAC;AAUvB,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AA8CnD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAkF5E;AAQD,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,MAAM,GACX,aAAa,CAQf"}

package/build/utils/loadCompiledAgent.js

@@ -7,15 +7,27 @@
 // (`compileAgent`); `resolveCompiledAgentFromState` then resolves the
 // `@cargo-ai/cdk` handle tokens it still carries to real uuids from
 // cargo.state.json — a faithful test of the agent's core chat behaviour.
-import { compileAgent, resetRegistry, resources, } from "@cargo-ai/cdk";
+import { bindHarnessRepositories, compileAgent, loadResourcesCollecting, resetRegistry, } from "@cargo-ai/cdk";
+import { inDirectory } from "@cargo-ai/cdk/cli";
 import { ExitCodes, failWith } from "../commands/runHandler.js";
-import { importModuleDefault, resolveTokensFromState } from "./cdkState.js";
+import { cdkProjectDirFor, importModuleDefault, resolveTokensFromState, } from "./cdkState.js";
 function isAgentHandle(value) {
     if (value === null || typeof value !== "object")
         return false;
     const v = value;
     return v["resource"] === "agent" && typeof v["slug"] === "string";
 }
+// Files the project load could not import, appended to a failure that a missing
+// resource explains — the connector this agent needs may be in one of them.
+function loadErrorContext(errors) {
+    if (errors.length === 0)
+        return [];
+    return [
+        "",
+        "Some project files failed to load, which may be why:",
+        ...errors.map((error) => `  ${error.file}: ${error.message}`),
+    ];
+}
 // Agent config an inline message can't express — rejected up front (rather than
 // silently dropped) so a test run is never quietly less than the deployed agent.
 // Each entry: the spec field, and whether the stored value means "set".
@@ -34,24 +46,52 @@ const UNSUPPORTED = [
     },
 ];
 // Load a `defineAgent` module and lower it to a `CompiledAgent` (tokens still
-// embedded — resolve them with `resolveCompiledAgentFromState`). `resetRegistry`
-// first so a stale registry (e.g. a prior load in the same process) can't leak
-// resources into this one.
+// embedded — resolve them with `resolveCompiledAgentFromState`).
 export async function loadCompiledAgent(file) {
-    // Reset BEFORE loading: the import runs the module's `define*` calls, which
-    // register into the shared CDK registry we read back below. A stale registry
-    // (e.g. a prior load in the same process) would otherwise leak in.
+    // The import below answers only WHICH agent this file exports; the resources
+    // come from the project load further down. Reset first anyway, so a prior
+    // load in the same process can't leak into either.
     resetRegistry();
     const { absPath, defaultExport: handle } = await importModuleDefault(file, "Agent");
     if (!isAgentHandle(handle)) {
         failWith("Agent module must `export default` an agent handle (the value returned by defineAgent()).", { code: ExitCodes.InvalidUsage });
     }
+    // Re-load the WHOLE project, not just this file. The harness binding needs
+    // the project's GitHub connector to bind an omitted `repository`, and a
+    // scaffolded repo declares that connector in its own file — invisible to a
+    // single-module import, which would fail as though the project declared none.
+    //
+    // Safe to load after the import above: the loader resets the registry and
+    // cache-busts every entry file (`?cdk=<pass>`), so this file's `define*`
+    // calls run again and re-register. Errors are collected rather than thrown so
+    // one unrelated broken file can't block a test chat.
+    //
+    // Load standing IN the project: resources that resolve paths from cwd — the
+    // scaffold's `defineContext({ dir: "../context" })` — fail when invoked from
+    // the repo root.
+    const projectDir = cdkProjectDirFor(absPath);
+    const project = await inDirectory(projectDir, () => loadResourcesCollecting(projectDir));
+    // Fill an omitted harness `repository` from the checkout, the same pass
+    // `cdk plan`/`deploy` run — so a test message clones what the deployed agent
+    // would, instead of silently getting an empty sandbox.
+    const bound = await bindHarnessRepositories(project.nodes, {
+        dir: projectDir,
+    });
+    if (bound.errors.length > 0) {
+        failWith([
+            ...bound.errors.map((error) => `${error.id}: ${error.message}`),
+            ...loadErrorContext(project.errors),
+        ].join("\n"), { code: ExitCodes.InvalidUsage });
+    }
     // A file can register several agents (its sub-agents), so pick THE one it
     // exports by slug rather than assuming a single registration.
-    const node = resources().find((n) => n.kind === "agent" && n.slug === handle.slug);
+    const node = bound.nodes.find((n) => n.kind === "agent" && n.slug === handle.slug);
     if (node === undefined) {
-        failWith(`Agent "${handle.slug}" was not registered by ${absPath}. Ensure the ` +
-            "module's default export is the handle returned by defineAgent().", { code: ExitCodes.GenericError });
+        failWith([
+            `Agent "${handle.slug}" was not registered by ${absPath}. Ensure the ` +
+                "module's default export is the handle returned by defineAgent().",
+            ...loadErrorContext(project.errors),
+        ].join("\n"), { code: ExitCodes.GenericError });
     }
     const setUnsupported = UNSUPPORTED.filter((u) => u.isSet(node.spec[u.field])).map((u) => u.label);
     if (setUnsupported.length > 0) {

package/build/utils/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/utils/prompt.ts"],"names":[],"mappings":";AAIA,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC;AAMF,wBAAgB,eAAe,IAAI,WAAW,GAAG,SAAS,CAYzD;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,MAAM,CAAC,cAAc,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAe7B"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/utils/prompt.ts"],"names":[],"mappings":";AAIA,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC;AAMF,wBAAgB,eAAe,IAAI,WAAW,GAAG,SAAS,CAYzD;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,MAAM,CAAC,cAAc,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkB7B"}

package/build/utils/prompt.js

@@ -23,7 +23,10 @@ export function openPromptInput() {
  * stderr so that piping stdout to `jq` keeps working.
  */
 export async function askQuestion(input, question) {
-    const rl = readline.createInterface({ input, output: process.stderr });
+    const rl = readline.createInterface({
+        input,
+        output: process.stderr,
+    });
     try {
         const answer = await rl.question(question);
         const trimmed = answer.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.77",
+  "version": "1.0.80",
   "private": false,
   "license": "UNLICENSED",
   "homepage": "https://getcargo.ai",
@@ -64,13 +64,17 @@
     "format:check": "prettier --check ."
   },
   "dependencies": {
-    "@cargo-ai/api": "^1.0.71",
+    "@ai-sdk/harness": "^1.0.95",
+    "@ai-sdk/harness-claude-code": "^1.0.99",
+    "@cargo-ai/api": "^1.0.75",
     "@cargo-ai/app-sdk": "^1.0.9",
-    "@cargo-ai/cdk": "^1.0.61",
-    "@cargo-ai/types": "^1.0.68",
+    "@cargo-ai/cdk": "^1.0.65",
+    "@cargo-ai/types": "^1.0.72",
     "@cargo-ai/utils": "^1.0.28",
     "@cargo-ai/worker-sdk": "^1.0.17",
     "@modelcontextprotocol/sdk": "1.29.0",
+    "ai": "^7.0.84",
+    "ai-sdk-sandbox-local": "^0.1.2",
     "commander": "^12.1.0",
     "tsx": "^4.19.2",
     "undici": "^7.29.0"