@cargo-ai/cli 1.0.36 → 1.0.37

package/build/commands/auth/index.js

@@ -23,7 +23,7 @@ Examples:
   $ cargo-ai login --oauth --workspace-uuid 550e8400-e29b-41d4-a716-446655440000
 
 Credentials are stored in ~/.config/cargo-ai/credentials.json.
-Environment variables (CARGO_API_TOKEN, CARGO_WORKSPACE_UUID, CARGO_BASE_URL) take precedence over saved credentials.`)
+Environment variables (CARGO_API_TOKEN, CARGO_WORKSPACE_UUID, CARGO_BASE_URL) take precedence over saved credentials, and the nearest project .env (walking up from the current directory) fills them in when they are not already exported.`)
         .action(async (opts) => {
         await runLogin(opts);
     });

package/build/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,kBAAkB,GAAG,MAAM,CAAC;AAEvE,MAAM,MAAM,MAAM,GAAG;IACnB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAIF,wBAAgB,SAAS,IAAI,MAAM,CA4BlC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,kBAAkB,GAAG,MAAM,CAAC;AAEvE,MAAM,MAAM,MAAM,GAAG;IACnB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,wBAAgB,SAAS,IAAI,MAAM,CAclC"}

package/build/config.js

@@ -1,47 +1,15 @@
+import { loadProjectEnv, resolveAuthConfig } from "@cargo-ai/cdk/cli";
 import { loadCredentials } from "./credentials.js";
-const DEFAULT_BASE_URL = "https://api.getcargo.io";
 export function getConfig() {
+    // Fold project `.env` into the environment first (never overriding explicit
+    // exports): a repo pinned to one workspace must win over a personal login.
+    loadProjectEnv();
     const credentials = loadCredentials();
-    const envToken = process.env["CARGO_API_TOKEN"];
-    let accessToken;
-    let source;
-    if (envToken !== undefined) {
-        accessToken = envToken;
-        source = "environment";
-    }
-    else if (credentials !== undefined &&
-        credentials.accessToken !== undefined) {
-        accessToken = credentials.accessToken;
-        source = "credentials-file";
-    }
-    else {
-        accessToken = undefined;
-        source = "none";
-    }
+    const resolved = resolveAuthConfig(process.env, credentials);
     return {
-        accessToken,
-        baseUrl: getBaseUrl(credentials),
-        workspaceUuid: getWorkspaceUuid(credentials),
-        source,
+        accessToken: resolved.accessToken,
+        baseUrl: resolved.baseUrl,
+        workspaceUuid: resolved.workspaceUuid,
+        source: resolved.tokenSource,
     };
 }
-const getBaseUrl = (credentials) => {
-    const envUrl = process.env["CARGO_BASE_URL"];
-    if (envUrl !== undefined) {
-        return envUrl;
-    }
-    if (credentials !== undefined && credentials.baseUrl !== undefined) {
-        return credentials.baseUrl;
-    }
-    return DEFAULT_BASE_URL;
-};
-const getWorkspaceUuid = (credentials) => {
-    const envUuid = process.env["CARGO_WORKSPACE_UUID"];
-    if (envUuid !== undefined) {
-        return envUuid;
-    }
-    if (credentials !== undefined) {
-        return credentials.workspaceUuid;
-    }
-    return undefined;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "private": false,
   "license": "UNLICENSED",
   "description": "Command-line interface for the Cargo API",
@@ -38,7 +38,7 @@
     "@modelcontextprotocol/sdk": "1.29.0",
     "commander": "^12.1.0",
     "tsx": "^4.19.2",
-    "undici": "^7.24.8"
+    "undici": "^7.28.0"
   },
   "devDependencies": {
     "@cargo-ai/eslint-config": "*",