@bli-cockpit/cli 0.2.242 → 0.2.244

package/dist/commands/local-args-tower-cal.js

@@ -19,8 +19,12 @@
  * would be computed in UTC — "today" would end at 5pm in Vancouver.
  */
 import { optionalNonEmpty, optionalPositiveInteger, optionalUrl, parseNamedArgs, } from "./local-arg-values.js";
+import { BOOKING_ACTIONS, BOOKING_BOOLEANS, BOOKING_GUEST_ACTIONS, BOOKING_VALUE_FLAGS, readBookingFlags } from "./local-args-tower-cal-booking.js";
+import { LINKS_ACTIONS, LINKS_BOOLEANS, LINKS_SUBJECT_ACTIONS, LINKS_VALUE_FLAGS, readLinksFlags } from "./local-args-tower-cal-links.js";
+import { readRemindFlags, REMIND_ACTIONS, REMIND_BOOLEANS, REMIND_SUBJECT_ACTIONS, REMIND_VALUE_FLAGS } from "./local-args-tower-cal-remind.js";
+import { readShareFlags, SHARE_ACTIONS, SHARE_BOOLEANS, SHARE_VALUE_FLAGS } from "./local-args-tower-cal-share.js";
 const CAL_ACTIONS = new Set([
-    "event", "export", "duplicate", "batch", "undo", "conflicts", "calendar-change", "view-settings", "view-settings-change",
+    "event", "export", "duplicate", "batch", "undo", "conflicts", "calendar-change", "view-settings", "view-settings-change", "people", "availability", "overlays", "suggest", ...SHARE_ACTIONS, ...BOOKING_ACTIONS, ...REMIND_ACTIONS, ...LINKS_ACTIONS,
     "today",
     "week",
     "next",
@@ -36,7 +40,7 @@ const CAL_ACTIONS = new Set([
     "delete",
 ]);
 /** Every verb that names ONE thing first — a calendar id, or (delete) an event id. */
-const CAL_ACTIONS_NEEDING_A_SUBJECT = new Set(["event", "export", "duplicate", "calendar-change", "sync", "detach", "share", "delete", "change", "cancel", "rsvp"]);
+const CAL_ACTIONS_NEEDING_A_SUBJECT = new Set([...BOOKING_GUEST_ACTIONS, ...REMIND_SUBJECT_ACTIONS, ...LINKS_SUBJECT_ACTIONS, "availability-revoke", "event", "export", "duplicate", "calendar-change", "sync", "detach", "share", "delete", "change", "cancel", "rsvp"]);
 /** `sync-status [<calendar id>]` — every calendar, or one's. Ticket 10730. */
 const CAL_ACTIONS_WITH_OPTIONAL_SUBJECT = new Set(["sync-status", "undo"]);
 const CAL_ALLOWED_FLAGS = [
@@ -73,6 +77,8 @@ const CAL_ALLOWED_FLAGS = [
     "--reason",
     "--scope", "--occurrence", "--response", "--comment", "--reminder", "--visibility", "--transparency", "--key",
     "--view", "--days", "--week-start", "--hide-weekends", "--density", "--zone",
+    "--with", "--pin", "--remove",
+    "--duration", "--weekends", "--recheck", ...SHARE_BOOLEANS, ...SHARE_VALUE_FLAGS, ...BOOKING_BOOLEANS, ...BOOKING_VALUE_FLAGS, ...REMIND_BOOLEANS, ...REMIND_VALUE_FLAGS, ...LINKS_BOOLEANS, ...LINKS_VALUE_FLAGS,
 ];
 const CAL_VALUE_FLAGS = [
     "--home",
@@ -98,6 +104,7 @@ const CAL_VALUE_FLAGS = [
     "--reason",
     "--scope", "--occurrence", "--response", "--comment", "--reminder", "--visibility", "--transparency", "--key",
     "--view", "--days", "--week-start", "--hide-weekends", "--density", "--zone",
+    "--with", "--pin", "--remove", "--duration", ...SHARE_VALUE_FLAGS, ...BOOKING_VALUE_FLAGS, ...REMIND_VALUE_FLAGS, ...LINKS_VALUE_FLAGS,
 ];
 export function parseCalArgs(args) {
     const values = parseNamedArgs(args, { allowedFlags: CAL_ALLOWED_FLAGS, valueFlags: CAL_VALUE_FLAGS });
@@ -111,13 +118,13 @@ export function parseCalArgs(args) {
     const limit = optionalPositiveInteger(values.flags.get("--limit"), "--limit");
     const offset = readCalOffset(values);
     const command = buildCalCommand(values, action, subject, query, title, startsAt, endsAt, offset, limit);
-    return { ...command, ...readCalEventScope(action, values), ...readViewSettingsPatch(action, values) };
+    return { ...command, ...readCalEventScope(action, values), ...readViewSettingsPatch(action, values), ...readPeopleFlags(action, values), ...readShareFlags(action, values), ...readBookingFlags(action, values), ...readRemindFlags(action, values), ...readLinksFlags(action, values) };
 }
 function readCalAction(values) {
     const first = values.positionals[0];
     const action = (first === undefined ? "today" : first);
     if (!CAL_ACTIONS.has(action)) {
-        throw new Error(`Unknown cal command: ${first}. Try today, week, conflicts, calendar-change, view-settings, view-settings-change, next, find, calendars, add-ical, create, duplicate, batch, undo, share, detach, sync, sync-status, or delete.`);
+        throw new Error(`Unknown cal command: ${first}. Try today, week, conflicts, calendar-change, view-settings, view-settings-change, people, availability, overlays, suggest, availability-share, availability-revoke, booking-page, booking-slots, book, booking-change, booking-cancel, remind, join, reminders, snooze, dismiss, links, agenda, next, find, calendars, add-ical, create, duplicate, batch, undo, share, detach, sync, sync-status, or delete.`);
     }
     return { action, rest: values.positionals.slice(first === undefined ? 0 : 1) };
 }
@@ -127,9 +134,17 @@ function readCalSubjectOrQuery(action, rest) {
     if (CAL_ACTIONS_NEEDING_A_SUBJECT.has(action)) {
         subject = optionalNonEmpty(rest[0]);
         if (!subject) {
-            throw new Error(action === "delete" || action === "duplicate" || action === "change" || action === "cancel" || action === "rsvp"
-                ? `cal ${action} needs an event id — take one from a window verb's output (today/week/next/find).`
-                : `cal ${action} needs a calendar id — take one from \`cockpit cal calendars\`.`);
+            throw new Error(action === "availability-revoke"
+                ? "cal availability-revoke needs a share id — take one from `cockpit cal availability-share --list`."
+                : BOOKING_GUEST_ACTIONS.includes(action)
+                    ? `cal ${action} needs the booking link (or its token) the host or Tower gave you.`
+                    : action === "snooze" || action === "dismiss"
+                        ? `cal ${action} needs an event id and --occurrence — take both from cal next.`
+                        : action === "links"
+                            ? "cal links needs an event id — take one from a window verb's output (today/week/next/find)."
+                            : action === "delete" || action === "duplicate" || action === "change" || action === "cancel" || action === "rsvp"
+                                ? `cal ${action} needs an event id — take one from a window verb's output (today/week/next/find).`
+                                : `cal ${action} needs a calendar id — take one from \`cockpit cal calendars\`.`);
         }
         if (rest.length > 1)
             throw new Error(`cal ${action} takes one id, not ${rest.length}.`);
@@ -144,6 +159,11 @@ function readCalSubjectOrQuery(action, rest) {
         if (!query)
             throw new Error('cal find needs words: cockpit cal find "standup".');
     }
+    else if (action === "people") {
+        query = optionalNonEmpty(rest.join(" "));
+        if (!query)
+            throw new Error('cal people needs a name or an email: cockpit cal people "Vee".');
+    }
     else if (rest.length > 0) {
         throw new Error(`cal ${action} does not take "${rest[0]}".`);
     }
@@ -200,7 +220,7 @@ function buildCalCommand(values, action, subject, query, title, startsAt, endsAt
         // `commands/cal.ts` rather than here, so the parser stays pure.
         timeZone: optionalNonEmpty(values.flags.get("--tz")),
         ...(offset === undefined ? {} : { offset }),
-        ...(optionalPositiveInteger(values.flags.get("--hours"), "--hours") === undefined
+        ...(action === "suggest" || optionalPositiveInteger(values.flags.get("--hours"), "--hours") === undefined
             ? {}
             : { hours: optionalPositiveInteger(values.flags.get("--hours"), "--hours") }),
         from: optionalNonEmpty(values.flags.get("--from")),
@@ -370,4 +390,57 @@ function readViewSettingsPatch(action, values) {
             patch.extra_zones = zones;
     }
     return Object.keys(patch).length ? { viewSettings: patch } : {};
+}
+const PEOPLE_FLAG_KEYS = ["--with", "--pin", "--remove"];
+const SUGGEST_FLAG_KEYS = ["--duration", "--weekends"];
+/** BLI-21522: `availability --with` (repeatable), `overlays --pin|--remove`. Each belongs to one verb. */
+function readPeopleFlags(action, values) {
+    const owner = { "--with": "availability", "--pin": "overlays", "--remove": "overlays" };
+    for (const flag of PEOPLE_FLAG_KEYS) {
+        if (values.flags.has(flag) && owner[flag] !== action && !(flag === "--with" && action === "suggest") && !(flag === "--remove" && action === "links"))
+            throw new Error(`cal ${action} does not take ${flag}; it belongs to cal ${owner[flag]}.`);
+    }
+    for (const flag of SUGGEST_FLAG_KEYS) {
+        if ((values.flags.has(flag) || values.booleans.has(flag)) && action !== "suggest" && !(flag === "--duration" && (action === "availability-share" || action === "booking-page")))
+            throw new Error(`cal ${action} does not take ${flag}; it belongs to cal suggest.`);
+    }
+    if (values.booleans.has("--recheck") && action !== "create")
+        throw new Error(`cal ${action} does not take --recheck; it belongs to cal create.`);
+    if (action === "create" && values.booleans.has("--recheck"))
+        return { recheck: true };
+    if (action === "suggest")
+        return readSuggestFlags(values);
+    if (action === "availability") {
+        const labels = (values.flagValues.get("--with") ?? []).map((label) => label.trim()).filter(Boolean);
+        return labels.length ? { peopleWith: labels } : {};
+    }
+    if (action === "overlays") {
+        const pin = optionalNonEmpty(values.flags.get("--pin"));
+        const remove = optionalNonEmpty(values.flags.get("--remove"));
+        if (pin && remove)
+            throw new Error("cal overlays takes --pin or --remove, not both.");
+        return { ...(pin ? { pinLabel: pin } : {}), ...(remove ? { removeEmail: remove } : {}) };
+    }
+    return {};
+}
+/** BLI-21542 `suggest --with ... --duration 30 --hours 09:00-17:00 --weekends`: shape only; the door owns the limits. */
+function readSuggestFlags(values) {
+    const labels = (values.flagValues.get("--with") ?? []).map((label) => label.trim()).filter(Boolean);
+    const out = labels.length ? { peopleWith: labels } : {};
+    const duration = optionalNonEmpty(values.flags.get("--duration"));
+    if (duration !== undefined) {
+        if (!/^\d+$/.test(duration))
+            throw new Error("--duration takes a whole number of minutes.");
+        out.duration = Number(duration);
+    }
+    const hours = optionalNonEmpty(values.flags.get("--hours"));
+    if (hours !== undefined) {
+        const match = /^(\d{1,2}:\d{2})-(\d{1,2}:\d{2})$/.exec(hours);
+        if (!match)
+            throw new Error("--hours takes a range like 09:00-17:00.");
+        out.hoursRange = { start: match[1], end: match[2] };
+    }
+    if (values.booleans.has("--weekends"))
+        out.weekends = true;
+    return out;
 }

package/dist/commands/local-args-tower-docs-msg.js

@@ -7,15 +7,22 @@
  * added both without stretching either existing family's own doc comment.
  */
 import { optionalNonEmpty, optionalPositiveInteger, optionalUrl, parseNamedArgs, } from "./local-arg-values.js";
+import { DOC_SEARCH_BOOLEAN_FLAGS, DOC_SEARCH_VALUE_FLAGS, hasDocScopeFlags, readDocSearchFilters } from "./docs-search-args.js";
+import { parseDocsCommentsArgs } from "./docs-comments-args.js";
+import { parseDocsFilesArgs } from "./docs-files-args.js";
+import { isDocsRefsInvocation, parseDocsRefsArgs } from "./docs-refs-args.js";
+import { isDocsSyncInvocation, parseDocsSyncArgs } from "./docs-sync-args.js";
+import { parseDocsFormattingArgs } from "./docs-formatting.js";
+import { parseDocsInboxArgs } from "./docs-inbox-args.js";
 import { parseDocsExportFlags } from "./local-args-docs-export.js";
-const DOCS_ACTIONS = new Set(["list", "tree", "read", "create", "update", "delete", "link", "sync-status", "export", "mutation-status", "share", "access"]);
+const DOCS_ACTIONS = new Set(["list", "tree", "read", "create", "update", "delete", "link", "sync-status", "export", "mutation-status", "share", "access", "trash", "restore", "versions", "favorite", "unfavorite", "marks", "search", "comments", "comment", "inbox", "inbox-read", "subscribe", "unsubscribe", "notifications", "files", "file"]);
 const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 // BLI-10450: `read` moved to its own branch in `parseDocsDocumentReference` —
 // it takes SEVERAL references now, so it no longer shares the "exactly one"
 // rule `update`/`link` still enforce. BLI‑10555: `delete` takes several too
 // (the same door, called once per ref), so it joined `read`'s branch rather
 // than this set.
-const DOCS_ACTIONS_NEEDING_A_DOC = new Set(["update", "link", "export", "mutation-status", "share", "access"]);
+const DOCS_ACTIONS_NEEDING_A_DOC = new Set(["update", "link", "export", "mutation-status", "share", "access", "restore", "versions", "favorite", "unfavorite"]);
 const DOCS_ALLOWED_FLAGS = [
     "--home",
     "--dashboard-url",
@@ -33,6 +40,7 @@ const DOCS_ALLOWED_FLAGS = [
     "--limit",
     "--clear",
     "--bodies",
+    "--all",
     "--section",
     "--offset",
     "--format",
@@ -40,6 +48,9 @@ const DOCS_ALLOWED_FLAGS = [
     "--add",
     "--remove",
     "--reason",
+    "--cursor",
+    "--before",
+    "--version",
     "--json",
 ];
 const DOCS_VALUE_FLAGS = [
@@ -60,8 +71,53 @@ const DOCS_VALUE_FLAGS = [
     "--add",
     "--remove",
     "--reason",
+    "--cursor",
+    "--before",
+    "--version",
 ];
+/**
+ * BLI-21697: `docs search [words] [--word] [--title-only] [--by <me|email|id>] [--under <id|slug>] [--since D]
+ * [--until D] [--timezone Z] [--sort relevance|updated] [--limit n]`. Words are positionals joined with a space; a
+ * person, subtree or date filter makes an empty query a search.
+ */
+function parseDocsSearchArgs(args) {
+    const values = parseNamedArgs(args, {
+        allowedFlags: ["--home", "--dashboard-url", "--limit", "--json", "--since", "--until", "--timezone", ...DOC_SEARCH_VALUE_FLAGS, ...DOC_SEARCH_BOOLEAN_FLAGS],
+        valueFlags: ["--home", "--dashboard-url", "--limit", "--since", "--until", "--timezone", ...DOC_SEARCH_VALUE_FLAGS],
+    });
+    const filters = readDocSearchFilters(values);
+    const query = values.positionals.slice(1).join(" ").trim();
+    if (query.length === 0 && !hasDocScopeFlags(filters)) {
+        throw new Error('docs search needs words to look for, e.g. `cockpit docs search "storage ceiling"`, or a filter such as --by me.');
+    }
+    return {
+        kind: "docs",
+        action: "search",
+        clearParent: false,
+        bodyStdin: false,
+        ...(query ? { query } : {}),
+        searchFilters: filters,
+        limit: optionalPositiveInteger(values.flags.get("--limit"), "--limit"),
+        homeDir: optionalNonEmpty(values.flags.get("--home")),
+        dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")),
+        json: values.booleans.has("--json"),
+    };
+}
 export function parseDocsArgs(args) {
+    if (args[0] === "search")
+        return parseDocsSearchArgs(args);
+    if (args[0] === "comments" || args[0] === "comment")
+        return parseDocsCommentsArgs(args);
+    if (args[0] === "files" || args[0] === "file")
+        return parseDocsFilesArgs(args);
+    if (isDocsRefsInvocation(args))
+        return parseDocsRefsArgs(args);
+    if (isDocsSyncInvocation(args))
+        return parseDocsSyncArgs(args);
+    if (args[0] === "formatting")
+        return parseDocsFormattingArgs(args);
+    if (args[0] === "inbox" || args[0] === "subscribe" || args[0] === "unsubscribe" || args[0] === "notifications")
+        return parseDocsInboxArgs(args);
     const values = parseNamedArgs(args, { allowedFlags: DOCS_ALLOWED_FLAGS, valueFlags: DOCS_VALUE_FLAGS });
     const { action, rest } = parseDocsAction(values.positionals);
     const link = parseDocsLink(action, rest, values.booleans.has("--clear"));
@@ -77,7 +133,7 @@ export function parseDocsArgs(args) {
     if (action === "delete" && (!docRefs || docRefs.length === 0)) {
         throw new Error("docs delete needs one or more document ids/slugs.");
     }
-    return buildDocsCommand(values, action, docRef, docRefs, visibility, clearParent, parentId, allowEmpty, title, query, wholeWord, limit, bodies, section, offset, link, { requestId, expectedRevision });
+    return buildDocsCommand(values, action, docRef, docRefs, visibility, clearParent, parentId, allowEmpty, title, query, wholeWord, limit, bodies, section, offset, link, { requestId, expectedRevision }, parseDocsRecoveryFlags(action, values, docRef));
 }
 /**
  * BLI-10450: `read` takes either several document references OR
@@ -129,7 +185,7 @@ function parseDocsAction(positionals) {
     const first = positionals[0];
     const action = (first === undefined ? "list" : first);
     if (!DOCS_ACTIONS.has(action)) {
-        throw new Error(`Unknown docs command: ${first}. Try list, tree, read, create, update, delete, link, sync-status, export, mutation-status, share, or access.`);
+        throw new Error(`Unknown docs command: ${first}. Try list, search, tree, read, create, update, delete, link, sync-status, export, mutation-status, share, access, trash, restore, versions, favorite, unfavorite, marks, comments, or comment.`);
     }
     return { action, rest: positionals.slice(first === undefined ? 0 : 1) };
 }
@@ -188,8 +244,8 @@ function parseDocsWriteFlags(action, values) {
         throw new Error("--allow-empty belongs to `cockpit docs update`.");
     }
     // BLI-21298: the write-safety pair belongs to `update`, like the other save-shaping flags.
-    if ((values.flags.has("--request-id") || values.flags.has("--expected-revision")) && action !== "update") {
-        throw new Error("--request-id and --expected-revision belong to `cockpit docs update`.");
+    if ((values.flags.has("--request-id") || values.flags.has("--expected-revision")) && action !== "update" && action !== "restore") {
+        throw new Error("--request-id and --expected-revision belong to `cockpit docs update` and `cockpit docs restore`.");
     }
     const requestId = optionalNonEmpty(values.flags.get("--request-id"));
     if (requestId && !UUID_PATTERN.test(requestId))
@@ -222,8 +278,8 @@ function parseDocsReadFlags(action, values) {
     // exclusive (`validateDocsReadTargets`), so the flag is never ambiguous in
     // any one call, only overloaded across the command's two shapes.
     const limit = optionalPositiveInteger(values.flags.get("--limit"), "--limit");
-    if (limit !== undefined && action !== "list" && action !== "read") {
-        throw new Error("--limit belongs to `cockpit docs list` or `cockpit docs read`.");
+    if (limit !== undefined && action !== "list" && action !== "read" && action !== "trash" && action !== "versions") {
+        throw new Error("--limit belongs to `cockpit docs list`, `read`, `trash` or `versions`.");
     }
     // BLI-10450: `--bodies` pairs with `--parent` to bulk-read a folder;
     // `--section`/`--offset` slice an explicit reference's body, mirroring
@@ -259,6 +315,38 @@ function parseDocsShareFlags(action, values) {
     }
     return { ...(addPerson ? { addPerson } : {}), ...(removePerson ? { removePerson } : {}), ...(reason ? { reason } : {}) };
 }
+/**
+ * BLI-21413: `docs trash [--cursor C] [--limit N]`, `docs versions <doc> [--before N] [--limit N] [--version V]`,
+ * `docs restore <id>` (take a page out of the trash) and `docs restore <doc> --version V [--expected-revision N]`.
+ */
+function parseDocsRecoveryFlags(action, values, docRef) {
+    const cursor = optionalNonEmpty(values.flags.get("--cursor"));
+    const before = optionalPositiveInteger(values.flags.get("--before"), "--before");
+    const versionId = optionalNonEmpty(values.flags.get("--version"));
+    if (cursor && action !== "trash" && action !== "list")
+        throw new Error("--cursor belongs to `cockpit docs trash` and `cockpit docs list`.");
+    const all = values.booleans.has("--all");
+    if (all && action !== "list")
+        throw new Error("--all belongs to `cockpit docs list`.");
+    if (all && cursor)
+        throw new Error("docs list takes --all (walk every page) or --cursor (one page), not both.");
+    if (before !== undefined && action !== "versions")
+        throw new Error("--before belongs to `cockpit docs versions`.");
+    if (versionId && action !== "restore" && action !== "versions")
+        throw new Error("--version belongs to `cockpit docs restore` and `cockpit docs versions`.");
+    if (versionId && !UUID_PATTERN.test(versionId))
+        throw new Error("--version must be a version id (a UUID, from `cockpit docs versions <doc>`).");
+    if (action === "restore" && !versionId) {
+        if (!UUID_PATTERN.test(docRef ?? ""))
+            throw new Error("docs restore needs the id of a page in the trash (`cockpit docs trash` lists them), or --version <id> to restore a version of a live page.");
+        if (values.flags.has("--expected-revision"))
+            throw new Error("--expected-revision belongs to `docs restore --version`; taking a page out of the trash has no revision to check.");
+    }
+    if (action === "versions" && versionId && (before !== undefined || values.flags.has("--limit"))) {
+        throw new Error("docs versions --version reads one version; --before and --limit page the list.");
+    }
+    return { ...(cursor ? { cursor } : {}), ...(all ? { all } : {}), ...(before === undefined ? {} : { before }), ...(versionId ? { versionId } : {}) };
+}
 function parseDocsOffset(raw) {
     const offsetRaw = optionalNonEmpty(raw);
     if (offsetRaw === undefined)
@@ -268,7 +356,7 @@ function parseDocsOffset(raw) {
         throw new Error("--offset must be a whole number 0 or greater.");
     return offset;
 }
-function buildDocsCommand(values, action, docRef, docRefs, visibility, clearParent, parentId, allowEmpty, title, query, wholeWord, limit, bodies, section, offset, link, safety) {
+function buildDocsCommand(values, action, docRef, docRefs, visibility, clearParent, parentId, allowEmpty, title, query, wholeWord, limit, bodies, section, offset, link, safety, recovery) {
     return {
         kind: "docs",
         action,
@@ -295,6 +383,7 @@ function buildDocsCommand(values, action, docRef, docRefs, visibility, clearPare
         ...(link.clearLink ? { clearLink: true } : {}),
         ...parseDocsExportFlags(action, values),
         ...parseDocsShareFlags(action, values),
+        ...recovery,
         json: values.booleans.has("--json"),
     };
 }

package/dist/commands/local-args-tower-msg.js

@@ -1,7 +1,14 @@
 import { optionalNonEmpty, optionalPositiveInteger, optionalUrl, parseNamedArgs } from "./local-arg-values.js";
 const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+import { MSG_CHANNEL_BOOLEAN_FLAGS, MSG_CHANNEL_VALUE_FLAGS, isMsgChannelAction, msgChannelNormalizeArgs, parseMsgChannelArgs, rejectMsgChannelFlags } from "./msg-channel-args.js";
+import { MSG_CONTEXT_VALUE_FLAGS, parseMsgContextArgs, rejectMsgContextFlags } from "./msg-context-args.js";
+import { MSG_MARK_VALUE_FLAGS, isMsgMarkAction, parseMsgMarkArgs, rejectMsgMarkFlags } from "./msg-mark-args.js";
+import { MSG_SCHEDULE_VALUE_FLAGS, isMsgScheduleAction, parseMsgScheduleArgs, rejectMsgScheduleFlags } from "./msg-schedule-args.js";
+import { MSG_NOTIFY_ONLY_FLAGS, parseMsgNotifyArgs } from "./msg-notify-args.js";
+import { MSG_SEARCH_BOOLEAN_FLAGS, MSG_SEARCH_ONLY_FLAGS, MSG_SEARCH_VALUE_FLAGS, readMsgSearchFilters } from "./msg-search-args.js";
+const MSG_FILE_VERBS = new Set(["upload", "show", "download", "cancel", "list"]);
 const MSG_DRAFT_VERBS = new Set(["list", "show", "save", "discard", "restore", "send"]);
-const MSG_ACTIONS = new Set(["channels", "read", "send", "thread", "create", "dm", "show", "unread", "edit", "delete", "outcome", "draft"]);
+const MSG_ACTIONS = new Set(["channels", "read", "send", "thread", "create", "dm", "show", "unread", "edit", "delete", "outcome", "draft", "file", "activity", "follow", "unfollow", "react", "notify", "search", "channel", "members", "hide", "unhide", "save", "saved", "pin", "pins", "forward", "schedule", "remind", "scheduled", "context"]);
 const MSG_ACTIONS_NEEDING_A_CHANNEL = new Set(["read", "send", "unread"]);
 /**
  * `--members a@x.test,b@y.test` — addresses only, split on commas, never
@@ -25,7 +32,8 @@ function parseMemberEmails(raw) {
     }
     return emails;
 }
-export function parseMsgArgs(args) {
+export function parseMsgArgs(rawArgs) {
+    const args = msgChannelNormalizeArgs(rawArgs);
     const values = parseNamedArgs(args, {
         allowedFlags: [
             "--home",
@@ -39,18 +47,78 @@ export function parseMsgArgs(args) {
             "--description",
             "--from",
             "--mark-read",
+            "--mentions",
+            "--threads",
+            "--unread",
+            "--remove",
             "--request-id",
             "--expected-revision",
+            "--name",
+            "--out",
+            "--file",
+            "--level",
+            "--timezone",
+            "--message",
+            "--mute",
+            "--unmute",
+            "--clear",
+            "--off",
+            ...MSG_SEARCH_BOOLEAN_FLAGS,
+            ...MSG_SEARCH_VALUE_FLAGS,
+            ...MSG_CHANNEL_VALUE_FLAGS,
+            ...MSG_CHANNEL_BOOLEAN_FLAGS,
+            ...MSG_MARK_VALUE_FLAGS,
+            ...MSG_SCHEDULE_VALUE_FLAGS,
+            ...MSG_CONTEXT_VALUE_FLAGS,
             "--json",
         ],
         valueFlags: [
             "--home", "--dashboard-url", "--channel", "--thread", "--limit", "--members", "--description", "--before", "--from",
-            "--request-id", "--expected-revision",
+            "--request-id", "--expected-revision", "--name", "--out", "--file",
+            "--level", "--timezone", "--message", ...MSG_SEARCH_VALUE_FLAGS, ...MSG_CHANNEL_VALUE_FLAGS, ...MSG_MARK_VALUE_FLAGS, ...MSG_SCHEDULE_VALUE_FLAGS, ...MSG_CONTEXT_VALUE_FLAGS,
         ],
     });
     const { action, rest } = parseMsgAction(values.positionals);
+    if (action === "context")
+        return parseMsgContextArgs(values, rest);
+    if (isMsgChannelAction(action))
+        return parseMsgChannelArgs(action, values, rest);
+    rejectMsgContextFlags(values);
+    if (isMsgMarkAction(action))
+        return parseMsgMarkArgs(action, values, rest);
+    if (isMsgScheduleAction(action))
+        return parseMsgScheduleArgs(action, values, rest);
+    rejectMsgChannelFlags(values);
+    rejectMsgMarkFlags(values);
+    rejectMsgScheduleFlags(values);
+    if (action === "search")
+        return parseMsgSearchArgs(values, rest);
+    const searchFlag = MSG_SEARCH_ONLY_FLAGS.find((flag) => values.flags.has(flag) || values.booleans.has(flag));
+    if (searchFlag)
+        throw new Error(`${searchFlag} belongs to \`cockpit msg search\`.`);
+    if (action === "notify")
+        return parseMsgNotifyArgs(values, rest);
+    const notifyFlag = MSG_NOTIFY_ONLY_FLAGS.find((flag) => values.flags.has(flag) || values.booleans.has(flag));
+    if (notifyFlag)
+        throw new Error(`${notifyFlag} belongs to \`cockpit msg notify\`.`);
     if (action === "draft")
         return parseMsgDraftArgs(values, rest);
+    if (action === "file")
+        return parseMsgFileArgs(values, rest);
+    if (action === "activity" || action === "follow" || action === "unfollow" || action === "react")
+        return parseMsgActivityArgs(action, values, rest);
+    for (const flag of ["--mentions", "--threads", "--unread", "--remove"]) {
+        if (values.booleans.has(flag))
+            throw new Error(`${flag} belongs to \`cockpit msg activity\` or \`msg react\`.`);
+    }
+    const fileIds = values.flagValues.get("--file") ?? [];
+    if (fileIds.length > 0 && action !== "send")
+        throw new Error("--file belongs to `cockpit msg send`.");
+    if (fileIds.length > 10 || fileIds.some((id) => !UUID_PATTERN.test(id))) {
+        throw new Error("--file takes a file UUID from `cockpit msg file upload`, at most 10 per message.");
+    }
+    if (values.flags.has("--name") || values.flags.has("--out"))
+        throw new Error("--name and --out belong to `cockpit msg file`.");
     if (values.flags.has("--before") && action !== "read" && action !== "thread") {
         throw new Error("--before belongs to msg read or msg thread.");
     }
@@ -59,7 +127,152 @@ export function parseMsgArgs(args) {
     const { isPrivate, memberEmails, description } = parseMsgCreateFlags(action, values);
     const { channelRef, threadId, limit } = parseMsgReadTarget(action, rest, values);
     const writeSafety = parseMsgWriteSafety(action, rest, values);
-    return buildMsgCommand(values, action, channelRef, channelName, dmEmail, memberEmails, description, isPrivate, threadId, limit, markRead, unreadFrom, writeSafety);
+    const built = buildMsgCommand(values, action, channelRef, channelName, dmEmail, memberEmails, description, isPrivate, threadId, limit, markRead, unreadFrom, writeSafety);
+    // `msg dm a@x b@y` is a group message: the single-address shape (dmEmail) is unchanged (BLI-21685).
+    const withGroup = action === "dm" && rest.length > 1 ? { ...built, dmEmails: rest } : built;
+    return fileIds.length > 0 ? { ...withGroup, fileIds } : withGroup;
+}
+/**
+ * `cockpit msg search [words] [--from <email|me>]... [--in <channel>] [--since <day>] [--until <day>] [--timezone <zone>]
+ * [--replies|--top-level] [--has-file] [--before <cursor>] [--limit <n>]` (BLI-21658). The words are positional and may
+ * be empty when a filter is set; inline operators (`from:`, `in:`, `has:file`) work inside them as in the web box.
+ */
+function parseMsgSearchArgs(values, rest) {
+    const stray = ["--channel", "--thread", "--members", "--description", "--request-id", "--expected-revision", "--name", "--out", "--file", "--level", "--message"]
+        .find((flag) => values.flags.has(flag));
+    const strayBoolean = ["--private", "--mark-read", "--mentions", "--threads", "--unread", "--remove", "--mute", "--unmute", "--clear", "--off"]
+        .find((flag) => values.booleans.has(flag));
+    if (stray || strayBoolean)
+        throw new Error(`${stray ?? strayBoolean} does not belong to \`cockpit msg search\`.`);
+    const searchFilters = readMsgSearchFilters(values);
+    const searchQuery = rest.join(" ").trim();
+    const filtered = Boolean(searchFilters.from || searchFilters.in || searchFilters.since || searchFilters.until || searchFilters.thread || searchFilters.hasFile);
+    if (searchQuery === "" && !filtered) {
+        throw new Error("msg search needs words or a filter, e.g. `cockpit msg search deploy --from me` or `cockpit msg search --has-file`.");
+    }
+    const limit = optionalPositiveInteger(values.flags.get("--limit"), "--limit");
+    if (limit !== undefined && limit > 100)
+        throw new Error("--limit takes 1 to 100.");
+    const before = optionalNonEmpty(values.flags.get("--before"));
+    return {
+        kind: "msg",
+        action: "search",
+        homeDir: optionalNonEmpty(values.flags.get("--home")),
+        dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")),
+        isPrivate: false,
+        searchQuery,
+        searchFilters,
+        ...(before ? { before } : {}),
+        ...(limit === undefined ? {} : { limit }),
+        json: values.booleans.has("--json"),
+    };
+}
+/**
+ * `cockpit msg activity [--mentions|--threads] [--unread] [--before <cursor>] [--limit <n>] [--mark-read]`,
+ * `follow <message-id>`, `unfollow <message-id>`, `react <message-id> <emoji> [--remove]` (BLI-21598).
+ */
+function parseMsgActivityArgs(action, values, rest) {
+    const stray = ["--channel", "--thread", "--members", "--description", "--from", "--request-id", "--expected-revision", "--name", "--out", "--file"]
+        .find((flag) => values.flags.has(flag));
+    if (stray || values.booleans.has("--private")) {
+        throw new Error(`${stray ?? "--private"} does not belong to \`cockpit msg ${action}\`.`);
+    }
+    const mentions = values.booleans.has("--mentions");
+    const threads = values.booleans.has("--threads");
+    const unreadOnly = values.booleans.has("--unread");
+    const remove = values.booleans.has("--remove");
+    const markRead = values.booleans.has("--mark-read");
+    const limit = optionalPositiveInteger(values.flags.get("--limit"), "--limit");
+    const before = optionalNonEmpty(values.flags.get("--before"));
+    const base = {
+        kind: "msg",
+        action,
+        homeDir: optionalNonEmpty(values.flags.get("--home")),
+        dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")),
+        isPrivate: false,
+        json: values.booleans.has("--json"),
+    };
+    if (action === "activity") {
+        if (rest.length > 0)
+            throw new Error(`msg activity does not take "${rest[0]}".`);
+        if (mentions && threads)
+            throw new Error("Pick one of --mentions or --threads, or neither for both.");
+        if (remove)
+            throw new Error("--remove belongs to `cockpit msg react`.");
+        return {
+            ...base,
+            ...(mentions ? { activityKind: "mention" } : threads ? { activityKind: "reply" } : {}),
+            ...(unreadOnly ? { unreadOnly } : {}),
+            ...(before ? { before } : {}),
+            ...(limit === undefined ? {} : { limit }),
+            ...(markRead ? { markRead } : {}),
+        };
+    }
+    if (mentions || threads || unreadOnly || markRead || before || limit !== undefined) {
+        throw new Error(`Only \`cockpit msg activity\` takes --mentions, --threads, --unread, --mark-read, --before or --limit.`);
+    }
+    if (remove && action !== "react")
+        throw new Error("--remove belongs to `cockpit msg react`.");
+    const targetId = optionalNonEmpty(rest[0]);
+    if (!targetId || !UUID_PATTERN.test(targetId)) {
+        throw new Error(`msg ${action} needs a message id (a UUID), e.g. \`cockpit msg ${action} <message-id>${action === "react" ? " :+1:" : ""}\`.`);
+    }
+    if (action !== "react") {
+        if (rest.length > 1)
+            throw new Error(`msg ${action} takes one message id, not ${rest.length}.`);
+        return { ...base, targetId };
+    }
+    const emoji = optionalNonEmpty(rest[1]);
+    if (!emoji || emoji.length > 32 || rest.length > 2) {
+        throw new Error("msg react needs one emoji of at most 32 characters, e.g. `cockpit msg react <message-id> 👍`.");
+    }
+    return { ...base, targetId, emoji, ...(remove ? { remove } : {}) };
+}
+/**
+ * `cockpit msg file upload <channel> <path|->  [--name <n>]`, `show <id>`, `download <id> [--out <path>]`,
+ * `cancel <id>`, `list <channel>` (BLI-21521). Stdin upload (`-`) needs --name.
+ */
+function parseMsgFileArgs(values, rest) {
+    const verb = rest[0];
+    if (!verb || !MSG_FILE_VERBS.has(verb)) {
+        throw new Error(`Unknown msg file command: ${rest[0] ?? "(none)"}. Try upload, show, download, cancel or list.`);
+    }
+    const stray = ["--limit", "--before", "--members", "--description", "--from", "--channel", "--thread", "--request-id", "--expected-revision", "--file"]
+        .find((flag) => values.flags.has(flag));
+    if (stray || values.booleans.has("--private") || values.booleans.has("--mark-read")) {
+        throw new Error(`${stray ?? "That flag"} does not belong to \`cockpit msg file\`. It takes --name (upload) and --out (download).`);
+    }
+    const positional = rest.slice(1);
+    const wanted = verb === "upload" ? 2 : 1;
+    if (positional.length !== wanted) {
+        throw new Error(verb === "upload"
+            ? "msg file upload needs a channel and a path (or - for stdin), e.g. `cockpit msg file upload general ./report.pdf`."
+            : `msg file ${verb} needs ${verb === "list" ? "a channel" : "a file id"}, e.g. \`cockpit msg file ${verb} ${verb === "list" ? "general" : "<file-id>"}\`.`);
+    }
+    const name = optionalNonEmpty(values.flags.get("--name"));
+    const out = optionalNonEmpty(values.flags.get("--out"));
+    if (name && verb !== "upload")
+        throw new Error("--name belongs to `cockpit msg file upload`.");
+    if (out && verb !== "download")
+        throw new Error("--out belongs to `cockpit msg file download`.");
+    if (verb === "upload" && positional[1] === "-" && !name)
+        throw new Error("Uploading from stdin needs --name <file name>.");
+    if ((verb === "show" || verb === "download" || verb === "cancel") && !UUID_PATTERN.test(positional[0])) {
+        throw new Error(`msg file ${verb} takes a file UUID.`);
+    }
+    return {
+        kind: "msg",
+        action: "file",
+        fileVerb: verb,
+        homeDir: optionalNonEmpty(values.flags.get("--home")),
+        dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")),
+        ...(verb === "upload" || verb === "list" ? { channelRef: positional[0] } : { targetId: positional[0] }),
+        ...(verb === "upload" ? { filePath: positional[1] } : {}),
+        ...(name ? { fileName: name } : {}),
+        ...(out ? { outPath: out } : {}),
+        isPrivate: false,
+        json: values.booleans.has("--json"),
+    };
 }
 /**
  * `cockpit msg draft [list|show|save|discard|restore|send] <channel> [--thread <id>] [--expected-revision <n>]`
@@ -159,7 +372,7 @@ function parseMsgAction(positionals) {
     const first = positionals[0];
     const action = (first === undefined ? "channels" : first);
     if (!MSG_ACTIONS.has(action)) {
-        throw new Error(`Unknown msg command: ${first}. Try channels, read, unread, send, thread, create, dm, or show; to change a message: edit, delete or outcome; for unsent text: draft.`);
+        throw new Error(`Unknown msg command: ${first}. Try channels, read, unread, send, thread, create, dm, or show; to change a message: edit, delete or outcome; for unsent text: draft; for files: file; to keep or share a message: save, saved, pin, pins or forward; to send or be reminded later: schedule, remind or scheduled; for Tower docs, tickets, events and notes on a message: context.`);
     }
     return { action, rest: positionals.slice(first === undefined ? 0 : 1) };
 }
@@ -182,11 +395,10 @@ function parseMsgCreateTarget(action, rest) {
     else if (action === "dm") {
         dmEmail = optionalNonEmpty(rest[0]);
         if (!dmEmail)
-            throw new Error("msg dm needs the person's email address, e.g. `cockpit msg dm ada@example.com`.");
-        if (rest.length > 1)
-            throw new Error(`msg dm takes one email address, not ${rest.length}.`);
-        if (!dmEmail.includes("@"))
-            throw new Error(`msg dm takes an email address; "${dmEmail}" is not one.`);
+            throw new Error("msg dm needs the person's email address, e.g. `cockpit msg dm ada@example.com` (several for a group message).");
+        const notAnAddress = rest.find((email) => !email.includes("@"));
+        if (notAnAddress !== undefined)
+            throw new Error(`msg dm takes email addresses; "${notAnAddress}" is not one.`);
     }
     return { channelName, dmEmail };
 }