@mobius-os/mobius 0.3.31 → 0.3.38

package/README.md

@@ -130,6 +130,13 @@ npm test                   # all three
 
 ## Build an installable package
 
+The TUI release version has one source of truth: `mobius/tui/package.json`.
+The welcome screen, npm package metadata, artifact filename, and download
+manifest all read that value. `package-lock.json` mirrors it as generated npm
+metadata; do not edit it as a separate release setting. The AIMUX bundle
+version (`BUNDLE_VER`) is an independent Python runtime cache version and is
+not the TUI version.
+
 From the repository root:
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobius-os/mobius",
-  "version": "0.3.31",
+  "version": "0.3.38",
   "type": "module",
   "description": "Mobius terminal client. Reuses Mobius frontend TypeScript types and jsonl entry shapes.",
   "bin": {
@@ -19,6 +19,7 @@
     "test:reconnect": "tsx tests/reconnect.test.tsx",
     "test:screen": "FORCE_COLOR=1 tsx tests/screen.test.tsx",
     "test:scroll": "tsx tests/scroll.test.tsx",
+    "test:viewport": "tsx tests/viewport.test.ts",
     "test:selection": "FORCE_COLOR=1 tsx tests/selection.test.tsx",
     "test": "npm run typecheck && npm run test:ui && npm run test:integration"
   },

package/scripts/build-python-bundles.sh

@@ -13,8 +13,8 @@ set -euo pipefail
 
 TAG=20241002
 PYVER=3.12.7
-BUNDLE_VER=2
-AIMUX_VERSION=0.1.21
+BUNDLE_VER=3
+AIMUX_VERSION=0.1.22
 PYPI_INDEX=https://pypi.org/simple
 WORK="${WORK:-/home/tianyi/python-bundles}"
 DIST="${DIST:-$WORK/dist}"

package/src/App.tsx

@@ -12,7 +12,7 @@
 import React, { useEffect, useState } from 'react'
 import { Box, Text } from 'ink'
 import { MobiusClient, getMe, login, ApiError } from './api.js'
-import { loadLogin, saveLogin, type LoginRecord } from './config.js'
+import { clearLogin, loadLogin, saveLogin, type LoginRecord } from './config.js'
 import { LoginScreen } from './components/Login.js'
 import { PrepScreen, type ReadyState } from './components/PrepScreen.js'
 import { ChatScreen } from './components/Chat.js'
@@ -150,6 +150,21 @@ export function App() {
     void stopAimuxConnection().finally(() => process.exit(0))
   }
 
+  async function onLogout() {
+    if (process.env.MOBIUS_TUI_DEBUG) console.error('[route] logout')
+    try {
+      await clearLogin()
+      await stopAimuxConnection()
+    } finally {
+      setClient(null)
+      setUserId(null)
+      setReady(null)
+      setResumeSessionId(null)
+      setAimuxStatus({ state: 'stopped', phase: 'idle', detail: '登录后自动连接' })
+      setRoute('login')
+    }
+  }
+
   // ── render ─────────────────────────────────────────────────────────────────
   // The chat screen already pins itself to the terminal height, so render it
   // bare — a <Screen> wrapper would clip its transcript in short terminals and
@@ -168,6 +183,7 @@ export function App() {
         onClear={onClear}
         onResume={onResume}
         onQuit={onQuit}
+        onLogout={() => { void onLogout() }}
         onReconfigure={onReconfigure}
         onConfigCancel={onConfigCancel}
         aimuxStatus={aimuxStatus}
@@ -178,7 +194,7 @@ export function App() {
   if (route === 'boot') {
     node = <Box paddingX={2} paddingY={1}><Text color="cyan">{bootMsg}</Text></Box>
   } else if (route === 'login' || !client) {
-    node = <LoginScreen onSuccess={onLoginSuccess} />
+    node = <LoginScreen onSuccess={onLoginSuccess} initialServer={prefill.server} initialUsername={prefill.username} />
   } else if (route === 'resume' && ready) {
     node = <Box flexDirection="column"><AimuxStatusLine status={aimuxStatus} compact /><ResumePicker client={client} project={ready.project} onPick={onResumed} onBack={() => setRoute('chat')} /></Box>
   } else {

package/src/aimux.ts

@@ -6,6 +6,7 @@
  * currently authenticated Mobius server.  Nothing is started before login.
  */
 import { spawn, spawnSync, type ChildProcess } from 'node:child_process'
+import { createHash } from 'node:crypto'
 import { promises as fs, existsSync, createWriteStream } from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
@@ -88,8 +89,8 @@ async function pythonForAimux(onProgress?: (p: InstallProgress) => void): Promis
 // 解压到 ~/.mobius/python-bundle/ 后用 `<python> -m aimux` 运行，彻底绕开宿主机
 // 系统 python（如被精简掉 ensurepip 的容器镜像）。aimux 全部依赖为纯 Python，
 // 故三平台可共用同一套打包产物，分别按 arch 发布到 CDN。
-const BUNDLE_VER = '2'
-const BUNDLE_AIMUX_VERSION = '0.1.21'
+const BUNDLE_VER = '3'
+const BUNDLE_AIMUX_VERSION = '0.1.23'
 const bundleDir = () => path.join(mobiusHome(), 'python-bundle')
 const bundlePython = () => WIN
   ? path.join(bundleDir(), 'python', 'python.exe')
@@ -300,16 +301,24 @@ export async function ensureAimux(onProgress?: (p: InstallProgress) => void): Pr
   return { ok: false, error: `${venvError}；内置运行时也失败: ${bundle.error}` }
 }
 
-export function tuiAimuxIdentifier(): string {
-  const host = os.hostname().toLowerCase().replace(/[^a-z0-9_.-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 32)
-  return `tui-${host || 'pc'}`
+export function tuiAimuxIdentifier(hostname = os.hostname(), cwd = process.cwd()): string {
+  const host = hostname.toLowerCase().replace(/[^a-z0-9_.-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 32)
+  // One machine may run several Mobius TUIs for different projects.  A
+  // hostname-only identifier makes every reverse client register with the
+  // same name and --replace continuously evicts its siblings ("client
+  // replaced").  The normalized cwd hash is stable across restarts/resume but
+  // unique for the common multi-project case.
+  const workspace = createHash('sha256').update(path.resolve(cwd)).digest('hex').slice(0, 10)
+  return `tui-${host || 'pc'}-${workspace}`
 }
 
 /**
  * Build the reverse-connect command in one place. The TUI can launch AIMUX
  * through either a venv executable or bundled Python; both paths must request
- * hidden Windows shells or every remote command flashes a console and steals
- * keyboard focus from the TUI.
+ * a fully headless Windows shell or every remote command flashes a console and
+ * steals keyboard focus from the TUI. Keep the old --silent-shell path
+ * available for older AIMUX bundles; current bundles use the no-console v2
+ * implementation (the historical spelling --slient-v2 is intentional).
  */
 export function reverseConnectArgs(
   server: string,
@@ -322,7 +331,7 @@ export function reverseConnectArgs(
     '--identifier', identifier,
     '--token', token,
     '--replace',
-    ...(platform === 'win32' ? ['--silent-shell'] : []),
+    ...(platform === 'win32' ? ['--slient-v2'] : []),
   ]
 }
 

package/src/components/Chat.tsx

@@ -13,18 +13,22 @@ import { useChat } from '../hooks/useChat.js'
 import { MobiusClient } from '../api.js'
 import { viewsForEntry, dedupeUserEntries, isAssistantOutput } from '../lib/entry-view.js'
 import {
-  displayWidth, compareSel, entryScreenLines, entryScreenRows,
-  buildTranscriptModel, computeTranscriptGeometry, screenToSelPoint,
+  displayWidth, compareSel, entryScreenRows, screenToSelPoint,
   buildSelectionMap, buildSelectionText, osc52,
   type TranscriptModel, type TranscriptGeometry, type SelPoint, type ScreenRow,
 } from '../lib/screen-text.js'
+import {
+  createRowAccess, moveAnchorByRows, sliceViewport, tailAnchor,
+  type RowAnchor,
+} from '../lib/transcript-viewport.js'
 import type { ReadyState } from './PrepScreen.js'
 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, useStableInput } from './primitives.js'
-import { useDeleteKeyCapture, applyDeleteIntent, clampCursor, previousCursorBoundary, nextCursorBoundary } from '../lib/delete-keys.js'
+import { useDeleteKeyCapture, applyDeleteIntent, clampCursor, previousCursorBoundary, nextCursorBoundary, previousWordBoundary, nextWordBoundary } from '../lib/delete-keys.js'
+import { useCursorKeyCapture } from '../lib/cursor-keys.js'
 
 interface ChatProps {
   client: MobiusClient
@@ -34,6 +38,7 @@ interface ChatProps {
   onClear: () => void
   onResume: () => void
   onQuit: () => void
+  onLogout: () => void
   onReconfigure: (result: ConfigResult) => void
   onConfigCancel: (sessionId: string | null) => void
   aimuxStatus?: AimuxStatus
@@ -45,8 +50,7 @@ interface TerminalSize {
   isTty: boolean
 }
 
-import { createRequire } from 'node:module'
-const VERSION = createRequire(import.meta.url)('../../package.json').version
+import { TUI_VERSION } from '../version.js'
 const DEFAULT_COMPOSER_ROWS = 5
 const STATUS_ROWS = 3
 
@@ -55,14 +59,17 @@ const SLASH_COMMANDS = [
   { cmd: '/resume', desc: '恢复一个历史会话' },
   { cmd: '/model', desc: '更换模型并开启新会话（保留当前任务）' },
   { cmd: '/config', desc: '重新选择项目、任务和模型' },
+  { cmd: '/logout', desc: '断开当前连接并返回登录界面' },
   { cmd: '/help', desc: '显示帮助' },
   { cmd: '/quit', desc: '退出 TUI' },
 ]
 
-export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear, onResume, onQuit, onReconfigure, onConfigCancel, aimuxStatus }: ChatProps) {
+export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear, onResume, onQuit, onLogout, onReconfigure, onConfigCancel, aimuxStatus }: ChatProps) {
   const chat = useChat({ client, ready, resumeSessionId })
   const [showHelp, setShowHelp] = useState(false)
-  const [scrollBack, setScrollBack] = useState(0)
+  // null means "follow the tail". A concrete anchor identifies the exact row
+  // at the top of the viewport while the user browses history.
+  const [rowAnchor, setRowAnchor] = useState<RowAnchor | null>(null)
   const [composerRows, setComposerRows] = useState(DEFAULT_COMPOSER_ROWS)
   const [modelLabel, setModelLabel] = useState<string | null>(null)
   const [configOpen, setConfigOpen] = useState(false)
@@ -87,10 +94,11 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
       case '/help': setShowHelp(s => !s); return true
       case '/model': setConfigOpen(true); return true
       case '/config': setReconfigOpen(true); return true
+      case '/logout': onLogout(); return true
       case '/quit': case '/exit': onQuit(); return true
       default: return false
     }
-  }, [onClear, onResume, onQuit])
+  }, [onClear, onResume, onQuit, onLogout])
 
   const onSubmit = useCallback((text: string) => {
     const t = text.trim()
@@ -100,7 +108,7 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
       return
     }
     setShowHelp(false)
-    setScrollBack(0)
+    setRowAnchor(null)
     void chat.send(t)
   }, [chat, runSlash])
 
@@ -116,39 +124,66 @@ 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 pendingEntry = useMemo<AnyEntry | null>(() => chat.pendingUser === null ? null : ({
+    type: 'user',
+    __id: '__pending-user__',
+    message: { role: 'user', content: chat.pendingUser },
+  }), [chat.pendingUser])
+  const transcriptEntries = useMemo(
+    () => pendingEntry ? [...dedupedEntries, pendingEntry] : dedupedEntries,
+    [dedupedEntries, pendingEntry],
+  )
+
+  // Markdown parsing and wrapping are paid once per entry/terminal width. Keep
+  // the two most recent widths so resize-back does not immediately reparse the
+  // whole visible history, while bounding cache growth during repeated resizes.
+  const rowCache = useRef<WeakMap<AnyEntry, Map<number, ScreenRow[]>>>(new WeakMap())
+  const rowsForEntry = useCallback((entry: AnyEntry): readonly ScreenRow[] => {
+    let widths = rowCache.current.get(entry)
+    if (!widths) {
+      widths = new Map()
+      rowCache.current.set(entry, widths)
+    }
+    const cached = widths.get(terminal.columns)
+    if (cached) return cached
+    const rows = entryScreenRows(viewsForEntry(entry), terminal.columns)
+    if (widths.size >= 2) widths.delete(widths.keys().next().value!)
+    widths.set(terminal.columns, rows)
+    return rows
+  }, [terminal.columns])
+  const rowAccess = useMemo(() => createRowAccess(
+    transcriptEntries,
+    // UUID is stable across SSE history replay; __id is only the local fallback
+    // for entries that do not carry a backend identity (notably the optimistic
+    // pending user row).
+    (entry, index) => String(entry.uuid ?? entry.__id ?? `entry-${index}`),
+    (entry) => rowsForEntry(entry),
+  ), [transcriptEntries, rowsForEntry])
   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
-  const transcriptRows = Math.max(1, viewportRows - composerRows - STATUS_ROWS - activityRows - helpRows - 3)
-  const fitted = useMemo(
-    () => fitTranscript(dedupedEntries, transcriptRows, terminal.columns, scrollBack),
-    [dedupedEntries, transcriptRows, terminal.columns, scrollBack],
+  // Conversation chrome is exactly two rows: compact header + navigation.
+  const transcriptRows = Math.max(1, viewportRows - composerRows - STATUS_ROWS - activityRows - helpRows - 2)
+  const tail = useMemo(() => tailAnchor(rowAccess, transcriptRows), [rowAccess, transcriptRows])
+  const effectiveAnchor = rowAnchor ?? tail
+  const viewport = useMemo(
+    () => sliceViewport(rowAccess, effectiveAnchor, transcriptRows),
+    [rowAccess, effectiveAnchor, transcriptRows],
   )
-  const showWelcome = dedupedEntries.length === 0 && chat.pendingUser === null && scrollBack === 0
-
-  // Keep a history page pinned while new events stream in. At the latest page,
-  // new output continues to auto-follow as usual.
-  const prevLenRef = useRef(dedupedEntries.length)
-  useEffect(() => {
-    const previous = prevLenRef.current
-    const current = dedupedEntries.length
-    prevLenRef.current = current
-    if (current > previous && scrollBack > 0) {
-      setScrollBack(value => value + current - previous)
-    } else if (scrollBack > current) {
-      setScrollBack(current)
-    }
-  }, [dedupedEntries.length, scrollBack])
+  const showWelcome = transcriptEntries.length === 0
+  const pageRows = Math.max(1, transcriptRows - 1)
+
+  const scrollRows = useCallback((deltaRows: number) => {
+    if (deltaRows === 0) return
+    selState.current = null
+    setSel(null)
+    setRowAnchor(previous => {
+      const start = previous ?? tailAnchor(rowAccess, transcriptRows)
+      const next = moveAnchorByRows(rowAccess, start, deltaRows)
+      if (deltaRows > 0 && !sliceViewport(rowAccess, next, transcriptRows).hasNewer) return null
+      return next
+    })
+  }, [rowAccess, transcriptRows])
 
   // Show the model's friendly label (e.g. "GPT-5.6-Sol") in the header/status
   // instead of its opaque key (e.g. "codex:mobiusdefaultaabb").
@@ -170,20 +205,18 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
     // the keypress). configOpen/reconfigOpen/sessionId are read from handlerRef
     // (see above) because Ink keeps the originally-registered callback and would
     // otherwise see a stale closure.
-    if (handlerRef.current.configOpen || handlerRef.current.reconfigOpen) {
+    if (handlerRef.current.configOpen) {
       if (isEscapeKeypress(_input, key)) onConfigCancel(handlerRef.current.sessionId)
       return
     }
-    const step = Math.max(1, fitted.entries.length)
-    if (key.pageUp) setScrollBack(value => Math.min(dedupedEntries.length, value + step))
-    else if (key.pageDown) setScrollBack(value => Math.max(0, value - step))
+    if (handlerRef.current.reconfigOpen) return // ReconfigFlow owns hierarchical Esc navigation.
+    if (key.pageUp) scrollRows(-pageRows)
+    else if (key.pageDown) scrollRows(pageRows)
   }, { interactive: false })
 
-  const olderHint = !showWelcome && (fitted.hiddenOlder > 0 || scrollBack > 0)
-    ? fitted.hiddenOlder > 0
-      ? `↑ 还有 ${fitted.hiddenOlder} 条较早记录 · 滚轮/PageUp 翻页 · 拖动选中文本`
-      : '已到最早记录 · 滚轮/PageDown 翻页 · 拖动选中文本'
-    : null
+  const navigationHint = viewport.hasOlder
+    ? `${viewport.hasNewer ? '↑ 较早内容 · ↓ 较新内容' : '↑ 还有较早内容'} · 滚轮 3 行 · PageUp/PageDown ${pageRows} 行 · 拖动选中文本`
+    : `${viewport.hasNewer ? '已到最早 · ↓ 还有较新内容' : '全部内容'} · 滚轮 3 行 · PageUp/PageDown ${pageRows} 行 · 拖动选中文本`
 
   // Mouse: wheel pages through history in small fixed steps, and a left-button
   // drag selects transcript text (tmux-style: the app owns the mouse, draws its
@@ -195,23 +228,16 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   const [sel, setSel] = useState<{ anchor: SelPoint; end: SelPoint; active: boolean } | null>(null)
   const [copyNotice, setCopyNotice] = useState<string | null>(null)
 
-  // Geometry + text model must mirror the rendered transcript so a screen
-  // (row, col) maps to the right entry/line/char. Recompute with the fitted view.
-  const tipShown = dedupedEntries.length === 0 && chat.pendingUser === null && !showHelp
-  const geometry: TranscriptGeometry = useMemo(() => computeTranscriptGeometry({
-    viewportRows,
-    composerRows,
-    statusRows: STATUS_ROWS,
-    activityRows,
-    helpRows,
-    showWelcome,
-    welcomeRows: 10,
-    olderHintShown: olderHint !== null,
-    tipShown,
-  }), [viewportRows, composerRows, activityRows, helpRows, showWelcome, olderHint, tipShown])
+  // Selection uses the exact virtual rows mounted below. There is no separate
+  // fitting/geometry pass, so hit-testing, rendering and clipboard extraction
+  // cannot disagree about which rows are on screen.
+  const geometry: TranscriptGeometry = useMemo(
+    () => ({ boxTop: 2, boxH: transcriptRows }),
+    [transcriptRows],
+  )
   const transcriptModel: TranscriptModel = useMemo(
-    () => buildTranscriptModel(fitted.entries, terminal.columns),
-    [fitted.entries, terminal.columns],
+    () => ({ entries: viewport.rows.map(item => [item.row.plain]), totalRows: viewport.rows.length }),
+    [viewport.rows],
   )
   const selMap = useMemo(
     () => (sel?.active ? buildSelectionMap(transcriptModel, sel.anchor, sel.end) : null),
@@ -227,25 +253,7 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
 
   useMouseEvents({
     onWheel: (delta) => {
-      if (delta === 0) return
-      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)))
+      scrollRows(delta * -3)
     },
     onPress: (row, col) => {
       const p = screenToSelPoint(row, col, transcriptModel, geometry)
@@ -307,6 +315,7 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
         <ReconfigFlow
           client={client}
           onDone={(result) => onReconfigure(result)}
+          onCancel={() => onConfigCancel(chat.sessionId)}
         />
       </Box>
     )
@@ -325,34 +334,25 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
           ? <WelcomeCard ready={ready} columns={terminal.columns} resumed={Boolean(resumeSessionId)} modelDisplay={modelDisplay} />
           : <CompactHeader ready={ready} sessionId={chat.sessionId} columns={terminal.columns} />}
 
-        {/* Older-records hint is pinned OUTSIDE the flex-end scroll box so it is
-            always the first line of the transcript, spanning the full width,
-            instead of floating mid-screen when the transcript has spare rows. */}
-        {olderHint !== null
-          ? <Box width="100%" flexShrink={0}><Text dimColor wrap="truncate-end">  {olderHint}</Text></Box>
+        {!showWelcome
+          ? <Box width="100%" flexShrink={0}><Text dimColor wrap="truncate-end">  {navigationHint}</Text></Box>
           : null}
 
-        <Box flexGrow={1} flexShrink={1} flexDirection="column" justifyContent={showWelcome || fitted.hiddenOlder > 0 ? 'flex-start' : 'flex-end'} overflowY="hidden">
-          {fitted.peekRows.length > 0
-            ? <Box width="100%" flexShrink={0} flexDirection="column">
-                {fitted.peekRows.map((row, index) => (
-                  <ScreenText
-                    key={`peek-${index}`}
-                    row={row}
-                    text={`${index === 0 ? '  ⋯ ' : '    '}${row.styled}`}
-                  />
-                ))}
-              </Box>
-            : null}
-          {fitted.entries.map((entry, index) => {
-            const entrySel = selMap?.get(index)
-            const key = entry.__id ?? `entry-${fitted.startIndex + index}`
-            return <EntryScreen key={key} entry={entry} columns={terminal.columns} sel={entrySel} />
-          })}
-          {chat.pendingUser !== null ? <UserLine text={chat.pendingUser} /> : null}
-          {fitted.hiddenRecent > 0
-            ? <Box width="100%" flexShrink={0}><Text dimColor wrap="truncate-end">  ↓ 滚轮/PageDown 翻页 · 较新 {fitted.hiddenRecent} 条</Text></Box>
-            : null}
+        <Box
+          height={showWelcome ? undefined : transcriptRows}
+          flexGrow={showWelcome ? 1 : 0}
+          flexShrink={showWelcome ? 1 : 0}
+          flexDirection="column"
+          justifyContent="flex-end"
+          overflowY="hidden"
+        >
+          {!showWelcome ? viewport.rows.map((item, index) => {
+            const range = selMap?.get(index)?.get(0)
+            const text = range && range.start < range.end
+              ? highlightScreenRow(item.row.styled, range.start, range.end)
+              : item.row.styled
+            return <ScreenText key={`${item.entryId}:${item.rowIndex}`} row={item.row} text={text || ' '} />
+          }) : null}
         </Box>
 
         {dedupedEntries.length === 0 && chat.pendingUser === null && !showHelp
@@ -417,7 +417,7 @@ function WelcomeCard({ ready, columns, resumed, modelDisplay }: { ready: ReadySt
         <Text>
           <Text dimColor>{'>_ '}</Text>
           <Text bold>Mobius</Text>
-          <Text dimColor> (v{VERSION})</Text>
+          <Text dimColor> (v{TUI_VERSION})</Text>
         </Text>
         <Text> </Text>
         <MetaRow label="model:" value={modelDisplay} hint="/help 查看命令" labelWidth={labelWidth} />
@@ -452,29 +452,6 @@ function CompactHeader({ ready, sessionId, columns }: { ready: ReadyState; sessi
   )
 }
 
-// Normal and selected transcript rows use the exact same component tree. Mouse
-// motion now changes only ANSI background bytes inside a row; it never swaps a
-// rich Markdown entry for a structurally different plain-text entry, which used
-// to make long/styled messages jump as the selection crossed entry boundaries.
-function EntryScreen({ entry, columns, sel }: {
-  entry: AnyEntry
-  columns: number
-  sel?: Map<number, { start: number; end: number }>
-}) {
-  const rows = entryScreenRows(viewsForEntry(entry), columns)
-  return (
-    <Box flexDirection="column">
-      {rows.map((row, index) => {
-        const range = sel?.get(index)
-        const text = range && range.start < range.end
-          ? highlightScreenRow(row.styled, range.start, range.end)
-          : row.styled
-        return <ScreenText key={index} row={row} text={text || ' '} />
-      })}
-    </Box>
-  )
-}
-
 function ScreenText({ row, text }: { row: ScreenRow; text: string }) {
   const tone = row.tone
   const color = tone === 'tool' ? 'cyan'
@@ -529,13 +506,6 @@ function highlightScreenRow(styled: string, start: number, end: number): string
   return out
 }
 
-function UserLine({ text }: { text: string }) {
-  const lines = text.split('\n')
-  if (lines[0] !== undefined) lines[0] = `› ${lines[0]}`
-  for (let i = 1; i < lines.length; i++) lines[i] = `  ${lines[i]}`
-  return <Box marginTop={1}><Text bold>{lines.join('\n')}</Text></Box>
-}
-
 function WorkingIndicator({ firstQuery }: { firstQuery: boolean }) {
   const startedAt = useRef(Date.now())
   const [animationFrame, setAnimationFrame] = useState(0)
@@ -625,6 +595,13 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
     const { text, cursor: nextCursor } = applyDeleteIntent(valueRef.current, cursorRef.current, intent)
     edit(text, nextCursor)
   })
+  useCursorKeyCapture(true, (intent) => {
+    const current = valueRef.current
+    const at = clampCursor(current, cursorRef.current)
+    const next = intent === 'home' ? 0 : intent === 'end' ? current.length
+      : intent === 'backward-word' ? previousWordBoundary(current, at) : nextWordBoundary(current, at)
+    moveCursor(next)
+  })
 
   const filtered = useMemo(() => {
     const match = /^(\w*)$/.exec(value.slice(1))
@@ -826,6 +803,7 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
       edit(text, nextCursor)
       return
     }
+    if (key.ctrl && (key.leftArrow || key.rightArrow)) return
     if (key.leftArrow) { moveCursor(previousCursorBoundary(current, at)); return }
     if (key.rightArrow) { moveCursor(nextCursorBoundary(current, at)); return }
 
@@ -921,7 +899,7 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
           })}
         </Box>
         <Box justifyContent="space-between">
-          <Text dimColor>{(stdout.columns ?? 80) >= 58 ? 'Enter 发送 · Shift+Enter / Ctrl+J 换行' : 'Enter 发送 · Ctrl+J 换行'}</Text>
+          <Text dimColor>{(stdout.columns ?? 80) >= 72 ? 'Enter 发送 · Shift+Enter / Alt+Enter / Ctrl+J 换行' : 'Enter 发送 · Alt+Enter / Ctrl+J 换行'}</Text>
           <Text dimColor>{wrapped.length > maxRows ? `${visualCursor + 1}/${wrapped.length} 行` : `${wrapped.length} 行`}</Text>
         </Box>
       </Box>
@@ -1104,60 +1082,3 @@ function clickableUrl(url: string, maxLen?: number): string {
 
 // displayWidth is imported from src/lib/screen-text.ts (CJK/emoji-aware), used
 // here to size the AIMUX status block so the web URL truncates exactly.
-
-export function fitTranscript(entries: AnyEntry[], rowBudget: number, columns: number, scrollBack = 0): {
-  entries: AnyEntry[]
-  /** Tail rows of the next older entry, used to fill spare space above the viewport. */
-  peekRows: ScreenRow[]
-  hiddenOlder: number
-  hiddenRecent: number
-  startIndex: number
-} {
-  const tail = Math.max(0, entries.length - scrollBack)
-  const available = tail === 0 ? [] : entries.slice(0, tail)
-  const renderedRows = available.map((entry) => entryScreenRows(viewsForEntry(entry), columns))
-  const fit = (budget: number) => {
-    let rows = 0
-    let first = available.length
-    for (let index = available.length - 1; index >= 0; index--) {
-      const nextRows = renderedRows[index].length
-      if (first < available.length && rows + nextRows > budget) break
-      rows += nextRows
-      first = index
-    }
-    return { first, rows }
-  }
-
-  const base = fit(rowBudget)
-  let fitted = base
-  let first = fitted.first
-  let peekRows: ScreenRow[] = []
-  // When older history exists, guarantee at least one row for the tail of the
-  // next older message. If complete entries exactly consume the budget, refit
-  // them with one fewer row; only the oldest complete entry can drop out, while
-  // the latest content remains visible. A single oversized entry keeps its
-  // original rendering because it cannot safely donate a row.
-  if (first > 0 && fitted.rows <= rowBudget) {
-    if (fitted.rows === rowBudget && rowBudget > 1) {
-      const reduced = fit(rowBudget - 1)
-      if (reduced.first > 0 && reduced.rows <= rowBudget - 1) {
-        fitted = reduced
-        first = reduced.first
-      }
-    }
-    const olderRows = renderedRows[first - 1].slice()
-    while (olderRows.length > 0 && !olderRows[0].plain.trim()) olderRows.shift()
-    while (olderRows.length > 0 && !olderRows[olderRows.length - 1].plain.trim()) olderRows.pop()
-    const spare = rowBudget - fitted.rows
-    if (spare > 0 && olderRows.length > 0) {
-      peekRows = olderRows.slice(-spare)
-    }
-  }
-  return {
-    entries: available.slice(first),
-    peekRows,
-    hiddenOlder: first,
-    hiddenRecent: entries.length - tail,
-    startIndex: first,
-  }
-}