@mobius-os/mobius 0.2.8 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobius-os/mobius",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "type": "module",
   "description": "Mobius terminal client. Reuses Mobius frontend TypeScript types and jsonl entry shapes.",
   "bin": {
@@ -18,6 +18,7 @@
   "dependencies": {
     "chalk": "^5.3.0",
     "cli-highlight": "2.1.11",
+    "extract-zip": "^2.0.1",
     "ink": "5.2.0",
     "marked": "12.0.2",
     "react": "18.3.1",

package/src/aimux.ts

@@ -6,9 +6,11 @@
  * currently authenticated Mobius server.  Nothing is started before login.
  */
 import { spawn, spawnSync, type ChildProcess } from 'node:child_process'
-import { promises as fs, existsSync } from 'node:fs'
+import { promises as fs, existsSync, createWriteStream } from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
+import { Readable } from 'node:stream'
+import extract from 'extract-zip'
 import { mobiusHome } from './config.js'
 
 export type AimuxState = 'starting' | 'connected' | 'failed' | 'stopped' | 'disabled'
@@ -22,6 +24,11 @@ export interface AimuxStatus {
 }
 export interface InstallProgress { phase: 'python' | 'venv' | 'install' | 'ready'; detail?: string }
 
+/** aimux 的调用方式：venv 直接执行，或用内置 python 跑 `-m aimux`（Plan B 兜底）。 */
+export type AimuxLauncher =
+  | { kind: 'exe'; path: string }
+  | { kind: 'module'; python: string }
+
 const AIMUX_PACKAGE = 'aimux'
 const WIN = process.platform === 'win32'
 const venvDir = () => path.join(mobiusHome(), 'aimux-venv')
@@ -76,21 +83,125 @@ async function pythonForAimux(onProgress?: (p: InstallProgress) => void): Promis
   return findPython() ?? installPython(onProgress)
 }
 
-export async function ensureAimux(onProgress?: (p: InstallProgress) => void): Promise<{ ok: boolean; error?: string }> {
-  if (existsSync(aimuxExe()) && existsSync(venvPython())) { onProgress?.({ phase: 'ready' }); return { ok: true } }
+// ── Plan B: 内置 python+aimux 运行时（本地 venv/pip 失败时的离线兜底）─────────
+// 一个 zip 内含完整的 python-build-standalone（自带 ensurepip+pip）+ 预装 aimux；
+// 解压到 ~/.mobius/python-bundle/ 后用 `<python> -m aimux` 运行，彻底绕开宿主机
+// 系统 python（如被精简掉 ensurepip 的容器镜像）。aimux 全部依赖为纯 Python，
+// 故三平台可共用同一套打包产物，分别按 arch 发布到 CDN。
+const BUNDLE_VER = '1'
+const bundleDir = () => path.join(mobiusHome(), 'python-bundle')
+const bundlePython = () => WIN
+  ? path.join(bundleDir(), 'python', 'python.exe')
+  : path.join(bundleDir(), 'python', 'bin', 'python3')
+
+/** 当前平台对应的内置运行时包名；mac-arm64 走 mac-x64（Rosetta 2）。 */
+export function bundleArch(): string | null {
+  const { platform, arch } = process
+  if (platform === 'linux' && arch === 'x64') return 'linux-x64'
+  if (platform === 'win32' && arch === 'x64') return 'win-x64'
+  if (platform === 'darwin' && (arch === 'x64' || arch === 'arm64')) return 'mac-x64'
+  return null
+}
+
+/** CDN 基址可用 MOBIUS_TUI_PYTHON_BUNDLE_URL 覆盖；文件名固定为 mobius-python-<arch>-v<N>.zip。 */
+export const bundleBaseUrl = () => (process.env.MOBIUS_TUI_PYTHON_BUNDLE_URL || 'https://serve.nutshellai.cn/publish/auto/mobius-tui').replace(/\/$/, '')
+export const bundleUrl = (arch: string) => `${bundleBaseUrl()}/mobius-python-${arch}-v${BUNDLE_VER}.zip`
+
+function bundleReady(): boolean {
+  return existsSync(bundlePython()) && spawnSync(bundlePython(), ['-c', 'import aimux'], { stdio: 'ignore', windowsHide: true }).status === 0
+}
+
+async function downloadBundle(arch: string, onProgress?: (p: InstallProgress) => void): Promise<{ ok: boolean; error?: string; zipPath?: string }> {
+  const url = bundleUrl(arch)
+  const zipPath = path.join(mobiusHome(), `python-bundle-v${BUNDLE_VER}.zip.tmp`)
+  await fs.mkdir(path.dirname(zipPath), { recursive: true })   // 首次安装 ~/.mobius 可能尚未创建
+  let res: Response
+  try { res = await fetch(url) } catch (e: any) { return { ok: false, error: `下载失败: ${e?.message ?? e}` } }
+  if (!res.ok) return { ok: false, error: `下载失败: HTTP ${res.status} (${url})` }
+  const total = Number(res.headers.get('content-length') || 0)
+  const ws = createWriteStream(zipPath)
+  let got = 0, last = 0
+  try {
+    const stream = Readable.fromWeb(res.body as any)
+    for await (const chunk of stream) {
+      ws.write(chunk as Buffer)
+      got += (chunk as Buffer).length
+      if (total && got - last > total * 0.03) { last = got; onProgress?.({ phase: 'install', detail: `下载内置运行时 ${Math.round((got / total) * 100)}%` }) }
+    }
+    if (!total && got) onProgress?.({ phase: 'install', detail: `下载内置运行时 ${(got / 1048576).toFixed(0)}MB` })
+    await new Promise<void>((resolve, reject) => { ws.end(() => resolve()); ws.on('error', reject) })
+  } catch (e: any) {
+    try { ws.destroy() } catch {}
+    try { await fs.unlink(zipPath) } catch {}
+    return { ok: false, error: `下载失败: ${e?.message ?? e}` }
+  }
+  return { ok: true, zipPath }
+}
+
+async function extractBundle(zipPath: string): Promise<{ ok: boolean; error?: string }> {
+  const staging = path.join(mobiusHome(), 'python-bundle.new')
+  const finalDir = bundleDir()
+  const stagingPython = WIN ? path.join(staging, 'python', 'python.exe') : path.join(staging, 'python', 'bin', 'python3')
+  await fs.rm(staging, { recursive: true, force: true }).catch(() => {})
+  await fs.mkdir(staging, { recursive: true })
+  try { await extract(zipPath, { dir: staging, defaultDirMode: 0o755, defaultFileMode: 0o644 }) }
+  catch (e: any) { await fs.rm(staging, { recursive: true, force: true }).catch(() => {}); return { ok: false, error: `解压失败: ${e?.message ?? e}` } }
+  if (!WIN) try { await fs.chmod(stagingPython, 0o755) } catch {}   // 保险：确保可执行位（extract-zip 通常已还原）
+  await fs.rm(finalDir, { recursive: true, force: true }).catch(() => {})
+  await fs.rename(staging, finalDir)
+  return { ok: true }
+}
+
+export async function ensureFromBundle(onProgress?: (p: InstallProgress) => void): Promise<{ ok: boolean; error?: string; launcher?: AimuxLauncher }> {
+  if (bundleReady()) return { ok: true, launcher: { kind: 'module', python: bundlePython() } }
+  const arch = bundleArch()
+  if (!arch) return { ok: false, error: `当前平台无内置运行时 (platform=${process.platform} arch=${process.arch})` }
+  onProgress?.({ phase: 'install', detail: `下载内置运行时 (${arch})…` })
+  const dl = await downloadBundle(arch, onProgress)
+  if (!dl.ok || !dl.zipPath) return { ok: false, error: dl.error }
+  onProgress?.({ phase: 'install', detail: '解压内置运行时…' })
+  const ex = await extractBundle(dl.zipPath)
+  try { await fs.unlink(dl.zipPath) } catch {}
+  if (!ex.ok) return { ok: false, error: ex.error }
+  if (!bundleReady()) return { ok: false, error: '内置运行时解压后仍无法 import aimux' }
+  return { ok: true, launcher: { kind: 'module', python: bundlePython() } }
+}
+
+/** 按 launcher 把 aimux 参数变成实际 spawn。 */
+export function spawnLauncher(launcher: AimuxLauncher, args: string[]): ChildProcess {
+  return launcher.kind === 'exe'
+    ? spawn(launcher.path, args, { windowsHide: true })
+    : spawn(launcher.python, ['-m', 'aimux', ...args], { windowsHide: true })
+}
+
+/** test-only 导出: 暴露内部 downloadBundle 以便单测 mock fetch 验证流式下载+进度。 */
+export const downloadBundleForTest = downloadBundle
+
+export async function ensureAimux(onProgress?: (p: InstallProgress) => void): Promise<{ ok: boolean; error?: string; launcher?: AimuxLauncher }> {
+  // Fast-path：venv 里已有 aimux 可执行 → 直接用。
+  if (existsSync(aimuxExe()) && existsSync(venvPython())) { onProgress?.({ phase: 'ready' }); return { ok: true, launcher: { kind: 'exe', path: aimuxExe() } } }
   const py = await pythonForAimux(onProgress)
-  if (!py) return { ok: false, error: '未找到 Python。请先安装 Python 3.10+（或安装 uv 后重试）。' }
-  onProgress?.({ phase: 'venv', detail: `创建 Python 虚拟环境（${py}）…` })
-  let r = await run(py, ['-m', 'venv', venvDir()])
-  if (r.code !== 0 && py === 'py') r = await run(py, ['-3', '-m', 'venv', venvDir()])
-  if (r.code !== 0) return { ok: false, error: `venv 创建失败: ${r.stderr || r.stdout}` }
-  onProgress?.({ phase: 'install', detail: `下载并安装 ${AIMUX_PACKAGE}…` })
-  r = await run(venvPython(), ['-m', 'pip', 'install', '--no-input', '--disable-pip-version-check', AIMUX_PACKAGE], line => {
-    if (/downloading|collecting|installing|using cached|%\s*\d|━|─/i.test(line)) onProgress?.({ phase: 'install', detail: line.slice(0, 120) })
-  })
-  if (r.code !== 0) return { ok: false, error: `pip install 失败: ${r.stderr || r.stdout}` }
-  if (!existsSync(aimuxExe())) return { ok: false, error: `aimux 可执行未生成: ${aimuxExe()}` }
-  onProgress?.({ phase: 'ready' }); return { ok: true }
+  let venvError = '未找到 Python。请先安装 Python 3.10+（或安装 uv 后重试）。'
+  if (py) {
+    onProgress?.({ phase: 'venv', detail: `创建 Python 虚拟环境（${py}）…` })
+    let r = await run(py, ['-m', 'venv', venvDir()])
+    if (r.code !== 0 && py === 'py') r = await run(py, ['-3', '-m', 'venv', venvDir()])
+    if (r.code === 0) {
+      onProgress?.({ phase: 'install', detail: `下载并安装 ${AIMUX_PACKAGE}…` })
+      r = await run(venvPython(), ['-m', 'pip', 'install', '--no-input', '--disable-pip-version-check', AIMUX_PACKAGE], line => {
+        if (/downloading|collecting|installing|using cached|%\s*\d|━|─/i.test(line)) onProgress?.({ phase: 'install', detail: line.slice(0, 120) })
+      })
+      if (r.code === 0 && existsSync(aimuxExe())) { onProgress?.({ phase: 'ready' }); return { ok: true, launcher: { kind: 'exe', path: aimuxExe() } } }
+      venvError = r.code === 0 ? `aimux 可执行未生成: ${aimuxExe()}` : `pip install 失败: ${r.stderr || r.stdout}`
+    } else {
+      venvError = `venv 创建失败: ${r.stderr || r.stdout}`
+    }
+  }
+  // ── Plan B 兜底：本地 python/venv 不可用 → 下载内置 python+aimux 运行时 ──
+  onProgress?.({ phase: 'install', detail: '本地 Python 不可用，改用内置运行时…' })
+  const bundle = await ensureFromBundle(onProgress)
+  if (bundle.ok && bundle.launcher) { onProgress?.({ phase: 'ready' }); return { ok: true, launcher: bundle.launcher } }
+  return { ok: false, error: `${venvError}；内置运行时也失败: ${bundle.error}` }
 }
 
 export function tuiAimuxIdentifier(): string {
@@ -281,8 +392,13 @@ export async function startAimuxConnection(opts: { server: string; token: string
       phase: p.phase === 'ready' ? 'connecting' : p.phase,
       detail: p.detail || (p.phase === 'ready' ? 'AIMUX 已就绪，准备连接…' : p.phase),
     }))
-    if (!ready.ok) { onStatus({ state: 'failed', phase: 'idle', detail: ready.error }); return }
-    supervisor = new AimuxSupervisor({ server: opts.server, token: opts.token, identifier: tuiAimuxIdentifier(), onStatus })
+    if (!ready.ok || !ready.launcher) { onStatus({ state: 'failed', phase: 'idle', detail: ready.error }); return }
+    const identifier = tuiAimuxIdentifier()
+    const launcher = ready.launcher
+    supervisor = new AimuxSupervisor({
+      server: opts.server, token: opts.token, identifier, onStatus,
+      spawnProcess: () => spawnLauncher(launcher, ['reverse', 'connect', `${opts.server.replace(/\/$/, '')}/aimux_bridge`, '--identifier', identifier, '--token', opts.token, '--replace']),
+    })
     supervisor.start()
   })().finally(() => { installing = null })
   await installing

package/src/components/Chat.tsx

@@ -8,11 +8,11 @@
  * 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, Static, Text, useInput, useStdout } from 'ink'
 import { useChat } from '../hooks/useChat.js'
 import { MobiusClient } from '../api.js'
 import { renderMarkdownLines } from '../markdown.js'
-import { viewsForEntry, toolLabel, type EntryView } from '../lib/entry-view.js'
+import { viewsForEntry, dedupeUserEntries, toolLabel, type EntryView } from '../lib/entry-view.js'
 import type { ReadyState } from './PrepScreen.js'
 import type { AnyEntry } from '../types.js'
 import type { AimuxStatus } from '../aimux.js'
@@ -36,7 +36,6 @@ interface TerminalSize {
 }
 
 const VERSION = '0.2.8'
-const CHROME_ROWS = 11
 
 const SLASH_COMMANDS = [
   { cmd: '/clear', desc: '清空当前对话，开启新会话' },
@@ -48,7 +47,6 @@ const SLASH_COMMANDS = [
 export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear, onResume, onQuit, aimuxStatus }: ChatProps) {
   const chat = useChat({ client, ready, resumeSessionId })
   const [showHelp, setShowHelp] = useState(false)
-  const [scrollBack, setScrollBack] = useState(0)
   const [modelLabel, setModelLabel] = useState<string | null>(null)
   const terminal = useTerminalSize()
 
@@ -71,35 +69,19 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
       return
     }
     setShowHelp(false)
-    setScrollBack(0)
     void chat.send(t)
   }, [chat, runSlash])
 
-  const transcriptRows = Math.max(5, terminal.rows - CHROME_ROWS)
-  const fitted = useMemo(
-    () => fitTranscript(chat.entries, transcriptRows, terminal.columns, scrollBack),
-    [chat.entries, transcriptRows, terminal.columns, scrollBack],
-  )
-  // Welcome card is for a truly fresh session only. Once there's any
-  // conversation (or an in-flight user message) it disappears, handing the
-  // compact header + bottom-anchored transcript the full height. Keeping it
-  // while chatting left recent messages stranded mid-screen with a blank gap
-  // above the composer.
-  const showWelcome = chat.entries.length === 0 && chat.pendingUser === null && scrollBack === 0
-
-  // In-app history pager. Ink redraws only the live frame, so the terminal's
-  // own scrollback holds no past turns — older entries are unreachable unless we
-  // page through them here. PageUp/PageDown move the viewport back/forward over
-  // the transcript. While reading history (scrollBack > 0) we keep the view
-  // pinned as new entries stream in; sending a message (onSubmit above) snaps
-  // back to the latest so the conversation auto-follows again.
-  const prevLenRef = useRef(chat.entries.length)
-  useEffect(() => {
-    const prev = prevLenRef.current
-    const cur = chat.entries.length
-    prevLenRef.current = cur
-    if (cur > prev && scrollBack > 0) setScrollBack(s => s + (cur - prev))
-  }, [chat.entries.length, scrollBack])
+  // Welcome card is for a truly fresh session only — once there's any
+  // conversation (or an in-flight message) it disappears. The transcript then
+  // streams into <Static> below and accumulates into the terminal scrollback
+  // (the terminal's own scrollback holds history; no in-app pager needed).
+  const showWelcome = chat.entries.length === 0 && chat.pendingUser === null
+
+  // 用户输入去重 (对齐 web viewer/rounds.ts buildRounds): codex 同一提问的 3 形态
+  // (type:user / response_item.message[user] / event_msg.user_message) 合并成 1 条,
+  // 避免在累积视图里把同一条提问显示多次.
+  const dedupedEntries = useMemo(() => dedupeUserEntries(chat.entries), [chat.entries])
 
   // 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").
@@ -114,50 +96,30 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   }, [client, ready.prefs.model])
   const modelDisplay = modelLabel ?? ready.prefs.model ?? 'default'
 
-  useInput((_input, key) => {
-    // The composer ignores pageUp/pageDown, so binding them here can't clash
-    // with text entry, history navigation, or the slash-command popup.
-    const step = Math.max(1, fitted.entries.length)
-    if (key.pageUp) setScrollBack(s => Math.min(chat.entries.length, s + step))
-    else if (key.pageDown) setScrollBack(s => Math.max(0, s - step))
-  })
-
   return (
-    <Box
-      flexDirection="column"
-      width={terminal.isTty ? terminal.columns : undefined}
-      height={terminal.isTty ? Math.max(16, terminal.rows - 1) : undefined}
-      paddingX={1}
-      overflowY="hidden"
-    >
-      <Box flexDirection="column" flexGrow={1} overflowY="hidden">
-        {showWelcome
-          ? <WelcomeCard ready={ready} columns={terminal.columns} resumed={Boolean(resumeSessionId)} modelDisplay={modelDisplay} />
-          : <CompactHeader ready={ready} sessionId={chat.sessionId} />}
-
-        <Box flexGrow={1} flexDirection="column" justifyContent={showWelcome ? 'flex-start' : 'flex-end'} overflowY="hidden">
-          {fitted.hiddenOlder > 0 || scrollBack > 0
-            ? <Text dimColor>  ↑ {fitted.hiddenOlder > 0 ? `还有 ${fitted.hiddenOlder} 条较早记录 · PageUp 向上翻页` : '已到最早记录 · PageDown 向下翻页'}</Text>
-            : null}
-          {fitted.entries.map((entry, index) => (
-            <EntryBlock key={entry.__id ?? `entry-${index}`} entry={entry} />
-          ))}
-          {chat.pendingUser !== null ? <UserLine text={chat.pendingUser} /> : null}
-          {fitted.hiddenRecent > 0
-            ? <Text dimColor>  ↓ PageDown 向下翻页 · 较新 {fitted.hiddenRecent} 条</Text>
-            : null}
-        </Box>
-
-        {chat.entries.length === 0 && chat.pendingUser === null && !showHelp
-          ? <Box marginTop={1}><Text dimColor>输入问题开始协作，或输入 <Text color="cyan">/</Text> 查看命令。</Text></Box>
-          : null}
+    <Box flexDirection="column" width={terminal.isTty ? terminal.columns : undefined} paddingX={1}>
+      {showWelcome ? (
+        <WelcomeCard ready={ready} columns={terminal.columns} resumed={Boolean(resumeSessionId)} modelDisplay={modelDisplay} />
+      ) : null}
 
-        {showHelp ? <HelpBlock commands={SLASH_COMMANDS} /> : null}
-      </Box>
+      {/* <Static> 累积输出: 每个 entry 永久打印进终端 scrollback, 不参与动态重绘.
+          新 entry 只追加打印, 历史靠终端自身滚动, 不再需要 in-app 翻页/视窗裁剪. */}
+      <Static items={dedupedEntries}>
+        {(entry, index) => (
+          <EntryAccum key={entry.__id ?? `e${index}`} entry={entry} columns={terminal.columns} />
+        )}
+      </Static>
 
+      {chat.pendingUser !== null ? <UserLine text={chat.pendingUser} /> : null}
       {chat.typing ? <WorkingIndicator /> : null}
       {chat.error ? <Text color="red">⚠ {chat.error}</Text> : null}
 
+      {chat.entries.length === 0 && chat.pendingUser === null && !showHelp
+        ? <Box marginTop={1}><Text dimColor>输入问题开始协作，或输入 <Text color="cyan">/</Text> 查看命令。</Text></Box>
+        : null}
+
+      {showHelp ? <HelpBlock commands={SLASH_COMMANDS} /> : null}
+
       <Composer
         onSubmit={onSubmit}
         onStop={chat.stop}
@@ -230,25 +192,17 @@ function MetaRow({ label, value, hint, labelWidth }: { label: string; value: str
   )
 }
 
-function CompactHeader({ ready, sessionId }: { ready: ReadyState; sessionId: string | null }) {
-  return (
-    <Box justifyContent="space-between">
-      <Text bold><Text dimColor>{'>_ '}</Text>Mobius</Text>
-      <Text dimColor>{ready.project.name} › {ready.issue.title}{sessionId ? ` · ${sessionId.slice(0, 8)}` : ''}</Text>
-    </Box>
-  )
-}
-
-function EntryBlock({ entry }: { entry: AnyEntry }) {
+function EntryAccum({ entry, columns }: { entry: AnyEntry; columns: number }) {
   const views = viewsForEntry(entry)
   return (
     <Box flexDirection="column">
-      {views.map((view, index) => <ViewLine key={index} view={view} />)}
+      {views.map((view, index) => <ViewLine key={index} view={view} columns={columns} />)}
     </Box>
   )
 }
 
-function ViewLine({ view }: { view: EntryView }) {
+function ViewLine({ view, columns }: { view: EntryView; columns: number }) {
+  const width = Math.max(20, columns - 4)
   switch (view.kind) {
     case 'skip':
       return null
@@ -266,30 +220,124 @@ function ViewLine({ view }: { view: EntryView }) {
         </Box>
       )
     }
-    case 'tool_call':
+    case 'tool_call': {
+      // compact (≤2 行): 命令行 + 可选结果行 (已与 tool_result 合并).
+      const head = clampLines(`${toolLabel(view.toolName)} ${view.summary}`.trim(), width - 2, 1)[0]
       return (
-        <Text>
-          <Text color="cyan">• {toolLabel(view.toolName)}</Text>
-          {view.summary ? <Text dimColor>  {view.summary}</Text> : null}
-        </Text>
+        <Box marginTop={1} flexDirection="column">
+          <Text color="cyan">• {head}</Text>
+          {view.result ? (
+            <Text dimColor color={view.result.isError ? 'red' : undefined}>
+              {'  └ '}{clampLines(view.result.text, width - 4, 1)[0] || '(无输出)'}
+            </Text>
+          ) : null}
+        </Box>
       )
-    case 'tool_result':
+    }
+    case 'tool_result': {
+      // codex 式 head+ellipsis+tail (output_max_lines=5): tool 结果保留头尾,
+      // 中间省略行数; DIM 样式 + └/缩进前缀 (对齐 codex exec_cell/render.rs).
+      const lines = headTailLines(view.text, width - 4, 5)
       return (
-        <Text dimColor color={view.isError ? 'red' : undefined}>
-          {'  └ '}{view.summary || '(无输出)'}
-        </Text>
+        <Box flexDirection="column">
+          {lines.map((l, i) => (
+            <Text key={i} dimColor color={view.isError ? 'red' : undefined}>{i === 0 ? '  └ ' : '    '}{l}</Text>
+          ))}
+        </Box>
+      )
+    }
+    case 'code_edit':
+      return <CodeEditView view={view} />
+    case 'write_file':
+      return <WriteFileView view={view} />
+    case 'reasoning': {
+      const lines = clampLines(view.text, width - 4, 2)
+      return (
+        <Box marginTop={1} flexDirection="column">
+          {lines.map((line, i) => (
+            <Text key={i} dimColor color="magenta">{i === 0 ? '  ◇ ' : '    '}{line}</Text>
+          ))}
+        </Box>
       )
-    case 'reasoning':
-      return <Text dimColor color="magenta">  ◇ {view.text}</Text>
+    }
     case 'system':
-      return <Text dimColor color="yellow">  {view.text}</Text>
+      return <Text dimColor color="yellow">  {clampLines(view.text, width - 2, 2)[0]}</Text>
     case 'error':
-      return <Text color="red">⚠ {view.text}</Text>
+      return (
+        <Box marginTop={1} flexDirection="column">
+          {view.text.split('\n').map((line, i) => (
+            <Text key={i} color="red">{i === 0 ? '⚠ ' : '  '}{line}</Text>
+          ))}
+        </Box>
+      )
     default:
       return null
   }
 }
 
+// 代码修改 (Edit/StrReplace/apply_patch) — full: 完整展示 old(−)/new(+) 改动原文.
+function CodeEditView({ view }: { view: { filePath: string; oldString: string; newString: string } }) {
+  return (
+    <Box marginTop={1} flexDirection="column">
+      <Text color="magenta">✎ 编辑 {view.filePath || '(未指定文件)'}</Text>
+      {view.oldString ? view.oldString.split('\n').map((line, i) => (
+        <Text key={`o${i}`} color="red">{'  − '}{line}</Text>
+      )) : null}
+      {view.newString ? view.newString.split('\n').map((line, i) => (
+        <Text key={`n${i}`} color="green">{'  + '}{line}</Text>
+      )) : null}
+    </Box>
+  )
+}
+
+// 文件写入 (Write/create_file) — full: 完整展示写入内容原文.
+function WriteFileView({ view }: { view: { filePath: string; content: string } }) {
+  return (
+    <Box marginTop={1} flexDirection="column">
+      <Text color="magenta">✎ 写入 {view.filePath || '(未指定文件)'}</Text>
+      {view.content.split('\n').map((line, i) => (
+        <Text key={i} color="green">{'  + '}{line}</Text>
+      ))}
+    </Box>
+  )
+}
+
+// 把文本按宽度硬切成最多 maxLines 行 (超出则在末行加 …), 用于 compact 类的 ≤2 行硬约束.
+function clampLines(text: string, width: number, maxLines: number): string[] {
+  if (!text) return ['']
+  const paras = text.replace(/\r\n/g, '\n').split('\n')
+  const wrapped: string[] = []
+  for (const para of paras) {
+    if (para === '') { wrapped.push(''); continue }
+    for (let i = 0; i < para.length; i += width) wrapped.push(para.slice(i, i + width))
+  }
+  if (wrapped.length <= maxLines) return wrapped
+  const trimmed = wrapped.slice(0, maxLines)
+  const last = trimmed[maxLines - 1]
+  trimmed[maxLines - 1] = last.length >= width ? last.slice(0, width - 1) + '…' : last + '…'
+  return trimmed
+}
+
+// codex 式 head + ellipsis + tail 截断 (参考 codex-rs/tui/src/exec_cell/render.rs
+// 的 truncate_lines_middle): 保留输出头尾, 中间省略并报告省略行数. 长输出既能看
+// 到结论 (成功/失败常在尾), 又不刷屏. maxLines 含省略行 (如 5 = 头2 + 省1 + 尾2).
+function headTailLines(text: string, width: number, maxLines: number): string[] {
+  if (!text) return ['']
+  const paras = text.replace(/\r\n/g, '\n').split('\n')
+  const wrapped: string[] = []
+  for (const para of paras) {
+    if (para === '') { wrapped.push(''); continue }
+    for (let i = 0; i < para.length; i += width) wrapped.push(para.slice(i, i + width))
+  }
+  if (wrapped.length <= maxLines) return wrapped.slice(0, maxLines)
+  const budget = maxLines - 1 // 留 1 行给省略标记
+  const head = Math.max(1, Math.ceil(budget / 2))
+  const tail = Math.max(1, budget - head)
+  const omitted = wrapped.length - head - tail
+  if (omitted <= 0) return wrapped.slice(0, maxLines)
+  return [...wrapped.slice(0, head), `… +${omitted} 行`, ...wrapped.slice(wrapped.length - tail)]
+}
+
 function UserLine({ text }: { text: string }) {
   const lines = text.split('\n')
   if (lines[0] !== undefined) lines[0] = `› ${lines[0]}`
@@ -535,43 +583,5 @@ function clickableUrl(url: string): string {
   return `\u001B]8;;${url}\u0007${url}\u001B]8;;\u0007`
 }
 
-function wrappedRows(text: string, columns: number): number {
-  const width = Math.max(20, columns - 6)
-  return text.split('\n').reduce((sum, line) => sum + Math.max(1, Math.ceil(line.length / width)), 0)
-}
-
-function entryRows(entry: AnyEntry, columns: number): number {
-  return viewsForEntry(entry).reduce((sum, view) => {
-    if (view.kind === 'skip') return sum
-    if (view.kind === 'tool_call') return sum + wrappedRows(`${toolLabel(view.toolName)} ${view.summary}`, columns)
-    if (view.kind === 'tool_result') return sum + wrappedRows(view.summary, columns)
-    return sum + wrappedRows(view.text, columns) + (view.kind === 'user' || view.kind === 'assistant' ? 1 : 0)
-  }, 0)
-}
-
-function fitTranscript(entries: AnyEntry[], rowBudget: number, columns: number, scrollBack = 0): {
-  entries: AnyEntry[]
-  hiddenOlder: number
-  hiddenRecent: number
-  estimatedRows: number
-} {
-  // `scrollBack` = how many of the most-recent entries are paged out of view
-  // below the viewport (the user pressed PageUp). The visible window is then
-  // fit from the tail of what remains, backward, until the row budget is full.
-  const tail = Math.max(0, entries.length - scrollBack)
-  const avail = tail === 0 ? [] : entries.slice(0, tail)
-  let rows = 0
-  let first = avail.length
-  for (let index = avail.length - 1; index >= 0; index--) {
-    const nextRows = entryRows(avail[index], columns)
-    if (first < avail.length && rows + nextRows > rowBudget) break
-    rows += nextRows
-    first = index
-  }
-  return {
-    entries: avail.slice(first),
-    hiddenOlder: first,                       // entries older than the viewport
-    hiddenRecent: entries.length - tail,      // == scrollBack: entries newer than the viewport
-    estimatedRows: rows,
-  }
-}
+// (fitTranscript / blockRows / wrappedRows 视窗裁剪 + in-app 翻页逻辑已移除:
+//  transcript 现由 <Static> 累积进终端 scrollback, 历史靠终端自身滚动.)

package/src/lib/entry-view.ts

@@ -1,28 +1,53 @@
 /**
- * jsonl entry → renderable view.
+ * jsonl entry → renderable view (TUI).
  *
- * The pure helpers (assistantResponseText / assistantEntryText / entryUserText
- * and the "hidden noise" predicates) are copied from the mobius web frontend's
- * frontend/src/components/viewer/entry-classify.ts. The frontend's full
- * entry-extract.ts (diff/plan machinery) is far heavier than a chat TUI needs,
- * so instead we project each entry into a small EntryView union that the
- * Transcript renders — handling BOTH the Claude SDK entry shape (type:
- * 'user'|'assistant'|'system', message.content[]) and both Codex SDK shapes
- * (function_call/function_call_output and custom_tool_call/custom_tool_call_output).
+ * 对齐 mobius web viewer (frontend/src/components/viewer/) 的过滤/合并/折叠思想,
+ * 但适配终端线性渲染 (无卡片点击展开):
+ *   - 隐藏: 对齐 web entry-classify.ts isHiddenJsonlNoiseEntry 的 7 类噪声.
+ *   - 合并: tool_use + 其 tool_result 按 call_id 配对成一个 block (借鉴 web
+ *     mergeBashToolResultItems, 简化版), 命令与结果不再分两行.
+ *   - 折叠/展开分流: web 用卡片 open state + 点击展开; TUI 改成 —— web 默认"折叠"
+ *     的卡 (普通命令/Read/reasoning/system) 压成 ≤2 行摘要 (见 Chat.tsx clampLines),
+ *     "展开"的卡 (assistant 文本/代码修改/error) 完整展示.
+ *   - 不引入 web entry-extract.ts 的重机器 (diff/plan 卡片渲染); 代码修改只完整
+ *     显示 old_str→new_str / content 原文, 不渲染红绿 diff.
+ *
+ * 同时处理 Claude SDK entry 形态 (type:'user'|'assistant'|'system', message.content[])
+ * 与两种 Codex SDK 形态 (function_call/function_call_output 和
+ * custom_tool_call/custom_tool_call_output).
  */
 import type { AnyEntry } from '../types.js'
 
+// compact (≤2 行): tool_call / reasoning / system
+// full (完整):     user / assistant / code_edit / write_file / error
 export type EntryView =
   | { kind: 'skip' }
   | { kind: 'user'; text: string }
   | { kind: 'assistant'; text: string }
   | { kind: 'reasoning'; text: string }
-  | { kind: 'tool_call'; toolName: string; summary: string }
-  | { kind: 'tool_result'; summary: string; isError: boolean }
+  | { kind: 'tool_call'; toolName: string; summary: string; result?: ToolResultView }
+  | { kind: 'tool_result'; text: string; isError: boolean }
+  | { kind: 'code_edit'; filePath: string; oldString: string; newString: string }
+  | { kind: 'write_file'; filePath: string; content: string }
   | { kind: 'system'; text: string }
   | { kind: 'error'; text: string }
 
-// ── copied verbatim from frontend entry-classify.ts ──────────────────────────
+export interface ToolResultView {
+  text: string
+  isError: boolean
+}
+
+/**
+ * 配对合并后的渲染单元. mergeToolCalls 把 entries 序列合并:
+ *   - tool_use entry → 'tool' block, 带上按 call_id 配对到的 result.
+ *   - 纯 tool_result entry (内容已并入发起方) → 丢弃.
+ *   - 其余 entry → 'entry' block.
+ */
+export type Block =
+  | { kind: 'entry'; entry: AnyEntry }
+  | { kind: 'tool'; entry: AnyEntry; results: Map<string, ToolResultView> }
+
+// ── copied verbatim from frontend entry-classify.ts (文本抽取) ──────────────
 export function assistantResponseText(content: any): string {
   if (typeof content === 'string') return content
   if (!Array.isArray(content)) return ''
@@ -62,13 +87,24 @@ function entryUserText(entry: AnyEntry): string {
 
 const ENV_CONTEXT_RE = /<environment_context\b[^>]*>[\s\S]*?<\/environment_context>/gi
 
-// Noise entries that carry no conversational value (system injections / metadata).
+/**
+ * 整卡隐藏的噪声: 对齐 web entry-classify.ts isHiddenJsonlNoiseEntry 的 7 类
+ *   - token_count         : codex 每轮 token 用量统计 (event_msg)
+ *   - environment_context : codex 每轮注入的 <environment_context> 纯系统 user 消息
+ *   - session_meta        : codex 会话首条元数据
+ *   - turn_context        : codex 每轮注入的本轮上下文元数据
+ *   - turn_duration       : Claude Code 每轮结束注入的 system 耗时统计
+ *   - skill_listing       : Claude Code 注入的可用 Skill 清单
+ *   - agent_listing_delta : Claude Code 注入的可用 subagent 清单
+ * 注: context_compacted 不在此列 (对齐 web — 它保留为可见事件, TUI 显示成 system 行).
+ */
 export function isHiddenNoise(entry: AnyEntry): boolean {
-  if (entry?.type === 'event_msg' && (entry?.payload?.type === 'token_count' || entry?.payload?.type === 'context_compacted')) return true
+  if (entry?.type === 'event_msg' && entry?.payload?.type === 'token_count') return true
   if (entry?.type === 'session_meta') return true
+  if (entry?.type === 'turn_context') return true
   if (entry?.type === 'system' && entry?.subtype === 'turn_duration') return true
   if (entry?.type === 'attachment' && (entry?.attachment?.type === 'skill_listing' || entry?.attachment?.type === 'agent_listing_delta')) return true
-  // pure <environment_context> injection
+  // 纯 <environment_context> 注入: 剥掉后无任何人类提问文本才隐藏.
   const t = entryUserText(entry)
   if (t) {
     const stripped = t.replace(ENV_CONTEXT_RE, '')
@@ -77,7 +113,176 @@ export function isHiddenNoise(entry: AnyEntry): boolean {
   return false
 }
 
-// ── TUI-side projection ──────────────────────────────────────────────────────
+// ── 字段提取 (轻量版, 不引入 web entry-extract.ts 重机器) ───────────────────
+const EDIT_NAMES = ['Edit', 'edit_file', 'StrReplace', 'str_replace', 'apply_patch']
+const WRITE_NAMES = ['Write', 'write_file', 'create_file']
+
+function pickString(input: any, keys: string[]): string {
+  if (!input || typeof input !== 'object') return ''
+  for (const k of keys) {
+    const v = input[k]
+    if (typeof v === 'string') return v
+  }
+  return ''
+}
+
+/** Edit 代码修改: Claude tool_use.old_string/new_string, 或 Codex patch_apply_end.unified_diff. */
+function extractEdit(entry: AnyEntry): { filePath: string; oldString: string; newString: string } | null {
+  if (entry?.type === 'assistant') {
+    const c = entry?.message?.content
+    if (Array.isArray(c)) {
+      for (const b of c) {
+        if (b?.type !== 'tool_use') continue
+        const name = typeof b.name === 'string' ? b.name : ''
+        if (!EDIT_NAMES.includes(name)) continue
+        const input = b.input && typeof b.input === 'object' ? b.input : {}
+        const oldS = pickString(input, ['old_string', 'old_str'])
+        const newS = pickString(input, ['new_string', 'new_str'])
+        const fp = pickString(input, ['file_path', 'path'])
+        if (oldS || newS) return { filePath: fp, oldString: oldS, newString: newS }
+      }
+    }
+  }
+  // Codex: event_msg patch_apply_end.changes[path].unified_diff (作为 newString 完整展示).
+  if (entry?.type === 'event_msg' && entry?.payload?.type === 'patch_apply_end') {
+    const changes = entry?.payload?.changes
+    if (changes && typeof changes === 'object' && !Array.isArray(changes)) {
+      for (const [fp, ch] of Object.entries(changes as any)) {
+        const diff = (ch as any)?.unified_diff
+        if (typeof diff === 'string' && diff.trim()) return { filePath: fp, oldString: '', newString: diff }
+      }
+    }
+  }
+  return null
+}
+
+/** Write 文件写入: tool_use.file_path + content (Claude / Codex). */
+function extractWrite(entry: AnyEntry): { filePath: string; content: string } | null {
+  const fromInput = (input: any): { filePath: string; content: string } | null => {
+    const fp = pickString(input, ['file_path', 'path', 'filePath'])
+    const content = pickString(input, ['content'])
+    if (!fp || !content) return null
+    return { filePath: fp, content }
+  }
+  if (entry?.type === 'assistant') {
+    const c = entry?.message?.content
+    if (Array.isArray(c)) {
+      for (const b of c) {
+        if (b?.type !== 'tool_use') continue
+        const name = typeof b.name === 'string' ? b.name : ''
+        if (!WRITE_NAMES.includes(name)) continue
+        const r = fromInput(b.input)
+        if (r) return r
+      }
+    }
+  }
+  if (entry?.type === 'response_item') {
+    const p = entry.payload
+    if ((p?.type === 'function_call' || p?.type === 'custom_tool_call') && WRITE_NAMES.includes(p?.name)) {
+      let input = p?.input
+      if (typeof input === 'string') { try { input = JSON.parse(input) } catch { input = null } }
+      return fromInput(input)
+    }
+  }
+  return null
+}
+
+// 提取 entry 内所有 tool_use 的 call_id (Claude tool_use.id / Codex function_call.call_id).
+function extractToolUseIds(entry: AnyEntry): string[] {
+  const ids: string[] = []
+  if (entry?.type === 'assistant') {
+    const c = entry?.message?.content
+    if (Array.isArray(c)) {
+      for (const b of c) {
+        if (b?.type === 'tool_use' && typeof b.id === 'string') ids.push(b.id)
+      }
+    }
+  }
+  if (entry?.type === 'response_item') {
+    const p = entry.payload
+    if ((p?.type === 'function_call' || p?.type === 'custom_tool_call') && typeof p?.call_id === 'string') ids.push(p.call_id)
+  }
+  return ids
+}
+
+// 提取 entry 内所有 tool_result 记录 (Claude user.tool_result / Codex function_call_output).
+function extractToolResults(entry: AnyEntry): Array<ToolResultView & { toolUseId?: string }> {
+  const out: Array<ToolResultView & { toolUseId?: string }> = []
+  if (entry?.type === 'user') {
+    const c = entry?.message?.content
+    if (Array.isArray(c)) {
+      for (const b of c) {
+        if (b?.type !== 'tool_result') continue
+        const { text, isError } = extractToolResult(b)
+        out.push({ text, isError, toolUseId: typeof b.tool_use_id === 'string' ? b.tool_use_id : undefined })
+      }
+    }
+  }
+  if (entry?.type === 'response_item') {
+    const p = entry.payload
+    if (p?.type === 'function_call_output' || p?.type === 'custom_tool_call_output') {
+      const { text } = extractToolResult({ content: p?.output, is_error: false })
+      out.push({ text, isError: p?.status === 'failed' || p?.is_error === true, toolUseId: typeof p?.call_id === 'string' ? p.call_id : undefined })
+    }
+  }
+  return out
+}
+
+function isPureToolResultEntry(entry: AnyEntry): boolean {
+  if (entry?.type === 'response_item') {
+    const p = entry.payload
+    return p?.type === 'function_call_output' || p?.type === 'custom_tool_call_output'
+  }
+  if (entry?.type !== 'user') return false
+  const c = entry?.message?.content
+  return Array.isArray(c) && c.length > 0 && c.every((b: any) => b?.type === 'tool_result')
+}
+
+/**
+ * 把 entries 序列合并成 Block 序列: tool_use 按 call_id 配对其 tool_result,
+ * 纯 tool_result entry (已并入发起方) 丢弃. 返回的 Block 序列与卡片渲染同序.
+ */
+export function mergeToolCalls(entries: AnyEntry[]): Block[] {
+  // call_id → tool_use 发起方 entry 的下标.
+  const useIndexById = new Map<string, number>()
+  entries.forEach((entry, index) => {
+    for (const id of extractToolUseIds(entry)) {
+      if (!useIndexById.has(id)) useIndexById.set(id, index)
+    }
+  })
+
+  // tool_use entry 下标 → (call_id → result).
+  const resultsByUseIndex = new Map<number, Map<string, ToolResultView>>()
+  const pureResultIndexes = new Set<number>()
+  entries.forEach((entry, index) => {
+    const records = extractToolResults(entry)
+    if (records.length === 0) return
+    let matched = 0
+    for (const r of records) {
+      const useIdx = r.toolUseId ? useIndexById.get(r.toolUseId) : undefined
+      if (useIdx == null) continue
+      const m = resultsByUseIndex.get(useIdx) || new Map<string, ToolResultView>()
+      m.set(r.toolUseId!, { text: r.text, isError: r.isError })
+      resultsByUseIndex.set(useIdx, m)
+      matched += 1
+    }
+    // 该 entry 是纯 tool_result 且全部配对成功 → 整条丢弃 (内容已并入发起方).
+    if (matched > 0 && matched === records.length && isPureToolResultEntry(entry)) pureResultIndexes.add(index)
+  })
+
+  const out: Block[] = []
+  entries.forEach((entry, index) => {
+    if (pureResultIndexes.has(index)) return
+    if (extractToolUseIds(entry).length > 0) {
+      out.push({ kind: 'tool', entry, results: resultsByUseIndex.get(index) || new Map<string, ToolResultView>() })
+    } else {
+      out.push({ kind: 'entry', entry })
+    }
+  })
+  return out
+}
+
+// ── TUI-side projection ─────────────────────────────────────────────────────
 function truncate(s: string, n: number): string {
   const one = s.replace(/\s+/g, ' ').trim()
   return one.length > n ? one.slice(0, n - 1) + '…' : one
@@ -157,6 +362,7 @@ function extractToolResult(content: any): { text: string; isError: boolean } {
 const TOOL_LABEL: Record<string, string> = {
   Bash: '运行命令', bash: '运行命令', shell: '运行命令', exec: '运行命令',
   exec_command: '运行命令', shell_command: '运行命令', run_terminal_cmd: '运行命令',
+  result: '结果',
   write_stdin: '输入命令',
   Read: '读取文件', read_file: '读取文件',
   Write: '写入文件', write_file: '写入文件', create_file: '创建文件',
@@ -240,8 +446,9 @@ function parseCustomToolCall(raw: any): { name: string; input: Record<string, an
   return { name: call[1], input }
 }
 
-/** Project one entry into zero or more renderable views. */
-export function viewsForEntry(entry: AnyEntry): EntryView[] {
+/** Project one block into zero or more renderable views. */
+export function viewsForBlock(block: Block): EntryView[] {
+  const entry = block.entry
   if (!entry || typeof entry !== 'object') return [{ kind: 'skip' }]
   if (isHiddenNoise(entry)) return [{ kind: 'skip' }]
   const type = entry.type
@@ -257,20 +464,42 @@ export function viewsForEntry(entry: AnyEntry): EntryView[] {
     const textParts: string[] = []
     const thinkingParts: string[] = []
     let hasThinking = false
+    const flushText = () => {
+      if (textParts.length) { out.push({ kind: 'assistant', text: textParts.join('\n') }); textParts.length = 0 }
+    }
     for (const b of content) {
       if (!b) continue
       if (b.type === 'text' || b.type === 'output_text') {
         if (b.text) textParts.push(b.text)
       } else if (b.type === 'tool_use') {
-        if (textParts.length) { out.push({ kind: 'assistant', text: textParts.join('\n') }); textParts.length = 0 }
-        out.push({ kind: 'tool_call', toolName: b.name, summary: summarizeToolInput(b.name, b.input) })
+        const name = typeof b.name === 'string' ? b.name : ''
+        const input = b.input && typeof b.input === 'object' ? b.input : {}
+        if (EDIT_NAMES.includes(name)) {
+          // 代码修改 → full (完整展示 old→new)
+          flushText()
+          out.push({
+            kind: 'code_edit',
+            filePath: pickString(input, ['file_path', 'path']),
+            oldString: pickString(input, ['old_string', 'old_str']),
+            newString: pickString(input, ['new_string', 'new_str']),
+          })
+        } else if (WRITE_NAMES.includes(name)) {
+          // 文件写入 → full (完整展示 content)
+          flushText()
+          out.push({ kind: 'write_file', filePath: pickString(input, ['file_path', 'path', 'filePath']), content: pickString(input, ['content']) })
+        } else {
+          // 普通工具 → compact (带配对的 result)
+          flushText()
+          const id = typeof b.id === 'string' ? b.id : ''
+          const result = block.kind === 'tool' && id ? block.results.get(id) : undefined
+          out.push({ kind: 'tool_call', toolName: name, summary: summarizeToolInput(name, b.input), result })
+        }
       } else if (b.type === 'thinking') {
-        // model reasoning — shown like the web viewer (encrypted/empty thinking → fallback label)
         hasThinking = true
         if (typeof b.thinking === 'string' && b.thinking) thinkingParts.push(b.thinking)
       }
     }
-    if (textParts.length) out.push({ kind: 'assistant', text: textParts.join('\n') })
+    flushText()
     if (thinkingParts.length) out.push({ kind: 'reasoning', text: thinkingParts.join('\n').trim() })
     else if (hasThinking) out.push({ kind: 'reasoning', text: '思考内容被隐藏' })
     return out.length ? out : [{ kind: 'skip' }]
@@ -278,25 +507,24 @@ export function viewsForEntry(entry: AnyEntry): EntryView[] {
 
   if (type === 'user') {
     const content = entry.message?.content
-    // tool_result wrapper (assistant's tool output fed back)
+    // tool_result wrapper (assistant's tool output fed back).
     if (Array.isArray(content) && content.some((b: any) => b?.type === 'tool_result')) {
       const out: EntryView[] = []
       for (const b of content) {
         if (b?.type === 'tool_result') {
           const { text, isError } = extractToolResult(b)
-          out.push({ kind: 'tool_result', summary: truncate(text, 160), isError })
+          out.push({ kind: 'tool_result', text, isError })
         }
       }
       return out
     }
     const text = entryUserText(entry)
-    return text ? [{ kind: 'user', text }] : [{ kind: 'skip' }]
+    return text ? [{ kind: 'user', text: stripUserFraming(text) }] : [{ kind: 'skip' }]
   }
 
   if (type === 'system') {
-    const subtype = entry.subtype
-    if (subtype === 'init') return [{ kind: 'skip' }]
-    const text = entry.content || entry.message?.content || subtype
+    if (entry.subtype === 'init') return [{ kind: 'skip' }]
+    const text = entry.content || entry.message?.content || entry.subtype
     return text ? [{ kind: 'system', text: truncate(typeof text === 'string' ? text : JSON.stringify(text), 160) }] : [{ kind: 'skip' }]
   }
 
@@ -307,7 +535,7 @@ export function viewsForEntry(entry: AnyEntry): EntryView[] {
     if (p.type === 'message') {
       const text = assistantResponseText(p.content)
       if (!text) return [{ kind: 'skip' }]
-      return [{ kind: p.role === 'user' ? 'user' : 'assistant', text }]
+      return [{ kind: p.role === 'user' ? 'user' : 'assistant', text: p.role === 'user' ? stripUserFraming(text) : text }]
     }
     if (p.type === 'reasoning') {
       const enc = p.encrypted_content
@@ -316,23 +544,25 @@ export function viewsForEntry(entry: AnyEntry): EntryView[] {
         : (reasoningSummaryText(p) || 'reasoning')
       return [{ kind: 'reasoning', text }]
     }
-    if (p.type === 'function_call') {
+    if (p.type === 'function_call' || p.type === 'custom_tool_call') {
+      // Write → full
+      const write = extractWrite(entry)
+      if (write) return [{ kind: 'write_file', filePath: write.filePath, content: write.content }]
       let name = p.name || 'tool'
       let input: any = p.arguments
       if (typeof input === 'string') { try { input = JSON.parse(input) } catch { /* keep string */ } }
-      return [{ kind: 'tool_call', toolName: name, summary: summarizeToolInput(name, input) }]
-    }
-    if (p.type === 'custom_tool_call') {
-      const nested = parseCustomToolCall(p.input)
-      const name = nested?.name || p.name || 'tool'
-      const input = nested?.input
-        || (p.input && typeof p.input === 'object' ? p.input : null)
-        || (typeof p.input === 'string' && ['exec', 'exec_command', 'shell', 'bash'].includes(name) ? { command: p.input } : {})
-      return [{ kind: 'tool_call', toolName: name, summary: summarizeToolInput(name, input) }]
+      if (p.type === 'custom_tool_call') {
+        const nested = parseCustomToolCall(p.input)
+        if (nested) { name = nested.name; input = nested.input }
+      }
+      const id = typeof p.call_id === 'string' ? p.call_id : ''
+      const result = block.kind === 'tool' && id ? block.results.get(id) : undefined
+      return [{ kind: 'tool_call', toolName: name, summary: summarizeToolInput(name, input), result }]
     }
     if (p.type === 'function_call_output' || p.type === 'custom_tool_call_output') {
+      // 累积模式: tool 结果单独成行 (发起的 tool_use 命令行已在前一条 entry 累积).
       const { text } = extractToolResult({ content: p.output, is_error: false })
-      return [{ kind: 'tool_result', summary: truncate(text, 160), isError: false }]
+      return [{ kind: 'tool_result', text, isError: p?.status === 'failed' || p?.is_error === true }]
     }
     return [{ kind: 'skip' }]
   }
@@ -340,12 +570,90 @@ export function viewsForEntry(entry: AnyEntry): EntryView[] {
   if (type === 'event_msg') {
     const ptype = entry.payload?.type
     if (ptype === 'error') return [{ kind: 'error', text: truncate(entry.payload?.message || '错误', 200) }]
+    if (ptype === 'context_compacted') return [{ kind: 'system', text: '◇ 上下文已压缩' }]
+    if (ptype === 'patch_apply_end') {
+      // Codex 代码修改完成 → full (完整展示 unified_diff)
+      const edit = extractEdit(entry)
+      if (edit) return [{ kind: 'code_edit', filePath: edit.filePath, oldString: edit.oldString, newString: edit.newString }]
+    }
     return [{ kind: 'skip' }]
   }
 
   return [{ kind: 'skip' }]
 }
 
+/** 旧接口保留: 单 entry 投射 (无合并), 给 useChat 的 entryMatchesPendingUser 等用. */
+export function viewsForEntry(entry: AnyEntry): EntryView[] {
+  return viewsForBlock({ kind: 'entry', entry })
+}
+
 export function toolLabel(name: string): string {
   return TOOL_LABEL[name] ?? name
 }
+
+// ── 用户输入去重 (对齐 web viewer/rounds.ts buildRounds) ──────────────────────
+// codex 一次用户输入在 jsonl 里以 3 种形态出现 (type:user / response_item.message[role=user]
+// / event_msg.user_message), 文本相同. 若与上一条用户输入文本相同, 且之间还没出现任何
+// agent 输出, 则视为同一次输入的重复入口 → 丢弃, 避免 TUI 把同一条提问显示多次.
+export function userTextOf(e: AnyEntry): string {
+  if (e?.type === 'event_msg' && e?.payload?.type === 'user_message') {
+    return String(e?.payload?.message || '').trim()
+  }
+  if (e?.type === 'response_item' && e?.payload?.type === 'message' && e?.payload?.role === 'user') {
+    const c = e?.payload?.content
+    if (typeof c === 'string') return c.trim()
+    if (Array.isArray(c)) return c.map((b: any) => b?.text || b?.input_text || '').filter(Boolean).join('\n').trim()
+    return ''
+  }
+  if (e?.type === 'user') {
+    const c = e?.message?.content
+    if (typeof c === 'string') return c.trim()
+    if (Array.isArray(c)) return c.filter((b: any) => b?.type === 'text').map((b: any) => b?.text || '').join('\n').trim()
+    return ''
+  }
+  return ''
+}
+
+// mobius 给 agent 的用户消息会注入一大段上下文框架: 从 "以下信息描述了你正在协助的
+// 用户、当前Project、Issue/Research 与 Session" 到 "## 用户的问题" 之前都是 framing
+// (用户/项目/Issue/Session/Research/Memory 等描述), 之后才是真实提问. TUI 显示用户
+// 消息时隐藏 framing, 只显示 "## 用户的问题" 之后的内容 (兼容 【## 用户的问题】 写法).
+const USER_QUESTION_MARKER = /(?:^|\n)\s*【?\s*##\s*用户的问题\s*】?\s*\r?\n/
+
+export function stripUserFraming(text: string): string {
+  if (!text) return text
+  const m = text.match(USER_QUESTION_MARKER)
+  if (!m || m.index == null) return text
+  const after = text.slice(m.index + m[0].length).trim()
+  return after || text
+}
+
+function isAssistantOutput(e: AnyEntry): boolean {
+  if (e?.type === 'assistant') return true
+  if (e?.type === 'event_msg' && e?.payload?.type === 'agent_message') return true
+  if (e?.type === 'response_item') {
+    const pt = e?.payload?.type
+    if (pt === 'function_call' || pt === 'function_call_output' || pt === 'custom_tool_call' || pt === 'custom_tool_call_output' || pt === 'reasoning') return true
+    if (pt === 'message') {
+      const role = e?.payload?.role
+      return !!role && role !== 'user'
+    }
+  }
+  return false
+}
+
+export function dedupeUserEntries(entries: AnyEntry[]): AnyEntry[] {
+  let lastUserText = ''
+  let seenAssistantAfter = false
+  return entries.filter((e) => {
+    const text = userTextOf(e)
+    if (text) {
+      if (text === lastUserText && !seenAssistantAfter) return false
+      lastUserText = text
+      seenAssistantAfter = false
+      return true
+    }
+    if (isAssistantOutput(e)) seenAssistantAfter = true
+    return true
+  })
+}