botmux 3.4.3 → 3.5.2

package/dist/core/command-handler.js

@@ -2,7 +2,7 @@
  * 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';
@@ -15,21 +15,20 @@ 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 } 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';
 import { repinSessionWorkingDir } from './session-cwd.js';
-import { discoverAdoptableSessions, validateAdoptTarget, adoptTargetKey, adoptTargetLabel } from './session-discovery.js';
+import { discoverAdoptableSessions, excludeOwnedHerdrAdoptTargets, validateAdoptTarget, adoptTargetKey, adoptTargetLabel } from './session-discovery.js';
 import { discoverAdoptableZellijSessions, validateZellijAdoptTarget } from './zellij-adopt-discovery.js';
 import { listCodexAppThreads } from '../services/codex-app-threads.js';
 import { generateAuthUrl, getTokenStatus, resolveUserToken, DOC_COMMENT_OAUTH_SCOPES } from '../utils/user-token.js';
@@ -1226,59 +1225,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 只是观察用户原本在
@@ -2324,14 +2270,20 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                     break;
                 }
                 const botCliId = botCfgForAdopt?.cliId;
-                // Discover BOTH tmux AND zellij sessions, regardless of the bot's own
-                // backend — a normal tmux bot should still be able to adopt a CLI the
-                // user is running inside zellij (and vice-versa). The adopt itself
-                // picks the right observe backend from the chosen target.
-                // discoverAdoptableZellijSessions returns [] when zellij isn't
-                // installed, so this is safe on tmux-only hosts.
+                // Discover every supported backend, but only offer live sessions for
+                // this bot's configured CLI. A Pi bot must not show Codex/TRAE panes:
+                // adopting one would unexpectedly change the agent behind the bot.
+                const ownedHerdrTargets = [...activeSessions.values()].flatMap(active => {
+                    const target = active.session.persistentBackendTarget;
+                    return active.session.status === 'active'
+                        && !active.adoptedFrom
+                        && target?.backendType === 'herdr'
+                        && !!target.agentName
+                        ? [{ sessionName: target.sessionName, agentName: target.agentName }]
+                        : [];
+                });
                 const sessions = [
-                    ...discoverAdoptableSessions(botCliId),
+                    ...excludeOwnedHerdrAdoptTargets(discoverAdoptableSessions(botCliId), ownedHerdrTargets),
                     ...discoverAdoptableZellijSessions(botCliId),
                 ];
                 // Second filter: sessions resumable from disk (paseo-style import).
@@ -3369,6 +3321,32 @@ export async function startAdoptSession(target, ds, deps, larkAppId) {
     const sessionReply = (rid, content, msgType) => deps.sessionReply(rid, content, msgType, larkAppId);
     const loc = localeForBot(ds.larkAppId ?? larkAppId);
     const zellij = isZellijTarget(target);
+    if (!zellij && target.source === 'herdr' && target.herdrSessionName && target.herdrAgentName) {
+        const occupied = [...deps.activeSessions.values()].some(active => {
+            if (active.session.sessionId === ds.session.sessionId || active.session.status !== 'active' || active.adoptedFrom)
+                return false;
+            const owned = active.session.persistentBackendTarget;
+            return owned?.backendType === 'herdr'
+                && owned.sessionName === target.herdrSessionName
+                && owned.agentName === target.herdrAgentName;
+        });
+        if (occupied) {
+            await sessionReply(sessionAnchorId(ds), t('cmd.adopt.target_exited', undefined, loc));
+            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);