@cargo-ai/cli 1.0.118 → 1.0.120

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/session.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,KAAK,iBAAiB,EAAoB,MAAM,gBAAgB,CAAC;AAE1E,eAAO,MAAM,gBAAgB,4BAA4B,CAAC;AAE1D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAMnE;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,MAAM,EAAE,cAAc,CAAC;IACvB,6EAA6E;IAC7E,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA4C7B"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/session.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,KAAK,iBAAiB,EAAoB,MAAM,gBAAgB,CAAC;AAE1E,eAAO,MAAM,gBAAgB,4BAA4B,CAAC;AAE1D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAMnE;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,MAAM,EAAE,cAAc,CAAC;IACvB,6EAA6E;IAC7E,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA4B7B"}

package/build/commands/auth/session.js

@@ -1,7 +1,6 @@
 import { saveCredentials } from "../../credentials.js";
 import { getOAuthConfig } from "../../oauthConfig.js";
 import { failWith } from "../runHandler.js";
-import { refreshAccessToken } from "./passwordless.js";
 import { resolveWorkspace } from "./workspace.js";
 export const DEFAULT_BASE_URL = "https://api.getcargo.io";
 export function resolveBaseUrl(override) {
@@ -21,29 +20,16 @@ export function resolveBaseUrl(override) {
  */
 export async function establishSession(opts) {
     const baseUrl = resolveBaseUrl(opts.baseUrlOverride);
-    const { workspace, wasCreated } = await resolveWorkspace({
+    const { workspace } = await resolveWorkspace({
         baseUrl,
         accessToken: opts.tokens.accessToken,
         explicitUuid: opts.workspaceUuid,
         explicitName: opts.workspaceName,
     });
-    let { accessToken, refreshToken, expiresAt } = opts.tokens;
+    const { accessToken, refreshToken, expiresAt } = opts.tokens;
     if (refreshToken === undefined) {
         failWith("The identity provider issued no refresh token, so the CLI cannot keep this session alive. Enable the Refresh Token grant for the CLI application in Auth0, then sign in again.");
     }
-    if (wasCreated === true) {
-        // The workspace list is a claim on the access token, so a workspace created
-        // moments ago is absent from the one we are holding and every request for
-        // it would be rejected. Only reissuing the token picks it up.
-        const refreshed = await refreshAccessToken({ refreshToken });
-        accessToken = refreshed.accessToken;
-        expiresAt = refreshed.expiresAt;
-        // Only a tenant that rotates refresh tokens returns a new one; keep the
-        // existing one otherwise, since it is still the valid one.
-        if (refreshed.refreshToken !== undefined) {
-            refreshToken = refreshed.refreshToken;
-        }
-    }
     const { domain, clientId } = getOAuthConfig();
     saveCredentials({
         accessToken,

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

@@ -1,4 +1,5 @@
 import { type WorkspaceManagement } from "@cargo-ai/api";
+import { type Api } from "../../api.js";
 export type ResolvedWorkspace = {
     uuid: string;
     name: string;
@@ -15,4 +16,23 @@ export declare function resolveWorkspace(opts: {
     explicitName: string | undefined;
 }): Promise<WorkspaceResolution>;
 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
+ * one: named "Personal" and created within SIGN_IN_WORKSPACE_MAX_AGE_MS.
+ *
+ * A fresh "Personal" can also be somebody else's that this account was invited
+ * into, which `isOnlyMember` rules out.
+ */
+export declare function findSignInWorkspace(workspaces: readonly Pick<WorkspaceManagement.Workspace, "uuid" | "name" | "createdAt">[], now: Date): ResolvedWorkspace | undefined;
+/**
+ * Whether the signed-in account is the workspace's only member — what tells
+ * the workspace sign-in just created for it apart from one it was invited
+ * into, which still holds whoever did the inviting.
+ *
+ * A listing that fails reads as "someone else's": renaming a colleague's
+ * workspace is a worse outcome than the second workspace this avoids.
+ *
+ * Exported for tests; `resolveWorkspace` is the only production caller.
+ */
+export declare function isOnlyMember(api: Api): Promise<boolean>;
 //# sourceMappingURL=workspace.d.ts.map

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;AAazD,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;AAUF,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,CAkG/B;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,SAAS,mBAAmB,CAAC,SAAS,EAAE,EACpD,IAAI,EAAE,MAAM,GACX,iBAAiB,GAAG,SAAS,CAY/B"}
+{"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"}

package/build/commands/auth/workspace.js

@@ -9,6 +9,17 @@ import { ExitCodes, failWith, handleApiCall, info, success, } from "../runHandle
  */
 const CREATE = " create";
 const DEFAULT_WORKSPACE_NAME = "My workspace";
+/**
+ * What the sign-in Action names the workspace it creates for an account that
+ * has none. Matches PERSONAL_WORKSPACE_NAME in the backend's action route.
+ */
+const SIGN_IN_WORKSPACE_NAME = "Personal";
+/**
+ * How recently that workspace must have been created to count as this
+ * sign-in's. An older "Personal" may hold work, so naming a workspace then
+ * creates a new one rather than renaming it.
+ */
+const SIGN_IN_WORKSPACE_MAX_AGE_MS = 10 * 60 * 1000;
 export async function resolveWorkspace(opts) {
     const accessToken = opts.accessToken;
     const api = createApi({
@@ -16,7 +27,7 @@ export async function resolveWorkspace(opts) {
         getAccessToken: () => Promise.resolve(accessToken),
         workspaceUuid: undefined,
     });
-    const { workspaces } = await handleApiCall(() => api.workspaceManagement.workspace.all({ refresh: false }), { spinner: "Loading workspaces..." });
+    const { workspaces } = await handleApiCall(() => api.workspaceManagement.workspace.all(), { spinner: "Loading workspaces..." });
     if (opts.explicitName !== undefined && opts.explicitName.length > 0) {
         // Reuse a same-named workspace rather than creating a duplicate, so that
         // re-running a non-interactive sign-in is idempotent as documented.
@@ -24,6 +35,25 @@ export async function resolveWorkspace(opts) {
         if (existingWorkspace !== undefined) {
             return { workspace: existingWorkspace, wasCreated: false };
         }
+        // A brand-new account already has the workspace sign-in created for it,
+        // and the name given here is for that one, not a second beside it.
+        const signInWorkspace = findSignInWorkspace(workspaces, new Date());
+        if (signInWorkspace !== undefined) {
+            // Reading the members and renaming both go through workspace-scoped
+            // routes, so this client carries the workspace the listing one could
+            // not.
+            const signInApi = createApi({
+                baseUrl: opts.baseUrl,
+                getAccessToken: () => Promise.resolve(accessToken),
+                workspaceUuid: signInWorkspace.uuid,
+            });
+            if ((await isOnlyMember(signInApi)) === true) {
+                return {
+                    workspace: await renameWorkspace(signInApi, opts.explicitName),
+                    wasCreated: false,
+                };
+            }
+        }
         return {
             workspace: await createWorkspace(api, opts.explicitName),
             wasCreated: true,
@@ -86,6 +116,27 @@ export function findWorkspaceByName(workspaces, name) {
     }
     return { uuid: matched.uuid, name: matched.name };
 }
+/**
+ * The workspace the sign-in Action just created, when it is the account's only
+ * one: named "Personal" and created within SIGN_IN_WORKSPACE_MAX_AGE_MS.
+ *
+ * A fresh "Personal" can also be somebody else's that this account was invited
+ * into, which `isOnlyMember` rules out.
+ */
+export function findSignInWorkspace(workspaces, now) {
+    const [onlyWorkspace] = workspaces;
+    if (workspaces.length !== 1 || onlyWorkspace === undefined) {
+        return undefined;
+    }
+    if (onlyWorkspace.name !== SIGN_IN_WORKSPACE_NAME) {
+        return undefined;
+    }
+    const age = now.getTime() - new Date(onlyWorkspace.createdAt).getTime();
+    if (age > SIGN_IN_WORKSPACE_MAX_AGE_MS) {
+        return undefined;
+    }
+    return { uuid: onlyWorkspace.uuid, name: onlyWorkspace.name };
+}
 /** Pick from the workspaces you have, or name a new one, in one question. */
 async function chooseWorkspace(api, workspaces) {
     if (workspaces.length === 0) {
@@ -169,6 +220,29 @@ async function createWorkspace(api, name) {
     const result = await handleApiCall(() => api.workspaceManagement.workspace.create({ name }), { spinner: "Creating workspace..." });
     return { uuid: result.workspace.uuid, name: result.workspace.name };
 }
+/**
+ * Whether the signed-in account is the workspace's only member — what tells
+ * the workspace sign-in just created for it apart from one it was invited
+ * into, which still holds whoever did the inviting.
+ *
+ * A listing that fails reads as "someone else's": renaming a colleague's
+ * workspace is a worse outcome than the second workspace this avoids.
+ *
+ * Exported for tests; `resolveWorkspace` is the only production caller.
+ */
+export async function isOnlyMember(api) {
+    try {
+        const { users } = await api.workspaceManagement.user.all();
+        return users.length === 1;
+    }
+    catch {
+        return false;
+    }
+}
+async function renameWorkspace(api, name) {
+    const result = await handleApiCall(() => api.workspaceManagement.workspace.update({ name }), { spinner: "Naming workspace..." });
+    return { uuid: result.workspace.uuid, name: result.workspace.name };
+}
 async function promptWorkspaceSelection(workspaces, input) {
     const rl = readline.createInterface({
         input,

package/build/commands/workspaceManagement/workspaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../../src/commands/workspaceManagement/workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAIxC,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,GAAG,GAChB,IAAI,CAkLN"}
+{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../../src/commands/workspaceManagement/workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAGxC,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,GAAG,GAChB,IAAI,CA0KN"}

package/build/commands/workspaceManagement/workspaces.js

@@ -1,4 +1,3 @@
-import { parseBooleanOption } from "../../utils/booleanOption.js";
 import { handleApiCall, outputJson, parseJson } from "../runHandler.js";
 export function registerWorkspacesCommands(parent, getApi) {
     const workspaces = parent
@@ -7,17 +6,13 @@ export function registerWorkspacesCommands(parent, getApi) {
     workspaces
         .command("list")
         .description("List all workspaces accessible to the current user")
-        .option("--refresh [true|false]", "Bypass any token cache and re-fetch from the server (useful after permission changes)", parseBooleanOption)
         .addHelpText("after", `
 Examples:
   $ cargo-ai workspaceManagement workspaces list
-  $ cargo-ai workspaceManagement workspaces list --refresh
   $ cargo-ai workspaceManagement workspaces list | jq -r '.workspaces[].uuid'`)
-        .action(async (opts) => {
+        .action(async () => {
         const api = getApi();
-        const result = await handleApiCall(() => api.workspaceManagement.workspace.all({
-            refresh: opts.refresh === true,
-        }));
+        const result = await handleApiCall(() => api.workspaceManagement.workspace.all());
         outputJson(result);
     });
     workspaces

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.118",
+  "version": "1.0.120",
   "mcpName": "io.github.getcargohq/cargo",
   "private": false,
   "license": "UNLICENSED",
@@ -74,11 +74,11 @@
   "dependencies": {
     "@ai-sdk/harness": "^1.0.144",
     "@ai-sdk/harness-claude-code": "^1.0.148",
-    "@cargo-ai/api": "^1.0.97",
+    "@cargo-ai/api": "^1.0.99",
     "@cargo-ai/app-sdk": "^1.0.11",
     "@cargo-ai/cdk": "^1.0.116",
-    "@cargo-ai/types": "^1.0.96",
-    "@cargo-ai/utils": "^1.0.32",
+    "@cargo-ai/types": "^1.0.99",
+    "@cargo-ai/utils": "^1.0.33",
     "@cargo-ai/worker-sdk": "^1.0.21",
     "@modelcontextprotocol/sdk": "^1.31.0",
     "ai": "^7.0.133",