@cargo-ai/cli 1.0.115 → 1.0.116

package/build/commands/ask/harness/instructions.js

@@ -1,4 +1,4 @@
-import { cdkProjectRoot } from "@cargo-ai/cdk/cli";
+import { findProjectDir } from "@cargo-ai/cdk/cli";
 import { buildReleaseInstructionAppendix } from "./release.js";
 const LOCAL_WORKING_COPY_INSTRUCTIONS = `You are working in the user's local working copy, not a sandbox. Prefer plan over deploy.
 
@@ -21,7 +21,7 @@ const LOCAL_CDK_RAILS_SKILL = {
  * Exported for tests.
  */
 export function localHarnessInstructions(dir, release) {
-    const rails = cdkProjectRoot(dir) !== undefined
+    const rails = findProjectDir(dir) !== undefined
         ? `${LOCAL_WORKING_COPY_INSTRUCTIONS}\n\n${CDK_RAILS_INSTRUCTIONS}`
         : LOCAL_WORKING_COPY_INSTRUCTIONS;
     if (release === undefined) {
@@ -36,7 +36,7 @@ export function localHarnessInstructions(dir, release) {
 }
 /** Exported for tests. */
 export function localHarnessSkills(dir) {
-    if (cdkProjectRoot(dir) !== undefined) {
+    if (findProjectDir(dir) !== undefined) {
         return [LOCAL_CDK_RAILS_SKILL];
     }
     return [];

package/build/commands/start/index.js

@@ -15,7 +15,7 @@
 // or a docs snippet, and every step leaves a valid machine behind: cancel after
 // signing in and you are signed in.
 import { spawnSync } from "node:child_process";
-import { askText, availableCodingAgents, cdkProjectRoot, COMPANY_CONTEXT_PATH, hasCompanyContext, installedCookbooks, isInteractive, launchBriefed, requireAnswer, selectOne, skillsInstalledFor, } from "@cargo-ai/cdk/cli";
+import { askText, availableCodingAgents, COMPANY_CONTEXT_PATH, findProjectDir, hasCompanyContext, installedCookbooks, isInteractive, launchBriefed, requireAnswer, selectOne, skillsInstalledFor, } from "@cargo-ai/cdk/cli";
 import { AGENT_SKILLS_NEXT_STEP } from "../../agentSkills.js";
 import { isSignedIn } from "../../setupIssues.js";
 import { parseBooleanOption } from "../../utils/booleanOption.js";
@@ -35,7 +35,7 @@ const EMAIL = "email";
  * Exported for tests; `go` is the only production caller.
  */
 export function resolveProjectContext(cwd) {
-    const root = cdkProjectRoot(cwd);
+    const root = findProjectDir(cwd);
     if (root === undefined) {
         return { kind: "none" };
     }

package/build/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
-import { availableCodingAgents, BRAND, canRunPalette, cdkProjectRoot, creditsLeftOf, declareSources, fetchSubscription, fetchWorkspaceName, formatWorkspaceSuffix, isInteractive, isUnpaidPlan, printSetupIssues, registerCommands as registerCdkCommands, runPalette, SessionExpiredError, } from "@cargo-ai/cdk/cli";
+import { availableCodingAgents, BRAND, canRunPalette, creditsLeftOf, declareSources, fetchSubscription, fetchWorkspaceName, findProjectDir, formatWorkspaceSuffix, isInteractive, isUnpaidPlan, printSetupIssues, registerCommands as registerCdkCommands, runPalette, SessionExpiredError, } from "@cargo-ai/cdk/cli";
 import { Command } from "commander";
 import { AGENT_SKILLS_HINT } from "./agentSkills.js";
 import { createApi } from "./api.js";
@@ -290,11 +290,11 @@ async function openPalette(startPath) {
         // Read once: a layout describing two different directories could offer to
         // deploy one and name the other.
         const cwd = process.cwd();
-        const root = cdkProjectRoot(cwd);
+        const root = findProjectDir(cwd);
         return buildPaletteLayout({
             signedIn: isSignedIn(),
             agents,
-            cdkProjectRoot: root,
+            projectDir: root,
             cwd,
             unpaidPlan,
         });

package/build/paletteLayout.d.ts

@@ -2,8 +2,8 @@ import { type CodingAgent, type PaletteLayout, type PinnedRow } from "@cargo-ai/
 export type PaletteLayoutInput = {
     signedIn: boolean;
     agents: readonly CodingAgent[];
-    /** The CDK repo root the palette is standing in, or undefined when none. */
-    cdkProjectRoot: string | undefined;
+    /** The project (`cargo.json`) folder the palette is in, or undefined when none. */
+    projectDir: string | undefined;
     /**
      * Where the palette is standing. The project rows are resolved by walking
      * *up* from here, so this is what says whether they point at the directory

package/build/paletteLayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paletteLayout.d.ts","sourceRoot":"","sources":["../src/paletteLayout.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,SAAS,EACf,MAAM,mBAAmB,CAAC;AA+E3B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IAC/B,4EAA4E;IAC5E,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,kBAAkB,GAAG,aAAa,CAS3E;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,kBAAkB,GAAG,SAAS,EAAE,CA+DjE"}
+{"version":3,"file":"paletteLayout.d.ts","sourceRoot":"","sources":["../src/paletteLayout.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,SAAS,EACf,MAAM,mBAAmB,CAAC;AA+E3B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IAC/B,mFAAmF;IACnF,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,kBAAkB,GAAG,aAAa,CAS3E;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,kBAAkB,GAAG,SAAS,EAAE,CA+DjE"}

package/build/paletteLayout.js

@@ -113,8 +113,8 @@ export function pinnedRows(input) {
     // for a workspace you have not built yet, and this one is open on screen.
     // Outside, there is no project to add to or deploy, so offer the tour and the
     // scaffold instead.
-    const projectRows = input.cdkProjectRoot !== undefined
-        ? cdkRows(input.cdkProjectRoot, input.cwd)
+    const projectRows = input.projectDir !== undefined
+        ? cdkRows(input.projectDir, input.cwd)
         : [
             {
                 value: DEMO,
@@ -163,9 +163,8 @@ function cdkRows(root, cwd) {
             value: ADD,
             label: "Add",
             hint: "a connector or a cookbook into this project",
-            // `--dir` because `project add` refuses a directory with no package.json,
-            // and the palette is as often open in `infra/` — where the scaffold's
-            // README sends people — as at the root.
+            // `--dir` pins the project the palette found, so the command adds to
+            // the one on screen whichever folder of it the palette is open in.
             argv: ["project", "add", "--dir", root],
         },
         {

package/build/utils/cdkState.d.ts

@@ -17,21 +17,18 @@ export declare function importModuleDefault(file: string, subject: string): Prom
 /**
  * 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/`.
+ * `rootDirectory` is measured from: the resources of the nearest `cargo.json`
+ * above the file, else above the cwd (a scratch file run from inside a
+ * project). With neither, the command stops, as `cdk plan` does: building from
+ * the file's own folder instead would load part of the project and bind the
+ * agent to a folder the deployed one does not clone, with nothing said.
  */
 export declare function cdkProjectDirFor(file: string): string;
 /**
  * Deep-resolve every `@cargo-ai/cdk` handle token in `value` to its real uuid
- * using the nearest cargo.state.json (searched from `file`'s directory upward,
- * then the cwd). `subject` names the thing under test in error messages (e.g. a
- * workflow or agent slug). A value with no tokens (literal-uuid refs, or a pure
+ * using the deploy state of the project `file` belongs to (`cdkProjectDirFor`).
+ * `subject` names the thing under test in error messages (e.g. a workflow or
+ * agent slug). A value with no tokens (literal-uuid refs, or a pure
  * body) is returned unchanged — no state needed. Fails with an actionable error
  * when state is missing or a referenced resource isn't deployed yet.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"cdkState.d.ts","sourceRoot":"","sources":["../../src/utils/cdkState.ts"],"names":[],"mappings":"AAoBA,wBAAgB,oBAAoB,CAAC,GAAG,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CASxE;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,CAAC,CAyBtD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOrD;AAaD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CA2CT"}
+{"version":3,"file":"cdkState.d.ts","sourceRoot":"","sources":["../../src/utils/cdkState.ts"],"names":[],"mappings":"AAoBA,wBAAgB,oBAAoB,CAAC,GAAG,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CASxE;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,CAAC,CAyBtD;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgBrD;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAkCT"}

package/build/utils/cdkState.js

@@ -5,10 +5,10 @@
 // `@cargo-ai/cdk` handle tokens the module references to their real uuids from
 // this project's deploy state — without deploying the module itself.
 import { existsSync } from "node:fs";
-import { dirname, isAbsolute, join, resolve } from "node:path";
+import { dirname, isAbsolute, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { dependenciesOf, readStateOffline, resolveTokens } from "@cargo-ai/cdk";
-import { cdkProjectDir, cdkProjectRoot } from "@cargo-ai/cdk/cli";
+import { cdkResourceDir, missingProjectFile } 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`
@@ -53,41 +53,30 @@ export async function importModuleDefault(file, subject) {
 /**
  * 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/`.
+ * `rootDirectory` is measured from: the resources of the nearest `cargo.json`
+ * above the file, else above the cwd (a scratch file run from inside a
+ * project). With neither, the command stops, as `cdk plan` does: building from
+ * the file's own folder instead would load part of the project and bind the
+ * agent to a folder the deployed one does not clone, with nothing said.
  */
 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;
-    for (;;) {
-        if (existsSync(join(dir, "cargo.state.json")))
-            return dir;
-        const parent = dirname(dir);
-        if (parent === dir)
-            return undefined;
-        dir = parent;
+    const fileProject = cdkResourceDir(dirname(absPath));
+    const project = fileProject !== undefined ? fileProject : cdkResourceDir(process.cwd());
+    if (project === undefined) {
+        const missing = missingProjectFile(dirname(absPath));
+        failWith(missing.message, {
+            code: ExitCodes.InvalidUsage,
+            extra: { run: missing.run },
+        });
     }
+    return project;
 }
 /**
  * Deep-resolve every `@cargo-ai/cdk` handle token in `value` to its real uuid
- * using the nearest cargo.state.json (searched from `file`'s directory upward,
- * then the cwd). `subject` names the thing under test in error messages (e.g. a
- * workflow or agent slug). A value with no tokens (literal-uuid refs, or a pure
+ * using the deploy state of the project `file` belongs to (`cdkProjectDirFor`).
+ * `subject` names the thing under test in error messages (e.g. a workflow or
+ * agent slug). A value with no tokens (literal-uuid refs, or a pure
  * body) is returned unchanged — no state needed. Fails with an actionable error
  * when state is missing or a referenced resource isn't deployed yet.
  */
@@ -95,20 +84,15 @@ export function resolveTokensFromState(value, file, subject) {
     const deps = dependenciesOf(value);
     if (deps.size === 0)
         return value;
-    const absPath = isAbsolute(file) ? file : resolve(process.cwd(), file);
-    const stateRoot = findStateRoot(dirname(absPath)) ?? findStateRoot(process.cwd());
-    if (stateRoot === undefined) {
-        failWith(`${subject} references ${String(deps.size)} deployed resource(s) ` +
-            `(${[...deps].join(", ")}), but no cargo.state.json was found near ` +
-            `${absPath} or the current directory. Deploy the resources first with ` +
-            "`cargo-ai project deploy`, or reference them by literal uuid " +
-            "(toolRef / agentRef / connectorRef).", { code: ExitCodes.NotFound });
-    }
+    // The project's own state file, beside its cargo.json, rather than the
+    // nearest cargo.state.json: in a repository of several projects that could
+    // be another project's.
+    const project = cdkProjectDirFor(file);
     // A project whose state lives in the workspace has a pointer here, not a
     // resource map, so the cache the last plan or deploy left behind is what
     // answers this offline. Resolving a handle is a read of what is already
     // deployed — worth a stale answer, not worth a round trip on every run.
-    const state = readStateOffline(stateRoot);
+    const state = readStateOffline(project);
     const outputs = new Map();
     if (state !== undefined) {
         for (const [id, entry] of Object.entries(state.resources)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.115",
+  "version": "1.0.116",
   "mcpName": "io.github.getcargohq/cargo",
   "private": false,
   "license": "UNLICENSED",
@@ -74,9 +74,9 @@
   "dependencies": {
     "@ai-sdk/harness": "^1.0.144",
     "@ai-sdk/harness-claude-code": "^1.0.148",
-    "@cargo-ai/api": "^1.0.95",
+    "@cargo-ai/api": "^1.0.96",
     "@cargo-ai/app-sdk": "^1.0.11",
-    "@cargo-ai/cdk": "^1.0.111",
+    "@cargo-ai/cdk": "^1.0.112",
     "@cargo-ai/types": "^1.0.96",
     "@cargo-ai/utils": "^1.0.32",
     "@cargo-ai/worker-sdk": "^1.0.20",