@cargo-ai/cli 1.0.145 → 1.0.146

package/build/commands/auth/workspace.d.ts

@@ -15,6 +15,23 @@ export declare function resolveWorkspace(opts: {
     explicitUuid: string | undefined;
     explicitName: string | undefined;
 }): Promise<WorkspaceResolution>;
+/**
+ * Without a terminal nothing can be picked, so the error itself has to carry
+ * the choice: every workspace with its uuid, and the flag that selects one.
+ * The sign-in is not saved, and an emailed code works once, so the command is
+ * re-run from the start.
+ *
+ * Exported for tests; `resolveWorkspace` is the only production caller.
+ */
+export declare function describeWorkspaceChoice(workspaces: readonly Pick<WorkspaceManagement.Workspace, "uuid" | "name">[]): string;
+/**
+ * The free plan caps how many workspaces one person owns, so naming a new one
+ * can be refused. The fix is to use a workspace that already exists, which the
+ * message lists with the flag that picks it.
+ *
+ * Exported for tests; `createWorkspace` is the only production caller.
+ */
+export declare function describeFreeWorkspaceLimit(name: string, workspaces: readonly Pick<WorkspaceManagement.Workspace, "uuid" | "name">[]): string;
 export declare function findWorkspaceByName(workspaces: readonly WorkspaceManagement.Workspace[], name: string): ResolvedWorkspace | undefined;
 /**
  * The workspace the sign-in Action just created, when it is the account's only

package/build/commands/auth/workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/workspace.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGzD,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,cAAc,CAAC;AAUnD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,mFAAmF;IACnF,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAuBF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwH/B;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,SAAS,mBAAmB,CAAC,SAAS,EAAE,EACpD,IAAI,EAAE,MAAM,GACX,iBAAiB,GAAG,SAAS,CAY/B;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,SAAS,IAAI,CACvB,mBAAmB,CAAC,SAAS,EAC7B,MAAM,GAAG,MAAM,GAAG,WAAW,CAC9B,EAAE,EACH,GAAG,EAAE,IAAI,GACR,iBAAiB,GAAG,SAAS,CAkB/B;AAsHD;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAQ7D"}
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/workspace.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGzD,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,cAAc,CAAC;AAUnD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,mFAAmF;IACnF,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAuBF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwH/B;AAUD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,SAAS,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,GAC1E,MAAM,CASR;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,SAAS,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,GAC1E,MAAM,CAsBR;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,SAAS,mBAAmB,CAAC,SAAS,EAAE,EACpD,IAAI,EAAE,MAAM,GACX,iBAAiB,GAAG,SAAS,CAY/B;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,SAAS,IAAI,CACvB,mBAAmB,CAAC,SAAS,EAC7B,MAAM,GAAG,MAAM,GAAG,WAAW,CAC9B,EAAE,EACH,GAAG,EAAE,IAAI,GACR,iBAAiB,GAAG,SAAS,CAkB/B;AAqJD;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAQ7D"}

package/build/commands/auth/workspace.js

@@ -55,7 +55,7 @@ export async function resolveWorkspace(opts) {
             }
         }
         return {
-            workspace: await createWorkspace(api, opts.explicitName),
+            workspace: await createWorkspace(api, opts.explicitName, workspaces),
             wasCreated: true,
         };
     }
@@ -92,7 +92,10 @@ export async function resolveWorkspace(opts) {
     }
     const promptInput = openPromptInput();
     if (promptInput === undefined) {
-        failWith("Multiple workspaces available and no interactive terminal; pass --workspace-uuid <uuid> (or set CARGO_WORKSPACE_UUID) to select one.", { code: ExitCodes.InvalidUsage });
+        failWith(describeWorkspaceChoice(workspaces), {
+            code: ExitCodes.InvalidUsage,
+            extra: { workspaces: listWorkspaceChoices(workspaces) },
+        });
     }
     let selectedWorkspace;
     try {
@@ -106,6 +109,49 @@ export async function resolveWorkspace(opts) {
     }
     return { workspace: selectedWorkspace, wasCreated: false };
 }
+function listWorkspaceChoices(workspaces) {
+    return workspaces.map((workspace) => {
+        return { uuid: workspace.uuid, name: workspace.name };
+    });
+}
+/**
+ * Without a terminal nothing can be picked, so the error itself has to carry
+ * the choice: every workspace with its uuid, and the flag that selects one.
+ * The sign-in is not saved, and an emailed code works once, so the command is
+ * re-run from the start.
+ *
+ * Exported for tests; `resolveWorkspace` is the only production caller.
+ */
+export function describeWorkspaceChoice(workspaces) {
+    return [
+        `You have ${String(workspaces.length)} workspaces and there is no interactive terminal to pick one, so this sign-in was not saved.`,
+        "Run the same login command again with --workspace-uuid <uuid> (or set CARGO_WORKSPACE_UUID). With --email, request a new code first: a code works only once.",
+        "Your workspaces:",
+        ...workspaces.map((workspace) => {
+            return `  --workspace-uuid ${workspace.uuid}  (${workspace.name})`;
+        }),
+    ].join("\n");
+}
+/**
+ * The free plan caps how many workspaces one person owns, so naming a new one
+ * can be refused. The fix is to use a workspace that already exists, which the
+ * message lists with the flag that picks it.
+ *
+ * Exported for tests; `createWorkspace` is the only production caller.
+ */
+export function describeFreeWorkspaceLimit(name, workspaces) {
+    const lines = [
+        `Cannot create workspace "${name}": you have reached the free plan's workspace limit.`,
+    ];
+    if (workspaces.length === 0) {
+        lines.push("Upgrade a workspace, or ask a teammate to invite you to theirs.");
+        return lines.join("\n");
+    }
+    lines.push("Use an existing workspace instead: re-run the login command with --workspace-uuid <uuid> in place of --workspace-name. Or upgrade one of them to create more.", "Your workspaces:", ...workspaces.map((workspace) => {
+        return `  --workspace-uuid ${workspace.uuid}  (${workspace.name})`;
+    }));
+    return lines.join("\n");
+}
 export function findWorkspaceByName(workspaces, name) {
     const wanted = name.trim().toLowerCase();
     const matched = workspaces.find((workspace) => {
@@ -142,7 +188,7 @@ async function chooseWorkspace(api, workspaces) {
     if (workspaces.length === 0) {
         info("You don't have any workspaces yet. Let's create one.");
         return {
-            workspace: await createWorkspace(api, await askWorkspaceName()),
+            workspace: await createWorkspace(api, await askWorkspaceName(), workspaces),
             wasCreated: true,
         };
     }
@@ -169,7 +215,7 @@ async function chooseWorkspace(api, workspaces) {
     });
     if (chosen === CREATE) {
         return {
-            workspace: await createWorkspace(api, await askWorkspaceName()),
+            workspace: await createWorkspace(api, await askWorkspaceName(), workspaces),
             wasCreated: true,
         };
     }
@@ -212,12 +258,33 @@ async function createWorkspaceByAsking(api) {
             code: ExitCodes.InvalidUsage,
         });
     }
-    const workspace = await createWorkspace(api, name);
+    // Only reached with no workspaces, so the limit message has none to list.
+    const workspace = await createWorkspace(api, name, []);
     success(`Created workspace: ${workspace.name} (${workspace.uuid})`);
     return { workspace, wasCreated: true };
 }
-async function createWorkspace(api, name) {
-    const result = await handleApiCall(() => api.workspaceManagement.workspace.create({ name }), { spinner: "Creating workspace..." });
+async function createWorkspace(api, name, 
+// Required, not defaulted: the free-plan-limit message lists these as the
+// way out, and a caller that forgot them printed "you have none" to someone
+// who has several.
+existingWorkspaces) {
+    const result = await handleApiCall(async () => {
+        try {
+            return await api.workspaceManagement.workspace.create({ name });
+        }
+        catch (error) {
+            if (error.reason === "freeWorkspaceLimitReached") {
+                failWith(describeFreeWorkspaceLimit(name, existingWorkspaces), {
+                    code: ExitCodes.InvalidUsage,
+                    extra: {
+                        reason: "freeWorkspaceLimitReached",
+                        workspaces: listWorkspaceChoices(existingWorkspaces),
+                    },
+                });
+            }
+            throw error;
+        }
+    }, { spinner: "Creating workspace..." });
     return { uuid: result.workspace.uuid, name: result.workspace.name };
 }
 /**

package/build/utils/openBrowser.d.ts

@@ -1,7 +1,21 @@
+/// <reference types="node" resolution-mode="require"/>
 /**
  * Best-effort browser launch. Every caller also prints the URL, so a failure
  * here is never fatal: headless boxes and sandboxes simply fall back to the
  * user opening the link themselves.
  */
 export declare function openBrowser(url: string): void;
+/**
+ * The command that hands `url` to the default browser.
+ *
+ * Windows goes through rundll32 rather than `cmd /c start`: cmd parses its
+ * command line, so every `&` in a query string ends the command there and the
+ * browser opens a truncated URL. rundll32 takes the URL as a plain argument.
+ *
+ * Exported for tests.
+ */
+export declare function buildOpenCommand(os: NodeJS.Platform, url: string): {
+    command: string;
+    args: string[];
+};
 //# sourceMappingURL=openBrowser.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"openBrowser.d.ts","sourceRoot":"","sources":["../../src/utils/openBrowser.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAc7C"}
+{"version":3,"file":"openBrowser.d.ts","sourceRoot":"","sources":["../../src/utils/openBrowser.ts"],"names":[],"mappings":";AAGA;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAa7C;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,MAAM,CAAC,QAAQ,EACnB,GAAG,EAAE,MAAM,GACV;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CASrC"}

package/build/utils/openBrowser.js

@@ -6,8 +6,7 @@ import { platform } from "node:process";
  * user opening the link themselves.
  */
 export function openBrowser(url) {
-    const command = pickOpenCommand();
-    const args = platform === "win32" ? ["/c", "start", "", url] : [url];
+    const { command, args } = buildOpenCommand(platform, url);
     try {
         const child = spawn(command, args, {
             detached: true,
@@ -20,10 +19,23 @@ export function openBrowser(url) {
         // Intentionally ignored — see above.
     }
 }
-function pickOpenCommand() {
-    if (platform === "darwin")
-        return "open";
-    if (platform === "win32")
-        return "cmd";
-    return "xdg-open";
+/**
+ * The command that hands `url` to the default browser.
+ *
+ * Windows goes through rundll32 rather than `cmd /c start`: cmd parses its
+ * command line, so every `&` in a query string ends the command there and the
+ * browser opens a truncated URL. rundll32 takes the URL as a plain argument.
+ *
+ * Exported for tests.
+ */
+export function buildOpenCommand(os, url) {
+    if (os === "darwin")
+        return { command: "open", args: [url] };
+    if (os === "win32") {
+        return {
+            command: "rundll32",
+            args: ["url.dll,FileProtocolHandler", url],
+        };
+    }
+    return { command: "xdg-open", args: [url] };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.145",
+  "version": "1.0.146",
   "mcpName": "io.github.getcargohq/cargo",
   "private": false,
   "license": "UNLICENSED",
@@ -77,7 +77,7 @@
     "@cargo-ai/api": "^1.0.107",
     "@cargo-ai/app-sdk": "^1.0.12",
     "@cargo-ai/cdk": "^1.0.140",
-    "@cargo-ai/types": "^1.0.107",
+    "@cargo-ai/types": "^1.0.108",
     "@cargo-ai/utils": "^1.0.37",
     "@cargo-ai/worker-sdk": "^1.0.21",
     "@modelcontextprotocol/sdk": "^1.32.0",