botmux 3.14.0 → 3.16.0

package/dist/adapters/cli/cursor.js

@@ -16,11 +16,23 @@ export function createCursorAdapter(pathOverride) {
         id: 'cursor',
         get resolvedBin() { return (cachedBin ??= resolveCommand(rawBin)); },
         buildArgs({ resume, resumeSessionId, model, disableCliBypass }) {
+            // --trust pre-answers the "Workspace Trust Required" startup dialog.
+            // Without it, the first spawn in a never-trusted directory (= every
+            // fresh-worktree topic) blocks on that dialog; the dialog sits silent,
+            // so quiescence-based idle fires and the worker types the first prompt
+            // INTO it — the first literal `a` in the text answers [a] Trust (a `q`
+            // would quit the CLI outright) and everything typed before the composer
+            // renders scatters into scrollback, truncating the prompt head.
+            // Deliberately NOT gated by disableCliBypass: this is a startup gate no
+            // headless spawn can answer, orthogonal to --force's approval bypass
+            // (--force alone does not suppress the dialog — verified empirically).
+            const base = ['--trust'];
             // --force skips approvals so the model can act inside the topic without
             // every shell/edit bouncing back to Lark for confirmation — same posture
             // as codex's --dangerously-bypass-approvals-and-sandbox and claude-code's
             // --dangerously-skip-permissions.
-            const base = disableCliBypass ? [] : ['--force'];
+            if (!disableCliBypass)
+                base.push('--force');
             if (model && model.trim()) {
                 base.push('--model', model.trim());
             }
@@ -28,9 +40,15 @@ export function createCursorAdapter(pathOverride) {
                 return base;
             if (resumeSessionId)
                 return [...base, '--resume', resumeSessionId];
-            // No id on hand — fall back to "last chat" so we at least don't drop
-            // the user's context. --continue is cursor's shorthand for --resume=-1.
-            return [...base, '--continue'];
+            // No persisted chat id: start FRESH, never `--continue`. Cursor's
+            // `--continue` (= `--resume=-1`) resumes the globally most recent chat,
+            // which is shared across every botmux session of this bot (same Cursor
+            // config home). A worker restart whose cliSessionId was never captured
+            // would then silently load a SIBLING session's conversation — e.g. a
+            // topic group's context leaking into a private chat. Losing this
+            // session's context is the lesser evil; matches reasonix/antigravity,
+            // which reject `--continue` for the same "most recent is racy" reason.
+            return base;
         },
         buildResumeCommand({ cliSessionId }) {
             // Cursor's chat id is opaque and not derivable from botmux's sessionId;
@@ -40,6 +58,10 @@ export function createCursorAdapter(pathOverride) {
                 return null;
             return `cursor-agent --resume ${cliSessionId}`;
         },
+        // buildArgs can only resume a precise id (no --continue fallback — it
+        // would resume the globally most recent chat, a sibling-context leak).
+        // Tells the worker to demote resume-without-id to a fresh launch + notify.
+        resumeRequiresCliSessionId: true,
         async writeInput(pty, content) {
             // Emit line-by-line instead of writing the whole message at once.
             // cursor-agent's paste detector folds a multi-line chunk that arrives in

package/dist/adapters/cli/cursor.js.map

@@ -1 +1 @@
-{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../src/adapters/cli/cursor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../src/adapters/cli/cursor.ts"],"names":[],"mappings":"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"}

package/dist/adapters/cli/dsh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dsh.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/dsh.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAyBxD,wBAAgB,gBAAgB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAoElE;AAED,eAAO,MAAM,MAAM,yBAAmB,CAAC"}
+{"version":3,"file":"dsh.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/dsh.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAyBxD,wBAAgB,gBAAgB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAwElE;AAED,eAAO,MAAM,MAAM,yBAAmB,CAAC"}

package/dist/adapters/cli/dsh.js

@@ -51,7 +51,7 @@ export function createDshAdapter(pathOverride) {
         sandboxExtraExecPaths() {
             return [(cachedDshBin ??= resolveCommand(rawDshBin))];
         },
-        buildArgs({ sessionId, workingDir, botName, botOpenId, locale, model }) {
+        buildArgs({ sessionId, workingDir, botName, botOpenId, locale, model, turnTimeoutMs }) {
             // Pre-create the persistent dsh dir in the real HOME before the worker
             // enters the sandbox: the sandbox's keepExisting filter drops authPaths
             // that don't exist yet, and the runner can't create them from inside.
@@ -66,6 +66,10 @@ export function createDshAdapter(pathOverride) {
             pushOpt(args, '--bot-open-id', botOpenId);
             pushOpt(args, '--locale', locale);
             pushOpt(args, '--model', model && model.trim() ? model.trim() : undefined);
+            // Per-bot turn timeout override; undefined → runner default (10 min).
+            pushOpt(args, '--turn-timeout-ms', typeof turnTimeoutMs === 'number' && turnTimeoutMs > 0
+                ? String(turnTimeoutMs)
+                : undefined);
             return args;
         },
         buildResumeCommand() {

package/dist/adapters/cli/dsh.js.map

@@ -1 +1 @@
-{"version":3,"file":"dsh.js","sourceRoot":"","sources":["../../../src/adapters/cli/dsh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dsh.js","sourceRoot":"","sources":["../../../src/adapters/cli/dsh.ts"],"names":[],"mappings":"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"}

package/dist/adapters/cli/grok.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grok.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/grok.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAoBxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuEG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAiPnE;AAED,eAAO,MAAM,MAAM,0BAAoB,CAAC"}
+{"version":3,"file":"grok.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/grok.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAoBxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuEG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAuQnE;AAED,eAAO,MAAM,MAAM,0BAAoB,CAAC"}

package/dist/adapters/cli/grok.js

@@ -106,7 +106,7 @@ export function createGrokAdapter(pathOverride) {
         // composer's readyPattern — cold-start TUI can accept (and drop) stdin
         // before the real composer exists.
         deferFirstPromptTimeoutUntilReady: true,
-        buildArgs({ sessionId, resume, resumeSessionId, workingDir, model, initialPrompt, disableCliBypass, botName, botOpenId, locale, larkAppId, }) {
+        buildArgs({ sessionId, resume, resumeSessionId, forkSession, workingDir, model, reasoningEffort, initialPrompt, disableCliBypass, botName, botOpenId, locale, larkAppId, }) {
             const args = [];
             if (!disableCliBypass) {
                 // Claude: --dangerously-skip-permissions. Grok: --always-approve (YOLO).
@@ -118,12 +118,30 @@ export function createGrokAdapter(pathOverride) {
             if (model && model.trim()) {
                 args.push('--model', model.trim());
             }
+            if (reasoningEffort && reasoningEffort.trim()) {
+                args.push('--reasoning-effort', reasoningEffort.trim());
+            }
             if (resume) {
                 const sid = resumeSessionId || sessionId;
-                if (sid)
+                if (sid) {
+                    // `--resume <botmux-sessionId>` is precise: grok's fresh spawn pins
+                    // `--session-id <botmux-uuid>` (below), so the botmux id IS the
+                    // grok session id.
                     args.push('--resume', sid);
-                else
-                    args.push('--continue');
+                }
+                // No --continue fallback (#927): it would resume the globally most
+                // recent grok session, which is shared across every botmux session of
+                // this bot (same GROK_HOME) — a worker restart with no id would then
+                // load a SIBLING session's conversation (topic-group context leaking
+                // into a private chat). Start fresh instead, matching
+                // reasonix/antigravity.
+                // Branch the source transcript into the child's Botmux UUID (#931).
+                // The explicit child id preserves exact ownership on restart.
+                if (forkSession) {
+                    args.push('--fork-session');
+                    if (sessionId)
+                        args.push('--session-id', sessionId);
+                }
             }
             else if (sessionId && !grokSessionDirExists(sessionId, workingDir)) {
                 // Pin grok's id to the botmux UUID so resume can reuse it. Skipped
@@ -158,6 +176,7 @@ export function createGrokAdapter(pathOverride) {
                 return null;
             return `grok --resume ${sid}`;
         },
+        buildSessionRenameCommand: (title) => `/rename ${title}`,
         checkResumeTargetExists({ sessionId, cliSessionId, workingDir }) {
             const sid = cliSessionId || sessionId;
             if (!sid)
@@ -301,8 +320,8 @@ export function createGrokAdapter(pathOverride) {
             sessionStartCommand: sessionReadyHookCommand(),
         },
         modelChoices: [
+            'grok-4.6',
             'grok-4.5',
-            'grok-composer-2.5-fast',
         ],
     };
 }

package/dist/adapters/cli/grok.js.map

@@ -1 +1 @@
-{"version":3,"file":"grok.js","sourceRoot":"","sources":["../../../src/adapters/cli/grok.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grok.js","sourceRoot":"","sources":["../../../src/adapters/cli/grok.ts"],"names":[],"mappings":"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"}

package/dist/adapters/cli/kimi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kimi.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/kimi.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AASxD,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAyDnE;AAED,eAAO,MAAM,MAAM,0BAAoB,CAAC"}
+{"version":3,"file":"kimi.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/kimi.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AASxD,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CA4EnE;AAED,eAAO,MAAM,MAAM,0BAAoB,CAAC"}

package/dist/adapters/cli/kimi.js

@@ -24,13 +24,31 @@ export function createKimiAdapter(pathOverride) {
                 return args;
             if (resumeSessionId)
                 return [...args, '--resume', resumeSessionId];
-            return [...args, '--continue'];
+            // No persisted session id: start FRESH, never `--continue`. Kimi's
+            // `--continue` resumes the most recent session, which is shared across
+            // every botmux session of this bot (same Kimi config home). A worker
+            // restart whose cliSessionId was never captured would then silently load
+            // a SIBLING session's conversation — e.g. a topic group's context
+            // leaking into a private chat. Losing this session's context is the
+            // lesser evil; matches reasonix/antigravity, which reject `--continue`
+            // for the same "most recent is racy" reason.
+            //
+            // 已知回退：Kimi 适配器目前没有任何 cliSessionId 捕获机制（无 bridge、
+            // 无 observation、无 output capture），「缺 id」是常态而非边角。移除
+            // `--continue` 后，Kimi 会话在每次 worker 重启（崩溃 / idle 回收 /
+            // 部署）后都新起干净会话，丧失跨重启恢复能力——`--continue` 曾是唯一的
+            // 跨重启恢复路径。后续需补 session id 捕获才能恢复精确 resume。
+            return args;
         },
         buildResumeCommand({ cliSessionId }) {
             if (!cliSessionId)
                 return null;
             return `kimi --resume ${cliSessionId}`;
         },
+        // buildArgs can only resume a precise id (no --continue fallback — it
+        // would resume the globally most recent session, a sibling-context leak).
+        // Tells the worker to demote resume-without-id to a fresh launch + notify.
+        resumeRequiresCliSessionId: true,
         async writeInput(pty, content) {
             try {
                 if (!kimiFirstWriteSeen.has(pty)) {

package/dist/adapters/cli/kimi.js.map

@@ -1 +1 @@
-{"version":3,"file":"kimi.js","sourceRoot":"","sources":["../../../src/adapters/cli/kimi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,MAAM,qBAAqB,GAAG,WAAW,CAAC;AAC1C,MAAM,mBAAmB,GAAG,WAAW,CAAC;AACxC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AACvC,MAAM,kBAAkB,GAAG,IAAI,OAAO,EAAa,CAAC;AAEpD,MAAM,UAAU,iBAAiB,CAAC,YAAqB;IACrD,MAAM,MAAM,GAAG,YAAY,IAAI,MAAM,CAAC;IACtC,IAAI,SAA6B,CAAC;IAClC,OAAO;QACL,EAAE,EAAE,MAAM;QACV,SAAS,EAAE,CAAC,0BAA0B,EAAE,oBAAoB,CAAC;QAC7D,IAAI,WAAW,KAAa,OAAO,CAAC,SAAS,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5E,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,gBAAgB,EAAE;YAC5D,MAAM,IAAI,GAAa,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtB,CAAC;YACD,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;YACD,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACzB,IAAI,eAAe;gBAAE,OAAO,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;YACnE,OAAO,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC;QACjC,CAAC;QAED,kBAAkB,CAAC,EAAE,YAAY,EAAE;YACjC,IAAI,CAAC,YAAY;gBAAE,OAAO,IAAI,CAAC;YAC/B,OAAO,iBAAiB,YAAY,EAAE,CAAC;QACzC,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,GAAc,EAAE,OAAe;YAC9C,IAAI,CAAC;gBACH,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC5B,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAC1C,CAAC;gBACD,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;oBACzC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;oBACvB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;oBACjB,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,MAAM,MAAM,GAAG,GAAG,qBAAqB,GAAG,OAAO,GAAG,mBAAmB,EAAE,CAAC;oBAC1E,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAClB,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;oBAClB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO;YACT,CAAC;QACH,CAAC;QAED,iBAAiB,EAAE,SAAS;QAC5B,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,kBAAkB;QAC/B,SAAS,EAAE,IAAI;QACf,YAAY,EAAE;YACZ,WAAW;YACX,gBAAgB;YAChB,gBAAgB;SACjB;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,iBAAiB,CAAC"}
+{"version":3,"file":"kimi.js","sourceRoot":"","sources":["../../../src/adapters/cli/kimi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,MAAM,qBAAqB,GAAG,WAAW,CAAC;AAC1C,MAAM,mBAAmB,GAAG,WAAW,CAAC;AACxC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AACvC,MAAM,kBAAkB,GAAG,IAAI,OAAO,EAAa,CAAC;AAEpD,MAAM,UAAU,iBAAiB,CAAC,YAAqB;IACrD,MAAM,MAAM,GAAG,YAAY,IAAI,MAAM,CAAC;IACtC,IAAI,SAA6B,CAAC;IAClC,OAAO;QACL,EAAE,EAAE,MAAM;QACV,SAAS,EAAE,CAAC,0BAA0B,EAAE,oBAAoB,CAAC;QAC7D,IAAI,WAAW,KAAa,OAAO,CAAC,SAAS,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5E,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,gBAAgB,EAAE;YAC5D,MAAM,IAAI,GAAa,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtB,CAAC;YACD,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;YACD,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACzB,IAAI,eAAe;gBAAE,OAAO,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;YACnE,mEAAmE;YACnE,uEAAuE;YACvE,qEAAqE;YACrE,yEAAyE;YACzE,kEAAkE;YAClE,oEAAoE;YACpE,uEAAuE;YACvE,6CAA6C;YAC7C,EAAE;YACF,kDAAkD;YAClD,mDAAmD;YACnD,qDAAqD;YACrD,4CAA4C;YAC5C,2CAA2C;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,kBAAkB,CAAC,EAAE,YAAY,EAAE;YACjC,IAAI,CAAC,YAAY;gBAAE,OAAO,IAAI,CAAC;YAC/B,OAAO,iBAAiB,YAAY,EAAE,CAAC;QACzC,CAAC;QAED,sEAAsE;QACtE,0EAA0E;QAC1E,2EAA2E;QAC3E,0BAA0B,EAAE,IAAI;QAEhC,KAAK,CAAC,UAAU,CAAC,GAAc,EAAE,OAAe;YAC9C,IAAI,CAAC;gBACH,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC5B,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAC1C,CAAC;gBACD,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;oBACzC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;oBACvB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;oBACjB,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,MAAM,MAAM,GAAG,GAAG,qBAAqB,GAAG,OAAO,GAAG,mBAAmB,EAAE,CAAC;oBAC1E,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAClB,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;oBAClB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO;YACT,CAAC;QACH,CAAC;QAED,iBAAiB,EAAE,SAAS;QAC5B,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,kBAAkB;QAC/B,SAAS,EAAE,IAAI;QACf,YAAY,EAAE;YACZ,WAAW;YACX,gBAAgB;YAChB,gBAAgB;SACjB;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,iBAAiB,CAAC"}

package/dist/adapters/cli/mojo.d.ts

@@ -0,0 +1,28 @@
+/**
+ * MojoCliAdapter — minimal pass-through adapter for mojo-backed sessions.
+ *
+ * mojo (@byted/mojo) is NOT driven as an interactive TUI here, and that is a
+ * deliberate, empirically forced choice:
+ *
+ *   1. `--yolo` / `-r` / `-c` / `--output-format` / `--timeout` / `--idle-timeout`
+ *      are all documented AND observed as "仅 -p" (print/headless mode only).
+ *      Passing them without `-p` does not start a TUI — the process just waits
+ *      on stdin until EOF. So there is no way to inject them into a long-lived
+ *      interactive process the way the kimi/grok adapters do.
+ *   2. mojo keeps NO local per-session transcript. `~/.mojo` holds only
+ *      credentials/ memory/ skills/ — session state lives server-side. So the
+ *      grok-style "tail updates.jsonl to detect turn end" bridge is impossible,
+ *      leaving only screen-scraping, which is unreliable under long output.
+ *
+ * Instead mojo exposes a clean headless control plane
+ * (`-p --background` + `mojo session get|respond|confirm|cancel`, all emitting
+ * one uniform single-line JSON envelope), which maps almost 1:1 onto the
+ * riff-style API-backed backend. All real work therefore happens in
+ * MojoBackend, which translates write() into mojo CLI invocations.
+ *
+ * Empirically verified against @byted/mojo 1.0.10 (linux-x64).
+ */
+import type { CliAdapter } from './types.js';
+export declare function createMojoAdapter(_pathOverride?: string): CliAdapter;
+export declare const create: typeof createMojoAdapter;
+//# sourceMappingURL=mojo.d.ts.map

package/dist/adapters/cli/mojo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mojo.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/mojo.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAExD,wBAAgB,iBAAiB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,UAAU,CAuDpE;AAED,eAAO,MAAM,MAAM,0BAAoB,CAAC"}

package/dist/adapters/cli/mojo.js

@@ -0,0 +1,58 @@
+export function createMojoAdapter(_pathOverride) {
+    return {
+        id: 'mojo',
+        // DIRECTORY-level on purpose (see src/adapters/cli/CLAUDE.md §文件沙盒 item 3):
+        // a single-file carve-out is skipped entirely while the file does not yet
+        // exist, and would miss sibling state anyway. `~/.mojo` holds credentials/
+        // (login), memory/ and skills/ — all of which must survive sandbox teardown.
+        // When the bot injects X_JWT_TOKEN instead, `mojo auth status --json`
+        // reports mode=jwt/source=env and credentials/ may be absent.
+        authPaths: ['~/.mojo'],
+        // Where mojo keeps its skill packages. Empirically confirmed on a live
+        // mojo host: the agent's own skill watcher resolves to this exact path
+        // (MERLIN_SKILL_WATCH_ROOT=~/.mojo/skills, 53 packages present).
+        // Without this the dashboard's native-skill scan silently yields nothing
+        // for mojo: discoverNativeCliSkillGroups only consults
+        // claudeDataDir/skillsDir, and authPaths is NOT a skills source.
+        skillsDir: '~/.mojo/skills',
+        // No binary is spawned by the worker — MojoBackend shells out per turn.
+        resolvedBin: '',
+        buildArgs() {
+            return [];
+        },
+        async writeInput(pty, content) {
+            // Direct passthrough — no PTY paste-burst detection or bracketed paste.
+            // MojoBackend.write() performs the actual CLI call.
+            pty.write(content);
+        },
+        // No <botmux_routing> is emitted for mojo, by omission rather than design:
+        // the shared block recommends --mention-back, which is wrong for a
+        // sandboxed remote session whose sender is frozen at creation. Unlike riff
+        // (DEFAULT_RIFF_SYSTEM_PROMPT) mojo has no replacement yet, so
+        // MojoBackend.decorate() prepends only the operator systemPrompt and the
+        // built-in skill block.
+        //
+        // Consequence for skill delivery: the worker passes hasRoutingBlock:false
+        // so the catalog keeps send/history/quoted/bots instead of assuming a
+        // routing block teaches them. Designing mojo's own routing/identity block
+        // is tracked separately — it cannot copy the local-CLI wording verbatim.
+        injectsSessionContext: true,
+        systemHints: [],
+        altScreen: false,
+        // mojo serializes turns server-side per session; botmux's input gate
+        // additionally serializes writes.
+        supportsTypeAhead: false,
+        // Verified via `mojo -p --model <bad>` → exit code 2, with the full list
+        // printed to stderr. Kept static here for synchronous UI enumeration;
+        // MojoBackend.probeModels() can refresh it from that stderr at runtime.
+        modelChoices: [
+            'doubao-seed-2.0-dogfooding',
+            'glm-5-turbo',
+            'gpt-5.4-2026-03-05',
+            'gpt-5.5-2026-04-24',
+            'gpt-5.5-ptu',
+        ],
+    };
+}
+export const create = createMojoAdapter;
+//# sourceMappingURL=mojo.js.map

package/dist/adapters/cli/mojo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mojo.js","sourceRoot":"","sources":["../../../src/adapters/cli/mojo.ts"],"names":[],"mappings":"AA0BA,MAAM,UAAU,iBAAiB,CAAC,aAAsB;IACpD,OAAO;QACH,EAAE,EAAE,MAAM;QACV,4EAA4E;QAC5E,0EAA0E;QAC1E,2EAA2E;QAC3E,6EAA6E;QAC7E,sEAAsE;QACtE,8DAA8D;QAC9D,SAAS,EAAE,CAAC,SAAS,CAAC;QACtB,uEAAuE;QACvE,uEAAuE;QACvE,iEAAiE;QACjE,yEAAyE;QACzE,uDAAuD;QACvD,iEAAiE;QACjE,SAAS,EAAE,gBAAgB;QAC3B,wEAAwE;QACxE,WAAW,EAAE,EAAE;QACf,SAAS;YACL,OAAO,EAAE,CAAC;QACd,CAAC;QACD,KAAK,CAAC,UAAU,CAAC,GAAc,EAAE,OAAe;YAC5C,wEAAwE;YACxE,oDAAoD;YACpD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC;QACD,2EAA2E;QAC3E,mEAAmE;QACnE,2EAA2E;QAC3E,+DAA+D;QAC/D,yEAAyE;QACzE,wBAAwB;QACxB,EAAE;QACF,0EAA0E;QAC1E,sEAAsE;QACtE,0EAA0E;QAC1E,yEAAyE;QACzE,qBAAqB,EAAE,IAAI;QAC3B,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,KAAK;QAChB,qEAAqE;QACrE,kCAAkC;QAClC,iBAAiB,EAAE,KAAK;QACxB,yEAAyE;QACzE,sEAAsE;QACtE,wEAAwE;QACxE,YAAY,EAAE;YACV,4BAA4B;YAC5B,aAAa;YACb,oBAAoB;YACpB,oBAAoB;YACpB,aAAa;SAChB;KACJ,CAAC;AACN,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,iBAAiB,CAAC"}

package/dist/adapters/cli/pi.d.ts

@@ -41,10 +41,12 @@ import type { CliAdapter } from './types.js';
  *       terminal stopReason), and `terminate` is not persisted — so that turn
  *       has no on-disk end marker.
  *  Setting `reliableTurnTerminal` would (a) claim VC-meeting delivery eligibility
- *  Pi can't honor, (b) suppress the busy-marker idle probe Pi actually relies on,
- *  and (c) make `structuredRateLimitAuthoritative` suppress Pi's screen `rate`
- *  verdict with no structured replacement (real 429s vanish). Leaving it unset
- *  keeps Pi on its proven quiescence + `Working...` busy-marker idle path.
+ *  Pi can't honor and (b) suppress the busy-marker idle probe Pi actually relies
+ *  on, so it stays unset — keeping Pi on its proven quiescence + `Working...`
+ *  busy-marker idle path. (Pi's screen `rate` verdict is NOT at risk here:
+ *  `structuredRateLimitAuthoritative` gates on `claudeDataDir` /
+ *  `emitsStructuredRateLimit`, neither of which Pi sets — Pi has no structured
+ *  rate-limit emit, so it correctly keeps screen-scanning real 429s.)
  *
  *  ## Idle detection
  *  Pi is a pure-quiescence adapter (no `readyPattern`, no `injectsReadyHook`).
@@ -52,7 +54,20 @@ import type { CliAdapter } from './types.js';
  *  idle probe and the reattach probe (`scheduleReattachIdleProbe`, gated on
  *  `busyPattern`), so a turn — and a reattached persistent pane with no new PTY
  *  output — is marked ready via the `Working...` marker exactly as before this
- *  change. `assistant_final` events additionally fire idle when they land. */
+ *  change. `assistant_final` events additionally fire idle when they land.
+ *  Three guards keep quiescence honest (the raw heuristic alone mis-fires):
+ *    1. Startup window: the TUI renders its input box seconds before the CLI
+ *       begins consuming an argv-baked first prompt (extension/model loading).
+ *       The worker holds the first ready until the turn has visibly started —
+ *       `Working...` seen on PTY, or the transcript's first user record
+ *       (worker `spawnArgvTurnStartEvidenceSeen` gate).
+ *    2. Mid-turn: pi is in STRUCTURED_BRIDGE_LIFECYCLE_BLOCKING_CLI_IDS, so a
+ *       transcript-started turn without a terminal suppresses screen idle
+ *       (drainPiTranscript emits terminals for stop/length-no-toolcall and the
+ *       hard error/aborted edges — see pi-transcript.ts for the accepted
+ *       custom-tool `terminate:true` gap).
+ *    3. Post-idle: `idleToBusyPattern` flips a falsely published ready back to
+ *       working when `Working...` reappears. */
 export declare function createPiAdapter(pathOverride?: string): CliAdapter;
 export declare const create: typeof createPiAdapter;
 //# sourceMappingURL=pi.d.ts.map

package/dist/adapters/cli/pi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/pi.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAIxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8EAqD8E;AAC9E,wBAAgB,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAiEjE;AAED,eAAO,MAAM,MAAM,wBAAkB,CAAC"}
+{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/pi.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAIxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gDAoEgD;AAChD,wBAAgB,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAwEjE;AAED,eAAO,MAAM,MAAM,wBAAkB,CAAC"}

package/dist/adapters/cli/pi.js

@@ -44,10 +44,12 @@ import { delay } from '../../utils/timing.js';
  *       terminal stopReason), and `terminate` is not persisted — so that turn
  *       has no on-disk end marker.
  *  Setting `reliableTurnTerminal` would (a) claim VC-meeting delivery eligibility
- *  Pi can't honor, (b) suppress the busy-marker idle probe Pi actually relies on,
- *  and (c) make `structuredRateLimitAuthoritative` suppress Pi's screen `rate`
- *  verdict with no structured replacement (real 429s vanish). Leaving it unset
- *  keeps Pi on its proven quiescence + `Working...` busy-marker idle path.
+ *  Pi can't honor and (b) suppress the busy-marker idle probe Pi actually relies
+ *  on, so it stays unset — keeping Pi on its proven quiescence + `Working...`
+ *  busy-marker idle path. (Pi's screen `rate` verdict is NOT at risk here:
+ *  `structuredRateLimitAuthoritative` gates on `claudeDataDir` /
+ *  `emitsStructuredRateLimit`, neither of which Pi sets — Pi has no structured
+ *  rate-limit emit, so it correctly keeps screen-scanning real 429s.)
  *
  *  ## Idle detection
  *  Pi is a pure-quiescence adapter (no `readyPattern`, no `injectsReadyHook`).
@@ -55,7 +57,20 @@ import { delay } from '../../utils/timing.js';
  *  idle probe and the reattach probe (`scheduleReattachIdleProbe`, gated on
  *  `busyPattern`), so a turn — and a reattached persistent pane with no new PTY
  *  output — is marked ready via the `Working...` marker exactly as before this
- *  change. `assistant_final` events additionally fire idle when they land. */
+ *  change. `assistant_final` events additionally fire idle when they land.
+ *  Three guards keep quiescence honest (the raw heuristic alone mis-fires):
+ *    1. Startup window: the TUI renders its input box seconds before the CLI
+ *       begins consuming an argv-baked first prompt (extension/model loading).
+ *       The worker holds the first ready until the turn has visibly started —
+ *       `Working...` seen on PTY, or the transcript's first user record
+ *       (worker `spawnArgvTurnStartEvidenceSeen` gate).
+ *    2. Mid-turn: pi is in STRUCTURED_BRIDGE_LIFECYCLE_BLOCKING_CLI_IDS, so a
+ *       transcript-started turn without a terminal suppresses screen idle
+ *       (drainPiTranscript emits terminals for stop/length-no-toolcall and the
+ *       hard error/aborted edges — see pi-transcript.ts for the accepted
+ *       custom-tool `terminate:true` gap).
+ *    3. Post-idle: `idleToBusyPattern` flips a falsely published ready back to
+ *       working when `Working...` reappears. */
 export function createPiAdapter(pathOverride) {
     const bin = resolveCommand(pathOverride ?? 'pi');
     return {
@@ -106,6 +121,13 @@ export function createPiAdapter(pathOverride) {
         },
         completionPattern: undefined,
         busyPattern: /Working\.\.\./,
+        // Self-heal for a falsely published ready (e.g. a startup-window quiescence
+        // idle slipping past the gates): if `Working...` renders AFTER an idle was
+        // reported, IdleDetector fires onBusy and the worker pulls isPromptReady
+        // back to false + republishes working. Safe as an idle→busy edge marker:
+        // Pi's `Working...` is an ephemeral status line, never part of transcript
+        // history redraws, so a completed turn cannot revive a closed card.
+        idleToBusyPattern: /Working\.\.\./,
         readyPattern: undefined,
         // Pi's native Message Queue parks/steers submit-while-busy input; the JSONL
         // transcript bridge (drainPiTranscript) + the `Working...` busy marker are

package/dist/adapters/cli/pi.js.map

@@ -1 +1 @@
-{"version":3,"file":"pi.js","sourceRoot":"","sources":["../../../src/adapters/cli/pi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pi.js","sourceRoot":"","sources":["../../../src/adapters/cli/pi.ts"],"names":[],"mappings":"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"}