botmux 3.16.0 → 3.17.0

package/dist/core/command-handler.js

@@ -63,6 +63,7 @@ import { requestAgentSessionRename } from './session-rename.js';
 import { hasProtectedSessionMutationOwnership } from './session-mutation-guard.js';
 import { withBotTurnMutation } from './bot-turn-mutation-gate.js';
 import { rehomeReplyTargetState } from './reply-target.js';
+import { isSharedAdoptSession } from './shared-adopt.js';
 import { configuredRuntimeDisplayName, sessionConfiguredRuntimeDisplayName, } from './cli-runtime-display.js';
 import { isSessionGroup } from '../services/session-groups-store.js';
 // ─── Exported constants ──────────────────────────────────────────────────────
@@ -1177,8 +1178,9 @@ export async function handleCardCommand(rootId, larkAppId, chatId, senderOpenId,
         }
         ds.streamingCardForced = true;
         const posted = await postFreshStreamingCard(ds, deps.sessionReply);
-        if (!posted)
+        if (!posted) {
             await reply(t('cmd.card.not_ready', undefined, loc));
+        }
         return;
     }
     await reply(t('cmd.card.usage', undefined, loc));
@@ -1273,6 +1275,43 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
         switch (cmd) {
             case '/close': {
                 if (ds) {
+                    // Shared adopts never own the source conversation. Keep /close
+                    // backwards-compatible as the quick "leave this BotMux share" action,
+                    // but never present it as terminating the source App Server / tmux CLI.
+                    if (isSharedAdoptSession(ds)) {
+                        const targetSessionId = ds.session.sessionId;
+                        const detached = await withBotTurnMutation(ds.larkAppId, async () => {
+                            const current = [...activeSessions.values()].find(candidate => candidate.session.sessionId === targetSessionId);
+                            if (!current || !isSharedAdoptSession(current))
+                                return 'missing';
+                            try {
+                                const result = await closeWorkerPoolSession(targetSessionId);
+                                if (!result.ok)
+                                    return 'refused';
+                                return result.outcome === 'closed' ? 'closed' : 'residual';
+                            }
+                            catch {
+                                return 'refused';
+                            }
+                        });
+                        if (detached === 'missing') {
+                            await sessionReply(rootId, t('cmd.no_active_session', undefined, loc));
+                            break;
+                        }
+                        if (detached === 'refused') {
+                            await sessionReply(rootId, t('cmd.detach.failed', undefined, loc));
+                            break;
+                        }
+                        if (detached === 'residual') {
+                            await sessionReply(rootId, t('cmd.detach.residual', undefined, loc));
+                            break;
+                        }
+                        await sessionReply(rootId, t(ds.session.existingAppServerEndpoint
+                            ? 'cmd.detach.existing_app_server_success'
+                            : 'cmd.detach.success', undefined, loc));
+                        logger.info(`[${logTag}] /close treated as shared-adopt disconnect`);
+                        break;
+                    }
                     const targetSessionId = ds.session.sessionId;
                     const closed = await withBotTurnMutation(ds.larkAppId, async () => {
                         // Re-resolve the exact session after all peer admissions drain. A
@@ -1389,36 +1428,56 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
             }
             case '/detach':
             case '/disconnect': {
-                // 文字版的"⏏ 断开"按钮：仅 adopt 会话适用——botmux 只是观察用户原本在
-                // 跑的 CLI，断开只清掉 botmux 这一侧的 worker / polling，绝不结束 CLI
-                // 进程本身。等价于 card-handler 里 `actionType === 'disconnect'` 那段。
+                // 文字版的"⏏ 断开"按钮：共享接入会话适用。
+                //   - tmux adopt：BotMux 停止观察外部终端，不结束原 CLI；
+                //   - existing App Server adopt：BotMux 停止自己的 `codex --remote`
+                //     第二客户端，不结束 Codex App 或开发机上的 App Server。
+                // 两种模式都只移除 BotMux 这一侧，不接管来源会话。
                 if (!ds) {
                     await sessionReply(rootId, t('cmd.no_active_session', undefined, loc));
                     break;
                 }
-                if (!ds.adoptedFrom) {
+                const existingAppServerAdopt = !!ds.session.existingAppServerEndpoint;
+                if (!isSharedAdoptSession(ds)) {
                     await sessionReply(rootId, t('cmd.detach.not_adopted', undefined, loc));
                     break;
                 }
                 const closedSessionId = ds.session.sessionId;
                 const detached = await withBotTurnMutation(ds.larkAppId, async () => {
                     const current = [...activeSessions.values()].find(candidate => candidate.session.sessionId === closedSessionId);
-                    if (!current || !current.adoptedFrom)
-                        return false;
-                    await closeWorkerPoolSession(closedSessionId);
-                    return true;
+                    if (!current || !isSharedAdoptSession(current))
+                        return 'missing';
+                    try {
+                        const result = await closeWorkerPoolSession(closedSessionId);
+                        if (!result.ok)
+                            return 'refused';
+                        return result.outcome === 'closed' ? 'closed' : 'residual';
+                    }
+                    catch {
+                        return 'refused';
+                    }
                 });
-                if (!detached) {
+                if (detached === 'missing') {
                     await sessionReply(rootId, t('cmd.no_active_session', undefined, loc));
                     break;
                 }
-                await sessionReply(rootId, t('cmd.detach.success', undefined, loc));
-                logger.info(`[${logTag}] Detached (adopt) by ${cmd} command`);
+                if (detached === 'refused') {
+                    await sessionReply(rootId, t('cmd.detach.failed', undefined, loc));
+                    break;
+                }
+                if (detached === 'residual') {
+                    await sessionReply(rootId, t('cmd.detach.residual', undefined, loc));
+                    break;
+                }
+                await sessionReply(rootId, t(existingAppServerAdopt
+                    ? 'cmd.detach.existing_app_server_success'
+                    : 'cmd.detach.success', undefined, loc));
+                logger.info(`[${logTag}] Detached ${existingAppServerAdopt ? 'existing App Server' : 'terminal'} adopt by ${cmd} command`);
                 break;
             }
             case '/restart': {
                 if (ds) {
-                    if (ds.adoptedFrom) {
+                    if (isSharedAdoptSession(ds)) {
                         await sessionReply(rootId, t('card.action.adopt_no_restart', undefined, loc));
                         break;
                     }
@@ -2686,6 +2745,10 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                     await sessionReply(rootId, t('cmd.session.transfer_in_progress', undefined, loc));
                     break;
                 }
+                if (ds?.session.existingAppServerEndpoint) {
+                    await sessionReply(rootId, t('cmd.codex_existing_app_server_adopt.already_attached', undefined, loc));
+                    break;
+                }
                 if (ds?.adoptedFrom) {
                     const adopted = ds.adoptedFrom;
                     const cliName = sessionCliDisplayName(ds);
@@ -2695,7 +2758,7 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                     break;
                 }
                 const botCfgForAdopt = ds ? getBot(ds.larkAppId).config : (larkAppId ? getBot(larkAppId).config : undefined);
-                if (botCfgForAdopt?.cliId === 'codex-app') {
+                if (botCfgForAdopt?.cliId === 'codex-app' || botCfgForAdopt?.existingAppServer) {
                     if (!ds) {
                         await sessionReply(rootId, t('cmd.no_active_session', undefined, loc));
                         break;
@@ -3254,7 +3317,7 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                 // pendingRepo too, but only after createGroupWithBots has already
                 // built a new chat. Failing here keeps relay clean and avoids
                 // orphan-chat garbage when the operation can't possibly succeed.
-                if (ds.session.adoptedFrom) {
+                if (isSharedAdoptSession(ds)) {
                     await sessionReply(rootId, t('cmd.relay.adopt_not_relayable', undefined, loc));
                     break;
                 }
@@ -3621,7 +3684,7 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                 }
                 // Front guards (fork needs a clean, real, idle source — same as relay).
                 // These MUST run before creating either a topic root or a new group.
-                if (ds.session.adoptedFrom) {
+                if (isSharedAdoptSession(ds)) {
                     await sessionReply(rootId, t('cmd.fork.adopt_not_forkable', undefined, loc));
                     break;
                 }
@@ -4145,6 +4208,8 @@ async function blockRiffTakeover(ds, sessionReply) {
 export async function startCodexAppThreadSession(thread, ds, deps, larkAppId) {
     const sessionReply = (rid, content, msgType) => deps.sessionReply(rid, content, msgType, larkAppId);
     const loc = localeForBot(ds.larkAppId ?? larkAppId);
+    const botCfg = getBot(ds.larkAppId).config;
+    const existingAppServerEndpoint = botCfg.existingAppServer?.endpoint;
     const title = codexAppThreadTitle(thread);
     if (isSessionTransferring(ds)) {
         await sessionReply(sessionAnchorId(ds), t('cmd.session.transfer_in_progress', undefined, loc));
@@ -4171,8 +4236,25 @@ export async function startCodexAppThreadSession(thread, ds, deps, larkAppId) {
         current.lastScreenStatus = undefined;
         current.session.workingDir = thread.cwd;
         current.session.title = `Codex App: ${title}`;
-        current.session.cliId = 'codex-app';
+        current.session.cliId = existingAppServerEndpoint ? 'codex' : 'codex-app';
         current.session.cliSessionId = thread.threadId;
+        if (existingAppServerEndpoint) {
+            // Do not reuse a possibly frozen runner/wrapper from the temporary
+            // BotMux shell this topic started with. The next fork freezes the current
+            // `cliId: codex` bot configuration and starts ONLY the official remote
+            // TUI. The endpoint itself is copied onto the session so later edits to
+            // bots.json cannot redirect an already-bound conversation.
+            current.session.existingAppServerEndpoint = existingAppServerEndpoint;
+            delete current.session.cliRuntime;
+            delete current.session.cliPathOverride;
+            delete current.session.wrapperCli;
+            delete current.session.model;
+            delete current.session.reasoningEffort;
+            delete current.session.agentFrozen;
+        }
+        else {
+            delete current.session.existingAppServerEndpoint;
+        }
         current.session.adoptedFrom = undefined;
         sessionStore.updateSession(current.session);
         forkWorker(current, '', true);
@@ -4186,7 +4268,9 @@ export async function startCodexAppThreadSession(thread, ds, deps, larkAppId) {
         await sessionReply(switched.anchor, '当前 Codex App 仍有未结算消息，不能切换原生 thread；请等待本轮完成或先关闭会话。');
         return;
     }
-    await sessionReply(switched.anchor, t('cmd.codex_app_adopt.success', { title }, loc));
+    await sessionReply(switched.anchor, t(existingAppServerEndpoint
+        ? 'cmd.codex_existing_app_server_adopt.success'
+        : 'cmd.codex_app_adopt.success', { title }, loc));
 }
 export async function startAdoptSession(target, ds, deps, larkAppId) {
     const sessionReply = (rid, content, msgType) => deps.sessionReply(rid, content, msgType, larkAppId);