@whatcha/cli 0.3.0 → 0.6.0

package/dist/commands/entry.js

@@ -0,0 +1,367 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseEntryArgs = parseEntryArgs;
+exports.runEntry = runEntry;
+const node_readline_1 = __importDefault(require("node:readline"));
+const node_util_1 = require("node:util");
+const session_1 = require("../auth/session");
+const errors_1 = require("../errors");
+const append_entry_1 = require("../lib/append-entry");
+const entry_edit_1 = require("../lib/entry-edit");
+const entry_get_1 = require("../lib/entry-get");
+const image_upload_1 = require("../lib/image-upload");
+const output_1 = require("../lib/output");
+const profile_family_1 = require("../lib/profile-family");
+const write_1 = require("./write");
+/**
+ * `whatcha entry update | delete` -- change or take back an entry that is
+ * already there (#117), by its id (`whatcha write` and `whatcha read
+ * --json` print it as `entryId`). The app's own calls:
+ *
+ *   update  PATCH /entries/{id}, optimistic-locked on the head commit
+ *   delete  DELETE /entries/{id} (a soft delete)
+ *
+ * Who may do either is the API's call -- the diary's `entry` update/delete
+ * permission, printed as the API's own error when refused. What this file
+ * adds is the CLI's one promise, nothing somebody else wrote is removed:
+ * replacing the text of an entry other people wrote in, or deleting it,
+ * needs `--all`, and `--mine` replaces only your own lines (lib/entry-edit.ts).
+ *
+ * Both run with no terminal at all: everything is a flag, and `delete`
+ * without `--yes` asks only when there is a terminal to ask at.
+ */
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const MAX_MESSAGE = 500;
+const MAX_MEDIA = 50;
+const UPDATE_USAGE = 'whatcha entry update <entry-id> [--text "..." | --text-file <path|->] [--mine | --all] [--title "..."] [--tag <tag>]... ' +
+    '[--image <file>]... [--remove-image <media-id>]... [--cover <file>] [--mood <mood>] [--location "..."] ' +
+    '[--lat <deg> --lng <deg>] [--message "..."] [--json]';
+const DELETE_USAGE = "whatcha entry delete <entry-id> [--yes] [--all] [--json]";
+const USAGE = `Usage:\n  ${UPDATE_USAGE}\n  ${DELETE_USAGE}`;
+const UPDATE_ONLY = ["text", "text-file", "mine", "title", "tag", "image", "remove-image", "cover", "mood", "location", "lat", "lng", "message"];
+function parseEntryArgs(argv) {
+    const [action, ...rest] = argv;
+    let values, positionals;
+    try {
+        ({ values, positionals } = (0, node_util_1.parseArgs)({
+            args: (0, write_1.negativeDegrees)(rest),
+            options: {
+                json: { type: "boolean", default: false },
+                text: { type: "string" },
+                "text-file": { type: "string" },
+                mine: { type: "boolean", default: false },
+                all: { type: "boolean", default: false },
+                title: { type: "string" },
+                tag: { type: "string", multiple: true },
+                image: { type: "string", multiple: true },
+                "remove-image": { type: "string", multiple: true },
+                cover: { type: "string" },
+                mood: { type: "string" },
+                location: { type: "string" },
+                lat: { type: "string" },
+                lng: { type: "string" },
+                message: { type: "string" },
+                yes: { type: "boolean", short: "y", default: false },
+            },
+            allowPositionals: true,
+        }));
+    }
+    catch (err) {
+        throw new errors_1.CliUsageError(err.message);
+    }
+    const json = values.json;
+    const entryId = () => {
+        if (positionals.length === 0)
+            throw new errors_1.CliUsageError(`Which entry? Give its id (\`whatcha read --json\` prints it as entryId).\n${USAGE}`);
+        if (positionals.length > 1)
+            throw new errors_1.CliUsageError(`Unexpected extra argument: "${positionals[1]}"`);
+        if (!UUID_RE.test(positionals[0])) {
+            throw new errors_1.CliUsageError(`An entry id is a UUID (\`whatcha read --json\` prints it as entryId), got "${positionals[0]}".`);
+        }
+        return positionals[0].toLowerCase();
+    };
+    switch (action) {
+        case "update":
+            if (values.yes)
+                throw new errors_1.CliUsageError(`--yes does not apply to \`whatcha entry update\`.\nUsage: ${UPDATE_USAGE}`);
+            return parseUpdate(values, entryId(), json);
+        case "delete":
+            for (const name of UPDATE_ONLY) {
+                const v = values[name];
+                if (v !== undefined && v !== false)
+                    throw new errors_1.CliUsageError(`--${name} does not apply to \`whatcha entry delete\`.\nUsage: ${DELETE_USAGE}`);
+            }
+            return { action, json, entryId: entryId(), yes: values.yes, all: values.all };
+        default:
+            throw new errors_1.CliUsageError(action ? `Unknown entry action "${action}".\n${USAGE}` : USAGE);
+    }
+}
+function parseUpdate(values, entryId, json) {
+    const textFile = values["text-file"];
+    const text = values.text;
+    if (text !== undefined && textFile !== undefined)
+        throw new errors_1.CliUsageError("Give --text or --text-file, not both.");
+    if (textFile !== undefined && !textFile.trim())
+        throw new errors_1.CliUsageError("--text-file takes a path, or - for standard input.");
+    const mine = values.mine;
+    const all = values.all;
+    const hasText = text !== undefined || textFile !== undefined;
+    if (mine && all)
+        throw new errors_1.CliUsageError("Give --mine or --all, not both.");
+    if ((mine || all) && !hasText)
+        throw new errors_1.CliUsageError(`${mine ? "--mine" : "--all"} says which text to replace; give the new text with --text or --text-file.`);
+    // Empty text is only "remove my part" -- an entry's whole text is never blanked by accident.
+    if (text !== undefined && !text.trim() && !mine) {
+        throw new errors_1.CliUsageError("--text must not be empty (with --mine, an empty --text removes your part).");
+    }
+    const title = values.title?.trim();
+    if (title !== undefined) {
+        if (!title)
+            throw new errors_1.CliUsageError("--title must not be empty.");
+        if (title.length > append_entry_1.MAX_TITLE_LENGTH)
+            throw new errors_1.CliUsageError(`--title is at most ${append_entry_1.MAX_TITLE_LENGTH} characters.`);
+    }
+    const rawTags = values.tag;
+    for (const t of rawTags ?? []) {
+        if (!t.trim())
+            throw new errors_1.CliUsageError("--tag must not be empty.");
+        if (t.trim().length > append_entry_1.MAX_TAG_LENGTH)
+            throw new errors_1.CliUsageError(`A --tag is at most ${append_entry_1.MAX_TAG_LENGTH} characters: "${t}".`);
+    }
+    const tags = rawTags ? (0, append_entry_1.normalizeTags)(rawTags) : undefined;
+    if (tags && tags.length > append_entry_1.MAX_TAGS)
+        throw new errors_1.CliUsageError(`At most ${append_entry_1.MAX_TAGS} tags per entry.`);
+    const mood = values.mood?.trim();
+    if (mood !== undefined) {
+        if (!mood)
+            throw new errors_1.CliUsageError(`--mood must not be empty (the app's are ${write_1.APP_MOODS.join(" ")}).`);
+        if (mood.length > append_entry_1.MAX_MOOD_LENGTH)
+            throw new errors_1.CliUsageError(`--mood is at most ${append_entry_1.MAX_MOOD_LENGTH} characters.`);
+    }
+    const location = values.location?.trim();
+    if (location !== undefined) {
+        if (!location)
+            throw new errors_1.CliUsageError("--location must not be empty.");
+        if (location.length > append_entry_1.MAX_LOCATION_LENGTH)
+            throw new errors_1.CliUsageError(`--location is at most ${append_entry_1.MAX_LOCATION_LENGTH} characters.`);
+    }
+    const rawLat = values.lat;
+    const rawLng = values.lng;
+    if ((rawLat === undefined) !== (rawLng === undefined))
+        throw new errors_1.CliUsageError("Give --lat and --lng together: a point needs both.");
+    const coordinates = rawLat !== undefined && rawLng !== undefined ? { lat: (0, write_1.degrees)(rawLat, "--lat", 90), lng: (0, write_1.degrees)(rawLng, "--lng", 180) } : undefined;
+    const images = values.image ?? [];
+    if (images.some((f) => !f.trim()))
+        throw new errors_1.CliUsageError("--image takes a file path.");
+    const removeImages = (values["remove-image"] ?? []).map((id) => id.trim().toLowerCase());
+    for (const id of removeImages) {
+        if (!UUID_RE.test(id))
+            throw new errors_1.CliUsageError(`--remove-image takes an image's id (\`whatcha read --json\` lists them as images), got "${id}".`);
+    }
+    const cover = values.cover;
+    if (cover !== undefined && !cover.trim())
+        throw new errors_1.CliUsageError("--cover takes a file path.");
+    const message = values.message?.trim();
+    if (message !== undefined && message.length > MAX_MESSAGE)
+        throw new errors_1.CliUsageError(`--message is at most ${MAX_MESSAGE} characters.`);
+    const changesSomething = hasText || title !== undefined || tags !== undefined || mood !== undefined || location !== undefined ||
+        coordinates !== undefined || images.length > 0 || removeImages.length > 0 || cover !== undefined;
+    if (!changesSomething)
+        throw new errors_1.CliUsageError(`Nothing to update -- give the text or a field to change.\nUsage: ${UPDATE_USAGE}`);
+    return {
+        action: "update",
+        json,
+        entryId,
+        ...(text !== undefined ? { text } : {}),
+        ...(textFile !== undefined ? { textFile } : {}),
+        mine,
+        all,
+        ...(title !== undefined ? { title } : {}),
+        ...(tags !== undefined ? { tags } : {}),
+        ...(mood !== undefined ? { mood } : {}),
+        ...(location !== undefined ? { location } : {}),
+        ...(coordinates ? { coordinates } : {}),
+        images,
+        removeImages,
+        ...(cover !== undefined ? { cover } : {}),
+        ...(message ? { message } : {}),
+    };
+}
+async function runEntry(opts, deps = {}) {
+    return opts.action === "update" ? runUpdate(opts, deps) : runDelete(opts, deps);
+}
+function concurrentSave(err) {
+    return new errors_1.CliUsageError("Someone else saved to this entry while whatcha was updating it. Nothing was overwritten -- " +
+        `run the same command again to retry. (${err.message})`);
+}
+async function readableEntry(client, entryId) {
+    try {
+        return await (0, entry_get_1.getEntry)(client, entryId);
+    }
+    catch (err) {
+        if (err instanceof errors_1.ApiError && err.status === 404) {
+            throw new errors_1.CliUsageError(`No entry with id ${entryId} (it was deleted, or is not visible to you).`);
+        }
+        throw err;
+    }
+}
+async function runUpdate(opts, deps) {
+    // Every local file is read and checked before anything is sent, so a wrong path changes nothing.
+    let text = opts.text;
+    if (opts.textFile !== undefined) {
+        text = await (0, write_1.readTextFile)(opts.textFile, deps.stdin);
+        if (!text.trim() && !opts.mine) {
+            throw new errors_1.CliUsageError(`${opts.textFile === "-" ? "Standard input" : opts.textFile} has no text.`);
+        }
+    }
+    const images = [];
+    for (const path of opts.images)
+        images.push(await (0, image_upload_1.readImageFile)(path));
+    const coverFile = opts.cover !== undefined ? await (0, image_upload_1.readImageFile)(opts.cover) : undefined;
+    const client = deps.client ?? (await (0, session_1.authenticatedClient)()).client;
+    const entry = await readableEntry(client, opts.entryId);
+    if (entry.isLocked)
+        throw new errors_1.CliUsageError("This entry is locked (Time Capsule) and cannot be changed until it opens.");
+    let body = entry.body;
+    let textMode = null;
+    if (text !== undefined) {
+        const me = await (0, profile_family_1.currentProfile)(client);
+        const blame = await (0, entry_edit_1.getBlame)(client, entry.id, entry.headCommitId);
+        if (opts.mine) {
+            if (!(0, entry_edit_1.blameMatches)(blame, entry.body)) {
+                throw new errors_1.CliUsageError("This entry changed while whatcha was reading it. Nothing was changed -- run the command again.");
+            }
+            body = (0, entry_edit_1.replaceMyPart)(blame, me.id, text);
+            textMode = "mine";
+        }
+        else {
+            const others = (0, entry_edit_1.otherWriters)(blame, me.id);
+            if (others.length > 0 && !opts.all) {
+                throw new errors_1.CliUsageError(`${others.join(", ")} also wrote in this entry. Nothing was changed. Use --mine to replace only ` +
+                    "the part you wrote, or --all to replace the whole text, theirs included.");
+            }
+            body = text;
+            textMode = "all";
+        }
+    }
+    // Images: the entry's own, minus the ones taken off, then the new ones.
+    const current = (0, entry_get_1.entryMedia)(entry);
+    const missing = opts.removeImages.filter((id) => !current.some((m) => m.mediaAssetId.toLowerCase() === id));
+    if (missing.length > 0) {
+        throw new errors_1.CliUsageError(`This entry has no image ${missing.join(", ")} (\`whatcha read --json\` lists its images). Nothing was changed.`);
+    }
+    const kept = current.filter((m) => !opts.removeImages.includes(m.mediaAssetId.toLowerCase()));
+    if (kept.length + images.length > MAX_MEDIA)
+        throw new errors_1.CliUsageError(`An entry holds at most ${MAX_MEDIA} images. Nothing was changed.`);
+    // Into the diary's own group: an entry can only show media of its group.
+    const imageIds = [];
+    let coverId;
+    if (images.length > 0 || coverFile) {
+        const diary = await client.get(`/diaries/${entry.diaryId}`);
+        for (const image of images)
+            imageIds.push(await (0, image_upload_1.uploadImage)(client, diary.groupId, image));
+        if (coverFile)
+            coverId = await (0, image_upload_1.uploadImage)(client, diary.groupId, coverFile);
+    }
+    let header = (0, append_entry_1.headerOf)(entry);
+    if (opts.title !== undefined)
+        header = { ...header, title: opts.title };
+    if (opts.tags !== undefined)
+        header = { ...header, tags: opts.tags };
+    if (opts.mood !== undefined)
+        header = { ...header, mood: opts.mood };
+    if (opts.location !== undefined)
+        header = { ...header, location: opts.location };
+    if (opts.coordinates)
+        header = { ...header, locationLat: opts.coordinates.lat, locationLng: opts.coordinates.lng };
+    if (coverId)
+        header = { ...header, coverMediaAssetId: coverId };
+    const changesMedia = opts.removeImages.length > 0 || imageIds.length > 0;
+    const media = [...kept, ...imageIds.map((mediaAssetId) => ({ mediaAssetId }))];
+    // A `PATCH /entries` save writes the header from `content`, which has no
+    // field for the time range, so a range the entry has is saved again after.
+    const range = await (0, append_entry_1.readRange)(client, entry.diaryId, entry.id);
+    let headCommitId;
+    try {
+        const saved = await client.patch(`/entries/${entry.id}`, {
+            content: { body, ...header },
+            ...(changesMedia ? { media } : {}),
+            expectedHeadCommitId: entry.headCommitId,
+            ...(opts.message ? { commitMessage: opts.message } : {}),
+        });
+        headCommitId = saved.headCommitId;
+    }
+    catch (err) {
+        if (err instanceof errors_1.ApiError && err.status === 409)
+            throw concurrentSave(err);
+        throw err;
+    }
+    if (range)
+        headCommitId = await (0, append_entry_1.saveRange)(client, entry.diaryId, entry.id, range, headCommitId);
+    if (opts.json) {
+        (0, output_1.printJson)({
+            ok: true,
+            entryId: entry.id,
+            diaryId: entry.diaryId,
+            headCommitId,
+            text: textMode ?? "unchanged",
+            title: header.title,
+            tags: header.tags,
+            images: media.map((m) => m.mediaAssetId),
+            coverMediaAssetId: header.coverMediaAssetId ?? null,
+        });
+    }
+    else {
+        const what = textMode === "mine" ? "your part of the text" : textMode === "all" ? "the text" : "the entry";
+        (0, output_1.printLine)(`Updated ${what}${imageIds.length > 0 ? ` (+${imageIds.length} image${imageIds.length === 1 ? "" : "s"})` : ""}. entryId=${entry.id}`);
+    }
+    return { exitCode: 0 };
+}
+function askOnTerminal(question) {
+    return new Promise((resolve) => {
+        // On stderr, so `--json` stdout stays the one object it promises.
+        const rl = node_readline_1.default.createInterface({ input: process.stdin, output: process.stderr });
+        rl.question(question, (answer) => {
+            rl.close();
+            resolve(answer);
+        });
+    });
+}
+async function runDelete(opts, deps) {
+    const client = deps.client ?? (await (0, session_1.authenticatedClient)()).client;
+    const entry = await readableEntry(client, opts.entryId);
+    if (!opts.all) {
+        const me = await (0, profile_family_1.currentProfile)(client);
+        const others = (0, entry_edit_1.otherWriters)(await (0, entry_edit_1.getBlame)(client, entry.id, entry.headCommitId), me.id);
+        if (others.length > 0) {
+            throw new errors_1.CliUsageError(`${others.join(", ")} also wrote in this entry, so deleting it deletes their writing too. Nothing was deleted. ` +
+                `To take back only your part: whatcha entry update ${entry.id} --mine --text "". ` +
+                "To delete the whole entry anyway: add --all.");
+        }
+    }
+    if (!opts.yes) {
+        const isTTY = deps.isTTY ?? Boolean(process.stdin.isTTY && process.stderr.isTTY);
+        if (!isTTY) {
+            throw new errors_1.CliUsageError("Not deleting: there is no terminal to confirm at. Add --yes to delete without asking.");
+        }
+        const label = `${entry.occurredAt.slice(0, 10)}${entry.title ? ` "${entry.title}"` : ""}`;
+        const answer = await (deps.confirm ?? askOnTerminal)(`Delete the entry ${label} (${entry.id})? [y/N] `);
+        if (!/^y(es)?$/i.test(answer.trim())) {
+            if (opts.json)
+                (0, output_1.printJson)({ ok: true, entryId: entry.id, deleted: false });
+            else
+                (0, output_1.printErrorLine)("Not deleted.");
+            return { exitCode: 1 };
+        }
+    }
+    await client.delete(`/entries/${entry.id}`);
+    if (opts.json)
+        (0, output_1.printJson)({ ok: true, entryId: entry.id, diaryId: entry.diaryId, deleted: true });
+    else
+        (0, output_1.printLine)(`Deleted the entry ${entry.id}.`);
+    return { exitCode: 0 };
+}
+//# sourceMappingURL=entry.js.map

package/dist/commands/entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../src/commands/entry.ts"],"names":[],"mappings":"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"}

package/dist/commands/profiles.js

@@ -5,6 +5,8 @@ exports.runProfiles = runProfiles;
 exports.parseRemoveArgs = parseRemoveArgs;
 exports.runRemove = runRemove;
 exports.parseAddArgs = parseAddArgs;
+exports.parseAvatarArgs = parseAvatarArgs;
+exports.runAvatar = runAvatar;
 exports.runAdd = runAdd;
 exports.parseSwitchArgs = parseSwitchArgs;
 exports.runSwitch = runSwitch;
@@ -34,14 +36,15 @@ const label = (p) => p.displayName && p.displayName.length > 0 ? p.displayName :
 async function runProfiles(opts, deps = {}) {
     const resolved = deps.client ? null : await (0, session_1.authenticatedClient)();
     const client = deps.client ?? resolved.client;
-    const session = deps.session ?? resolved.session;
     const switcher = await client.get("/me/profiles");
+    // The server's answer, not the saved note (#58).
+    const current = (await (0, profile_family_1.currentProfile)(client)).id;
     if (opts.json) {
-        (0, output_1.printJson)({ ok: true, ...switcher, currentProfileId: session.userId });
+        (0, output_1.printJson)({ ok: true, ...switcher, currentProfileId: current });
         return { exitCode: 0 };
     }
     for (const p of switcher.profiles) {
-        const here = p.id === session.userId ? "* " : "  ";
+        const here = p.id === current ? "* " : "  ";
         const kind = p.parentProfileId === null ? "  (account)" : "";
         (0, output_1.printLine)(`${here}@${p.username ?? "?"}  ${label(p)}${kind}`);
     }
@@ -130,6 +133,79 @@ function parseAddArgs(argv) {
     }
     return { username, displayName, avatar: values.avatar, json: values.json };
 }
+/** Reads an avatar file and checks it against `POST /me/avatar`'s limits. */
+async function readAvatarFile(path) {
+    const avatar = await (0, image_upload_1.readImageFile)(path);
+    if (avatar.bytes.length > MAX_AVATAR_BYTES) {
+        throw new errors_1.CliUsageError(`${avatar.path} is over 5 MB; an avatar is at most 5 MB.`);
+    }
+    return avatar;
+}
+/** `POST /me/avatar` as whoever `client` is. The new avatar's URL. */
+async function setAvatar(client, avatar) {
+    const set = await client.post("/me/avatar", {
+        fileName: avatar.fileName,
+        contentType: avatar.contentType,
+        dataBase64: Buffer.from(avatar.bytes).toString("base64"),
+    });
+    return set.avatarUrl;
+}
+function parseAvatarArgs(argv) {
+    let values;
+    let positionals;
+    try {
+        ({ values, positionals } = (0, node_util_1.parseArgs)({
+            args: argv,
+            options: { json: { type: "boolean", default: false } },
+            allowPositionals: true,
+        }));
+    }
+    catch (err) {
+        throw new errors_1.CliUsageError(err.message);
+    }
+    const [target, file, extra] = positionals;
+    if (!target || !file)
+        throw new errors_1.CliUsageError("Usage: whatcha profile-avatar <@handle> <file> [--json]");
+    if (extra !== undefined)
+        throw new errors_1.CliUsageError(`Unexpected extra argument: "${extra}"`);
+    return { target, file, json: values.json };
+}
+/**
+ * Change an existing profile's avatar (#50) -- until now only `profile-add
+ * --avatar` could set one, at creation. The profile the CLI is signed in
+ * as sets its own; another of this login's sub-profiles is set through a
+ * session for it, used once and dropped, as `profile-add` does. The account
+ * itself cannot be reached from a sub-profile (the API refuses that on
+ * purpose), so that case says to switch back first.
+ */
+async function runAvatar(opts, deps = {}) {
+    const avatar = await readAvatarFile(opts.file);
+    const resolved = deps.client ? null : await (0, session_1.authenticatedClient)();
+    const client = deps.client ?? resolved.client;
+    const forToken = deps.clientForToken ?? (0, profile_family_1.bearerClients)(resolved?.session.apiBaseUrl || (0, config_1.apiBaseUrl)());
+    const switcher = await client.get("/me/profiles");
+    const target = (0, profile_family_1.findProfile)(switcher.profiles, opts.target);
+    if (!target) {
+        throw new errors_1.CliUsageError(`No profile "${opts.target}". Run \`whatcha profiles\` to see them.`);
+    }
+    // Who the credential is, asked of the server (#58): a stale saved id made
+    // this set the ACCOUNT's avatar while naming a sub-profile.
+    const current = await (0, profile_family_1.currentProfile)(client);
+    let asTarget;
+    if (target.id === current.id)
+        asTarget = client;
+    else if (target.parentProfileId === null) {
+        throw new errors_1.CliUsageError("That is the account. Run `whatcha switch --account` first, then this again.");
+    }
+    else
+        asTarget = await (0, profile_family_1.clientAsProfile)(client, target.id, forToken);
+    const avatarUrl = await setAvatar(asTarget, avatar);
+    if (opts.json)
+        (0, output_1.printJson)({ ok: true, profileId: target.id, avatarUrl });
+    else
+        (0, output_1.printLine)(`Changed the avatar of @${target.username ?? target.id}.`);
+    return { exitCode: 0 };
+}
 /**
  * Create a sub-profile (#1699): `POST /me/profiles`, the call the app's
  * "Add a profile" dialog makes. The plan's limit and a taken @handle are
@@ -144,10 +220,7 @@ function parseAddArgs(argv) {
  * than undone -- the profile is real and usable, just without a picture.
  */
 async function runAdd(opts, deps = {}) {
-    const avatar = opts.avatar !== undefined ? await (0, image_upload_1.readImageFile)(opts.avatar) : undefined;
-    if (avatar && avatar.bytes.length > MAX_AVATAR_BYTES) {
-        throw new errors_1.CliUsageError(`${avatar.path} is over 5 MB; an avatar is at most 5 MB.`);
-    }
+    const avatar = opts.avatar !== undefined ? await readAvatarFile(opts.avatar) : undefined;
     const resolved = deps.client ? null : await (0, session_1.authenticatedClient)();
     const client = deps.client ?? resolved.client;
     const forToken = deps.clientForToken ?? (0, profile_family_1.bearerClients)(resolved?.session.apiBaseUrl || (0, config_1.apiBaseUrl)());
@@ -159,12 +232,7 @@ async function runAdd(opts, deps = {}) {
     if (avatar) {
         try {
             const asProfile = await (0, profile_family_1.clientAsProfile)(client, profile.id, forToken);
-            const set = await asProfile.post("/me/avatar", {
-                fileName: avatar.fileName,
-                contentType: avatar.contentType,
-                dataBase64: Buffer.from(avatar.bytes).toString("base64"),
-            });
-            profile = { ...profile, avatarUrl: set.avatarUrl };
+            profile = { ...profile, avatarUrl: await setAvatar(asProfile, avatar) };
         }
         catch (err) {
             if (!(err instanceof errors_1.ApiError))
@@ -178,7 +246,7 @@ async function runAdd(opts, deps = {}) {
         (0, output_1.printLine)(`Created @${profile.username ?? opts.username} (${label(profile)}). Run \`whatcha switch @${profile.username ?? opts.username}\` to write as it.`);
     if (avatarError) {
         (0, output_1.printErrorLine)(`WARNING: the profile was created, but its avatar could not be set (${avatarError.code}: ${avatarError.message}). ` +
-            "Set it in the app, under the profile's settings.");
+            `Try again with \`whatcha profile-avatar @${profile.username ?? opts.username} <file>\`.`);
         return { exitCode: 2 };
     }
     return { exitCode: 0 };
@@ -209,36 +277,53 @@ function parseSwitchArgs(argv) {
     }
     return { target, toAccount, json: values.json };
 }
+/**
+ * Saves `session` with its `userId` / `email` set to who `client` is on the
+ * server (#58). The saved id is only a note beside the credential; it has
+ * to be rewritten whenever the credential changes, or every check that
+ * reads it (and 0.4.0 had several) answers for the wrong profile.
+ */
+async function saveAs(session, who, stores) {
+    const next = { ...session, userId: who.id, email: who.email };
+    await (0, session_1.saveSession)(next, stores);
+    return next;
+}
 async function runSwitch(opts, deps = {}) {
     const stores = deps.stores ?? (0, token_store_1.candidateStores)();
+    const reopen = deps.reopen ?? (() => (0, session_1.authenticatedClient)(stores));
     const resolved = deps.client ? null : await (0, session_1.authenticatedClient)(stores);
     const client = deps.client ?? resolved.client;
     const session = (deps.session ?? resolved.session);
     if (opts.toAccount) {
         const { accountRefreshToken: _dropped, accountKey, ...rest } = session;
+        let restored;
         if (accountKey) {
             // Logged in with a personal access key (#1663): the way back is the
             // key itself, which needs no refresh.
-            await (0, session_1.saveSession)({ ...rest, accessToken: accountKey, refreshToken: "", expiresAt: 0, authKind: "key" }, stores);
-            if (opts.json)
-                (0, output_1.printJson)({ ok: true, switchedTo: "account" });
-            else
-                (0, output_1.printLine)("Back on the account.");
-            return { exitCode: 0 };
+            restored = { ...rest, accessToken: accountKey, refreshToken: "", expiresAt: 0, authKind: "key" };
         }
-        const back = session.accountRefreshToken;
-        if (!back) {
-            throw new errors_1.CliUsageError("Already on the account.");
+        else {
+            const back = session.accountRefreshToken;
+            if (!back) {
+                throw new errors_1.CliUsageError("Already on the account.");
+            }
+            // An access token cannot be derived here, so the stored one is left
+            // expired on purpose: reopening it below refreshes from the refresh
+            // token, the same path a session that sat unused overnight takes.
+            restored = { ...rest, refreshToken: back, expiresAt: 0, authKind: "session" };
         }
-        // An access token cannot be derived here, so the stored one is left
-        // expired on purpose: authenticatedClient() refreshes from the refresh
-        // token on the very next command, which is the same path a session that
-        // sat unused overnight takes.
-        await (0, session_1.saveSession)({ ...rest, refreshToken: back, expiresAt: 0, authKind: "session" }, stores);
+        await (0, session_1.saveSession)(restored, stores);
+        // #58: `rest` still carries the sub-profile's id and (absent) email.
+        // Reopen the account's credential now and ask the server who it is,
+        // so the saved note is the account's -- and a credential that no
+        // longer works fails here rather than on the next command.
+        const opened = await reopen();
+        const me = await (0, profile_family_1.currentProfile)(opened.client);
+        await saveAs(opened.session, me, stores);
         if (opts.json)
-            (0, output_1.printJson)({ ok: true, switchedTo: "account" });
+            (0, output_1.printJson)({ ok: true, switchedTo: "account", profileId: me.id });
         else
-            (0, output_1.printLine)("Back on the account.");
+            (0, output_1.printLine)(`Back on the account (@${me.username ?? me.id}).`);
         return { exitCode: 0 };
     }
     const switcher = await client.get("/me/profiles");
@@ -249,7 +334,11 @@ async function runSwitch(opts, deps = {}) {
     if (target.parentProfileId === null) {
         throw new errors_1.CliUsageError("To go back to the account, run `whatcha switch --account`.");
     }
-    if (target.id === session.userId) {
+    // "Already there" is the server's call, not the saved id's (#58).
+    const current = await (0, profile_family_1.currentProfile)(client);
+    if (target.id === current.id) {
+        if (session.userId !== current.id || session.email !== current.email)
+            await saveAs(session, current, stores);
         if (opts.json)
             (0, output_1.printJson)({ ok: true, switchedTo: target.id, alreadyThere: true });
         else
@@ -257,6 +346,9 @@ async function runSwitch(opts, deps = {}) {
         return { exitCode: 0 };
     }
     const issued = await client.post(`/me/profiles/${target.id}/session`, {});
+    if (issued.profileId && issued.profileId !== target.id) {
+        throw new errors_1.CliUsageError(`The server issued a session for ${issued.profileId}, not @${target.username ?? target.id}; nothing was changed.`);
+    }
     // The account's credential is carried over BEFORE the session is
     // replaced: after this save it is the only copy, and losing it would
     // strand the CLI inside a sub-profile. A key login (#1663) has no refresh
@@ -267,7 +359,7 @@ async function runSwitch(opts, deps = {}) {
     const { accountRefreshToken: _r, accountKey: _k, ...base } = session;
     const next = {
         ...base,
-        userId: issued.profileId,
+        userId: target.id,
         // A sub-profile has no address of its own; the internal one the API
         // holds for GoTrue is never handed out and must not be stored here.
         email: null,
@@ -279,7 +371,7 @@ async function runSwitch(opts, deps = {}) {
     };
     await (0, session_1.saveSession)(next, stores);
     if (opts.json)
-        (0, output_1.printJson)({ ok: true, switchedTo: issued.profileId });
+        (0, output_1.printJson)({ ok: true, switchedTo: target.id });
     else
         (0, output_1.printLine)(`Writing as @${target.username ?? target.id}.`);
     return { exitCode: 0 };