@zalify/cli 0.2.3 → 0.3.0

package/dist/cli.js

@@ -11308,11 +11308,35 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 var dir = join(homedir(), ".zalify");
 var file = join(dir, "config.json");
+function migrate(raw) {
+  if (!raw || typeof raw !== "object")
+    return null;
+  const obj = raw;
+  if (obj.version === 2 && obj.workspaces && obj.appUrl) {
+    return obj;
+  }
+  if (typeof obj.key === "string" && typeof obj.workspaceId === "string") {
+    return {
+      version: 2,
+      appUrl: obj.appUrl ?? "https://app.zalify.com",
+      activeWorkspaceId: obj.workspaceId,
+      workspaces: {
+        [obj.workspaceId]: {
+          key: obj.key,
+          name: obj.workspaceName ?? "",
+          slug: obj.workspaceSlug ?? "",
+          createdAt: obj.createdAt ?? new Date().toISOString()
+        }
+      }
+    };
+  }
+  return null;
+}
 function readConfig() {
   if (!existsSync(file))
     return null;
   try {
-    return JSON.parse(readFileSync(file, "utf8"));
+    return migrate(JSON.parse(readFileSync(file, "utf8")));
   } catch {
     return null;
   }
@@ -11325,12 +11349,13 @@ function writeConfig(config) {
 function deleteConfig() {
   rmSync(file, { force: true });
 }
-function requireConfig() {
+function requireActive() {
   const config = readConfig();
-  if (!config?.key) {
+  if (!config || Object.keys(config.workspaces).length === 0) {
     throw new Error("Not logged in. Run `zalify login` first.");
   }
-  return config;
+  const workspaceId = config.activeWorkspaceId && config.workspaces[config.activeWorkspaceId] ? config.activeWorkspaceId : Object.keys(config.workspaces)[0];
+  return { appUrl: config.appUrl, workspaceId, entry: config.workspaces[workspaceId], config };
 }
 
 // src/auth.ts
@@ -11346,10 +11371,14 @@ function openBrowser(url) {
     detached: true
   }).unref();
 }
+function decodePayload(encoded) {
+  const b64 = encoded.replace(/-/g, "+").replace(/_/g, "/");
+  return JSON.parse(Buffer.from(b64, "base64").toString("utf8"));
+}
 async function login(options) {
   const base = (options.appUrl || readConfig()?.appUrl || DEFAULT_APP_URL).replace(/\/$/, "");
   const state = randomBytes(32).toString("hex");
-  const result = await new Promise((resolvePromise, reject) => {
+  const payload = await new Promise((resolvePromise, reject) => {
     const timer = setTimeout(() => {
       server.close();
       server.closeAllConnections();
@@ -11387,22 +11416,38 @@ async function login(options) {
         });
         return;
       }
-      const key = url.searchParams.get("key");
-      if (!key) {
-        done("Login failed: no key in callback.", () => {
+      const encoded = url.searchParams.get("payload");
+      const legacyKey = url.searchParams.get("key");
+      let parsed = null;
+      if (encoded) {
+        try {
+          parsed = decodePayload(encoded);
+        } catch {
+          parsed = null;
+        }
+      } else if (legacyKey) {
+        parsed = {
+          keys: [
+            {
+              workspaceId: url.searchParams.get("workspace_id") ?? "",
+              workspaceName: url.searchParams.get("workspace_name") ?? "",
+              workspaceSlug: url.searchParams.get("workspace_slug") ?? "",
+              key: legacyKey
+            }
+          ]
+        };
+      }
+      if (!parsed || parsed.keys.length === 0) {
+        done("Login failed: no keys in callback.", () => {
           teardown();
-          reject(new Error("Callback did not include a key."));
+          reject(new Error("Callback did not include any keys."));
         });
         return;
       }
-      done("Logged in!", () => {
+      const result = parsed;
+      done(`Logged in to ${result.keys.length} workspace${result.keys.length === 1 ? "" : "s"}!`, () => {
         teardown();
-        resolvePromise({
-          key,
-          workspaceId: url.searchParams.get("workspace_id") ?? "",
-          workspaceName: url.searchParams.get("workspace_name") ?? "",
-          workspaceSlug: url.searchParams.get("workspace_slug") ?? ""
-        });
+        resolvePromise(result);
       });
     });
     server.listen(0, "127.0.0.1", () => {
@@ -11416,13 +11461,40 @@ async function login(options) {
     });
     server.on("error", reject);
   });
-  writeConfig({ appUrl: base, ...result, createdAt: new Date().toISOString() });
-  console.log(`✓ Logged in to workspace "${result.workspaceName || result.workspaceId}" (key stored in ~/.zalify/config.json)`);
+  const existing = readConfig();
+  const config = {
+    version: 2,
+    appUrl: base,
+    activeWorkspaceId: existing?.activeWorkspaceId ?? null,
+    workspaces: { ...existing?.appUrl === base ? existing?.workspaces : {} }
+  };
+  const now = new Date().toISOString();
+  for (const k of payload.keys) {
+    config.workspaces[k.workspaceId] = {
+      key: k.key,
+      name: k.workspaceName,
+      slug: k.workspaceSlug,
+      createdAt: now
+    };
+  }
+  if (!config.activeWorkspaceId || !config.workspaces[config.activeWorkspaceId]) {
+    config.activeWorkspaceId = payload.keys[0].workspaceId;
+  }
+  writeConfig(config);
+  console.log(`✓ Authorized ${payload.keys.length} workspace(s):`);
+  for (const k of payload.keys) {
+    const active = k.workspaceId === config.activeWorkspaceId ? "  (active)" : "";
+    console.log(`  - ${k.workspaceName} (${k.workspaceSlug})${active}`);
+  }
+  for (const f of payload.failed ?? []) {
+    console.log(`  ✗ ${f.workspaceName}: ${f.error}`);
+  }
+  console.log("Switch with `zalify workspace set <slug>`.");
 }
 function logout() {
   deleteConfig();
   console.log("✓ Logged out (local credentials deleted).");
-  console.log("  To revoke the key itself: app.zalify.com → Settings → Developer.");
+  console.log("  To revoke keys: each workspace's Settings → Developer on app.zalify.com.");
 }
 function ago(iso) {
   if (!iso)
@@ -11439,12 +11511,12 @@ function ago(iso) {
   return `${Math.round(hours / 24)}d ago`;
 }
 async function whoami() {
-  const config = requireConfig();
+  const { appUrl, workspaceId, entry, config } = requireActive();
   let live = null;
   let liveError = null;
   try {
-    const res = await fetch(`${config.appUrl}/api/cli/whoami`, {
-      headers: { Authorization: `Bearer ${config.key}` }
+    const res = await fetch(`${appUrl}/api/cli/whoami`, {
+      headers: { Authorization: `Bearer ${entry.key}` }
     });
     if (res.ok) {
       live = await res.json();
@@ -11457,17 +11529,19 @@ async function whoami() {
     liveError = "could not reach the server (offline?)";
   }
   const ws = live?.workspace;
-  console.log(`workspace  ${ws?.name ?? config.workspaceName ?? "(unknown)"} (${ws?.slug ?? config.workspaceSlug ?? "?"}) [${ws?.id ?? config.workspaceId}]`);
+  const total = Object.keys(config.workspaces).length;
+  console.log(`workspace  ${ws?.name ?? entry.name ?? "(unknown)"} (${ws?.slug ?? entry.slug ?? "?"}) [${ws?.id ?? workspaceId}]` + (total > 1 ? ` — 1 of ${total}, see \`zalify workspace list\`` : ""));
   if (live) {
     console.log(`plan       ${live.plan.name} (${live.plan.type})`);
     if (live.key.createdByName) {
       console.log(`user       ${live.key.createdByName}`);
     }
-    console.log(`key        ${live.key.name ?? config.key.slice(0, 16) + "…"} — created ${live.key.createdAt ? new Date(live.key.createdAt).toISOString().slice(0, 10) : "?"}, last used ${ago(live.key.lastRequest)}`);
+    console.log(`key        ${live.key.name ?? entry.key.slice(0, 16) + "…"} — created ${live.key.createdAt ? new Date(live.key.createdAt).toISOString().slice(0, 10) : "?"}, last used ${ago(live.key.lastRequest)}`);
   } else {
-    console.log(`key        ${config.key.slice(0, 16)}…`);
+    console.log(`key        ${entry.key.slice(0, 16)}…`);
   }
-  console.log(`app        ${config.appUrl}`);
+  const slug = ws?.slug ?? entry.slug;
+  console.log(`app        ${slug ? `${appUrl}/store/${slug}` : appUrl}`);
   console.log(live ? "status     ✓ key verified" : `status     ! not verified — ${liveError}`);
 }
 
@@ -11512,24 +11586,25 @@ async function assetsPull(storeDir) {
   console.log(`Done: ${pulled} downloaded, ${Object.keys(index).length - pulled} already local.`);
 }
 async function assetsPush(storeDir) {
-  const config = requireConfig();
+  const { appUrl, workspaceId, entry } = requireActive();
   const imagesDir = imagesDirFor(storeDir);
   const indexPath = join2(imagesDir, "assets.json");
   const index = readIndex(imagesDir);
   async function api(path9, body) {
-    const res = await fetch(`${config.appUrl}${path9}`, {
+    const res = await fetch(`${appUrl}${path9}`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        Authorization: `Bearer ${config.key}`
+        Authorization: `Bearer ${entry.key}`
       },
       body: JSON.stringify(body)
     });
     const json = await res.json().catch(() => ({}));
     if (!res.ok) {
       if (json.code === "UPGRADE_REQUIRED") {
+        const billingUrl = entry.slug ? `${appUrl}/store/${entry.slug}/settings/billing` : `${appUrl} (Settings → Billing)`;
         throw new Error(`${json.error ?? "This feature requires a paid plan."}
-` + `  Upgrade this workspace at ${config.appUrl} (Settings → Billing).`);
+` + `  Upgrade this workspace: ${billingUrl}`);
       }
       throw new Error(`${path9} ${res.status}: ${JSON.stringify(json)}`);
     }
@@ -11543,11 +11618,11 @@ async function assetsPush(storeDir) {
     console.log("Everything already pushed.");
     return;
   }
-  console.log(`Pushing ${files.length} file(s) to "${config.workspaceName || config.workspaceId}"`);
+  console.log(`Pushing ${files.length} file(s) to "${entry.name || workspaceId}"`);
   for (let i = 0;i < files.length; i += BATCH) {
     const batch = files.slice(i, i + BATCH);
     const { uploads } = await api("/api/assets/presign", {
-      workspaceId: config.workspaceId,
+      workspaceId,
       folderId: process.env.ZALIFY_FOLDER_ID ?? null,
       files: batch.map((f) => ({
         id: f.name,
@@ -11587,7 +11662,7 @@ async function assetsPush(storeDir) {
     }
     if (toFinalize.length) {
       const { assets, pending } = await api("/api/assets/finalize", {
-        workspaceId: config.workspaceId,
+        workspaceId,
         items: toFinalize.map(({ file: file2, up }) => ({
           assetId: up.assetId,
           checksum: file2.checksum,
@@ -11646,6 +11721,34 @@ Try manually: ${cmd} ${args.join(" ")}`);
 ✓ Done${updated ? ` (version: ${updated})` : ""}`);
 }
 
+// src/workspace.ts
+function workspaceList() {
+  const config = readConfig();
+  const entries = Object.entries(config?.workspaces ?? {});
+  if (!config || entries.length === 0) {
+    throw new Error("Not logged in. Run `zalify login` first.");
+  }
+  for (const [id, w] of entries) {
+    const marker = id === config.activeWorkspaceId ? "* " : "  ";
+    console.log(`${marker}${w.slug.padEnd(36)} ${w.name} [${id}]`);
+  }
+}
+function workspaceSet(slugOrId) {
+  const config = readConfig();
+  if (!config || Object.keys(config.workspaces).length === 0) {
+    throw new Error("Not logged in. Run `zalify login` first.");
+  }
+  const match = Object.entries(config.workspaces).find(([id, w]) => id === slugOrId || w.slug === slugOrId || w.name === slugOrId);
+  if (!match) {
+    const known = Object.values(config.workspaces).map((w) => w.slug).join(", ");
+    throw new Error(`No authorized workspace matches "${slugOrId}". Known: ${known}.
+` + "Run `zalify login` to authorize more workspaces.");
+  }
+  config.activeWorkspaceId = match[0];
+  writeConfig(config);
+  console.log(`✓ Active workspace: ${match[1].name} (${match[1].slug})`);
+}
+
 // src/cli.ts
 var __dirname4 = dirname(fileURLToPath3(import.meta.url));
 var require2 = createRequire2(import.meta.url);
@@ -11686,6 +11789,9 @@ program2.command("logout").description("Delete the stored CLI credentials").acti
 program2.command("whoami").description("Verify the stored key and show workspace, plan, and key details").action(async () => {
   await whoami();
 });
+var workspace = program2.command("workspace").description("List authorized workspaces or switch the active one");
+workspace.command("list", { isDefault: true }).description("List authorized workspaces (* = active)").action(() => workspaceList());
+workspace.command("set <slug-or-id>").description("Switch the active workspace (local, no re-login)").action((slugOrId) => workspaceSet(slugOrId));
 var assets = program2.command("assets").description("Sync images with the Zalify asset library");
 assets.command("push <store-dir>").description("Upload <store-dir>/images/*.png (sha256 dedup, writes assets.json)").action(async (storeDir) => {
   await assetsPush(storeDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zalify/cli",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Zalify CLI - command-line interface for Zalify",
   "type": "module",
   "main": "dist/cli.js",