faces-cli 1.8.2 → 1.8.4

package/dist/commands/style/revert.js

@@ -3,9 +3,10 @@ import { BaseCommand } from '../../base.js';
 import { FacesAPIError } from '../../client.js';
 import { VERSIONS_PATH } from '../../style.js';
 export default class StyleRevert extends BaseCommand {
-    static description = 'Go back to the style a face had before the last style:make. A face holds one style per medium, so ' +
-        'name which one with --medium when it has more than one. Two versions are kept per medium, so this ' +
-        'goes back exactly one step. It changes how the face writes immediately, so it asks first.';
+    static description = 'Go back to the style a face had before the last style:make. Two versions are kept per medium, so ' +
+        'this is a toggle: running it again returns to where you started. A face holds one style per medium, ' +
+        'so name which one with --medium when it has more than one. It changes how the face writes ' +
+        'immediately, so it asks first.';
     static examples = [
         '<%= config.bin %> <%= command.id %> alice --yes',
         '<%= config.bin %> <%= command.id %> alice --medium email --yes',
@@ -50,13 +51,6 @@ export default class StyleRevert extends BaseCommand {
                 if (err.statusCode === 409) {
                     this.error(`Error (409): ${err.message}\nSee what is there: faces style:versions ${args.alias}`);
                 }
-                // Reverting a named medium currently fails this way even when the
-                // server itself reports can_revert: true (faces-backend-shared#590).
-                if (err.statusCode === 500) {
-                    this.error(`Error (500): the server failed to revert '${args.alias}'.\n` +
-                        'Reverting a per-medium style is currently broken upstream and nothing was changed. ' +
-                        'Tracked as faces-backend-shared#590.');
-                }
                 this.error(`Error (${err.statusCode}): ${err.message}`);
             }
             throw err;
@@ -71,8 +65,11 @@ export default class StyleRevert extends BaseCommand {
         else {
             this.log(`'${args.alias}' reverted.`);
         }
-        this.log(`To undo this, capture the style again: faces style:make ${args.alias} --all`);
-        this.log(`List versions: faces style:versions ${args.alias}`);
+        // Reverting again returns to where you started — it is a toggle between the
+        // two kept versions, not a walk backwards. Name the version it goes back to
+        // so the user does not have to hold it in their head.
+        const back = from === undefined ? '' : ` to return to version ${from}`;
+        this.log(`Run it again${back}. List versions: faces style:versions ${args.alias}`);
         return data;
     }
 }

package/dist/commands/team/add.d.ts

@@ -10,5 +10,6 @@ export default class TeamAdd extends BaseCommand {
     static args: {
         team_id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
+    static examples: string[];
     run(): Promise<unknown>;
 }

package/dist/commands/team/add.js

@@ -4,8 +4,8 @@ import { FacesAPIError } from '../../client.js';
 import { TeamCatalogService } from '../../team-catalog.js';
 import { resolveFace } from '../../utils.js';
 export default class TeamAdd extends BaseCommand {
-    static description = 'Add face(s) to a team. A team may only contain faces this account owns: a published or shared face ' +
-        'can be chatted with but cannot be a member.';
+    static description = 'Add face(s) to a team. Any face this account can reach may join: your own, a published one, or one ' +
+        'shared with you. Name someone else\'s as owner:alias, the same address chat uses.';
     static flags = {
         ...BaseCommand.baseFlags,
         face: Flags.string({ description: 'Face alias to add (repeatable)', multiple: true, required: true }),
@@ -13,13 +13,17 @@ export default class TeamAdd extends BaseCommand {
     static args = {
         team_id: Args.string({ description: 'Team ID', required: true }),
     };
+    static examples = [
+        '<%= config.bin %> <%= command.id %> TEAM_ID --face alice --face bob',
+        '<%= config.bin %> <%= command.id %> TEAM_ID --face head:socrates',
+    ];
     async run() {
         const { args, flags } = await this.parse(TeamAdd);
         const client = this.makeClient(flags);
-        // Resolve aliases to iam_ids. resolveFace also finds published and shared
-        // faces, which the plain face route cannot: without that a reachable face
-        // fails here as 404 or 403 depending on how it was named, and both read as
-        // a typo rather than as the rule that teams are owner-scoped.
+        // Resolve to iam_ids. The members endpoint takes a uid or an owner:alias
+        // and not a bare alias, so resolving here means a user can name any face
+        // the way they already name it everywhere else. resolveFace also finds
+        // published and shared faces, which the plain face route cannot.
         const iamIds = [];
         for (const alias of flags.face) {
             let resolved;
@@ -36,15 +40,6 @@ export default class TeamAdd extends BaseCommand {
                 }
                 throw err;
             }
-            // The server enforces this too, but only once it has an id, which this
-            // command cannot reach for a face it does not own. Say the real reason.
-            if (!resolved.owned) {
-                this.error(`A team may only contain faces you own, and '${resolved.handle}' is owned by ` +
-                    `'${resolved.owner ?? 'another account'}'. It is published or shared with you, so you can chat ` +
-                    `it as ${resolved.handle}@<model>, but it cannot be a team member.\n` +
-                    'Do not create a copy to work around this: the copy would be a different face with different ' +
-                    'compiled material.');
-            }
             const face = resolved.face;
             const id = (face.uid ?? face.id ?? face.iam_id);
             if (!id)

package/dist/commands/team/members.d.ts

@@ -1,6 +1,7 @@
 import { BaseCommand } from '../../base.js';
 export default class TeamMembers extends BaseCommand {
     static description: string;
+    static examples: string[];
     static flags: {
         'base-url': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/dist/commands/team/members.js

@@ -1,8 +1,21 @@
 import { Args } from '@oclif/core';
 import { BaseCommand } from '../../base.js';
 import { FacesAPIError } from '../../client.js';
+/**
+ * Why a member can no longer be reached, in the terms a user can act on.
+ *
+ * The two are kept apart deliberately: access can be granted again, a deleted
+ * face cannot come back. Rendering them the same would tell someone to go and
+ * ask for something that no longer exists.
+ */
+const REASONS = {
+    unpublished_or_unshared: 'access was revoked by its owner',
+    deleted: 'the face was deleted',
+};
 export default class TeamMembers extends BaseCommand {
-    static description = 'List members of a team';
+    static description = 'List members of a team. A member you do not own can stop being reachable if its owner revokes ' +
+        'access or deletes it; those are listed with the reason rather than dropped.';
+    static examples = ['<%= config.bin %> <%= command.id %> TEAM_ID', '<%= config.bin %> <%= command.id %> TEAM_ID --json'];
     static flags = {
         ...BaseCommand.baseFlags,
     };
@@ -17,12 +30,48 @@ export default class TeamMembers extends BaseCommand {
             data = await client.get(`/v1/teams/${args.team_id}/members`);
         }
         catch (err) {
-            if (err instanceof FacesAPIError)
+            if (err instanceof FacesAPIError) {
+                if (err.statusCode === 404)
+                    this.error(`No team '${args.team_id}'. It does not exist, or is not yours.`);
                 this.error(`Error (${err.statusCode}): ${err.message}`);
+            }
             throw err;
         }
-        if (!this.jsonEnabled())
-            this.printHuman(data);
+        if (this.jsonEnabled())
+            return data;
+        const members = (data.data ?? data) ?? [];
+        if (members.length === 0) {
+            this.log('This team has no members.');
+            this.log(`Add one with: faces team:add ${args.team_id} --face <alias>`);
+            return data;
+        }
+        const rows = members.map((m) => ({
+            alias: m.alias?.trim() || '(unknown)',
+            // reachable is absent on older servers; only an explicit false is a problem.
+            status: m.reachable === false
+                ? `unreachable - ${REASONS[m.unreachable_reason ?? ''] ?? m.unreachable_reason ?? 'reason not given'}`
+                : 'ok',
+            id: m.iam_id ?? '-',
+        }));
+        const cols = [
+            ['FACE', (r) => r.alias],
+            ['STATUS', (r) => r.status],
+            ['ID', (r) => r.id],
+        ];
+        const w = cols.map(([h, g]) => Math.max(h.length, ...rows.map((r) => g(r).length)));
+        const line = (c) => c.map((x, i) => x.padEnd(w[i])).join('  ').trimEnd();
+        this.log(line(cols.map(([h]) => h)));
+        for (const r of rows)
+            this.log(line(cols.map(([, g]) => g(r))));
+        const lost = members.filter((m) => m.reachable === false);
+        this.log('');
+        this.log(`${rows.length} member(s).`);
+        if (lost.length > 0) {
+            // Say it plainly: a team that silently changed shape is the thing this
+            // reporting exists to prevent.
+            this.log(`${lost.length} can no longer be reached and will not answer. They are still listed because the ` +
+                'team has not changed; remove them with faces team:remove.');
+        }
         return data;
     }
 }