botmux 2.84.0 → 2.85.0

package/dist/utils/file-lock.js.map

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

package/dist/worker.js

@@ -22,6 +22,7 @@ import { shouldSuppressBridgeEmit } from './services/bridge-fallback-gate.js';
 import { shouldWriteNow } from './utils/input-gate.js';
 import { mergeQueuedCliInput } from './utils/pending-input-queue.js';
 import { ReadyGate, shouldArmReadyGate } from './utils/ready-gate.js';
+import { shouldRunStartupCommandsOnSpawn, shouldDeferInitialPromptForStartup } from './core/startup-commands.js';
 import { InflightInputTracker } from './core/inflight-input-tracker.js';
 import { shouldRunQuietRotation, evaluatePidResolverPullback, decideFingerprintSwitch, shouldHealAbsentBaseline, sessionIdFromJsonlPath, SESSION_ID_FILENAME_RE, } from './services/bridge-rotation-policy.js';
 import { CodexBridgeQueue } from './services/codex-bridge-queue.js';
@@ -143,6 +144,12 @@ function cliName() { return CLI_DISPLAY_NAMES[lastInitConfig?.cliId ?? ''] ?? 'C
 let isPromptReady = false;
 /** Mutex for async flushPending — prevents concurrent flush loops. */
 let isFlushing = false;
+/** Per-spawn one-shot: have this spawn's bot.startupCommands been typed in yet?
+ *  Reset in spawnCli so a restart/resume (which re-spawns the CLI) re-applies
+ *  them — needed because session-only settings like `/effort ultracode` are lost
+ *  when the CLI restarts. Consumed inside flushPending right before the first
+ *  user prompt is drained, so the commands always precede it (see runStartupCommands). */
+let hasRunStartupCommands = false;
 /** Ready-gate (Claude-family): holds the first prompt until the SessionStart
  *  hook fires a true-ready signal, so a cjadk-style startup selector's ❯ (which
  *  falsely matches readyPattern) can't eat the first message. Recreated + armed
@@ -208,6 +215,73 @@ function releaseReadyGate(reason) {
         settleThenFlush(Date.now());
     }
 }
+/** Per-startup-command quiescence: how long the PTY must be quiet before sending
+ *  the next command, capped so a slow/redrawing command can't stall the queue. */
+const STARTUP_CMD_QUIET_MS = 500;
+const STARTUP_CMD_CAP_MS = 4_000;
+/** Type one literal input LINE into the CLI exactly like a passthrough slash
+ *  command: raw text → a 200ms beat (so the TUI's slash-command picker registers
+ *  the match before submit) → a separate Enter. Non-TUI backends fall back to a
+ *  single write + CR. Shared by the `raw_input` IPC handler and runStartupCommands
+ *  so both stay in lockstep. */
+async function sendRawCommandLine(be, content) {
+    if ('sendText' in be && 'sendSpecialKeys' in be) {
+        be.sendText(content);
+        await new Promise(r => setTimeout(r, 200));
+        be.sendSpecialKeys('Enter');
+    }
+    else {
+        be.write(content + '\r');
+    }
+}
+/** Resolve once the PTY has been quiet for `quietMs`, or after `capMs` total.
+ *  Spaces out startup commands so each is processed before the next is typed. */
+function awaitPtyQuiescence(quietMs, capMs) {
+    return new Promise(resolve => {
+        const startedAt = Date.now();
+        const check = () => {
+            const now = Date.now();
+            if (now - lastPtyOutputAtMs >= quietMs || now - startedAt >= capMs) {
+                resolve();
+                return;
+            }
+            const wait = Math.min(quietMs - (now - lastPtyOutputAtMs), capMs - (now - startedAt));
+            const t = setTimeout(check, Math.max(50, wait));
+            t.unref?.();
+        };
+        check();
+    });
+}
+/** Type this spawn's bot.startupCommands into the CLI in order — one submit each,
+ *  before the first user prompt. Best-effort: a failing command is logged and
+ *  skipped, never blocking the first prompt. Skipped in adopt mode (we observe
+ *  the user's existing session). Invoked once per spawn from flushPending under
+ *  the isFlushing mutex, so no user message can interleave. */
+async function runStartupCommands() {
+    const cmds = lastInitConfig?.startupCommands;
+    if (!cmds || cmds.length === 0)
+        return;
+    if (lastInitConfig?.adoptMode)
+        return;
+    if (!backend)
+        return;
+    log(`Running ${cmds.length} startup command(s) before first prompt`);
+    for (const cmd of cmds) {
+        if (!backend)
+            break;
+        try {
+            await sendRawCommandLine(backend, cmd);
+            await awaitPtyQuiescence(STARTUP_CMD_QUIET_MS, STARTUP_CMD_CAP_MS);
+            log(`Startup command sent: ${cmd}`);
+        }
+        catch (e) {
+            log(`Startup command failed (${cmd}): ${e?.message ?? e}`);
+        }
+    }
+    // Commands consumed turns and reset idle; treat the first user prompt fresh.
+    isPromptReady = false;
+    idleDetector?.reset();
+}
 const pendingMessages = [];
 /** Inputs written to the CLI whose turn hasn't completed — re-queued across a
  *  CLI crash so a submit-time death can't silently eat user messages. */
@@ -3128,6 +3202,16 @@ async function flushPending() {
         idleDetector?.reset();
     }
     try {
+        // One-shot per spawn: type the bot's startup commands (e.g. `/effort
+        // ultracode`) into the CLI before the first user prompt drains. Both ready
+        // paths funnel through flushPending — the ready-gate settle for Claude-family
+        // CLIs, markPromptReady for the rest — so this is the single universal
+        // "ready, about to send the first prompt" point, for every CLI. Held by the
+        // isFlushing mutex so no Lark message can interleave between the commands.
+        if (!hasRunStartupCommands) {
+            hasRunStartupCommands = true;
+            await runStartupCommands();
+        }
         while (pendingMessages.length > 0 && backend && cliAdapter) {
             const item = pendingMessages.shift();
             // Track as in-flight until the CLI returns to idle (markPromptReady).
@@ -3595,6 +3679,9 @@ function scheduleBusyPatternIdleProbe(source) {
     busyPatternIdleProbeTimer.unref?.();
 }
 function spawnCli(cfg) {
+    // (startupCommands one-shot is re-armed below, AFTER the reattach-vs-fresh
+    // prediction — only a genuinely fresh CLI process replays them; see
+    // willReattachPersistent.)
     // Re-deliver inputs that were in-flight when the previous CLI died (see
     // backend.onExit). killCli() already wiped pendingMessages, so these go to
     // the front; the normal flush paths (prompt detect / first-prompt timeout)
@@ -3773,6 +3860,14 @@ function spawnCli(cfg) {
                 ? ZellijBackend.hasSession(persistentSessionName)
                 : HerdrBackend.hasSession(persistentSessionName)
         : false;
+    // Re-arm the startup-commands one-shot ONLY for a genuinely fresh CLI process.
+    // A reattach to a LIVE persistent pane (daemon-restart recovery) is the SAME
+    // CLI with /effort etc. already applied — replaying would re-type them (and
+    // /clear,/compact would corrupt the recovered context). hasRun=true ⇒ skip.
+    // Fresh spawns (incl. resume that starts a new CLI, where hasSession is false)
+    // arm it. spawnCli is synchronous up to backend spawn, so this lands before
+    // any flushPending consumes the flag.
+    hasRunStartupCommands = !shouldRunStartupCommandsOnSpawn({ willReattachPersistent });
     // ── Resume pre-flight check + two-tier fallback ──────────────────────────
     // Tier 1 (adapter probe): adapter.checkResumeTargetExists returns false
     // → skip --resume, spawn FRESH.
@@ -3853,17 +3948,28 @@ function spawnCli(cfg) {
     // ttadk 网关：模型走 ttadk 自己的 `-m`（启动期注入到 ttadk 前缀，见下方 wrapperCli
     // 分支），不能再把 cfg.model 透给底层适配器，否则真实 CLI 会再吃一个 --model 重复。
     const ttadkGateway = isTtadkWrapper(cfg.wrapperCli);
+    // When a bot has startupCommands AND this CLI bakes the first prompt into
+    // launch args (passesInitialPromptViaArgs, e.g. Gemini -i), don't bake it —
+    // route it through the input queue instead so startupCommands run first
+    // (flushPending's hook can't precede an args-baked prompt). The init handler
+    // mirrors this when deciding whether to enqueue the prompt.
+    const deferInitialPrompt = shouldDeferInitialPromptForStartup({
+        hasStartupCommands: !!cfg.startupCommands?.length,
+        adoptMode: cfg.adoptMode === true,
+        passesInitialPromptViaArgs: cliAdapter.passesInitialPromptViaArgs === true,
+    });
     const args = cliAdapter.buildArgs({
         sessionId: effectiveAdapterSessionId,
         resume: effectiveResume,
         workingDir: cfg.workingDir,
         resumeSessionId: effectiveCliSessionId,
-        initialPrompt: cfg.prompt || undefined,
+        initialPrompt: deferInitialPrompt ? undefined : (cfg.prompt || undefined),
         botName: cfg.botName,
         botOpenId: cfg.botOpenId,
         locale: cfg.locale,
         model: ttadkGateway ? undefined : cfg.model,
         disableCliBypass: cfg.disableCliBypass === true,
+        skillPluginDir: cfg.skillPluginDir,
     });
     // Extra args from env (CLI_DISABLE_DEFAULT_ARGS is removed — adapters own their defaults)
     const extra = (process.env.CLI_EXTRA_ARGS ?? '').trim();
@@ -4026,6 +4132,7 @@ function spawnCli(cfg) {
                     hidePaths: cfg.sandboxHidePaths ?? [],
                     authPaths: cliAdapter.authPaths,
                     extraExecPaths: cliAdapter.sandboxExtraExecPaths?.(),
+                    readonlyRoots: cfg.skillReadonlyRoots ?? [],
                 });
                 if (sbx) {
                     spawnBin = sbx.bin;
@@ -5043,10 +5150,17 @@ process.on('message', async (raw) => {
                 spawnCli(msg);
                 // Queue the initial prompt — flushed when CLI shows idle.
                 // Adapters with passesInitialPromptViaArgs (e.g. Gemini -i) bake the
-                // prompt into CLI args, so we skip queuing to avoid double-send.
-                // Bridge mark is deferred to flushPending — see flushPending
-                // comment for why marking at enqueue is wrong.
-                if (msg.prompt && !cliAdapter?.passesInitialPromptViaArgs) {
+                // prompt into CLI args, so we normally skip queuing to avoid double-send.
+                // EXCEPTION: when this bot has startupCommands, spawnCli deliberately did
+                // NOT bake the prompt (deferInitialPrompt) so the commands can precede it
+                // — so we MUST queue it here. shouldDeferInitialPromptForStartup mirrors
+                // spawnCli's decision exactly. Bridge mark is deferred to flushPending.
+                const deferInitialPrompt = shouldDeferInitialPromptForStartup({
+                    hasStartupCommands: !!msg.startupCommands?.length,
+                    adoptMode: msg.adoptMode === true,
+                    passesInitialPromptViaArgs: cliAdapter?.passesInitialPromptViaArgs === true,
+                });
+                if (msg.prompt && (!cliAdapter?.passesInitialPromptViaArgs || deferInitialPrompt)) {
                     pendingMessages.push({ content: msg.prompt, turnId: msg.turnId });
                 }
                 send({ type: 'ready', port, token: writeToken, turnId: currentBotmuxTurnId });
@@ -5175,21 +5289,14 @@ process.on('message', async (raw) => {
             if (tmuxScrolledHalfPages > 0)
                 exitTmuxScrollMode();
             if (backend) {
-                if ('sendText' in backend && 'sendSpecialKeys' in backend) {
-                    backend.sendText(msg.content);
-                    // Beat between text and Enter so the CLI's slash-command picker has
-                    // time to register the match before submit. Without this, Codex
-                    // (and likely other Ink-based TUIs) fires Enter while the picker
-                    // is still building, dismisses the match, and submits the literal
-                    // `/clear` as a regular user prompt — visible to the user as
-                    // "/clear + 换行" stuck in conversation history. 200ms mirrors the
-                    // codex adapter's own writeInput paste-detection delay.
-                    await new Promise(r => setTimeout(r, 200));
-                    backend.sendSpecialKeys('Enter');
-                }
-                else {
-                    backend.write(msg.content + '\r');
-                }
+                // sendRawCommandLine: literal text → 200ms beat (so the CLI's slash-
+                // command picker registers the match before submit; without it Codex /
+                // other Ink TUIs fire Enter while the picker is still building, dismiss
+                // the match, and submit the literal `/clear` as a regular user prompt —
+                // visible to the user as "/clear + 换行" stuck in history; the 200ms
+                // mirrors the codex adapter's own writeInput paste-detection delay) →
+                // Enter. Shared with runStartupCommands so both stay in lockstep.
+                await sendRawCommandLine(backend, msg.content);
                 isPromptReady = false;
                 idleDetector?.reset();
                 log(`Passthrough slash command: ${msg.content}`);