@vosjs/cli 0.86.0 → 0.87.0

package/README.md

@@ -300,7 +300,7 @@ take/
   join.json        a joined take's inputs: each one's path, footage sha256 and media id, read by `vos join --keep-edits`
   outputs/         the files `download` steps kept, listed in meta.json's outputs
   page-sound/      the sound the page played during the take, listed in meta.json's media
-  vos.json         hosted tracking (vos id + base version), written by push, fetch and pull
+  vos.json         hosted tracking (vos id + base version, the origin and the account it belongs to), written by push, fetch and pull
   stills/          `vos frames` output + stills.json
   digest/          `vos digest` output: digest.json, <id>.full.png, <id>.crop.png, sheet.png
   kit/             `vos deliver` output: kit.json + the cuts
@@ -532,7 +532,7 @@ vos brand https://your.app --out BRAND.md                      # the brand kit,
 
 ## The vos.so loop
 
-Everything that runs on your machine is open source; [vos.so](https://vos.so) is the hosted platform: a studio for the human half of an edit, version history with a typed changelog, a shelf of projects and recipes. All vos.so traffic lives behind one client: one origin (`VOS_ORIGIN`, default `https://vos.so`; `--origin` per call), one credential ladder (`--key`, then `--account <handle>`, then `VOS_API_KEY`, then `VOS_ACCOUNT`, then the account in use at `~/.config/vos/credentials`; a `vos_rg_` remix grant is just a key), one tracking file (`vos.json` beside the artifact). **A person is many accounts** (themselves, and every organization they act for), so `vos login` is additive: the approval page asks which account the terminal is signed in as, every account signed in is stored by name under `~/.config/vos/accounts/<host>/<id>`, the one in use is copied to `~/.config/vos/credentials` (its first line is still the key, for every older reader), `vos switch [<handle>]` changes which, `vos whoami` says which is in use and what else is stored, and `--account <handle>` or `VOS_ACCOUNT` picks a stored one for a command without switching; a name nothing is stored under is refused in words, never answered with another account. A key acts for exactly the account it belongs to, so switching is choosing a key. Credentials are never printed, and a stored one is sent only to the origin it was minted for (a file written before the origin line is `https://vos.so`'s): a command aimed at another origin sends no key and says so, so pass `--key` or `VOS_API_KEY` for it, or `vos login --origin <it>`. Keys can never publish: pushes are private, and humans publish on vos.so.
+Everything that runs on your machine is open source; [vos.so](https://vos.so) is the hosted platform: a studio for the human half of an edit, version history with a typed changelog, a shelf of projects and recipes. All vos.so traffic lives behind one client: one origin (`VOS_ORIGIN`, default `https://vos.so`; `--origin` per call), one credential ladder (`--key`, then `--account <handle>`, then `VOS_API_KEY`, then `VOS_ACCOUNT`, then the account in use at `~/.config/vos/credentials`; a `vos_rg_` remix grant is just a key), one tracking file (`vos.json` beside the artifact). **A person is many accounts** (themselves, and every organization they act for), so `vos login` is additive: the approval page asks which account the terminal is signed in as, every account signed in is stored by name under `~/.config/vos/accounts/<host>/<id>`, the one in use is copied to `~/.config/vos/credentials` (its first line is still the key, for every older reader), `vos switch [<handle>]` changes which, `vos whoami` says which is in use and what else is stored, and `--account <handle>` or `VOS_ACCOUNT` picks a stored one for a command without switching; a name nothing is stored under is refused in words, never answered with another account. A DIRECTORY remembers whose work it is: `vos.json` carries the `origin` and the `account` of its last push or fetch, and a verb on it resolves the stored credential for that account before the active one, so switching is rarely needed; a directory whose account is not stored here says so before any request. A push to someone else's project address (`--folder <handle>/<slug>`) asks before starting your own copy of it (`--yes` headless). A key acts for exactly the account it belongs to, so switching is choosing a key. Credentials are never printed, and a stored one is sent only to the origin it was minted for (a file written before the origin line is `https://vos.so`'s): a command aimed at another origin sends no key and says so, so pass `--key` or `VOS_API_KEY` for it, or `vos login --origin <it>`. Keys can never publish: pushes are private, and humans publish on vos.so.
 
 ```bash
 vos login [--key <k>] [--label <name>] [--no-browser]   # browser sign-in: a code and a vos.so/cli/auth URL, a human approves (as themselves or an org), the key stores itself beside the ones already stored

package/dist/{assetManifest-QFJ7X6TT.js → assetManifest-UUKFWTLO.js}

@@ -4,12 +4,12 @@ import {
   localManifestRefs,
   pullManifest,
   uploadManifest
-} from "./chunk-V3RUNUNP.js";
-import "./chunk-PZP76YJI.js";
+} from "./chunk-2UFNOKVY.js";
+import "./chunk-PEW5GIZF.js";
 export {
   hostedLiteralWarnings,
   localManifestRefs,
   pullManifest,
   uploadManifest
 };
-//# sourceMappingURL=assetManifest-QFJ7X6TT.js.map
+//# sourceMappingURL=assetManifest-UUKFWTLO.js.map

package/dist/{chunk-V3RUNUNP.js → chunk-2UFNOKVY.js}

@@ -14,7 +14,7 @@ import {
   writeFileSafe,
   writeFileSafeSync,
   writeSyncState
-} from "./chunk-PZP76YJI.js";
+} from "./chunk-PEW5GIZF.js";
 
 // src/plugin/assetManifest.ts
 import { existsSync as existsSync4, readFileSync, realpathSync, rmSync } from "fs";
@@ -958,4 +958,4 @@ export {
   pullManifest,
   hostedLiteralWarnings
 };
-//# sourceMappingURL=chunk-V3RUNUNP.js.map
+//# sourceMappingURL=chunk-2UFNOKVY.js.map

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

@@ -10,7 +10,7 @@ import {
   reencodeStill,
   renderStill,
   videoFormat
-} from "./chunk-2LAXJZCG.js";
+} from "./chunk-EXDMMAPT.js";
 import {
   PREV_DOC_NAME,
   PasteFileRefusal,
@@ -46,7 +46,7 @@ import {
   uploadDocRefs,
   uploadManifest,
   writeJson
-} from "./chunk-V3RUNUNP.js";
+} from "./chunk-2UFNOKVY.js";
 import {
   ACCOUNT_ENV,
   CREDENTIALS_PATH,
@@ -62,6 +62,7 @@ import {
   bearerFor,
   clientId,
   containerMismatch,
+  credentialAccount,
   credentialFlags,
   deriveSlug,
   detailLine,
@@ -96,12 +97,13 @@ import {
   sniffMediaType,
   strFlag,
   switchTarget,
+  syncIdentity,
   writeCredential,
   writeFileSafe,
   writeOutput,
   writeOutputSync,
   writeSyncState
-} from "./chunk-PZP76YJI.js";
+} from "./chunk-PEW5GIZF.js";
 import {
   deadLine,
   deadWarns
@@ -7466,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";
 
@@ -7547,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 });
@@ -7567,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 {
@@ -7575,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`,
@@ -7812,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 });
   }
@@ -7952,11 +7976,16 @@ function hostOf(origin) {
 }
 
 // src/plugin/sync.ts
-function apiContext(flags) {
+function apiContext(flags, dir) {
   const origin = platformOrigin(flags);
   return {
     origin,
-    key: requireCredential({ key: flags.key, account: flags.account, origin })
+    key: requireCredential({
+      key: flags.key,
+      account: flags.account,
+      origin,
+      dir
+    })
   };
 }
 async function api(ctx, path, init) {
@@ -8048,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) {
@@ -8057,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] `
     );
@@ -8093,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);
   }
@@ -8186,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 };
   }
@@ -8236,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,
@@ -8245,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) {
@@ -8355,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,
@@ -8470,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,
@@ -8699,7 +8733,8 @@ async function cmdFetch(argv) {
     vosId,
     versionId: head,
     ...title ? { title } : {},
-    slug
+    slug,
+    ...await syncIdentity(origin, key)
   });
   let take = false;
   let mediaLine = "";
@@ -8966,8 +9001,8 @@ with their key: vos push ${source} --vos ${String(created2.id ?? "<id>")}`
     );
     return EXIT_OK;
   }
-  const key = requireCredential(credentialFlags(flags));
-  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 = [
@@ -9051,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}`;
@@ -9086,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({
@@ -9114,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}`;
@@ -9181,7 +9221,7 @@ async function cmdPullProgram(argv) {
       `no base version in ${dir}/vos.json \u2014 pass --since <versionId>`
     );
   }
-  const key = requireCredential(credentialFlags(flags));
+  const key = requireCredential({ ...credentialFlags(flags), dir });
   const res = await apiJson(
     origin,
     `/api/vos/${vosId}/changes?since=${encodeURIComponent(since)}`,
@@ -9253,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(
     {
@@ -9320,7 +9361,7 @@ 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");
@@ -9987,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"]);
@@ -10187,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] `
     );
@@ -19188,7 +19229,9 @@ via VOS_ORIGIN, default https://vos.so). A take push uploads the recording ONCE
 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
@@ -21399,4 +21442,4 @@ export {
   verbHelp,
   run
 };
-//# sourceMappingURL=chunk-ZXFO32KW.js.map
+//# sourceMappingURL=chunk-ACWV3Y6Y.js.map