botmux 3.16.0 → 3.17.0

package/dist/im/lark/card-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"card-handler.d.ts","sourceRoot":"","sources":["../../../src/im/lark/card-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"card-handler.d.ts","sourceRoot":"","sources":["../../../src/im/lark/card-handler.ts"],"names":[],"mappings":"AAiDA,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAGL,KAAK,wBAAwB,EAC9B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAGL,KAAK,wBAAwB,EAC9B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,mCAAmC,CAAC;AAS3C,OAAO,EAAijB,KAAK,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAS1nB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAsBrE,MAAM,WAAW,eAAe;IAC9B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,yBAAyB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5J,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IACzC,oEAAoE;IACpE,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,iDAAiD;IACjD,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,gDAAgD;IAChD,eAAe,CAAC,EAAE,0BAA0B,CAAC;IAC7C,6CAA6C;IAC7C,kBAAkB,CAAC,EAAE,6BAA6B,CAAC;IACnD,yBAAyB;IACzB,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,yBAAyB;IACzB,kBAAkB,CAAC,EAAE,6BAA6B,CAAC;IACnD;oFACgF;IAChF,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChF,mDAAmD;IACnD,uBAAuB,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACpF,mCAAmC;IACnC,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/D;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB;;kFAE0E;QAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACtC,CAAC;IACF,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,2EAA2E;AAC3E,MAAM,WAAW,oBAAoB;IACnC,gFAAgF;IAChF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;iEAC6D;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;gFACgF;AAChF,MAAM,WAAW,8BAA8B;IAC7C,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1G;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,IAAI,GAAE,8BAAmC,GACxC,OAAO,CAAC,oBAAoB,CAAC,CAuB/B;AAoKD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE;IACH,EAAE,EAAE,aAAa,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACpG,EACD,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAIhB,IAAI,CAAC,EAAE;IACL,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB,GACA,OAAO,CAAC,OAAO,CAAC,CAkZlB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,EAAE,EAAE,aAAa,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;CACtD,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDhB;AAqDD;;;;GAIG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAepF;AAuBD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CA21FpH"}

package/dist/im/lark/card-handler.js

@@ -34,7 +34,7 @@ import { logger } from '../../utils/logger.js';
 import * as sessionStore from '../../services/session-store.js';
 import { loadFrozenCards, saveFrozenCards } from '../../services/frozen-card-store.js';
 import { resumeStartsFresh } from '../../services/resume-fresh-policy.js';
-import { forkWorker, sendWorkerInput, sendWorkerSessionInput, closeSession as closeWorkerPoolSession, teardownAuthoritativePersistentBackingBeforeClose, scheduleCardPatch, parkStreamCard, clearUsageLimitState, cardUsageLimit, writableTerminalLinkFor, workerHasInitialized, sessionSupportsWebTerminal, readableTerminalUrlFor, resolvePrivateCardAudience, deliverWriteLinkCard, deliverEphemeralOrReply, CARD_POSTING_SENTINEL, requestSessionRestart, isSessionTransferring, getDaemonStreamingCardUsageSnapshot, withActiveSessionKeyLock } from '../../core/worker-pool.js';
+import { forkWorker, sendWorkerInput, sendWorkerSessionInput, closeSession as closeWorkerPoolSession, teardownAuthoritativePersistentBackingBeforeClose, scheduleCardPatch, parkStreamCard, clearUsageLimitState, cardUsageLimit, writableTerminalLinkFor, workerHasInitialized, sessionSupportsWebTerminal, readableTerminalUrlFor, resolvePrivateCardAudience, deliverWriteLinkCard, deliverEphemeralOrReply, CARD_POSTING_SENTINEL, requestSessionRestart, isSessionTransferring, getDaemonStreamingCardUsageSnapshot, withActiveSessionKeyLock, buildStreamingCardJson } from '../../core/worker-pool.js';
 import { getSessionWorkingDir, buildNewTopicCliInput, getAvailableBots, persistStreamCardState, resumeSession, rememberLastCliInput, ensureSessionWhiteboard } from '../../core/session-manager.js';
 import { markInitialUserTurnPending } from '../../core/initial-user-turn.js';
 import { publishAttentionPatch, announcePendingRepoSession } from '../../core/session-activity.js';
@@ -53,6 +53,7 @@ import { isLocalCliOpenCapable, isLocalCliOpenConfigured, isLocalCliOpenReady, l
 import { hasProtectedSessionMutationOwnership } from '../../core/session-mutation-guard.js';
 import { persistPendingRepoCardMessageId } from '../../core/pending-repo-journal.js';
 import { runDetachedBotTurnAdmission, withBotTurnMutation } from '../../core/bot-turn-mutation-gate.js';
+import { isSharedAdoptSession } from '../../core/shared-adopt.js';
 /**
  * Resolve the verified `union_id` of the operator who clicked a card button.
  *
@@ -1886,7 +1887,7 @@ export async function handleCardAction(data, deps, larkAppId) {
             }
             const target = resumable.find(r => r.cliSessionId === cliSessionId);
             if (!target) {
-                await pickerReply(t('cmd.adopt.resume_not_found', { id: cliSessionId }, localeForBot(ds.larkAppId)));
+                await pickerReply(t('cmd.adopt.resume_not_found', undefined, localeForBot(ds.larkAppId)));
                 clearAdoptCandidates(rootId);
                 if (cardMessageId && larkAppId)
                     deleteMessage(larkAppId, cardMessageId);
@@ -2113,8 +2114,8 @@ export async function handleCardAction(data, deps, larkAppId) {
             // already omits the restart button when adoptMode=true, but a stale
             // pre-fix card or a malformed action payload could still arrive.
             const locDs = localeForBot(ds.larkAppId);
-            if (ds.adoptedFrom || ds.initConfig?.adoptMode) {
-                logger.warn(`[${tag(ds)}] Rejected restart on adopt session — would kill user's pane`);
+            if (isSharedAdoptSession(ds)) {
+                logger.warn(`[${tag(ds)}] Rejected restart on shared adopt — would replace the source conversation client`);
                 await sessionReply(rootId, t('card.action.adopt_no_restart', undefined, locDs));
                 return;
             }
@@ -2163,6 +2164,43 @@ export async function handleCardAction(data, deps, larkAppId) {
                 // 会话」却静默无反应会让人以为按钮坏了，给一条失败 toast（成功路径不弹，已关卡即反馈）。
                 return { toast: { type: 'warning', content: t('card.action.session_gone', undefined, localeForBot(larkAppId)) } };
             }
+            // Historical cards can still carry the old `close` action. A shared
+            // adopt must never interpret it as permission to terminate the source
+            // conversation; treat it as "disconnect BotMux" just like /close does.
+            if (isSharedAdoptSession(ds)) {
+                const targetSessionId = ds.session.sessionId;
+                const disconnected = 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, { awaitWorkerExit: false });
+                        if (!result.ok)
+                            return 'refused';
+                        return result.outcome === 'closed' ? 'closed' : 'residual';
+                    }
+                    catch {
+                        return 'refused';
+                    }
+                });
+                const locDs = localeForBot(ds.larkAppId);
+                if (disconnected === 'missing') {
+                    return { toast: { type: 'warning', content: t('card.action.session_gone', undefined, localeForBot(larkAppId)) } };
+                }
+                if (disconnected === 'refused') {
+                    await sessionReply(rootId, t('cmd.detach.failed', undefined, locDs));
+                    return;
+                }
+                if (disconnected === 'residual') {
+                    await sessionReply(rootId, t('cmd.detach.residual', undefined, locDs));
+                    return;
+                }
+                await sessionReply(rootId, t(ds.session.existingAppServerEndpoint
+                    ? 'cmd.detach.existing_app_server_success'
+                    : 'cmd.detach.success', undefined, locDs));
+                logger.info(`[${tag(ds)}] Historical close action treated as shared-adopt disconnect`);
+                return;
+            }
             const targetSessionId = ds.session.sessionId;
             const closed = await withBotTurnMutation(ds.larkAppId, async () => {
                 // Card payload roots survive transfers. Re-resolve by immutable session
@@ -2176,9 +2214,22 @@ export async function handleCardAction(data, deps, larkAppId) {
                 // Build the closed card BEFORE closeWorkerPoolSession — it reads the
                 // live session's identity off `current`.
                 const card = buildClosedSessionCard(current, localeForBot(current.larkAppId));
+                // The clicked card IS the live streaming card in the common in-thread
+                // (non-private) case. When so, patch it in place via the callback return
+                // below instead of sending a separate closed card — a stray extra card
+                // (and its now-dead buttons) is what we're avoiding. Only when the
+                // clicked message is that streaming card and we're not in private mode.
+                const patchClickedCardInPlace = !!cardMessageId
+                    && cardMessageId === current.streamCardId
+                    && value?.visibility !== 'private'
+                    && !botCfg.privateCard;
                 let closeResult;
                 try {
-                    closeResult = await closeWorkerPoolSession(targetSessionId);
+                    // Don't await the worker exiting — a busy CLI only dies at the ~7s
+                    // SIGKILL backstop, which blows past Lark's ~3s card-ACK window and
+                    // surfaces the client-side "code: 300000" toast. The logical close is
+                    // synchronous; the worker is killed in the background.
+                    closeResult = await closeWorkerPoolSession(targetSessionId, { awaitWorkerExit: false });
                 }
                 catch (err) {
                     logger.error(`[${tag(current)}] Refused close because backing teardown was not verified: ${err}`);
@@ -2200,7 +2251,7 @@ export async function handleCardAction(data, deps, larkAppId) {
                         residual: closeResult.residual,
                     };
                 }
-                return { status: 'closed', current, botCfg, card };
+                return { status: 'closed', current, botCfg, card, patchClickedCardInPlace };
             });
             if (!closed) {
                 return { toast: { type: 'warning', content: t('card.action.session_gone', undefined, localeForBot(larkAppId)) } };
@@ -2242,7 +2293,7 @@ export async function handleCardAction(data, deps, larkAppId) {
                     },
                 };
             }
-            const { current, botCfg, card } = closed;
+            const { current, botCfg, card, patchClickedCardInPlace } = closed;
             // The closed card carries session title / CLI name / workingDir / resume
             // command. In private-card mode those must not leak to the group — send the
             // closed card ephemeral to the same owner audience instead. No group
@@ -2258,6 +2309,14 @@ export async function handleCardAction(data, deps, larkAppId) {
                 logger.info(`[${tag(current)}] Closed via card button (private close card → ${audience.length} owner(s))`);
             }
             else {
+                if (patchClickedCardInPlace) {
+                    // Return the closed card as the callback response → Lark patches the
+                    // just-clicked streaming card in place (no delete, no separate send,
+                    // no "code: 300000" race). The "等待输入" card becomes the closed card
+                    // with its now-dead buttons removed.
+                    logger.info(`[${tag(current)}] Closed via card button (in-place patch)`);
+                    return JSON.parse(card);
+                }
                 await deliverEphemeralOrReply(current, operatorOpenId, card, 'interactive', () => sessionReply(rootId, card, 'interactive'));
                 logger.info(`[${tag(current)}] Closed via card button`);
             }
@@ -2279,6 +2338,46 @@ export async function handleCardAction(data, deps, larkAppId) {
                     const resumeMsg = resumeStartsFresh(result.ds.session)
                         ? t('card.action.resume_success_fresh', { cliName }, localeForBot(result.ds.larkAppId))
                         : t('card.action.resume_success', { cliName }, localeForBot(result.ds.larkAppId));
+                    // Restore the ORIGINAL live streaming card (🖥️ header + usage line +
+                    // 显示输出/终端/操作链接/关闭会话) as a WITHDRAW-then-REPOST (old closed card
+                    // recalled, fresh card posted at the thread bottom), AND send the
+                    // "✅ 会话已恢复…" text follow-up — both are wanted.
+                    // Ordering is load-bearing for two reasons:
+                    //   1) ACK the callback FIRST (bare `return` → empty ACK), THEN
+                    //      post/delete in the background — deleting the just-clicked card
+                    //      inside the callback response races it and triggers client
+                    //      "code: 300000".
+                    //   2) POST the fresh card BEFORE deleting the old one, so the thread
+                    //      never briefly shows zero cards (same invariant as park→recall).
+                    // Skip in private-card mode (clicked card may be an ephemeral snapshot).
+                    const botCfgResume = getBot(result.ds.larkAppId).config;
+                    if (cardMessageId && value?.visibility !== 'private' && !botCfgResume.privateCard) {
+                        const staleCardId = cardMessageId;
+                        const resumedDs = result.ds;
+                        void (async () => {
+                            try {
+                                const freshCardId = await sessionReply(rootId, buildStreamingCardJson(resumedDs), 'interactive');
+                                resumedDs.streamCardId = freshCardId;
+                                persistStreamCardState(resumedDs);
+                                await deleteMessage(resumedDs.larkAppId, staleCardId).catch(() => { });
+                                // Also send the "✅ 会话已恢复…" text follow-up (the original resume
+                                // behavior). Both are wanted: the live streaming card AND the text
+                                // prompt telling the user to send a message to continue.
+                                await deliverEphemeralOrReply(resumedDs, operatorOpenId, resumeMsg, 'text', () => sessionReply(rootId, resumeMsg));
+                                logger.info(`[${targetSessionId.substring(0, 8)}] Resumed via card button (withdraw + repost streaming card + text)`);
+                            }
+                            catch (err) {
+                                logger.warn(`[${targetSessionId.substring(0, 8)}] resume card repost failed: ${err instanceof Error ? err.message : String(err)}`);
+                            }
+                        })();
+                        // Bare `return` (→ undefined) so the dispatcher's shaper emits a
+                        // genuine empty ACK `{}`. Returning `{}` here would instead be
+                        // truthy and get wrapped as `{card:{type:raw,data:{}}}` — an
+                        // in-place patch with an empty card body (invalid), racing the
+                        // background deleteMessage above. Matches every other empty-ACK in
+                        // this handler.
+                        return; // fast empty ACK; card work happens in background
+                    }
                     await deliverEphemeralOrReply(result.ds, operatorOpenId, resumeMsg, 'text', () => sessionReply(rootId, resumeMsg));
                     logger.info(`[${targetSessionId.substring(0, 8)}] Resumed via card button`);
                 }
@@ -2310,14 +2409,30 @@ export async function handleCardAction(data, deps, larkAppId) {
             const disconnected = await withBotTurnMutation(ds.larkAppId, async () => {
                 const current = [...activeSessions.values()].find(candidate => candidate.session.sessionId === targetSessionId);
                 if (!current)
-                    return undefined;
-                await closeWorkerPoolSession(targetSessionId);
-                return current;
+                    return 'missing';
+                try {
+                    const result = await closeWorkerPoolSession(targetSessionId);
+                    if (!result.ok)
+                        return 'refused';
+                    return result.outcome === 'closed' ? 'closed' : 'residual';
+                }
+                catch {
+                    return 'refused';
+                }
             });
-            if (!disconnected) {
+            const locDs = localeForBot(ds.larkAppId);
+            if (disconnected === 'missing') {
                 return { toast: { type: 'warning', content: t('card.action.session_gone', undefined, localeForBot(larkAppId)) } };
             }
-            await sessionReply(rootId, t('card.action.disconnected', undefined, localeForBot(ds.larkAppId)));
+            if (disconnected === 'refused') {
+                await sessionReply(rootId, t('cmd.detach.failed', undefined, locDs));
+                return;
+            }
+            if (disconnected === 'residual') {
+                await sessionReply(rootId, t('cmd.detach.residual', undefined, locDs));
+                return;
+            }
+            await sessionReply(rootId, t('card.action.disconnected', undefined, locDs));
             logger.info(`[${tag(ds)}] Disconnected (adopt) via card button`);
         }
         if (actionType === 'takeover' && ds && ds.adoptedFrom) {
@@ -2378,7 +2493,7 @@ export async function handleCardAction(data, deps, larkAppId) {
             let cardJson;
             if (ds.streamCardId && ds.streamCardId !== CARD_POSTING_SENTINEL && workerHasInitialized(ds)) {
                 const readUrl = readableTerminalUrlFor(ds);
-                cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, ds.currentTurnTitle, '', 'working', sessionCliId(ds), ds.displayMode ?? 'hidden', ds.streamCardNonce, ds.currentImageKey, !!ds.adoptedFrom, false, locDs, undefined, writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: sessionCliId(ds) }), getDaemonStreamingCardUsageSnapshot(ds, sessionCliId(ds)), sessionRuntimeDisplayName(ds), codexServiceTierBadge(sessionCliId(ds), ds.codexServiceTier));
+                cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, ds.currentTurnTitle, '', 'working', sessionCliId(ds), ds.displayMode ?? 'hidden', ds.streamCardNonce, ds.currentImageKey, isSharedAdoptSession(ds), false, locDs, undefined, writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: sessionCliId(ds) }), getDaemonStreamingCardUsageSnapshot(ds, sessionCliId(ds)), sessionRuntimeDisplayName(ds), codexServiceTierBadge(sessionCliId(ds), ds.codexServiceTier));
                 scheduleCardPatch(ds, cardJson);
             }
             logger.info(`[${tag(ds)}] Retrying last task after usage limit`);
@@ -2702,7 +2817,7 @@ export async function handleCardAction(data, deps, larkAppId) {
             if (sessionSupportsWebTerminal(ds) && (ds.riffAccessUrl || (ds.workerPort && ds.workerToken))) {
                 const writeUrl = buildTerminalUrl(ds, { write: true });
                 const cardJson = buildSessionCard(ds.session.sessionId, sessionAnchorId(ds), writeUrl, ds.session.title || getCliDisplayName(effectiveCliId), effectiveCliId, true, // showManageButtons — write-link card includes restart & close
-                !!ds.adoptedFrom, // adoptMode — disconnect, never close-the-CLI
+                isSharedAdoptSession(ds), // shared adopt — disconnect, never close the source conversation
                 locDs, isLocalCliOpenReady(ds, { cliId: effectiveCliId }), sessionRuntimeDisplayName(ds));
                 // 普通群发「仅自己可见」私密卡，话题群 / 单聊自动回退私聊 DM（两条通道都私密，
                 // 不泄露写入 token）。fire-and-forget，保持卡片回调快速返回。
@@ -2752,7 +2867,7 @@ export async function handleCardAction(data, deps, larkAppId) {
                     if (cardMessageId && workerHasInitialized(ds)) {
                         const readUrl = readableTerminalUrlFor(ds);
                         const turnTitle = ds.currentTurnTitle || ds.session.title || getCliDisplayName(effectiveCliId);
-                        const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, next, ds.streamCardNonce, ds.currentImageKey, !!ds.adoptedFrom, false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), codexServiceTierBadge(effectiveCliId, ds.codexServiceTier));
+                        const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, next, ds.streamCardNonce, ds.currentImageKey, isSharedAdoptSession(ds), false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), codexServiceTierBadge(effectiveCliId, ds.codexServiceTier));
                         updateMessage(ds.larkAppId, cardMessageId, cardJson).catch(err => logger.debug(`[${tag(ds)}] Failed to migrate unknown frozen card: ${err}`));
                         logger.info(`[${tag(ds)}] Migrated unknown frozen card to ${next} (legacy nonce=${clickedNonce})`);
                         try {
@@ -2779,7 +2894,7 @@ export async function handleCardAction(data, deps, larkAppId) {
                 const effectiveCliId = sessionCliId(ds);
                 const readUrl = readableTerminalUrlFor(ds);
                 const turnTitle = ds.currentTurnTitle || ds.session.title || getCliDisplayName(effectiveCliId);
-                const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, next, ds.streamCardNonce, ds.currentImageKey, !!ds.adoptedFrom, false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), effectiveCliId === 'codex' ? frozen.codexServiceTierBadge : undefined);
+                const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, next, ds.streamCardNonce, ds.currentImageKey, isSharedAdoptSession(ds), false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), effectiveCliId === 'codex' ? frozen.codexServiceTierBadge : undefined);
                 updateMessage(ds.larkAppId, frozen.messageId, cardJson).catch(err => logger.debug(`[${tag(ds)}] Failed to migrate frozen card: ${err}`));
                 ds.frozenCards.delete(clickedNonce);
                 saveFrozenCards(ds.session.sessionId, ds.frozenCards);
@@ -2803,7 +2918,7 @@ export async function handleCardAction(data, deps, larkAppId) {
             if (ds.streamCardId && workerHasInitialized(ds)) {
                 const readUrl = readableTerminalUrlFor(ds);
                 const turnTitle = ds.currentTurnTitle || ds.session.title || getCliDisplayName(effectiveCliId);
-                const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, next, ds.streamCardNonce, ds.currentImageKey, !!ds.adoptedFrom, false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), codexServiceTierBadge(effectiveCliId, ds.codexServiceTier));
+                const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, next, ds.streamCardNonce, ds.currentImageKey, isSharedAdoptSession(ds), false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), codexServiceTierBadge(effectiveCliId, ds.codexServiceTier));
                 if (cardMessageId && cardMessageId !== ds.streamCardId) {
                     updateMessage(ds.larkAppId, cardMessageId, cardJson).catch(err => logger.debug(`[${tag(ds)}] Failed to migrate clicked legacy card: ${err}`));
                 }
@@ -2854,7 +2969,7 @@ export async function handleCardAction(data, deps, larkAppId) {
                 const effectiveCliId = sessionCliId(ds);
                 const readUrl = readableTerminalUrlFor(ds);
                 const turnTitle = ds.currentTurnTitle || ds.session.title || getCliDisplayName(effectiveCliId);
-                const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, ds.displayMode ?? 'screenshot', ds.streamCardNonce, ds.currentImageKey, !!ds.adoptedFrom, false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), codexServiceTierBadge(effectiveCliId, ds.codexServiceTier));
+                const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, ds.displayMode ?? 'screenshot', ds.streamCardNonce, ds.currentImageKey, isSharedAdoptSession(ds), false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), codexServiceTierBadge(effectiveCliId, ds.codexServiceTier));
                 if (cardMessageId && cardMessageId !== ds.streamCardId) {
                     updateMessage(ds.larkAppId, cardMessageId, cardJson).catch(err => logger.debug(`[${tag(ds)}] Failed to migrate clicked legacy card: ${err}`));
                 }
@@ -2887,7 +3002,7 @@ export async function handleCardAction(data, deps, larkAppId) {
                 const effectiveCliId = sessionCliId(ds);
                 const readUrl = readableTerminalUrlFor(ds);
                 const turnTitle = ds.currentTurnTitle || ds.session.title || getCliDisplayName(effectiveCliId);
-                const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, ds.displayMode ?? 'screenshot', ds.streamCardNonce, ds.currentImageKey, !!ds.adoptedFrom, false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), codexServiceTierBadge(effectiveCliId, ds.codexServiceTier));
+                const cardJson = buildStreamingCard(ds.session.sessionId, sessionAnchorId(ds), readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', effectiveCliId, ds.displayMode ?? 'screenshot', ds.streamCardNonce, ds.currentImageKey, isSharedAdoptSession(ds), false, localeForBot(ds.larkAppId), cardUsageLimit(ds), writableTerminalLinkFor(ds), isLocalCliOpenReady(ds, { cliId: effectiveCliId }), getDaemonStreamingCardUsageSnapshot(ds, effectiveCliId), sessionRuntimeDisplayName(ds), codexServiceTierBadge(effectiveCliId, ds.codexServiceTier));
                 try {
                     return JSON.parse(cardJson);
                 }
@@ -3085,7 +3200,7 @@ export async function handleCardAction(data, deps, larkAppId) {
         if (!selected.threadId)
             return;
         const botCfg = getBot(ds.larkAppId).config;
-        if (botCfg.cliId !== 'codex-app')
+        if (botCfg.cliId !== 'codex-app' && !botCfg.existingAppServer)
             return;
         const { listCodexAppThreads } = await import('../../services/codex-app-threads.js');
         let threads;