@zalify/cli 0.3.0 → 0.4.0

package/dist/cli.js

@@ -11312,9 +11312,10 @@ function migrate(raw) {
   if (!raw || typeof raw !== "object")
     return null;
   const obj = raw;
-  if (obj.version === 2 && obj.workspaces && obj.appUrl) {
+  if (obj.version === 3 && obj.userKey && obj.appUrl)
+    return obj;
+  if (obj.version === 2 && obj.workspaces && obj.appUrl)
     return obj;
-  }
   if (typeof obj.key === "string" && typeof obj.workspaceId === "string") {
     return {
       version: 2,
@@ -11351,11 +11352,36 @@ function deleteConfig() {
 }
 function requireActive() {
   const config = readConfig();
-  if (!config || Object.keys(config.workspaces).length === 0) {
+  if (!config) {
     throw new Error("Not logged in. Run `zalify login` first.");
   }
-  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 };
+  if (config.version === 3) {
+    if (!config.active) {
+      throw new Error("No active workspace. Run `zalify workspace list` then `zalify workspace set <slug>`.");
+    }
+    return {
+      appUrl: config.appUrl,
+      key: config.userKey,
+      workspaceId: config.active.id,
+      workspaceName: config.active.name,
+      workspaceSlug: config.active.slug,
+      config
+    };
+  }
+  const ids = Object.keys(config.workspaces);
+  if (ids.length === 0) {
+    throw new Error("Not logged in. Run `zalify login` first.");
+  }
+  const workspaceId = config.activeWorkspaceId && config.workspaces[config.activeWorkspaceId] ? config.activeWorkspaceId : ids[0];
+  const entry = config.workspaces[workspaceId];
+  return {
+    appUrl: config.appUrl,
+    key: entry.key,
+    workspaceId,
+    workspaceName: entry.name,
+    workspaceSlug: entry.slug,
+    config
+  };
 }
 
 // src/auth.ts
@@ -11375,6 +11401,18 @@ function decodePayload(encoded) {
   const b64 = encoded.replace(/-/g, "+").replace(/_/g, "/");
   return JSON.parse(Buffer.from(b64, "base64").toString("utf8"));
 }
+async function fetchWorkspaces(appUrl, userKey) {
+  try {
+    const res = await fetch(`${appUrl}/api/cli/workspaces`, {
+      headers: { Authorization: `Bearer ${userKey}` }
+    });
+    if (!res.ok)
+      return [];
+    return (await res.json()).workspaces;
+  } catch {
+    return [];
+  }
+}
 async function login(options) {
   const base = (options.appUrl || readConfig()?.appUrl || DEFAULT_APP_URL).replace(/\/$/, "");
   const state = randomBytes(32).toString("hex");
@@ -11437,15 +11475,15 @@ async function login(options) {
           ]
         };
       }
-      if (!parsed || parsed.keys.length === 0) {
-        done("Login failed: no keys in callback.", () => {
+      if (!parsed || !parsed.userKey && !parsed.keys?.length) {
+        done("Login failed: no credentials in callback.", () => {
           teardown();
-          reject(new Error("Callback did not include any keys."));
+          reject(new Error("Callback did not include credentials."));
         });
         return;
       }
       const result = parsed;
-      done(`Logged in to ${result.keys.length} workspace${result.keys.length === 1 ? "" : "s"}!`, () => {
+      done("Logged in!", () => {
         teardown();
         resolvePromise(result);
       });
@@ -11461,15 +11499,40 @@ async function login(options) {
     });
     server.on("error", reject);
   });
+  if (payload.userKey && payload.user) {
+    const previous = readConfig();
+    const previousActive = previous?.version === 3 ? previous.active : previous?.version === 2 && previous.activeWorkspaceId ? {
+      id: previous.activeWorkspaceId,
+      name: previous.workspaces[previous.activeWorkspaceId]?.name ?? "",
+      slug: previous.workspaces[previous.activeWorkspaceId]?.slug ?? ""
+    } : null;
+    const workspaces = await fetchWorkspaces(base, payload.userKey);
+    const active = previousActive && workspaces.find((w) => w.id === previousActive.id) || workspaces[0] || previousActive || null;
+    writeConfig({
+      version: 3,
+      appUrl: base,
+      userKey: payload.userKey,
+      user: payload.user,
+      active,
+      workspacesCache: workspaces
+    });
+    console.log(`✓ Logged in as ${payload.user.name ?? payload.user.email ?? payload.user.id} — key covers ${workspaces.length || "your"} workspace(s), expires in 90 days.`);
+    if (active)
+      console.log(`  Active workspace: ${active.name} (${active.slug})`);
+    console.log("  Switch with `zalify workspace set <slug>`.");
+    return;
+  }
   const existing = readConfig();
   const config = {
     version: 2,
     appUrl: base,
-    activeWorkspaceId: existing?.activeWorkspaceId ?? null,
-    workspaces: { ...existing?.appUrl === base ? existing?.workspaces : {} }
+    activeWorkspaceId: existing?.version === 2 ? existing.activeWorkspaceId : null,
+    workspaces: {
+      ...existing?.version === 2 && existing.appUrl === base ? existing.workspaces : {}
+    }
   };
   const now = new Date().toISOString();
-  for (const k of payload.keys) {
+  for (const k of payload.keys ?? []) {
     config.workspaces[k.workspaceId] = {
       key: k.key,
       name: k.workspaceName,
@@ -11478,23 +11541,15 @@ async function login(options) {
     };
   }
   if (!config.activeWorkspaceId || !config.workspaces[config.activeWorkspaceId]) {
-    config.activeWorkspaceId = payload.keys[0].workspaceId;
+    config.activeWorkspaceId = payload.keys?.[0]?.workspaceId ?? null;
   }
   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>`.");
+  console.log(`✓ Authorized ${payload.keys?.length ?? 0} workspace(s) (legacy keys).`);
 }
 function logout() {
   deleteConfig();
   console.log("✓ Logged out (local credentials deleted).");
-  console.log("  To revoke keys: each workspace's Settings → Developer on app.zalify.com.");
+  console.log("  CLI keys expire after 90 days; revoke sooner via app.zalify.com if needed.");
 }
 function ago(iso) {
   if (!iso)
@@ -11511,17 +11566,15 @@ function ago(iso) {
   return `${Math.round(hours / 24)}d ago`;
 }
 async function whoami() {
-  const { appUrl, workspaceId, entry, config } = requireActive();
+  const auth = requireActive();
   let live = null;
   let liveError = null;
   try {
-    const res = await fetch(`${appUrl}/api/cli/whoami`, {
-      headers: { Authorization: `Bearer ${entry.key}` }
-    });
+    const res = await fetch(`${auth.appUrl}/api/cli/whoami?workspaceId=${encodeURIComponent(auth.workspaceId)}`, { headers: { Authorization: `Bearer ${auth.key}` } });
     if (res.ok) {
       live = await res.json();
     } else if (res.status === 401) {
-      liveError = "key is invalid or was revoked — run `zalify login`";
+      liveError = "key is invalid, expired, or revoked — run `zalify login`";
     } else {
       liveError = `server returned ${res.status}`;
     }
@@ -11529,19 +11582,21 @@ async function whoami() {
     liveError = "could not reach the server (offline?)";
   }
   const ws = live?.workspace;
-  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\`` : ""));
+  const keyKind = auth.key.startsWith("zalify_cli_") ? "user key" : "workspace key";
+  console.log(`workspace  ${ws?.name ?? auth.workspaceName ?? "(unknown)"} (${ws?.slug ?? auth.workspaceSlug ?? "?"}) [${ws?.id ?? auth.workspaceId}]`);
+  if (auth.config.version === 3) {
+    console.log(`user       ${auth.config.user.name ?? auth.config.user.email ?? auth.config.user.id}`);
+  } else if (live?.key.createdByName) {
+    console.log(`user       ${live.key.createdByName}`);
+  }
   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 ?? entry.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 ?? auth.key.slice(0, 16) + "…"} (${keyKind}) — created ${live.key.createdAt ? new Date(live.key.createdAt).toISOString().slice(0, 10) : "?"}, last used ${ago(live.key.lastRequest)}`);
   } else {
-    console.log(`key        ${entry.key.slice(0, 16)}…`);
+    console.log(`key        ${auth.key.slice(0, 16)}… (${keyKind})`);
   }
-  const slug = ws?.slug ?? entry.slug;
-  console.log(`app        ${slug ? `${appUrl}/store/${slug}` : appUrl}`);
+  const slug = ws?.slug ?? auth.workspaceSlug;
+  console.log(`app        ${slug ? `${auth.appUrl}/store/${slug}` : auth.appUrl}`);
   console.log(live ? "status     ✓ key verified" : `status     ! not verified — ${liveError}`);
 }
 
@@ -11586,7 +11641,7 @@ async function assetsPull(storeDir) {
   console.log(`Done: ${pulled} downloaded, ${Object.keys(index).length - pulled} already local.`);
 }
 async function assetsPush(storeDir) {
-  const { appUrl, workspaceId, entry } = requireActive();
+  const { appUrl, workspaceId, key, workspaceName, workspaceSlug } = requireActive();
   const imagesDir = imagesDirFor(storeDir);
   const indexPath = join2(imagesDir, "assets.json");
   const index = readIndex(imagesDir);
@@ -11595,14 +11650,14 @@ async function assetsPush(storeDir) {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        Authorization: `Bearer ${entry.key}`
+        Authorization: `Bearer ${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)`;
+        const billingUrl = workspaceSlug ? `${appUrl}/store/${workspaceSlug}/settings/billing` : `${appUrl} (Settings → Billing)`;
         throw new Error(`${json.error ?? "This feature requires a paid plan."}
 ` + `  Upgrade this workspace: ${billingUrl}`);
       }
@@ -11618,7 +11673,7 @@ async function assetsPush(storeDir) {
     console.log("Everything already pushed.");
     return;
   }
-  console.log(`Pushing ${files.length} file(s) to "${entry.name || workspaceId}"`);
+  console.log(`Pushing ${files.length} file(s) to "${workspaceName || workspaceId}"`);
   for (let i = 0;i < files.length; i += BATCH) {
     const batch = files.slice(i, i + BATCH);
     const { uploads } = await api("/api/assets/presign", {
@@ -11722,31 +11777,74 @@ Try manually: ${cmd} ${args.join(" ")}`);
 }
 
 // src/workspace.ts
-function workspaceList() {
+async function fetchWorkspaces2(appUrl, userKey) {
+  try {
+    const res = await fetch(`${appUrl}/api/cli/workspaces`, {
+      headers: { Authorization: `Bearer ${userKey}` }
+    });
+    if (!res.ok)
+      return null;
+    const json = await res.json();
+    return json.workspaces;
+  } catch {
+    return null;
+  }
+}
+async function workspaceList() {
   const config = readConfig();
-  const entries = Object.entries(config?.workspaces ?? {});
-  if (!config || entries.length === 0) {
+  if (!config)
     throw new Error("Not logged in. Run `zalify login` first.");
+  if (config.version === 3) {
+    const live = await fetchWorkspaces2(config.appUrl, config.userKey);
+    const list = live ?? config.workspacesCache;
+    if (live) {
+      config.workspacesCache = live;
+      writeConfig(config);
+    } else {
+      console.log(`! could not fetch live list — showing cached workspaces
+`);
+    }
+    for (const w of list) {
+      const marker = w.id === config.active?.id ? "* " : "  ";
+      console.log(`${marker}${w.slug.padEnd(36)} ${w.name} [${w.id}]`);
+    }
+    return;
   }
+  const entries = Object.entries(config.workspaces);
+  if (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) {
+async function workspaceSet(slugOrId) {
   const config = readConfig();
-  if (!config || Object.keys(config.workspaces).length === 0) {
+  if (!config)
     throw new Error("Not logged in. Run `zalify login` first.");
+  if (config.version === 3) {
+    const live = await fetchWorkspaces2(config.appUrl, config.userKey);
+    const list = live ?? config.workspacesCache;
+    if (live)
+      config.workspacesCache = live;
+    const match = list.find((w) => w.id === slugOrId || w.slug === slugOrId || w.name === slugOrId);
+    if (!match) {
+      throw new Error(`No workspace matches "${slugOrId}". Known: ${list.map((w) => w.slug).join(", ")}.`);
+    }
+    config.active = match;
+    writeConfig(config);
+    console.log(`✓ Active workspace: ${match.name} (${match.slug})`);
+    return;
   }
-  const match = Object.entries(config.workspaces).find(([id, w]) => id === slugOrId || w.slug === slugOrId || w.name === slugOrId);
-  if (!match) {
+  const found = Object.entries(config.workspaces).find(([id, w]) => id === slugOrId || w.slug === slugOrId || w.name === slugOrId);
+  if (!found) {
     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];
+  config.activeWorkspaceId = found[0];
   writeConfig(config);
-  console.log(`✓ Active workspace: ${match[1].name} (${match[1].slug})`);
+  console.log(`✓ Active workspace: ${found[1].name} (${found[1].slug})`);
 }
 
 // src/cli.ts
@@ -11790,8 +11888,12 @@ program2.command("whoami").description("Verify the stored key and show workspace
   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));
+workspace.command("list", { isDefault: true }).description("List authorized workspaces (* = active)").action(async () => {
+  await workspaceList();
+});
+workspace.command("set <slug-or-id>").description("Switch the active workspace (local, no re-login)").action(async (slugOrId) => {
+  await 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.3.0",
+  "version": "0.4.0",
   "description": "Zalify CLI - command-line interface for Zalify",
   "type": "module",
   "main": "dist/cli.js",