@mobius-os/mobius 0.3.26 → 0.3.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobius-os/mobius",
-  "version": "0.3.26",
+  "version": "0.3.27",
   "type": "module",
   "description": "Mobius terminal client. Reuses Mobius frontend TypeScript types and jsonl entry shapes.",
   "bin": {

package/src/App.tsx

@@ -21,10 +21,16 @@ import { ResumePicker } from './components/ResumePicker.js'
 import { Screen } from './components/Screen.js'
 import { startAimuxConnection, stopAimuxConnection, type AimuxStatus } from './aimux.js'
 import { AimuxStatusLine } from './components/AimuxStatus.js'
+import { useStableInput } from './components/primitives.js'
 
 type Route = 'boot' | 'login' | 'prep' | 'chat' | 'resume'
 
 export function App() {
+  // Keep stdin raw mode alive across route transitions. Without a persistent
+  // owner, Ink can briefly drop raw mode between an async picker unmount and
+  // the next Chat/Select mount, making the first arrows or typed characters
+  // appear ignored until a later key causes another render.
+  useStableInput(() => {})
   const [route, setRoute] = useState<Route>('boot')
   const [bootMsg, setBootMsg] = useState('初始化…')
   const [client, setClient] = useState<MobiusClient | null>(null)

package/src/components/Chat.tsx

@@ -8,7 +8,7 @@
  * activity, composer, and a persistent context status line.
  */
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Box, Text, useInput, useStdout } from 'ink'
+import { Box, Text, useStdout } from 'ink'
 import { useChat } from '../hooks/useChat.js'
 import { MobiusClient } from '../api.js'
 import { renderMarkdownLines } from '../markdown.js'
@@ -24,7 +24,7 @@ import type { AnyEntry } from '../types.js'
 import { ConfigFlow, ReconfigFlow, type ConfigResult } from './ConfigFlow.js'
 import type { AimuxStatus } from '../aimux.js'
 import { AimuxStatusLine, aimuxStatusText } from './AimuxStatus.js'
-import { isEscapeKeypress, isMouseInput, useMouseEvents } from './primitives.js'
+import { isEscapeKeypress, isMouseInput, useMouseEvents, useStableInput } from './primitives.js'
 import { useDeleteKeyCapture, applyDeleteIntent, clampCursor, previousCursorBoundary, nextCursorBoundary } from '../lib/delete-keys.js'
 
 interface ChatProps {
@@ -112,6 +112,16 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   // (type:user / response_item.message[user] / event_msg.user_message) 合并成 1 条,
   // 避免在累积视图里把同一条提问显示多次.
   const dedupedEntries = useMemo(() => dedupeUserEntries(chat.entries), [chat.entries])
+  // Cache: entry index → rendered line count. Cleared when entries or columns change.
+  const entryLines = useRef<Map<number, number>>(new Map())
+  useEffect(() => { entryLines.current.clear() }, [dedupedEntries, terminal.columns])
+  const getEntryLines = useCallback((i: number) => {
+    const c = entryLines.current.get(i)
+    if (c !== undefined) return c
+    const n = entryScreenLines(viewsForEntry(dedupedEntries[i]), terminal.columns).length || 1
+    entryLines.current.set(i, n)
+    return n
+  }, [dedupedEntries, terminal.columns])
   const viewportRows = terminal.isTty ? Math.max(9, terminal.rows - 1) : terminal.rows
   const activityRows = (chat.typing ? 2 : 0) + (chat.error ? 1 : 0)
   const helpRows = showHelp ? SLASH_COMMANDS.length + 3 : 0
@@ -149,7 +159,7 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   }, [client, ready.prefs.model])
   const modelDisplay = modelLabel ?? ready.prefs.model ?? 'default'
 
-  useInput((_input, key) => {
+  useStableInput((_input, key) => {
     // While a config/reconfig flow is open, this ChatScreen-level handler owns
     // Esc so cancel is reliable even mid-list-loading (a per-component
     // EscToCancel could be unmounted by the loading→loaded transition and drop
@@ -214,8 +224,24 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   useMouseEvents({
     onWheel: (delta) => {
       if (delta === 0) return
-      const step = 3
-      setScrollBack(value => Math.min(dedupedEntries.length, Math.max(0, value + delta * step)))
+      const targetLines = 2
+      let lines = 0
+      let next = scrollBack
+      const n = dedupedEntries.length
+      if (delta > 0) {
+        // scroll up (older): hide more entries from the tail
+        for (let i = n - 1 - next; i >= 0 && lines < targetLines; i--) {
+          lines += getEntryLines(i)
+          next++
+        }
+      } else {
+        // scroll down (newer): unhide entries from the tail
+        for (let i = n - next; i < n && lines < targetLines; i++) {
+          lines += getEntryLines(i)
+          next--
+        }
+      }
+      setScrollBack(Math.min(n, Math.max(0, next)))
     },
     onPress: (row, col) => {
       const p = screenToSelPoint(row, col, transcriptModel, geometry)
@@ -772,7 +798,7 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
 
   useEffect(() => () => resetPasteBurst(), [])
 
-  useInput((input, key) => {
+  useStableInput((input, key) => {
     if (isMouseInput(input)) return // mouse events must never become typed text
     const now = Date.now()
     const escape = isEscapeKeypress(input, key)

package/src/components/primitives.tsx

@@ -3,9 +3,20 @@
  * Select (single-choice list + multi-choice with checkboxes), and a Spinner.
  */
 import React, { useEffect, useRef, useState } from 'react'
-import { Box, Text, useInput, useStdout, useStdin } from 'ink'
+import { Box, Text, useInput, useStdout, useStdin, type Key } from 'ink'
 import { useDeleteKeyCapture, applyDeleteIntent } from '../lib/delete-keys.js'
 
+type InputHandler = (input: string, key: Key) => void
+
+/** Keep one Ink listener while a component rerenders; read the latest handler through a ref. */
+export function useStableInput(handler: InputHandler, options?: { isActive?: boolean }): void {
+  const handlerRef = useRef(handler)
+  handlerRef.current = handler
+  const stableRef = useRef<InputHandler | null>(null)
+  if (!stableRef.current) stableRef.current = (input, key) => handlerRef.current(input, key)
+  useInput(stableRef.current, options)
+}
+
 /** Windows Terminal/ConPTY may expose Esc as a named key, a raw byte, or Ctrl+[. */
 export function isEscapeKeypress(input: string, key: { escape?: boolean; ctrl?: boolean }): boolean {
   return key.escape === true || input === '\x1b' || (key.ctrl === true && input === '[')
@@ -185,7 +196,7 @@ export function TextInput(props: TextInputProps) {
     edit(text, nextCursor)
   })
 
-  useInput((input, key) => {
+  useStableInput((input, key) => {
     if (isMouseInput(input)) return
     if (key.return) { props.onSubmit?.(); return }
     if (key.upArrow) { props.onArrowUp?.(); return }
@@ -309,7 +320,7 @@ export function Select(props: SelectProps) {
 
   useEffect(() => { setActive(a => Math.min(a, Math.max(0, items.length - 1))) }, [items.length])
 
-  useInput((input, key) => {
+  useStableInput((input, key) => {
     if (!items.length) return
     if (isMouseInput(input)) return
     if (key.upArrow) { setActive(a => (a - 1 + items.length) % items.length); return }