botmux 3.5.0 → 3.6.0

package/dist/core/command-handler.js

@@ -2,12 +2,12 @@
  * Command handler — processes /slash commands from users.
  * Extracted from daemon.ts for modularity.
  */
-import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, statSync } from 'node:fs';
 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';
@@ -15,16 +15,15 @@ import { scanMultipleProjects, describeProjectDir } from '../services/project-sc
 import { createRepoWorktree, pushWorktreeBranch } from '../services/git-worktree.js';
 import { worktreeSlugFromContextAI } from '../services/worktree-slug-ai.js';
 import { resolvePairedSpawnBackendType } from './persistent-backend.js';
-import { buildRepoSelectCard, buildAdoptSelectCard, buildCodexAppThreadSelectCard, buildSlashListCard, getCliDisplayName, buildConfigCard, buildLandCard } from '../im/lark/card-builder.js';
-import { computeSandboxDiff } from '../services/sandbox-land.js';
+import { buildRepoSelectCard, buildAdoptSelectCard, buildCodexAppThreadSelectCard, buildSlashListCard, getCliDisplayName, buildConfigCard } from '../im/lark/card-builder.js';
 import { handleDashboardCommand } from './dashboard-command/index.js';
 import { createCliAdapterSync } from '../adapters/cli/registry.js';
-import { deleteMessage, sendMessage, sendUserMessage, replyMessage, listChatBotMembers, resolveUserUnionId, getChatModeStrict, uploadFile, UserTokenMissingError } from '../im/lark/client.js';
+import { deleteMessage, sendMessage, sendUserMessage, replyMessage, listChatBotMembers, resolveUserUnionId, getChatModeStrict, UserTokenMissingError } from '../im/lark/client.js';
 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, 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';
@@ -75,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
@@ -932,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;
@@ -1226,59 +1246,6 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                 await sessionReply(rootId, formatInsightCard(report, loc));
                 break;
             }
-            case '/land': {
-                // 把沙盒会话副本里 agent 的改动落回真实仓库。owner 审阅 diff 卡后点「应用到磁盘」。
-                // agent 在沙盒里无感（以为改的就是真文件），所以只能由 owner 在此手动触发。
-                if (!ds) {
-                    await sessionReply(rootId, t('cmd.no_active_session', undefined, loc));
-                    break;
-                }
-                const sid = ds.session.sessionId;
-                const wd = ds.session.workingDir;
-                if (!wd) {
-                    await sessionReply(rootId, t('cmd.land.no_workingdir', undefined, loc));
-                    break;
-                }
-                const d = computeSandboxDiff(config.session.dataDir, sid, loc);
-                if (!d.ok) {
-                    await sessionReply(rootId, t('cmd.land.cannot', { error: d.error }, loc));
-                    break;
-                }
-                if (d.empty) {
-                    await sessionReply(rootId, t('cmd.land.empty', undefined, loc));
-                    break;
-                }
-                // In-card preview: cap by lines AND chars (Lark card size limit); the FULL
-                // diff goes to an attached .patch file (better for large changesets).
-                const MAX_LINES = 60, MAX_CHARS = 4000;
-                const allLines = d.patch.split('\n');
-                let preview = allLines.slice(0, MAX_LINES).join('\n');
-                let truncated = allLines.length > MAX_LINES;
-                if (preview.length > MAX_CHARS) {
-                    preview = preview.slice(0, MAX_CHARS);
-                    truncated = true;
-                }
-                // Attach the full .patch (git apply-able) — sent as a file message first,
-                // then the review card below it.
-                let patchAttached = false;
-                if (larkAppId) {
-                    try {
-                        const patchName = `botmux-land-${sid.slice(0, 8)}.patch`;
-                        const patchPath = join(config.session.dataDir, 'sandboxes', sid, patchName);
-                        writeFileSync(patchPath, d.patch);
-                        const fileKey = await uploadFile(larkAppId, patchPath);
-                        await sendMessage(larkAppId, ds.session.chatId, JSON.stringify({ file_key: fileKey }), 'file');
-                        patchAttached = true;
-                    }
-                    catch (e) {
-                        logger.warn(`[${logTag}] /land patch attach failed: ${e.message}`);
-                    }
-                }
-                const card = buildLandCard({ sessionId: sid, workingDir: wd, statText: d.statText, files: d.files, insertions: d.insertions, deletions: d.deletions, preview, truncated, patchAttached }, loc);
-                await sessionReply(rootId, card, 'interactive');
-                logger.info(`[${logTag}] /land: ${d.files} files (+${d.insertions}/-${d.deletions}) → card${patchAttached ? ' + .patch' : ''}`);
-                break;
-            }
             case '/detach':
             case '/disconnect': {
                 // 文字版的"⏏ 断开"按钮：仅 adopt 会话适用——botmux 只是观察用户原本在
@@ -1302,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 {
@@ -2574,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];
@@ -3389,6 +3357,18 @@ export async function startAdoptSession(target, ds, deps, larkAppId) {
             return;
         }
     }
+    // Fail-closed at the ENTRY point, BEFORE any target validation or state
+    // mutation: a sandbox-enabled bot can't wrap an already-running CLI
+    // (confinement is spawn-time only). Reject here so `adoptedFrom` is never
+    // persisted and "adopted" is never replied — otherwise the session would
+    // become a worker=null pseudo-adopt whose next message still routes as a
+    // bridge/adopt session. Covers both real host-process adopt entries
+    // (`/adopt <pane>` and the adopt_select card, which both route here). Checks
+    // the live bot flag AND the session's frozen sandbox decision (union).
+    if (adoptSandboxBlocked(getBot(ds.larkAppId ?? larkAppId).config, ds.session)) {
+        await sessionReply(sessionAnchorId(ds), t('cmd.adopt.sandbox_blocked', undefined, loc));
+        return;
+    }
     const valid = zellij
         ? validateZellijAdoptTarget(target.zellijSession, target.zellijPaneId, target.cliPid, target.cliId)
         : validateAdoptTarget(target);