@cargo-ai/cli 1.0.44 → 1.0.46

package/build/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
-import { registerCommands as registerCdkCommands, registerManifestCommands, } from "@cargo-ai/cdk/cli";
+import { registerCommands as registerCdkCommands, registerManifestCommands, SessionExpiredError, } from "@cargo-ai/cdk/cli";
 import { Command } from "commander";
 import { createApi } from "./api.js";
 import { registerAiCommands } from "./commands/ai/index.js";
@@ -35,8 +35,9 @@ program
     .version(version)
     .addHelpText("after", `
 Authentication:
-  With API token:     cargo-ai login --token <your-token>
+  Emailed code:       cargo-ai login --email you@company.com  (no browser; signs you up on first use)
   Browser sign-in:    cargo-ai login --oauth
+  With API token:     cargo-ai login --token <your-token>
   Use env variables:  CARGO_API_TOKEN, CARGO_WORKSPACE_UUID, CARGO_BASE_URL
   Check status:       cargo-ai whoami
 
@@ -53,11 +54,11 @@ Exit codes:
 Run "cargo-ai <command> --help" for details on a specific command group.
 Run "cargo-ai <command> <subcommand> --help" for details on a subcommand.`);
 const getApi = () => {
-    const { baseUrl, accessToken, workspaceUuid } = getConfig();
-    if (accessToken === undefined) {
-        failWith("Not authenticated. Run 'cargo-ai login --token <token>' or 'cargo-ai login --oauth'.", { code: ExitCodes.NotAuthenticated });
+    const { baseUrl, getAccessToken, workspaceUuid } = getConfig();
+    if (getAccessToken === undefined) {
+        failWith("Not authenticated. Run 'cargo-ai login --email <email>' (no browser needed) or 'cargo-ai login --oauth'.", { code: ExitCodes.NotAuthenticated });
     }
-    return createApi({ baseUrl, accessToken, workspaceUuid });
+    return createApi({ baseUrl, getAccessToken, workspaceUuid });
 };
 registerAuthCommands(program, getApi);
 registerVersionCommand(program, version);
@@ -89,5 +90,11 @@ program
     .parseAsync()
     .then(() => maybeNotifyUpdate(version))
     .catch((err) => {
-    failWith(err instanceof Error ? err.message : String(err));
+    // An expired session is the ordinary way to lose authentication, so it has
+    // to carry the documented exit code rather than the generic one.
+    failWith(err instanceof Error ? err.message : String(err), {
+        code: err instanceof SessionExpiredError
+            ? ExitCodes.NotAuthenticated
+            : undefined,
+    });
 });

package/build/oauthConfig.d.ts

@@ -4,10 +4,5 @@ export type OAuthConfig = {
     audience: string;
     scope: string;
 };
-export type OAuthConfigOverrides = {
-    domain?: string;
-    clientId?: string;
-    audience?: string;
-};
-export declare function getOAuthConfig(overrides: OAuthConfigOverrides): OAuthConfig;
+export declare function getOAuthConfig(): OAuthConfig;
 //# sourceMappingURL=oauthConfig.d.ts.map

package/build/oauthConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauthConfig.d.ts","sourceRoot":"","sources":["../src/oauthConfig.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAOF,wBAAgB,cAAc,CAAC,SAAS,EAAE,oBAAoB,GAAG,WAAW,CAO3E"}
+{"version":3,"file":"oauthConfig.d.ts","sourceRoot":"","sources":["../src/oauthConfig.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAOF,wBAAgB,cAAc,IAAI,WAAW,CAO5C"}

package/build/oauthConfig.js

@@ -1,17 +1,12 @@
-const DEFAULT_DOMAIN = "auth.getcargo.io";
-const DEFAULT_AUDIENCE = "https://api.getcargo.io";
-const DEFAULT_SCOPE = "openid profile email offline_access";
-const DEFAULT_CLIENT_ID = "oUc99KlLSMAYUAPgxTUyqazef0sxR93b";
-export function getOAuthConfig(overrides) {
+const DOMAIN = "auth.getcargo.io";
+const AUDIENCE = "https://api.getcargo.io";
+const SCOPE = "openid profile email offline_access";
+const CLIENT_ID = "oUc99KlLSMAYUAPgxTUyqazef0sxR93b";
+export function getOAuthConfig() {
     return {
-        domain: pickString(overrides.domain, DEFAULT_DOMAIN),
-        audience: pickString(overrides.audience, DEFAULT_AUDIENCE),
-        clientId: pickString(overrides.clientId, DEFAULT_CLIENT_ID),
-        scope: DEFAULT_SCOPE,
+        domain: DOMAIN,
+        audience: AUDIENCE,
+        clientId: CLIENT_ID,
+        scope: SCOPE,
     };
 }
-const pickString = (override, fallback) => {
-    if (override !== undefined && override.length > 0)
-        return override;
-    return fallback;
-};

package/build/utils/openBrowser.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 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;
+//# sourceMappingURL=openBrowser.d.ts.map

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

@@ -0,0 +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"}

package/build/utils/openBrowser.js

@@ -0,0 +1,29 @@
+import { spawn } from "node:child_process";
+import { platform } from "node:process";
+/**
+ * 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 function openBrowser(url) {
+    const command = pickOpenCommand();
+    const args = platform === "win32" ? ["/c", "start", "", url] : [url];
+    try {
+        const child = spawn(command, args, {
+            detached: true,
+            stdio: "ignore",
+        });
+        child.on("error", () => undefined);
+        child.unref();
+    }
+    catch {
+        // Intentionally ignored — see above.
+    }
+}
+function pickOpenCommand() {
+    if (platform === "darwin")
+        return "open";
+    if (platform === "win32")
+        return "cmd";
+    return "xdg-open";
+}

package/build/utils/prompt.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node" resolution-mode="require"/>
+export type PromptInput = {
+    stream: NodeJS.ReadableStream;
+    close: () => void;
+};
+export declare function openPromptInput(): PromptInput | undefined;
+/**
+ * Asks a single question on the controlling terminal. Prompts are written to
+ * stderr so that piping stdout to `jq` keeps working.
+ */
+export declare function askQuestion(input: NodeJS.ReadableStream, question: string): Promise<string | undefined>;
+//# sourceMappingURL=prompt.d.ts.map

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

@@ -0,0 +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"}

package/build/utils/prompt.js

@@ -0,0 +1,38 @@
+import * as fs from "node:fs";
+import * as readline from "node:readline/promises";
+import * as tty from "node:tty";
+// Interactive prompts must not assume stdin is a terminal: `curl | sh`
+// installers and agent-driven shells pipe stdin while the controlling
+// terminal stays reachable via /dev/tty. Prefer stdin when it is a TTY,
+// otherwise fall back to opening /dev/tty directly.
+export function openPromptInput() {
+    if (process.stdin.isTTY === true) {
+        return { stream: process.stdin, close: () => undefined };
+    }
+    try {
+        const fd = fs.openSync("/dev/tty", "r");
+        const stream = new tty.ReadStream(fd);
+        return { stream, close: () => stream.destroy() };
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Asks a single question on the controlling terminal. Prompts are written to
+ * stderr so that piping stdout to `jq` keeps working.
+ */
+export async function askQuestion(input, question) {
+    const rl = readline.createInterface({ input, output: process.stderr });
+    try {
+        const answer = await rl.question(question);
+        const trimmed = answer.trim();
+        if (trimmed === "") {
+            return undefined;
+        }
+        return trimmed;
+    }
+    finally {
+        rl.close();
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "private": false,
   "license": "UNLICENSED",
   "description": "Command-line interface for the Cargo API",
@@ -23,6 +23,8 @@
     "build": "tsc --build",
     "dev": "tsx watch src/index.ts",
     "start": "node build/index.js",
+    "test": "npm run build && node --test \"test/**/*.test.mjs\"",
+    "test:watch": "node --test --watch \"test/**/*.test.mjs\"",
     "type:check": "tsc --noEmit",
     "lint": "eslint ./ --fix",
     "lint:check": "eslint ./ --max-warnings=0",
@@ -30,7 +32,7 @@
     "format:check": "prettier --check ."
   },
   "dependencies": {
-    "@cargo-ai/api": "^1.0.56",
+    "@cargo-ai/api": "^1.0.57",
     "@cargo-ai/app-sdk": "^1.0.5",
     "@cargo-ai/cdk": "*",
     "@cargo-ai/types": "*",