@cargo-ai/cli 1.0.82 → 1.0.83

package/build/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
-import { availableCodingAgents, BRAND, canRunPalette, cdkProjectDir, cdkProjectRoot, creditsLeftOf, declareSources, fetchSubscription, fetchWorkspaceName, formatWorkspaceSuffix, isInteractive, isUnpaidPlan, printSetupIssues, registerCommands as registerCdkCommands, runPalette, SessionExpiredError, } from "@cargo-ai/cdk/cli";
+import { availableCodingAgents, BRAND, canRunPalette, cdkProjectRoot, creditsLeftOf, declareSources, fetchSubscription, fetchWorkspaceName, 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";
@@ -289,11 +289,6 @@ async function openPalette(startPath) {
             signedIn: isSignedIn(),
             agents,
             cdkProjectRoot: root,
-            // Resolved from the root, never the cwd. `cdkProjectDir` looks *down* for
-            // `infra/` rather than walking up, and a scaffolded `infra/` carries no
-            // package.json to be recognised by — so asked from inside one it answers
-            // undefined, and `deploy` would fall back to the root it must not use.
-            cdkProjectDir: root === undefined ? undefined : cdkProjectDir(root),
             cwd,
             unpaidPlan,
         });

package/build/paletteLayout.d.ts

@@ -4,16 +4,6 @@ export type PaletteLayoutInput = {
     agents: readonly CodingAgent[];
     /** The CDK repo root the palette is standing in, or undefined when none. */
     cdkProjectRoot: string | undefined;
-    /**
-     * The directory holding the CDK project — `infra/` for a scaffolded repo, or
-     * the same as `cdkProjectRoot` for a hand-rolled layout. Commands that load
-     * the resource tree and state (`cdk deploy`) need this, not the repo root.
-     *
-     * Resolve it from `cdkProjectRoot` rather than from `cwd`: `cdkProjectDir`
-     * looks down for `infra/` instead of walking up, so from inside one it
-     * answers undefined.
-     */
-    cdkProjectDir: 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;AA8E3B,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;;;;;;;;OAQG;IACH,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC;;;;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;AA8E3B,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"}

package/build/paletteLayout.js

@@ -7,7 +7,7 @@
 // most often wants, a coding agent briefed on their workspace, two screens
 // down behind `start`. This is the missing opinion, kept in one place and as
 // data, so it can be read and tested rather than inferred from a menu.
-import { basename, relative, resolve } from "node:path";
+import { basename, resolve } from "node:path";
 import { ASK, } from "@cargo-ai/cdk/cli";
 /** Pinned row values. The leading space keeps them out of the command namespace. */
 const SIGN_IN = " sign-in";
@@ -113,7 +113,7 @@ export function pinnedRows(input) {
     // 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.cdkProjectDir, input.cwd)
+        ? cdkRows(input.cdkProjectRoot, input.cwd)
         : [
             {
                 value: DEMO,
@@ -156,11 +156,7 @@ export function pinnedRows(input) {
     ];
 }
 /** The two rows for a palette standing in the CDK project rooted at `root`. */
-function cdkRows(root, projectDir, cwd) {
-    // `cdk deploy` loads the resource tree and `cargo.state.json` from the
-    // directory it runs in, so it needs the CDK project — `infra/` in a
-    // scaffolded repo — where `add` takes the root and resolves that itself.
-    const target = projectDir !== undefined ? projectDir : root;
+function cdkRows(root, cwd) {
     return [
         {
             value: ADD,
@@ -174,27 +170,17 @@ function cdkRows(root, projectDir, cwd) {
         {
             value: DEPLOY,
             label: "Deploy",
-            // Name the directory whenever it is not the one on screen. The project is
-            // found by walking *up*, so this row can target a project the cwd gives no
-            // sign of — and it mutates a live workspace, which in a repo holding more
-            // than one project is worth saying out loud before it is picked.
-            hint: resolve(target) === resolve(cwd)
+            // Name the project whenever it is not the directory on screen. The
+            // project is found by walking *up*, so this row can target a repo the
+            // cwd gives no sign of — and it mutates a live workspace, which in a
+            // tree holding more than one project is worth saying out loud before it
+            // is picked. `deploy` walks into `infra/` itself.
+            hint: resolve(root) === resolve(cwd)
                 ? "this project to your workspace"
-                : `${projectName(target, root)}/ to your workspace`,
+                : `${basename(root)}/ to your workspace`,
             // No `--yes`: `deploy` shows the plan and asks, which is the point of
             // reaching it from a menu.
-            argv: ["cdk", "deploy", "--dir", target],
+            argv: ["cdk", "deploy", "--dir", root],
         },
     ];
 }
-/**
- * A short name for the CDK project directory: where it sits inside the repo
- * (`infra`), or the repo's own directory name when it *is* the repo root.
- *
- * `relative` answers "" for two equal paths — the hand-rolled layout that keeps
- * its resources at the root — and "" is not a name anybody can read.
- */
-function projectName(dir, root) {
-    const within = relative(root, dir);
-    return within === "" ? basename(root) : within;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.82",
+  "version": "1.0.83",
   "private": false,
   "license": "UNLICENSED",
   "homepage": "https://getcargo.ai",
@@ -68,7 +68,7 @@
     "@ai-sdk/harness-claude-code": "^1.0.99",
     "@cargo-ai/api": "^1.0.75",
     "@cargo-ai/app-sdk": "^1.0.10",
-    "@cargo-ai/cdk": "^1.0.66",
+    "@cargo-ai/cdk": "^1.0.67",
     "@cargo-ai/types": "^1.0.72",
     "@cargo-ai/utils": "^1.0.28",
     "@cargo-ai/worker-sdk": "^1.0.17",