@bli-cockpit/cli 0.2.237 → 0.2.239

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

@@ -119,6 +119,40 @@ export function parseMemoryStoreArgs(action, args) {
     const values = parseNamedArgs(args, { allowedFlags: ALLOWED_FLAGS, valueFlags: VALUE_FLAGS });
     const rest = values.positionals.slice(1);
     const containers = values.flagValues.get("--container") ?? [];
+    rejectFlagsThatDoNotBelongTo(action, values, containers, rest);
+    const command = {
+        kind: "memory-store",
+        homeDir: optionalNonEmpty(values.flags.get("--home")),
+        dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")),
+        workspace: optionalNonEmpty(workRootFlagValue(values)),
+        containerTags: containers
+            .map((tag) => tag.trim())
+            .filter((tag) => tag.length > 0),
+        json: values.booleans.has("--json"),
+    };
+    if (action === "requeue")
+        return parseRequeueVerb(command, values, rest);
+    if (action === "profile")
+        return parseProfileVerb(command, rest);
+    if (action === "search")
+        return parseSearchVerb(command, values, rest);
+    if (action === "consolidation")
+        return { ...command, action };
+    if (action === "exam")
+        return parseExamVerb(command, values, rest);
+    if (action === "source")
+        return parseSourceVerb(command, values, rest);
+    if (action === "private" || action === "public" || action === "chain") {
+        return parseOneMemoryIdVerb(command, action, rest);
+    }
+    if (action === "save")
+        return parseSaveVerb(command, values, rest);
+    if (action === "update")
+        return parseUpdateVerb(command, values, rest);
+    return parseForgetVerb(command, values, rest);
+}
+/** Every flag is legal to the parser; this says which verb each one belongs to. */
+function rejectFlagsThatDoNotBelongTo(action, values, containers, rest) {
     if (action !== "search" && action !== "consolidation" && containers.length > 1) {
         throw new Error(`memory ${action} takes at most one --container.`);
     }
@@ -166,130 +200,118 @@ export function parseMemoryStoreArgs(action, args) {
     if (values.flags.has("--file") && action !== "save" && action !== "update") {
         throw new Error("--file only applies to memory save and memory update.");
     }
-    const command = {
-        kind: "memory-store",
-        action,
-        homeDir: optionalNonEmpty(values.flags.get("--home")),
-        dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")),
-        workspace: optionalNonEmpty(workRootFlagValue(values)),
-        containerTags: containers
-            .map((tag) => tag.trim())
-            .filter((tag) => tag.length > 0),
-        json: values.booleans.has("--json"),
-    };
-    if (action === "requeue") {
-        // A window is REQUIRED. There is no requeue-everything: applying re-runs
-        // one model call per receipt, so the ceiling on a wrong filter is a bill.
-        if (rest.length > 0) {
-            throw new Error("memory requeue takes no words; name the window with --since and --until.");
-        }
-        const since = readInstant(values.flags.get("--since"), "--since");
-        if (!since) {
-            throw new Error("memory requeue needs --since <iso>, e.g. `cockpit memory requeue --since 2026-09-21T04:10:00Z --dry-run`.");
-        }
-        const until = readInstant(values.flags.get("--until"), "--until");
-        if (until && until < since)
-            throw new Error("--until is before --since; nothing could match.");
-        const source = optionalNonEmpty(values.flags.get("--source"));
-        if (source && source !== "hook" && source !== "harvest") {
-            throw new Error("--source is hook or harvest — the two values a receipt can carry.");
-        }
-        if (values.booleans.has("--dry-run") && values.booleans.has("--apply")) {
-            throw new Error("--dry-run and --apply are opposites; name one.");
-        }
-        return {
-            ...command,
-            action,
-            since,
-            until,
-            ...(source ? { source: source } : {}),
-            // The safe question unless somebody typed otherwise.
-            dryRun: !values.booleans.has("--apply"),
-            reason: optionalNonEmpty(values.flags.get("--reason")),
-        };
-    }
-    if (action === "profile") {
-        // A pure read of ONE container's compiled page. No positional: there is
-        // nothing to ask it, and a stray word would look like a query this verb
-        // silently ignored.
-        if (rest.length > 0) {
-            throw new Error("memory profile takes no words; it reads this repository's compiled page. Name another space with --container.");
-        }
-        return { ...command, action };
+}
+function parseRequeueVerb(command, values, rest) {
+    // A window is REQUIRED. There is no requeue-everything: applying re-runs
+    // one model call per receipt, so the ceiling on a wrong filter is a bill.
+    if (rest.length > 0) {
+        throw new Error("memory requeue takes no words; name the window with --since and --until.");
     }
-    if (action === "search") {
-        // Every remaining positional joined, so `cockpit memory search what did we
-        // decide about pagination` needs no quotes — the same shape `cockpit
-        // search` and `cockpit cal find` already have.
-        const query = rest.join(" ").trim();
-        if (!query)
-            throw new Error("memory search needs a question, e.g. `cockpit memory search \"pagination rule\"`.");
-        // BLI-19246: both flags absent leaves the choice to the door (exact-detail questions reach the originals).
-        const includeOriginals = values.booleans.has("--include-originals") ? true : values.booleans.has("--no-originals") ? false : undefined;
-        // BLI-19255: the raw source behind the top hits; absent lets the door decide by the question.
-        const includeSource = values.booleans.has("--include-source") ? true : values.booleans.has("--no-source") ? false : undefined;
-        return {
-            ...command, action, query, limit: readLimit(values.flags.get("--limit")), includeRecent: !values.booleans.has("--no-recent"),
-            ...(includeOriginals === undefined ? {} : { includeOriginals }),
-            ...(includeSource === undefined ? {} : { includeSource }),
-        };
+    const since = readInstant(values.flags.get("--since"), "--since");
+    if (!since) {
+        throw new Error("memory requeue needs --since <iso>, e.g. `cockpit memory requeue --since 2026-09-21T04:10:00Z --dry-run`.");
     }
-    if (action === "consolidation") {
-        return { ...command, action };
+    const until = readInstant(values.flags.get("--until"), "--until");
+    if (until && until < since)
+        throw new Error("--until is before --since; nothing could match.");
+    const source = optionalNonEmpty(values.flags.get("--source"));
+    if (source && source !== "hook" && source !== "harvest") {
+        throw new Error("--source is hook or harvest — the two values a receipt can carry.");
     }
-    if (action === "exam") {
-        if (rest.length > 0)
-            throw new Error("memory exam takes no words: `cockpit memory exam [--night <YYYY-MM-DD>] [--misses] [--json]`.");
-        const night = optionalNonEmpty(values.flags.get("--night"));
-        if (night && !/^\d{4}-\d{2}-\d{2}$/.test(night))
-            throw new Error("--night must be a date like 2026-10-14.");
-        return { ...command, action, ...(night ? { night } : {}), misses: values.booleans.has("--misses") };
+    if (values.booleans.has("--dry-run") && values.booleans.has("--apply")) {
+        throw new Error("--dry-run and --apply are opposites; name one.");
     }
-    if (action === "source") {
-        // BLI-19255: one memory, named by the id `cockpit memory search` printed; `--query` steers which part of the source.
-        const memoryId = optionalNonEmpty(rest[0]);
-        if (!memoryId)
-            throw new Error("memory source needs the memory id `cockpit memory search` printed.");
-        if (rest.length > 1)
-            throw new Error("memory source takes one id.");
-        const rawChars = values.flags.get("--chars");
-        const chars = rawChars === undefined ? undefined : Number(rawChars);
-        if (chars !== undefined && (!Number.isInteger(chars) || chars < 200 || chars > 6000))
-            throw new Error("--chars is a whole number from 200 to 6000.");
-        return { ...command, action, memoryId, ...(values.flags.get("--query") ? { sourceQuery: values.flags.get("--query") } : {}), ...(chars === undefined ? {} : { sourceChars: chars }) };
+    return {
+        ...command,
+        action: "requeue",
+        since,
+        until,
+        ...(source ? { source: source } : {}),
+        // The safe question unless somebody typed otherwise.
+        dryRun: !values.booleans.has("--apply"),
+        reason: optionalNonEmpty(values.flags.get("--reason")),
+    };
+}
+function parseProfileVerb(command, rest) {
+    // A pure read of ONE container's compiled page. No positional: there is
+    // nothing to ask it, and a stray word would look like a query this verb
+    // silently ignored.
+    if (rest.length > 0) {
+        throw new Error("memory profile takes no words; it reads this repository's compiled page. Name another space with --container.");
     }
-    if (action === "private" || action === "public" || action === "chain") {
-        // BLI-12927: one memory, named by the id `cockpit memory search` printed.
-        const memoryId = optionalNonEmpty(rest[0]);
-        if (!memoryId) {
-            throw new Error(`memory ${action} needs the memory id \`cockpit memory search\` printed.`);
-        }
-        if (rest.length > 1)
-            throw new Error(`memory ${action} takes one id.`);
-        return { ...command, action, memoryId };
+    return { ...command, action: "profile" };
+}
+function parseSearchVerb(command, values, rest) {
+    // Every remaining positional joined, so `cockpit memory search what did we
+    // decide about pagination` needs no quotes — the same shape `cockpit
+    // search` and `cockpit cal find` already have.
+    const query = rest.join(" ").trim();
+    if (!query)
+        throw new Error("memory search needs a question, e.g. `cockpit memory search \"pagination rule\"`.");
+    // BLI-19246: both flags absent leaves the choice to the door (exact-detail questions reach the originals).
+    const includeOriginals = values.booleans.has("--include-originals") ? true : values.booleans.has("--no-originals") ? false : undefined;
+    // BLI-19255: the raw source behind the top hits; absent lets the door decide by the question.
+    const includeSource = values.booleans.has("--include-source") ? true : values.booleans.has("--no-source") ? false : undefined;
+    return {
+        ...command, action: "search", query, limit: readLimit(values.flags.get("--limit")), includeRecent: !values.booleans.has("--no-recent"),
+        ...(includeOriginals === undefined ? {} : { includeOriginals }),
+        ...(includeSource === undefined ? {} : { includeSource }),
+    };
+}
+function parseExamVerb(command, values, rest) {
+    if (rest.length > 0)
+        throw new Error("memory exam takes no words: `cockpit memory exam [--night <YYYY-MM-DD>] [--misses] [--json]`.");
+    const night = optionalNonEmpty(values.flags.get("--night"));
+    if (night && !/^\d{4}-\d{2}-\d{2}$/.test(night))
+        throw new Error("--night must be a date like 2026-10-14.");
+    return { ...command, action: "exam", ...(night ? { night } : {}), misses: values.booleans.has("--misses") };
+}
+function parseSourceVerb(command, values, rest) {
+    // BLI-19255: one memory, named by the id `cockpit memory search` printed; `--query` steers which part of the source.
+    const memoryId = optionalNonEmpty(rest[0]);
+    if (!memoryId)
+        throw new Error("memory source needs the memory id `cockpit memory search` printed.");
+    if (rest.length > 1)
+        throw new Error("memory source takes one id.");
+    const rawChars = values.flags.get("--chars");
+    const chars = rawChars === undefined ? undefined : Number(rawChars);
+    if (chars !== undefined && (!Number.isInteger(chars) || chars < 200 || chars > 6000))
+        throw new Error("--chars is a whole number from 200 to 6000.");
+    return { ...command, action: "source", memoryId, ...(values.flags.get("--query") ? { sourceQuery: values.flags.get("--query") } : {}), ...(chars === undefined ? {} : { sourceChars: chars }) };
+}
+function parseOneMemoryIdVerb(command, action, rest) {
+    // BLI-12927: one memory, named by the id `cockpit memory search` printed.
+    const memoryId = optionalNonEmpty(rest[0]);
+    if (!memoryId) {
+        throw new Error(`memory ${action} needs the memory id \`cockpit memory search\` printed.`);
     }
-    if (action === "save") {
-        if (rest.length > 0) {
-            throw new Error("memory save reads the memory from stdin or --file, never from the command line: `echo \"...\" | cockpit memory save`.");
-        }
-        return {
-            ...command,
-            action,
-            customId: optionalNonEmpty(values.flags.get("--custom-id")),
-            ...(values.flagValues.has("--alias") ? { aliases: values.flagValues.get("--alias") } : {}),
-            extract: values.booleans.has("--extract"),
-            filePath: optionalNonEmpty(values.flags.get("--file")),
-        };
+    if (rest.length > 1)
+        throw new Error(`memory ${action} takes one id.`);
+    return { ...command, action, memoryId };
+}
+function parseSaveVerb(command, values, rest) {
+    if (rest.length > 0) {
+        throw new Error("memory save reads the memory from stdin or --file, never from the command line: `echo \"...\" | cockpit memory save`.");
     }
-    if (action === "update") {
-        const memoryId = optionalNonEmpty(rest[0]);
-        if (!memoryId)
-            throw new Error("memory update needs the memory id `cockpit memory search` printed.");
-        if (rest.length > 1) {
-            throw new Error("memory update takes one id; the replacement text comes from stdin or --file, never from the command line.");
-        }
-        return { ...command, action, memoryId, filePath: optionalNonEmpty(values.flags.get("--file")) };
+    return {
+        ...command,
+        action: "save",
+        customId: optionalNonEmpty(values.flags.get("--custom-id")),
+        ...(values.flagValues.has("--alias") ? { aliases: values.flagValues.get("--alias") } : {}),
+        extract: values.booleans.has("--extract"),
+        filePath: optionalNonEmpty(values.flags.get("--file")),
+    };
+}
+function parseUpdateVerb(command, values, rest) {
+    const memoryId = optionalNonEmpty(rest[0]);
+    if (!memoryId)
+        throw new Error("memory update needs the memory id `cockpit memory search` printed.");
+    if (rest.length > 1) {
+        throw new Error("memory update takes one id; the replacement text comes from stdin or --file, never from the command line.");
     }
+    return { ...command, action: "update", memoryId, filePath: optionalNonEmpty(values.flags.get("--file")) };
+}
+function parseForgetVerb(command, values, rest) {
     const memoryId = optionalNonEmpty(rest[0]);
     if (rest.length > 1)
         throw new Error("memory forget takes one id, or --content-stdin with a --container.");
@@ -302,7 +324,7 @@ export function parseMemoryStoreArgs(action, args) {
     }
     return {
         ...command,
-        action,
+        action: "forget",
         memoryId,
         contentStdin,
         reason: optionalNonEmpty(values.flags.get("--reason")),

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

@@ -1,6 +1,6 @@
 import { optionalNonEmpty, optionalPositiveInteger, optionalUrl, parseNamedArgs } from "./local-arg-values.js";
-const MSG_ACTIONS = new Set(["channels", "read", "send", "thread", "create", "dm", "show"]);
-const MSG_ACTIONS_NEEDING_A_CHANNEL = new Set(["read", "send"]);
+const MSG_ACTIONS = new Set(["channels", "read", "send", "thread", "create", "dm", "show", "unread"]);
+const MSG_ACTIONS_NEEDING_A_CHANNEL = new Set(["read", "send", "unread"]);
 /**
  * `--members a@x.test,b@y.test` — addresses only, split on commas, never
  * fuzzy (BLI-3749). The door resolves each one exactly, so a typo comes back
@@ -35,24 +35,40 @@ export function parseMsgArgs(args) {
             "--private",
             "--members",
             "--description",
+            "--from",
+            "--mark-read",
             "--json",
         ],
-        valueFlags: ["--home", "--dashboard-url", "--channel", "--thread", "--limit", "--members", "--description", "--before"],
+        valueFlags: ["--home", "--dashboard-url", "--channel", "--thread", "--limit", "--members", "--description", "--before", "--from"],
     });
     const { action, rest } = parseMsgAction(values.positionals);
     if (values.flags.has("--before") && action !== "read" && action !== "thread") {
         throw new Error("--before belongs to msg read or msg thread.");
     }
+    const { markRead, unreadFrom } = parseMsgReadLineFlags(action, values);
     const { channelName, dmEmail } = parseMsgCreateTarget(action, rest);
     const { isPrivate, memberEmails, description } = parseMsgCreateFlags(action, values);
     const { channelRef, threadId, limit } = parseMsgReadTarget(action, rest, values);
-    return buildMsgCommand(values, action, channelRef, channelName, dmEmail, memberEmails, description, isPrivate, threadId, limit);
+    return buildMsgCommand(values, action, channelRef, channelName, dmEmail, memberEmails, description, isPrivate, threadId, limit, markRead, unreadFrom);
+}
+/** `read --mark-read` and `unread --from <message-id>` (BLI-21299): the read line, moved on purpose. */
+function parseMsgReadLineFlags(action, values) {
+    const markRead = values.booleans.has("--mark-read");
+    if (markRead && action !== "read")
+        throw new Error("--mark-read belongs to `cockpit msg read`.");
+    const unreadFrom = optionalNonEmpty(values.flags.get("--from"));
+    if (action === "unread" && !unreadFrom) {
+        throw new Error("msg unread needs --from <message-id>, e.g. `cockpit msg unread general --from <message-id>`.");
+    }
+    if (unreadFrom && action !== "unread")
+        throw new Error("--from belongs to `cockpit msg unread`.");
+    return { markRead, unreadFrom };
 }
 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, send, thread, create, dm, or show.`);
+        throw new Error(`Unknown msg command: ${first}. Try channels, read, unread, send, thread, create, dm, or show.`);
     }
     return { action, rest: positionals.slice(first === undefined ? 0 : 1) };
 }
@@ -129,7 +145,7 @@ function parseMsgReadTarget(action, rest, values) {
     }
     return { channelRef, threadId, limit };
 }
-function buildMsgCommand(values, action, channelRef, channelName, dmEmail, memberEmails, description, isPrivate, threadId, limit) {
+function buildMsgCommand(values, action, channelRef, channelName, dmEmail, memberEmails, description, isPrivate, threadId, limit, markRead, unreadFrom) {
     return {
         kind: "msg",
         action,
@@ -144,6 +160,8 @@ function buildMsgCommand(values, action, channelRef, channelName, dmEmail, membe
         isPrivate,
         ...(threadId ? { threadId } : {}),
         ...(limit === undefined ? {} : { limit }),
+        ...(markRead ? { markRead } : {}),
+        ...(unreadFrom ? { unreadFrom } : {}),
         json: values.booleans.has("--json"),
     };
 }