botmux 2.23.3 → 2.24.1

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.js

@@ -1428,6 +1428,10 @@ botmux v${getVersion()} — IM ↔ AI 编程 CLI 桥接
   bots list                            列出当前群聊中的机器人（含 open_id）
   thread messages [--limit N]          拉取当前话题的消息历史 (JSON)
 
+新建飞书群:
+  create-group --bot <name> [--bot ...] [--name "群名"]
+                                       用指定 bot 起新群；详见 \`botmux create-group --help\`
+
 配置目录: ~/.botmux/
 文档: https://github.com/deepcoldy/botmux
 `);
@@ -2127,6 +2131,147 @@ async function cmdSend(rest) {
         process.exit(1);
     }
 }
+// ─── Create-group subcommand ─────────────────────────────────────────────────
+async function cmdCreateGroup(rest) {
+    if (rest.includes('--help') || rest.includes('-h')) {
+        console.log(`
+botmux create-group — 用一组机器人新建飞书群
+
+用法:
+  botmux create-group --bot <name|larkAppId> [--bot ...] [--name "群名"]
+
+参数:
+  --bot <ref>     至少一个，可多次。ref 推荐用 bot 显示名（同 botmux send 的 @<name>）或完整 larkAppId；
+                  cliId（如 claude-code）仅作 fallback —— 多个 bot 常共用同一个 cliId，重名命中只能取
+                  bots.json 中第一个。重名 → 取 bots.json 中第一个匹配，stderr 打 warning。
+                  重复 ref → 自动去重保留首次顺序。
+  --name <群名>   可选；不传则用飞书默认无名群。
+
+行为:
+  - 第一个解析到的 bot 作为 creator（决定建群身份 + 初始群主 + open_id app scope）。
+  - 邀请用户 / 转让群主 / @通知 对象都从 creator 的 resolvedAllowedUsers 取首个 open_id（email 自动转换；
+    转不出来或为空则跳过对应步骤，stderr warning）。
+  - 不依赖 botmux 会话，任何环境都能跑。
+
+输出协议（skill 友好）:
+  - 成功（即使 transfer/notify 部分失败）：stdout 单行 chatId，exit 0；stderr 打人类提示 + applink。
+  - 失败（缺 --bot / 解析失败 / chat.create 抛错）：stdout 空，exit 非零；stderr 打错误。
+`);
+        return;
+    }
+    process.env.SESSION_DATA_DIR ??= resolveDataDir();
+    const botRefs = argValues(rest, '--bot');
+    const name = argValue(rest, '--name');
+    if (botRefs.length === 0) {
+        console.error('用法: botmux create-group --bot <name|larkAppId> [--bot ...] [--name "群名"]');
+        console.error('至少传一个 --bot。');
+        process.exit(1);
+    }
+    // Load bot configs (bots.json order) and bots-info.json (for botName)
+    const { registerBot, loadBotConfigs } = await import('./bot-registry.js');
+    let botConfigs;
+    try {
+        botConfigs = loadBotConfigs().map(c => ({ larkAppId: c.larkAppId, cliId: c.cliId }));
+    }
+    catch (err) {
+        console.error(`加载 bots.json 失败: ${err?.message ?? err}`);
+        process.exit(1);
+    }
+    const dataDir = resolveDataDir();
+    const botInfoPath = join(dataDir, 'bots-info.json');
+    let botInfoEntries = [];
+    try {
+        if (existsSync(botInfoPath))
+            botInfoEntries = JSON.parse(readFileSync(botInfoPath, 'utf-8'));
+    }
+    catch { /* */ }
+    const { resolveBotRefs } = await import('./cli/create-group-resolver.js');
+    const resolved = resolveBotRefs(botRefs, botConfigs, botInfoEntries.map(b => ({ larkAppId: b.larkAppId, botName: b.botName })));
+    for (const w of resolved.ambiguousWarnings)
+        console.error(`⚠️  ${w}`);
+    if (resolved.invalid.length > 0) {
+        console.error(`无法解析的 --bot 引用: ${resolved.invalid.join(', ')}`);
+        console.error('可用 bot：');
+        for (const cfg of botConfigs) {
+            const info = botInfoEntries.find(b => b.larkAppId === cfg.larkAppId);
+            console.error(`  - ${info?.botName ?? '(unnamed)'}  cliId=${cfg.cliId}  ${cfg.larkAppId}`);
+        }
+        process.exit(1);
+    }
+    if (resolved.larkAppIds.length === 0) {
+        console.error('未解析到任何 bot，请检查 --bot 引用。');
+        process.exit(1);
+    }
+    const creatorLarkAppId = resolved.larkAppIds[0];
+    // Register bots so getBotClient works inside service
+    const fullConfigs = loadBotConfigs();
+    const needed = new Set(resolved.larkAppIds);
+    try {
+        for (const cfg of fullConfigs)
+            if (needed.has(cfg.larkAppId))
+                registerBot(cfg);
+    }
+    catch (err) {
+        console.error(`注册 bot 失败: ${err?.message ?? err}`);
+        process.exit(1);
+    }
+    // Derive user_open_id from creator's allowedUsers (creator app scope only).
+    // resolveAllowedUsers converts emails → open_ids via creator's Lark client.
+    const creatorCfg = fullConfigs.find(c => c.larkAppId === creatorLarkAppId);
+    const allowedRaw = creatorCfg?.allowedUsers ?? [];
+    const { resolveAllowedUsers } = await import('./im/lark/client.js');
+    let creatorAllowedOpenIds = [];
+    try {
+        creatorAllowedOpenIds = await resolveAllowedUsers(creatorLarkAppId, allowedRaw);
+    }
+    catch (err) {
+        console.error(`⚠️  解析 creator allowedUsers 失败: ${err?.message ?? err}（继续创建空群）`);
+    }
+    const targetOpenId = creatorAllowedOpenIds[0];
+    if (!targetOpenId) {
+        console.error('⚠️  creator bot 的 allowedUsers 没有可用 open_id — 将创建仅含 bot 的群（跳过邀请/转让/@通知）。');
+    }
+    const { createGroupWithBots } = await import('./services/group-creator.js');
+    let result;
+    try {
+        result = await createGroupWithBots({
+            creatorLarkAppId,
+            larkAppIds: resolved.larkAppIds,
+            name: name?.trim() || undefined,
+            userOpenIds: targetOpenId ? [targetOpenId] : [],
+            transferOwnerTo: targetOpenId,
+            notifyOwnerOpenId: targetOpenId,
+        });
+    }
+    catch (err) {
+        console.error(`建群失败: ${err?.message ?? err}`);
+        process.exit(1);
+    }
+    // Always stdout chatId on createChat success — even if transfer/notify
+    // partially failed, the chat exists and retrying would create duplicates.
+    process.stdout.write(`${result.chatId}\n`);
+    // Human-readable summary + warnings → stderr.
+    const link = `https://applink.feishu.cn/client/chat/open?openChatId=${encodeURIComponent(result.chatId)}`;
+    console.error(`✅ 群已创建：${link}`);
+    if (result.invalidBotIds.length > 0) {
+        console.error(`⚠️  飞书拒绝邀请的 bot: ${result.invalidBotIds.join(', ')}`);
+    }
+    if (result.invalidUserIds.length > 0) {
+        console.error(`⚠️  飞书拒绝邀请的 user: ${result.invalidUserIds.join(', ')}`);
+    }
+    if (result.transferError) {
+        console.error(`⚠️  群主转让失败 (${result.transferError}) — 当前群主仍为 creator bot`);
+    }
+    else if (result.ownerTransferredTo) {
+        console.error(`✅ 群主已转让给 ${result.ownerTransferredTo}`);
+    }
+    if (result.notifyError) {
+        console.error(`⚠️  @通知发送失败: ${result.notifyError}`);
+    }
+    else if (result.notifyMessageId) {
+        console.error(`✅ @通知已发送 (msg ${result.notifyMessageId})`);
+    }
+}
 // ─── Bots subcommand ─────────────────────────────────────────────────────────
 async function cmdBots(sub, rest) {
     process.env.SESSION_DATA_DIR ??= resolveDataDir();
@@ -2245,6 +2390,9 @@ switch (command) {
     case 'send':
         await cmdSend(process.argv.slice(3));
         break;
+    case 'create-group':
+        await cmdCreateGroup(process.argv.slice(3));
+        break;
     case 'bots':
         await cmdBots(process.argv[3] ?? 'list', process.argv.slice(4));
         break;