@vosjs/cli 0.85.0 → 0.87.0

package/dist/{chunk-NJBUBXFE.js → chunk-ACWV3Y6Y.js}

@@ -10,7 +10,7 @@ import {
   reencodeStill,
   renderStill,
   videoFormat
-} from "./chunk-Q47FUCYN.js";
+} from "./chunk-EXDMMAPT.js";
 import {
   PREV_DOC_NAME,
   PasteFileRefusal,
@@ -46,47 +46,64 @@ import {
   uploadDocRefs,
   uploadManifest,
   writeJson
-} from "./chunk-M5ZBQFPG.js";
+} from "./chunk-2UFNOKVY.js";
 import {
+  ACCOUNT_ENV,
   CREDENTIALS_PATH,
+  DEFAULT_STORE,
   MEDIA_HEAD_BYTES,
   SYNC_STATE_NAME,
   UsageError,
+  accountFrom,
+  accountLabel,
+  activate,
   apiError,
   apiJson,
   bearerFor,
   clientId,
   containerMismatch,
+  credentialAccount,
+  credentialFlags,
   deriveSlug,
   detailLine,
+  findStored,
   formatChanges,
   hasFlag,
   hostedAssetId,
+  isActive,
+  lastCredential,
+  listStored,
   localFile,
   manifestRefs,
   mintAt,
   nameForType,
   numFlag2 as numFlag,
+  originOf,
   parseArgs2 as parseArgs,
   parseVosId,
   platformOrigin,
   prepareOutput,
   programAssets,
   promptHint,
+  readActive,
   readSyncState,
   refuseSymlink,
+  removeAll,
+  removeStored,
   requireCredential,
   resolveCredential,
   resolveMediaType,
   serverWarnings,
   sniffMediaType,
   strFlag,
+  switchTarget,
+  syncIdentity,
   writeCredential,
   writeFileSafe,
   writeOutput,
   writeOutputSync,
   writeSyncState
-} from "./chunk-EPSYIF2S.js";
+} from "./chunk-PEW5GIZF.js";
 import {
   deadLine,
   deadWarns
@@ -4856,6 +4873,7 @@ async function deliverTake(browser, dir, opts) {
 
 // src/plugin/login.ts
 import { hostname } from "os";
+var storeWith = (store) => store ?? ((key, origin, account) => writeCredential(key, origin, void 0, account));
 var LoginUnsupportedError = class extends Error {
   constructor() {
     super("this origin does not support browser login");
@@ -4932,12 +4950,14 @@ async function browserLogin(origin, r, opts) {
       continue;
     }
     if (res.status === 200 && status === "ok") {
-      const path = (opts.store ?? writeCredential)(
+      const account = accountFrom(res.body.user);
+      const path = storeWith(opts.store)(
         res.body.key,
-        origin
+        origin,
+        account
       );
       const user = typeof res.body.user === "object" && res.body.user !== null ? res.body.user.name ?? "" : "";
-      return { path, user };
+      return { path, user, account };
     }
     if (res.status === 429) {
       if (status === "key_limit" && !capNoted) {
@@ -4975,16 +4995,19 @@ async function handoffLogin(url, r, opts = {}) {
     body: { token: parsed.token, hostname: hostname().slice(0, 64) }
   });
   if (res.status === 200 && res.body.status === "ok") {
-    const path = (opts.store ?? writeCredential)(
+    const account = accountFrom(res.body.user);
+    const path = storeWith(opts.store)(
       res.body.key,
-      parsed.origin
+      parsed.origin,
+      account
     );
     const user = typeof res.body.user === "object" && res.body.user !== null ? res.body.user.name ?? "" : "";
     return {
       path,
       user,
       keyName: String(res.body.keyName ?? ""),
-      origin: parsed.origin
+      origin: parsed.origin,
+      account
     };
   }
   if (res.status === 404 && !res.body.status) {
@@ -7445,7 +7468,7 @@ async function planTake(dir, opts = {}) {
 import { createHash } from "crypto";
 import { existsSync as existsSync13, readFileSync as readFileSync3, readdirSync as readdirSync2 } from "fs";
 import { readFile as readFile11 } from "fs/promises";
-import { createInterface as createInterface2 } from "readline/promises";
+import { createInterface as createInterface3 } from "readline/promises";
 import { basename as basename3, join as join14 } from "path";
 import { lowerToComposition as lowerToComposition3, migrateHostedDoc as migrateHostedDoc2 } from "@vosjs/studio-core";
 
@@ -7526,6 +7549,7 @@ import { mkdir as mkdir6 } from "fs/promises";
 import { join as join13 } from "path";
 import { recipeHints } from "@vosjs/shared/frontmatter";
 import { migrateHostedDoc } from "@vosjs/studio-core";
+import { createInterface as createInterface2 } from "readline/promises";
 var BOOLEAN_FLAGS = /* @__PURE__ */ new Set(["json", "help", "media"]);
 async function listFolders(origin, key) {
   const r = await apiJson(origin, "/api/folders", { key });
@@ -7546,7 +7570,18 @@ function projectAddress(ref) {
   );
   return m ? { handle: m[1], slug: m[2].toLowerCase() } : null;
 }
-async function resolvePushFolder(origin, key, ref) {
+function startFromVerdict(at2, mine) {
+  const owner = at2.handle.toLowerCase();
+  const asks = mine !== null && (!mine.handle || mine.handle.toLowerCase() !== owner);
+  const who = mine ? accountLabel(mine) : "this credential";
+  const address = `@${at2.handle}/${at2.slug}`;
+  return {
+    asks,
+    question: `Pushing to ${address} as ${who} would START your own copy of it (its recipes copied in), not continue it. Continue?`,
+    refusal: `vos push --folder ${address} as ${who} would start your own copy of it, not continue it: run it as @${at2.handle} (vos switch ${at2.handle}, or --account ${at2.handle}), or pass --yes to start the copy`
+  };
+}
+async function resolvePushFolder(origin, key, ref, opts = {}) {
   const at2 = projectAddress(ref);
   if (!at2) {
     return {
@@ -7554,6 +7589,15 @@ async function resolvePushFolder(origin, key, ref) {
       note: null
     };
   }
+  const mine = await credentialAccount(origin, key);
+  const start = startFromVerdict(at2, mine);
+  if (start.asks && !opts.yes) {
+    if (!process.stdin.isTTY) throw new UsageError(start.refusal);
+    const rl = createInterface2({ input: process.stdin, output: process.stderr });
+    const answer = await rl.question(`${start.question} [y/N] `);
+    rl.close();
+    if (!/^y(es)?$/i.test(answer.trim())) throw new UsageError(start.refusal);
+  }
   const r = await apiJson(
     origin,
     `/api/folders/public/${encodeURIComponent(at2.handle)}/${encodeURIComponent(at2.slug)}/push-target`,
@@ -7603,7 +7647,7 @@ async function cmdList(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const rows = await listFolders(origin, key);
   if (r.json) {
     r.done({ folders: rows }, "");
@@ -7628,7 +7672,7 @@ async function cmdCreate(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const parentRef = strFlag(flags, "parent");
   let parentId;
   if (parentRef) {
@@ -7663,7 +7707,7 @@ async function cmdMove(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const folderId = toRef === "none" ? null : resolveFolder(await listFolders(origin, key), toRef).id;
   let failed = 0;
   const moved = [];
@@ -7723,7 +7767,7 @@ async function cmdPull(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const folder = resolveFolder(await listFolders(origin, key), ref);
   const res = await apiJson(origin, `/api/folders/${folder.id}`, { key });
   if (res.status !== 200)
@@ -7791,7 +7835,8 @@ async function cmdPull(argv) {
       vosId: v.id,
       versionId: v.currentVersionId ?? null,
       title: v.title,
-      ...v.slug ? { slug: v.slug } : {}
+      ...v.slug ? { slug: v.slug } : {},
+      ...await syncIdentity(origin, key)
     });
     members.push({ dir, id: v.id, title: v.title, take });
   }
@@ -7931,10 +7976,16 @@ function hostOf(origin) {
 }
 
 // src/plugin/sync.ts
-function apiContext(flags) {
+function apiContext(flags, dir) {
+  const origin = platformOrigin(flags);
   return {
-    origin: platformOrigin(flags),
-    key: requireCredential(flags.key, platformOrigin(flags))
+    origin,
+    key: requireCredential({
+      key: flags.key,
+      account: flags.account,
+      origin,
+      dir
+    })
   };
 }
 async function api(ctx, path, init) {
@@ -8026,7 +8077,7 @@ async function pushTake(dir, flags, r) {
     await readScript(dir) ?? take.doc.source.script,
     dir
   );
-  const ctx = apiContext(flags);
+  const ctx = apiContext(flags, dir);
   const tracked = readSyncState(dir);
   const firstPush = tracked === null;
   if (firstPush && !flags.yes) {
@@ -8035,7 +8086,7 @@ async function pushTake(dir, flags, r) {
         "first push of this take uploads its recording \u2014 pass --yes to consent headlessly"
       );
     }
-    const rl = createInterface2({ input: process.stdin, output: process.stderr });
+    const rl = createInterface3({ input: process.stdin, output: process.stderr });
     const answer = await rl.question(
       `Push this take (recording + doc.json) to ${ctx.origin}? [y/N] `
     );
@@ -8071,7 +8122,9 @@ async function pushTake(dir, flags, r) {
         "--folder applies when CREATING a vos \u2014 this take is already pushed; file it with: vos folder move <vosId> --to <folder>"
       );
     }
-    const target = await resolvePushFolder(ctx.origin, ctx.key, flags.folder);
+    const target = await resolvePushFolder(ctx.origin, ctx.key, flags.folder, {
+      yes: flags.yes === true
+    });
     folderId = target.id;
     if (target.note) r.log(target.note);
   }
@@ -8164,7 +8217,8 @@ async function pushTake(dir, flags, r) {
       versionId,
       pushedAt: (/* @__PURE__ */ new Date()).toISOString(),
       title,
-      slug
+      slug,
+      ...await syncIdentity(ctx.origin, ctx.key)
     });
     return { vosId: vos.id, versionId, versionNumber: 1 };
   }
@@ -8214,7 +8268,8 @@ async function pushTake(dir, flags, r) {
   writeSyncState(dir, {
     vosId: state.vosId,
     versionId: version.id,
-    pushedAt: (/* @__PURE__ */ new Date()).toISOString()
+    pushedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    ...await syncIdentity(ctx.origin, ctx.key)
   });
   return {
     vosId: state.vosId,
@@ -8223,7 +8278,7 @@ async function pushTake(dir, flags, r) {
   };
 }
 async function pullTake(dir, flags, r) {
-  const ctx = apiContext(flags);
+  const ctx = apiContext(flags, dir);
   const state = readSyncState(dir);
   const vosId = flags.vos ?? state?.vosId;
   if (!vosId) {
@@ -8333,7 +8388,8 @@ async function pullTake(dir, flags, r) {
   writeSyncState(dir, {
     vosId,
     versionId: head,
-    pushedAt: state?.pushedAt ?? (/* @__PURE__ */ new Date()).toISOString()
+    pushedAt: state?.pushedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+    ...await syncIdentity(ctx.origin, ctx.key)
   });
   return {
     vosId,
@@ -8448,7 +8504,7 @@ async function pushTakeClaimable(dir, flags, r) {
 // src/plugin/program.ts
 import { existsSync as existsSync15 } from "fs";
 import { mkdir as mkdir7, readFile as readFile12 } from "fs/promises";
-import { createInterface as createInterface3 } from "readline/promises";
+import { createInterface as createInterface4 } from "readline/promises";
 import { basename as basename5, dirname as dirname2, join as join15 } from "path";
 import {
   CURRENT_CONFIG_VERSION,
@@ -8677,7 +8733,8 @@ async function cmdFetch(argv) {
     vosId,
     versionId: head,
     ...title ? { title } : {},
-    slug
+    slug,
+    ...await syncIdentity(origin, key)
   });
   let take = false;
   let mediaLine = "";
@@ -8944,8 +9001,8 @@ with their key: vos push ${source} --vos ${String(created2.id ?? "<id>")}`
     );
     return EXIT_OK;
   }
-  const key = requireCredential(strFlag(flags, "key"));
-  void flags.yes;
+  const key = requireCredential({ ...credentialFlags(flags), dir });
+  const yes = flags.yes === true;
   const files = await collectFiles(config, programDoc, dir, r);
   await files.upload({ origin, key });
   const overrides = [
@@ -9029,7 +9086,11 @@ with their key: vos push ${source} --vos ${String(created2.id ?? "<id>")}`
     }
     const version = res.body.version ?? {};
     if (typeof version.id === "string") {
-      writeSyncState(dir, { vosId, versionId: version.id });
+      writeSyncState(dir, {
+        vosId,
+        versionId: version.id,
+        ...await syncIdentity(origin, key)
+      });
     }
     const watchUrl2 = `${origin}/vos/${vosId}`;
     const studioUrl2 = `${origin}/studio?vos=${vosId}`;
@@ -9064,7 +9125,7 @@ ${landedLines(landed2)}` : "")
   const remixOfId = pushTarget.kind === "create" ? pushTarget.remixOfId : void 0;
   const fallbackTitle = state?.title ? `${state.title} remix` : basename5(source).replace(/\.json$/i, "") || "vos remix";
   const title = (strFlag(flags, "title") ?? fallbackTitle).slice(0, 100);
-  const pushFolder = folderRef ? await resolvePushFolder(origin, key, folderRef) : void 0;
+  const pushFolder = folderRef ? await resolvePushFolder(origin, key, folderRef, { yes }) : void 0;
   const folderId = pushFolder?.id;
   if (pushFolder?.note) r.log(pushFolder.note);
   const created = await createProgramVos({
@@ -9092,7 +9153,8 @@ ${landedLines(landed2)}` : "")
     versionId: created.currentVersionId,
     title,
     slug: created.slug,
-    ...remixOfId ? { remixOfId } : {}
+    ...remixOfId ? { remixOfId } : {},
+    ...await syncIdentity(origin, key)
   });
   const watchUrl = `${origin}/vos/${created.id}`;
   const studioUrl = `${origin}/studio?vos=${created.id}`;
@@ -9159,7 +9221,7 @@ async function cmdPullProgram(argv) {
       `no base version in ${dir}/vos.json \u2014 pass --since <versionId>`
     );
   }
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential({ ...credentialFlags(flags), dir });
   const res = await apiJson(
     origin,
     `/api/vos/${vosId}/changes?since=${encodeURIComponent(since)}`,
@@ -9231,7 +9293,8 @@ async function cmdPullProgram(argv) {
   await writeFileSafe(configPath, JSON.stringify(headConfig, null, 2));
   writeSyncState(dir, {
     vosId,
-    versionId: typeof head.id === "string" ? head.id : since
+    versionId: typeof head.id === "string" ? head.id : since,
+    ...await syncIdentity(origin, key)
   });
   r.done(
     {
@@ -9258,16 +9321,21 @@ async function cmdLogin(argv) {
   });
   const handoffUrl = strFlag(flags, "handoff");
   if (handoffUrl) {
+    const before = await nameActiveCredential(
+      parseHandoffUrl(handoffUrl)?.origin ?? origin
+    );
     const done = await handoffLogin(handoffUrl, r);
     r.done(
       {
         path: done.path,
         origin: done.origin,
         user: done.user,
+        account: done.account,
         keyName: done.keyName,
+        ...setAsideFacts(before, done.account),
         next_step: "the link is spent; vos push when you want the work hosted"
       },
-      `Signed in${done.user ? ` as ${done.user}` : ""} \u2014 key "${done.keyName}" stored at ${done.path} (used by every vos platform verb). The link is spent.`
+      `Signed in${signedAs(done.user, done.account)} \u2014 key "${done.keyName}" stored at ${done.path} (used by every vos platform verb). The link is spent.${setAsideLine(before, done.account)}`
     );
     return EXIT_OK;
   }
@@ -9275,13 +9343,14 @@ async function cmdLogin(argv) {
   if (explicit) return storeKey(explicit, origin, r);
   try {
     const openBrowser = process.stdout.isTTY === true && !process.env.SSH_CONNECTION && !process.env.SSH_TTY && flags.json !== true && flags["no-browser"] !== true;
-    const { path, user } = await browserLogin(origin, r, {
+    const before = await nameActiveCredential(origin);
+    const { path, user, account } = await browserLogin(origin, r, {
       label: strFlag(flags, "label"),
       openBrowser
     });
     r.done(
-      { path, origin, user },
-      `Signed in${user ? ` as ${user}` : ""} \u2014 key stored at ${path} (used by every vos platform verb)`
+      { path, origin, user, account, ...setAsideFacts(before, account) },
+      `Signed in${signedAs(user, account)} \u2014 key stored at ${path} (used by every vos platform verb).${setAsideLine(before, account)}`
     );
     return EXIT_OK;
   } catch (e) {
@@ -9292,24 +9361,64 @@ async function cmdLogin(argv) {
       `vos login --key <vos_sk_\u2026> (headless), or run interactively \u2014 mint a key at ${mintAt(origin)}`
     );
   }
-  const rl = createInterface3({ input: process.stdin, output: process.stderr });
+  const rl = createInterface4({ input: process.stdin, output: process.stderr });
   const key = (await rl.question(`Paste a content key from ${origin}/app/api: `)).trim();
   rl.close();
   if (!key) throw new UsageError("no key given");
   return storeKey(key, origin, r);
 }
 async function storeKey(key, origin, r) {
-  const probe3 = await apiJson(origin, "/api/folders", { key });
-  if (probe3.status === 401 || probe3.status === 403) {
-    throw new Error(apiError("validate key", probe3));
+  const who = await apiJson(origin, "/api/user/whoami", { key });
+  if (who.status === 401 || who.status === 403) {
+    throw new Error(apiError("validate key", who));
   }
-  const path = writeCredential(key, origin);
+  let account = null;
+  if (who.status === 200) account = accountFrom(who.body.user);
+  else {
+    const probe3 = await apiJson(origin, "/api/folders", { key });
+    if (probe3.status === 401 || probe3.status === 403) {
+      throw new Error(apiError("validate key", probe3));
+    }
+  }
+  const before = await nameActiveCredential(origin);
+  const path = writeCredential(key, origin, void 0, account);
   r.done(
-    { path, origin },
-    `Signed in \u2014 key stored at ${path} (used by every vos platform verb)`
+    { path, origin, account, ...setAsideFacts(before, account) },
+    `Signed in${signedAs("", account)} \u2014 key stored at ${path} (used by every vos platform verb).${setAsideLine(before, account)}`
   );
   return EXIT_OK;
 }
+function signedAs(user, account) {
+  if (account) return ` as ${accountLabel(account)}`;
+  return user ? ` as ${user}` : "";
+}
+async function nameActiveCredential(origin) {
+  const active = readActive(DEFAULT_STORE);
+  if (!active || active.origin !== originOf(origin)) return active;
+  if (active.account) return active;
+  try {
+    const who = await apiJson(origin, "/api/user/whoami", { key: active.key });
+    const account = who.status === 200 ? accountFrom(who.body.user) : null;
+    if (!account) return active;
+    const named = { ...active, account };
+    activate(DEFAULT_STORE, named);
+    return named;
+  } catch {
+    return active;
+  }
+}
+function setAsideFacts(before, account) {
+  if (!before || account && before.account?.id === account.id) return {};
+  return before.account ? { setAside: before.account } : { replaced: true };
+}
+function setAsideLine(before, account) {
+  const facts = setAsideFacts(before, account);
+  if (facts.setAside)
+    return ` ${accountLabel(facts.setAside)} stays stored; vos switch ${facts.setAside.handle ?? facts.setAside.id} when you need it.`;
+  if (facts.replaced)
+    return " The credential stored before had no name on file and was replaced.";
+  return "";
+}
 function isTakeDir(target) {
   return directoryKind(target) === "take";
 }
@@ -9625,7 +9734,7 @@ async function cmdRename(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const res = await apiJson(origin, `/api/assets/${assetId}`, {
     method: "PATCH",
     key,
@@ -9648,7 +9757,7 @@ async function cmdPush(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const folderRef = strFlag(flags, "folder");
   const folder = folderRef ? resolveFolder(await listFolders(origin, key), folderRef) : null;
   const uploaded = [];
@@ -9729,7 +9838,7 @@ async function cmdImport(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const folderRef = strFlag(flags, "folder");
   const folder = folderRef ? resolveFolder(await listFolders(origin, key), folderRef) : null;
   const refused = fetchRefusal(url);
@@ -9813,7 +9922,7 @@ async function cmdList2(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const params = new URLSearchParams({
     limit: String(Math.min(200, Math.max(1, numFlag(flags, "limit", 50))))
   });
@@ -9846,7 +9955,7 @@ async function cmdUsage(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const res = await apiJson(origin, "/api/user/usage", { key });
   if (res.status !== 200) throw new Error(apiError("read usage", res));
   const usage = res.body.usage ?? {};
@@ -9873,7 +9982,7 @@ async function cmdWhy(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const res = await apiJson(origin, `/api/assets/${assetId}`, { key });
   if (res.status !== 200) throw new Error(apiError(`read ${assetId}`, res));
   const asset = hostedFile(res.body.asset);
@@ -9919,7 +10028,7 @@ async function cmdAsset(argv) {
 // src/plugin/remove.ts
 import { existsSync as existsSync16, rmSync as rmSync2, statSync as statSync3 } from "fs";
 import { join as join16 } from "path";
-import { createInterface as createInterface4 } from "readline/promises";
+import { createInterface as createInterface5 } from "readline/promises";
 
 // src/plugin/trash.ts
 var BOOLEAN_FLAGS4 = /* @__PURE__ */ new Set(["json", "help"]);
@@ -9968,7 +10077,7 @@ function context(flags) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   }).replace(/\/+$/, "");
-  return { origin, key: requireCredential(strFlag(flags, "key")) };
+  return { origin, key: requireCredential(credentialFlags(flags)) };
 }
 async function readTrash(ctx) {
   const res = await apiJson(ctx.origin, "/api/trash", { key: ctx.key });
@@ -10096,7 +10205,7 @@ async function cmdDelete(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   }).replace(/\/+$/, "");
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   const dir = existsSync16(target) && statSync3(target).isDirectory() ? target : null;
   const vosId = dir ? readSyncState(dir)?.vosId : parseVosId(target);
   if (!vosId)
@@ -10119,7 +10228,7 @@ async function cmdDelete(argv) {
       throw new UsageError(
         `"${title}" (${vosId}) would move to Trash: re-run with --yes to confirm, or --dry-run to only look`
       );
-    const rl = createInterface4({ input: process.stdin, output: process.stderr });
+    const rl = createInterface5({ input: process.stdin, output: process.stderr });
     const answer = await rl.question(
       `Move "${title}" (${vosId}) to Trash? It stays restorable there for a while (vos restore ${vosId}). [y/N] `
     );
@@ -12149,7 +12258,7 @@ async function cmdPush2(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = requireCredential(strFlag(flags, "key"));
+  const key = requireCredential(credentialFlags(flags));
   if (assetId) {
     const res = await apiJson(origin, `/api/assets/${assetId}/file`, {
       method: "PUT",
@@ -18021,7 +18130,6 @@ import {
   existsSync as existsSync30,
   mkdirSync as mkdirSync6,
   readFileSync as readFileSync12,
-  rmSync as rmSync3,
   writeFileSync as writeFileSync6
 } from "fs";
 import { homedir as homedir2 } from "os";
@@ -18115,7 +18223,7 @@ var RULES_BODY = `## Product videos (vosso)
 - Hand back: vos open take serves the take into the studio at vos.so, doc.json intact
 - Local by default: vos push only when asked for a link, the shelf or a cloud render
 - Deleting: vos delete moves a vos to Trash and vos restore brings it back; if you deleted by mistake, restore it and say so. Only the person can delete forever, at vos.so/app/trash
-- Credentials: VOS_API_KEY, then ~/.config/vos/credentials, then vos login; never print one
+- Credentials: VOS_API_KEY, then the account in use at ~/.config/vos/credentials (vos whoami says which; vos switch <handle> changes it), then vos login; never print one
 - Reference: https://vos.so/llms-full.txt`;
 var RULES_BLOCK = `${RULES_BEGIN}
 ${RULES_BODY}
@@ -18195,6 +18303,18 @@ var NODE_MIN_MAJOR = 18;
 function major(version) {
   return parseInt(version.split(".")[0] ?? "0", 10);
 }
+function credentialLine(facts) {
+  const accounts = facts.accounts ?? [];
+  const active = accounts.find((a) => a.active);
+  const others = accounts.filter((a) => !a.active).map((a) => a.label);
+  if (active) {
+    return `${active.label} \u2713${others.length ? ` (also ${others.join(", ")})` : ""}`;
+  }
+  if (facts.credential) {
+    return `present \u2713${others.length ? ` (stored: ${others.join(", ")}; vos switch to use one)` : ""}`;
+  }
+  return `absent (vos login when you need hosting)${others.length ? `; stored: ${others.join(", ")}, vos switch to use one` : ""}`;
+}
 function doctorReport(facts) {
   const lines = [];
   const nodeOk = major(facts.node) >= NODE_MIN_MAJOR;
@@ -18220,9 +18340,7 @@ function doctorReport(facts) {
   } else {
     lines.push("skills      none \u2717  run: npx vos setup");
   }
-  lines.push(
-    `credential  ${facts.credential ? "present \u2713" : "absent (vos login when you need hosting)"}`
-  );
+  lines.push(`credential  ${credentialLine(facts)}`);
   if (facts.devServer) {
     const d = facts.devServer;
     lines.push(
@@ -18280,6 +18398,7 @@ var BOOLEAN_FLAGS15 = /* @__PURE__ */ new Set([
   "no-rules",
   "no-browser"
 ]);
+var LOGOUT_FLAGS = /* @__PURE__ */ new Set([...BOOLEAN_FLAGS15, "all"]);
 var SKILLS_SOURCE = "vosjs/skills";
 var SKILLS_CLI_VERSION = "1.7.2";
 function skillsCatalogAt(version) {
@@ -18349,10 +18468,24 @@ async function doctorFacts(opts) {
     browser: probe2(),
     ffmpeg: ffmpegVersion(),
     skills: skillsFacts(opts.homes),
-    credential: resolveCredential() !== null,
+    credential: safeResolve() !== null,
+    accounts: storedAccounts(platformOrigin()),
     ...opts.url ? { devServer: await devServerFact(opts.url) } : {}
   };
 }
+function safeResolve() {
+  try {
+    return resolveCredential();
+  } catch {
+    return null;
+  }
+}
+function storedAccounts(origin, store = DEFAULT_STORE) {
+  return listStored(store, origin).map((c) => ({
+    label: accountLabel(c.account),
+    active: isActive(c, store)
+  }));
+}
 async function cmdSetup(argv) {
   const { flags } = parseArgs(argv, BOOLEAN_FLAGS15);
   const r = reporterFor(flags);
@@ -18512,29 +18645,42 @@ async function cmdWhoami(argv) {
     origin: strFlag(flags, "origin"),
     api: strFlag(flags, "api")
   });
-  const key = resolveCredential(strFlag(flags, "key"));
+  const stored = storedAccounts(origin);
+  const others = stored.filter((a) => !a.active).map((a) => a.label);
+  const alsoStored = others.length ? ` Also stored: ${others.join(", ")}; vos switch <name> to use one.` : "";
+  const key = resolveCredential({
+    key: strFlag(flags, "key"),
+    account: strFlag(flags, "account"),
+    origin
+  });
   if (!key) {
     r.done(
       {
         signedIn: false,
         origin,
+        accounts: stored,
         next_step: "vos login (only needed for hosting, sharing or cloud rendering)"
       },
-      `Not signed in to ${origin}. Recording and rendering need no account; vos login when you want a link.`
+      `Not signed in to ${origin}. Recording and rendering need no account; vos login when you want a link.${alsoStored}`
     );
     return EXIT_ERROR;
   }
+  const resolved = lastCredential();
+  const via = resolved?.via ?? "stored";
+  const viaLine = via === "flag" ? " (the key passed as --key)" : via === "env" ? " (from VOS_API_KEY, which outranks the stored credential)" : via === "account-flag" ? " (--account)" : via === "account-env" ? ` (${ACCOUNT_ENV})` : "";
   const res = await apiJson(origin, "/api/user/whoami", { key });
   if (res.status === 404) {
     r.done(
       {
         signedIn: true,
         origin,
+        via,
         user: null,
         key: null,
+        accounts: stored,
         next_step: "vos push when you want the work hosted"
       },
-      `A credential is present for ${origin} (this origin cannot say whose).`
+      `A credential is present for ${origin}${viaLine} (this origin cannot say whose).${alsoStored}`
     );
     return EXIT_OK;
   }
@@ -18543,44 +18689,150 @@ async function cmdWhoami(argv) {
       {
         signedIn: false,
         origin,
+        via,
         error: apiError("whoami", res),
+        accounts: stored,
         next_step: "vos login"
       },
-      `The stored credential is refused by ${origin}: ${apiError("whoami", res)}. Run vos login.`
+      `The stored credential is refused by ${origin}${viaLine}: ${apiError("whoami", res)}. Run vos login.${alsoStored}`
     );
     return EXIT_ERROR;
   }
   if (res.status !== 200) throw new Error(apiError("whoami", res));
   const user = res.body.user;
+  const actor = res.body.actor;
   const k = res.body.key;
   const who = user?.username ? `@${user.username}` : user?.name ?? "an account";
+  const orgLine = user?.kind === "org" ? ` (an organization${actor ? `, ${actor.username ? `@${actor.username}` : actor.name ?? "you"} recorded as the person behind it` : ""})` : "";
   const keyLine = k ? `key "${k.name ?? ""}" (${k.prefix ?? "\u2026"}, ${(k.scopes ?? []).join(", ") || "no scopes"})` : "a session, not a key";
+  if (via === "stored" && resolved && !resolved.account && user?.id) {
+    const active = readActive(DEFAULT_STORE);
+    if (active && active.key === key) {
+      activate(DEFAULT_STORE, {
+        ...active,
+        account: {
+          id: user.id,
+          kind: user.kind === "org" ? "org" : "person",
+          handle: user.username ?? null
+        }
+      });
+    }
+  }
   r.done(
     {
       signedIn: true,
       origin,
+      via,
       user,
+      actor: actor ?? null,
       key: k,
+      accounts: storedAccounts(origin),
       next_step: "vos push when you want the work hosted"
     },
-    `Signed in to ${origin} as ${who}, with ${keyLine}.`
+    `Signed in to ${origin} as ${who}${orgLine}, with ${keyLine}${viaLine}.${alsoStored}`
+  );
+  return EXIT_OK;
+}
+function cmdSwitch(argv) {
+  const { flags, positionals } = parseArgs(argv, BOOLEAN_FLAGS15);
+  const r = reporterFor(flags);
+  const origin = platformOrigin({
+    origin: strFlag(flags, "origin"),
+    api: strFlag(flags, "api")
+  });
+  const store = DEFAULT_STORE;
+  const stored = listStored(store, origin);
+  const active = readActive(store);
+  const target = switchTarget(
+    stored,
+    active?.key ?? null,
+    positionals[0],
+    origin
+  );
+  if (!target.ok) throw new UsageError(target.error);
+  const to = target.to;
+  if (active && active.key === to.key) {
+    r.done(
+      {
+        origin,
+        account: to.account,
+        changed: false,
+        accounts: storedAccounts(origin, store),
+        next_step: "vos push when you want the work hosted"
+      },
+      `${accountLabel(to.account)} is already the account in use on ${origin}.`
+    );
+    return EXIT_OK;
+  }
+  activate(store, to);
+  const envKey = Boolean(process.env.VOS_API_KEY?.trim());
+  r.done(
+    {
+      origin,
+      account: to.account,
+      changed: true,
+      accounts: storedAccounts(origin, store),
+      next_step: envKey ? "unset VOS_API_KEY; it outranks the stored credential" : "vos push when you want the work hosted"
+    },
+    `Now ${accountLabel(to.account)} on ${origin}${active?.account ? ` (${accountLabel(active.account)} stays stored)` : ""}.${envKey ? " VOS_API_KEY is set in this shell and still outranks it." : ""}`
   );
   return EXIT_OK;
 }
 function cmdLogout(argv) {
-  const { flags } = parseArgs(argv, BOOLEAN_FLAGS15);
+  const { flags, positionals } = parseArgs(argv, LOGOUT_FLAGS);
   const r = reporterFor(flags);
-  const had = existsSync30(CREDENTIALS_PATH);
-  rmSync3(CREDENTIALS_PATH, { force: true });
+  const origin = platformOrigin({
+    origin: strFlag(flags, "origin"),
+    api: strFlag(flags, "api")
+  });
+  const store = DEFAULT_STORE;
   const envKey = Boolean(process.env.VOS_API_KEY?.trim());
+  const envNote = envKey ? " VOS_API_KEY is still set in this shell and still resolves." : "";
+  const envStep = envKey ? "unset VOS_API_KEY as well; it still resolves" : "vos login when you next need hosting";
+  if (flags.all === true) {
+    const { had } = removeAll(store);
+    r.done(
+      {
+        path: CREDENTIALS_PATH,
+        removed: had,
+        all: true,
+        envCredential: envKey,
+        next_step: envStep
+      },
+      (had ? "Removed every stored credential." : "Nothing was stored.") + envNote
+    );
+    return EXIT_OK;
+  }
+  const ref = positionals[0];
+  const target = ref ? findStored(store, origin, ref) : readActive(store);
+  if (!target) {
+    const have = storedAccounts(origin, store);
+    r.done(
+      {
+        path: CREDENTIALS_PATH,
+        removed: false,
+        envCredential: envKey,
+        accounts: have,
+        next_step: envStep
+      },
+      (ref ? `Nothing stored for ${ref.startsWith("@") ? ref : `@${ref}`} on ${origin}.` : `Nothing stored at ${CREDENTIALS_PATH}.`) + (have.length ? ` Stored: ${have.map((a) => a.label).join(", ")}.` : "") + envNote
+    );
+    return EXIT_OK;
+  }
+  const { wasActive } = removeStored(store, target);
+  const left = storedAccounts(origin, store);
+  const leftLine = left.length ? wasActive ? ` Still stored: ${left.map((a) => a.label).join(", ")}; vos switch <name> to use one.` : ` ${left.find((a) => a.active)?.label ?? "another account"} stays in use.` : "";
   r.done(
     {
       path: CREDENTIALS_PATH,
-      removed: had,
+      removed: true,
+      account: target.account,
+      wasActive,
       envCredential: envKey,
-      next_step: envKey ? "unset VOS_API_KEY as well; it still resolves" : "vos login when you next need hosting"
+      accounts: left,
+      next_step: left.length && wasActive ? "vos switch <name>" : envStep
     },
-    (had ? `Removed ${CREDENTIALS_PATH}.` : `Nothing stored at ${CREDENTIALS_PATH}.`) + (envKey ? " VOS_API_KEY is still set in this shell and still resolves." : "")
+    `Removed ${accountLabel(target.account)} (${target.origin}).${leftLine}${envNote}`
   );
   return EXIT_OK;
 }
@@ -18689,15 +18941,22 @@ This machine (no account)
             agent, a credential (present or absent, never printed), and the
             dev server when --url names one. Exit 3 when no browser
   vos whoami [--json]
-            the key's name and the account it belongs to, never the key
-  vos logout [--json]
-            remove ~/.config/vos/credentials (VOS_API_KEY still resolves)
+            the account in use (its key's name, which rung resolved it) and
+            every other account stored for the origin, never a key
+  vos switch [<handle>] [--json]
+            use another stored account (with two stored, the other one);
+            vos login once per account, approving as it, stores them all
+  vos logout [<handle>] [--all] [--json]
+            forget the account in use, a named one, or every stored
+            credential (VOS_API_KEY still resolves)
 
 Platform (vos.so) \u2014 fetch, edit, push, pull, repeat
   vos login [--key <vos_sk_\u2026>] [--handoff <url>] [--label <name>] [--no-browser]
             sign in via the browser (approve at vos.so/cli/auth; works
             headless \u2014 print the URL, a human approves, the key stores
             itself). --key skips the browser (mint at vos.so/app/api).
+            Additive: the person picks the account on the approval page,
+            and every account signed in stays stored (vos switch).
             --handoff https://vos.so/h/\u2026 exchanges the setup link a
             signed-in person's line carries for a key, once, no click
   vos fetch <vosId|watch-url> [--out dir] [--media] [--json]
@@ -18761,7 +19020,8 @@ Platform (vos.so) \u2014 fetch, edit, push, pull, repeat
             kept) or the take's doc.json. ALWAYS pull before editing pushed work.
             --media also downloads the recording (+ mic/cam sidecars) beside
             the doc and re-anchors it, so digest/frames/render run locally
-            auth: --key, VOS_API_KEY, or ~/.config/vos/credentials; keys can
+            auth: --key, --account <handle>, VOS_API_KEY, VOS_ACCOUNT, or the
+            stored account in use (~/.config/vos/credentials); keys can
             never publish (visibility stays private; humans publish on vos.so)
   vos folder list
   vos folder create <name> [--parent <folderId|slug>] [--desc <text>]
@@ -18962,13 +19222,16 @@ doc.json edits arrive intact; a human can drag every zoom span. Keeps
 serving until Ctrl-C. The studio is https://vos.so by default (VOS_ORIGIN
 moves it; --studio http://localhost:6060 for a dev server).
 
-push/pull \u2014 the hosted iteration loop (credentials: --key, VOS_API_KEY, or
-~/.config/vos/credentials via vos login; origin via VOS_ORIGIN, default
-https://vos.so). A take push uploads the recording ONCE (content-addressed),
+push/pull \u2014 the hosted iteration loop (credentials: --key, --account <handle>,
+VOS_API_KEY, VOS_ACCOUNT, or the account in use at ~/.config/vos/credentials
+via vos login, one sign-in per account and vos switch between them; origin
+via VOS_ORIGIN, default https://vos.so). A take push uploads the recording ONCE (content-addressed),
 lowers doc.json, and creates a private vos (first push asks; --yes for
 headless) or a new version against the base in vos.json \u2014 a stale base
 prints the human's typed changelog and exits 1 (run pull, re-apply, push
-again). A protected conflict means the human touched those nodes in the
+again). vos.json also names the ACCOUNT the directory belongs to, and a
+verb on it uses the stored credential for that account before the active
+one, so a take fetched as an organization pushes as it with no switch. A protected conflict means the human touched those nodes in the
 studio: keep their values, or --override <id> ONLY when the user asked for
 that exact change. ALWAYS pass --label (what you did, one line) and --note
 (why: the user's ask) \u2014 the version history reads as a conversation, and an
@@ -20794,7 +21057,7 @@ reference and the only credential.`
   }).replace(/\/+$/, "");
   const landed = flags.wait === true ? await waitForLanded({
     origin: pushedTo,
-    key: requireCredential(strFlag(flags, "key")),
+    key: requireCredential(credentialFlags(flags)),
     vosId: result.vosId,
     versionId: result.versionId ?? null,
     log: (l) => r.log(l)
@@ -20915,6 +21178,8 @@ async function run(argv) {
         return await cmdWhoami(rest);
       case "logout":
         return cmdLogout(rest);
+      case "switch":
+        return cmdSwitch(rest);
       case "push": {
         const target = rest.find((a) => !a.startsWith("-"));
         if (target && isTakeDir(target)) return await cmdPush3(rest);
@@ -21177,4 +21442,4 @@ export {
   verbHelp,
   run
 };
-//# sourceMappingURL=chunk-NJBUBXFE.js.map
+//# sourceMappingURL=chunk-ACWV3Y6Y.js.map