botmux 2.9.0 → 2.9.2

package/dist/cli/arg-utils.js

@@ -0,0 +1,25 @@
+/**
+ * Small argv helpers used by botmux subcommands. Lives in a side-effect-free
+ * module so tests can import them without triggering cli.ts's top-level
+ * dispatcher switch.
+ */
+/** Pick the first positional (non-flag, non-flag-value) token from `args`.
+ *  Skips both `--name` flags AND their following value tokens, so
+ *  `cmd --session-id <uuid> om_xxx` correctly returns `om_xxx`. Flags that
+ *  take values must be passed in `flagsWithValue` to avoid eating their args. */
+export function firstPositional(args, flagsWithValue) {
+    for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (flagsWithValue.includes(a)) {
+            i++;
+            continue;
+        } // --flag value
+        if (flagsWithValue.some(f => a.startsWith(f + '=')))
+            continue; // --flag=value
+        if (a.startsWith('-'))
+            continue; // unknown flag / boolean
+        return a;
+    }
+    return undefined;
+}
+//# sourceMappingURL=arg-utils.js.map

package/dist/cli/arg-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arg-utils.js","sourceRoot":"","sources":["../../src/cli/arg-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;iFAGiF;AACjF,MAAM,UAAU,eAAe,CAAC,IAAc,EAAE,cAAwB;IACtE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,IAAI,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YAAC,CAAC,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC,CAAY,eAAe;QAC7E,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;YAAE,SAAS,CAAC,eAAe;QAC9E,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS,CAA8B,yBAAyB;QACvF,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/cli/create-group-resolver.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Bot ref resolver for `botmux create-group`. Pure function, no I/O — testable
+ * in isolation by passing in mock bot configs + bot-info entries.
+ *
+ * Resolution order for each ref:
+ *   1. Exact `larkAppId` match
+ *   2. `botName` from bots-info.json (case-insensitive)
+ *   3. `cliId` from bots.json (case-insensitive) — fallback when botName is
+ *      unknown (bots-info.json gets populated by daemon at startup)
+ *
+ * Multiple matches by name → take the first in `botConfigs` order (= bots.json
+ * traversal order, the user's deployment intent). Same ref repeated → dedup,
+ * keeping first occurrence. Unresolvable ref → reported in `invalid` list.
+ */
+export interface BotConfigForResolve {
+    larkAppId: string;
+    cliId: string;
+}
+export interface BotInfoForResolve {
+    larkAppId: string;
+    botName: string | null;
+}
+export interface ResolvedBots {
+    /** Resolved larkAppIds in input order, deduped. First element is creator. */
+    larkAppIds: string[];
+    /** Refs that couldn't be matched to any bot. */
+    invalid: string[];
+    /** Warnings about ambiguous name → first match picked. */
+    ambiguousWarnings: string[];
+}
+export declare function resolveBotRefs(refs: string[], botConfigs: BotConfigForResolve[], botInfo: BotInfoForResolve[]): ResolvedBots;
+//# sourceMappingURL=create-group-resolver.d.ts.map

package/dist/cli/create-group-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-group-resolver.d.ts","sourceRoot":"","sources":["../../src/cli/create-group-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,6EAA6E;IAC7E,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,gDAAgD;IAChD,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,0DAA0D;IAC1D,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EAAE,EACd,UAAU,EAAE,mBAAmB,EAAE,EACjC,OAAO,EAAE,iBAAiB,EAAE,GAC3B,YAAY,CA2Dd"}

package/dist/cli/create-group-resolver.js

@@ -0,0 +1,70 @@
+/**
+ * Bot ref resolver for `botmux create-group`. Pure function, no I/O — testable
+ * in isolation by passing in mock bot configs + bot-info entries.
+ *
+ * Resolution order for each ref:
+ *   1. Exact `larkAppId` match
+ *   2. `botName` from bots-info.json (case-insensitive)
+ *   3. `cliId` from bots.json (case-insensitive) — fallback when botName is
+ *      unknown (bots-info.json gets populated by daemon at startup)
+ *
+ * Multiple matches by name → take the first in `botConfigs` order (= bots.json
+ * traversal order, the user's deployment intent). Same ref repeated → dedup,
+ * keeping first occurrence. Unresolvable ref → reported in `invalid` list.
+ */
+export function resolveBotRefs(refs, botConfigs, botInfo) {
+    const out = [];
+    const seen = new Set();
+    const invalid = [];
+    const ambiguousWarnings = [];
+    for (const ref of refs) {
+        const trimmed = ref.trim();
+        if (!trimmed)
+            continue;
+        let matchedAppId;
+        let ambiguousLabel;
+        // 1. Exact larkAppId
+        const byAppId = botConfigs.find(c => c.larkAppId === trimmed);
+        if (byAppId) {
+            matchedAppId = byAppId.larkAppId;
+        }
+        else {
+            // 2. botName (case-insensitive). bots-info.json is merge-written by
+            //    multiple daemons and its order is NOT guaranteed to match bots.json.
+            //    Spec says "重名取 bots.json 中第一个", so we walk botConfigs in
+            //    deployment order and pick the first whose appId appears in the
+            //    set of name-matched entries.
+            const lower = trimmed.toLowerCase();
+            const nameMatchSet = new Set(botInfo.filter(b => b.botName?.toLowerCase() === lower).map(b => b.larkAppId));
+            const byNameAll = botConfigs.filter(c => nameMatchSet.has(c.larkAppId));
+            if (byNameAll.length > 0) {
+                matchedAppId = byNameAll[0].larkAppId;
+                if (byNameAll.length > 1)
+                    ambiguousLabel = `botName "${trimmed}"`;
+            }
+            else {
+                // 3. cliId fallback — relies on botConfigs order which IS bots.json
+                //    order (loadBotConfigs preserves file traversal order).
+                const byCliIdAll = botConfigs.filter(c => c.cliId.toLowerCase() === lower);
+                if (byCliIdAll.length > 0) {
+                    matchedAppId = byCliIdAll[0].larkAppId;
+                    if (byCliIdAll.length > 1)
+                        ambiguousLabel = `cliId "${trimmed}"`;
+                }
+            }
+        }
+        if (!matchedAppId) {
+            invalid.push(trimmed);
+            continue;
+        }
+        if (seen.has(matchedAppId))
+            continue;
+        seen.add(matchedAppId);
+        out.push(matchedAppId);
+        if (ambiguousLabel) {
+            ambiguousWarnings.push(`${ambiguousLabel} matches multiple bots in bots.json — picked first (${matchedAppId}).`);
+        }
+    }
+    return { larkAppIds: out, invalid, ambiguousWarnings };
+}
+//# sourceMappingURL=create-group-resolver.js.map

package/dist/cli/create-group-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-group-resolver.js","sourceRoot":"","sources":["../../src/cli/create-group-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAqBH,MAAM,UAAU,cAAc,CAC5B,IAAc,EACd,UAAiC,EACjC,OAA4B;IAE5B,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO;YAAE,SAAS;QAEvB,IAAI,YAAgC,CAAC;QACrC,IAAI,cAAkC,CAAC;QAEvC,qBAAqB;QACrB,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC;QAC9D,IAAI,OAAO,EAAE,CAAC;YACZ,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,oEAAoE;YACpE,0EAA0E;YAC1E,8DAA8D;YAC9D,oEAAoE;YACpE,kCAAkC;YAClC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;YACpC,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAC9E,CAAC;YACF,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACxE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;oBAAE,cAAc,GAAG,YAAY,OAAO,GAAG,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,oEAAoE;gBACpE,4DAA4D;gBAC5D,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC;gBAC3E,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1B,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBACvC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;wBAAE,cAAc,GAAG,UAAU,OAAO,GAAG,CAAC;gBACnE,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtB,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC;YAAE,SAAS;QACrC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACvB,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEvB,IAAI,cAAc,EAAE,CAAC;YACnB,iBAAiB,CAAC,IAAI,CACpB,GAAG,cAAc,uDAAuD,YAAY,IAAI,CACzF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACzD,CAAC"}

package/dist/cli/quoted-render.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Pure-function render pipeline for `botmux quoted`. Extracted so unit tests
+ * can exercise the wire-up (numberer sharing, extraResources merging) without
+ * spinning up the CLI dispatcher or hitting Lark APIs.
+ */
+import type { LarkMessage } from '../types.js';
+import { createImgNumberer, type MessageResource } from '../im/lark/message-parser.js';
+/** Subset of expandMergeForward used here — accepts the parsed message and a
+ *  numberer, mutates parsed.content to the rendered tree, returns extra
+ *  resources from sub-messages. Dependency-injected so tests can stub it. */
+export type ExpandMergeForwardFn = (larkAppId: string, messageId: string, parsed: LarkMessage, numberer: ReturnType<typeof createImgNumberer>) => Promise<{
+    extraResources: MessageResource[];
+}>;
+export interface RenderedQuotedMessage extends LarkMessage {
+    resources: MessageResource[];
+}
+/**
+ * Render a single quoted message into the JSON shape `botmux quoted` emits.
+ *
+ * Invariants this preserves:
+ *   - Image and file counters in `[图片 N]` / `[文件 N]` placeholders align
+ *     1:1 with the indices of the matching-type entries in `resources`
+ *     (independent counters, mirrors `formatAttachmentsHint`).
+ *   - For merge_forward messages, sub-message images/files are appended to
+ *     `resources` and rendered inside the forwarded-XML tree using the same
+ *     numberer, so placeholders inside the XML keep aligning with the
+ *     overall list.
+ */
+export declare function renderQuotedMessage(larkAppId: string, rawMessage: any, expandMergeForward: ExpandMergeForwardFn): Promise<RenderedQuotedMessage>;
+//# sourceMappingURL=quoted-render.d.ts.map

package/dist/cli/quoted-render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quoted-render.d.ts","sourceRoot":"","sources":["../../src/cli/quoted-render.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAGL,iBAAiB,EACjB,KAAK,eAAe,EACrB,MAAM,8BAA8B,CAAC;AAEtC;;6EAE6E;AAC7E,MAAM,MAAM,oBAAoB,GAAG,CACjC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAC3C,OAAO,CAAC;IAAE,cAAc,EAAE,eAAe,EAAE,CAAA;CAAE,CAAC,CAAC;AAEpD,MAAM,WAAW,qBAAsB,SAAQ,WAAW;IACxD,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,GAAG,EACf,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,qBAAqB,CAAC,CAchC"}

package/dist/cli/quoted-render.js

@@ -0,0 +1,29 @@
+import { parseApiMessage, extractResources, createImgNumberer, } from '../im/lark/message-parser.js';
+/**
+ * Render a single quoted message into the JSON shape `botmux quoted` emits.
+ *
+ * Invariants this preserves:
+ *   - Image and file counters in `[图片 N]` / `[文件 N]` placeholders align
+ *     1:1 with the indices of the matching-type entries in `resources`
+ *     (independent counters, mirrors `formatAttachmentsHint`).
+ *   - For merge_forward messages, sub-message images/files are appended to
+ *     `resources` and rendered inside the forwarded-XML tree using the same
+ *     numberer, so placeholders inside the XML keep aligning with the
+ *     overall list.
+ */
+export async function renderQuotedMessage(larkAppId, rawMessage, expandMergeForward) {
+    const numberer = createImgNumberer();
+    // Order: extractResources first so top-level keys get their numbers, then
+    // parseApiMessage reuses them when rendering text content. Calling them in
+    // the other order leaves resources unnumbered when extractTextContent runs
+    // first (it only consults the cache, doesn't create entries for resources
+    // that haven't been declared yet via extractResources).
+    const resources = extractResources(rawMessage.msg_type ?? '', rawMessage.body?.content ?? '', numberer);
+    const parsed = parseApiMessage(rawMessage, numberer);
+    if (parsed.msgType === 'merge_forward') {
+        const { extraResources } = await expandMergeForward(larkAppId, parsed.messageId, parsed, numberer);
+        resources.push(...extraResources);
+    }
+    return { ...parsed, resources };
+}
+//# sourceMappingURL=quoted-render.js.map

package/dist/cli/quoted-render.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quoted-render.js","sourceRoot":"","sources":["../../src/cli/quoted-render.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,iBAAiB,GAElB,MAAM,8BAA8B,CAAC;AAgBtC;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,SAAiB,EACjB,UAAe,EACf,kBAAwC;IAExC,MAAM,QAAQ,GAAG,iBAAiB,EAAE,CAAC;IACrC,0EAA0E;IAC1E,2EAA2E;IAC3E,2EAA2E;IAC3E,0EAA0E;IAC1E,wDAAwD;IACxD,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IACxG,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACrD,IAAI,MAAM,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;QACvC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACnG,SAAS,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,CAAC;AAClC,CAAC"}