botmux 2.105.0 → 2.106.0

package/dist/worker.js

@@ -390,6 +390,10 @@ let readyFlushSettleTimer = null;
  *  holds (just like the gate) so a message arriving mid-settle can't type-ahead
  *  past the settle and re-trigger paste-burst. */
 let isSettlingFirstFlush = false;
+/** IdleDetector can fire during the post-ready settle. Do not mark the prompt
+ *  ready yet, or flushPending will be blocked by isSettlingFirstFlush and a
+ *  later markPromptReady call would return early with the first prompt stranded. */
+let promptReadyDetectedDuringSettle = false;
 /** Wait until the PTY has been quiet for READY_FLUSH_SETTLE_MS (Ink render
  *  drained), capped at READY_FLUSH_SETTLE_CAP_MS, then flush the held prompt.
  *  A real SessionStart/BOTMUX_READY_COMMAND signal is itself authoritative
@@ -401,8 +405,10 @@ function settleThenFlush(startedAtMs, promptReadyAfterSettle) {
     const quietForMs = now - lastPtyOutputAtMs;
     if (quietForMs >= READY_FLUSH_SETTLE_MS || now - startedAtMs >= READY_FLUSH_SETTLE_CAP_MS) {
         isSettlingFirstFlush = false;
-        log(`Ready-gate settle done (quiet ${quietForMs}ms); ${promptReadyAfterSettle ? 'marking prompt ready' : 'delivering held first prompt'}`);
-        if (promptReadyAfterSettle) {
+        const shouldMarkPromptReady = promptReadyAfterSettle || promptReadyDetectedDuringSettle;
+        promptReadyDetectedDuringSettle = false;
+        log(`Ready-gate settle done (quiet ${quietForMs}ms); ${shouldMarkPromptReady ? 'marking prompt ready' : 'delivering held first prompt'}`);
+        if (shouldMarkPromptReady) {
             markPromptReady();
             return;
         }
@@ -3309,6 +3315,11 @@ function markPromptReady() {
         log('Idle detected but holding for SessionStart ready signal (startup selector guard)');
         return;
     }
+    if (isSettlingFirstFlush) {
+        promptReadyDetectedDuringSettle = true;
+        log('Idle detected during ready-gate settle; deferring prompt-ready until settle completes');
+        return;
+    }
     isPromptReady = true;
     // CLI 实际启动成功（回到 prompt）：复位连续重启计数。
     // 任何能到这一步的 spawn 都算"成功"——后续即便再崩溃（不是 resume 目标不存在
@@ -5197,6 +5208,7 @@ function spawnCli(cfg) {
         readyFlushSettleTimer = null;
     }
     isSettlingFirstFlush = false;
+    promptReadyDetectedDuringSettle = false;
     // Reset quiescence baseline so the settle measures silence from THIS spawn.
     lastPtyOutputAtMs = Date.now();
     if (shouldArmReadyGate({
@@ -5325,6 +5337,7 @@ function killCli() {
         readyFlushSettleTimer = null;
     }
     isSettlingFirstFlush = false;
+    promptReadyDetectedDuringSettle = false;
     stopScreenAnalyzer();
     stopScreenUpdates();
     backend?.kill();
@@ -5862,12 +5875,35 @@ window.addEventListener('resize',onViewportResize);
 // doesn't compound into a whole screen. px<0 = scroll up (toward history). The
 // per-call cap stops a single huge delta (page tick / fling) from over-firing.
 var _scrollAccum=0;var _SCROLL_STEP=33;
-function _fwdScroll(px){
+// Map a viewport pixel (clientX/Y) to a 1-based terminal cell "col;row", clamped to
+// the grid. The forwarded SGR wheel event MUST carry the cell UNDER THE POINTER, the
+// way a physical terminal reports it: zone-routed alt-screen TUIs — OpenCode (Bubble
+// Tea + bubblezone) — only scroll when the wheel lands inside the messages viewport's
+// mouse zone. A fixed (1,1) is the top-left border, outside that zone, so every
+// forwarded wheel was dropped and OpenCode wouldn't scroll at all. Coordinate-agnostic
+// CLIs (Claude Code etc.) scroll regardless of coords, which is why ONLY OpenCode broke.
+// Fall back to the grid CENTRE (never 1,1) when the screen geometry can't be read.
+function _cellAt(clientX,clientY){
+  var col=(term.cols>>1)+1,row=(term.rows>>1)+1;
+  try{
+    var sc=term.element&&term.element.querySelector('.xterm-screen');
+    var r=sc&&sc.getBoundingClientRect();
+    if(r&&r.width>0&&r.height>0){
+      col=Math.floor((clientX-r.left)/(r.width/term.cols))+1;
+      row=Math.floor((clientY-r.top)/(r.height/term.rows))+1;
+    }
+  }catch(_e){}
+  if(col<1)col=1;else if(col>term.cols)col=term.cols;
+  if(row<1)row=1;else if(row>term.rows)row=term.rows;
+  return col+';'+row;
+}
+function _fwdScroll(px,coord){
   if(!ws_||ws_.readyState!==1)return;
+  coord=coord||(((term.cols>>1)+1)+';'+((term.rows>>1)+1)); // never (1,1)
   _scrollAccum+=px;var data='',n=0;
   while(Math.abs(_scrollAccum)>=_SCROLL_STEP&&n<6){
     var up=_scrollAccum<0; // px<0 → wheel-up (history)
-    data+='\\x1b[<'+(up?64:65)+';1;1M';
+    data+='\\x1b[<'+(up?64:65)+';'+coord+'M';
     _scrollAccum+=up?_SCROLL_STEP:-_SCROLL_STEP;n++;
   }
   if(data)ws_.send(JSON.stringify({type:'input',data:data}));
@@ -5883,7 +5919,7 @@ if(!${isTmuxMode && !isPipeMode}){
     e.preventDefault();e.stopPropagation();
     // Normalise deltaMode to px: line→~16px, page→~one screen.
     var px=e.deltaMode===1?e.deltaY*16:e.deltaMode===2?e.deltaY*term.rows*16:e.deltaY;
-    _fwdScroll(px);
+    _fwdScroll(px,_cellAt(e.clientX,e.clientY)); // report the cell under the pointer
   },{capture:true,passive:false});
 }
 
@@ -5932,7 +5968,8 @@ if(!${isTmuxMode && !isPipeMode}){
     if(term.buffer.active.type!=='alternate'||_tLastY===null||e.touches.length!==1)return;
     e.preventDefault();e.stopPropagation();
     var y=e.touches[0].clientY;
-    _fwdScroll(_tLastY-y); // finger drags down (y grows) → px<0 → scroll up (history)
+    // finger drags down (y grows) → px<0 → scroll up (history); report the touched cell
+    _fwdScroll(_tLastY-y,_cellAt(e.touches[0].clientX,y));
     _tLastY=y;
   },{capture:true,passive:false});
   _tTerm.addEventListener('touchend',function(){_tLastY=null;},{capture:true,passive:true});
@@ -5943,10 +5980,13 @@ if(!${isTmuxMode && !isPipeMode}){
 }
 // ─── IPC Communication ───────────────────────────────────────────────────────
 function send(msg) {
-    if (isWorkflowWorker() && msg.type === 'final_output') {
+    const payload = msg.type === 'final_output' && sessionId
+        ? { ...msg, sessionId }
+        : msg;
+    if (isWorkflowWorker() && payload.type === 'final_output') {
         workflowFinalOutputSent = true;
     }
-    process.send?.(msg);
+    process.send?.(payload);
 }
 function log(msg) {
     const ts = new Date().toISOString();