botmux 2.81.0 → 2.82.0

package/dist/worker.js

@@ -39,7 +39,7 @@ import { t, setDefaultLocale } from './i18n/index.js';
 import { TerminalRenderer } from './utils/terminal-renderer.js';
 import { DEFAULT_RENDER_COLS, DEFAULT_RENDER_ROWS, MAX_RENDER_COLS, MAX_RENDER_ROWS, MIN_RENDER_COLS, MIN_RENDER_ROWS, clamp, resolveRenderDimensions, } from './utils/render-dimensions.js';
 import { createCliAdapterSync, locateOnPath } from './adapters/cli/registry.js';
-import { buildWrappedLaunch, parseWrapperCli } from './setup/cli-selection.js';
+import { buildWrappedLaunch, parseWrapperCli, isTtadkWrapper } from './setup/cli-selection.js';
 import { findLaunchedCliPid, scheduleWrapperRealCliPid } from './core/session-discovery.js';
 import { claudeJsonlPathForSession, resolveJsonlFromPid, findOpenClaudeSessionIds, DEFAULT_CLAUDE_DATA_DIR } from './adapters/cli/claude-code.js';
 import { mtrSessionIdForBotmuxSession } from './adapters/cli/mtr.js';
@@ -3685,6 +3685,9 @@ function spawnCli(cfg) {
     // `lastInitConfig.resume` (= true) and baseline an empty store, swallowing
     // the fresh session's first turn.
     lastSpawnEffectiveResume = effectiveResume;
+    // ttadk 网关：模型走 ttadk 自己的 `-m`（启动期注入到 ttadk 前缀，见下方 wrapperCli
+    // 分支），不能再把 cfg.model 透给底层适配器，否则真实 CLI 会再吃一个 --model 重复。
+    const ttadkGateway = isTtadkWrapper(cfg.wrapperCli);
     const args = cliAdapter.buildArgs({
         sessionId: effectiveAdapterSessionId,
         resume: effectiveResume,
@@ -3694,7 +3697,7 @@ function spawnCli(cfg) {
         botName: cfg.botName,
         botOpenId: cfg.botOpenId,
         locale: cfg.locale,
-        model: cfg.model,
+        model: ttadkGateway ? undefined : cfg.model,
         disableCliBypass: cfg.disableCliBypass === true,
     });
     // Extra args from env (CLI_DISABLE_DEFAULT_ARGS is removed — adapters own their defaults)
@@ -3925,11 +3928,21 @@ function spawnCli(cfg) {
             log(`wrapperCli="${cfg.wrapperCli}" ignored: file sandbox enabled and takes precedence (cannot combine launch prefix with bwrap)`);
         }
         else {
-            const launch = buildWrappedLaunch(cfg.wrapperCli, spawnArgs, (b) => locateOnPath(b) ?? b);
+            const launch = buildWrappedLaunch(cfg.wrapperCli, spawnArgs, (b) => locateOnPath(b) ?? b, {
+                ttadkModel: cfg.model,
+            });
             if (launch.bin) {
                 spawnBin = launch.bin;
                 spawnArgs = launch.args;
                 log(`Launch prefix: spawning ${spawnBin} ${spawnArgs.slice(0, 2).join(' ')} … (cliId=${cfg.cliId})`);
+                // ttadk runs its launched agent through a gateway that pops an interactive
+                // model-picker unless `-m <model>` is given. buildWrappedLaunch injects
+                // `-m <bot.model || glm-5.1> --skip-check` into the ttadk prefix above
+                // (CoCo excluded — it takes no -m). The model is sourced from the bot's
+                // `model` config (editable in the dashboard), NOT baked into wrapperCli.
+                if (ttadkGateway) {
+                    log(`ttadk launcher: model=${(cfg.model ?? '').trim() || 'glm-5.1 (default)'} injected as -m, suppressed on underlying ${cfg.cliId}`);
+                }
                 // cjadk runs its launched agent in an INTERACTIVE wrapper by default —
                 // a model/session selector at startup plus terminal quirks that fight
                 // botmux's automated input (the selector eats the first prompt; the