lithe-cli 0.6.0__tar.gz → 0.6.2__tar.gz

{lithe_cli-0.6.0 → lithe-cli-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: lithe-cli
-Version: 0.6.0
+Version: 0.6.2
 Summary: Command-line interface for the lithe agent kernel: chat, one-shot runs, undo, and run inspection.
 License: MIT License
         
@@ -38,13 +38,8 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: lithe>=0.9.8
-Requires-Dist: prompt-toolkit>=3.0.38
 Provides-Extra: dev
-Requires-Dist: pytest>=8; extra == "dev"
-Requires-Dist: ruff>=0.4; extra == "dev"
-Dynamic: license-file
+License-File: LICENSE
 
 # lithe-cli
 
@@ -101,14 +96,16 @@ servers — so you can see what a run would use before starting one.
 ```bash
 $ cd my-project
 $ lithe run "总结 README.md 的要点，存到 SUMMARY.md"
-  ⚒ read_file {"path": "README.md"}
+  ⚒ read_file 读取 README.md
   ✓ 已读取 README.md（120 行） 0.1s
-  ⚒ write_file {"path": "SUMMARY.md", "content": "..."}
+  ⚒ write_file 写入 SUMMARY.md
   ✓ 写入 SUMMARY.md 0.0s
 已把要点写入 SUMMARY.md。
 ── done · steps 3 · tokens 2100 · cost 0.0042
 ```
 
+修改已有文件时，助手优先调用 `edit_file` 或 `apply_patch` 做局部更新；只有新建文件或需要整体替换时才使用 `write_file`。工具调用界面只显示工具名、文件路径等摘要，不再展开完整参数。
+
 `--stream` streams tokens as they generate; `-v` adds per-call
 usage/context gauges; `--max-steps` caps the tool loop;
 `--context-window` enables fullness gauges.
@@ -120,35 +117,43 @@ persistent full-screen interface instead of scribbling one-line events
 into the console:
 
 ```text
- lithe 0.6.0 · your-model · /home/me/my-project      ● 完成 · 0.2s
-┌─ 对话 ──────────────────────────────┐┌─ 运行状态 ─────────┐
+ lithe 0.6.2 · your-model · /home/me/my-project      ● 完成 · 0.2s
+╭─ 对话 ──────────────────────────────╮╭─ 运行状态 ─────────╮
 │ 把 a.txt 改成三行待办清单            ││ ● 完成 · 0.2s      │
-│ ⚒ update_todos {"todos": [...]}     ││ 步骤 2/35 · 0.2s   │
+│ ◆ update_todos                      ││ 步骤 2/35 · 0.2s   │
 │ ✓ 任务清单已更新（3 条） 0.0s        ││ ✓ update_todos 0.0s│
-│ ⚒ write_file {"path": "a.txt"}      ││ ✓ write_file 0.0s  │
-│ ✓ 写入 a.txt 0.0s                   ││ ── 待办 1/3        │
+│ ◆ edit_file · 局部修改 a.txt        ││ ✓ edit_file 0.0s   │
+│ ✓ 已修改 a.txt 0.0s                 ││ ◆ 待办 1/3         │
 │ 已完成。                             ││ [~] 修改 a.txt     │
-│                                     ││ ── 用量            │
-│                                     ││ tokens 1,240       │
-└─────────────────────────────────────┘└────────────────────┘
+│                                     ││ ◆ 会话用量         │
+│                                     ││ 输入 1,024 · 输出 216│
+│                                     ││ 缓存输入 768       │
+│                                     ││ 合计 1,240 · $0.0021│
+│                                     ││ 上下文 1,024 / 128,000 (0.8%)│
+╰─────────────────────────────────────╯╰────────────────────╯
 lithe ❯ _
  ● 完成 · step 2/35 · 1,240 tok · $0.0021    Enter 发送 · /help 命令
 ```
 
-The left pane is the conversation (task, tool calls and outcomes, the
-streaming assistant reply); the right sidebar shows run status, step
-budget and elapsed time, recent tool calls with duration, the agent's
-todo list (updated live as the agent rewrites it), and running token /
-cost / context totals. The screen stays up between turns — a finished
-run does not dump you back into the raw console. `Ctrl+C` cancels the
-current turn while running and exits when idle; in `lithe run` mode the
-result stays on screen until you press `q`. Layout, wrapping and
-alignment are East-Asian-width aware; narrower terminals stack the two
-panes vertically. Pipes and CI keep the plain per-line output unchanged.
+The left pane is the conversation (task, compact tool-call summaries
+and outcomes, and the streaming assistant reply). The right sidebar shows
+run status, recent tools, todos, session-wide cumulative input/output/
+cached tokens and cost, plus the latest model-call context length and
+window percentage. The two panes are separate windows — selecting text
+in one never captures the other — and the conversation scrolls: mouse
+wheel, PageUp/PageDown, Home/End (a new turn jumps back to the output).
+F2 or `/sidebar` hides the status pane so a reply can be copied from a
+full-width screen; Shift+drag keeps the terminal's native selection. The
+screen stays up between turns; `Ctrl+C` cancels the current turn while
+running and exits when idle. In `lithe run` mode the result stays on
+screen until you press `q`. Layout, wrapping and alignment are
+East-Asian-width aware; narrower terminals stack the two panes
+vertically. Pipes and CI keep the plain per-line output unchanged.
 
 History carries across turns within a session (each turn is its own run
 in the store, replayed as context for the next). `/new` clears the
-session, `/tools` lists the registered tools, `/help` lists the commands.
+conversation history and session usage totals; `/tools` lists the
+registered tools, `/help` lists the commands.
 
 ### Extra capabilities
 

{lithe_cli-0.6.0 → lithe-cli-0.6.2}/README.md

@@ -53,14 +53,16 @@ servers — so you can see what a run would use before starting one.
 ```bash
 $ cd my-project
 $ lithe run "总结 README.md 的要点，存到 SUMMARY.md"
-  ⚒ read_file {"path": "README.md"}
+  ⚒ read_file 读取 README.md
   ✓ 已读取 README.md（120 行） 0.1s
-  ⚒ write_file {"path": "SUMMARY.md", "content": "..."}
+  ⚒ write_file 写入 SUMMARY.md
   ✓ 写入 SUMMARY.md 0.0s
 已把要点写入 SUMMARY.md。
 ── done · steps 3 · tokens 2100 · cost 0.0042
 ```
 
+修改已有文件时，助手优先调用 `edit_file` 或 `apply_patch` 做局部更新；只有新建文件或需要整体替换时才使用 `write_file`。工具调用界面只显示工具名、文件路径等摘要，不再展开完整参数。
+
 `--stream` streams tokens as they generate; `-v` adds per-call
 usage/context gauges; `--max-steps` caps the tool loop;
 `--context-window` enables fullness gauges.
@@ -72,35 +74,43 @@ persistent full-screen interface instead of scribbling one-line events
 into the console:
 
 ```text
- lithe 0.6.0 · your-model · /home/me/my-project      ● 完成 · 0.2s
-┌─ 对话 ──────────────────────────────┐┌─ 运行状态 ─────────┐
+ lithe 0.6.2 · your-model · /home/me/my-project      ● 完成 · 0.2s
+╭─ 对话 ──────────────────────────────╮╭─ 运行状态 ─────────╮
 │ 把 a.txt 改成三行待办清单            ││ ● 完成 · 0.2s      │
-│ ⚒ update_todos {"todos": [...]}     ││ 步骤 2/35 · 0.2s   │
+│ ◆ update_todos                      ││ 步骤 2/35 · 0.2s   │
 │ ✓ 任务清单已更新（3 条） 0.0s        ││ ✓ update_todos 0.0s│
-│ ⚒ write_file {"path": "a.txt"}      ││ ✓ write_file 0.0s  │
-│ ✓ 写入 a.txt 0.0s                   ││ ── 待办 1/3        │
+│ ◆ edit_file · 局部修改 a.txt        ││ ✓ edit_file 0.0s   │
+│ ✓ 已修改 a.txt 0.0s                 ││ ◆ 待办 1/3         │
 │ 已完成。                             ││ [~] 修改 a.txt     │
-│                                     ││ ── 用量            │
-│                                     ││ tokens 1,240       │
-└─────────────────────────────────────┘└────────────────────┘
+│                                     ││ ◆ 会话用量         │
+│                                     ││ 输入 1,024 · 输出 216│
+│                                     ││ 缓存输入 768       │
+│                                     ││ 合计 1,240 · $0.0021│
+│                                     ││ 上下文 1,024 / 128,000 (0.8%)│
+╰─────────────────────────────────────╯╰────────────────────╯
 lithe ❯ _
  ● 完成 · step 2/35 · 1,240 tok · $0.0021    Enter 发送 · /help 命令
 ```
 
-The left pane is the conversation (task, tool calls and outcomes, the
-streaming assistant reply); the right sidebar shows run status, step
-budget and elapsed time, recent tool calls with duration, the agent's
-todo list (updated live as the agent rewrites it), and running token /
-cost / context totals. The screen stays up between turns — a finished
-run does not dump you back into the raw console. `Ctrl+C` cancels the
-current turn while running and exits when idle; in `lithe run` mode the
-result stays on screen until you press `q`. Layout, wrapping and
-alignment are East-Asian-width aware; narrower terminals stack the two
-panes vertically. Pipes and CI keep the plain per-line output unchanged.
+The left pane is the conversation (task, compact tool-call summaries
+and outcomes, and the streaming assistant reply). The right sidebar shows
+run status, recent tools, todos, session-wide cumulative input/output/
+cached tokens and cost, plus the latest model-call context length and
+window percentage. The two panes are separate windows — selecting text
+in one never captures the other — and the conversation scrolls: mouse
+wheel, PageUp/PageDown, Home/End (a new turn jumps back to the output).
+F2 or `/sidebar` hides the status pane so a reply can be copied from a
+full-width screen; Shift+drag keeps the terminal's native selection. The
+screen stays up between turns; `Ctrl+C` cancels the current turn while
+running and exits when idle. In `lithe run` mode the result stays on
+screen until you press `q`. Layout, wrapping and alignment are
+East-Asian-width aware; narrower terminals stack the two panes
+vertically. Pipes and CI keep the plain per-line output unchanged.
 
 History carries across turns within a session (each turn is its own run
 in the store, replayed as context for the next). `/new` clears the
-session, `/tools` lists the registered tools, `/help` lists the commands.
+conversation history and session usage totals; `/tools` lists the
+registered tools, `/help` lists the commands.
 
 ### Extra capabilities
 

{lithe_cli-0.6.0 → lithe-cli-0.6.2}/lithe_cli/__init__.py

@@ -1,3 +1,3 @@
 """lithe-cli: the command-line interface for the lithe agent kernel."""
 
-__version__ = "0.6.0"
+__version__ = "0.6.2"

{lithe_cli-0.6.0 → lithe-cli-0.6.2}/lithe_cli/agent.py

@@ -17,7 +17,6 @@ Everything here maps lithe's host contract onto CLI defaults:
 
 from __future__ import annotations
 
-import json
 import shutil
 import sys
 import time
@@ -43,8 +42,10 @@ from .ui import CYAN, GREEN, YELLOW, ui
 
 SYSTEM_PROMPT_BASE = (
     "你是运行在命令行里的助理，工作区是用户的当前目录。"
-    "用提供的文件工具完成任务（读写前先读、谨慎修改），"
-    "需要多步任务时先用 update_todos 列出计划，最后用简洁中文汇报结果。"
+    "用提供的文件工具完成任务（读写前先读、谨慎修改）；修改已有文件时优先用 edit_file 或 apply_patch 做局部修改，"
+    "仅在新建文件或确需整体重写时使用 write_file。"
+    "需要多步任务时先用 update_todos 列出计划（条数与实际步骤数一致：一两步就一两条，复杂任务可以拆到七八条，不要固定写成 3 条），"
+    "最后用简洁中文汇报结果。"
 )
 
 
@@ -154,7 +155,7 @@ def render_event(
         if text and not (stream and pending.get("_deltas")):
             ui.assistant(text)
     elif t == "tool_call":
-        args = json.dumps(ev.get("args", {}), ensure_ascii=False)
+        args = ev.get("args") or {}
         ui.tool_call(str(ev.get("name")), args)
         if ev.get("id") is not None:
             pending[ev["id"]] = time.monotonic()

{lithe_cli-0.6.0 → lithe-cli-0.6.2}/lithe_cli/tui.py

@@ -2,20 +2,22 @@
 
 One prompt_toolkit ``Application`` owns the terminal for the whole
 session: a conversation pane (task, tool feed, streaming assistant text)
-on the left, a status sidebar (run state, tool calls, todos, token /
-cost totals) on the right, an input line and a status bar. Turns stream
-into the panes and the screen stays up between runs — no falling back
-to the raw console after a task finishes.
+in its own scrollable Window, a status sidebar (run state, tool calls,
+todos, token / cost totals) in a separate Window beside it, an input line
+and a status bar. Panes never share a rendering surface, so terminal
+selection cannot bleed across them; F2 hides the sidebar entirely and the
+conversation keeps a scroll offset (wheel, PgUp/PgDn, Home/End). Turns
+stream into the panes and the screen stays up between runs — no falling
+back to the raw console after a task finishes.
 
 Everything degrades: without a TTY ``main`` never routes here, and the
-frame composition is a pure function (``compose_frame``) so it renders
-identically under tests.
+pane composition is pure functions (``conversation_rows`` /
+``sidebar_rows``) so they render identically under tests.
 """
 
 from __future__ import annotations
 
 import asyncio
-import json
 import os
 import shutil
 import sys
@@ -29,6 +31,7 @@ from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.layout import (
     BufferControl,
     Dimension,
+    DynamicContainer,
     FormattedTextControl,
     HSplit,
     Layout,
@@ -37,7 +40,7 @@ from prompt_toolkit.layout import (
 )
 from prompt_toolkit.styles import Style
 
-from .ui import display_width, pad, truncate, wrap_text
+from .ui import display_width, pad, tool_call_label, truncate, wrap_text
 
 _TODO_MARKS = {"pending": "[ ]", "in_progress": "[~]", "completed": "[x]", "cancelled": "[-]"}
 _TODO_CLASSES = {
@@ -50,33 +53,36 @@ _STATUS_DONE = "done"
 
 _STYLE = Style.from_dict(
     {
-        "hdr": "bg:ansiblue fg:ansiwhite bold",
-        "foot": "bg:ansibrightblack fg:ansiwhite",
-        "border": "fg:ansibrightblack",
-        "title": "fg:ansicyan bold",
-        "prompt": "fg:ansicyan bold",
-        "user": "fg:ansiblue bold",
-        "assistant": "fg:ansigreen",
-        "tool": "fg:ansicyan",
-        "ok": "fg:ansigreen",
-        "err": "fg:ansired bold",
-        "warn": "fg:ansiyellow",
-        "dim": "fg:ansibrightblack",
-        "reason": "fg:ansimagenta",
-        "todo-ip": "fg:ansiyellow",
-        "todo-done": "fg:ansigreen",
-        "st-idle": "fg:ansicyan bold",
-        "st-run": "fg:ansiyellow bold",
-        "st-ok": "fg:ansigreen bold",
-        "st-bad": "fg:ansired bold",
+        "hdr": "bg:#172033 fg:#e2e8f0 bold",
+        "foot": "bg:#111827 fg:#cbd5e1",
+        "border": "fg:#475569",
+        "title": "fg:#38bdf8 bold",
+        "prompt": "fg:#38bdf8 bold",
+        "user": "fg:#60a5fa bold",
+        "assistant": "fg:#4ade80",
+        "tool": "fg:#22d3ee",
+        "ok": "fg:#4ade80",
+        "err": "fg:#f87171 bold",
+        "warn": "fg:#fbbf24",
+        "dim": "fg:#94a3b8",
+        "reason": "fg:#c084fc",
+        "todo-ip": "fg:#fbbf24",
+        "todo-done": "fg:#4ade80",
+        "st-idle": "fg:#22d3ee bold",
+        "st-run": "fg:#fbbf24 bold",
+        "st-ok": "fg:#4ade80 bold",
+        "st-bad": "fg:#f87171 bold",
     }
 )
 
 _WELCOME = (
     "输入任务开始对话；/help 查看命令。",
+    "PgUp/PgDn 或滚轮回看对话；F2 隐藏侧栏；Shift+拖拽复制。",
     "Ctrl+C 在运行中取消本轮，空闲时退出。",
 )
 
+_SCROLL_STEP = 3
+
 
 def screen_supported() -> bool:
     """The TUI needs a real terminal (never pipes, CI or dumb terms)."""
@@ -102,10 +108,22 @@ class TuiState:
         self.step = 0
         self.tokens = 0
         self.cost = 0.0
+        self.input_tokens = 0
+        self.output_tokens = 0
+        self.cached_tokens = 0
+        self._turn_tokens = 0
+        self._turn_cost = 0.0
+        self._turn_input_tokens = 0
+        self._turn_output_tokens = 0
+        self._turn_cached_tokens = 0
+        self.context_tokens = None
+        self.context_window = None
         self.context_percent = None
         self.tools: list[dict] = []
         self.feed: list[tuple[str, str]] = []
         self.streaming = ""
+        self.scroll = 0
+        self.show_sidebar = True
         self.started: float | None = None
         self.last_status: str | None = None
         self.stop: asyncio.Event | None = None
@@ -125,13 +143,35 @@ class TuiState:
 
     # -- events -------------------------------------------------------------
 
+    def reset_usage(self) -> None:
+        self.tokens = 0
+        self.cost = 0.0
+        self.input_tokens = 0
+        self.output_tokens = 0
+        self.cached_tokens = 0
+        self._turn_tokens = 0
+        self._turn_cost = 0.0
+        self._turn_input_tokens = 0
+        self._turn_output_tokens = 0
+        self._turn_cached_tokens = 0
+        self.context_tokens = None
+        self.context_window = None
+        self.context_percent = None
+
     def on_event(self, ev: dict) -> None:
         kind = ev.get("type")
         if kind == "run_start":
             self.status = "思考中"
             self.step = 0
-            self.tokens = 0
-            self.cost = 0.0
+            self.scroll = 0
+            self._turn_tokens = 0
+            self._turn_cost = 0.0
+            self._turn_input_tokens = 0
+            self._turn_output_tokens = 0
+            self._turn_cached_tokens = 0
+            self.context_tokens = None
+            self.context_window = None
+            self.context_percent = None
             self.tools = []
             self.started = time.monotonic()
         elif kind == "step":
@@ -146,17 +186,18 @@ class TuiState:
             self.streaming = ""
         elif kind == "tool_call":
             name = str(ev.get("name") or "tool")
+            args = ev.get("args")
+            args = args if isinstance(args, dict) else {}
             self.tools.append(
                 {
                     "id": ev.get("id"),
                     "name": name,
-                    "args": json.dumps(ev.get("args") or {}, ensure_ascii=False),
                     "status": "running",
                     "t0": time.monotonic(),
                     "elapsed": None,
                 }
             )
-            self.say("tool", f"⚒ {name} {self.tools[-1]['args']}")
+            self.say("tool", f"◆ {tool_call_label(name, args)}")
             self.status = f"工具 {name}"
         elif kind == "tool_result":
             self._settle_tool(ev.get("id"), bool(ev.get("ok")), ev.get("summary"))
@@ -164,8 +205,15 @@ class TuiState:
             self.todos = list(ev.get("new") or [])
             self.say("dim", f"□ 任务清单已更新（{len(self.todos)} 项）")
         elif kind == "usage":
-            self.tokens += int(ev.get("total_tokens") or 0)
-            self.cost += float(ev.get("cost") or 0)
+            self._turn_input_tokens += int(ev.get("prompt_tokens") or 0)
+            self._turn_output_tokens += int(ev.get("completion_tokens") or 0)
+            self._turn_cached_tokens += int(ev.get("cached_tokens") or 0)
+            self._turn_tokens += int(ev.get("total_tokens") or 0)
+            self._turn_cost += float(ev.get("cost") or 0)
+            if ev.get("context_tokens") is not None:
+                self.context_tokens = int(ev["context_tokens"])
+            if ev.get("context_window") is not None:
+                self.context_window = int(ev["context_window"])
             if ev.get("context_percent") is not None:
                 self.context_percent = ev["context_percent"]
         elif kind == "reasoning":
@@ -189,8 +237,30 @@ class TuiState:
                 "empty_response": "空响应",
             }.get(status, status)
             self.step = int(ev.get("steps") or self.step)
-            self.tokens = int(ev.get("tokens") or self.tokens)
-            self.cost = float(ev.get("cost") or self.cost)
+            if ev.get("prompt_tokens") is not None:
+                self._turn_input_tokens = int(ev["prompt_tokens"])
+            if ev.get("completion_tokens") is not None:
+                self._turn_output_tokens = int(ev["completion_tokens"])
+            if ev.get("tokens") is not None:
+                self._turn_tokens = int(ev["tokens"])
+            if ev.get("cost") is not None:
+                self._turn_cost = float(ev["cost"])
+            self.input_tokens += self._turn_input_tokens
+            self.output_tokens += self._turn_output_tokens
+            self.cached_tokens += self._turn_cached_tokens
+            self.tokens += self._turn_tokens
+            self.cost += self._turn_cost
+            self._turn_tokens = 0
+            self._turn_cost = 0.0
+            self._turn_input_tokens = 0
+            self._turn_output_tokens = 0
+            self._turn_cached_tokens = 0
+            if ev.get("context_tokens") is not None:
+                self.context_tokens = int(ev["context_tokens"])
+            if ev.get("context_window") is not None:
+                self.context_window = int(ev["context_window"])
+            if ev.get("context_percent") is not None:
+                self.context_percent = ev["context_percent"]
             if self.started is not None:
                 self.status += f" · {time.monotonic() - self.started:.1f}s"
         self.invalidate()
@@ -220,32 +290,79 @@ def _status_class(status: str) -> str:
     return "st-run"
 
 
-def _panel(title: str, lines: list[tuple[str, str]], width: int, height: int) -> list[list]:
-    """A bordered box of exactly *height* rows, each *width* columns wide."""
+def _wrap_feed(lines: list[tuple[str, str]], inner: int) -> list[tuple[str, str]]:
+    wrapped: list[tuple[str, str]] = []
+    for cls, text in lines:
+        wrapped.extend((cls, seg) for seg in wrap_text(text, inner))
+    return wrapped
+
+
+def _scroll_handler(state: TuiState, delta: int):
+    def _on_mouse(event) -> None:
+        state.scroll = max(0, state.scroll + delta)
+        state.invalidate()
+
+    return _on_mouse
+
+
+def _box(
+    title: str,
+    wrapped: list[tuple[str, str]],
+    width: int,
+    height: int,
+    handler=None,
+) -> list[list]:
+    """A bordered box of exactly *height* rows; *handler* rides content lines."""
     width = max(20, width)
     height = max(4, height)
     inner = max(1, width - 4)
     label = truncate(f" {title} ", inner)
     rows = [
         [
-            ("class:border", "┌"),
+            ("class:border", "╭"),
             ("class:title", label),
-            ("class:border", "─" * (inner - display_width(label)) + "┐"),
+            ("class:border", "─" * (width - display_width(label) - 2) + "╮"),
         ]
     ]
-    wrapped: list[tuple[str, str]] = []
-    for cls, text in lines:
-        wrapped.extend((cls, seg) for seg in wrap_text(text, inner))
-    for cls, seg in wrapped[-(height - 2):]:
+    shown = wrapped[-(height - 2):]
+    if handler is None:
+        body = [(f"class:{cls}" if cls else "", pad(seg, inner)) for cls, seg in shown]
+    else:
+        body = [
+            (f"class:{cls}" if cls else "", pad(seg, inner), handler)
+            for cls, seg in shown
+        ]
+    for seg in body:
         rows.append(
-            [("class:border", "│ "), (f"class:{cls}" if cls else "", pad(seg, inner)), ("class:border", " │")]
+            [("class:border", "│ "), seg, ("class:border", " │")]
         )
-    for _ in range(height - 2 - (len(rows) - 1)):
+    for _ in range(height - 2 - len(body)):
         rows.append([("class:border", "│ "), ("", " " * inner), ("class:border", " │")])
-    rows.append([("class:border", "└" + "─" * inner + "┘")])
+    rows.append([("class:border", "╰" + "─" * (inner + 2) + "╯")])
     return rows
 
 
+def _panel(title: str, lines: list[tuple[str, str]], width: int, height: int) -> list[list]:
+    inner = max(1, max(20, width) - 4)
+    return _box(title, _wrap_feed(lines, inner), width, height)
+
+
+def conversation_rows(state: TuiState, width: int, height: int) -> list[list]:
+    """The conversation pane, windowed by *state.scroll* (0 = follow the tail)."""
+    inner = max(1, max(20, width) - 4)
+    wrapped = _wrap_feed(_conversation_lines(state), inner)
+    visible = max(1, height - 2)
+    max_scroll = max(0, len(wrapped) - visible)
+    state.scroll = min(state.scroll, max_scroll)
+    start = max(0, len(wrapped) - visible - state.scroll)
+    window = wrapped[start:start + visible]
+    return _box("对话", window, width, height, handler=_scroll_handler(state, _SCROLL_STEP))
+
+
+def sidebar_rows(state: TuiState, width: int, height: int) -> list[list]:
+    return _panel("运行状态", _sidebar_lines(state), width, height)
+
+
 def _conversation_lines(state: TuiState) -> list[tuple[str, str]]:
     lines = list(state.feed)
     if state.streaming:
@@ -266,8 +383,8 @@ def _sidebar_lines(state: TuiState) -> list[tuple[str, str]]:
         (cls, f"● {state.status}"),
         ("dim", f"步骤 {state.step}/{state.max_steps} · {elapsed:.1f}s"),
         ("dim", f"模型 {state.model}"),
-        ("dim", f"目录 {state.workspace}"),
-        ("dim", "── 工具调用"),
+        ("dim", f"工作区 {state.workspace}"),
+        ("dim", "◆ 工具"),
     ]
     if not state.tools:
         lines.append(("dim", "暂无调用"))
@@ -277,19 +394,32 @@ def _sidebar_lines(state: TuiState) -> list[tuple[str, str]]:
         lines.append(("ok" if tool["status"] == "done" else "err" if tool["status"] == "failed" else "tool",
                       f"{mark} {tool['name']}{suffix}"))
     done = sum(todo.get("status") == "completed" for todo in state.todos)
-    lines.extend([("dim", f"── 待办 {done}/{len(state.todos)}")])
+    lines.append(("dim", f"◆ 待办 {done}/{len(state.todos)}"))
     if not state.todos:
         lines.append(("dim", "暂无任务清单"))
     for todo in state.todos[-5:]:
         mark = _TODO_MARKS.get(todo.get("status"), "[ ]")
         cls_todo = _TODO_CLASSES.get(todo.get("status"), "")
         lines.append((cls_todo, f"{mark} {todo.get('content', '')}"))
-    ctx = "—" if state.context_percent is None else f"{state.context_percent}%"
+    input_tokens = state.input_tokens + state._turn_input_tokens
+    output_tokens = state.output_tokens + state._turn_output_tokens
+    cached_tokens = state.cached_tokens + state._turn_cached_tokens
+    tokens = state.tokens + state._turn_tokens
+    cost = state.cost + state._turn_cost
+    context = "—"
+    if state.context_tokens is not None:
+        context = f"{state.context_tokens:,}"
+        if state.context_window:
+            context += f" / {state.context_window:,}"
+        if state.context_percent is not None:
+            context += f" ({state.context_percent}%)"
     lines.extend(
         [
-            ("dim", "── 用量"),
-            ("", f"tokens {state.tokens:,}"),
-            ("", f"cost ${state.cost:.4f} · ctx {ctx}"),
+            ("dim", "◆ 会话用量"),
+            ("", f"输入 {input_tokens:,} · 输出 {output_tokens:,}"),
+            ("", f"缓存输入 {cached_tokens:,}"),
+            ("", f"合计 {tokens:,} · ${cost:.4f}"),
+            ("", f"上下文 {context}"),
         ]
     )
     return lines
@@ -307,29 +437,25 @@ def _header_row(state: TuiState, width: int, version: str) -> list:
     ]
 
 
-def compose_frame(state: TuiState, width: int, height: int, version: str) -> list[list]:
-    """The whole middle of the screen: header row + panel rows."""
-    width = max(40, width)
-    height = max(10, height)
-    rows = [_header_row(state, width, version)]
-    body = height - 3  # header 1 + input 1 + footer 1
+def body_layout(state: TuiState, width: int, height: int):
+    """Pane geometry: (conversation w×h, sidebar w×h | None)."""
+    height = max(6, height)
+    if not state.show_sidebar:
+        return (width, height), None
     if width >= 76:
         side_w = min(44, max(30, width // 3))
-        conv = _panel("对话", _conversation_lines(state), width - side_w, body)
-        side = _panel("运行状态", _sidebar_lines(state), side_w, body)
-        rows.extend(c + s for c, s in zip(conv, side, strict=True))
-    else:
-        conv_h = max(4, body * 3 // 5)
-        rows.extend(_panel("对话", _conversation_lines(state), width, conv_h))
-        rows.extend(_panel("运行状态", _sidebar_lines(state), width, max(4, body - conv_h)))
-    return rows
+        return (width - side_w, height), (side_w, height)
+    conv_h = max(4, height * 3 // 5)
+    return (width, conv_h), (width, max(4, height - conv_h))
 
 
 def compose_footer(state: TuiState, width: int, running_hint: str) -> list:
     dot = f"class:foot class:{_status_class(state.status)}"
+    total_tokens = state.tokens + state._turn_tokens
+    total_cost = state.cost + state._turn_cost
     left = (
         f" ● {state.status} · step {state.step}/{state.max_steps}"
-        f" · {state.tokens:,} tok · ${state.cost:.4f}"
+        f" · {total_tokens:,} tok · ${total_cost:.4f}"
     )
     room = width - display_width(running_hint) - display_width(left) - 2
     text = left + (" " * max(1, room)) if room >= 1 else truncate(left, width - display_width(running_hint) - 1)
@@ -354,7 +480,13 @@ def _term_size(app: Application | None) -> tuple[int, int]:
 
 
 def build_app(state: TuiState, mode: str, version: str, on_line) -> tuple[Application, Buffer]:
-    """Assemble the full-screen Application; the input line drives *on_line*."""
+    """Assemble the full-screen Application; the input line drives *on_line*.
+
+    The conversation pane and the status sidebar live in separate Windows,
+    so terminal selection never spans both. The conversation keeps a scroll
+    offset (PgUp/PgDn/Home/End and the mouse wheel) instead of only ever
+    showing the tail; F2 (or /sidebar) hides the sidebar for full-width
+    copying."""
     kb = KeyBindings()
 
     @kb.add("c-c", eager=True)
@@ -373,6 +505,26 @@ def build_app(state: TuiState, mode: str, version: str, on_line) -> tuple[Applic
             if not state.running:
                 event.app.exit()
 
+    def _page(dy: int):
+        def _scroll(event):
+            _, rows = _term_size(state._app)
+            step = max(1, (rows - 5) // 2)
+            state.scroll = max(0, state.scroll + dy * step)
+            state.invalidate()
+
+        return _scroll
+
+    kb.add("pageup")(_page(1))
+    kb.add("pagedown")(_page(-1))
+    kb.add("home")(lambda event: (setattr(state, "scroll", 10**9), state.invalidate()))
+    kb.add("end")(lambda event: (setattr(state, "scroll", 0), state.invalidate()))
+
+    def _toggle_sidebar(event):
+        state.show_sidebar = not state.show_sidebar
+        state.invalidate()
+
+    kb.add("f2")(_toggle_sidebar)
+
     buffer = Buffer(
         history=_chat_history() if mode == "chat" else None,
         multiline=False,
@@ -380,30 +532,65 @@ def build_app(state: TuiState, mode: str, version: str, on_line) -> tuple[Applic
         accept_handler=lambda buff: (on_line(buff.text), False)[1],
     )
 
-    def _frame():
+    def _header():
+        cols, _ = _term_size(state._app)
+        return FormattedText(_header_row(state, cols, version))
+
+    def _conv_text():
         cols, rows = _term_size(state._app)
+        (cw, ch), _ = body_layout(state, cols, rows - 3)
         fragments = []
-        for row in compose_frame(state, cols, rows, version):
+        for row in conversation_rows(state, cw, ch):
             fragments.extend(row)
             fragments.append(("", "\n"))
-        return FormattedText(fragments)
+        return FormattedText(fragments[:-1])
+
+    def _side_text():
+        cols, rows = _term_size(state._app)
+        _, side = body_layout(state, cols, rows - 3)
+        fragments = []
+        if side is not None:
+            for row in sidebar_rows(state, side[0], side[1]):
+                fragments.extend(row)
+                fragments.append(("", "\n"))
+        return FormattedText(fragments[:-1] if fragments else "")
+
+    def _body():
+        cols, rows = _term_size(state._app)
+        (cw, ch), side = body_layout(state, cols, rows - 3)
+        conv = Window(
+            FormattedTextControl(_conv_text, show_cursor=False),
+            width=Dimension.exact(cw),
+            height=Dimension.exact(ch),
+            wrap_lines=False,
+        )
+        if side is None:
+            return conv
+        side_win = Window(
+            FormattedTextControl(_side_text, show_cursor=False),
+            width=Dimension.exact(side[0]),
+            height=Dimension.exact(side[1]),
+            wrap_lines=False,
+        )
+        if side[0] >= 30 and side[1] == ch:
+            return VSplit([conv, side_win])
+        return HSplit([conv, side_win])
 
     def _footer():
         cols, _ = _term_size(state._app)
         if mode == "run":
-            hint = " q 退出 " if not state.running else " Ctrl+C 取消 "
+            hint = " q 退出 · F2 侧栏 " if not state.running else " Ctrl+C 取消 · PgUp/PgDn 滚动 "
         elif state.running:
-            hint = " Ctrl+C 取消本轮 "
+            hint = " Ctrl+C 取消本轮 · PgUp/PgDn 滚动 "
         else:
-            hint = " Enter 发送 · /help 命令 "
+            hint = " Enter 发送 · F2 侧栏 · /help 命令 "
         return FormattedText(compose_footer(state, cols, hint))
 
     def _prompt_text():
         return FormattedText([("class:prompt", "lithe ❯ ")])
 
-    frame_win = Window(
-        FormattedTextControl(_frame, show_cursor=False), wrap_lines=False, height=Dimension(weight=1)
-    )
+    header_win = Window(FormattedTextControl(_header, show_cursor=False), height=Dimension.exact(1))
+    body_container = DynamicContainer(_body)
     input_row = VSplit(
         [
             Window(FormattedTextControl(_prompt_text, show_cursor=False), width=Dimension.exact(8)),
@@ -412,20 +599,25 @@ def build_app(state: TuiState, mode: str, version: str, on_line) -> tuple[Applic
     )
     footer_win = Window(FormattedTextControl(_footer, show_cursor=False), height=Dimension.exact(1))
     app = Application(
-        layout=Layout(HSplit([frame_win, input_row, footer_win])),
+        layout=Layout(HSplit([header_win, body_container, input_row, footer_win])),
         key_bindings=kb,
         style=_STYLE,
         full_screen=True,
+        mouse_support=True,
     )
     app.layout.focus(buffer)
     return app, buffer
 
 
 _CHAT_HELP = """可用命令：
-  /help   显示这段帮助
-  /tools  列出当前注册的工具
-  /new    清空会话历史，重新开始
-  /exit   退出（等同 /quit）"""
+  /help    显示这段帮助
+  /tools   列出当前注册的工具
+  /sidebar 显示/隐藏右侧状态栏（F2 同效）
+  /new     清空会话历史，重新开始
+  /exit    退出（等同 /quit）
+
+按键：PgUp/PgDn·滚轮 滚动对话，Home/End 跳到顶/底，
+Shift+拖拽 终端原生复制（隐藏侧栏后左栏独占整行更干净）。"""
 
 
 async def run_screen(cfg, task: str | None, mode: str) -> int:
@@ -453,13 +645,18 @@ async def run_screen(cfg, task: str | None, mode: str) -> int:
         if line == "/help":
             state.say("dim", _CHAT_HELP)
             return True
+        if line == "/sidebar":
+            state.show_sidebar = not state.show_sidebar
+            state.say("dim", "（侧栏已隐藏，F2 或 /sidebar 恢复）" if not state.show_sidebar else "（侧栏已恢复）")
+            return True
         if line == "/tools":
             names = sorted(build_registry(cfg).names())
             state.say("dim", "已注册工具：" + "、".join(names))
             return True
         if line == "/new":
             run_ids.clear()
-            state.say("dim", "（已清空会话历史）")
+            state.reset_usage()
+            state.say("dim", "（已清空会话历史与用量统计）")
             return True
         return False
 

{lithe_cli-0.6.0 → lithe-cli-0.6.2}/lithe_cli/ui.py

@@ -105,6 +105,27 @@ def wrap_text(text: str, width: int) -> list[str]:
     return lines
 
 
+def tool_call_label(name: str, args: dict) -> str:
+    path = str(args.get("path") or args.get("file_path") or "").strip()
+    if name in {"read_file", "write_file", "edit_file"}:
+        action = {"read_file": "读取", "write_file": "写入", "edit_file": "局部修改"}[name]
+        return f"{name} · {action} {path}" if path else name
+    if name == "apply_patch":
+        patch = str(args.get("patch_text") or "")
+        paths = [
+            line.partition(":")[2].strip()
+            for line in patch.splitlines()
+            if line.startswith(("*** Update File:", "*** Add File:", "*** Delete File:"))
+        ]
+        files = "、".join(dict.fromkeys(paths))
+        return f"{name} · {files}" if files else f"{name} · 文件补丁"
+    for key in ("query", "pattern", "agent", "command", "url"):
+        value = args.get(key)
+        if isinstance(value, str) and value.strip():
+            return f"{name} · {value.strip()[:80]}"
+    return name
+
+
 class UI:
     """All terminal output goes through here; ``color`` gates every code."""
 
@@ -194,9 +215,10 @@ class UI:
     def assistant(self, text: str) -> None:
         print(self.s(text, GREEN))
 
-    def tool_call(self, name: str, args: str) -> None:
+    def tool_call(self, name: str, args: dict) -> None:
+        label = tool_call_label(name, args if isinstance(args, dict) else {})
         prefix = f"  ⚒ {name} "
-        detail = truncate(args, max(8, self.width - display_width(prefix)))
+        detail = truncate(label[len(name):].strip(" ·"), max(8, self.width - display_width(prefix)))
         print(f"  {self.s('⚒', CYAN)} {self.s(name, CYAN, BOLD)} {self.s(detail, DIM)}")
 
     def tool_result(self, ok: bool, summary: str, elapsed: float | None) -> None:

{lithe_cli-0.6.0 → lithe-cli-0.6.2}/lithe_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: lithe-cli
-Version: 0.6.0
+Version: 0.6.2
 Summary: Command-line interface for the lithe agent kernel: chat, one-shot runs, undo, and run inspection.
 License: MIT License
         
@@ -38,13 +38,8 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: lithe>=0.9.8
-Requires-Dist: prompt-toolkit>=3.0.38
 Provides-Extra: dev
-Requires-Dist: pytest>=8; extra == "dev"
-Requires-Dist: ruff>=0.4; extra == "dev"
-Dynamic: license-file
+License-File: LICENSE
 
 # lithe-cli
 
@@ -101,14 +96,16 @@ servers — so you can see what a run would use before starting one.
 ```bash
 $ cd my-project
 $ lithe run "总结 README.md 的要点，存到 SUMMARY.md"
-  ⚒ read_file {"path": "README.md"}
+  ⚒ read_file 读取 README.md
   ✓ 已读取 README.md（120 行） 0.1s
-  ⚒ write_file {"path": "SUMMARY.md", "content": "..."}
+  ⚒ write_file 写入 SUMMARY.md
   ✓ 写入 SUMMARY.md 0.0s
 已把要点写入 SUMMARY.md。
 ── done · steps 3 · tokens 2100 · cost 0.0042
 ```
 
+修改已有文件时，助手优先调用 `edit_file` 或 `apply_patch` 做局部更新；只有新建文件或需要整体替换时才使用 `write_file`。工具调用界面只显示工具名、文件路径等摘要，不再展开完整参数。
+
 `--stream` streams tokens as they generate; `-v` adds per-call
 usage/context gauges; `--max-steps` caps the tool loop;
 `--context-window` enables fullness gauges.
@@ -120,35 +117,43 @@ persistent full-screen interface instead of scribbling one-line events
 into the console:
 
 ```text
- lithe 0.6.0 · your-model · /home/me/my-project      ● 完成 · 0.2s
-┌─ 对话 ──────────────────────────────┐┌─ 运行状态 ─────────┐
+ lithe 0.6.2 · your-model · /home/me/my-project      ● 完成 · 0.2s
+╭─ 对话 ──────────────────────────────╮╭─ 运行状态 ─────────╮
 │ 把 a.txt 改成三行待办清单            ││ ● 完成 · 0.2s      │
-│ ⚒ update_todos {"todos": [...]}     ││ 步骤 2/35 · 0.2s   │
+│ ◆ update_todos                      ││ 步骤 2/35 · 0.2s   │
 │ ✓ 任务清单已更新（3 条） 0.0s        ││ ✓ update_todos 0.0s│
-│ ⚒ write_file {"path": "a.txt"}      ││ ✓ write_file 0.0s  │
-│ ✓ 写入 a.txt 0.0s                   ││ ── 待办 1/3        │
+│ ◆ edit_file · 局部修改 a.txt        ││ ✓ edit_file 0.0s   │
+│ ✓ 已修改 a.txt 0.0s                 ││ ◆ 待办 1/3         │
 │ 已完成。                             ││ [~] 修改 a.txt     │
-│                                     ││ ── 用量            │
-│                                     ││ tokens 1,240       │
-└─────────────────────────────────────┘└────────────────────┘
+│                                     ││ ◆ 会话用量         │
+│                                     ││ 输入 1,024 · 输出 216│
+│                                     ││ 缓存输入 768       │
+│                                     ││ 合计 1,240 · $0.0021│
+│                                     ││ 上下文 1,024 / 128,000 (0.8%)│
+╰─────────────────────────────────────╯╰────────────────────╯
 lithe ❯ _
  ● 完成 · step 2/35 · 1,240 tok · $0.0021    Enter 发送 · /help 命令
 ```
 
-The left pane is the conversation (task, tool calls and outcomes, the
-streaming assistant reply); the right sidebar shows run status, step
-budget and elapsed time, recent tool calls with duration, the agent's
-todo list (updated live as the agent rewrites it), and running token /
-cost / context totals. The screen stays up between turns — a finished
-run does not dump you back into the raw console. `Ctrl+C` cancels the
-current turn while running and exits when idle; in `lithe run` mode the
-result stays on screen until you press `q`. Layout, wrapping and
-alignment are East-Asian-width aware; narrower terminals stack the two
-panes vertically. Pipes and CI keep the plain per-line output unchanged.
+The left pane is the conversation (task, compact tool-call summaries
+and outcomes, and the streaming assistant reply). The right sidebar shows
+run status, recent tools, todos, session-wide cumulative input/output/
+cached tokens and cost, plus the latest model-call context length and
+window percentage. The two panes are separate windows — selecting text
+in one never captures the other — and the conversation scrolls: mouse
+wheel, PageUp/PageDown, Home/End (a new turn jumps back to the output).
+F2 or `/sidebar` hides the status pane so a reply can be copied from a
+full-width screen; Shift+drag keeps the terminal's native selection. The
+screen stays up between turns; `Ctrl+C` cancels the current turn while
+running and exits when idle. In `lithe run` mode the result stays on
+screen until you press `q`. Layout, wrapping and alignment are
+East-Asian-width aware; narrower terminals stack the two panes
+vertically. Pipes and CI keep the plain per-line output unchanged.
 
 History carries across turns within a session (each turn is its own run
 in the store, replayed as context for the next). `/new` clears the
-session, `/tools` lists the registered tools, `/help` lists the commands.
+conversation history and session usage totals; `/tools` lists the
+registered tools, `/help` lists the commands.
 
 ### Extra capabilities
 

{lithe_cli-0.6.0 → lithe-cli-0.6.2}/tests/test_cli.py

@@ -244,6 +244,18 @@ def test_ui_banner_fits_terminal_width():
     assert "…" in out
 
 
+def test_ui_tool_call_hides_full_file_payload(capsys):
+    from lithe_cli.ui import UI
+
+    UI(color=False, width=80).tool_call(
+        "edit_file",
+        {"path": "src/example.py", "old_text": "private old text", "new_text": "replacement"},
+    )
+    output = capsys.readouterr().out
+    assert "edit_file" in output and "src/example.py" in output
+    assert "private old text" not in output and "replacement" not in output
+
+
 def test_run_dashboard_shows_tools_todos_and_usage():
     from lithe_cli.tui import TuiState
 
@@ -256,36 +268,150 @@ def test_run_dashboard_shows_tools_todos_and_usage():
         "type": "todo_change",
         "new": [{"content": "检查测试", "status": "in_progress"}],
     })
-    state.on_event({"type": "usage", "total_tokens": 120, "context_tokens": 100, "context_percent": 10.0, "cost": 0.001})
+    state.on_event({
+        "type": "usage",
+        "prompt_tokens": 100,
+        "completion_tokens": 20,
+        "cached_tokens": 60,
+        "total_tokens": 120,
+        "context_tokens": 100,
+        "context_window": 1000,
+        "context_percent": 10.0,
+        "cost": 0.001,
+    })
     state.on_event({"type": "assistant", "text": "检查完成"})
-    state.on_event({"type": "done", "status": "done", "steps": 3, "tokens": 120, "cost": 0.001})
+    state.on_event({
+        "type": "done",
+        "status": "done",
+        "steps": 3,
+        "tokens": 120,
+        "prompt_tokens": 100,
+        "completion_tokens": 20,
+        "cost": 0.001,
+        "context_tokens": 100,
+        "context_window": 1000,
+        "context_percent": 10.0,
+    })
 
     assert state.tools[0]["status"] == "done"
     assert state.tools[0]["elapsed"] is not None
     assert state.todos and state.todos[0]["content"] == "检查测试"
     assert state.tokens == 120 and state.last_status == "done"
+    assert state.input_tokens == 100 and state.output_tokens == 20
+    assert state.cached_tokens == 60 and state.context_window == 1000
     feed_text = "\n".join(text for _, text in state.feed)
-    assert "read_file" in feed_text and "检查完成" in feed_text
+    assert "read_file · 读取 main.py" in feed_text and "检查完成" in feed_text
+    assert '"path"' not in feed_text
 
-
-def test_run_dashboard_fits_narrow_terminal():
-    from lithe_cli.tui import TuiState, compose_footer, compose_frame
+    state.on_event({"type": "run_start"})
+    state.on_event({
+        "type": "usage",
+        "prompt_tokens": 50,
+        "completion_tokens": 10,
+        "cached_tokens": 25,
+        "total_tokens": 60,
+        "context_tokens": 50,
+        "context_window": 500,
+        "context_percent": 10.0,
+        "cost": 0.002,
+    })
+    state.on_event({
+        "type": "done",
+        "status": "done",
+        "tokens": 60,
+        "prompt_tokens": 50,
+        "completion_tokens": 10,
+        "cost": 0.002,
+        "context_tokens": 50,
+        "context_window": 500,
+        "context_percent": 10.0,
+    })
+    assert state.tokens == 180 and state.cost == pytest.approx(0.003)
+    assert state.input_tokens == 150 and state.output_tokens == 30
+    assert state.cached_tokens == 85 and state.context_tokens == 50
+    from lithe_cli.tui import _sidebar_lines
+
+    usage_text = "\n".join(text for _, text in _sidebar_lines(state))
+    assert "输入 150 · 输出 30" in usage_text
+    assert "缓存输入 85" in usage_text
+    assert "50 / 500 (10.0%)" in usage_text
+
+
+def test_system_prompt_prefers_localized_file_edits():
+    from lithe_cli.agent import SYSTEM_PROMPT_BASE
+
+    assert "优先用 edit_file 或 apply_patch 做局部修改" in SYSTEM_PROMPT_BASE
+    assert "仅在新建文件或确需整体重写时使用 write_file" in SYSTEM_PROMPT_BASE
+    assert "条数与实际步骤数一致" in SYSTEM_PROMPT_BASE
+    assert "不要固定写成 3 条" in SYSTEM_PROMPT_BASE
+
+
+def test_panes_fit_terminal_and_stay_independent():
+    from lithe_cli.tui import (
+        TuiState,
+        _header_row,
+        body_layout,
+        compose_footer,
+        conversation_rows,
+        sidebar_rows,
+    )
     from lithe_cli.ui import display_width
 
     state = TuiState("模型", "/工作区", 5)
     state.on_event({"type": "tool_call", "id": "c1", "name": "read_file", "args": {"path": "x"}})
     state.on_event({"type": "todo_change", "new": [{"content": "处理中文任务", "status": "pending"}]})
 
-    for width, height in ((100, 30), (76, 24), (56, 24), (40, 20)):
-        rows = compose_frame(state, width, height, "0.6.0")
-        assert len(rows) == height - 2
-        for row in rows:
-            assert display_width("".join(text for _, text in row)) <= width
+    for width, height in ((100, 27), (76, 21), (56, 21), (40, 17)):
+        (cw, ch), side = body_layout(state, width, height)
+        if side is None:
+            assert (cw, ch) == (width, height)
+        elif side[1] == ch:  # side-by-side: independent windows on the same rows
+            assert cw + side[0] == width and ch == height
+        else:  # stacked: panes share columns, not rows
+            assert cw == side[0] == width and ch + side[1] <= height
+        for rows, w, h in (
+            (conversation_rows(state, cw, ch), cw, ch),
+            (sidebar_rows(state, *side) if side else [], *(side or (0, 0))),
+        ):
+            if not rows:
+                continue
+            assert len(rows) == h
+            for row in rows:
+                assert display_width("".join(f[1] for f in row)) == w
+        assert all(display_width(t) <= width for t, _ in _header_row(state, width, "0.7.0"))
         assert all(display_width(text) <= width for _, text in compose_footer(state, width, " hint "))
-    wide = "\n".join("".join(t for _, t in row) for row in compose_frame(state, 100, 30, "0.6.0"))
-    narrow = "\n".join("".join(t for _, t in row) for row in compose_frame(state, 56, 24, "0.6.0"))
-    assert "对话" in wide and "运行状态" in wide
-    assert "处理中文任务" in narrow  # stacked layout still shows todos
+    assert "处理中文任务" in "\n".join(
+        "".join(f[1] for f in row) for row in sidebar_rows(state, 40, 17)
+    )
+
+    state.show_sidebar = False
+    (cw, ch), side = body_layout(state, 100, 27)
+    assert side is None and (cw, ch) == (100, 27)
+
+
+def test_conversation_pane_scrolls_back_and_clamps():
+    from lithe_cli.tui import TuiState, conversation_rows
+
+    state = TuiState("模型", "/工作区", 5)
+    for i in range(30):
+        state.say("assistant", f"第 {i} 行")
+    rows = conversation_rows(state, 60, 12)
+    text = "\n".join("".join(f[1] for f in row) for row in rows)
+    assert "第 29 行" in text and "第 0 行" not in text
+
+    state.scroll = 10**9  # Home: clamp to the very top
+    rows = conversation_rows(state, 60, 12)
+    text = "\n".join("".join(f[1] for f in row) for row in rows)
+    assert "第 0 行" in text and "第 29 行" not in text
+    assert state.scroll == 30 - 10
+
+    state.scroll = 5  # mid viewport: last visible line is 10 lines above the tail
+    rows = conversation_rows(state, 60, 12)
+    text = "\n".join("".join(f[1] for f in row) for row in rows)
+    assert "第 15 行" in text and "第 24 行" in text and "第 29 行" not in text
+
+    state.on_event({"type": "run_start"})  # a new turn resumes following the tail
+    assert state.scroll == 0
 
 
 def test_wrap_text_is_cjk_aware():
@@ -546,6 +672,37 @@ def _pty_drain(fd) -> bytes:
     return out
 
 
+def test_fullscreen_app_scrolls_and_toggles_sidebar():
+    code = """
+import asyncio
+from lithe_cli.tui import TuiState, build_app
+
+async def main():
+    state = TuiState("m", "/ws", 5)
+    for i in range(40):
+        state.say("assistant", f"line {i}")
+    app, _ = build_app(state, "chat", "0.7.0", lambda text: None)
+    await app.run_async()
+    print(f"RESULT scroll={state.scroll} sidebar={state.show_sidebar}")
+
+asyncio.run(main())
+"""
+    feed = [
+        b"\x1b[5~",   # PageUp: scroll back
+        b"\x1b[6~",   # PageDown: back to the tail
+        b"\x1bOQ",    # F2: hide the sidebar
+        b"\x1b[5~",   # PageUp again: leave a nonzero offset
+        b"\x1b[5~",
+        b"\x03",      # Ctrl+C exits
+    ]
+    out, rc = _pty_run(code, feed, settle=0.4)
+    assert rc == 0
+    assert "RESULT scroll=" in out
+    assert "scroll=0 " not in out  # two PageUps must leave a nonzero offset
+    assert "sidebar=False" in out
+    assert "Traceback" not in out
+
+
 def test_prompt_toolkit_cjk_paste_password_history(tmp_path):
     # the exact long Chinese line that readline corrupted in the field,
     # driven through the real prompt_toolkit stack