botmux 2.81.0 → 2.82.0

package/dist/core/closed-session-card.d.ts

@@ -0,0 +1,16 @@
+import { type DaemonSession } from './types.js';
+import type { Locale } from '../i18n/index.js';
+/**
+ * Build the same "session closed" card `/close` emits for a session that is
+ * about to be displaced (e.g. a mid-session `/repo` switch reuses the SAME
+ * anchor for a fresh session). Without this trace the old context vanishes —
+ * relay/adopt/resume all hit `anchor_occupied` once the new session holds the
+ * anchor — so the card keeps it visible and carries the terminal
+ * `claude --resume` command as the real recovery path.
+ *
+ * MUST be called BEFORE killWorker/closeSession: it reads the live session's
+ * identity (sessionId, cliSessionId, title, workingDir, anchor) straight off
+ * `ds`. Returns the card JSON; the caller decides how to deliver it.
+ */
+export declare function buildClosedSessionCard(ds: DaemonSession, locale: Locale): string;
+//# sourceMappingURL=closed-session-card.d.ts.map

package/dist/core/closed-session-card.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"closed-session-card.d.ts","sourceRoot":"","sources":["../../src/core/closed-session-card.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAyBhF"}

package/dist/core/closed-session-card.js

@@ -0,0 +1,39 @@
+import { getBot } from '../bot-registry.js';
+import { createCliAdapterSync } from '../adapters/cli/registry.js';
+import { decorateResumeForWrapper } from '../setup/cli-selection.js';
+import { buildSessionClosedCard } from '../im/lark/card-builder.js';
+import { sessionAnchorId } from './types.js';
+/**
+ * Build the same "session closed" card `/close` emits for a session that is
+ * about to be displaced (e.g. a mid-session `/repo` switch reuses the SAME
+ * anchor for a fresh session). Without this trace the old context vanishes —
+ * relay/adopt/resume all hit `anchor_occupied` once the new session holds the
+ * anchor — so the card keeps it visible and carries the terminal
+ * `claude --resume` command as the real recovery path.
+ *
+ * MUST be called BEFORE killWorker/closeSession: it reads the live session's
+ * identity (sessionId, cliSessionId, title, workingDir, anchor) straight off
+ * `ds`. Returns the card JSON; the caller decides how to deliver it.
+ */
+export function buildClosedSessionCard(ds, locale) {
+    const botCfg = getBot(ds.larkAppId).config;
+    const closedSessionId = ds.session.sessionId;
+    const closedCliId = ds.session.cliId ?? botCfg.cliId;
+    const cliResumeCommand = (() => {
+        try {
+            const adapter = createCliAdapterSync(closedCliId, botCfg.cliPathOverride);
+            const raw = adapter.buildResumeCommand?.({
+                sessionId: closedSessionId,
+                cliSessionId: ds.session.cliSessionId,
+            }) ?? null;
+            // ttadk 网关：resume 命令必须带 `-m <model> --skip-check`（模型取 bot.model），
+            // 否则用户复制粘贴这条命令会卡在 ttadk 的交互式选模型菜单（CoCo 不带 -m）。
+            return raw ? decorateResumeForWrapper(raw, botCfg.wrapperCli, { ttadkModel: botCfg.model }) : null;
+        }
+        catch {
+            return null;
+        }
+    })();
+    return buildSessionClosedCard(closedSessionId, sessionAnchorId(ds), ds.session.title, closedCliId, ds.session.workingDir, cliResumeCommand, locale);
+}
+//# sourceMappingURL=closed-session-card.js.map

package/dist/core/closed-session-card.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"closed-session-card.js","sourceRoot":"","sources":["../../src/core/closed-session-card.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAsB,MAAM,YAAY,CAAC;AAGjE;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,sBAAsB,CAAC,EAAiB,EAAE,MAAc;IACtE,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;IAC3C,MAAM,eAAe,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;IAC7C,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IACrD,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE;QAC7B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;YAC1E,MAAM,GAAG,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;gBACvC,SAAS,EAAE,eAAe;gBAC1B,YAAY,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY;aACtC,CAAC,IAAI,IAAI,CAAC;YACX,kEAAkE;YAClE,+CAA+C;YAC/C,OAAO,GAAG,CAAC,CAAC,CAAC,wBAAwB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrG,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;IAC1B,CAAC,CAAC,EAAE,CAAC;IACL,OAAO,sBAAsB,CAC3B,eAAe,EACf,eAAe,CAAC,EAAE,CAAC,EACnB,EAAE,CAAC,OAAO,CAAC,KAAK,EAChB,WAAW,EACX,EAAE,CAAC,OAAO,CAAC,UAAU,EACrB,gBAAgB,EAChB,MAAM,CACP,CAAC;AACJ,CAAC"}

package/dist/core/command-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-handler.d.ts","sourceRoot":"","sources":["../../src/core/command-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-handler.d.ts","sourceRoot":"","sources":["../../src/core/command-handler.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAQxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAoF,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACjJ,OAAO,EAA8D,KAAK,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACtI,OAAO,EAAuB,KAAK,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAsBnG,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAKhD,eAAO,MAAM,eAAe,aAAyR,CAAC;AAEtT;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,aAA2E,CAAC;AAEpH;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,aAO/B,CAAC;AAUH,wBAAgB,wCAAwC,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAYrF;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAe1E;AAID,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAMD,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAAE,GACjB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA0C9C;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKpF;AAED;;;;mCAImC;AACnC,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,sBAAsB,GAAG,IAAI,CAqB1F;AAoED,MAAM,WAAW,kBAAkB;IACjC,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,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1H,cAAc,EAAE,MAAM,MAAM,CAAC;IAC7B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,gCAAgC,EAAE,WAAW,EAAE,CAAC,CAAC;CACnF;AAwaD;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,IAAI,CAAC,CA6Df;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,kBAAkB,EACxB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA+hDf;AAoDD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,qBAAqB,EAC7B,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,kBAAkB,EACxB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,gBAAgB,GAAG,sBAAsB,EACjD,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,kBAAkB,EACxB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA4Cf;AAED;;;wBAGwB;AACxB,wBAAsB,+BAA+B,CACnD,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAC1C,KAAK,SAAK,GACT,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAuB7B;AAED;;kFAEkF;AAClF,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,EACxB,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,kBAAkB,EACxB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAoBf"}

package/dist/core/command-handler.js

@@ -13,7 +13,7 @@ import * as scheduleStore from '../services/schedule-store.js';
 import * as scheduler from './scheduler.js';
 import { scanMultipleProjects, describeProjectDir } from '../services/project-scanner.js';
 import { createRepoWorktree } from '../services/git-worktree.js';
-import { buildRepoSelectCard, buildAdoptSelectCard, buildCodexAppThreadSelectCard, buildSessionClosedCard, buildSlashListCard, getCliDisplayName, buildConfigCard, buildLandCard } from '../im/lark/card-builder.js';
+import { buildRepoSelectCard, buildAdoptSelectCard, buildCodexAppThreadSelectCard, buildSlashListCard, getCliDisplayName, buildConfigCard, buildLandCard } from '../im/lark/card-builder.js';
 import { computeSandboxDiff } from '../services/sandbox-land.js';
 import { createCliAdapterSync } from '../adapters/cli/registry.js';
 import { deleteMessage, sendMessage, sendUserMessage, listChatBotMembers, resolveUserUnionId, getChatModeStrict, uploadFile } from '../im/lark/client.js';
@@ -34,7 +34,8 @@ import { putDocSubscription, removeDocSubscription, listDocSubscriptionsForSessi
 import { bindOncall, unbindOncall, getOncallStatus } from '../services/oncall-store.js';
 import { CONFIG_FIELDS, findConfigField, settableFieldKeys, parseBooleanValue, applyConfigField, setBotAllowedUsers, getConfigSnapshot, getConfigCardData, } from '../services/bot-config-store.js';
 import { resolveCliId, findInvalidAllowedUserEntries } from '../setup/bot-config-editor.js';
-import { decorateResumeForWrapper } from '../setup/cli-selection.js';
+import { buildClosedSessionCard } from './closed-session-card.js';
+import { ttadkConfigModelChoices } from '../setup/cli-selection.js';
 import { publishAttentionPatch, announcePendingRepoSession } from './session-activity.js';
 import { setCardMode } from '../services/card-mode-store.js';
 import { canOperate } from '../im/lark/event-dispatcher.js';
@@ -618,11 +619,17 @@ async function handleConfigCommand(message, rootId, larkAppId, deps) {
     const cardLoc = cardLocaleArg(sub);
     if (!sub || cardLoc) {
         const renderLoc = cardLoc ?? loc;
-        let modelChoices = [];
-        try {
-            modelChoices = createCliAdapterSync(bot.config.cliId, bot.config.cliPathOverride).modelChoices ?? [];
+        // ttadk 网关 bot：模型候选用 ttadk 网关模型（glm-5.1…），不是底层适配器的
+        // opus/gpt-5（那会被 worker 注入成 `ttadk -m opus` 用错模型启动失败）；CoCo 无候选。
+        // 非 ttadk（返回 null）才回落底层适配器自己的 modelChoices。
+        const ttadkChoices = ttadkConfigModelChoices(bot.config.wrapperCli);
+        let modelChoices = ttadkChoices ?? [];
+        if (ttadkChoices === null) {
+            try {
+                modelChoices = createCliAdapterSync(bot.config.cliId, bot.config.cliPathOverride).modelChoices ?? [];
+            }
+            catch { /* 无候选 → 不渲染 model 下拉 */ }
         }
-        catch { /* 无候选 → 不渲染 model 下拉 */ }
         const data = getConfigCardData(larkAppId, modelChoices);
         if (!data) {
             await reply(buildConfigHelp(renderLoc));
@@ -875,29 +882,12 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
         switch (cmd) {
             case '/close': {
                 if (ds) {
-                    const closedSessionId = ds.session.sessionId;
-                    const closedTitle = ds.session.title;
-                    const botCfg = getBot(ds.larkAppId).config;
-                    const closedCliId = ds.session.cliId ?? botCfg.cliId;
-                    const closedAnchor = sessionAnchorId(ds);
-                    const closedWorkingDir = ds.session.workingDir;
-                    const cliResumeCommand = (() => {
-                        try {
-                            const adapter = createCliAdapterSync(closedCliId, botCfg.cliPathOverride);
-                            const raw = adapter.buildResumeCommand?.({
-                                sessionId: closedSessionId,
-                                cliSessionId: ds.session.cliSessionId,
-                            }) ?? null;
-                            return raw ? decorateResumeForWrapper(raw, botCfg.wrapperCli) : null;
-                        }
-                        catch {
-                            return null;
-                        }
-                    })();
+                    // Capture the closed-session card BEFORE killWorker/closeSession —
+                    // it reads the live session's identity off `ds`.
+                    const card = buildClosedSessionCard(ds, loc);
                     killWorker(ds);
-                    sessionStore.closeSession(closedSessionId);
+                    sessionStore.closeSession(ds.session.sessionId);
                     activeSessions.delete(sessionKey(rootId, larkAppId));
-                    const card = buildSessionClosedCard(closedSessionId, closedAnchor, closedTitle, closedCliId, closedWorkingDir, cliResumeCommand, loc);
                     // 「会话已关闭」卡片优先「仅自己可见」：普通群里走 ephemeral 只发给执行
                     // /close 的本人；话题群不支持 ephemeral(18053) 时回退为正常的群内可见回复
                     // ——与流式卡片上「关闭会话」按钮的送达方式保持一致。
@@ -1094,19 +1084,39 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                 // close + recreate the session (mid-session switch). Used by both the
                 // numeric `/repo <N>` form and the `/repo <path|name>` form.
                 const commitRepoSelection = async (selectedPath, displayName, how) => {
-                    ds.workingDir = selectedPath;
-                    ds.session.workingDir = selectedPath;
-                    sessionStore.updateSession(ds.session);
                     if (ds.pendingRepo) {
+                        // First spawn: pin the new cwd onto the CURRENT session, then fork.
+                        ds.workingDir = selectedPath;
+                        ds.session.workingDir = selectedPath;
+                        sessionStore.updateSession(ds.session);
                         await forkPendingCli(t('cmd.repo.selected_in_pending', { name: displayName }, loc));
                     }
                     else {
+                        // Safety net: a mid-session `/repo` switch closes the running
+                        // session and spawns a fresh one on the SAME anchor. Without a
+                        // trace, the old context silently vanishes (relay/adopt/resume all
+                        // hit `anchor_occupied` once the new session holds the anchor).
+                        // So, before displacing it, post the same "session closed" card
+                        // `/close` emits — it keeps the old session visible and carries the
+                        // terminal `claude --resume` command. (Its in-card resume button
+                        // still hits anchor_occupied while the new session occupies this
+                        // anchor — expected; `/close` the new one first, or use the
+                        // command.) Mirrors the `/close` case above.
+                        //
+                        // The new cwd is NOT written onto the old session here — it would
+                        // pollute the displaced session's stored workingDir (and the closed
+                        // card), so `claude --resume` later would reopen the old context in
+                        // the new repo's cwd. The new repo is pinned onto the fresh session
+                        // below instead.
+                        const closedCard = buildClosedSessionCard(ds, loc);
                         killWorker(ds);
                         sessionStore.closeSession(ds.session.sessionId);
+                        await deliverEphemeralOrReply(ds, message.senderId, closedCard, 'interactive', () => sessionReply(rootId, closedCard, 'interactive'));
                         const session = sessionStore.createSession(ds.chatId, rootId, displayName, ds.chatType);
                         ds.session = session;
                         ds.lastUserPrompt = undefined;
                         ds.lastCliInput = undefined;
+                        ds.workingDir = selectedPath;
                         ds.session.workingDir = selectedPath;
                         ds.session.larkAppId = ds.larkAppId;
                         sessionStore.updateSession(ds.session);