botmux 3.5.2 → 3.6.0

package/dist/core/command-handler.js

@@ -7,7 +7,7 @@ import { join, resolve, basename } from 'node:path';
 import { config } from '../config.js';
 import { buildTerminalUrl } from './terminal-url.js';
 import { getBot, getAllBots, getBotOpenId, getOwnerOpenId, findOncallChat, effectiveDefaultWorkingDir } from '../bot-registry.js';
-import { repoPickerScanOptions } from '../global-config.js';
+import { readGlobalConfig, repoPickerScanOptions } from '../global-config.js';
 import * as sessionStore from '../services/session-store.js';
 import * as scheduleStore from '../services/schedule-store.js';
 import * as scheduler from './scheduler.js';
@@ -23,7 +23,7 @@ import { chatAppLink, normalizeBrand } from '../im/lark/lark-hosts.js';
 import { claimPairing } from '../services/pairing-store.js';
 import { logger } from '../utils/logger.js';
 import { scheduleTimeZone } from '../utils/timezone.js';
-import { killWorker, suspendWorker, forkWorker, forkAdoptWorker, adoptSandboxBlocked, getCurrentCliVersion, postFreshStreamingCard, postPrivateSnapshotCard, resolvePrivateCardAudience, deliverEphemeralOrReply, deliverWritableTerminalCardTo } from './worker-pool.js';
+import { killWorker, suspendWorker, forkWorker, forkAdoptWorker, adoptSandboxBlocked, getCurrentCliVersion, postFreshStreamingCard, postPrivateSnapshotCard, resolvePrivateCardAudience, deliverEphemeralOrReply, deliverWritableTerminalCardTo, requestSessionRestart } from './worker-pool.js';
 import { expandHome, getSessionWorkingDir, getProjectScanDirs, rememberLastCliInput, buildNewTopicCliInput, ensureSessionWhiteboard, getAvailableBots, } from './session-manager.js';
 import { discoverSlashCommandsForAdapter, listMcpServerNames, supportsFilesystemCommandDiscovery } from './command-discovery.js';
 import { validateWorkingDir } from './working-dir.js';
@@ -74,6 +74,23 @@ export { DAEMON_COMMANDS, PASSTHROUGH_COMMANDS };
  * that pollutes the dashboard's session list. Handle them without a session.
  */
 export const SESSIONLESS_DAEMON_COMMANDS = new Set(['/group', '/g', '/list-slash-command', '/slash', '/botconfig', '/dashboard', '/skills', '/vc-auth', '/watch-comment']);
+const SLASH_GROUP_NAME_MAX_UTF16_LENGTH = 50;
+/** Apply the machine-wide prefix used only by `/group` and `/g`, then keep the
+ *  existing Lark headroom. The legacy limit is measured in UTF-16 code units;
+ *  iterating by code point keeps that limit without slicing an emoji's
+ *  surrogate pair. */
+export function formatSlashGroupName(name, prefix = '') {
+    const prefixed = prefix && !name.startsWith(prefix) ? `${prefix}${name}` : name;
+    if (prefixed.length <= SLASH_GROUP_NAME_MAX_UTF16_LENGTH)
+        return prefixed;
+    let truncated = '';
+    for (const character of prefixed) {
+        if (truncated.length + character.length > SLASH_GROUP_NAME_MAX_UTF16_LENGTH)
+            break;
+        truncated += character;
+    }
+    return `${truncated}…`;
+}
 /**
  * Daemon commands that operate on an ALREADY-EXISTING session and must never
  * pre-create one. `/rename` renames the current session — with no session there
@@ -931,7 +948,11 @@ async function handleConfigCommand(message, rootId, larkAppId, deps) {
         let value;
         switch (spec.kind) {
             case 'stringList': {
-                const arr = parseCustomPassthroughInput(rawValue);
+                // 与 card/config-store 路径（bot-config-store.ts 的 coerce）同口径：优先用
+                // 字段自带的 parseList——canTalkDaemonCommands / startupCommands 的解析规则
+                // 与默认的 parseCustomPassthroughInput 相反或不同，硬编码默认解析器会把
+                // 合法输入静默滤光成"空值"。
+                const arr = (spec.parseList ?? parseCustomPassthroughInput)(rawValue);
                 if (arr.length === 0) {
                     await reply(t('cmd.config.value_required', { field: spec.key }, loc));
                     return;
@@ -1248,16 +1269,17 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
             }
             case '/restart': {
                 if (ds) {
-                    if (ds.worker && !ds.worker.killed) {
-                        ds.worker.send({ type: 'restart' });
-                        const cliName = getCliDisplayName(getBot(ds.larkAppId).config.cliId);
-                        await sessionReply(rootId, t('cmd.restart.in_progress', { cliName }, loc));
-                    }
-                    else {
-                        killWorker(ds);
-                        const cliName = getCliDisplayName(getBot(ds.larkAppId).config.cliId);
-                        await sessionReply(rootId, t('cmd.restart.terminated', { cliName }, loc));
+                    if (ds.adoptedFrom) {
+                        await sessionReply(rootId, t('card.action.adopt_no_restart', undefined, loc));
+                        break;
                     }
+                    const cliName = getCliDisplayName(getBot(ds.larkAppId).config.cliId);
+                    requestSessionRestart(ds, {
+                        source: 'slash',
+                        notify: async (status) => {
+                            await sessionReply(rootId, t(`cmd.restart.${status}`, { cliName }, loc));
+                        },
+                    });
                     logger.info(`[${logTag}] Restart by /restart command`);
                 }
                 else {
@@ -2520,16 +2542,16 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                     rawArgs = rawArgs.replace(roleProfileArg[0], ' ');
                 }
                 const firstLine = rawArgs.split(/\r?\n/).map(s => s.trim()).find(Boolean) ?? '';
-                const MAX_NAME = 50; // Lark group names cap around 60; leave headroom for '…'
-                let groupName;
+                let baseGroupName;
                 if (firstLine) {
-                    groupName = firstLine.length > MAX_NAME ? firstLine.slice(0, MAX_NAME) + '…' : firstLine;
+                    baseGroupName = firstLine;
                 }
                 else {
                     const now = new Date();
                     const ts = `${String(now.getMonth() + 1).padStart(2, '0')}/${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
-                    groupName = t('cmd.group.empty_fallback', { ts }, loc);
+                    baseGroupName = t('cmd.group.empty_fallback', { ts }, loc);
                 }
+                const groupName = formatSlashGroupName(baseGroupName, readGlobalConfig().groupNamePrefix);
                 // Bots to invite: every @-mentioned bot (creator filtered out internally
                 // by the service). Empty mentions → solo group (creator only).
                 const larkAppIdsForGroup = mentionedBotAppIds.length > 0 ? mentionedBotAppIds : [creatorAppId];