@curviate/cli 0.21.1 → 0.23.0

package/dist/{chunk-OE7OMTCM.js → chunk-MBO4LBLY.js}

@@ -15,7 +15,10 @@ import {
 import {
   normalizeChatId,
   resolveIdentifier
-} from "./chunk-DMQZEPQE.js";
+} from "./chunk-UEAX6KUB.js";
+import {
+  requireAccount
+} from "./chunk-3BO6GVS2.js";
 import {
   buildPreviewOutput
 } from "./chunk-R3VLWLVV.js";
@@ -25,7 +28,7 @@ import {
   renderSuccess,
   renderUnexpectedError,
   resolveEffectiveConfig
-} from "./chunk-VPKMJYIF.js";
+} from "./chunk-JA3NNST6.js";
 import {
   READ_SINGLE_FLAGS,
   WRITE_FLAGS
@@ -42,13 +45,6 @@ function buildOutputStreams() {
     stderr: { write: (s) => process.stderr.write(s) }
   };
 }
-function requireAccount(account, out) {
-  if (!account) {
-    out.stderr.write("error: --account is required for this command. Set it via --account, CURVIATE_ACCOUNT, or `curviate config set-account`.\n");
-    process.exit(2);
-  }
-  return account;
-}
 function rejectPreviewOnRead(preview, out) {
   if (preview) {
     out.stderr.write("error: --preview is only valid on write commands (mutations). Reads just run.\n");
@@ -77,7 +73,7 @@ var MEMBER_PROVIDER_ID_RE = /^A[CDE][A-Za-z0-9_-]{4,}$/;
 async function handleSdkError(err, outOpts, out) {
   const { CurviateError } = await import("@curviate/sdk");
   if (err instanceof CurviateError) {
-    const { getExitCode } = await import("./exit-codes-63JE5GM5.js");
+    const { getExitCode } = await import("./exit-codes-KAVZN5BQ.js");
     renderError(err, outOpts, out);
     process.exit(getExitCode(err.code));
   }
@@ -95,7 +91,7 @@ function willSendAsNotice(chatId) {
   return chatId.startsWith("COMPANY_") ? "Will send as a company page\n" : null;
 }
 async function runMessageNew(client, flags, out, _readStdin) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const rawTo = flags.to ?? "";
   const rawText = flags.text ?? "";
   const attachPaths = normalizeAttachPaths(flags.attach);
@@ -154,7 +150,7 @@ async function runMessageNew(client, flags, out, _readStdin) {
   }
 }
 async function runMessageSend(client, flags, out, _readStdin) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const chatId = normalizeChatId(flags.chatId ?? "");
   const rawText = flags.text ?? "";
   const attachPaths = normalizeAttachPaths(flags.attach);
@@ -205,7 +201,7 @@ async function runMessageSend(client, flags, out, _readStdin) {
 async function runMessageGet(client, flags, out) {
   rejectPreviewOnRead(flags.preview, out);
   rejectAllOnNonPaginated(flags.all, out);
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const chatId = normalizeChatId(flags.chatId ?? "");
   const messageId = flags.messageId ?? "";
   const ns = client.account(accountId);
@@ -218,7 +214,7 @@ async function runMessageGet(client, flags, out) {
   }
 }
 async function runMessageEdit(client, flags, out, _readStdin) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const chatId = normalizeChatId(flags.chatId ?? "");
   const messageId = flags.messageId ?? "";
   const rawText = flags.text ?? "";
@@ -243,7 +239,7 @@ async function runMessageEdit(client, flags, out, _readStdin) {
   }
 }
 async function runMessageDelete(client, flags, out) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const chatId = normalizeChatId(flags.chatId ?? "");
   const messageId = flags.messageId ?? "";
   if (flags.preview) {
@@ -266,7 +262,7 @@ async function runMessageDelete(client, flags, out) {
   }
 }
 async function runMessageReact(client, flags, out) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const chatId = normalizeChatId(flags.chatId ?? "");
   const messageId = flags.messageId ?? "";
   const reaction = flags.emoji ?? flags.emojiAlias ?? "";
@@ -296,7 +292,7 @@ async function runMessageReact(client, flags, out) {
 }
 async function runMessageAttachment(client, flags, out, isTTY) {
   rejectPreviewOnRead(flags.preview, out);
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const chatId = normalizeChatId(flags.chatId ?? "");
   const messageId = flags.messageId ?? "";
   const attachmentId = flags.attachmentId ?? "";
@@ -319,7 +315,7 @@ async function runMessageAttachment(client, flags, out, isTTY) {
   }
 }
 async function runMessageInMail(client, flags, out, _readStdin) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const rawTo = flags.to ?? "";
   if (!rawTo) {
     out.stderr.write(
@@ -373,7 +369,7 @@ async function runMessageInMail(client, flags, out, _readStdin) {
 async function runMessageInMailBalance(client, flags, out) {
   rejectPreviewOnRead(flags.preview, out);
   rejectAllOnNonPaginated(flags.all, out);
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const ns = client.account(accountId);
   const outOpts = resolveOutputOpts(flags);
   try {
@@ -390,7 +386,7 @@ var messageNewCommand = defineCommand({
     ...WRITE_FLAGS,
     to: {
       type: "string",
-      description: "Recipient: LinkedIn profile URL (e.g. https://www.linkedin.com/in/some-slug), bare slug (e.g. some-slug), or provider ID (e.g. ACoAAA\u2026). URL and slug inputs resolve the provider ID automatically.",
+      description: "Recipient: LinkedIn profile URL (e.g. https://www.linkedin.com/in/some-slug), bare slug (e.g. some-slug), or provider ID (e.g. ACoAAA...). URL and slug inputs resolve the provider ID automatically.",
       required: true
     },
     text: { type: "positional", stdinArg: true, description: "Opening message text. Pass - to read from stdin (e.g. via heredoc or pipe)." },
@@ -565,7 +561,7 @@ var messageInMailCommand = defineCommand({
     ...WRITE_FLAGS,
     to: {
       type: "string",
-      description: "Recipient: LinkedIn profile URL, bare slug, provider-id (ACoAAA\u2026), or member URN (urn:li:member:<id>). URL and slug inputs resolve the provider ID automatically.",
+      description: "Recipient: LinkedIn profile URL, bare slug, provider-id (ACoAAA...), or member URN (urn:li:member:<id>). URL and slug inputs resolve the provider ID automatically.",
       required: true
     },
     subject: { type: "string", description: "InMail subject line.", required: true },
@@ -657,12 +653,12 @@ var MESSAGE_SUBCOMMANDS = [
   "inmail",
   "inmail-balance"
 ];
-var MESSAGE_USAGE = 'Usage: curviate message new --to <attendee> "<text>" [--attach <file>\u2026]\n       curviate message send <chat_id> "<text>" [--attach <file>\u2026]\n       curviate message <chat_id> "<text>" [--attach <file>\u2026]\n       curviate message get <chat_id> <message_id>\n       curviate message edit <chat_id> <message_id> "<text>"\n       curviate message delete <chat_id> <message_id>\n       curviate message react <chat_id> <message_id> <emoji>\n       curviate message attachment <chat_id> <message_id> <attachment_id> [-o <file>]\n       curviate message inmail --to <id> --subject <s> "<text>"\n       curviate message inmail-balance\n';
+var MESSAGE_USAGE = 'Usage: curviate message new --to <attendee> "<text>" [--attach <file>...]\n       curviate message send <chat_id> "<text>" [--attach <file>...]\n       curviate message <chat_id> "<text>" [--attach <file>...]\n       curviate message get <chat_id> <message_id>\n       curviate message edit <chat_id> <message_id> "<text>"\n       curviate message delete <chat_id> <message_id>\n       curviate message react <chat_id> <message_id> <emoji>\n       curviate message attachment <chat_id> <message_id> <attachment_id> [-o <file>]\n       curviate message inmail --to <id> --subject <s> "<text>"\n       curviate message inmail-balance\n';
 function guardBareMessageForm(chatId, out) {
   if (!looksLikeCommandWord(chatId)) return;
   const suggestion = nearestSubcommand(chatId, [...MESSAGE_SUBCOMMANDS]);
   out.stderr.write(
-    `error: \`${chatId}\` is not a curviate message subcommand, and it is not a chat id (a chat id looks like 2-\u2026 or COMPANY_\u2026, or a linkedin.com/messaging/thread/\u2026 URL).
+    `error: \`${chatId}\` is not a curviate message subcommand, and it is not a chat id (a chat id looks like 2-... or COMPANY_..., or a linkedin.com/messaging/thread/... URL).
 `
   );
   if (suggestion) {

package/dist/{chunk-M6UDWFHX.js → chunk-PMRQXBCP.js}

@@ -51,7 +51,7 @@ var EXIT_CODE_MAP = {
   PAYMENT_FAILED: 11,
   SUBSCRIPTION_BUSY: 11,
   SEAT_CANCELLED: 11,
-  // Internal / uncaught (1) — last resort bucket
+  // Internal / uncaught (1), last resort bucket
   INTERNAL: 1,
   PLATFORM_NOT_IMPLEMENTED: 1
 };

package/dist/{chunk-WYRYCTUM.js → chunk-RFUO2G3M.js}

@@ -41,7 +41,7 @@ function slimProfileMe(data) {
     first_name: d["first_name"] ?? null,
     last_name: d["last_name"] ?? null,
     // LinkedIn serves the profile headline in the `description` wire field
-    // on reads, not a field named `headline` — see JSDoc above.
+    // on reads, not a field named `headline`, see JSDoc above.
     headline: d["description"] ?? null,
     public_identifier: d["public_identifier"] ?? null,
     location: d["location"] ?? null,
@@ -59,7 +59,7 @@ function slimProfile(data) {
     first_name: d["first_name"] ?? null,
     last_name: d["last_name"] ?? null,
     // LinkedIn serves the profile headline in the `description` wire field
-    // on reads, not a field named `headline` — see slimProfileMe's JSDoc.
+    // on reads, not a field named `headline`, see slimProfileMe's JSDoc.
     headline: d["description"] ?? null,
     location: d["location"] ?? null,
     network_distance: specifics?.["network_distance"] ?? null,

package/dist/{chunk-QJZ3LWOX.js → chunk-RJTG5YWE.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   resolveIdentifier
-} from "./chunk-DMQZEPQE.js";
+} from "./chunk-UEAX6KUB.js";
 
 // src/lib/member-id.ts
 var MEMBER_PROVIDER_ID_RE = /^A[CDE][A-Za-z0-9_-]{4,}$/;

package/dist/{chunk-DMQZEPQE.js → chunk-UEAX6KUB.js}

@@ -33,6 +33,15 @@ function normalizeChatId(raw) {
   if (match?.[1]) return match[1];
   return raw;
 }
+var GROUP_URL_RE = /^https?:\/\/(?:[a-z0-9-]+\.)?linkedin\.com\/groups\/([^/?#]+)/i;
+var GROUP_PATH_RE = /^\/groups\/([^/?#]+)\/?$/;
+function normalizeGroupId(raw) {
+  const urlMatch = GROUP_URL_RE.exec(raw);
+  if (urlMatch?.[1]) return urlMatch[1];
+  const pathMatch = GROUP_PATH_RE.exec(raw);
+  if (pathMatch?.[1]) return pathMatch[1];
+  return raw;
+}
 var JOB_URL_RE = /\/jobs\/view\/(\d+)/;
 function resolveJobIdentifier(raw) {
   const match = JOB_URL_RE.exec(raw);
@@ -43,5 +52,6 @@ function resolveJobIdentifier(raw) {
 export {
   resolveIdentifier,
   normalizeChatId,
+  normalizeGroupId,
   resolveJobIdentifier
 };

package/dist/cli.js

@@ -78,6 +78,15 @@ async function nodeName(cmd) {
   const meta = await resolveValue(cmd.meta ?? {});
   return meta.name ?? "this command";
 }
+function renderPath(path) {
+  const parts = path[0] === "curviate" ? path.slice(1) : path;
+  return ["curviate", ...parts].join(" ");
+}
+function arityPhrase(count) {
+  if (count === 0) return "no positional arguments";
+  if (count === 1) return "1 positional argument";
+  return `${count} positional arguments`;
+}
 function positionalTokens(rawArgs, booleanFlags) {
   const out = [];
   let afterDoubleDash = false;
@@ -104,6 +113,24 @@ function positionalTokens(rawArgs, booleanFlags) {
   }
   return out;
 }
+async function extraPositionals(cmd, rawArgs) {
+  const booleanFlags = await booleanFlagNames(cmd);
+  const positionals = positionalTokens(rawArgs, booleanFlags);
+  const declaredCount = await nodePositionalCount(cmd);
+  return positionals.slice(declaredCount);
+}
+async function assertLeafConsumesPositionals(leaf, leafArgs, path, siblings) {
+  const extras = await extraPositionals(leaf, leafArgs);
+  if (extras.length === 0) return;
+  const token = extras[0].token;
+  const form = renderPath(path);
+  const arity = arityPhrase(await nodePositionalCount(leaf));
+  const hint = siblings && Object.prototype.hasOwnProperty.call(siblings, token) ? `Did you mean \`${renderPath([...path.slice(0, -1), token])}\`?` : void 0;
+  usageError(
+    `unexpected argument \`${token}\` after \`${form}\`. \`${form}\` takes ${arity}. Run \`${form} --help\` for its usage.`,
+    hint
+  );
+}
 async function declaredArgNames(cmd) {
   const names = /* @__PURE__ */ new Set();
   const argsDef = await resolveValue(cmd.args ?? {});
@@ -155,7 +182,8 @@ function usageError(message, hint) {
   process.stderr.write("Run `curviate --help` for usage.\n");
   process.exit(2);
 }
-async function resolveLeaf(cmd, rawArgs) {
+async function resolveLeaf(cmd, rawArgs, descent) {
+  const here = descent ?? { path: [await nodeName(cmd)] };
   const subCommands = await resolveValue(cmd.subCommands);
   if (subCommands && Object.keys(subCommands).length > 0) {
     const idx = firstPositionalIndex(rawArgs);
@@ -163,7 +191,10 @@ async function resolveLeaf(cmd, rawArgs) {
     const hasBarePositional = await nodeHasPositional(cmd);
     if (token !== void 0 && subCommands[token]) {
       const sub = await resolveValue(subCommands[token]);
-      return resolveLeaf(sub, rawArgs.slice(idx + 1));
+      return resolveLeaf(sub, rawArgs.slice(idx + 1), {
+        path: [...here.path, token],
+        siblings: subCommands
+      });
     }
     if (token !== void 0) {
       const hint = successorHint(await nodeName(cmd), token);
@@ -172,16 +203,16 @@ async function resolveLeaf(cmd, rawArgs) {
       }
     }
     if (token !== void 0 && hasBarePositional) {
-      const booleanFlags = await booleanFlagNames(cmd);
-      const positionals = positionalTokens(rawArgs, booleanFlags);
-      const declaredCount = await nodePositionalCount(cmd);
-      const extras = positionals.slice(declaredCount);
+      const extras = await extraPositionals(cmd, rawArgs);
       if (extras.length > 0) {
         const first = extras[0];
         if (extras.length === 1 && Object.prototype.hasOwnProperty.call(subCommands, first.token)) {
           const sub = await resolveValue(subCommands[first.token]);
           const remaining = rawArgs.filter((_, i) => i !== first.index);
-          return resolveLeaf(sub, remaining);
+          return resolveLeaf(sub, remaining, {
+            path: [...here.path, first.token],
+            siblings: subCommands
+          });
         }
         const name = await nodeName(cmd);
         usageError(
@@ -195,6 +226,7 @@ async function resolveLeaf(cmd, rawArgs) {
     }
     return { leaf: cmd, leafArgs: rawArgs };
   }
+  await assertLeafConsumesPositionals(cmd, rawArgs, here.path, here.siblings);
   return { leaf: cmd, leafArgs: rawArgs };
 }
 async function dispatch(root, rawArgs) {
@@ -259,31 +291,31 @@ var main = defineCommand({
     version: pkg.version,
     description: "Official command-line interface for the Curviate API."
   },
-  // Subcommand registry — names and descriptions are static for help rendering;
+  // Subcommand registry, names and descriptions are static for help rendering;
   // the handler implementation is loaded lazily on first invocation.
   subCommands: {
     login: () => import("./login-ZLDDIAFW.js").then((m) => m.loginCommand),
     config: () => import("./config-FPWWYG7G.js").then((m) => m.configCommand),
     // ---------------------------------------------------------------------------
-    // Noun groups — lazy-loaded on first invocation.
+    // Noun groups, lazy-loaded on first invocation.
     // ---------------------------------------------------------------------------
-    profile: () => import("./profile-GADE33FY.js").then((m) => m.profileCommand),
-    company: () => import("./company-NT4VO6JV.js").then((m) => m.companyCommand),
-    job: () => import("./job-VOVQZGCK.js").then((m) => m.jobCommand),
-    connect: () => import("./connect-VXWRLGQZ.js").then((m) => m.connectCommand),
-    search: () => import("./search-V35MFTXL.js").then((m) => m.searchCommand),
-    inbox: () => import("./inbox-GZAOUWZP.js").then((m) => m.inboxCommand),
-    inboxes: () => import("./inboxes-6AZOB43U.js").then((m) => m.inboxesCommand),
-    message: () => import("./message-FIEWH2BU.js").then((m) => m.messageCommand),
-    post: () => import("./post-G4IMWUE2.js").then((m) => m.postCommand),
-    comment: () => import("./comment-W4XTOTHN.js").then((m) => m.commentCommand),
-    account: () => import("./account-OIV73PXX.js").then((m) => m.accountCommand),
-    webhook: () => import("./webhook-5HXMJQFO.js").then((m) => m.webhookCommand),
-    "sales-nav": () => import("./sales-nav-OXLRN6YK.js").then((m) => m.salesNavCommand),
-    recruiter: () => import("./recruiter-LI2TMRHY.js").then((m) => m.recruiterCommand),
-    group: () => import("./group-43PHTFP7.js").then((m) => m.groupCommand),
-    feed: () => import("./feed-4Q3B56WI.js").then((m) => m.feedCommand),
-    notification: () => import("./notification-65V67NWK.js").then((m) => m.notificationCommand)
+    profile: () => import("./profile-SUKHRWQP.js").then((m) => m.profileCommand),
+    company: () => import("./company-LHYDAO2C.js").then((m) => m.companyCommand),
+    job: () => import("./job-JQG34ATV.js").then((m) => m.jobCommand),
+    connect: () => import("./connect-5S4TFQAF.js").then((m) => m.connectCommand),
+    search: () => import("./search-MZQJDJTX.js").then((m) => m.searchCommand),
+    inbox: () => import("./inbox-3IQPPQMH.js").then((m) => m.inboxCommand),
+    inboxes: () => import("./inboxes-JK36F6SK.js").then((m) => m.inboxesCommand),
+    message: () => import("./message-2WIZESSM.js").then((m) => m.messageCommand),
+    post: () => import("./post-JRJMGV2I.js").then((m) => m.postCommand),
+    comment: () => import("./comment-TUXC7K72.js").then((m) => m.commentCommand),
+    account: () => import("./account-MIPWTAG5.js").then((m) => m.accountCommand),
+    webhook: () => import("./webhook-7ESDSIRU.js").then((m) => m.webhookCommand),
+    "sales-nav": () => import("./sales-nav-4MFL2JSE.js").then((m) => m.salesNavCommand),
+    recruiter: () => import("./recruiter-NIKKDGMR.js").then((m) => m.recruiterCommand),
+    group: () => import("./group-PHGUOOJE.js").then((m) => m.groupCommand),
+    feed: () => import("./feed-ISNH4NXB.js").then((m) => m.feedCommand),
+    notification: () => import("./notification-ORSZY2IJ.js").then((m) => m.notificationCommand)
   },
   async run() {
     const { runMain } = await import("citty");

package/dist/{comment-W4XTOTHN.js → comment-TUXC7K72.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   resolveMemberOrMeProviderId
-} from "./chunk-QJZ3LWOX.js";
+} from "./chunk-RJTG5YWE.js";
 import {
   AttachError,
   describeAttachment,
@@ -11,8 +11,11 @@ import {
 import {
   pageDelayFromFlags,
   streamAll
-} from "./chunk-HZFK45IW.js";
-import "./chunk-DMQZEPQE.js";
+} from "./chunk-H6XD3F66.js";
+import "./chunk-UEAX6KUB.js";
+import {
+  requireAccount
+} from "./chunk-3BO6GVS2.js";
 import {
   buildPreviewOutput
 } from "./chunk-R3VLWLVV.js";
@@ -22,7 +25,7 @@ import {
   renderSuccess,
   renderUnexpectedError,
   resolveEffectiveConfig
-} from "./chunk-VPKMJYIF.js";
+} from "./chunk-JA3NNST6.js";
 import {
   GLOBAL_FLAGS,
   WRITE_SINGLE_FLAGS
@@ -30,6 +33,7 @@ import {
 import {
   resolveTextOrStdin
 } from "./chunk-ZYURL5VK.js";
+import "./chunk-PMRQXBCP.js";
 
 // src/commands/comment.ts
 import { defineCommand } from "citty";
@@ -40,13 +44,6 @@ function buildOutputStreams() {
     stderr: { write: (s) => process.stderr.write(s) }
   };
 }
-function requireAccount(account, out) {
-  if (!account) {
-    out.stderr.write("error: --account is required for this command. Set it via --account, CURVIATE_ACCOUNT, or `curviate config set-account`.\n");
-    process.exit(2);
-  }
-  return account;
-}
 function rejectPreviewOnRead(preview, out) {
   if (preview) {
     out.stderr.write("error: --preview is only valid on write commands (mutations). Reads just run.\n");
@@ -70,7 +67,7 @@ function buildListQuery(flags) {
 async function handleSdkError(err, outOpts, out) {
   const { CurviateError } = await import("@curviate/sdk");
   if (err instanceof CurviateError) {
-    const { getExitCode } = await import("./exit-codes-63JE5GM5.js");
+    const { getExitCode } = await import("./exit-codes-KAVZN5BQ.js");
     renderError(err, outOpts, out);
     process.exit(getExitCode(err.code));
   }
@@ -92,7 +89,7 @@ function assertReaction(reaction, out) {
 }
 async function runCommentList(client, flags, out) {
   rejectPreviewOnRead(flags.preview, out);
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const ns = client.account(accountId);
   const outOpts = resolveOutputOpts(flags);
@@ -119,7 +116,7 @@ async function runCommentList(client, flags, out) {
 }
 async function runCommentReplies(client, flags, out) {
   rejectPreviewOnRead(flags.preview, out);
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const commentId = flags.commentId ?? "";
   const ns = client.account(accountId);
@@ -147,7 +144,7 @@ async function runCommentReplies(client, flags, out) {
 }
 async function runCommentReactions(client, flags, out) {
   rejectPreviewOnRead(flags.preview, out);
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const commentId = flags.commentId ?? "";
   const ns = client.account(accountId);
@@ -175,7 +172,7 @@ async function runCommentReactions(client, flags, out) {
 }
 async function runCommentUser(client, flags, out) {
   rejectPreviewOnRead(flags.preview, out);
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const ns = client.account(accountId);
   const outOpts = resolveOutputOpts(flags);
   let userId;
@@ -207,7 +204,7 @@ async function runCommentUser(client, flags, out) {
   }
 }
 async function runCommentAdd(client, flags, out, readStdin) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const attachPaths = normalizeAttachPaths(flags.attach);
   let attachBuffers = [];
@@ -248,7 +245,7 @@ async function runCommentAdd(client, flags, out, readStdin) {
   }
 }
 async function runCommentReply(client, flags, out, readStdin) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const commentId = flags.commentId ?? "";
   const attachPaths = normalizeAttachPaths(flags.attach);
@@ -290,7 +287,7 @@ async function runCommentReply(client, flags, out, readStdin) {
   }
 }
 async function runCommentEdit(client, flags, out, readStdin) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const commentId = flags.commentId ?? "";
   const text = await resolveTextOrStdin(flags.text ?? "", out, readStdin);
@@ -315,7 +312,7 @@ async function runCommentEdit(client, flags, out, readStdin) {
   }
 }
 async function runCommentDelete(client, flags, out) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const commentId = flags.commentId ?? "";
   if (flags.preview) {
@@ -338,7 +335,7 @@ async function runCommentDelete(client, flags, out) {
   }
 }
 async function runCommentReact(client, flags, out) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const commentId = flags.commentId ?? "";
   const reaction = flags.reaction ?? "";
@@ -364,7 +361,7 @@ async function runCommentReact(client, flags, out) {
   }
 }
 async function runCommentUnreact(client, flags, out) {
-  const accountId = requireAccount(flags.account, out);
+  const accountId = await requireAccount(client, flags, out);
   const postId = flags.postId ?? "";
   const commentId = flags.commentId ?? "";
   const reaction = flags.reaction ?? "";