@mcpcloud/cli 0.5.0 → 0.7.0-next-20260628020545

package/dist/index.js

@@ -2819,11 +2819,11 @@ var ERROR_REMEDIATION = {
   api_key_name_required: "Pass --name <…> when creating an API key.",
   api_key_id_required: "Pass an apiKeyId. List existing keys with `mcp api-keys list`.",
   api_key_not_found: "No such API key for this user. Run `mcp api-keys list` to see live IDs.",
-  organization_not_selected: "Pass --org <id> or run `mcp config set-org <id>`.",
-  organization_id_required: "Pass --org <id> or run `mcp config set-org <id>`.",
+  organization_not_selected: "Pass --org <id> or run `mcp config set-org <name|id>`.",
+  organization_id_required: "Pass --org <id> or run `mcp config set-org <name|id>`.",
   organization_context_required: "Pass --org <id> for machine-driven flows; browser sessions infer it.",
-  organization_access_denied: "You're not a member of this organization. `mcp whoami` lists ones you can use.",
-  organization_access_required: "You're not a member of this organization. `mcp whoami` lists ones you can use.",
+  organization_access_denied: "Not a member of that organization — a stale saved org is the usual cause after switching accounts. Run `mcp orgs list`, then `mcp config set-org <name>`.",
+  organization_access_required: "Not a member of that organization — a stale saved org is the usual cause after switching accounts. Run `mcp orgs list`, then `mcp config set-org <name>`.",
   organization_mismatch: "The deployment belongs to a different org. Pass --org <correct-id>.",
   insufficient_role: "Your role doesn't permit this action. Contact an org owner.",
   resource_not_found: "No such resource for this org. Verify the ID with the matching `list` command.",
@@ -3457,12 +3457,13 @@ function registerAuthCommands(program2) {
     setApiKey(result.apiKey);
     const previousBaseUrl = readConfig().baseUrl ?? null;
     let baseUrlChanged = false;
+    const config = readConfig();
+    delete config.defaultOrganizationId;
     if (result.apiBaseUrl && result.apiBaseUrl !== previousBaseUrl) {
-      const config = readConfig();
       config.baseUrl = result.apiBaseUrl;
-      writeConfig(config);
       baseUrlChanged = true;
     }
+    writeConfig(config);
     printSuccess(`Signed in${result.user?.email ? ` as ${c.bold(result.user.email)}` : ""}.`);
     if (result.apiKeyName)
       printInfo(c.dim(`  key name: ${result.apiKeyName}`));
@@ -3496,6 +3497,7 @@ function registerAuthCommands(program2) {
   program2.command("logout").description("Remove the saved API key from ~/.mcpcloud/config.json").action(runAction(() => {
     const config = readConfig();
     delete config.apiKey;
+    delete config.defaultOrganizationId;
     writeConfig(config);
     printSuccess("API key removed.");
   }));
@@ -3571,6 +3573,35 @@ class NoOrganizationError extends Error {
     this.name = "NoOrganizationError";
   }
 }
+async function resolveOrgReference(reference) {
+  const ref = reference.trim();
+  let data;
+  try {
+    data = await api.get("/api/v1/organizations");
+  } catch {
+    return { id: ref, matchedBy: "verbatim" };
+  }
+  const orgs = data.organizations ?? [];
+  const byId = orgs.find((org) => org.id === ref);
+  if (byId)
+    return { id: byId.id, matchedBy: "id", name: byId.name };
+  const lower = ref.toLowerCase();
+  const byName = orgs.filter((org) => (org.name ?? "").toLowerCase() === lower);
+  if (byName.length > 1) {
+    throw new Error(`Multiple organizations are named "${reference}". Pass the org id instead (see \`mcp orgs list\`).`);
+  }
+  const nameMatch = byName[0];
+  if (nameMatch)
+    return { id: nameMatch.id, matchedBy: "name", name: nameMatch.name };
+  const bySlug = orgs.find((org) => (org.slug ?? "").toLowerCase() === lower);
+  if (bySlug)
+    return { id: bySlug.id, matchedBy: "slug", name: bySlug.name };
+  const available = orgs.map((org) => `  • ${org.name ?? org.id}${org.slug ? ` (${org.slug})` : ""} — ${org.id}`).join(`
+`);
+  throw new Error(`No organization matching "${reference}".` + (available ? `
+Your organizations:
+${available}` : " Run `mcp orgs list` to see your organizations."));
+}
 async function resolveOrgId(orgId) {
   if (orgId && orgId.trim())
     return orgId.trim();
@@ -8825,15 +8856,17 @@ function registerConfigCommands(program2) {
     }
     printSuccess("Cleared saved dashboard URL.");
   }));
-  config.command("set-org <organizationId>").description("Save a default organization ID").action(runAction((organizationId) => {
+  config.command("set-org <organization>").description("Save a default organization (by name, slug, or id)").action(runAction(async (organization) => {
+    const resolved = await resolveOrgReference(organization);
     const c2 = readConfig();
-    c2.defaultOrganizationId = organizationId;
+    c2.defaultOrganizationId = resolved.id;
     writeConfig(c2);
     if (isJsonMode()) {
-      printJson({ defaultOrganizationId: organizationId });
+      printJson({ defaultOrganizationId: resolved.id });
       return;
     }
-    printSuccess(`Saved default organization: ${organizationId}`);
+    const label = resolved.name && resolved.matchedBy !== "id" ? `${resolved.name} (${resolved.id})` : resolved.id;
+    printSuccess(`Saved default organization: ${label}`);
   }));
   config.command("clear-org").description("Remove the saved default organization ID").action(runAction(() => {
     const c2 = readConfig();
@@ -29860,6 +29893,9 @@ function validateSourceType2(value) {
 }
 async function runSpecInit(args) {
   const { orgId, opts } = args;
+  if (opts.name && !isJsonMode()) {
+    printWarn("--name is ignored with --from-spec; the server name comes from the spec. Rename it later in the dashboard or with the API.");
+  }
   const sourceType = validateSourceType2(opts.sourceType);
   const payload = await readSpecSource(opts.fromSpec, sourceType);
   const { project, created: projectCreated } = await pickProject(orgId, opts.project);
@@ -29944,6 +29980,22 @@ async function runSpecInit(args) {
 // src/commands/installation.ts
 function registerInstallationCommands(program2) {
   const installation = program2.command("installation").description("Manage your skill / artifact installations");
+  installation.command("list").description("List your active installations and their ids").action(runAction(async () => {
+    const data = await api.get("/api/v1/installations");
+    printList(data.installations.map((i) => ({
+      id: i.installationId,
+      type: i.artifactType,
+      artifact: i.artifactName,
+      version: i.version,
+      installed: formatDate(i.installedAt)
+    })), [
+      { key: "id", label: "ID", width: 24 },
+      { key: "type", label: "Type", width: 8 },
+      { key: "artifact", label: "Artifact", width: 28 },
+      { key: "version", label: "Version", width: 12 },
+      { key: "installed", label: "Installed", width: 22 }
+    ], data);
+  }));
   installation.command("disable <installationId>").description("Disable an installation by id (replay-as-success on already-disabled rows)").option("--org <organizationId>", "Organization ID").addHelpText("after", [
     "",
     "Notes:",
@@ -30612,6 +30664,8 @@ function registerUsageCommands(program2) {
       window: `${usageData.usage.windowDays}d (since ${formatDate(usageData.usage.windowStartedAt)})`,
       requests: t.requestCount,
       allowed: t.allowedCount,
+      "billable invocations": usageData.usage.invocations?.billableCount ?? t.allowedToolCallCount ?? 0,
+      "invocation cost": formatMicros(usageData.usage.invocations?.billedMicros),
       "rate-limited": t.rateLimitedCount,
       unauthorized: t.unauthorizedCount,
       failed: t.failedCount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpcloud/cli",
-  "version": "0.5.0",
+  "version": "0.7.0-next-20260628020545",
   "description": "The official CLI for MCPCloud — manage projects, servers, skills, and API keys from the terminal",
   "type": "module",
   "bin": {