diff --git a/CHANGELOG.md b/CHANGELOG.md
index adede049..5c529e59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,24 @@
 
 ## [Unreleased]
 
+## [0.4.20] - 2026-09-21
+
+### 新增
+- 对话：长对话左侧出现聊天大纲，点刻度可跳到自己发出的消息；悬停预览，当前轮高亮
+- 对话：顶栏可切换会话，Alt+↑ / Alt+↓ 切上一条 / 下一条
+- 对话：本轮改过的文件会列出来，点「查看修改」可预览
+
+### 改进
+- 对话：历史按工作目录分组，侧栏入口改成「工作区」；组标题显示文件夹名，悬停看路径，加号开新会话
+- 对话：思考过程和工具分开显示；思考是可折叠段，完成后写时长
+- 对话：计划条标出待做 / 进行中 / 已完成，可收起；Claude 新对话的任务清单接到计划条
+- 对话：顶栏不再写这次怎么接；从历史继续时，对上对方会话就复用
+- 用量：刷新嵌入的模型单价
+
+### 修复
+- 对话：宽面板下聊天大纲会挂上可点刻度，不再只留下看不见的测量层
+- 对话：点「新建对话」不再因循环引用卡住
+
 ## [0.4.19] - 2026-09-17
 
 ### 新增
diff --git a/Cargo.lock b/Cargo.lock
index 56fa8dbd..a64f20ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,7 +10,7 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "agenthub-cli"
-version = "0.4.19"
+version = "0.4.20"
 dependencies = [
  "agenthub-core",
  "clap",
@@ -24,7 +24,7 @@ dependencies = [
 
 [[package]]
 name = "agenthub-core"
-version = "0.4.19"
+version = "0.4.20"
 dependencies = [
  "async-stream",
  "axum",
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "agenthub-gui"
-version = "0.4.19"
+version = "0.4.20"
 dependencies = [
  "agenthub-core",
  "base64 0.22.1",
diff --git a/Cargo.toml b/Cargo.toml
index 87ff675b..87540c18 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.4.19"
+version = "0.4.20"
 edition = "2021"
 license = "MIT"
 authors = ["AgentHub"]
diff --git a/crates/agenthub-core/src/services/chat_runtime/actor_tests.rs b/crates/agenthub-core/src/services/chat_runtime/actor_tests.rs
index 7f3ff93e..62681eae 100644
--- a/crates/agenthub-core/src/services/chat_runtime/actor_tests.rs
+++ b/crates/agenthub-core/src/services/chat_runtime/actor_tests.rs
@@ -2651,6 +2651,175 @@ fn claude_stream_result_completes_turn_and_keeps_session() {
     );
 }
 
+#[test]
+fn claude_todo_write_fills_snapshot_not_timeline() {
+    let db = Database::open_in_memory().unwrap();
+    conversation_with(&db, "claude-plan", AgentId::Claude, &std::env::temp_dir());
+    let mut worker = worker(&db, "claude-plan");
+    worker.agent = AgentId::Claude;
+    worker.store.enable_if_new("claude-plan").unwrap();
+    start_placeholder(&mut worker);
+
+    worker
+        .notification(
+            "claude/stream",
+            &json!({
+                "type": "assistant",
+                "session_id": "claude-sess-plan",
+                "message": {
+                    "role": "assistant",
+                    "content": [{
+                        "type": "tool_use",
+                        "id": "toolu_todo",
+                        "name": "TodoWrite",
+                        "input": {
+                            "todos": [
+                                { "content": "read", "status": "completed" },
+                                { "content": "edit", "status": "in_progress" }
+                            ]
+                        }
+                    }]
+                }
+            }),
+        )
+        .unwrap();
+
+    let stored = worker.store.snapshot("claude-plan", None).unwrap();
+    assert!(!stored.events.iter().any(|event| matches!(
+        &event.event,
+        ChatEvent::AgentProcess { .. }
+    )));
+    let snapshot = worker.with_catalog_epoch(stored);
+    assert_eq!(snapshot.plan.len(), 2);
+    assert_eq!(snapshot.plan[0].content, "read");
+    assert_eq!(snapshot.plan[0].status.as_deref(), Some("completed"));
+    assert_eq!(snapshot.plan[1].content, "edit");
+    assert_eq!(snapshot.plan[1].status.as_deref(), Some("in_progress"));
+
+    worker
+        .notification(
+            "claude/stream",
+            &json!({
+                "type": "assistant",
+                "message": {
+                    "content": [{
+                        "type": "tool_use",
+                        "id": "toolu_create",
+                        "name": "TaskCreate",
+                        "input": { "subject": "write tests" }
+                    }]
+                }
+            }),
+        )
+        .unwrap();
+    worker
+        .notification(
+            "claude/stream",
+            &json!({
+                "type": "user",
+                "tool_use_result": { "task": { "id": "task-2", "subject": "write tests" } },
+                "message": {
+                    "content": [{
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_create",
+                        "content": "created"
+                    }]
+                }
+            }),
+        )
+        .unwrap();
+    worker
+        .notification(
+            "claude/stream",
+            &json!({
+                "type": "assistant",
+                "message": {
+                    "content": [{
+                        "type": "tool_use",
+                        "name": "TaskUpdate",
+                        "input": { "taskId": "task-2", "status": "in_progress" }
+                    }]
+                }
+            }),
+        )
+        .unwrap();
+
+    worker
+        .notification(
+            "claude/stream",
+            &json!({
+                "type": "user",
+                "tool_use_result": {
+                    "oldTodos": [{ "content": "read", "status": "pending" }],
+                    "newTodos": [{ "content": "read", "status": "completed" }]
+                },
+                "message": {
+                    "content": [{
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_todo",
+                        "content": "Todos have been modified successfully."
+                    }]
+                }
+            }),
+        )
+        .unwrap();
+    worker
+        .notification(
+            "claude/stream",
+            &json!({
+                "type": "assistant",
+                "message": {
+                    "content": [{
+                        "type": "tool_use",
+                        "id": "toolu_bash",
+                        "name": "Bash",
+                        "input": { "command": "ls" }
+                    }]
+                }
+            }),
+        )
+        .unwrap();
+    worker
+        .notification(
+            "claude/stream",
+            &json!({
+                "type": "assistant",
+                "message": {
+                    "content": [{
+                        "type": "tool_use",
+                        "name": "TodoWrite",
+                        "input": { "todos": [] }
+                    }]
+                }
+            }),
+        )
+        .unwrap();
+
+    let patched = worker.with_catalog_epoch(worker.store.snapshot("claude-plan", None).unwrap());
+    assert_eq!(patched.plan.len(), 3);
+    assert_eq!(patched.plan[2].content, "write tests");
+    assert_eq!(patched.plan[2].id.as_deref(), Some("task-2"));
+    assert_eq!(patched.plan[2].status.as_deref(), Some("in_progress"));
+    assert!(patched.events.iter().any(|event| matches!(
+        &event.event,
+        ChatEvent::AgentProcess {
+            step: crate::models::ProcessStep::Tool { name, .. },
+            ..
+        } if name == "Bash"
+    )));
+    assert!(!patched.events.iter().any(|event| matches!(
+        &event.event,
+        ChatEvent::AgentProcess {
+            step: crate::models::ProcessStep::Tool { name, .. },
+            ..
+        } if name == "TodoWrite" || name == "TaskCreate" || name == "TaskUpdate" || name == "tool"
+    )));
+
+    worker.clear_turn_plan();
+    let cleared = worker.with_catalog_epoch(worker.store.snapshot("claude-plan", None).unwrap());
+    assert!(cleared.plan.is_empty());
+}
+
 #[cfg(unix)]
 #[test]
 fn grok_fs_write_outside_cwd_emits_card_then_writes_on_allow() {
diff --git a/crates/agenthub-core/src/services/chat_runtime/mod.rs b/crates/agenthub-core/src/services/chat_runtime/mod.rs
index 8effa3f4..7ad8cf74 100644
--- a/crates/agenthub-core/src/services/chat_runtime/mod.rs
+++ b/crates/agenthub-core/src/services/chat_runtime/mod.rs
@@ -102,6 +102,10 @@ struct CatalogCache {
     image_input: Option<bool>,
     catalog_epoch: i64,
     plan: Vec<RuntimePlanEntry>,
+    /// TaskCreate tool_use id → subject, until the result assigns a task id.
+    pending_plan_creates: Vec<(String, String)>,
+    /// Plan-tool `tool_use` ids this turn, so matching results stay off the timeline.
+    plan_tool_use_ids: Vec<String>,
     /// Conversation-local Always allow. Survives catalog refetch; not SQLite.
     session_allow_always: bool,
 }
@@ -117,6 +121,8 @@ fn merge_catalog_cache(previous: Option<&CatalogCache>, mut fetched: CatalogCach
         fetched.catalog_epoch = previous.catalog_epoch.max(fetched.catalog_epoch);
         if fetched.plan.is_empty() {
             fetched.plan = previous.plan.clone();
+            fetched.pending_plan_creates = previous.pending_plan_creates.clone();
+            fetched.plan_tool_use_ids = previous.plan_tool_use_ids.clone();
         }
         fetched.session_allow_always =
             fetched.session_allow_always || previous.session_allow_always;
@@ -124,6 +130,128 @@ fn merge_catalog_cache(previous: Option<&CatalogCache>, mut fetched: CatalogCach
     fetched
 }
 
+fn apply_claude_plan_op(
+    cache: &mut CatalogCache,
+    op: crate::utils::stream_parse::claude::ClaudePlanOp,
+) {
+    use crate::utils::stream_parse::claude::ClaudePlanOp;
+    match op {
+        ClaudePlanOp::Replace(entries) => {
+            let next: Vec<RuntimePlanEntry> = entries
+                .into_iter()
+                .filter(|entry| !entry.content.trim().is_empty())
+                .map(|entry| RuntimePlanEntry {
+                    content: entry.content,
+                    status: entry.status,
+                    priority: entry.priority,
+                    id: entry.id,
+                })
+                .collect();
+            if next.is_empty() {
+                return;
+            }
+            cache.plan = next;
+            cache.pending_plan_creates.clear();
+        }
+        ClaudePlanOp::Create {
+            tool_use_id,
+            content,
+            status,
+            id,
+            priority,
+        } => {
+            let content = content.trim();
+            if content.is_empty() {
+                return;
+            }
+            if let Some(existing_id) = id
+                .as_deref()
+                .map(str::trim)
+                .filter(|value| !value.is_empty())
+            {
+                if let Some(existing) = cache
+                    .plan
+                    .iter_mut()
+                    .find(|entry| entry.id.as_deref() == Some(existing_id))
+                {
+                    existing.content = content.to_string();
+                    if status.is_some() {
+                        existing.status = status;
+                    }
+                    if priority.is_some() {
+                        existing.priority = priority;
+                    }
+                    return;
+                }
+            }
+            cache.plan.push(RuntimePlanEntry {
+                content: content.to_string(),
+                status: status.or_else(|| Some("pending".into())),
+                priority,
+                id: id.filter(|value| !value.trim().is_empty()),
+            });
+            if let Some(tool_use_id) = tool_use_id.filter(|value| !value.is_empty()) {
+                cache
+                    .pending_plan_creates
+                    .push((tool_use_id, content.to_string()));
+            }
+        }
+        ClaudePlanOp::Update {
+            id,
+            status,
+            content,
+            priority,
+        } => {
+            let id = id.trim();
+            if id.is_empty() {
+                return;
+            }
+            let deleted = status.as_deref().is_some_and(|value| {
+                matches!(
+                    value.trim().to_ascii_lowercase().as_str(),
+                    "deleted" | "removed"
+                )
+            });
+            if deleted {
+                cache.plan.retain(|entry| entry.id.as_deref() != Some(id));
+                return;
+            }
+            if let Some(existing) = cache
+                .plan
+                .iter_mut()
+                .find(|entry| entry.id.as_deref() == Some(id))
+            {
+                if let Some(status) = status {
+                    existing.status = Some(status);
+                }
+                if let Some(content) = content.filter(|value| !value.trim().is_empty()) {
+                    existing.content = content;
+                }
+                if let Some(priority) = priority {
+                    existing.priority = Some(priority);
+                }
+            }
+        }
+        ClaudePlanOp::BindId { tool_use_id, id } => {
+            let Some(pos) = cache
+                .pending_plan_creates
+                .iter()
+                .position(|(pending, _)| pending == &tool_use_id)
+            else {
+                return;
+            };
+            let (_, subject) = cache.pending_plan_creates.remove(pos);
+            if let Some(entry) = cache
+                .plan
+                .iter_mut()
+                .find(|entry| entry.id.is_none() && entry.content == subject)
+            {
+                entry.id = Some(id);
+            }
+        }
+    }
+}
+
 /// Map product identity → transport channel. Same channel (e.g. ACP) may be
 /// shared by multiple AgentIds; identities remain distinct (identity families).
 fn runtime_channel(agent: Option<AgentId>) -> RuntimeChannel {
@@ -1439,7 +1567,7 @@ impl ActorWorker {
         let now = Utc::now().to_rfc3339();
         let message_id = format!("msg-{}", Uuid::new_v4());
         let mut user = ChatMessage {
-            id: format!("msg-{}", Uuid::new_v4()),
+            id: client_request_id.to_string(),
             conversation_id: self.conversation_id.clone(),
             turn: 0,
             role: ChatRole::User,
@@ -1906,6 +2034,12 @@ impl ActorWorker {
             }
         }
 
+        self.remember_claude_plan_tools(params);
+        let plan_ops = crate::utils::stream_parse::claude::extract_todo_plan(params);
+        if !plan_ops.is_empty() {
+            self.apply_claude_plan(plan_ops);
+        }
+
         let ty = params.get("type").and_then(Value::as_str).unwrap_or("");
         if ty == "result" {
             let is_err = params
@@ -1919,6 +2053,9 @@ impl ActorWorker {
             if let Some(steps) = crate::utils::stream_parse::claude::parse_line(&params.to_string())
             {
                 for step in steps {
+                    if self.drops_claude_plan_process(&step) {
+                        continue;
+                    }
                     match step {
                         ProcessStep::Text { text } => {
                             if !text.is_empty() {
@@ -1993,6 +2130,9 @@ impl ActorWorker {
             return Ok(());
         };
         for step in steps {
+            if self.drops_claude_plan_process(&step) {
+                continue;
+            }
             match step {
                 ProcessStep::Text { text } => {
                     if !text.is_empty() {
@@ -3247,15 +3387,62 @@ impl ActorWorker {
                     content: entry.content,
                     status: entry.status,
                     priority: entry.priority,
+                    id: None,
                 })
                 .collect();
         }
     }
 
+    fn apply_claude_plan(&self, ops: Vec<crate::utils::stream_parse::claude::ClaudePlanOp>) {
+        if ops.is_empty() {
+            return;
+        }
+        if let Ok(mut guard) = self.catalogs.lock() {
+            let cache = guard.entry(self.conversation_id.clone()).or_default();
+            for op in ops {
+                apply_claude_plan_op(cache, op);
+            }
+        }
+    }
+
+    fn remember_claude_plan_tools(&self, params: &Value) {
+        let ids = crate::utils::stream_parse::claude::plan_tool_use_ids(params);
+        if ids.is_empty() {
+            return;
+        }
+        if let Ok(mut guard) = self.catalogs.lock() {
+            let cache = guard.entry(self.conversation_id.clone()).or_default();
+            for id in ids {
+                if !cache.plan_tool_use_ids.iter().any(|existing| existing == &id) {
+                    cache.plan_tool_use_ids.push(id);
+                }
+            }
+        }
+    }
+
+    fn drops_claude_plan_process(&self, step: &ProcessStep) -> bool {
+        let ProcessStep::Tool { id, name, .. } = step else {
+            return false;
+        };
+        if crate::utils::stream_parse::claude::is_claude_plan_tool_name(name) {
+            return true;
+        }
+        let Some(id) = id.as_deref() else {
+            return false;
+        };
+        self.catalogs.lock().ok().is_some_and(|guard| {
+            guard
+                .get(&self.conversation_id)
+                .is_some_and(|cache| cache.plan_tool_use_ids.iter().any(|known| known == id))
+        })
+    }
+
     fn clear_turn_plan(&self) {
         if let Ok(mut guard) = self.catalogs.lock() {
             if let Some(entry) = guard.get_mut(&self.conversation_id) {
                 entry.plan.clear();
+                entry.pending_plan_creates.clear();
+                entry.plan_tool_use_ids.clear();
             }
         }
     }
diff --git a/crates/agenthub-core/src/services/chat_runtime/tests.rs b/crates/agenthub-core/src/services/chat_runtime/tests.rs
index 49fd690f..bf1f5d66 100644
--- a/crates/agenthub-core/src/services/chat_runtime/tests.rs
+++ b/crates/agenthub-core/src/services/chat_runtime/tests.rs
@@ -131,6 +131,7 @@ fn begin_turn_bumps_conversation_sort_time_without_renaming() {
             }]
         })
         .unwrap();
+    assert_eq!(user.id, "user-1");
 
     let listed = repo.list_conversations().unwrap();
     assert_eq!(listed[0].id, "older");
diff --git a/crates/agenthub-core/src/services/chat_runtime/types.rs b/crates/agenthub-core/src/services/chat_runtime/types.rs
index 2077b94a..ec4fc992 100644
--- a/crates/agenthub-core/src/services/chat_runtime/types.rs
+++ b/crates/agenthub-core/src/services/chat_runtime/types.rs
@@ -141,7 +141,7 @@ pub struct RuntimeSnapshot {
     /// Bumps when Options catalog changes (slash commands, handshake image). Not the command list.
     #[serde(default)]
     pub catalog_epoch: i64,
-    /// Current-turn ACP plan. Live chrome only — not a process row, dropped on the next turn.
+    /// Current-turn plan. Live chrome only — not a process row, dropped on the next turn.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub plan: Vec<RuntimePlanEntry>,
     /// Live ACP host commands. One card per terminal id; not a conversation TTY.
@@ -193,6 +193,9 @@ pub struct RuntimePlanEntry {
     pub status: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub priority: Option<String>,
+    /// Vendor task id when the Agent sent one. Matching only; not shown.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub id: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
diff --git a/crates/agenthub-core/src/services/chat_service.rs b/crates/agenthub-core/src/services/chat_service.rs
index 6fdd1fe8..b1a59f4b 100644
--- a/crates/agenthub-core/src/services/chat_service.rs
+++ b/crates/agenthub-core/src/services/chat_service.rs
@@ -128,7 +128,8 @@ impl ChatService {
 
     /// Open or create an AgentHub conversation keyed by official session id.
     /// History comes from the store (or is imported once). Missing cwd is kept
-    /// for display and never fails this call.
+    /// for display and never fails this call. Same Agent and working directory
+    /// without that session id still create a new row.
     pub fn open_from_session(
         &self,
         agent_id: AgentId,
diff --git a/crates/agenthub-core/src/services/chat_service/tests.rs b/crates/agenthub-core/src/services/chat_service/tests.rs
index 197064b3..a705ef35 100644
--- a/crates/agenthub-core/src/services/chat_service/tests.rs
+++ b/crates/agenthub-core/src/services/chat_service/tests.rs
@@ -1715,6 +1715,48 @@ fn rebind_missing_cwd_allowed_after_session_starts() {
     assert_eq!(chat.list_messages(&again.id).unwrap().len(), 2);
 }
 
+#[test]
+fn open_from_session_creates_when_native_id_is_new() {
+    let dir = tempdir().unwrap();
+    let db = Database::open(&dir.path().join("t.db")).unwrap();
+    let run = Arc::new(RunService::with_runner(
+        deterministic_registry(),
+        Arc::new(RecordingProcessRunner::new()),
+    ));
+    let chat = ChatService::new(db, run);
+    let existing = chat
+        .create_conversation(vec![AgentId::Claude], Some("/work/app".into()))
+        .unwrap();
+
+    let opened = chat
+        .open_from_session(
+            AgentId::Claude,
+            Some("sess-history".into()),
+            Some("/work/app".into()),
+            Some("历史里的那场".into()),
+            vec![ChatHistoryTurn {
+                role: ChatRole::User,
+                content: "接着改登录页".into(),
+            }],
+        )
+        .unwrap();
+    assert_ne!(opened.id, existing.id);
+    assert_eq!(opened.native_session_id.as_deref(), Some("sess-history"));
+    assert_eq!(chat.list_conversations().unwrap().len(), 2);
+
+    let again = chat
+        .open_from_session(
+            AgentId::Claude,
+            Some("sess-history".into()),
+            Some("/work/app".into()),
+            Some("忽略".into()),
+            vec![],
+        )
+        .unwrap();
+    assert_eq!(again.id, opened.id);
+    assert_eq!(chat.list_conversations().unwrap().len(), 2);
+}
+
 #[test]
 fn rebind_missing_cwd_rejects_clear() {
     let dir = tempdir().unwrap();
diff --git a/crates/agenthub-core/src/usage/embedded-pricing.json b/crates/agenthub-core/src/usage/embedded-pricing.json
index 851f7c1b..7a572a81 100644
--- a/crates/agenthub-core/src/usage/embedded-pricing.json
+++ b/crates/agenthub-core/src/usage/embedded-pricing.json
@@ -413,12 +413,24 @@
     "cacheCreate": 2.5,
     "cacheRead": 0.5
   },
+  "dashscope/qwen3.8-flash": {
+    "input": 0.15,
+    "output": 0.47,
+    "cacheCreate": 0.2,
+    "cacheRead": 0.016
+  },
   "dashscope/qwen3.8-max": {
     "input": 2,
     "output": 6,
     "cacheCreate": 2,
     "cacheRead": 0.25
   },
+  "dashscope/qwen3.8-omni-flash": {
+    "input": 0.15,
+    "output": 0.47,
+    "cacheCreate": 0.15,
+    "cacheRead": 0.016
+  },
   "dashscope/qwq-plus": {
     "input": 0.8,
     "output": 2.4,
@@ -821,17 +833,17 @@
     "cacheRead": 0.03
   },
   "gemini-flash-latest": {
+    "input": 0.75,
+    "output": 3.75,
+    "cacheCreate": 0.75,
+    "cacheRead": 0.075
+  },
+  "gemini-flash-lite-latest": {
     "input": 0.3,
     "output": 2.5,
     "cacheCreate": 0.3,
     "cacheRead": 0.03
   },
-  "gemini-flash-lite-latest": {
-    "input": 0.1,
-    "output": 0.4,
-    "cacheCreate": 0.1,
-    "cacheRead": 0.01
-  },
   "gemini-gemma-2-27b-it": {
     "input": 0.35,
     "output": 1.05,
@@ -853,13 +865,13 @@
     "cacheCreate": 1.5
   },
   "gemini-pro-latest": {
-    "input": 1.25,
-    "output": 10,
-    "cacheCreate": 1.25,
-    "cacheRead": 0.125,
-    "inputAbove200k": 2.5,
-    "outputAbove200k": 15,
-    "cacheReadAbove200k": 0.25
+    "input": 2,
+    "output": 12,
+    "cacheCreate": 2,
+    "cacheRead": 0.2,
+    "inputAbove200k": 4,
+    "outputAbove200k": 18,
+    "cacheReadAbove200k": 0.4
   },
   "gemini-robotics-er-1.5-preview": {
     "input": 0.3,
@@ -873,10 +885,10 @@
     "cacheCreate": 1
   },
   "gemini-robotics-er-2-preview": {
-    "input": 2,
-    "output": 10,
-    "cacheCreate": 2,
-    "cacheRead": 0.2
+    "input": 1,
+    "output": 5,
+    "cacheCreate": 1,
+    "cacheRead": 0.1
   },
   "gemini-robotics-er-2-streaming-preview": {
     "input": 2,
@@ -1029,17 +1041,17 @@
     "cacheRead": 0.075
   },
   "gemini/gemini-flash-latest": {
+    "input": 0.75,
+    "output": 3.75,
+    "cacheCreate": 0.75,
+    "cacheRead": 0.075
+  },
+  "gemini/gemini-flash-lite-latest": {
     "input": 0.3,
     "output": 2.5,
     "cacheCreate": 0.3,
     "cacheRead": 0.03
   },
-  "gemini/gemini-flash-lite-latest": {
-    "input": 0.1,
-    "output": 0.4,
-    "cacheCreate": 0.1,
-    "cacheRead": 0.01
-  },
   "gemini/gemini-gemma-2-27b-it": {
     "input": 0.35,
     "output": 1.05,
@@ -1061,13 +1073,13 @@
     "cacheCreate": 1.5
   },
   "gemini/gemini-pro-latest": {
-    "input": 1.25,
-    "output": 10,
-    "cacheCreate": 1.25,
-    "cacheRead": 0.125,
-    "inputAbove200k": 2.5,
-    "outputAbove200k": 15,
-    "cacheReadAbove200k": 0.25
+    "input": 2,
+    "output": 12,
+    "cacheCreate": 2,
+    "cacheRead": 0.2,
+    "inputAbove200k": 4,
+    "outputAbove200k": 18,
+    "cacheReadAbove200k": 0.4
   },
   "gemini/gemini-robotics-er-1.5-preview": {
     "input": 0.3,
@@ -1081,10 +1093,10 @@
     "cacheCreate": 1
   },
   "gemini/gemini-robotics-er-2-preview": {
-    "input": 2,
-    "output": 10,
-    "cacheCreate": 2,
-    "cacheRead": 0.2
+    "input": 1,
+    "output": 5,
+    "cacheCreate": 1,
+    "cacheRead": 0.1
   },
   "gemini/gemini-robotics-er-2-streaming-preview": {
     "input": 2,
@@ -2830,12 +2842,24 @@
     "cacheCreate": 2.5,
     "cacheRead": 0.5
   },
+  "qwen3.8-flash": {
+    "input": 0.15,
+    "output": 0.47,
+    "cacheCreate": 0.2,
+    "cacheRead": 0.016
+  },
   "qwen3.8-max": {
     "input": 2,
     "output": 6,
     "cacheCreate": 2,
     "cacheRead": 0.25
   },
+  "qwen3.8-omni-flash": {
+    "input": 0.15,
+    "output": 0.47,
+    "cacheCreate": 0.15,
+    "cacheRead": 0.016
+  },
   "qwq-plus": {
     "input": 0.8,
     "output": 2.4,
diff --git a/crates/agenthub-core/src/usage/embedded-pricing.meta.json b/crates/agenthub-core/src/usage/embedded-pricing.meta.json
index c0cd1b5d..91c1bc61 100644
--- a/crates/agenthub-core/src/usage/embedded-pricing.meta.json
+++ b/crates/agenthub-core/src/usage/embedded-pricing.meta.json
@@ -1,9 +1,9 @@
 {
   "source": "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json",
-  "fetchedAt": "2026-09-16T11:17:33.814Z",
-  "modelCount": 515,
-  "fromLitellmRows": 299,
-  "aliasKeysAdded": 211,
+  "fetchedAt": "2026-09-20T11:05:19.474Z",
+  "modelCount": 519,
+  "fromLitellmRows": 301,
+  "aliasKeysAdded": 213,
   "overrideKeys": 16,
   "unit": "USD per 1M tokens",
   "notes": "Offline embedded snapshot. Runtime does not fetch pricing. Re-run scripts/update-embedded-pricing.mjs or wait for daily CI."
diff --git a/crates/agenthub-core/src/utils/stream_parse/claude.rs b/crates/agenthub-core/src/utils/stream_parse/claude.rs
index 71728293..e52b4bd8 100644
--- a/crates/agenthub-core/src/utils/stream_parse/claude.rs
+++ b/crates/agenthub-core/src/utils/stream_parse/claude.rs
@@ -56,8 +56,16 @@ impl ClaudeStreamParser {
             "user" => Some(parse_user_tool_results(&v)),
             "result" => Some(self.parse_result(&v)),
             "content_block_delta" | "stream_event" => self.parse_deltaish(&v),
-            "tool_use" => Some(vec![tool_from_obj(&v, "start")]),
-            "tool_result" => Some(vec![tool_result_from_obj(&v)]),
+            "tool_use" => Some(if is_claude_plan_tool_name(tool_name(&v)) {
+                vec![]
+            } else {
+                vec![tool_from_obj(&v, "start")]
+            }),
+            "tool_result" => Some(if is_claude_plan_result(&v) {
+                vec![]
+            } else {
+                vec![tool_result_from_obj(&v)]
+            }),
             "error" => {
                 let message = v
                     .get("error")
@@ -145,7 +153,11 @@ impl ClaudeStreamParser {
                             });
                         }
                     }
-                    "tool_use" => steps.push(tool_from_obj(block, "start")),
+                    "tool_use" => {
+                        if !is_claude_plan_tool_name(tool_name(block)) {
+                            steps.push(tool_from_obj(block, "start"));
+                        }
+                    }
                     _ => {}
                 }
             }
@@ -225,6 +237,7 @@ pub fn parse_line(line: &str) -> Option<Vec<ProcessStep>> {
 
 fn parse_user_tool_results(v: &Value) -> Vec<ProcessStep> {
     let mut steps = Vec::new();
+    let parent_plan_result = looks_like_plan_output(v);
     let content = v
         .pointer("/message/content")
         .or_else(|| v.get("content"))
@@ -232,14 +245,22 @@ fn parse_user_tool_results(v: &Value) -> Vec<ProcessStep> {
         .unwrap_or(Value::Null);
     if let Some(arr) = content.as_array() {
         for block in arr {
-            if block.get("type").and_then(|t| t.as_str()) == Some("tool_result") {
-                steps.push(tool_result_from_obj(block));
+            if block.get("type").and_then(|t| t.as_str()) != Some("tool_result") {
+                continue;
+            }
+            if is_claude_plan_result(block) || (parent_plan_result && tool_name(block).is_empty()) {
+                continue;
             }
+            steps.push(tool_result_from_obj(block));
         }
     }
     steps
 }
 
+fn tool_name(v: &Value) -> &str {
+    v.get("name").and_then(|name| name.as_str()).unwrap_or("")
+}
+
 fn tool_from_obj(v: &Value, status: &str) -> ProcessStep {
     let id = v
         .get("id")
@@ -300,5 +321,301 @@ fn tool_result_from_obj(v: &Value) -> ProcessStep {
     }
 }
 
+/// One Claude todo / Task tool row. Not a `ProcessStep`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct ClaudePlanEntry {
+    pub content: String,
+    pub status: Option<String>,
+    pub priority: Option<String>,
+    pub id: Option<String>,
+}
+
+/// Mutations from TodoWrite / Task* tool_use and matching results.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) enum ClaudePlanOp {
+    Replace(Vec<ClaudePlanEntry>),
+    Create {
+        tool_use_id: Option<String>,
+        content: String,
+        status: Option<String>,
+        id: Option<String>,
+        priority: Option<String>,
+    },
+    Update {
+        id: String,
+        status: Option<String>,
+        content: Option<String>,
+        priority: Option<String>,
+    },
+    BindId {
+        tool_use_id: String,
+        id: String,
+    },
+}
+
+/// TodoWrite replaces the list; TaskCreate/TaskUpdate patch it. Not a process row.
+pub(crate) fn extract_todo_plan(v: &Value) -> Vec<ClaudePlanOp> {
+    if let Some(event) = v.get("event") {
+        let nested = extract_todo_plan(event);
+        if !nested.is_empty() {
+            return nested;
+        }
+    }
+    let mut ops = Vec::new();
+    for_each_tool_use(v, |block| {
+        if let Some(op) = plan_op_from_tool_use(block) {
+            ops.push(op);
+        }
+    });
+    ops.extend(plan_ops_from_results(v));
+    ops
+}
+
+pub(crate) fn is_claude_plan_tool_name(name: &str) -> bool {
+    plan_tool_kind(name).is_some()
+}
+
+pub(crate) fn plan_tool_use_ids(v: &Value) -> Vec<String> {
+    let mut ids = Vec::new();
+    for_each_tool_use(v, |block| {
+        if !is_claude_plan_tool_name(tool_name(block)) {
+            return;
+        }
+        if let Some(id) = first_str(block, &["id", "tool_use_id"]) {
+            ids.push(id);
+        }
+    });
+    ids
+}
+
+fn is_claude_plan_result(v: &Value) -> bool {
+    is_claude_plan_tool_name(tool_name(v)) || looks_like_plan_output(v)
+}
+
+fn plan_tool_kind(name: &str) -> Option<&'static str> {
+    let compact = name
+        .trim()
+        .to_ascii_lowercase()
+        .replace(['_', '-', ' '], "");
+    match compact.as_str() {
+        "todowrite" => Some("write"),
+        "todoread" => Some("read"),
+        "taskcreate" => Some("create"),
+        "taskupdate" => Some("update"),
+        "taskget" => Some("get"),
+        "tasklist" => Some("list"),
+        _ => None,
+    }
+}
+
+fn for_each_tool_use(v: &Value, mut visit: impl FnMut(&Value)) {
+    let ty = v.get("type").and_then(Value::as_str).unwrap_or("");
+    if ty == "tool_use" {
+        visit(v);
+        return;
+    }
+    if let Some(block) = v.get("content_block") {
+        if block.get("type").and_then(Value::as_str) == Some("tool_use") {
+            visit(block);
+        }
+    }
+    let content = v.pointer("/message/content").or_else(|| v.get("content"));
+    if let Some(items) = content.and_then(Value::as_array) {
+        for block in items {
+            if block.get("type").and_then(Value::as_str) == Some("tool_use") {
+                visit(block);
+            }
+        }
+    }
+}
+
+fn plan_op_from_tool_use(block: &Value) -> Option<ClaudePlanOp> {
+    let kind = plan_tool_kind(tool_name(block))?;
+    let input = block.get("input").unwrap_or(&Value::Null);
+    match kind {
+        "write" => {
+            let entries = input
+                .get("todos")
+                .and_then(Value::as_array)
+                .into_iter()
+                .flatten()
+                .filter_map(parse_plan_entry)
+                .collect::<Vec<_>>();
+            Some(ClaudePlanOp::Replace(entries))
+        }
+        "create" => {
+            let content = first_str(input, &["subject", "content", "text", "title"])?;
+            Some(ClaudePlanOp::Create {
+                tool_use_id: first_str(block, &["id", "tool_use_id"]),
+                content,
+                status: first_str(input, &["status"]).or_else(|| Some("pending".into())),
+                id: first_str(input, &["taskId", "id", "task_id"]),
+                priority: first_str(input, &["priority"]),
+            })
+        }
+        "update" => {
+            let id = first_str(input, &["taskId", "id", "task_id"])?;
+            Some(ClaudePlanOp::Update {
+                id,
+                status: first_str(input, &["status"]),
+                content: first_str(input, &["subject", "content", "text", "title"]),
+                priority: first_str(input, &["priority"]),
+            })
+        }
+        _ => None,
+    }
+}
+
+fn plan_ops_from_results(v: &Value) -> Vec<ClaudePlanOp> {
+    let mut ops = Vec::new();
+    let parent_result = v
+        .get("tool_use_result")
+        .or_else(|| v.pointer("/message/tool_use_result"));
+    let content = v.pointer("/message/content").or_else(|| v.get("content"));
+    if let Some(items) = content.and_then(Value::as_array) {
+        for block in items {
+            if block.get("type").and_then(Value::as_str) != Some("tool_result") {
+                continue;
+            }
+            collect_result_ops(block, parent_result, &mut ops);
+        }
+    } else if v.get("type").and_then(Value::as_str) == Some("tool_result") {
+        collect_result_ops(v, parent_result, &mut ops);
+    }
+    ops
+}
+
+fn collect_result_ops(block: &Value, parent_result: Option<&Value>, ops: &mut Vec<ClaudePlanOp>) {
+    if let Some(tool_use_id) = first_str(block, &["tool_use_id"]) {
+        if let Some(id) = task_id_from(parent_result).or_else(|| task_id_from(Some(block))) {
+            ops.push(ClaudePlanOp::BindId { tool_use_id, id });
+        }
+    }
+    if let Some(entries) = tasks_from_payload(parent_result).or_else(|| tasks_from_value(block)) {
+        if !entries.is_empty() {
+            ops.push(ClaudePlanOp::Replace(entries));
+        }
+    }
+}
+
+fn task_id_from(payload: Option<&Value>) -> Option<String> {
+    payload
+        .and_then(structured_task_output)?
+        .pointer("/task/id")
+        .and_then(Value::as_str)
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+        .map(str::to_string)
+}
+
+fn tasks_from_payload(payload: Option<&Value>) -> Option<Vec<ClaudePlanEntry>> {
+    let parsed = payload.and_then(structured_task_output)?;
+    let items = parsed.get("tasks").and_then(Value::as_array)?;
+    let entries = items
+        .iter()
+        .filter_map(parse_plan_entry)
+        .collect::<Vec<_>>();
+    (!entries.is_empty()).then_some(entries)
+}
+
+fn looks_like_plan_output(v: &Value) -> bool {
+    payload_has_plan_shape(v)
+        || v.get("tool_use_result")
+            .is_some_and(payload_has_plan_shape)
+        || v.pointer("/message/tool_use_result")
+            .is_some_and(payload_has_plan_shape)
+        || v.get("content")
+            .and_then(parse_jsonish)
+            .is_some_and(|value| payload_has_plan_shape(&value))
+        || v.get("output")
+            .and_then(parse_jsonish)
+            .is_some_and(|value| payload_has_plan_shape(&value))
+}
+
+fn payload_has_plan_shape(v: &Value) -> bool {
+    v.get("task").is_some()
+        || v.get("tasks").is_some()
+        || v.get("oldTodos").is_some()
+        || v.get("newTodos").is_some()
+        || v.get("old_todos").is_some()
+        || v.get("new_todos").is_some()
+        || v.get("updatedFields").is_some()
+        || v.get("updated_fields").is_some()
+        || ((v.get("taskId").is_some() || v.get("task_id").is_some())
+            && (v.get("success").is_some() || v.get("status").is_some()))
+}
+
+fn structured_task_output(v: &Value) -> Option<Value> {
+    if payload_has_plan_shape(v) {
+        return Some(v.clone());
+    }
+    if let Some(direct) = v.get("tool_use_result") {
+        if payload_has_plan_shape(direct) {
+            return Some(direct.clone());
+        }
+    }
+    let content = v.get("content").or_else(|| v.get("output"))?;
+    parse_jsonish(content).filter(payload_has_plan_shape)
+}
+
+fn tasks_from_value(v: &Value) -> Option<Vec<ClaudePlanEntry>> {
+    let parsed = structured_task_output(v)?;
+    let items = parsed.get("tasks").and_then(Value::as_array)?;
+    let entries = items
+        .iter()
+        .filter_map(parse_plan_entry)
+        .collect::<Vec<_>>();
+    (!entries.is_empty()).then_some(entries)
+}
+
+fn parse_plan_entry(value: &Value) -> Option<ClaudePlanEntry> {
+    let content = first_str(value, &["content", "subject", "text", "title"])?;
+    Some(ClaudePlanEntry {
+        content,
+        status: first_str(value, &["status"]),
+        priority: first_str(value, &["priority"]),
+        id: first_str(value, &["id", "taskId", "task_id"]),
+    })
+}
+
+fn parse_jsonish(content: &Value) -> Option<Value> {
+    match content {
+        Value::Object(_) => Some(content.clone()),
+        Value::String(text) => serde_json::from_str(text).ok(),
+        Value::Array(items) => {
+            let text = items
+                .iter()
+                .filter_map(|item| {
+                    if item.get("type").and_then(Value::as_str) == Some("text") {
+                        item.get("text").and_then(Value::as_str)
+                    } else {
+                        None
+                    }
+                })
+                .collect::<String>();
+            if text.trim().is_empty() {
+                None
+            } else {
+                serde_json::from_str(&text).ok()
+            }
+        }
+        _ => None,
+    }
+}
+
+fn first_str(value: &Value, keys: &[&str]) -> Option<String> {
+    for key in keys {
+        if let Some(text) = value
+            .get(*key)
+            .and_then(Value::as_str)
+            .map(str::trim)
+            .filter(|text| !text.is_empty())
+        {
+            return Some(text.to_string());
+        }
+    }
+    None
+}
+
 #[cfg(test)]
 mod tests;
diff --git a/crates/agenthub-core/src/utils/stream_parse/claude/tests.rs b/crates/agenthub-core/src/utils/stream_parse/claude/tests.rs
index 09a19376..a2170499 100644
--- a/crates/agenthub-core/src/utils/stream_parse/claude/tests.rs
+++ b/crates/agenthub-core/src/utils/stream_parse/claude/tests.rs
@@ -76,3 +76,284 @@ fn deltas_then_result_does_not_double_assistant_text() {
     let _ = s.feed(OutputStream::Stdout, ndjson);
     assert_eq!(s.assistant_text(), "PONGC");
 }
+
+#[test]
+fn todo_write_is_plan_not_process_step() {
+    let payload = serde_json::json!({
+        "type": "assistant",
+        "message": {
+            "role": "assistant",
+            "content": [{
+                "type": "tool_use",
+                "id": "toolu_1",
+                "name": "TodoWrite",
+                "input": {
+                    "todos": [
+                        { "content": "read", "status": "completed", "priority": "high" },
+                        { "content": "edit", "status": "in_progress" },
+                        { "content": "  " },
+                        { "content": "test", "status": "pending" }
+                    ]
+                }
+            }]
+        }
+    });
+    let steps = parse_line(&payload.to_string()).unwrap();
+    assert!(steps.is_empty(), "{steps:?}");
+    let ops = super::extract_todo_plan(&payload);
+    assert_eq!(ops.len(), 1);
+    match &ops[0] {
+        super::ClaudePlanOp::Replace(entries) => {
+            assert_eq!(entries.len(), 3);
+            assert_eq!(entries[0].content, "read");
+            assert_eq!(entries[0].status.as_deref(), Some("completed"));
+            assert_eq!(entries[1].status.as_deref(), Some("in_progress"));
+            assert_eq!(entries[2].content, "test");
+        }
+        other => panic!("expected replace, got {other:?}"),
+    }
+}
+
+#[test]
+fn task_create_and_update_are_plan_patches() {
+    let create = serde_json::json!({
+        "type": "assistant",
+        "message": {
+            "content": [{
+                "type": "tool_use",
+                "id": "toolu_create",
+                "name": "TaskCreate",
+                "input": { "subject": "build auth", "activeForm": "Building auth" }
+            }]
+        }
+    });
+    let ops = super::extract_todo_plan(&create);
+    assert_eq!(
+        ops,
+        vec![super::ClaudePlanOp::Create {
+            tool_use_id: Some("toolu_create".into()),
+            content: "build auth".into(),
+            status: Some("pending".into()),
+            id: None,
+            priority: None,
+        }]
+    );
+    let update = serde_json::json!({
+        "type": "tool_use",
+        "id": "toolu_upd",
+        "name": "TaskUpdate",
+        "input": { "taskId": "task-1", "status": "in_progress" }
+    });
+    assert_eq!(
+        super::extract_todo_plan(&update),
+        vec![super::ClaudePlanOp::Update {
+            id: "task-1".into(),
+            status: Some("in_progress".into()),
+            content: None,
+            priority: None,
+        }]
+    );
+}
+
+#[test]
+fn task_create_result_binds_id() {
+    let payload = serde_json::json!({
+        "type": "user",
+        "tool_use_result": { "task": { "id": "task-9", "subject": "build auth" } },
+        "message": {
+            "content": [{
+                "type": "tool_result",
+                "tool_use_id": "toolu_create",
+                "content": "created"
+            }]
+        }
+    });
+    assert!(parse_line(&payload.to_string()).unwrap().is_empty());
+    assert_eq!(
+        super::extract_todo_plan(&payload),
+        vec![super::ClaudePlanOp::BindId {
+            tool_use_id: "toolu_create".into(),
+            id: "task-9".into(),
+        }]
+    );
+}
+
+#[test]
+fn todo_write_result_is_not_process_step() {
+    let payload = serde_json::json!({
+        "type": "user",
+        "tool_use_result": {
+            "oldTodos": [{ "content": "read", "status": "pending" }],
+            "newTodos": [{ "content": "read", "status": "completed" }]
+        },
+        "message": {
+            "content": [{
+                "type": "tool_result",
+                "tool_use_id": "toolu_todo",
+                "content": "Todos have been modified successfully."
+            }]
+        }
+    });
+    assert!(parse_line(&payload.to_string()).unwrap().is_empty());
+}
+
+#[test]
+fn task_list_result_replaces_plan() {
+    let payload = serde_json::json!({
+        "type": "user",
+        "tool_use_result": {
+            "tasks": [
+                { "id": "t1", "subject": "read", "status": "completed" },
+                { "id": "t2", "subject": "edit", "status": "in_progress" }
+            ]
+        },
+        "message": {
+            "content": [{
+                "type": "tool_result",
+                "tool_use_id": "toolu_list",
+                "content": "listed"
+            }]
+        }
+    });
+    assert!(parse_line(&payload.to_string()).unwrap().is_empty());
+    match &super::extract_todo_plan(&payload)[0] {
+        super::ClaudePlanOp::Replace(entries) => {
+            assert_eq!(entries.len(), 2);
+            assert_eq!(entries[0].id.as_deref(), Some("t1"));
+            assert_eq!(entries[1].content, "edit");
+        }
+        other => panic!("expected replace, got {other:?}"),
+    }
+}
+
+#[test]
+fn empty_todo_write_is_replace_with_no_rows() {
+    let payload = serde_json::json!({
+        "type": "assistant",
+        "message": {
+            "content": [{
+                "type": "tool_use",
+                "name": "TodoWrite",
+                "input": { "todos": [] }
+            }]
+        }
+    });
+    assert_eq!(
+        super::extract_todo_plan(&payload),
+        vec![super::ClaudePlanOp::Replace(vec![])]
+    );
+}
+
+#[test]
+fn bash_tool_use_still_emits_process_step() {
+    let steps = parse_line(
+        r#"{"type":"assistant","message":{"content":[{"type":"tool_use","id":"t1","name":"Bash","input":{"command":"ls"}}]}}"#,
+    )
+    .unwrap();
+    assert!(matches!(
+        &steps[0],
+        ProcessStep::Tool { name, .. } if name == "Bash"
+    ));
+    assert!(super::extract_todo_plan(&serde_json::json!({
+        "type": "assistant",
+        "message": { "content": [{ "type": "tool_use", "name": "Bash", "input": { "command": "ls" } }] }
+    }))
+    .is_empty());
+}
+
+#[test]
+fn hyphenated_plan_tool_names_and_nested_event_unwrap() {
+    assert!(super::is_claude_plan_tool_name("Todo-Write"));
+    assert!(super::is_claude_plan_tool_name("Task Create"));
+    assert!(super::is_claude_plan_tool_name("todo_read"));
+    assert!(!super::is_claude_plan_tool_name("Bash"));
+    let payload = serde_json::json!({
+        "event": {
+            "type": "assistant",
+            "message": {
+                "content": [{
+                    "type": "tool_use",
+                    "id": "toolu_todo",
+                    "name": "Todo-Write",
+                    "input": {
+                        "todos": [
+                            { "title": "read docs", "status": "pending" },
+                            { "content": "  " }
+                        ]
+                    }
+                }]
+            }
+        }
+    });
+    match &super::extract_todo_plan(&payload)[0] {
+        super::ClaudePlanOp::Replace(entries) => {
+            assert_eq!(entries.len(), 1);
+            assert_eq!(entries[0].content, "read docs");
+            assert_eq!(entries[0].status.as_deref(), Some("pending"));
+        }
+        other => panic!("expected replace, got {other:?}"),
+    }
+    assert_eq!(
+        super::plan_tool_use_ids(payload.get("event").expect("event")),
+        vec!["toolu_todo".to_string()]
+    );
+}
+
+#[test]
+fn content_block_task_create_and_skipped_read_tools() {
+    let create = serde_json::json!({
+        "type": "content_block_start",
+        "content_block": {
+            "type": "tool_use",
+            "id": "toolu_create",
+            "name": "TaskCreate",
+            "input": { "title": "build auth", "priority": "high" }
+        }
+    });
+    assert_eq!(
+        super::extract_todo_plan(&create),
+        vec![super::ClaudePlanOp::Create {
+            tool_use_id: Some("toolu_create".into()),
+            content: "build auth".into(),
+            status: Some("pending".into()),
+            id: None,
+            priority: Some("high".into()),
+        }]
+    );
+    assert!(super::extract_todo_plan(&serde_json::json!({
+        "type": "tool_use",
+        "name": "TodoRead",
+        "input": { "todos": [{ "content": "ignore" }] }
+    }))
+    .is_empty());
+    assert!(super::extract_todo_plan(&serde_json::json!({
+        "type": "tool_use",
+        "name": "TaskUpdate",
+        "input": { "status": "in_progress" }
+    }))
+    .is_empty());
+    assert!(super::extract_todo_plan(&serde_json::json!({
+        "type": "tool_use",
+        "name": "TaskCreate",
+        "input": { "status": "pending" }
+    }))
+    .is_empty());
+}
+
+#[test]
+fn task_update_accepts_task_id_alias() {
+    let update = serde_json::json!({
+        "type": "tool_use",
+        "name": "TaskUpdate",
+        "input": { "task_id": "task-3", "subject": "rewrite", "status": "completed" }
+    });
+    assert_eq!(
+        super::extract_todo_plan(&update),
+        vec![super::ClaudePlanOp::Update {
+            id: "task-3".into(),
+            status: Some("completed".into()),
+            content: Some("rewrite".into()),
+            priority: None,
+        }]
+    );
+}
diff --git a/docs/STATUS.md b/docs/STATUS.md
index 1c7f63a6..2bd5efa0 100644
--- a/docs/STATUS.md
+++ b/docs/STATUS.md
@@ -3,7 +3,7 @@ title: AgentHub 当前实现状态
 type: status
 status: current
 owner: maintainers
-updated: 2026-09-17
+updated: 2026-09-20
 ---
 
 # 当前实现状态
@@ -24,10 +24,10 @@ updated: 2026-09-17
   - **新空 Grok 会话**：持续聊天（模型/思考、图片、后续轮排队），**不支持**为本轮指定「用于本次」技能，界面也不画可点的假按钮。真实窗口验收已通过。Chat 只带官方 `grok agent --no-leader stdio` 旗标（`--permission-mode` 写在 `agent` 前或后都会让进程在出卡前退出）。`session/new` 带 `_meta.yoloMode=false`，覆盖本机 always-approve；握手按官方 ACP 声明本机可读写文件、不发 `initialized`。工作目录外写出走本机 `fs/write_text_file`：先出「修改文件」卡片再写文件，可点一直允许；目录内直接写。对方若另发 `session/request_permission`，卡片仍只带对方给的「一直允许」。会话自动批准才加 `--always-approve` 和 `_meta.yoloMode=true`。进程退出时界面写「Grok 已退出」，不写 Codex 的 app-server 字样。
   - **新空 Kiro 会话**：`kiro-cli acp` 持续通道（允许/拒绝、停止；生成时不能中途补充，可排队到下一轮）。真实窗口验收已通过（ACP 新对话；打印路径 HTTP 多轮为 Builder ID / 本机登录，不是企业 IdC）。旧对话保留原发送方式。
   - **其余 Agent 与旧会话**：仍走原发送方式。
-  - **过程面板**：主列一行过程摘要（正在读取 / 正在修改 / 正在执行，完成则已读取 / 已修改 / 已执行）。点开后在右侧栏看你说了什么、思考、工具行、等待允许或拒绝、本轮用量；工具名、状态和 JSON 进折叠的「细节」；命令、过程日志、退出码和状态事件仍在「运行详情」。允许 / 拒绝按钮仍在卡片上，不在过程行上造假按钮。右侧栏不随发送自动打开；点 Markdown 仍预览文件。种类约定见 [过程事件](concepts/chat-process-events.md)。斜杠目录和模型目录更新不进过程时间线。Grok / Kiro 若推了当前轮 `plan`，输入区上方出现计划条，换轮丢掉。ACP 若声明 `terminal`，对方跑的那条命令一张卡片，可停这一条（不是对话页终端）。仍约 80ms 读快照，过程行按序号增量挂现有面板，不另开总线。
+  - **过程面板**：主列一行过程摘要（正在读取 / 正在修改 / 正在执行，完成则已读取 / 已修改 / 已执行）。点开后在右侧栏看你说了什么、思考、工具行、等待允许或拒绝、本轮用量；工具名、状态和 JSON 进折叠的「细节」；命令、过程日志、退出码和状态事件仍在「运行详情」。允许 / 拒绝按钮仍在卡片上，不在过程行上造假按钮。右侧栏不随发送自动打开；点 Markdown 仍预览文件。种类约定见 [过程事件](concepts/chat-process-events.md)。斜杠目录和模型目录更新不进过程时间线。Grok / Kiro 若推了当前轮 `plan`，或 Claude 新对话用 TodoWrite / Task 工具更新了任务清单，输入区上方出现计划条，换轮丢掉。ACP 若声明 `terminal`，对方跑的那条命令一张卡片，可停这一条（不是对话页终端）。仍约 80ms 读快照，过程行按序号增量挂现有面板，不另开总线。
   - **过程内用量**：新空 Codex 会话仍解析 `thread/tokenUsage/updated` 的当前轮 `last`（累计 `total` / 窗口只留在总览等用量页）。新空 Grok 会话解析 **当前轮**（`turn_completed.usage`）；ACP 没有会话累计字段，不把各轮相加冒充累计。Grok / Kiro 的 `context_usage` 有数字才进用量小字（窗口用量），全 0 不画。解析路径已接；真窗 2026-09-09 见过部分轮次 **没有** `turn_completed.usage`，此时界面不画假数字。对话里只在本轮结束后用小字写输入 / 输出（有缓存才写缓存）；生成中不画用量。只显示协议里的数字，不估算费用。Kiro 没有 token 累计数据源。
   - **`/` 菜单**：立刻执行的动作（新建对话、复制最近回复；换模型/思考/技能要搜到才列出，避免把整份目录摊在 `/` 上）。Grok / Kiro 会话就绪且对方声明了命令时，另列对方斜杠项：选中后当作一轮正常发出（无必填参数则直接发送 `/名字`；必填参数则插入 `/名字 ` 供补全后再发）。Grok 走标准 ACP `available_commands_update`；Kiro 走 `_kiro.dev/commands/available` 的 `commands[]`（不把技能/工具目录摊进 `/`）。目录变了会重拉；未就绪或未声明则不画，不猜菜单。Kiro 就绪会话「对方命令」Linux 真窗已 PASS（修复 tip `daed5ccf`，现行 tip 仍含该修复）：列出对方声明的斜杠项，裸 `/` 不摊技能目录；记录见 `/workspace/qa-issues/CHAT-SLASH-PR365-RETEST-daed5ccf.md`。本条只记这次验过的展示，不把选中发送或其它 Agent 写成已验收。有可启动的命令行时，`/` 可列出「启动命令行」（DeepSeek 为「打开网页会话」），在外部打开，不标成对话页能力。
-  - **本机对接与本会话**：本机持续通道按 Agent 写死：新空 Codex 走 app-server，新空 Grok / Kiro 走 ACP，新空 Claude 走 stream-json；其余与旧会话仍走原发送方式。Cursor 默认软隐藏，不在允许/拒绝之列，也不进持续聊天白名单。**Agents 详情**写这份 Agent 的新对话怎么接（ACP / 持续对话 / 原来的发送方式），不是一份可改的「ACP 总表」。**Chat 顶栏和会话设置**写这次对话实际在走哪条；点了卡片上的一直允许之后，会话设置里可以关掉「本会话已一直允许」（不能在这里假装打开）。一次对话是否在用持续通道，看这次会话是不是上述新空路径。Kiro 旧对话没有切到 ACP 的入口。会话字段见 [会话身份](concepts/chat-session-identity.md)。
+  - **本机对接与本会话**：本机持续通道按 Agent 写死：新空 Codex 走 app-server，新空 Grok / Kiro 走 ACP，新空 Claude 走 stream-json；其余与旧会话仍走原发送方式。Cursor 默认软隐藏，不在允许/拒绝之列，也不进持续聊天白名单。**Agents 详情**写这份 Agent 的新对话怎么接（ACP / 持续对话 / 原来的发送方式），不是一份可改的「ACP 总表」。**Chat 会话设置**写这次对话实际在走哪条；点了卡片上的一直允许之后，会话设置里可以关掉「本会话已一直允许」（不能在这里假装打开）。顶栏不写接法。一次对话是否在用持续通道，看这次会话是不是上述新空路径。Kiro 旧对话没有切到 ACP 的入口。会话字段见 [会话身份](concepts/chat-session-identity.md)。
   - **新空 Claude 会话（B3 首片）**：走 Claude Code `-p --input-format stream-json --output-format stream-json` 持续通道（同进程多轮、本地图片 base64、模型/思考强度参数）；**不支持**生成中补充；本片**不**接可点允许/拒绝（默认 `dontAsk`，危险模式 `bypassPermissions`）。有历史的旧 Claude 会话仍走 print+resume。print 路径在已经出过 assistant 正文后不再把最终 `result` 再拼进气泡（短回复不会同一句写两遍）；只有没见过 assistant 文本时才用 `result` 当正文。Linux 真窗短回复已验不双写。见 [Claude B3](archive/chat-claude-b3.md)。
   - **对话标题**：新建对话先用首条消息提炼的短句。一轮结束后读对方写在自己会话记录里的标题并改用它：Codex（app-server 汇总的 `sqlite/*.db` 里 `local_thread_catalog.display_title`，退回 `session_index.jsonl` 的 `thread_name`）、Grok（`summary.json` 的 `generated_title`）、Kiro（`sessions/cli/<id>.json` 的 `title`）、DSH（会话日志的 `session/title` 行）。Claude 没有标题来源，保持首条消息推导。手动改过名字的对话不再被覆盖（不新增「谁起的名字」列，也不做迁移）；连续通道取运行时线程 id，旧会话取 `native_session_id`。AgentHub 不进协议里要标题。实机核对：Grok 与 Codex 的真实会话都能取到；Codex 的 `session_index.jsonl` 只收 IDE / 桌面端自己建的会话，所以优先读 `local_thread_catalog`；Kiro 常见只有 1–2 字的占位；DSH 普通发送不带会话 id，实际触发不到；Claude 无来源。
   - **停止**：点停止后按钮保持「正在停止」并禁用，直到这一轮真正结束。运行时已经是 `cancelling` 时同样显示「正在停止」。取消请求落空时恢复可点。停止横幅标题「已停止」；`error=cancelled` 不把英文 `cancelled` 写在旁边，改用「已按你的要求停止。可恢复草稿后重发。」
diff --git a/docs/concepts/chat-and-agents.md b/docs/concepts/chat-and-agents.md
index 8db7da40..d982934f 100644
--- a/docs/concepts/chat-and-agents.md
+++ b/docs/concepts/chat-and-agents.md
@@ -5,7 +5,7 @@ status: current
 owner: maintainers
 audience: chat, adapter, and frontend contributors
 source-of-truth: ChatService/RunService, ChatEvent, stream parsers, Tauri Channel adapter, and chat process reducer
-updated: 2026-09-16
+updated: 2026-09-20
 ---
 
 # Chat 与 Agent 运行
@@ -17,7 +17,7 @@ Chat 是 AgentHub 里的运行工作台。当前一个会话对应一个 Agent
 - **新空 Codex 会话**：app-server 持续聊天；会话级模型/思考强度、最小操作菜单、本地图片附件、「用于本次」技能已落地（见 [B2](../archive/chat-codex-b2.md)）。计划模式未做；文本问答等上游默认稳定后再跟，不打开 under-development 开关、也不造假卡片；Linux AgentHub Chat 不可用 Codex Computer Use。Claude B3 首片见下。
 - **新空 Grok 会话**：持续聊天，可选模型和思考等级，支持图片与后续轮排队。不能为本轮指定「用于本次」技能（与 Codex 不同；界面也不画出可点的假按钮）。生成时不能中途补充，只能排队到下一轮。
 - **新空 Kiro 会话**：`kiro-cli acp` 持续通道（允许/拒绝、停止；生成时不能中途补充，可排队到下一轮）。旧对话保留原发送方式。本机登录或 `KIRO_API_KEY` 可用时，打印路径可走 HTTP 多轮（`kiro-http:` 前缀）；已有 HTTP 会话失败时直接报错并保留会话，不回退成新的命令行会话。企业 IdC / `profileArn` 仍是提案剩余边界（带上参数 ≠ 已验收）。跨页事实见 [STATUS](../STATUS.md)。
-- **新空 Claude 会话**：`claude -p --input-format stream-json` 持续通道（多轮、本地图片；不能在生成中补充；本片无允许/拒绝卡片，默认 `dontAsk` / 危险模式 `bypassPermissions`）。有历史的 Claude 会话仍走 print+resume。见 [Claude B3](../archive/chat-claude-b3.md)。
+- **新空 Claude 会话**：`claude -p --input-format stream-json` 持续通道（多轮、本地图片；不能在生成中补充；本片无允许/拒绝卡片，默认 `dontAsk` / 危险模式 `bypassPermissions`）。对方用 TodoWrite 或 Task 工具更新任务清单时，输入区上方出现与 Grok / Kiro 相同的计划条（可折叠、带进展），不进过程时间线；换轮丢掉。有历史的 Claude 会话仍走 print+resume。见 [Claude B3](../archive/chat-claude-b3.md)。
 - **其余 Agent 与旧会话**：保留原有发送方式。
 
 ## 允许 / 拒绝 / 一直允许
@@ -36,7 +36,7 @@ Kiro 会话设置里的「帮我批准 / 完全访问权限」是启动时的 `-
 本机有哪些持续通道，是按 Agent 写死的名单，不是用户可改的「ACP 总表」。界面上分两层：
 
 - **Agents 详情「新对话」**：这份 Agent 开新对话时走 ACP / 持续对话 / 原来的发送方式。隐藏 Agent 后 Chat 不会用它开新对话。
-- **Chat 顶栏和会话设置「这次对话怎么接」**：这场对话实际在走哪条。旧 Kiro 等仍走原来的发送方式时，这里会和「新对话」不一致。
+- **Chat 会话设置「这次对话」**：这场对话实际在走哪条。旧 Kiro 等仍走原来的发送方式时，这里会和「新对话」不一致。顶栏不写接法。
 
 | 本机对接 | 用在哪次会话 |
 | --- | --- |
diff --git a/docs/concepts/chat-process-events.md b/docs/concepts/chat-process-events.md
index 389cf6ec..036b7f4b 100644
--- a/docs/concepts/chat-process-events.md
+++ b/docs/concepts/chat-process-events.md
@@ -5,7 +5,7 @@ status: current
 owner: maintainers
 audience: chat and core contributors
 source-of-truth: ProcessStep, ChatEvent, RuntimeSnapshot
-updated: 2026-09-17
+updated: 2026-09-20
 ---
 
 # Chat 过程事件
@@ -37,7 +37,7 @@ updated: 2026-09-17
 - ACP `config_option_update`（模型 / 思考目录）
 - 世代号 `catalogEpoch`（只用来重拉 Options）
 
-`plan` 走当前轮计划条，换轮丢掉。宿主 `terminal/*` 走命令卡片，不是对话 TTY。
+`plan` 走当前轮计划条，换轮丢掉。Grok / Kiro 的 ACP `sessionUpdate: plan`，以及 Claude 新对话的 TodoWrite / TaskCreate / TaskUpdate / TaskList，都进这条，不进过程时间线。宿主 `terminal/*` 走命令卡片，不是对话 TTY。
 
 ## 本波边界
 
diff --git a/docs/concepts/chat-session-identity.md b/docs/concepts/chat-session-identity.md
index 542fde5b..efa9775e 100644
--- a/docs/concepts/chat-session-identity.md
+++ b/docs/concepts/chat-session-identity.md
@@ -5,7 +5,7 @@ status: current
 owner: maintainers
 audience: chat and core contributors
 source-of-truth: Conversation / ChatService / chat_runtime thread_id
-updated: 2026-09-15
+updated: 2026-09-20
 ---
 
 # Chat 会话身份
@@ -31,7 +31,7 @@ updated: 2026-09-15
 | --- | --- |
 | 对话页「新建对话」 | 插入新行：`native_session_id` 为空，直到对方给出会话 id。 |
 | 点开历史列表里已有行 | 续同一 `conversations.id`。持续通道用运行时线程；旧会话用已存的 `native_session_id` 解释标题和续聊。 |
-| 按对方会话 id 打开（`open_from_session`） | 先用 `native_session_id` 查找：命中则续该行（空记录可补导入历史）；未命中再新建并写入该 id。 |
+| 按对方会话 id 打开（`open_from_session`） | 先用 `native_session_id` 查找：命中则续该行（空记录可补导入历史）；未命中再新建并写入该 id。同一 Agent、同一工作目录但对方会话不同，仍是新开一条。 |
 | 默认空会话 `ensure_default_conversation` | 避免初始化重复插行；显式新建仍始终插入。 |
 | CLI `agenthub run` | 不复用对话页会话表。 |
 
diff --git a/docs/reference/chat-session-options.md b/docs/reference/chat-session-options.md
index 5adde4fc..bffe9444 100644
--- a/docs/reference/chat-session-options.md
+++ b/docs/reference/chat-session-options.md
@@ -4,7 +4,7 @@ description: Runtime Options 的 seed / 探测来源与 fail-closed 边界。
 type: reference
 status: current
 owner: maintainers
-updated: 2026-09-17
+updated: 2026-09-20
 ---
 
 # Chat 会话选项目录
@@ -29,7 +29,7 @@ Chat「模型 / 思考 / 扩展 / 斜杠原生命令」等来自会话 **Options
 | Claude | `claude_fallback_catalog`（seed） | 无活探测权威时仅用 seed |
 | Codex（及其他走 app-server 探测的路径） | `model/list`、`skills/list`、`plugin/installed` | 探测失败 → 空/缓存策略；不伪装厂商未声明的项 |
 
-原生命令目录（斜杠）由持续通道在会话就绪后注入 `native_commands`；未就绪或目录空 → UI fail-closed（不假装有对方命令）。Grok 走标准 ACP `available_commands_update`；Kiro 在 `session/new` 之后用厂商通知 `_kiro.dev/commands/available` 的 `commands[]`（不要把 `prompts` / 技能、`tools`、`mcpServers` 摊进 `/`）。立刻执行的动作（如新建对话）与对方命令分来源，见 STATUS / Chat 概念页。`transport` 会画在 Chat 顶栏和会话设置「这次对话怎么接」，不进过程时间线。
+原生命令目录（斜杠）由持续通道在会话就绪后注入 `native_commands`；未就绪或目录空 → UI fail-closed（不假装有对方命令）。Grok 走标准 ACP `available_commands_update`；Kiro 在 `session/new` 之后用厂商通知 `_kiro.dev/commands/available` 的 `commands[]`（不要把 `prompts` / 技能、`tools`、`mcpServers` 摊进 `/`）。立刻执行的动作（如新建对话）与对方命令分来源，见 STATUS / Chat 概念页。`transport` 会画在会话设置「这次对话」，不进过程时间线。
 
 ## 纪律
 
diff --git a/docs/reference/chat-support-depth.md b/docs/reference/chat-support-depth.md
index 12b9755d..6d07feeb 100644
--- a/docs/reference/chat-support-depth.md
+++ b/docs/reference/chat-support-depth.md
@@ -4,7 +4,7 @@ description: 每家 Agent 的探测/启动与 Chat 宿主深度对照；与 Capa
 type: reference
 status: current
 owner: maintainers
-updated: 2026-09-15
+updated: 2026-09-20
 ---
 
 # Chat 支持深度矩阵
@@ -35,7 +35,7 @@ updated: 2026-09-15
 
 | Agent | D0 | Chat 主档 | `RuntimeChannel`（新空） | D3 摘要（新空持续会话） | 备注 |
 |---|---|---|---|---|---|
-| Claude | 有 | **D2** 新空；有历史仍 **D1** print+resume | `stream-json` | 模型/思考、图片；**无**允许/拒绝卡（`dontAsk` / 危险 `bypassPermissions`）；无「用于本次」 | 见 STATUS / Claude B3 |
+| Claude | 有 | **D2** 新空；有历史仍 **D1** print+resume | `stream-json` | 模型/思考、图片；TodoWrite / Task 任务清单进计划条；**无**允许/拒绝卡（`dontAsk` / 危险 `bypassPermissions`）；无「用于本次」 | 见 STATUS / Claude B3 |
 | Codex | 有 | **D2** 新空 | `app-server` | 允许/拒绝/一直允许、模型/思考、图片、「用于本次」、斜杠动态菜单；计划模式未做；CU 无产品路径 | 最深 |
 | Grok | 有 | **D2** 新空 | `acp` | 允许/拒绝（对方选项）、模型/思考、图片；**无**「用于本次」；生成中不可补充（可排队） | ACP 族 |
 | Kiro | 有 | **D2** 新空 ACP；旧会话 **D1** | `acp` | 允许/拒绝、停止；模型/思考/权限启动后固定；生成中不可补充 | ACP 族；旧 headless 不切 ACP |
diff --git a/docs/reference/terminology.md b/docs/reference/terminology.md
index be7517c1..6a09931a 100644
--- a/docs/reference/terminology.md
+++ b/docs/reference/terminology.md
@@ -4,7 +4,7 @@ description: AgentHub 用户界面、领域模型和内部实现术语的对应
 type: reference
 audience: all
 status: current
-updated: 2026-09-17
+updated: 2026-09-20
 ---
 
 # 术语表
@@ -47,6 +47,7 @@ updated: 2026-09-17
 | 项目技能 | `<工作区>/.agents/skills` | 只作用于该项目的技能；Skills 页按项目列表里已识别的工作区选择 |
 | 插件 | 各家 `plugin` / `extension` 包（Claude `/plugin`、Codex `/plugins`、Grok `plugin`、Pi `pi install`） | 可安装的发行单元，常含 skills/commands/hooks，有时附带 MCP。**不是** MCP server 条目，也不是 Skills 页 |
 | 历史 | `ProjectHistory` / `/projects` | 各 Agent 的本机会话记录与工作区。侧栏入口和页面标题说「历史」；代码、路径和内部文档仍用 Projects / 项目 |
+| 聊天大纲 | Chat outline / `ChatOutlineRail` | 对话页 transcript 左侧的提示词跳转轨道 |
 | MCP | MCP server 条目；`/mcp` 可盘点，部分 Agent 可写入/启用 | Agent 作为客户端连接的外部工具；Claude / Codex / Grok / Cursor / WorkBuddy 为 Partial（无 OAuth） |
 | mock backend | `src/dev/mocks` | 仅供 `pnpm dev:mock` 和 Vitest 使用的浏览器实现 |
 | Tauri adapter | `src/lib/backend/tauri` | 生产桌面 backend；唯一允许直接 `invoke` 的前端边界 |
diff --git a/docs/ui/chat-experience-bar.md b/docs/ui/chat-experience-bar.md
index 508e531c..594f0f21 100644
--- a/docs/ui/chat-experience-bar.md
+++ b/docs/ui/chat-experience-bar.md
@@ -3,7 +3,7 @@ title: Chat 体验标杆
 type: ui
 status: current
 owner: maintainers
-updated: 2026-09-16
+updated: 2026-09-20
 ---
 
 # Chat 体验标杆
@@ -17,7 +17,7 @@ updated: 2026-09-16
 | 流式 | 正文随生成出现。过程是「正在读取 / 正在修改 / 正在执行」，细节可展开。 | 新空 Codex / Grok / Kiro / Claude 持续聊天：活动会话约 80ms 读快照，正文用同一次读取的完整 currentMessage，不用字符串猜增量，也不把整段回复拆开假装逐字打出。首字前显示「正在想」，正文出现后「正在写」并带光标。主列只留一行过程摘要（正在读取 / 正在修改 / 正在执行，完成则已读取 / 已修改 / 已执行）；点开后在右侧栏看你说了什么、思考、工具行、等待允许或拒绝、本轮用量和运行详情。工具名、状态和 JSON 进折叠的「细节」。思考带计时。允许 / 拒绝按钮仍在卡片上。右侧栏不随发送自动打开，点 Markdown 时仍预览文件。有历史的 Claude 与其他旧会话仍是一次性发送。 |
 | 用量 | 本轮结束后用小字写下输入 / 输出；生成中不画。没有数据不画假进度条。 | Codex 持续聊天仍解析 `thread/tokenUsage/updated` 的当前轮 last；Grok 解析 `turn_completed.usage`。对话里只在回复结束后用 muted 小字写本轮输入 / 输出（有缓存才写缓存）。不写累计、不对窗口做 n / 窗口。Kiro 无 token 累计数据源。没有数字就不画。 |
     | 输入区 Enter / 排队 / 停止 | `Enter` 发送，`Shift+Enter` 换行。生成中能补充（不打断当前动作）或排队到下一轮，两种动作分得清。停止先「正在停止」，确认后再「已停止」。中文输入法组字时 `Enter` 不发送。 | 空会话不把 Enter / 换行写在输入区下方，改到输入框和发送按钮的悬停提示。有消息后仍在输入区下写当前快捷键。`Enter` 发送，组字时不发。生成中 Codex 为补充，Grok / Kiro / Claude 为排队（Claude 无中途补充）。右下角只留一个圆形按钮：空闲是发送（无字则禁用）；生成中有字且能补充/排队则仍是发送，清空后同一位置改成停止（方块图标，不并排「停止」二字）。点了停止之后（或运行时已是正在取消）保持「正在停止」并禁用，直到这一轮结束；取消没发出去则恢复可点。停止横幅标题「已停止」，不把英文 `cancelled` 写在旁边，用「已按你的要求停止。可恢复草稿后重发。」发送后焦点留在输入框。`Esc` 仍走同一条停止（对话框/菜单/预览先吃掉 Esc）；快捷键一览与悬停浮层写着 Esc。 |
-    | 审批 | 卡片是「允许」「拒绝」；「一直允许」写清管到这场对话还是本轮。改文件能看见路径和将要改的内容。 | 卡片先写种类再写标题；允许 / 拒绝；带了该选项才出一直允许，范围写在按钮旁边：「仅当前这次对话，不保存」，并写明不是会话设置里的自动批准 / 完全访问权限。点了之后三家都在这场对话里记住后续同类确认（Codex 跨轮，含另一条工作目录外路径；Grok / Kiro 同一条 ACP 进程可跨轮），对话里出现「本会话已一直允许」，会话设置可以关掉记住、不能假装打开。没有该选项不画按钮。文件卡标题「修改文件」，等宽字显示路径；协议里已有 `diff` / `content` / 前后片段时直接展示，没有这些字段就写「暂无改动预览」，不编一段假 diff。Kiro「完全访问权限」是启动时的会话设置。顶栏和会话设置写这次对话怎么接（ACP / 持续对话 / 原来的发送方式）；Agents 详情写这份 Agent 的新对话怎么接。 |
+    | 审批 | 卡片是「允许」「拒绝」；「一直允许」写清管到这场对话还是本轮。改文件能看见路径和将要改的内容。 | 卡片先写种类再写标题；允许 / 拒绝；带了该选项才出一直允许，范围写在按钮旁边：「仅当前这次对话，不保存」，并写明不是会话设置里的自动批准 / 完全访问权限。点了之后三家都在这场对话里记住后续同类确认（Codex 跨轮，含另一条工作目录外路径；Grok / Kiro 同一条 ACP 进程可跨轮），对话里出现「本会话已一直允许」，会话设置可以关掉记住、不能假装打开。没有该选项不画按钮。文件卡标题「修改文件」，等宽字显示路径；协议里已有 `diff` / `content` / 前后片段时直接展示，没有这些字段就写「暂无改动预览」，不编一段假 diff。Kiro「完全访问权限」是启动时的会话设置。会话设置写这次对话（ACP / 持续对话 / 原来的发送方式），顶栏不写；Agents 详情写这份 Agent 的新对话怎么接。 |
 | 模型与思考 | 输入区旁显示当前模型和思考强度；选项来自这份登录真实可用的列表；换模型后强度跟着变；生成中不改正在跑的一轮。 | Codex / Grok 可持续聊天里可换模型和思考强度，拒绝后保留原值。菜单用可读名（如 GPT 5.3 Codex Spark），当前项打勾。思考强度旁有短说明（可能更慢）。Kiro 开始后要换需新建对话。`Ctrl+Shift+I`（macOS 也认 `Cmd+Shift+I`）打开模型菜单。 |
 | 附件 | 发送前能看见已加的图片或文件，可移除。支持选图、粘贴、拖入；工作目录里的文件能点名带上。 | 新空 Codex / Grok / Kiro / Claude 持续聊天已接本地图片（选图 / 粘贴 / 拖入，最多 8 张、单张 10MB）；已选图片在输入区旁显示可移除芯片。有历史的旧 Claude 仍是 print+resume，**没有**图片按钮。普通文件和 `@` 提文件尚未接入（协议未验证，不把路径拼进提示词冒充附件）。 |
 | 用于本次技能 | 当前 Agent 可调用的技能能选进这一条，选中后看得到。对方做不到时不画可点的假入口。 | Codex **不画**工具条技能按钮：技能由 Codex 自动选用，或输入 `/` 在动态菜单里选「用于本次」。Grok 无此能力，也不画假按钮。 |
@@ -25,6 +25,7 @@ updated: 2026-09-16
 | 续聊 | 点开历史立刻看到上次正文。生成中切走再回来，任务还在。关窗口再开，同一场对话能接着说。 | 切会话不取消生成。Codex 关窗续聊 Linux 真窗已验、macOS 重开有效，Windows 未宣称。Grok 旧会话可「用新方式继续」。Kiro 同一进程内续聊；进程退出后留历史并提示新建。 |
 | 空状态 | 空会话焦点在输入区。先写清可以打字；示例只填草稿、不代发。缺目录或登录时一条提示加恢复，不占满中间。底栏保留所需控件，但不跟输入区抢第一眼。 | 空会话焦点在输入区。中间只写「开始对话」和示例芯片，不再单独写出 Agent 名或日期。占位是「发消息…」。示例只填草稿，说明写在芯片悬停提示里。缺条件时一条提示加恢复，不占满中间。没有 Agent 时去 Agent 页。Kiro / Grok / Claude 的「不能中途补充」写在输入框和发送的悬停提示，不占常驻行。空会话底栏图片和技能收成图标（仍有无障碍名称）；连接名截断，悬停看全称。选中 Agent 后不再放重复的 ⋮ 菜单。侧栏「新建对话」用主题色。 |
     | 键盘 | `Enter` 发送，`Shift+Enter` 换行，`Esc` 停止，`/` 搜对话内动作。能新建对话、打开模型菜单，并能看到当前快捷键。输入框内全选、复制、剪切、粘贴必须可用。 | 输入区旁是紧凑的快捷键按钮：悬停或点击都打开同一份快捷键浮层（与一览相同：新建对话、发送/换行、停止、换模型等）。发送和换行用回车键图标，不用「Enter」字样。不在输入框里时按 `?` 仍打开快捷键对话框（美式键盘上 `?` 是 Shift+/，两种按键报告都认）。桌面窗口的快捷键在捕获阶段监听，冒泡阶段到不了。`Enter` / `Shift+Enter` / 组字时不发送 / `Esc` 停止 / `/` 本地菜单已有。`/` 先列立刻执行的动作（新建对话、复制最近回复；换模型/思考/用于本次技能要搜到才列出）；Grok / Kiro 会话就绪且对方声明了命令时，另列对方斜杠项，选中后当作一轮正常发出。打开历史、搜索历史、打开设置、打开 Agent、打开连接走侧栏或顶栏，不再进 `/`。选中 Agent 旁不再放重复的 ⋮。侧栏「新建对话」用主题色。删除确认（会话、备份）按 Enter 仍确认，按钮上只画回车键图标。`Ctrl+K`（macOS `Cmd+K`）聚焦历史搜索。`Ctrl+Shift+I`（macOS 也认 `Cmd+Shift+I`）打开模型菜单。`Ctrl+N`（macOS `Cmd+N`）新建对话；桌面窗口另用系统菜单加速键，避免 WebKit 把 Ctrl+N 当成新窗口。输入框内 `Ctrl+A` / `C` / `X` / `V`（macOS `Cmd`）走系统编辑菜单，页面快捷键不拦截。 |
+| 长对话定位 | 长对话能从大纲跳到自己发过的提示。 | 设置默认打开。用户消息不少于 2 条、对话面板够宽时，transcript 左侧出现聊天大纲；悬停看预览，点击跳到那条消息，跳转后不跟着新回复滚回底部。 |
 
 前沿对照日期 2026-09-09，依据各家公开文档： [Claude Code 桌面](https://code.claude.com/docs/en/desktop)、[Cursor Agent](https://cursor.com/docs/agent/overview)、[Codex app](https://developers.openai.com/codex/app)。各家能力不同；本页不承诺每家生成相同答案，也不把 Claude 批准卡片或 SDK 宿主写成已完成（B3 首片仅 stream-json 多轮+图片）。
 
diff --git a/docs/ui/page-patterns.md b/docs/ui/page-patterns.md
index c4c5b7a1..62c83607 100644
--- a/docs/ui/page-patterns.md
+++ b/docs/ui/page-patterns.md
@@ -3,7 +3,7 @@ title: UI 页面模式
 type: reference
 status: current
 owner: maintainers
-updated: 2026-09-17
+updated: 2026-09-20
 ---
 
 # UI Page Patterns
@@ -340,7 +340,8 @@ Chat is a one-conversation, one-Agent workbench with a session rail, transcript,
 - An empty transcript invites typing first (`开始对话` only). Example chips stay above the composer and only fill the draft; the draft-only note is on the chip hover, not a permanent line. The composer placeholder is generic (`发消息…`). Grok / Kiro / Claude queue-only limits and Enter / Shift+Enter sit on hover titles near the composer or send, not as permanent secondary lines on an empty session. On that first-use empty transcript the toolbar keeps Agent, connection, model, thinking, images, and skills, but secondary image/skill labels collapse to icon-only (accessible names stay); the connection label truncates and shows the full name on hover. Cursor is not on this surface.
 - The send button is the composer's accent action. The session-rail **新建对话** button uses the same theme fill (not gray). Enter sends; Shift+Enter inserts a new line; the footer names the current shortcut on a non-empty transcript, and on an empty session via hover. The bottom-right slot is a single circular control: never Stop and Send side by side. Idle shows Send (disabled when empty). While generating, Send stays when there is draft text and a real action (mid-turn inject, otherwise queue); an empty or blocked generating composer shows Stop in that same slot (square icon, danger styling, same footprint). After click or when the runtime is already cancelling, Stop stays 正在停止 and disabled until the turn ends. A missed cancel request re-enables it. Esc uses the same cancel path unless a dialog, menu, or preview already owns Escape; the shortcut overview and hover layer list Esc. Queued follow-ups show a count and preview with a clear action. The 已停止 banner does not show a raw `cancelled` status word; it uses 已按你的要求停止。可恢复草稿后重发。 After send, focus stays in the composer. Retry creates a new turn using the same validation path. Cursor is not on this surface.
 - Approval cards offer Allow / Deny; Always allow when this request includes that option. After Always allow, Codex / Grok / Kiro auto-accept later command/file prompts in the current process (Codex typically this turn; Grok / Kiro the live ACP process). Not saved. Chat then shows **本会话已一直允许**, distinct from session-settings auto-approve / Kiro full access; session settings can turn that remember off, and will not fake turning it on. File-change cards title **修改文件** and show the path.
-- Streaming process details use a compact one-line summary of 正在读取 / 正在修改 / 正在执行 on the reply. Clicking it opens the right-hand pane with 你说了、thinking, tools, waiting allow/deny, turn usage, and run details (the same pane as Markdown preview; opening a file replaces process). Allow / Deny stay on the card — the pane does not invent buttons. Tool names, statuses, and JSON payloads stay in a per-step **细节** disclosure. Commands, stderr, status events, and exit codes stay in **运行详情**. After the turn ends, Codex / Grok may show a muted turn-only 输入 / 输出 footnote under the reply; nothing while generating, and no session total or window ratio. No fake usage bar. Continuous Codex / Grok / Kiro turns poll the focused snapshot about every 80ms and show **正在想** before the first character, then **正在写** with a caret. The body is the durable `currentMessage` from that read, not a client-side drip of a buffered reply.
+- A current-turn plan list sits above the composer when the Agent published one. The header shows completed/total counts and status labels (待做 / 进行中 / 已完成 / 失败); the list collapses. Collapsed view keeps the counts and the in-progress row. Missing status counts as 待做. The bar is not a process timeline.
+- Streaming process details use a compact one-line summary of 正在读取 / 正在修改 / 正在执行 on the reply. Clicking it opens the right-hand pane with 你说了、thinking, tools, waiting allow/deny, turn usage, and run details (the same pane as Markdown preview; opening a file replaces process). Allow / Deny stay on the card — the pane does not invent buttons. Tool names, statuses, and JSON payloads stay in a per-step **细节** disclosure. Commands, stderr, status events, and exit codes stay in **运行详情**. After the turn ends, Codex / Grok may show a muted turn-only 输入 / 输出 footnote under the reply; nothing while generating, and no session total or window ratio. No fake usage bar. Continuous Codex / Grok / Kiro turns poll the focused snapshot about every 80ms and show **正在想** before the first character, then **正在写** with a caret. The body is the durable `currentMessage` from that read, not a client-side drip of a buffered reply. A failed poll keeps the last view and shows **没法更新这场对话** with Retry after one second; it does not toast every poll, and it does not fall back to the one-shot send path.
 - Switching conversations does not cancel the active operation. Codex runtime keeps per-conversation process state and a replay cursor; its snapshot supplies the authoritative current reply. Legacy sends retain their existing in-memory process behavior.
 - Copy is available for completed user/Agent messages. Running messages do not show copy or retry.
 
@@ -350,8 +351,10 @@ Chat is a one-conversation, one-Agent workbench with a session rail, transcript,
 - Header: Agent identity, working directory, how this chat connects, automatic-approval state, connection context.
 - Empty transcript: invite headline only; example chips fill the draft only (draft-only note on chip hover). Composer placeholder is generic (`发消息…`); Grok / Kiro / Claude queue-only limits and Enter / Shift+Enter use hover titles on an empty session. First-use toolbar keeps needed controls and quiets image/skill labels to icons; connection label truncates with a full-name hover. Composer blocker order: hidden Agent → environment not ready → missing authorization → unknown status → missing working directory; send is the composer accent action; rail **新建对话** uses the same theme fill. Enter sends, Shift+Enter makes a new line. While generating, one bottom-right control: Send injects or queues when the draft has text and that channel exists; empty draft shows icon Stop in the same slot; Esc still stops (dialogs/menus first). Queued lines show a count; Stop stays 正在停止 and disabled until the turn ends (re-enables if the cancel request misses); the 已停止 banner hides a raw `cancelled` status word; focus stays in the composer after send. Retry creates a new turn. Several conversations may generate at once. A compact shortcuts control opens the same overview on hover or click; `?` still opens the shortcuts dialog. Delete-confirm dialogs (session rail, backups) keep Enter-to-confirm and show a return-key icon, not the word Enter.
 - Approval cards: Allow / Deny; Always allow when the request includes that option. Codex / Grok / Kiro in-process remember (not saved). File-change cards show the path.
+- Plan bar above the composer: counts and 待做 / 进行中 / 已完成 / 失败; collapsible. Snapshot poll failure: **没法更新这场对话** after one second, Retry, no toast spam.
 - Streaming process: one-line human 正在读取 / 正在修改 / 正在执行 on the reply; click to open thinking/tools in the right-hand pane; protocol details folded. After the turn ends, muted turn-only 输入 / 输出 under the reply when the protocol sent counts. Copy for completed messages only.
-- New Codex conversations use durable app-server snapshots and show actual approval/question requests as controls. Replies and stop target the exact run; snapshot failure does not fall back to legacy send. Codex B2 is in: session model/effort, `/` command search, local image attachments, and skills/plugins discovery for this turn (no plan mode; no toolbar skill button — use `/` or Codex auto-use). The composer does not show a duplicate Agent overflow (⋮) next to the selected Agent. `/` lists run-now actions (new chat, copy latest reply). Model/effort/skill appear when the query matches, not as a full dump on a bare `/`. When a Grok/Kiro session is ready and the peer declared commands, `/` also lists those names: choosing one sends `/name` as a normal turn, or inserts `/name ` when the declaration requires args. History, search, settings, Agents, and Connections stay on the rail or header. New Grok conversations are continuous (model/thinking, images, queued follow-ups); **Unsupported**: choosing a skill “for this turn” (no clickable fake control). New Kiro conversations use the ACP continuous channel; old Kiro chats keep the original send path. New Claude conversations use stream-json continuous chat (images; no mid-turn steer; no approval cards in this slice); old Claude chats keep print+resume. See [B2](../archive/chat-codex-b2.md) and [STATUS](../STATUS.md).
+- Chat outline (聊天大纲): with the setting on (default), two or more user messages, and a transcript panel at least 720px wide, a tick rail on the left of the transcript jumps between prompts. Hover magnifies nearby ticks and shows a preview; the current reading turn is highlighted. A jump turns off stick-to-bottom so streaming does not pull the view back. Toggle is Settings → 语言与外观 (`agenthub:chat-outline-enabled`).
+- New Codex conversations use durable app-server snapshots and show actual approval/question requests as controls. Replies and stop target the exact run; snapshot failure does not fall back to legacy send. Codex B2 is in: session model/effort, `/` command search, local image attachments, and skills/plugins discovery for this turn (no plan mode; no toolbar skill button — use `/` or Codex auto-use). The composer does not show a duplicate Agent overflow (⋮) next to the selected Agent. `/` lists run-now actions (new chat, copy latest reply). Model/effort/skill appear when the query matches, not as a full dump on a bare `/`. When a Grok/Kiro session is ready and the peer declared commands, `/` also lists those names: choosing one sends `/name` as a normal turn, or inserts `/name ` when the declaration requires args. History, search, settings, Agents, and Connections stay on the rail or header. New Grok conversations are continuous (model/thinking, images, queued follow-ups); **Unsupported**: choosing a skill “for this turn” (no clickable fake control). New Kiro conversations use the ACP continuous channel; old Kiro chats keep the original send path. New Claude conversations use stream-json continuous chat (images; no mid-turn steer; no approval cards in this slice); TodoWrite / Task tool lists fill the same plan bar as Grok / Kiro. Old Claude chats keep print+resume. See [B2](../archive/chat-codex-b2.md) and [STATUS](../STATUS.md).
 - Runtime confirmation cards use **允许** / **拒绝**. **一直允许** appears only when this request includes that option (Codex command/file prompts always include it; Grok / Kiro only if the ACP request does, including Kiro `allow_always_tool`). Pending option lists are stored with the request so a snapshot or restart can still show the same buttons. After **一直允许**, Codex / Grok / Kiro auto-accept later command/file prompts in the current process (Codex typically this turn; Grok / Kiro the live ACP process; not saved). Grok / Kiro also forward the server option. Kiro session **完全访问权限** is a separate start-time setting, not this card. Cursor is out of this surface. See [Chat 与 Agent](../concepts/chat-and-agents.md#允许-拒绝-一直允许).
 
 ### Agent touchpoints (Chat)
diff --git a/e2e/browser/boot-and-navigation.spec.ts b/e2e/browser/boot-and-navigation.spec.ts
index f0dcc3ef..9e594be4 100644
--- a/e2e/browser/boot-and-navigation.spec.ts
+++ b/e2e/browser/boot-and-navigation.spec.ts
@@ -20,7 +20,7 @@ test('app boots on mock and primary navigation works', async ({ page }) => {
   await expect(page).toHaveURL(/#\/projects/);
   await expect(page.getByRole('heading', { name: '历史' })).toBeVisible();
 
-  await goNav(page, '对话');
+  await goNav(page, '工作区');
   await expect(page).toHaveURL(/#\/chat/);
   await expect(
     page.getByRole('textbox', { name: '消息输入' }).or(page.getByText('还没有可对话的 Agent')),
@@ -172,7 +172,7 @@ test('page title sits in the top bar; Chat has neither title nor in-app notifica
   expect(Math.abs(createBox!.y + createBox!.height / 2 - (leadBox!.y + leadBox!.height / 2))).toBeLessThanOrEqual(8);
   expect(Math.abs(leadBox!.y - connectionsTop)).toBeLessThanOrEqual(12);
 
-  await goNav(page, '对话');
+  await goNav(page, '工作区');
   await expect(page).toHaveURL(/#\/chat/);
   await expect(page.getByRole('button', { name: '通知' })).toHaveCount(0);
   await expect(page.getByRole('heading', { level: 1 })).toHaveCount(0);
diff --git a/e2e/browser/chat-file-approval.spec.ts b/e2e/browser/chat-file-approval.spec.ts
index 15e58173..cb32f351 100644
--- a/e2e/browser/chat-file-approval.spec.ts
+++ b/e2e/browser/chat-file-approval.spec.ts
@@ -20,7 +20,7 @@ test('path-only file approval stays readable without inventing a diff', async ({
   const card = page.locator('[data-help="chat-file-change-preview-path-only"]');
   await expect(card).toBeVisible({ timeout: 20_000 });
   await expect(page.getByText('修改文件', { exact: true }).first()).toBeVisible();
-  await expect(page.getByText('/workspace/notes.md', { exact: true })).toBeVisible();
+  await expect(card.getByText('/workspace/notes.md', { exact: true })).toBeVisible();
   await expect(page.getByText('仅有路径，无内容预览')).toBeVisible();
   await expect(page.getByRole('button', { name: '允许', exact: true })).toBeVisible();
   await expect(page.getByRole('button', { name: '一直允许' })).toBeVisible();
diff --git a/e2e/browser/chat-overflow.spec.ts b/e2e/browser/chat-overflow.spec.ts
index f0b12a2d..209f80b9 100644
--- a/e2e/browser/chat-overflow.spec.ts
+++ b/e2e/browser/chat-overflow.spec.ts
@@ -10,7 +10,8 @@ test('selected Agent has no duplicate overflow menu; other entries stay', async
   await expect(composer.getByRole('button', { name: '更多操作' })).toHaveCount(0);
   await expect(page.getByRole('button', { name: '更多操作' })).toHaveCount(0);
 
-  await expect(page.getByRole('button', { name: '新建对话' })).toBeVisible();
+  await expect(page.getByRole('button', { name: '新建对话', exact: true })).toBeVisible();
+  await expect(page.locator('[data-help="chat-new"]')).toHaveCount(1);
   await expect(page.getByLabel('搜索标题或工作目录')).toBeVisible();
   await expect(page.getByRole('button', { name: '会话设置' })).toBeVisible();
 
diff --git a/e2e/browser/helpers.ts b/e2e/browser/helpers.ts
index b320a648..3e842485 100644
--- a/e2e/browser/helpers.ts
+++ b/e2e/browser/helpers.ts
@@ -82,7 +82,7 @@ export async function addClaudeApiKeyAndSwitch(page: Page): Promise<void> {
 }
 
 export async function openChatComposer(page: Page): Promise<void> {
-  await goNav(page, '对话');
+  await goNav(page, '工作区');
   await expect(page.getByRole('textbox', { name: '消息输入' })).toBeVisible({
     timeout: 20_000,
   });
diff --git a/package.json b/package.json
index 7fb592d3..e44b6946 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "agenthub",
   "private": true,
-  "version": "0.4.19",
+  "version": "0.4.20",
   "description": "Multi-agent desktop hub: install runtimes, manage providers/accounts, skills, usage, and chat",
   "license": "MIT",
   "repository": {
diff --git a/src/lib/api/chat.test.ts b/src/lib/api/chat.test.ts
index 3aacc2e4..9af8e890 100644
--- a/src/lib/api/chat.test.ts
+++ b/src/lib/api/chat.test.ts
@@ -63,6 +63,17 @@ describe('chat API (browser mock)', () => {
     await rejected;
   });
 
+  it('createConversation drops a cyclic click-event cwd instead of throwing', async () => {
+    const cyclic: { target?: unknown } = {};
+    cyclic.target = cyclic;
+    expect(() => JSON.stringify(cyclic)).toThrow(/circular|cyclic/i);
+    const createP = createConversation(['claude'], cyclic as unknown as string);
+    await vi.runAllTimersAsync();
+    const created = await createP;
+    expect(created.agentIds).toEqual(['claude']);
+    expect(created.cwd).toBeNull();
+  });
+
   it('ensureDefaultConversation reuses the initial blank conversation', async () => {
     const firstP = ensureDefaultConversation(['claude']);
     await vi.runAllTimersAsync();
@@ -156,6 +167,38 @@ describe('chat API (browser mock)', () => {
     expect(again.cwd).toBe('C:\\Users\\demo\\app');
   });
 
+  it('opens a new conversation when the official session is not already in Chat', async () => {
+    const createdP = createConversation(['claude'], 'D:\\demo\\chen\\2026\\AgentHub');
+    await vi.runAllTimersAsync();
+    const created = await createdP;
+
+    const openP = openConversationFromSession({
+      agentId: 'claude',
+      sessionId: 'sess-history',
+      cwd: 'D:\\demo\\chen\\2026\\AgentHub',
+      title: '历史里的那场',
+      history: [{ role: 'user', content: '接着改登录页' }],
+    });
+    await vi.runAllTimersAsync();
+    const opened = await openP;
+    expect(opened.id).not.toBe(created.id);
+    expect(opened.nativeSessionId).toBe('sess-history');
+
+    const againP = openConversationFromSession({
+      agentId: 'claude',
+      sessionId: 'sess-history',
+      cwd: 'D:\\demo\\chen\\2026\\AgentHub',
+      title: '忽略',
+      history: [],
+    });
+    await vi.runAllTimersAsync();
+    expect((await againP).id).toBe(opened.id);
+
+    const listP = listConversations();
+    await vi.runAllTimersAsync();
+    expect((await listP).map((row) => row.id).sort()).toEqual([created.id, opened.id].sort());
+  });
+
   it('create / list / update / delete conversation', async () => {
     const createP = createConversation(['claude'], 'D:\\demo');
     await vi.runAllTimersAsync();
diff --git a/src/lib/api/chat.ts b/src/lib/api/chat.ts
index 79aa09a9..42ce49f6 100644
--- a/src/lib/api/chat.ts
+++ b/src/lib/api/chat.ts
@@ -2,6 +2,7 @@
  * Chat API façade — delegates to app runtime backend.
  */
 import { getBackend } from '@/app/runtime';
+import { createConversationCwd } from '@/lib/open-chat-cwd';
 import type { AgentKey, ChatEvent, ChatHistoryTurn, ChatMessage, Conversation } from '@/lib/types';
 import type { MarkdownFilePreviewDto } from '@/lib/backend/contracts/chat-port';
 import type { RuntimeOptions, RuntimeReply, RuntimeSnapshot, RuntimeStartExtras, RuntimeTurnSettings } from '@/lib/backend/contracts/chat-runtime';
@@ -23,7 +24,7 @@ export async function createConversation(
   agentIds: AgentKey[],
   cwd?: string | null,
 ): Promise<Conversation> {
-  return getBackend().chat.createConversation(agentIds, cwd);
+  return getBackend().chat.createConversation(agentIds, createConversationCwd(cwd));
 }
 
 export async function ensureDefaultConversation(
diff --git a/src/lib/backend/contracts/chat-runtime.ts b/src/lib/backend/contracts/chat-runtime.ts
index bbe34a6a..ef437a4b 100644
--- a/src/lib/backend/contracts/chat-runtime.ts
+++ b/src/lib/backend/contracts/chat-runtime.ts
@@ -53,7 +53,7 @@ export interface RuntimeSnapshot {
   currentMessage?: ChatMessage | null;
   /** Bumps when the Options catalog changes. Not the command list. */
   catalogEpoch?: number;
-  /** Current-turn ACP plan. Live chrome only — dropped on the next turn. */
+  /** Current-turn plan. Chrome only — dropped on the next turn. */
   plan?: RuntimePlanEntry[];
   /** Live ACP host commands. One card per id; not a conversation TTY. */
   hostTerminals?: RuntimeHostTerminal[];
@@ -77,6 +77,8 @@ export interface RuntimePlanEntry {
   content: string;
   status?: string | null;
   priority?: string | null;
+  /** Vendor task id when the Agent sent one. Matching only; not shown. */
+  id?: string | null;
 }
 
 export interface RuntimeReply {
diff --git a/src/lib/backend/tauri/chat.ts b/src/lib/backend/tauri/chat.ts
index 6fcf0926..5ce86adb 100644
--- a/src/lib/backend/tauri/chat.ts
+++ b/src/lib/backend/tauri/chat.ts
@@ -1,4 +1,5 @@
 import type { ChatPort, MarkdownFilePreviewDto } from '@/lib/backend/contracts';
+import { createConversationCwd } from '@/lib/open-chat-cwd';
 import {
   mapChatMessage,
   mapConversation,
@@ -20,7 +21,7 @@ export function createTauriChatPort(): ChatPort {
     async createConversation(agentIds, cwd) {
       const row = await invoke<CoreConversation>('create_conversation', {
         agentIds,
-        cwd: cwd ?? null,
+        cwd: createConversationCwd(cwd),
       });
       return mapConversation(row);
     },
diff --git a/src/lib/chat-process.test.ts b/src/lib/chat-process.test.ts
index 65dea0c6..ff78e087 100644
--- a/src/lib/chat-process.test.ts
+++ b/src/lib/chat-process.test.ts
@@ -10,13 +10,17 @@ import {
   hasInspectableProcess,
   hasProcessDetails,
   isProtocolProcessStep,
+  latestThinkingStep,
   mergeThinkingText,
   mergeToolResult,
   phaseFromMessageStatus,
   processKey,
   processPhaseLabel,
   reduceProcessEvent,
+  showBubbleThinkingBar,
   stepSummary,
+  thinkingElapsedMs,
+  timelineHasToolRow,
   timelineProcessSteps,
   toolActionTarget,
   toolActionTone,
@@ -622,6 +626,97 @@ describe('chat-process reduceProcessEvent', () => {
     expect(map['1:grok']?.steps[1]).toMatchObject({ type: 'tool', status: 'end', result: 'ok' });
   });
 
+  it('stamps thinking start and freezes duration when the episode ends', () => {
+    let map: ProcessMap = reduceProcessEvent(
+      {},
+      { type: 'agentStarted', turn: 1, agent: 'grok', command: 'x' },
+      1000,
+    );
+    map = reduceProcessEvent(
+      map,
+      {
+        type: 'agentProcess',
+        turn: 1,
+        agent: 'grok',
+        step: { type: 'thinking', text: 'Hel', done: false },
+      },
+      2000,
+    );
+    expect(map['1:grok']?.thinkingStartedAt).toBe(2000);
+    expect(map['1:grok']?.thinkingDurationMs).toBeUndefined();
+    expect(thinkingElapsedMs(map['1:grok'], 3500)).toBe(1500);
+    expect(latestThinkingStep(map['1:grok']?.steps)).toMatchObject({ done: false });
+    expect(showBubbleThinkingBar(map['1:grok']?.steps, false)).toBe(true);
+    expect(showBubbleThinkingBar(map['1:grok']?.steps, true)).toBe(false);
+
+    map = reduceProcessEvent(
+      map,
+      {
+        type: 'agentProcess',
+        turn: 1,
+        agent: 'grok',
+        step: { type: 'thinking', text: 'lo', done: false },
+      },
+      2800,
+    );
+    expect(map['1:grok']?.thinkingStartedAt).toBe(2000);
+
+    map = reduceProcessEvent(
+      map,
+      {
+        type: 'agentProcess',
+        turn: 1,
+        agent: 'grok',
+        step: { type: 'tool', id: 't1', name: 'Read', status: 'start' },
+      },
+      5200,
+    );
+    expect(map['1:grok']?.thinkingDurationMs).toBe(3200);
+    expect(thinkingElapsedMs(map['1:grok'], 9000)).toBe(3200);
+    expect(timelineHasToolRow(map['1:grok']?.steps)).toBe(true);
+  });
+
+  it('starts a new thinking timer after a tool', () => {
+    let map: ProcessMap = reduceProcessEvent(
+      {},
+      { type: 'agentStarted', turn: 1, agent: 'grok', command: 'x' },
+      1,
+    );
+    map = reduceProcessEvent(
+      map,
+      {
+        type: 'agentProcess',
+        turn: 1,
+        agent: 'grok',
+        step: { type: 'thinking', text: 'first', done: false },
+      },
+      100,
+    );
+    map = reduceProcessEvent(
+      map,
+      {
+        type: 'agentProcess',
+        turn: 1,
+        agent: 'grok',
+        step: { type: 'tool', id: 't1', name: 'Read', status: 'start' },
+      },
+      400,
+    );
+    map = reduceProcessEvent(
+      map,
+      {
+        type: 'agentProcess',
+        turn: 1,
+        agent: 'grok',
+        step: { type: 'thinking', text: 'second', done: false },
+      },
+      900,
+    );
+    expect(map['1:grok']?.thinkingStartedAt).toBe(900);
+    expect(map['1:grok']?.thinkingDurationMs).toBeUndefined();
+    expect(thinkingElapsedMs(map['1:grok'], 1400)).toBe(500);
+  });
+
   it('agentFinished marks leftover thinking done', () => {
     let map: ProcessMap = reduceProcessEvent(
       {},
@@ -646,9 +741,11 @@ describe('chat-process reduceProcessEvent', () => {
         agent: 'grok',
         message: finishedMsg({ status: 'ok', content: 'done', agentId: 'grok' }),
       },
-      3,
+      5002,
     );
     expect(map['1:grok']?.steps[0]).toMatchObject({ type: 'thinking', done: true });
+    expect(map['1:grok']?.thinkingStartedAt).toBe(2);
+    expect(map['1:grok']?.thinkingDurationMs).toBe(5000);
   });
 
   it('finished finalizes still-active process views for the turn', () => {
@@ -986,3 +1083,64 @@ describe('chat-process human tool labels', () => {
     expect(isProtocolProcessStep({ type: 'tool', name: 'Read', status: 'start' })).toBe(false);
   });
 });
+
+describe('thinking / tools pane helpers', () => {
+  it('keeps thinking-only timelines off the tool chip', () => {
+    const thinking = [{ type: 'thinking' as const, text: 'plan', done: false }];
+    expect(latestThinkingStep(thinking)?.text).toBe('plan');
+    expect(latestThinkingStep([])).toBeUndefined();
+    expect(latestThinkingStep(undefined)).toBeUndefined();
+    expect(timelineHasToolRow(thinking)).toBe(false);
+    expect(showBubbleThinkingBar(thinking, false)).toBe(true);
+    expect(formatProcessHeadline(thinking, 'running', t)).toBe('思考中');
+    expect(thinkingElapsedMs(undefined, 1000)).toBe(0);
+    expect(thinkingElapsedMs({
+      turn: 1,
+      agent: 'codex',
+      phase: 'running',
+      stdout: '',
+      stderr: '',
+      steps: thinking,
+      updatedAt: 1,
+    }, 1000)).toBe(0);
+    expect(thinkingElapsedMs({
+      turn: 1,
+      agent: 'codex',
+      phase: 'ok',
+      stdout: '',
+      stderr: '',
+      steps: thinking,
+      updatedAt: 1,
+      thinkingStartedAt: 500,
+      thinkingDurationMs: -12,
+    }, 900)).toBe(0);
+  });
+
+  it('folds same-id execute updates and skips blank command output', () => {
+    expect(timelineProcessSteps([
+      { type: 'raw', text: '   ', note: 'command output' },
+      { type: 'tool', id: 'run-1', name: 'Bash', status: 'start', input: { command: 'ls' } },
+      { type: 'tool', id: 'run-1', name: 'Bash', status: 'end', result: 'docs' },
+      { type: 'status', phase: 'starting', detail: 'thread.started' },
+      { type: 'usage', scope: 'turn', input: 1, output: 1 },
+    ])).toEqual([
+      {
+        type: 'tool',
+        id: 'run-1',
+        name: 'Bash',
+        status: 'end',
+        input: { command: 'ls' },
+        result: 'docs',
+      },
+    ]);
+    expect(timelineHasToolRow([
+      { type: 'tool', name: 'Bash', status: 'end' },
+      { type: 'error', message: 'boom' },
+    ])).toBe(true);
+    expect(formatProcessHeadline(
+      [{ type: 'tool', name: 'Bash', status: 'error', input: { command: 'ls' } }],
+      'failed',
+      t,
+    )).toBe('没法执行 ls');
+  });
+});
diff --git a/src/lib/chat-process.ts b/src/lib/chat-process.ts
index 41af2d83..cea37e2a 100644
--- a/src/lib/chat-process.ts
+++ b/src/lib/chat-process.ts
@@ -16,6 +16,8 @@ export type ProcessPhase =
   | 'cancelled'
   | 'timeout';
 
+export type ThinkingStep = Extract<ProcessStep, { type: 'thinking' }>;
+
 export type AgentProcessView = {
   turn: number;
   agent: AgentKey;
@@ -26,6 +28,10 @@ export type AgentProcessView = {
   /** Structured steps (tool / thinking / status / raw / usage). Cap in reducer. */
   steps: ProcessStep[];
   updatedAt: number;
+  /** Wall-clock when the current/last thinking episode started. */
+  thinkingStartedAt?: number;
+  /** Frozen duration for the last thinking episode once it finishes. */
+  thinkingDurationMs?: number;
 };
 
 export type ProcessMap = Record<string, AgentProcessView>;
@@ -344,6 +350,39 @@ export function timelineProcessSteps(steps: ProcessStep[]): ProcessStep[] {
   return out;
 }
 
+export function isThinkingStep(step: ProcessStep): step is ThinkingStep {
+  return step.type === 'thinking';
+}
+
+export function latestThinkingStep(steps: ProcessStep[] | undefined): ThinkingStep | undefined {
+  const found = lastMatching(steps ?? [], isThinkingStep);
+  return found && isThinkingStep(found) ? found : undefined;
+}
+
+/** Live timer, or the frozen duration after thinking ends. */
+export function thinkingElapsedMs(view: AgentProcessView | undefined, now: number): number {
+  if (!view?.thinkingStartedAt) return 0;
+  if (view.thinkingDurationMs != null) return Math.max(0, view.thinkingDurationMs);
+  return Math.max(0, now - view.thinkingStartedAt);
+}
+
+/** Main-column chrome: thinking exists and the assistant body has not arrived. */
+export function showBubbleThinkingBar(
+  steps: ProcessStep[] | undefined,
+  hasContent: boolean,
+): boolean {
+  if (hasContent) return false;
+  return latestThinkingStep(steps) != null;
+}
+
+export function timelineHasToolRow(steps: ProcessStep[] | undefined): boolean {
+  return timelineProcessSteps(steps ?? []).some(
+    (step) => step.type === 'tool' || step.type === 'error' || step.type === 'raw',
+  );
+}
+
+function lastMatching<T, S extends T>(items: T[], pred: (item: T) => item is S): S | undefined;
+function lastMatching<T>(items: T[], pred: (item: T) => boolean): T | undefined;
 function lastMatching<T>(items: T[], pred: (item: T) => boolean): T | undefined {
   for (let i = items.length - 1; i >= 0; i -= 1) {
     if (pred(items[i])) return items[i];
@@ -549,6 +588,45 @@ function markLastThinkingDone(steps: ProcessStep[]): ProcessStep[] {
   return steps;
 }
 
+function freezeThinkingDuration(
+  view: Pick<AgentProcessView, 'thinkingStartedAt' | 'thinkingDurationMs'>,
+  now: number,
+): Pick<AgentProcessView, 'thinkingStartedAt' | 'thinkingDurationMs'> {
+  if (view.thinkingStartedAt == null || view.thinkingDurationMs != null) {
+    return {
+      thinkingStartedAt: view.thinkingStartedAt,
+      thinkingDurationMs: view.thinkingDurationMs,
+    };
+  }
+  return {
+    thinkingStartedAt: view.thinkingStartedAt,
+    thinkingDurationMs: Math.max(0, now - view.thinkingStartedAt),
+  };
+}
+
+function stampThinkingTiming(
+  prev: AgentProcessView,
+  step: ProcessStep,
+  now: number,
+): Pick<AgentProcessView, 'thinkingStartedAt' | 'thinkingDurationMs'> {
+  if (step.type === 'thinking') {
+    const last = prev.steps[prev.steps.length - 1];
+    const mergeIntoOpen = last?.type === 'thinking' && !last.done;
+    const startedAt = mergeIntoOpen ? (prev.thinkingStartedAt ?? now) : now;
+    if (step.done) {
+      return { thinkingStartedAt: startedAt, thinkingDurationMs: Math.max(0, now - startedAt) };
+    }
+    return { thinkingStartedAt: startedAt, thinkingDurationMs: undefined };
+  }
+  if (prev.thinkingStartedAt != null && prev.thinkingDurationMs == null) {
+    return freezeThinkingDuration(prev, now);
+  }
+  return {
+    thinkingStartedAt: prev.thinkingStartedAt,
+    thinkingDurationMs: prev.thinkingDurationMs,
+  };
+}
+
 /**
  * Codex `item.updated` reasoning is a full snapshot; Grok/Pi/Claude thinking
  * chunks are deltas. If the new text already contains the previous text as a
@@ -686,6 +764,8 @@ export function reduceProcessEvent(map: ProcessMap, ev: ChatEvent, now = Date.no
         stdout: prev?.stdout ?? '',
         stderr: prev?.stderr ?? '',
         steps: prev?.steps ?? [],
+        thinkingStartedAt: prev?.thinkingStartedAt,
+        thinkingDurationMs: prev?.thinkingDurationMs,
         updatedAt: now,
       },
     };
@@ -728,6 +808,7 @@ export function reduceProcessEvent(map: ProcessMap, ev: ChatEvent, now = Date.no
         ...prev,
         phase: prev.phase === 'queued' || prev.phase === 'starting' ? 'running' : prev.phase,
         steps: pushStep(prev.steps, ev.step),
+        ...stampThinkingTiming(prev, ev.step, now),
         updatedAt: now,
       },
     };
@@ -744,6 +825,7 @@ export function reduceProcessEvent(map: ProcessMap, ev: ChatEvent, now = Date.no
         phase: phaseFromMessageStatus(ev.message.status),
         stdout: content || prev.stdout,
         steps: markLastThinkingDone(prev.steps),
+        ...freezeThinkingDuration(prev, now),
         updatedAt: now,
       },
     };
@@ -765,6 +847,7 @@ export function reduceProcessEvent(map: ProcessMap, ev: ChatEvent, now = Date.no
           // 生产取消时 ok=true；缺省 cancelled 当 false，兼容旧事件
           phase: ev.cancelled ? 'cancelled' : ev.ok ? 'ok' : 'failed',
           steps: markLastThinkingDone(view.steps),
+          ...freezeThinkingDuration(view, now),
           updatedAt: now,
         };
         changed = true;
diff --git a/src/lib/i18n/index.test.ts b/src/lib/i18n/index.test.ts
index d1e668a9..4584ed1b 100644
--- a/src/lib/i18n/index.test.ts
+++ b/src/lib/i18n/index.test.ts
@@ -66,6 +66,7 @@ describe('translate / interpolate', () => {
     expect(translate('en', 'common.save')).toBe('Save');
     expect(translate('zh', 'common.save')).toBe('保存');
     const t = createTranslator('en');
+    expect(t('nav.chat')).toBe('Workspace');
     expect(t('nav.routes')).toBe('Routes');
     expect(t('routes.page.title')).toBe('Routes');
     expect(t('nav.dashboard')).toBe('Dashboard');
@@ -80,7 +81,7 @@ describe('translate / interpolate', () => {
     expect(zhNav('nav.routes')).toBe('路由');
     expect(zhNav('routes.page.title')).toBe('路由');
     expect(zhNav('nav.settings')).toBe('设置');
-    expect(zhNav('nav.chat')).toBe('对话');
+    expect(zhNav('nav.chat')).toBe('工作区');
     expect(zhNav('nav.agents')).toBe('Agent');
     expect(zhNav('chrome.onboarding.enterDashboard')).toBe('进入总览');
     expect(zhNav('chrome.onboarding.skipGuide')).toBe('跳过引导');
diff --git a/src/lib/i18n/locales/en.ts b/src/lib/i18n/locales/en.ts
index 6f612558..6d331116 100644
--- a/src/lib/i18n/locales/en.ts
+++ b/src/lib/i18n/locales/en.ts
@@ -40,7 +40,7 @@ export const en = {
   nav: {
     workspace: 'Workspace',
     manage: 'Manage',
-    chat: 'Chat',
+    chat: 'Workspace',
     agents: 'Agents',
     skills: 'Skills',
     mcp: 'MCP',
@@ -111,6 +111,8 @@ export const en = {
       canvasMint: 'Mint',
       canvasSand: 'Sand',
       canvasLilac: 'Lilac',
+      chatOutlineLabel: 'Chat outline',
+      chatOutlineDescription: 'Show an outline for jumping between prompts',
       autoStartLabel: 'Launch at login',
       autoStartDescription: 'Start after you sign in',
       autoStartTip:
@@ -2738,6 +2740,7 @@ export const en = {
       expandHistory: "Expand history",
       resize: "Resize history",
       newChat: "New chat",
+      newChatInWorkspace: "New chat in this folder",
       newChatDisabled: "Install or unhide an agent first",
       searchPlaceholder: "Search title or folder",
       searchAria: "Search title or folder",
@@ -2753,6 +2756,7 @@ export const en = {
     header: {
       conversation: "Chat",
       titleAria: "Conversation title",
+      switchSession: "Switch session",
       pickCwd: "Click to choose a working directory",
       cwdUnset: "Working directory not set",
       cwdMissing: "Folder is gone",
@@ -2764,6 +2768,10 @@ export const en = {
       resumeCommandCopiedHint: "Paste in the terminal to continue this chat",
       noResumeCommand: "No session to copy",
     },
+    outline: {
+      aria: "Chat outline",
+      tick: "{n} of {total}: {preview}",
+    },
     preview: {
       titleFallback: "Preview",
       back: "Back",
@@ -2776,6 +2784,7 @@ export const en = {
       failed: "Couldn't open",
       emptyBody: "Nothing to show",
       truncatedSuffix: " · Truncated",
+      viewEdit: "View edits",
     },
     composer: {
       placeholder: "Message an agent…",
@@ -2823,6 +2832,8 @@ export const en = {
       stop: "Stop",
       actions: "More actions",
       history: "Search history",
+      prevSession: "Previous session",
+      nextSession: "Next session",
       model: "Change model",
       newChat: "New chat",
       overview: "Shortcut overview",
@@ -2851,9 +2862,9 @@ export const en = {
       sessionRemembered: 'Always allow is on for this chat',
       sessionRememberedHint: 'A new chat will ask again. This is not auto-approve in session settings.',
       sessionRememberedHintKiro: 'A new chat will ask again. This is not full access in session settings.',
-      sessionRememberedOff: 'Off. Turn it on from a card — this switch will not fake an allow.',
-      sessionRememberedOnHint: 'Turn off to ask again in this chat. This is not auto-approve in session settings.',
-      sessionRememberedOnHintKiro: 'Turn off to ask again in this chat. This is not full access in session settings.',
+      sessionRememberedOff: 'Turn on from a card',
+      sessionRememberedOnHint: 'Turn off to ask again',
+      sessionRememberedOnHintKiro: 'Turn off to ask again',
       sessionRememberedClear: 'Stop remembering',
       sessionRememberedClearFailed: "Couldn't turn off always allow for this chat",
       replyFailed: "Couldn't send allow or deny",
@@ -2871,6 +2882,16 @@ export const en = {
       needConfirm: 'Needs confirmation',
       needAnswer: 'Needs your answer',
       plan: 'Plan',
+      planProgress: '{done}/{total} done',
+      planStatusPending: 'To do',
+      planStatusLive: 'In progress',
+      planStatusDone: 'Done',
+      planStatusFailed: 'Failed',
+      planExpand: 'Expand plan',
+      planCollapse: 'Collapse plan',
+      snapshotStale: "Couldn't update this chat",
+      snapshotStaleHint: 'Showing the last content we have. Retry to read again.',
+      snapshotRetry: 'Retry',
       hostCommand: 'Run command',
       stopCommand: 'Stop this one',
       stopCommandFailed: "Couldn't stop this command",
@@ -3033,7 +3054,7 @@ export const en = {
       acp: "ACP",
       continuous: "Continuous chat",
       legacy: "Original send path",
-      sessionTitle: "How this chat connects",
+      sessionTitle: "This chat",
       sessionHintAcp: "This chat uses ACP. Always allow on a card only remembers this conversation — not start-of-chat auto-approve.",
       sessionHintContinuous: "This chat uses continuous chat. Always allow on a card only remembers this conversation — not start-of-chat auto-approve.",
       sessionHintLegacy: "This chat uses the original send path. There is no allow/deny card.",
@@ -3044,7 +3065,7 @@ export const en = {
     },
     settings: {
       title: "Session settings",
-      description: "Working directory, how this chat connects, and auto-approve",
+      description: "Working folder and auto-approve",
       cwd: "Working directory",
       cwdPlaceholder: "Choose a local folder, or paste a full path",
       pickDir: "Choose folder",
diff --git a/src/lib/i18n/locales/zh.ts b/src/lib/i18n/locales/zh.ts
index 7314d5de..b48fa143 100644
--- a/src/lib/i18n/locales/zh.ts
+++ b/src/lib/i18n/locales/zh.ts
@@ -39,7 +39,7 @@ export const zh = {
   nav: {
     workspace: '工作区',
     manage: '管理',
-    chat: '对话',
+    chat: '工作区',
     agents: 'Agent',
     skills: '技能',
     mcp: 'MCP',
@@ -110,6 +110,8 @@ export const zh = {
       canvasMint: '薄荷',
       canvasSand: '沙色',
       canvasLilac: '淡紫',
+      chatOutlineLabel: '聊天大纲',
+      chatOutlineDescription: '显示用于在提示词之间跳转的大纲',
       autoStartLabel: '开机自启',
       autoStartDescription: '登录后启动',
       autoStartTip:
@@ -2718,6 +2720,7 @@ export const zh = {
       expandHistory: "展开历史",
       resize: "拖动调整历史宽度",
       newChat: "新建对话",
+      newChatInWorkspace: "在此工作目录新建对话",
       newChatDisabled: "请先安装或取消隐藏 Agent",
       searchPlaceholder: "搜索标题或工作目录",
       searchAria: "搜索标题或工作目录",
@@ -2733,6 +2736,7 @@ export const zh = {
     header: {
       conversation: "对话",
       titleAria: "会话标题",
+      switchSession: "切换会话",
       pickCwd: "点击选择工作目录",
       cwdUnset: "未设置工作目录",
       cwdMissing: "目录已不存在",
@@ -2744,6 +2748,10 @@ export const zh = {
       resumeCommandCopiedHint: "粘贴到终端即可继续这场对话",
       noResumeCommand: "没有可复制的会话",
     },
+    outline: {
+      aria: "聊天大纲",
+      tick: "{n} / {total}：{preview}",
+    },
     preview: {
       titleFallback: "预览",
       back: "返回",
@@ -2756,6 +2764,7 @@ export const zh = {
       failed: "无法打开",
       emptyBody: "没有内容",
       truncatedSuffix: " · 已截断",
+      viewEdit: "查看修改",
     },
     composer: {
       placeholder: "发给 Agent…",
@@ -2803,6 +2812,8 @@ export const zh = {
       stop: "停止",
       actions: "更多操作",
       history: "搜索历史会话",
+      prevSession: "上一条会话",
+      nextSession: "下一条会话",
       model: "换模型",
       newChat: "新建对话",
       overview: "快捷键一览",
@@ -2831,9 +2842,9 @@ export const zh = {
       sessionRemembered: '本会话已一直允许',
       sessionRememberedHint: '新对话再问。不是会话设置里的自动批准。',
       sessionRememberedHintKiro: '新对话再问。不是会话设置里的完全访问权限。',
-      sessionRememberedOff: '关。卡片上点了才会开，不会在这里假装打开。',
-      sessionRememberedOnHint: '关掉后这次对话再问。不是会话设置里的自动批准。',
-      sessionRememberedOnHintKiro: '关掉后这次对话再问。不是会话设置里的完全访问权限。',
+      sessionRememberedOff: '卡片上点了才会开',
+      sessionRememberedOnHint: '关了这次对话再问',
+      sessionRememberedOnHintKiro: '关了这次对话再问',
       sessionRememberedClear: '停止记住',
       sessionRememberedClearFailed: '没法关掉本会话一直允许',
       replyFailed: '没法回传允许或拒绝',
@@ -2851,6 +2862,16 @@ export const zh = {
       needConfirm: '需要确认',
       needAnswer: '需要你的回答',
       plan: '计划',
+      planProgress: '{done}/{total} 已完成',
+      planStatusPending: '待做',
+      planStatusLive: '进行中',
+      planStatusDone: '已完成',
+      planStatusFailed: '失败',
+      planExpand: '展开计划',
+      planCollapse: '收起计划',
+      snapshotStale: '没法更新这场对话',
+      snapshotStaleHint: '停在最后看到的内容。点重试再读一次。',
+      snapshotRetry: '重试',
       hostCommand: '执行命令',
       stopCommand: '停止这条',
       stopCommandFailed: '没法停止这条命令',
@@ -3013,7 +3034,7 @@ export const zh = {
       acp: "ACP",
       continuous: "持续对话",
       legacy: "原来的发送方式",
-      sessionTitle: "这次对话怎么接",
+      sessionTitle: "这次对话",
       sessionHintAcp: "这次对话走 ACP。卡片上的一直允许只记这一次，不是启动时的自动批准。",
       sessionHintContinuous: "这次对话走持续对话。卡片上的一直允许只记这一次，不是启动时的自动批准。",
       sessionHintLegacy: "这次对话走原来的发送方式，没有允许/拒绝卡片。",
@@ -3024,7 +3045,7 @@ export const zh = {
     },
     settings: {
       title: "会话设置",
-      description: "工作目录、这次对话怎么接、自动批准",
+      description: "工作目录和自动批准",
       cwd: "工作目录",
       cwdPlaceholder: "选择本机目录，或粘贴完整路径",
       pickDir: "选择目录",
diff --git a/src/lib/open-chat-cwd.test.ts b/src/lib/open-chat-cwd.test.ts
index f3a8f12b..482d7f56 100644
--- a/src/lib/open-chat-cwd.test.ts
+++ b/src/lib/open-chat-cwd.test.ts
@@ -4,7 +4,9 @@ import { fileURLToPath } from 'node:url';
 import { describe, expect, it, vi } from 'vitest';
 import {
   consumePendingOpenChatCwd,
+  createConversationCwd,
   folderNameFromCwd,
+  newChatCwdArg,
   shellOpenChatBootstrap,
   shellOpenChatHref,
 } from './open-chat-cwd';
@@ -26,6 +28,25 @@ describe('folderNameFromCwd', () => {
   });
 });
 
+describe('newChatCwdArg', () => {
+  it('keeps a folder path or explicit null and drops click events', () => {
+    expect(newChatCwdArg('/workspace')).toBe('/workspace');
+    expect(newChatCwdArg(null)).toBeNull();
+    expect(newChatCwdArg(undefined)).toBeUndefined();
+    const cyclic: { target?: unknown } = {};
+    cyclic.target = cyclic;
+    expect(() => JSON.stringify(cyclic)).toThrow(/circular|cyclic/i);
+    expect(newChatCwdArg(cyclic)).toBeUndefined();
+    expect(() => JSON.stringify({
+      agentIds: ['grok'],
+      cwd: createConversationCwd(cyclic),
+    })).not.toThrow();
+    expect(createConversationCwd(cyclic)).toBeNull();
+    expect(createConversationCwd('/workspace')).toBe('/workspace');
+    expect(createConversationCwd(null)).toBeNull();
+  });
+});
+
 describe('consumePendingOpenChatCwd', () => {
   it('is a no-op when takePending returns nothing', async () => {
     const applyBootstrap = vi.fn();
@@ -85,4 +106,13 @@ describe('App open-chat wiring', () => {
       /HashRouter `useNavigate` changes identity with pathname; do not resubscribe\.\s*\n\s*\}, \[\]\);/,
     );
   });
+
+  it('omits non-string cwd before create-conversation persist and IPC', () => {
+    const dir = path.dirname(fileURLToPath(import.meta.url));
+    const api = readFileSync(path.resolve(dir, 'api/chat.ts'), 'utf8');
+    const tauri = readFileSync(path.resolve(dir, 'backend/tauri/chat.ts'), 'utf8');
+    expect(api).toContain('createConversationCwd');
+    expect(tauri).toContain('createConversationCwd');
+    expect(tauri).toContain('cwd: createConversationCwd(cwd)');
+  });
 });
diff --git a/src/lib/open-chat-cwd.ts b/src/lib/open-chat-cwd.ts
index 84b38230..9da1ef96 100644
--- a/src/lib/open-chat-cwd.ts
+++ b/src/lib/open-chat-cwd.ts
@@ -1,5 +1,21 @@
 import type { ChatBootstrap } from '@/lib/types';
 
+/**
+ * New-chat cwd for persist / IPC. Only a folder path or explicit null.
+ * Click events and other objects are dropped so JSON.stringify never sees a cycle.
+ */
+export function newChatCwdArg(value: unknown): string | null | undefined {
+  if (value === undefined) return undefined;
+  if (value === null) return null;
+  if (typeof value === 'string') return value;
+  return undefined;
+}
+
+/** Wire / invoke shape: never pass a non-string through JSON.stringify. */
+export function createConversationCwd(value: unknown): string | null {
+  return typeof value === 'string' ? value : null;
+}
+
 /** Last path segment for a folder chosen in the OS file manager. */
 export function folderNameFromCwd(cwd: string): string {
   const trimmed = cwd.trim().replace(/[\\/]+$/, '');
diff --git a/src/lib/storage-key.test.ts b/src/lib/storage-key.test.ts
index 3c160485..9dfb1ed4 100644
--- a/src/lib/storage-key.test.ts
+++ b/src/lib/storage-key.test.ts
@@ -90,6 +90,10 @@ describe('StorageKey', () => {
       chatBootstrap: 'agenthub:chat-bootstrap',
     });
   });
+
+  it('stores the chat outline toggle on the kebab catalog', () => {
+    expect(StorageKey.chatOutlineEnabled).toBe('agenthub:chat-outline-enabled');
+  });
 });
 
 describe('readStorageItem', () => {
diff --git a/src/lib/storage-key.ts b/src/lib/storage-key.ts
index 30a513da..15da0927 100644
--- a/src/lib/storage-key.ts
+++ b/src/lib/storage-key.ts
@@ -100,6 +100,8 @@ export const StorageKey = {
   projectsListSort: `${PREFIX}projects-list-sort`,
   /** Last workspace chosen on the project-skills tab. */
   skillsProjectWorkspace: `${PREFIX}skills-project-workspace`,
+  /** Chat transcript outline (tick rail); default on. */
+  chatOutlineEnabled: `${PREFIX}chat-outline-enabled`,
   ...LAYOUT_STORAGE_KEY,
 } as const;
 
diff --git a/src/pages/chat/ChatEditPreviewPanel.tsx b/src/pages/chat/ChatEditPreviewPanel.tsx
new file mode 100644
index 00000000..c3ac4792
--- /dev/null
+++ b/src/pages/chat/ChatEditPreviewPanel.tsx
@@ -0,0 +1,166 @@
+import { useEffect, useId } from 'react';
+import { PanelRightClose } from 'lucide-react';
+import { SourcePreview } from '@/components/shared/SourcePreview';
+import { CopyableFileName } from '@/components/shared/CopyableFileName';
+import { pathTailLabel } from '@/components/shared/file-name-label';
+import { useI18n } from '@/components/shared/LanguageProvider';
+import { Button } from '@/components/ui/button';
+import { Tip } from '@/components/ui/tooltip';
+import { CHAT_FILE_PREVIEW_MAX_CHARS } from '@/lib/source-preview';
+import { hasEscPriorityOverlay } from '@/lib/skills/preview-keys';
+import { cn } from '@/lib/utils';
+import {
+  sameEditPath,
+  turnEditDiffText,
+  type TurnEditFile,
+} from './chat-edit-preview';
+
+function fileName(path: string): string {
+  const parts = path.trim().split(/[/\\]/).filter(Boolean);
+  return parts[parts.length - 1] ?? path.trim();
+}
+
+export function ChatTurnEditList({
+  files,
+  selectedPath,
+  onSelect,
+}: {
+  files: TurnEditFile[];
+  selectedPath?: string;
+  onSelect: (file: TurnEditFile) => void;
+}) {
+  const { t } = useI18n();
+  if (files.length === 0) return null;
+  return (
+    <section
+      className="mb-2 rounded-card border border-border bg-subtle px-3 py-2 text-meta"
+      data-help="chat-turn-edits"
+      aria-label={t('chat.preview.viewEdit')}
+    >
+      <p className="font-medium text-secondary">{t('chat.preview.viewEdit')}</p>
+      <ul className="mt-1.5 space-y-0.5">
+        {files.map((file) => {
+          const selected = Boolean(selectedPath && sameEditPath(selectedPath, file.path));
+          const statusLabel = file.status === 'live'
+            ? t('chat.process.toolEdit')
+            : t('chat.process.toolEditDone');
+          return (
+            <li key={file.path}>
+              <button
+                type="button"
+                className={cn(
+                  'flex w-full min-w-0 items-baseline gap-2 rounded-btn px-1 py-0.5 text-left hover:bg-hover',
+                  file.status === 'live' && 'agent-progress-running font-medium text-primary',
+                  file.status === 'done' && 'text-secondary',
+                  selected && 'bg-hover',
+                )}
+                aria-current={selected ? 'true' : undefined}
+                onClick={() => onSelect(file)}
+              >
+                <span className="shrink-0 text-muted">{statusLabel}</span>
+                <Tip label={file.path} className="min-w-0 flex-1 truncate font-mono">
+                  {pathTailLabel(file.path)}
+                </Tip>
+              </button>
+            </li>
+          );
+        })}
+      </ul>
+    </section>
+  );
+}
+
+export function ChatEditPreviewPanel({
+  file,
+  open,
+  width,
+  onClose,
+  className,
+}: {
+  file: TurnEditFile;
+  open: boolean;
+  width?: number;
+  onClose: () => void;
+  className?: string;
+}) {
+  const { t } = useI18n();
+  const titleId = useId();
+  const name = fileName(file.path);
+  const diff = turnEditDiffText(file) ?? '';
+
+  useEffect(() => {
+    if (!open) return;
+    const onKey = (e: KeyboardEvent) => {
+      if (e.key !== 'Escape') return;
+      if (hasEscPriorityOverlay()) return;
+      e.preventDefault();
+      onClose();
+    };
+    window.addEventListener('keydown', onKey);
+    return () => window.removeEventListener('keydown', onKey);
+  }, [open, onClose]);
+
+  if (!open) return null;
+
+  return (
+    <aside
+      className={cn(
+        'flex h-full min-h-0 min-w-0 shrink-0 flex-col overflow-hidden rounded-card border border-border bg-panel shadow-xs',
+        className,
+      )}
+      style={width != null ? { width } : undefined}
+      aria-labelledby={titleId}
+      data-chat-edit-preview
+    >
+      <header className="shrink-0 border-b border-border">
+        <div className="flex h-10 items-center gap-1.5 overflow-x-auto px-3">
+          <div className="min-w-0 flex-1 basis-16">
+            <div className="flex min-w-0 items-baseline gap-2">
+              <h2
+                id={titleId}
+                className="truncate text-sm font-semibold leading-tight text-primary"
+              >
+                {name || t('chat.preview.viewEdit')}
+              </h2>
+              <span className="min-w-0 truncate text-meta text-muted">
+                {t('chat.preview.viewEdit')}
+              </span>
+            </div>
+          </div>
+          <Button
+            size="icon"
+            variant="ghost"
+            className="h-7 w-7 shrink-0"
+            aria-label={t('chat.preview.collapse')}
+            title={t('chat.preview.collapse')}
+            onClick={onClose}
+          >
+            <PanelRightClose className="h-4 w-4" />
+          </Button>
+        </div>
+      </header>
+
+      <div className="min-h-0 min-w-0 flex-1 overflow-hidden p-0">
+        {diff.trim() ? (
+          <SourcePreview
+            value={diff}
+            fileName={`${name || 'edit'}.diff`}
+            format="diff"
+            readOnly
+            pretty={false}
+            compressBlankLines={false}
+            density="document"
+            maxChars={CHAT_FILE_PREVIEW_MAX_CHARS}
+            className="h-full rounded-none"
+          />
+        ) : (
+          <p className="px-4 py-6 text-sm text-muted">{t('chat.preview.emptyBody')}</p>
+        )}
+      </div>
+
+      <footer className="flex shrink-0 items-center gap-2 border-t border-border px-3 py-1.5">
+        <CopyableFileName path={file.path} className="min-w-0 flex-1" />
+      </footer>
+    </aside>
+  );
+}
diff --git a/src/pages/chat/ChatMessageBubble.test.ts b/src/pages/chat/ChatMessageBubble.test.ts
index c5442f9a..13bbd4b6 100644
--- a/src/pages/chat/ChatMessageBubble.test.ts
+++ b/src/pages/chat/ChatMessageBubble.test.ts
@@ -91,6 +91,128 @@ describe('ChatMessageBubble streaming feel', () => {
     expect(html).not.toContain('已停止');
   });
 
+  it('shows a clickable thinking bar instead of three dots when thinking has no body yet', () => {
+    const process: AgentProcessView = {
+      turn: 1,
+      agent: 'codex',
+      phase: 'running',
+      stdout: '',
+      stderr: '',
+      steps: [{ type: 'thinking', text: 'secret plan that must not enter the bubble', done: false }],
+      updatedAt: 1,
+      thinkingStartedAt: Date.now() - 3200,
+    };
+    const html = renderToStaticMarkup(
+      createElement(TooltipProvider, null, createElement(ChatMessageBubble, {
+        message: agentMessage(''),
+        process,
+        isLastTurn: true,
+        multiAgent: false,
+        retryDisabled: false,
+        onRetry: () => undefined,
+        onOpenProcess: () => undefined,
+      })),
+    );
+    expect(html).toContain('data-help="chat-thinking-bar"');
+    expect(html).toContain('思考中');
+    expect(html).toContain('▸');
+    expect(html).not.toContain('正在想');
+    expect(html).not.toContain('secret plan that must not enter the bubble');
+    expect(html).not.toContain('data-help="chat-process-chip"');
+  });
+
+  it('shows 思考了 after thinking ends and before the reply body', () => {
+    const process: AgentProcessView = {
+      turn: 1,
+      agent: 'codex',
+      phase: 'running',
+      stdout: '',
+      stderr: '',
+      steps: [{ type: 'thinking', text: 'done thinking body', done: true }],
+      updatedAt: 1,
+      thinkingStartedAt: 1,
+      thinkingDurationMs: 3200,
+    };
+    const html = renderToStaticMarkup(
+      createElement(TooltipProvider, null, createElement(ChatMessageBubble, {
+        message: agentMessage(''),
+        process,
+        isLastTurn: true,
+        multiAgent: false,
+        retryDisabled: false,
+        onRetry: () => undefined,
+        onOpenProcess: () => undefined,
+      })),
+    );
+    expect(html).toContain('data-help="chat-thinking-bar"');
+    expect(html).toContain('思考了 3.2s');
+    expect(html).not.toContain('正在写');
+    expect(html).not.toContain('done thinking body');
+  });
+
+  it('hides the thinking bar once the reply body arrives', () => {
+    const process: AgentProcessView = {
+      turn: 1,
+      agent: 'codex',
+      phase: 'running',
+      stdout: '',
+      stderr: '',
+      steps: [{ type: 'thinking', text: 'secret plan', done: true }],
+      updatedAt: 1,
+      thinkingStartedAt: 1,
+      thinkingDurationMs: 1200,
+    };
+    const html = renderToStaticMarkup(
+      createElement(TooltipProvider, null, createElement(ChatMessageBubble, {
+        message: agentMessage('第一段正文'),
+        process,
+        isLastTurn: true,
+        multiAgent: false,
+        retryDisabled: false,
+        onRetry: () => undefined,
+        onOpenProcess: () => undefined,
+      })),
+    );
+    expect(html).not.toContain('data-help="chat-thinking-bar"');
+    expect(html).not.toContain('secret plan');
+    expect(html).toContain('第一段正文');
+  });
+
+  it('shows the thinking bar and a tool chip together before any body', () => {
+    const process: AgentProcessView = {
+      turn: 1,
+      agent: 'codex',
+      phase: 'running',
+      stdout: '',
+      stderr: '',
+      steps: [
+        { type: 'thinking', text: 'secret plan', done: false },
+        { type: 'tool', name: 'Read', status: 'start', input: { path: 'README.md' } },
+      ],
+      updatedAt: 1,
+      thinkingStartedAt: Date.now() - 1500,
+    };
+    const html = renderToStaticMarkup(
+      createElement(TooltipProvider, null, createElement(ChatMessageBubble, {
+        message: agentMessage(''),
+        process,
+        isLastTurn: true,
+        multiAgent: false,
+        retryDisabled: false,
+        onRetry: () => undefined,
+        onOpenProcess: () => undefined,
+      })),
+    );
+    expect(html).toContain('data-help="chat-thinking-bar"');
+    expect(html).toContain('data-help="chat-process-chip"');
+    expect(html).toContain('正在读取 README.md');
+    expect(html).not.toContain('secret plan');
+    const barAt = html.indexOf('data-help="chat-thinking-bar"');
+    const chipAt = html.indexOf('data-help="chat-process-chip"');
+    expect(barAt).toBeGreaterThan(-1);
+    expect(chipAt).toBeGreaterThan(barAt);
+  });
+
   it('opens process details from a one-line chip', () => {
     const process: AgentProcessView = {
       turn: 1,
diff --git a/src/pages/chat/ChatMessageBubble.tsx b/src/pages/chat/ChatMessageBubble.tsx
index e98767aa..d933f835 100644
--- a/src/pages/chat/ChatMessageBubble.tsx
+++ b/src/pages/chat/ChatMessageBubble.tsx
@@ -1,3 +1,4 @@
+import { useEffect, useState } from 'react';
 import { AgentLogo } from '@/components/shared/AgentLogo';
 import { AgentThinking } from '@/components/shared/AgentThinking';
 import { CopyTextButton } from '@/components/shared/CopyTextButton';
@@ -10,7 +11,11 @@ import {
   formatProcessHeadline,
   formatTurnUsageFooter,
   hasInspectableProcess,
+  latestThinkingStep,
   phaseFromMessageStatus,
+  showBubbleThinkingBar,
+  thinkingElapsedMs,
+  timelineHasToolRow,
 } from '@/lib/chat-process';
 import type { AgentProcessView } from '@/lib/chat-process';
 import type { AgentKey, ChatMessage } from '@/lib/types';
@@ -20,6 +25,7 @@ import {
   localizeChatFailure,
   looksLikeChatProtocolDump,
   sanitizeCliChatText,
+  thinkingChromeLabel,
 } from './chat-format';
 import { messageStatusLabel } from './chat-model';
 import { streamingActivity, streamingPlaceholderKey } from './chat-streaming';
@@ -159,20 +165,31 @@ function AgentBubble({
     : running
       ? 'running'
       : null;
+  const thinking = latestThinkingStep(process?.steps);
+  const showThinkingBar = showBubbleThinkingBar(process?.steps, hasContent);
   const showProcessChip = Boolean(onOpenProcess) && (
     running || Boolean(process && hasInspectableProcess(process))
-  );
+  ) && (!showThinkingBar || timelineHasToolRow(process?.steps));
   const processHeadline = showProcessChip
     ? process && effectivePhase
       ? formatProcessHeadline(process.steps, effectivePhase, t)
       : messageStatusLabel(t, resolvedStatus, process, hasContent) ?? t('chat.process.summaryGenerating')
     : '';
-  const statusText = (hideRetry && looksFailed) || showProcessChip
+  const statusText = (hideRetry && looksFailed) || showProcessChip || showThinkingBar
     ? null
     : messageStatusLabel(t, resolvedStatus, process, hasContent);
   const activity = running ? streamingActivity(process, hasContent) : null;
   const showRetry = isLastTurn && looksFailed && !hideRetry;
   const usageText = formatTurnUsageFooter(process?.steps, running, t);
+  const [now, setNow] = useState(() => Date.now());
+  useEffect(() => {
+    if (!showThinkingBar || thinking?.done) return;
+    const id = window.setInterval(() => setNow(Date.now()), 1000);
+    return () => window.clearInterval(id);
+  }, [showThinkingBar, thinking?.done]);
+  const thinkingLabel = thinking
+    ? thinkingChromeLabel(Boolean(thinking.done), thinkingElapsedMs(process, now), t)
+    : '';
 
   return (
     <div id={`chat-msg-${message.id}`} className="group flex min-w-0 gap-3">
@@ -200,6 +217,29 @@ function AgentBubble({
             </Hint>
           )}
         </div>
+        {showThinkingBar && thinkingLabel ? (
+          <button
+            type="button"
+            className="mb-1 inline-flex max-w-full items-center gap-1 rounded-btn px-1 py-0.5 text-left text-meta text-secondary hover:bg-hover hover:text-primary"
+            data-help="chat-thinking-bar"
+            aria-expanded={processPaneOpen}
+            disabled={!onOpenProcess}
+            onClick={() => {
+              if (!onOpenProcess) return;
+              if (processPaneOpen) onCloseProcess?.();
+              else onOpenProcess(message.turn, agent);
+            }}
+          >
+            <span className="shrink-0" aria-hidden>
+              {processPaneOpen ? '▾' : '▸'}
+            </span>
+            {thinking?.done ? (
+              <span className="min-w-0 truncate">{thinkingLabel}</span>
+            ) : (
+              <AgentThinking label={thinkingLabel} showTimer={false} />
+            )}
+          </button>
+        ) : null}
         {showProcessChip && processHeadline && onOpenProcess ? (
           <button
             type="button"
@@ -231,11 +271,11 @@ function AgentBubble({
               />
               {running ? <span className="chat-stream-caret" aria-hidden /> : null}
             </div>
-          ) : running ? (
+          ) : running && !showThinkingBar ? (
             <AgentThinking label={t(streamingPlaceholderKey(process))} />
-          ) : (
+          ) : !running ? (
             <span className="text-muted">{displayError || t('chat.bubble.noOutput')}</span>
-          )}
+          ) : null}
           {displayError && (looksFailed || message.status !== 'ok') && displayContent && (
             <p className="mt-2 text-body leading-relaxed text-danger">{displayError}</p>
           )}
diff --git a/src/pages/chat/ChatOutlineRail.test.ts b/src/pages/chat/ChatOutlineRail.test.ts
new file mode 100644
index 00000000..a7ca7c33
--- /dev/null
+++ b/src/pages/chat/ChatOutlineRail.test.ts
@@ -0,0 +1,210 @@
+import { createElement, type ReactElement } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { StorageKey } from '@/lib/storage-key';
+import type { ChatMessage } from '@/lib/types';
+import type { TurnGroup } from './chat-format';
+import { ChatOutlineRail } from './ChatOutlineRail';
+import { saveChatOutlineEnabled } from './chat-outline-pref';
+
+function user(id: string, content: string): ChatMessage {
+  return {
+    id,
+    conversationId: 'c1',
+    turn: 1,
+    role: 'user',
+    content,
+    status: 'ok',
+    durationMs: 0,
+    createdAt: '2026-09-20T00:00:00.000Z',
+  };
+}
+
+function turns(...contents: string[]): TurnGroup[] {
+  return contents.map((content, index) => ({
+    turn: index + 1,
+    user: user(`u${index + 1}`, content),
+    agents: [],
+  }));
+}
+
+function renderRail(props: {
+  turns: TurnGroup[];
+  measuredWidth: number;
+  enabled?: boolean;
+}): string {
+  return renderToStaticMarkup(
+    createElement(ChatOutlineRail, {
+      turns: props.turns,
+      measuredWidth: props.measuredWidth,
+      ...(props.enabled === undefined ? {} : { enabled: props.enabled }),
+    }) as ReactElement,
+  );
+}
+
+function hasOutline(html: string): boolean {
+  return html.includes('data-testid="chat-outline-rail"');
+}
+
+describe('ChatOutlineRail visibility gates', () => {
+  it('shows the rail only when the setting, two user messages, and 720px all hold', () => {
+    expect(hasOutline(renderRail({
+      turns: turns('first', 'second'),
+      measuredWidth: 720,
+      enabled: true,
+    }))).toBe(true);
+    expect(hasOutline(renderRail({
+      turns: turns('first', 'second', 'third'),
+      measuredWidth: 800,
+      enabled: true,
+    }))).toBe(true);
+  });
+
+  it('hides when any one gate fails', () => {
+    expect(hasOutline(renderRail({
+      turns: turns('first', 'second'),
+      measuredWidth: 720,
+      enabled: false,
+    }))).toBe(false);
+    expect(hasOutline(renderRail({
+      turns: turns('only one'),
+      measuredWidth: 800,
+      enabled: true,
+    }))).toBe(false);
+    expect(hasOutline(renderRail({
+      turns: [],
+      measuredWidth: 800,
+      enabled: true,
+    }))).toBe(false);
+    expect(hasOutline(renderRail({
+      turns: turns('first', 'second'),
+      measuredWidth: 719,
+      enabled: true,
+    }))).toBe(false);
+    expect(hasOutline(renderRail({
+      turns: turns('first', 'second'),
+      measuredWidth: 0,
+      enabled: true,
+    }))).toBe(false);
+  });
+
+  it('does not count agent-only turns toward the two-prompt gate', () => {
+    const oneUser = [
+      { turn: 1, user: user('u1', 'only user'), agents: [] },
+      { turn: 2, agents: [] },
+      { turn: 3, agents: [] },
+    ];
+    const html = renderRail({ turns: oneUser, measuredWidth: 800, enabled: true });
+    expect(hasOutline(html)).toBe(false);
+    expect(html).toContain('data-chat-outline-measure');
+    expect(html).not.toContain('role="tablist"');
+  });
+
+  it('returns nothing when the setting is off, and keeps a measure host for one user message', () => {
+    expect(renderRail({
+      turns: turns('first', 'second'),
+      measuredWidth: 800,
+      enabled: false,
+    })).toBe('');
+    const one = renderRail({ turns: turns('only one'), measuredWidth: 800 });
+    expect(hasOutline(one)).toBe(false);
+    expect(one).toContain('data-chat-outline-measure');
+  });
+
+  describe('stored preference when enabled is omitted', () => {
+    const store = new Map<string, string>();
+
+    beforeEach(() => {
+      store.clear();
+      vi.stubGlobal('localStorage', {
+        getItem: (key: string) => store.get(key) ?? null,
+        setItem: (key: string, value: string) => {
+          store.set(key, value);
+        },
+        removeItem: (key: string) => {
+          store.delete(key);
+        },
+      });
+    });
+
+    afterEach(() => {
+      vi.unstubAllGlobals();
+    });
+
+    it('defaults on, and hides after the preference is saved off', () => {
+      const wideTwo = { turns: turns('first', 'second'), measuredWidth: 720 };
+      expect(hasOutline(renderRail(wideTwo))).toBe(true);
+      saveChatOutlineEnabled(false);
+      expect(store.get(StorageKey.chatOutlineEnabled)).toBe('0');
+      expect(hasOutline(renderRail(wideTwo))).toBe(false);
+      expect(renderRail(wideTwo)).toBe('');
+    });
+  });
+});
+
+describe('ChatOutlineRail markup', () => {
+  it('keeps the measure host mounted for one user message so width can attach', () => {
+    const html = renderRail({ turns: turns('only one'), measuredWidth: 800 });
+    expect(html).toContain('data-chat-outline-measure');
+    expect(html).not.toContain('chat-outline-rail');
+    expect(html).not.toContain('role="tablist"');
+  });
+
+  it('draws a tablist when two prompts fit a 720px panel', () => {
+    const html = renderRail({ turns: turns('first', 'second'), measuredWidth: 720 });
+    expect(html).toContain('data-testid="chat-outline-rail"');
+    expect(html).toContain('role="tablist"');
+    expect(html).toContain('role="tab"');
+    expect(html).toContain('type="button"');
+    expect(html).toContain('data-testid="chat-outline-tick-u1"');
+    expect(html).toContain('data-testid="chat-outline-tick-u2"');
+    expect(html).toContain('1 / 2：first');
+    expect(html).toContain('2 / 2：second');
+  });
+
+  it('does not treat a zero-width empty host as a mounted rail', () => {
+    const html = renderRail({ turns: turns('first', 'second'), measuredWidth: 0 });
+    expect(html).toContain('data-chat-outline-measure');
+    expect(html).not.toContain('chat-outline-rail');
+    expect(html).not.toContain('role="tablist"');
+    expect(html).not.toContain('role="tab"');
+    expect(html).not.toContain('chat-outline-tick-');
+  });
+
+  it('hides the rail when the panel is narrower than 720px', () => {
+    const html = renderRail({ turns: turns('first', 'second'), measuredWidth: 719 });
+    expect(html).not.toContain('chat-outline-rail');
+  });
+
+  it('hides the rail when the setting is off', () => {
+    const html = renderRail({
+      turns: turns('first', 'second'),
+      measuredWidth: 800,
+      enabled: false,
+    });
+    expect(html).not.toContain('chat-outline-rail');
+  });
+
+  it('keeps a measure wrapper when two prompts are too narrow to draw ticks', () => {
+    const html = renderRail({ turns: turns('first', 'second'), measuredWidth: 719 });
+    expect(html).toContain('pointer-events-none');
+    expect(html).not.toContain('data-testid="chat-outline-rail"');
+  });
+
+  it('skips agent-only turns and still jumps by the user message id', () => {
+    const html = renderRail({
+      turns: [
+        { turn: 1, user: user('u1', 'first'), agents: [] },
+        { turn: 2, agents: [] },
+        { turn: 3, user: user('u3', 'third'), agents: [] },
+      ],
+      measuredWidth: 800,
+    });
+    expect(html).toContain('data-testid="chat-outline-tick-u1"');
+    expect(html).toContain('data-testid="chat-outline-tick-u3"');
+    expect(html).not.toContain('chat-outline-tick-u2');
+    expect(html).toContain('1 / 2：first');
+    expect(html).toContain('2 / 2：third');
+    expect(html).not.toContain('data-testid="chat-outline-preview"');
+  });
+});
diff --git a/src/pages/chat/ChatOutlineRail.tsx b/src/pages/chat/ChatOutlineRail.tsx
new file mode 100644
index 00000000..52872b3a
--- /dev/null
+++ b/src/pages/chat/ChatOutlineRail.tsx
@@ -0,0 +1,275 @@
+import {
+  memo,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+  type MouseEvent,
+  type PointerEvent,
+  type RefObject,
+} from 'react';
+import { useI18n } from '@/components/shared/LanguageProvider';
+import { usePrefersReducedMotion } from '@/lib/motion';
+import { cn } from '@/lib/utils';
+import type { TurnGroup } from './chat-format';
+import { createChatOutlineHoverIntent } from './chat-outline-hover';
+import {
+  OUTLINE_READING_LINE_PX,
+  outlinePanelElement,
+  outlinePanelWidthReady,
+  outlinePromptsFromTurns,
+  outlineTickSize,
+  promptTickMagnification,
+  readOutlinePanelWidth,
+  resolveActivePromptId,
+  shouldShowChatOutline,
+  type ChatOutlinePrompt,
+} from './chat-outline-model';
+import { loadChatOutlineEnabled } from './chat-outline-pref';
+
+const RAIL_WIDTH_PX = 36;
+const SLOT_HEIGHT_PX = 8;
+const PREVIEW_GAP_PX = 4;
+
+export function ChatOutlineRail({
+  turns,
+  scrollRef,
+  onJumpToPrompt,
+  measuredWidth,
+  enabled,
+}: {
+  turns: TurnGroup[];
+  scrollRef?: RefObject<HTMLDivElement>;
+  onJumpToPrompt?: (messageId: string) => void;
+  measuredWidth?: number;
+  enabled?: boolean;
+}) {
+  const { t } = useI18n();
+  const prompts = useMemo(() => outlinePromptsFromTurns(turns), [turns]);
+  const [prefEnabled] = useState(loadChatOutlineEnabled);
+  const isEnabled = enabled ?? prefEnabled;
+  const [observedWidth, setObservedWidth] = useState(0);
+  const hasMeasuredWidth = outlinePanelWidthReady(measuredWidth);
+  const panelWidth = hasMeasuredWidth ? measuredWidth : observedWidth;
+  const [measureNode, setMeasureNode] = useState<HTMLDivElement | null>(null);
+  const assignMeasureRef = useCallback((node: HTMLDivElement | null) => {
+    setMeasureNode((prev) => (prev === node ? prev : node));
+  }, []);
+  const [hoveredIndex, setHoveredIndex] = useState<number | null>(null);
+  const [focusedIndex, setFocusedIndex] = useState<number | null>(null);
+  const [activeId, setActiveId] = useState<string | null>(null);
+  const prefersReducedMotion = usePrefersReducedMotion();
+
+  const hoverIntent = useMemo(
+    () =>
+      createChatOutlineHoverIntent({
+        activate: setHoveredIndex,
+        schedule: (callback, delayMs) => window.setTimeout(callback, delayMs),
+        cancel: (timerId) => window.clearTimeout(timerId),
+      }),
+    [],
+  );
+
+  useEffect(() => () => hoverIntent.dispose(), [hoverIntent]);
+
+  useEffect(() => {
+    if (hasMeasuredWidth) return;
+    const node = measureNode;
+    if (!node) return;
+    const apply = () => {
+      const next = readOutlinePanelWidth(node);
+      setObservedWidth((prev) => (prev === next ? prev : next));
+    };
+    apply();
+    if (typeof ResizeObserver === 'undefined') {
+      window.addEventListener('resize', apply);
+      return () => window.removeEventListener('resize', apply);
+    }
+    const observer = new ResizeObserver(apply);
+    observer.observe(outlinePanelElement(node) ?? node);
+    return () => observer.disconnect();
+  }, [hasMeasuredWidth, measureNode]);
+
+  const readActivePrompt = useCallback(() => {
+    const container = scrollRef?.current;
+    if (!container) return;
+    const readingLine = container.getBoundingClientRect().top + OUTLINE_READING_LINE_PX;
+    const tops = prompts.map((prompt) => {
+      const el = document.getElementById(`chat-msg-${prompt.id}`);
+      return el ? el.getBoundingClientRect().top : Number.POSITIVE_INFINITY;
+    });
+    setActiveId((current) => {
+      const next = resolveActivePromptId(prompts, tops, readingLine);
+      return current === next ? current : next;
+    });
+  }, [prompts, scrollRef]);
+
+  useEffect(() => {
+    const container = scrollRef?.current;
+    if (!container) return;
+    container.addEventListener('scroll', readActivePrompt, { passive: true });
+    readActivePrompt();
+    return () => container.removeEventListener('scroll', readActivePrompt);
+  }, [readActivePrompt, scrollRef]);
+
+  const handlePointerEnterTick = useCallback(
+    (index: number) => hoverIntent.pointAt(index),
+    [hoverIntent],
+  );
+  const handlePointerEnterRail = useCallback(
+    (event: PointerEvent<HTMLDivElement>) => {
+      hoverIntent.enter({ x: event.clientX, y: event.clientY });
+    },
+    [hoverIntent],
+  );
+  const handlePointerMoveRail = useCallback(
+    (event: PointerEvent<HTMLDivElement>) => {
+      hoverIntent.move({ x: event.clientX, y: event.clientY });
+    },
+    [hoverIntent],
+  );
+  const handlePointerLeaveRail = useCallback(() => hoverIntent.leave(), [hoverIntent]);
+  const handleFocusChange = useCallback((index: number, focused: boolean) => {
+    setFocusedIndex((current) => {
+      if (focused) return index;
+      return current === index ? null : current;
+    });
+  }, []);
+
+  const visible = shouldShowChatOutline({
+    enabled: isEnabled,
+    promptCount: prompts.length,
+    panelWidth,
+  });
+  const attentionIndex = hoveredIndex ?? focusedIndex;
+
+  useEffect(() => {
+    if (!visible) hoverIntent.leave();
+  }, [hoverIntent, visible]);
+
+  if (!isEnabled) return null;
+
+  return (
+    <div
+      ref={assignMeasureRef}
+      className="pointer-events-none absolute inset-0"
+      data-chat-outline-measure
+    >
+      {visible ? (
+        <div
+          role="tablist"
+          aria-label={t('chat.outline.aria')}
+          data-testid="chat-outline-rail"
+          className="pointer-events-auto absolute bottom-[10%] top-[10%] z-[2] flex flex-col items-center justify-center"
+          style={{ left: 8, width: RAIL_WIDTH_PX }}
+          onPointerEnter={handlePointerEnterRail}
+          onPointerMove={handlePointerMoveRail}
+          onPointerLeave={handlePointerLeaveRail}
+        >
+          {prompts.map((prompt, index) => (
+            <ChatOutlineTick
+              key={prompt.id}
+              index={index}
+              prompt={prompt}
+              label={t('chat.outline.tick', {
+                n: index + 1,
+                total: prompts.length,
+                preview: prompt.preview,
+              })}
+              isActive={prompt.id === activeId}
+              hasAttention={index === attentionIndex}
+              magnification={
+                prefersReducedMotion || attentionIndex === null
+                  ? 0
+                  : promptTickMagnification(index - attentionIndex)
+              }
+              onHover={handlePointerEnterTick}
+              onFocusChange={handleFocusChange}
+              onJumpToPrompt={onJumpToPrompt}
+            />
+          ))}
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+const ChatOutlineTick = memo(function ChatOutlineTick({
+  index,
+  prompt,
+  label,
+  isActive,
+  hasAttention,
+  magnification,
+  onHover,
+  onFocusChange,
+  onJumpToPrompt,
+}: {
+  index: number;
+  prompt: ChatOutlinePrompt;
+  label: string;
+  isActive: boolean;
+  hasAttention: boolean;
+  magnification: number;
+  onHover: (index: number) => void;
+  onFocusChange: (index: number, focused: boolean) => void;
+  onJumpToPrompt?: (messageId: string) => void;
+}) {
+  const size = outlineTickSize(isActive, magnification);
+  const handleJump = useCallback(
+    (event: MouseEvent<HTMLButtonElement>) => {
+      onJumpToPrompt?.(prompt.id);
+      event.currentTarget.blur();
+      onFocusChange(index, false);
+    },
+    [index, onFocusChange, onJumpToPrompt, prompt.id],
+  );
+
+  return (
+    <div
+      className="relative flex min-h-0 items-center justify-center"
+      style={{
+        width: RAIL_WIDTH_PX,
+        flexBasis: SLOT_HEIGHT_PX,
+        flexGrow: 1,
+        flexShrink: 1,
+      }}
+      onPointerEnter={() => onHover(index)}
+    >
+      <button
+        type="button"
+        role="tab"
+        aria-selected={isActive}
+        aria-label={label}
+        data-testid={`chat-outline-tick-${prompt.id}`}
+        className="flex h-full w-full cursor-pointer items-center justify-start bg-transparent pl-1 outline-none"
+        onMouseDown={(event) => event.preventDefault()}
+        onClick={handleJump}
+        onFocus={() => onFocusChange(index, true)}
+        onBlur={() => onFocusChange(index, false)}
+      >
+        <span
+          className={cn(
+            'block rounded-full transition-[width,height,background-color] duration-[140ms] ease-out motion-reduce:transition-none',
+            hasAttention ? 'bg-primary' : isActive ? 'bg-muted' : 'bg-border',
+          )}
+          style={{ width: size.width, height: size.height }}
+        />
+      </button>
+      {hasAttention ? (
+        <div
+          aria-hidden
+          data-testid="chat-outline-preview"
+          className="pointer-events-none absolute top-1/2 z-[3] h-12 overflow-hidden rounded-card border border-border bg-panel px-3 py-1.5 shadow-md"
+          style={{
+            left: RAIL_WIDTH_PX + PREVIEW_GAP_PX,
+            width: 260,
+            marginTop: -24,
+          }}
+        >
+          <p className="line-clamp-2 text-meta text-primary">{prompt.preview}</p>
+        </div>
+      ) : null}
+    </div>
+  );
+});
diff --git a/src/pages/chat/ChatPlanBar.test.ts b/src/pages/chat/ChatPlanBar.test.ts
new file mode 100644
index 00000000..b53e7ef8
--- /dev/null
+++ b/src/pages/chat/ChatPlanBar.test.ts
@@ -0,0 +1,57 @@
+import { createElement } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+import type { RuntimePlanEntry } from '@/lib/api/chat';
+import { ChatPlanBar } from './ChatPlanBar';
+
+function renderPlan(plan?: RuntimePlanEntry[] | null): string {
+  return renderToStaticMarkup(createElement(ChatPlanBar, { plan }));
+}
+
+describe('ChatPlanBar', () => {
+  it('draws nothing when the plan is missing or only blank rows', () => {
+    expect(renderPlan(undefined)).toBe('');
+    expect(renderPlan(null)).toBe('');
+    expect(renderPlan([])).toBe('');
+    expect(renderPlan([{ content: '   ' }])).toBe('');
+  });
+
+  it('shows progress, live/failed counts, and every kept row when expanded', () => {
+    const html = renderPlan([
+      { content: 'read', status: 'completed' },
+      { content: 'edit', status: 'in_progress' },
+      { content: '  ' },
+      { content: 'test', status: 'pending' },
+      { content: 'broken', status: 'failed' },
+    ]);
+    expect(html).toContain('data-help="chat-plan-bar"');
+    expect(html).toContain('aria-expanded="true"');
+    expect(html).toContain('1/4 已完成');
+    expect(html).toContain('进行中 1');
+    expect(html).toContain('失败 1');
+    expect(html).toContain('已完成');
+    expect(html).toContain('read');
+    expect(html).toContain('edit');
+    expect(html).toContain('test');
+    expect(html).toContain('broken');
+    expect(html).toContain('收起计划');
+    expect(html).not.toContain('  ');
+  });
+
+  it('maps vendor status aliases onto the same live / done / pending / failed labels', () => {
+    const html = renderPlan([
+      { content: 'done-row', status: 'complete' },
+      { content: 'live-row', status: 'running' },
+      { content: 'fail-row', status: 'canceled' },
+      { content: 'wait-row' },
+    ]);
+    expect(html).toContain('1/4 已完成');
+    expect(html).toContain('进行中 1');
+    expect(html).toContain('失败 1');
+    expect(html).toContain('待做');
+    expect(html).toContain('done-row');
+    expect(html).toContain('live-row');
+    expect(html).toContain('fail-row');
+    expect(html).toContain('wait-row');
+  });
+});
diff --git a/src/pages/chat/ChatPlanBar.tsx b/src/pages/chat/ChatPlanBar.tsx
index 3c5cbf2b..809b8602 100644
--- a/src/pages/chat/ChatPlanBar.tsx
+++ b/src/pages/chat/ChatPlanBar.tsx
@@ -1,36 +1,85 @@
+import { useState } from 'react';
+import { ChevronDown } from 'lucide-react';
 import { useI18n } from '@/components/shared/LanguageProvider';
 import { cn } from '@/lib/utils';
 import type { RuntimePlanEntry } from '@/lib/api/chat';
-import { runtimePlanEntryTone, visibleRuntimePlan } from './chat-runtime-model';
+import {
+  runtimePlanEntryTone,
+  runtimePlanProgress,
+  runtimePlanStatusKey,
+  visibleRuntimePlan,
+} from './chat-runtime-model';
 
 export function ChatPlanBar({ plan }: { plan?: RuntimePlanEntry[] | null }) {
   const { t } = useI18n();
   const entries = visibleRuntimePlan(plan);
+  const [open, setOpen] = useState(true);
   if (entries.length === 0) return null;
+  const progress = runtimePlanProgress(entries);
+  const live = entries.find((entry) => runtimePlanEntryTone(entry.status) === 'live');
+  const listId = 'chat-plan-bar-list';
   return (
     <section
       className="mb-2 rounded-card border border-border bg-subtle px-3 py-2 text-meta"
       data-help="chat-plan-bar"
       aria-label={t('chat.runtime.plan')}
     >
-      <p className="font-medium text-secondary">{t('chat.runtime.plan')}</p>
-      <ol className="mt-1 space-y-0.5">
-        {entries.map((entry, index) => {
-          const tone = runtimePlanEntryTone(entry.status);
-          return (
-            <li
-              key={`${index}:${entry.content}`}
-              className={cn(
-                'min-w-0 truncate text-secondary',
-                tone === 'live' && 'font-medium text-primary',
-                tone === 'done' && 'text-muted',
-              )}
-            >
-              {entry.content}
-            </li>
-          );
-        })}
-      </ol>
+      <button
+        type="button"
+        className="flex w-full min-w-0 items-center gap-2 text-left"
+        aria-expanded={open}
+        aria-controls={open || live ? listId : undefined}
+        onClick={() => setOpen((current) => !current)}
+      >
+        <span className="min-w-0 flex-1">
+          <span className="font-medium text-secondary">{t('chat.runtime.plan')}</span>
+          <span className="mt-0.5 block text-muted">
+            {t('chat.runtime.planProgress', { done: progress.done, total: progress.total })}
+            {progress.live > 0
+              ? ` · ${t('chat.runtime.planStatusLive')} ${progress.live}`
+              : null}
+            {progress.failed > 0
+              ? ` · ${t('chat.runtime.planStatusFailed')} ${progress.failed}`
+              : null}
+          </span>
+        </span>
+        <ChevronDown
+          className={cn('h-4 w-4 shrink-0 text-muted transition-transform', open && 'rotate-180')}
+          aria-hidden
+        />
+        <span className="sr-only">
+          {open ? t('chat.runtime.planCollapse') : t('chat.runtime.planExpand')}
+        </span>
+      </button>
+      {open ? (
+        <ol id={listId} className="mt-2 space-y-1">
+          {entries.map((entry, index) => {
+            const tone = runtimePlanEntryTone(entry.status);
+            return (
+              <li
+                key={`${index}:${entry.content}`}
+                className={cn(
+                  'grid min-w-0 grid-cols-[auto_minmax(0,1fr)] items-baseline gap-x-2',
+                  tone === 'live' && 'font-medium text-primary',
+                  tone === 'done' && 'text-muted',
+                  tone === 'failed' && 'text-danger',
+                  tone === 'pending' && 'text-secondary',
+                )}
+              >
+                <span className="shrink-0 text-muted">
+                  {t(runtimePlanStatusKey(entry.status))}
+                </span>
+                <span className="min-w-0 flex-1 whitespace-normal break-words">{entry.content}</span>
+              </li>
+            );
+          })}
+        </ol>
+      ) : live ? (
+        <p id={listId} className="mt-2 min-w-0 font-medium text-primary">
+          <span className="text-muted">{t(runtimePlanStatusKey(live.status))} · </span>
+          {live.content}
+        </p>
+      ) : null}
     </section>
   );
 }
diff --git a/src/pages/chat/ChatProcessPanel.test.ts b/src/pages/chat/ChatProcessPanel.test.ts
index d1c20973..8a3f564b 100644
--- a/src/pages/chat/ChatProcessPanel.test.ts
+++ b/src/pages/chat/ChatProcessPanel.test.ts
@@ -102,13 +102,75 @@ describe('ChatProcessPanel human copy', () => {
       view({
         phase: 'ok',
         steps: [{ type: 'thinking', text: '先看工作目录', done: true }],
+        thinkingStartedAt: 1,
+        thinkingDurationMs: 3200,
       }),
       'ok',
     );
     expect(html).toContain('先看工作目录');
+    expect(html).toContain('思考了 3.2s');
+    expect(html).toContain('data-help="chat-process-thinking"');
     expect(html).toMatch(/<details[^>]*open/);
   });
 
+  it('shows a thinking fold without a tool row when no tools ran', () => {
+    const html = renderPanel(
+      view({
+        phase: 'running',
+        steps: [{ type: 'thinking', text: 'only thinking', done: false }],
+        thinkingStartedAt: Date.now() - 800,
+      }),
+    );
+    expect(html).toContain('data-help="chat-process-thinking"');
+    expect(html).toContain('only thinking');
+    expect(html).not.toContain('data-help="chat-process-tool"');
+  });
+
+  it('keeps an error on the tools timeline, not inside the thinking fold', () => {
+    const html = renderPanel(
+      view({
+        phase: 'failed',
+        steps: [
+          { type: 'thinking', text: 'tried', done: true },
+          { type: 'error', message: 'disk full' },
+        ],
+        thinkingStartedAt: 1,
+        thinkingDurationMs: 400,
+      }),
+      'failed',
+    );
+    expect(html).toContain('data-help="chat-process-thinking"');
+    expect(html).toContain('tried');
+    expect(html).toContain('disk full');
+    expect(html).toContain('text-danger');
+    const thinkingAt = html.indexOf('data-help="chat-process-thinking"');
+    const errorAt = html.indexOf('disk full');
+    expect(errorAt).toBeGreaterThan(thinkingAt);
+  });
+
+  it('keeps thinking as a fold separate from tool rows and pins live text', () => {
+    const html = renderPanel(
+      view({
+        phase: 'running',
+        steps: [
+          { type: 'thinking', text: '先看目录再改', done: false },
+          { type: 'tool', name: 'Read', status: 'start', input: { path: 'README.md' } },
+        ],
+        thinkingStartedAt: Date.now() - 3200,
+      }),
+    );
+    expect(html).toContain('data-help="chat-process-thinking"');
+    expect(html).toContain('data-help="chat-process-tool"');
+    expect(html).toContain('思考中');
+    expect(html).toContain('正在读取 README.md');
+    expect(html).toContain('[overflow-anchor:none]');
+    expect(html).toContain('max-h-40');
+    const thinkingAt = html.indexOf('data-help="chat-process-thinking"');
+    const toolAt = html.indexOf('data-help="chat-process-tool"');
+    expect(thinkingAt).toBeGreaterThan(-1);
+    expect(toolAt).toBeGreaterThan(thinkingAt);
+  });
+
   it('offers one-click copy on JSON in tool details', () => {
     const html = renderPanel(
       view({
diff --git a/src/pages/chat/ChatProcessPanel.tsx b/src/pages/chat/ChatProcessPanel.tsx
index 95c02565..e6950209 100644
--- a/src/pages/chat/ChatProcessPanel.tsx
+++ b/src/pages/chat/ChatProcessPanel.tsx
@@ -15,6 +15,7 @@ import {
   formatToolStep,
   formatUsageStep,
   isProtocolProcessStep,
+  latestThinkingStep,
   phaseFromMessageStatus,
   stepSummary,
   timelineProcessSteps,
@@ -194,13 +195,21 @@ function toolHasProtocolDetails(step: Extract<ProcessStep, { type: 'tool' }>): b
   );
 }
 
-function ProcessStepRow({ step }: { step: ProcessStep }) {
+function ProcessStepRow({
+  step,
+  thinkingStartedAt,
+  thinkingDurationMs,
+}: {
+  step: ProcessStep;
+  thinkingStartedAt?: number;
+  thinkingDurationMs?: number;
+}) {
   const { t } = useI18n();
   if (step.type === 'tool') {
     const input = formatStepInput(step.input);
     const live = toolActionTone(step.status) === 'live';
     return (
-      <div className="py-1">
+      <div className="py-1" data-help="chat-process-tool">
         <div
           className={cn(
             'font-medium text-secondary',
@@ -228,7 +237,15 @@ function ProcessStepRow({ step }: { step: ProcessStep }) {
     );
   }
   if (step.type === 'thinking') {
-    return <ThinkingStepRow text={step.text} done={Boolean(step.done)} defaultOpen />;
+    return (
+      <ThinkingStepRow
+        text={step.text}
+        done={Boolean(step.done)}
+        defaultOpen
+        startedAt={thinkingStartedAt}
+        durationMs={thinkingDurationMs}
+      />
+    );
   }
   if (step.type === 'error') {
     return <div className="py-1 text-danger">{step.message}</div>;
@@ -259,15 +276,24 @@ function ThinkingStepRow({
   text,
   done,
   defaultOpen,
+  startedAt,
+  durationMs,
 }: {
   text: string;
   done: boolean;
   defaultOpen: boolean;
+  startedAt?: number;
+  durationMs?: number;
 }) {
   const { t } = useI18n();
-  const [elapsedMs, setElapsedMs] = useState(0);
-  const startRef = useRef(Date.now());
+  const startRef = useRef(startedAt ?? Date.now());
+  const [now, setNow] = useState(() => Date.now());
   const [open, setOpen] = useState(defaultOpen);
+  const bodyRef = useRef<HTMLPreElement>(null);
+
+  useEffect(() => {
+    if (startedAt != null) startRef.current = startedAt;
+  }, [startedAt]);
 
   useEffect(() => {
     if (done) {
@@ -275,20 +301,26 @@ function ThinkingStepRow({
       return;
     }
     setOpen(true);
-    startRef.current = Date.now();
-    const tick = () => setElapsedMs(Math.max(0, Date.now() - startRef.current));
+    const tick = () => setNow(Date.now());
     tick();
     const id = window.setInterval(tick, 1000);
     return () => window.clearInterval(id);
   }, [done, defaultOpen]);
 
+  const elapsedMs = done
+    ? (durationMs ?? 0)
+    : Math.max(0, now - startRef.current);
   const label = thinkingChromeLabel(done, elapsedMs, t);
-
   const body = clipProcessTail(text);
 
+  useLayoutEffect(() => {
+    if (!done) pinElementScrollToBottom(bodyRef.current);
+  }, [body, done]);
+
   return (
     <details
       className="py-1"
+      data-help="chat-process-thinking"
       open={open}
       onToggle={(e) => {
         e.stopPropagation();
@@ -304,7 +336,12 @@ function ThinkingStepRow({
         )}
       </summary>
       {body ? (
-        <div className="mt-0.5 whitespace-pre-wrap break-words italic text-muted">{body}</div>
+        <pre
+          ref={bodyRef}
+          className="mt-0.5 max-h-40 overflow-auto [overflow-anchor:none] whitespace-pre-wrap break-words italic text-muted"
+        >
+          {body}
+        </pre>
       ) : null}
     </details>
   );
@@ -343,6 +380,7 @@ export function ChatProcessPanel({
   );
   const timelineRef = useRef<HTMLDivElement>(null);
   const stderrRef = useRef<HTMLPreElement>(null);
+  const latestThinking = latestThinkingStep(timeline);
 
   useLayoutEffect(() => {
     pinElementScrollToBottom(timelineRef.current);
@@ -367,7 +405,20 @@ export function ChatProcessPanel({
             </div>
           ) : null}
           {timeline.map((step, i) => (
-            <ProcessStepRow key={processStepKey(step, i)} step={step} />
+            <ProcessStepRow
+              key={processStepKey(step, i)}
+              step={step}
+              thinkingStartedAt={
+                step.type === 'thinking' && step === latestThinking
+                  ? view.thinkingStartedAt
+                  : undefined
+              }
+              thinkingDurationMs={
+                step.type === 'thinking' && step === latestThinking
+                  ? view.thinkingDurationMs
+                  : undefined
+              }
+            />
           ))}
           {pendingConfirm ? (
             <div className="py-1 text-muted" data-help="chat-process-confirm">
diff --git a/src/pages/chat/ChatSessionHeader.tsx b/src/pages/chat/ChatSessionHeader.tsx
index c4576f17..1348764c 100644
--- a/src/pages/chat/ChatSessionHeader.tsx
+++ b/src/pages/chat/ChatSessionHeader.tsx
@@ -1,22 +1,35 @@
 import { useEffect, useRef, useState } from 'react';
-import { Copy, FolderOpen, PanelLeftOpen, Settings2, ShieldAlert, Terminal } from 'lucide-react';
+import {
+  ChevronDown,
+  ChevronUp,
+  ChevronsUpDown,
+  Copy,
+  FolderOpen,
+  PanelLeftOpen,
+  Settings2,
+  ShieldAlert,
+  Terminal,
+} from 'lucide-react';
 import { ChromeActions } from '@/components/layout/ChromeActions';
 import { pageRhythm } from '@/components/layout/page-rhythm';
 import { copyTextToClipboard } from '@/components/shared/CopyTextButton';
 import { useI18n } from '@/components/shared/LanguageProvider';
 import { Button } from '@/components/ui/button';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu';
 import { Hint } from '@/components/ui/tooltip';
 import { Input } from '@/components/ui/input';
 import { useToast } from '@/components/ui/toast';
 import type { Conversation } from '@/lib/types';
 import { cn } from '@/lib/utils';
+import { sessionSwitchNeighbors } from './chat-session-switch';
 import { isKiroChatAgent } from './chat-kiro-model';
-import {
-  chatConnectLabelKey,
-  sessionChatConnectKind,
-} from './chat-connect-model';
 import { sessionAllowAlwaysActive } from './chat-runtime-model';
-import type { RuntimeChannel, RuntimeSnapshot } from '@/lib/api/chat';
+import type { RuntimeSnapshot } from '@/lib/api/chat';
 import {
   autoApproveActive,
   autoApproveEffect,
@@ -32,25 +45,27 @@ export function ChatSessionHeader({
   active,
   railOpen,
   recordText,
+  sessions,
+  sendingConversationIds = [],
   onExpandRail,
   onRename,
+  onFocus,
   onOpenSettings,
   onPickWorkingDirectory,
   runtimeLocked = false,
-  transport = null,
-  runtimeEnabled = false,
   runtime = null,
 }: {
   active: Conversation | null;
   railOpen: boolean;
   recordText?: string;
+  sessions: readonly Conversation[];
+  sendingConversationIds?: readonly string[];
   onExpandRail: () => void;
   onRename: (next: string) => Promise<boolean>;
+  onFocus: (id: string) => void;
   onOpenSettings: () => void;
   onPickWorkingDirectory: () => void;
   runtimeLocked?: boolean;
-  transport?: RuntimeChannel | null;
-  runtimeEnabled?: boolean;
   runtime?: Pick<RuntimeSnapshot, 'sessionAllowAlways'> | null;
 }) {
   const { t } = useI18n();
@@ -73,11 +88,6 @@ export function ChatSessionHeader({
   const selectedAgent = active?.agentIds[0] ?? null;
   const approveOn = autoApproveActive(Boolean(active?.allowDangerous), selectedAgent);
   const kiroPermissions = isKiroChatAgent(selectedAgent);
-  const connectKind = sessionChatConnectKind({
-    agentId: selectedAgent,
-    transport,
-    runtimeEnabled,
-  });
   const sessionAlways = sessionAllowAlwaysActive(runtime);
 
   async function commit() {
@@ -114,7 +124,14 @@ export function ChatSessionHeader({
         </Button>
       )}
       <div className="min-w-0 flex-1">
-        {active && editing ? (
+        {!railOpen && sessions.length > 0 ? (
+          <ChatSessionSwitcher
+            sessions={sessions}
+            active={active}
+            sendingConversationIds={sendingConversationIds}
+            onFocus={onFocus}
+          />
+        ) : active && editing ? (
           <Input
             ref={inputRef}
             value={draftTitle}
@@ -205,18 +222,6 @@ export function ChatSessionHeader({
               </span>
             </Button>
           </Hint>
-          <Hint label={t('chat.connect.sessionTitle')}>
-            <Button
-              type="button"
-              size="sm"
-              variant="outline"
-              onClick={onOpenSettings}
-              data-help="chat-session-connect"
-              className="text-muted"
-            >
-              {t(chatConnectLabelKey(connectKind))}
-            </Button>
-          </Hint>
           {active.nativeSessionId && (
             <Button
               type="button"
@@ -311,3 +316,100 @@ export function ChatSessionHeader({
 function shortenId(id: string, max: number): string {
   return id.length <= max ? id : `${id.slice(0, max - 1)}…`;
 }
+
+function SendingDot({ sending }: { sending: boolean }) {
+  if (!sending) return null;
+  return (
+    <span aria-hidden className="inline-block h-1.5 w-1.5 shrink-0 rounded-full bg-accent" data-sending="" />
+  );
+}
+
+function ChatSessionSwitcher({
+  sessions,
+  active,
+  sendingConversationIds,
+  onFocus,
+}: {
+  sessions: readonly Conversation[];
+  active: Conversation | null;
+  sendingConversationIds: readonly string[];
+  onFocus: (id: string) => void;
+}) {
+  const { t } = useI18n();
+  const neighbors = sessionSwitchNeighbors(sessions, active?.id ?? null);
+  const title = active ? conversationTitle(t, active.title) : t('chat.header.conversation');
+  const cwdLabel = active ? cwdShortName(active.cwd, t) : t('chat.cwd.unset');
+  const sendingHere = Boolean(active && sendingConversationIds.includes(active.id));
+
+  return (
+    <div className="flex min-w-0 items-center gap-0.5" data-help="chat-session-switch">
+      <Button
+        type="button"
+        size="icon"
+        variant="ghost"
+        className="text-muted"
+        disabled={!neighbors.prevId}
+        title={t('chat.shortcuts.prevSession')}
+        aria-label={t('chat.shortcuts.prevSession')}
+        aria-keyshortcuts="Alt+ArrowUp"
+        onClick={() => {
+          if (neighbors.prevId) onFocus(neighbors.prevId);
+        }}
+      >
+        <ChevronUp className="h-4 w-4" />
+      </Button>
+      <DropdownMenu modal={false}>
+        <DropdownMenuTrigger asChild>
+          <Button
+            type="button"
+            size="sm"
+            variant="ghost"
+            className="min-w-0 max-w-xs justify-start px-1.5"
+            aria-label={t('chat.header.switchSession')}
+          >
+            <SendingDot sending={sendingHere} />
+            <span className="min-w-0 truncate font-semibold text-primary">{title}</span>
+            <span className="min-w-0 truncate text-meta font-normal text-muted">{cwdLabel}</span>
+            <ChevronsUpDown className="h-3.5 w-3.5 shrink-0 text-muted" aria-hidden />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="start" className="max-h-72 min-w-[16rem] overflow-y-auto">
+          {sessions.map((session) => {
+            const selected = active?.id === session.id;
+            const sending = sendingConversationIds.includes(session.id);
+            return (
+              <DropdownMenuItem
+                key={session.id}
+                className={cn('items-start', selected && 'font-medium')}
+                onSelect={() => onFocus(session.id)}
+              >
+                <SendingDot sending={sending} />
+                <span className="min-w-0 flex-1">
+                  <span className="block truncate">{conversationTitle(t, session.title)}</span>
+                  <span className="block truncate text-meta text-muted">
+                    {cwdShortName(session.cwd, t)}
+                  </span>
+                </span>
+              </DropdownMenuItem>
+            );
+          })}
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <Button
+        type="button"
+        size="icon"
+        variant="ghost"
+        className="text-muted"
+        disabled={!neighbors.nextId}
+        title={t('chat.shortcuts.nextSession')}
+        aria-label={t('chat.shortcuts.nextSession')}
+        aria-keyshortcuts="Alt+ArrowDown"
+        onClick={() => {
+          if (neighbors.nextId) onFocus(neighbors.nextId);
+        }}
+      >
+        <ChevronDown className="h-4 w-4" />
+      </Button>
+    </div>
+  );
+}
diff --git a/src/pages/chat/ChatSessionRail.test.ts b/src/pages/chat/ChatSessionRail.test.ts
index 1387f861..2f242f20 100644
--- a/src/pages/chat/ChatSessionRail.test.ts
+++ b/src/pages/chat/ChatSessionRail.test.ts
@@ -5,7 +5,11 @@ import { describe, expect, it, vi } from 'vitest';
 import { TooltipProvider } from '@/components/ui/tooltip';
 import type { Conversation } from '@/lib/types';
 import { createTranslator } from '@/lib/i18n';
-import { conversationRailHintView, conversationSemanticTitle } from './chat-model';
+import {
+  conversationRailHintView,
+  conversationSemanticTitle,
+  type ConversationWorkspaceGroup,
+} from './chat-model';
 import { ChatSessionRail } from './ChatSessionRail';
 
 vi.mock('@/components/shared/LanguageProvider', async () => {
@@ -34,12 +38,26 @@ function renderMarkup(node: ReactElement) {
   return renderToStaticMarkup(createElement(TooltipProvider, null, node));
 }
 
+function workspaceGroup(
+  items: Conversation[],
+  partial?: Partial<ConversationWorkspaceGroup>,
+): ConversationWorkspaceGroup {
+  const cwd = items[0]?.cwd ?? null;
+  return {
+    key: cwd ? `path:${cwd}` : 'unset',
+    label: cwd ? 'demo-project' : '未设置工作目录',
+    cwd,
+    items,
+    ...partial,
+  };
+}
+
 function rail(partial?: Partial<Parameters<typeof ChatSessionRail>[0]>) {
   const item = conversation();
   return createElement(ChatSessionRail, {
     open: true,
     listLoading: false,
-    groups: [{ key: 'today', label: '今天', items: [item] }],
+    groups: [workspaceGroup([item])],
     conversations: [item],
     filteredCount: 1,
     query: '',
@@ -65,7 +83,7 @@ describe('ChatSessionRail titles', () => {
       'Use your terminal to write exactly what I asked without clipping the title';
     const html = renderMarkup(
       rail({
-        groups: [{ key: 'today', label: '今天', items: [conversation({ title: full })] }],
+        groups: [workspaceGroup([conversation({ title: full })])],
         conversations: [conversation({ title: full })],
         firstUserContentById: { c1: full },
       }),
@@ -94,7 +112,7 @@ describe('ChatSessionRail titles', () => {
     renderMarkup(
       rail({
         activeId: active.id,
-        groups: [{ key: 'today', label: '今天', items: [active, clipped] }],
+        groups: [workspaceGroup([active, clipped])],
         conversations: [active, clipped],
         filteredCount: 2,
         firstUserContentById,
@@ -133,7 +151,42 @@ describe('ChatSessionRail titles', () => {
     expect(hint.meta).toContain('/workspace/demo-project');
     const src = readFileSync(new URL('./ChatSessionRail.tsx', import.meta.url), 'utf8');
     expect(src).toContain('conversationRailHintView(');
-    expect(src).not.toContain('cwdShortName');
+    expect(src).toContain('data-help="chat-workspace-group-label"');
+  });
+
+  it('groups sessions under a collapsible working-directory header', () => {
+    const html = renderMarkup(rail());
+    expect(html).toContain('data-help="chat-workspace-group"');
+    expect(html).toContain('data-help="chat-workspace-group-label"');
+    expect(html).toContain('demo-project');
+    expect(html).toContain('aria-expanded="true"');
+    expect(html).not.toContain('今天');
+    const src = readFileSync(new URL('./ChatSessionRail.tsx', import.meta.url), 'utf8');
+    expect(src).toContain('ChevronDown');
+    expect(src).toContain('ChevronRight');
+  });
+
+  it('hides a plus on the folder until hover, then starts a chat in that folder', () => {
+    const html = renderMarkup(rail());
+    const src = readFileSync(new URL('./ChatSessionRail.tsx', import.meta.url), 'utf8');
+    expect(html).toContain('data-help="chat-workspace-new"');
+    expect(src).toContain('group-hover:opacity-100');
+    expect(src).toContain('onNewChat(group.cwd)');
+    expect(html).toContain('opacity-0');
+  });
+
+  it('puts the folder path on hover, not in the group header', () => {
+    const item = conversation();
+    const html = renderMarkup(rail({ groups: [workspaceGroup([item])] }));
+    const src = readFileSync(new URL('./ChatSessionRail.tsx', import.meta.url), 'utf8');
+    expect(src).toContain('Hint label={group.cwd ?? group.label}');
+    expect(src).not.toContain('chat-workspace-group-path');
+    expect(html).toContain('data-help="chat-workspace-group-label"');
+    expect(html).toContain('demo-project');
+    const labelStart = html.indexOf('data-help="chat-workspace-group-label"');
+    const labelHtml = html.slice(labelStart, labelStart + 180);
+    expect(labelHtml).toContain('demo-project');
+    expect(labelHtml).not.toContain('/workspace/demo-project');
   });
 
   it('paints 新建对话 with the theme fill', () => {
@@ -143,5 +196,39 @@ describe('ChatSessionRail titles', () => {
     expect(html).toContain('bg-accent');
     expect(html).not.toContain('删除确认 Enter');
   });
+
+  it('keeps two working-directory groups and an unset group on separate headers', () => {
+    const app = conversation({ id: 'app', cwd: '/workspace/demo-project', title: '修登录' });
+    const other = conversation({ id: 'other', cwd: '/tmp/other', title: '另一场' });
+    const unset = conversation({ id: 'unset', cwd: null, title: '未设' });
+    const html = renderMarkup(
+      rail({
+        groups: [
+          workspaceGroup([app]),
+          workspaceGroup([other], { key: 'path:/tmp/other', label: 'other', cwd: '/tmp/other' }),
+          workspaceGroup([unset], { key: 'unset', label: '未设置工作目录', cwd: null }),
+        ],
+        conversations: [app, other, unset],
+        filteredCount: 3,
+      }),
+    );
+    expect(html.split('data-help="chat-workspace-group"')).toHaveLength(4);
+    expect(html).toContain('demo-project');
+    expect(html).toContain('other');
+    expect(html).toContain('未设置工作目录');
+    expect(html).toContain('data-session-id="app"');
+    expect(html).toContain('data-session-id="other"');
+    expect(html).toContain('data-session-id="unset"');
+    expect(html.split('data-help="chat-workspace-new"')).toHaveLength(3);
+    const unsetAt = html.indexOf('data-session-id="unset"');
+    const unsetGroup = html.slice(html.lastIndexOf('data-help="chat-workspace-group"', unsetAt), unsetAt);
+    expect(unsetGroup).not.toContain('data-help="chat-workspace-new"');
+  });
+
+  it('starts the main new chat without passing the click event as a folder', () => {
+    const src = readFileSync(new URL('./ChatSessionRail.tsx', import.meta.url), 'utf8');
+    expect(src).toContain('onClick={() => onNewChat()}');
+    expect(src).not.toContain('onClick={onNewChat}');
+  });
 });
 
diff --git a/src/pages/chat/ChatSessionRail.tsx b/src/pages/chat/ChatSessionRail.tsx
index 9f4b1423..785672e2 100644
--- a/src/pages/chat/ChatSessionRail.tsx
+++ b/src/pages/chat/ChatSessionRail.tsx
@@ -1,5 +1,5 @@
-import { useEffect, useRef } from 'react';
-import { Loader2, PanelLeftClose, Plus, Trash2 } from 'lucide-react';
+import { useEffect, useRef, useState } from 'react';
+import { ChevronDown, ChevronRight, Loader2, PanelLeftClose, Plus, Trash2 } from 'lucide-react';
 import { AgentLogo } from '@/components/shared/AgentLogo';
 import { NavResizeHandle } from '@/components/layout/NavResizeHandle';
 import { pageRhythm } from '@/components/layout/page-rhythm';
@@ -28,7 +28,7 @@ import {
   conversationRailMarkColor,
   conversationRailSelectedFill,
   conversationTitle,
-  type ConversationDayGroup,
+  type ConversationWorkspaceGroup,
 } from './chat-model';
 
 export function ChatSessionRail({
@@ -56,7 +56,7 @@ export function ChatSessionRail({
 }: {
   open: boolean;
   listLoading: boolean;
-  groups: ConversationDayGroup[];
+  groups: ConversationWorkspaceGroup[];
   conversations: Conversation[];
   filteredCount: number;
   query: string;
@@ -67,7 +67,7 @@ export function ChatSessionRail({
   hasUsableAgent: boolean;
   deleteConfirmId: string | null;
   onToggleRail: () => void;
-  onNewChat: () => void;
+  onNewChat: (cwd?: string | null) => void;
   onFocus: (id: string) => void;
   onRequestDelete: (id: string) => void;
   onCancelDelete: () => void;
@@ -85,6 +85,8 @@ export function ChatSessionRail({
   const pending = conversations.find((c) => c.id === deleteConfirmId) ?? null;
   const railRef = useRef<HTMLElement>(null);
   const searchInputRef = useRef<HTMLInputElement>(null);
+  const [collapsedKeys, setCollapsedKeys] = useState<Set<string>>(() => new Set());
+  const searching = Boolean(query.trim());
   useEffect(() => {
     if (!open || !searchFocusNonce) return;
     const timer = window.setTimeout(() => {
@@ -93,6 +95,17 @@ export function ChatSessionRail({
     }, 0);
     return () => window.clearTimeout(timer);
   }, [open, searchFocusNonce]);
+  useEffect(() => {
+    if (!activeId) return;
+    const key = groups.find((group) => group.items.some((item) => item.id === activeId))?.key;
+    if (!key) return;
+    setCollapsedKeys((prev) => {
+      if (!prev.has(key)) return prev;
+      const next = new Set(prev);
+      next.delete(key);
+      return next;
+    });
+  }, [activeId, groups, historyRevealNonce]);
   useEffect(() => {
     if (!open || !historyRevealNonce) return;
     const timer = window.setTimeout(() => {
@@ -147,7 +160,7 @@ export function ChatSessionRail({
             disabled={agentsReady && !hasUsableAgent}
             data-help="chat-new"
             aria-keyshortcuts="Control+N"
-            onClick={onNewChat}
+            onClick={() => onNewChat()}
           >
             <Plus className="h-3.5 w-3.5" />
             {t('chat.rail.newChat')}
@@ -180,12 +193,61 @@ export function ChatSessionRail({
             <p className="text-meta text-muted">{t('chat.rail.noMatch')}</p>
           </div>
         ) : (
-          groups.map((group) => (
-            <div key={group.key} className="mb-2">
-              <div className={cn('px-2 pb-1 pt-1.5', pageRhythm.sectionEyebrow)}>
-                {group.label}
+          groups.map((group) => {
+            const expanded = searching || !collapsedKeys.has(group.key);
+            return (
+            <div
+              key={group.key}
+              className="mb-2"
+              data-help="chat-workspace-group"
+              data-workspace-key={group.key}
+            >
+              <div className="group flex items-center gap-0.5 pr-1">
+              <Hint label={group.cwd ?? group.label}>
+              <button
+                type="button"
+                className="flex min-w-0 flex-1 items-center gap-1 px-2 pb-1 pt-1.5 text-left text-meta font-medium text-muted"
+                aria-expanded={expanded}
+                onClick={() => {
+                  setCollapsedKeys((prev) => {
+                    const next = new Set(prev);
+                    if (next.has(group.key)) next.delete(group.key);
+                    else next.add(group.key);
+                    return next;
+                  });
+                }}
+              >
+                {expanded ? (
+                  <ChevronDown className="h-3.5 w-3.5 shrink-0" />
+                ) : (
+                  <ChevronRight className="h-3.5 w-3.5 shrink-0" />
+                )}
+                <span className="min-w-0 flex-1 truncate" data-help="chat-workspace-group-label">
+                  {group.label}
+                </span>
+              </button>
+              </Hint>
+              {group.cwd ? (
+                <Hint label={t('chat.rail.newChatInWorkspace')}>
+                  <Button
+                    type="button"
+                    size="icon"
+                    variant="ghost"
+                    className="h-6 w-6 shrink-0 text-muted opacity-0 transition-opacity hover:text-primary group-hover:opacity-100 focus-visible:opacity-100 group-focus-within:opacity-100"
+                    disabled={agentsReady && !hasUsableAgent}
+                    data-help="chat-workspace-new"
+                    aria-label={t('chat.rail.newChatInWorkspace')}
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      onNewChat(group.cwd);
+                    }}
+                  >
+                    <Plus className="h-3.5 w-3.5" />
+                  </Button>
+                </Hint>
+              ) : null}
               </div>
-              {group.items.map((c) => {
+              {expanded ? group.items.map((c) => {
                 const selected = activeId === c.id;
                 const sending = sendingConversationIds.includes(c.id);
                 return (
@@ -255,9 +317,10 @@ export function ChatSessionRail({
                     </Button>
                   </div>
                 );
-              })}
+              }) : null}
             </div>
-          ))
+          );
+          })
         )}
       </div>
       <Dialog open={Boolean(deleteConfirmId)} onOpenChange={(next) => !next && onCancelDelete()}>
diff --git a/src/pages/chat/ChatSettingsDialog.tsx b/src/pages/chat/ChatSettingsDialog.tsx
index 5cab4912..2612938e 100644
--- a/src/pages/chat/ChatSettingsDialog.tsx
+++ b/src/pages/chat/ChatSettingsDialog.tsx
@@ -27,7 +27,6 @@ import {
 import {
   agentNewChatConnectKind,
   chatConnectLabelKey,
-  sessionChatConnectHintKey,
   sessionChatConnectKind,
 } from './chat-connect-model';
 import { sessionAllowAlwaysActive } from './chat-runtime-model';
@@ -114,14 +113,14 @@ export function ChatSettingsDialog({
     <>
       <Dialog open={open} onOpenChange={onOpenChange}>
         <DialogContent>
-          <DialogHeader>
+          <DialogHeader className="mb-2">
             <DialogTitle>{t('chat.settings.title')}</DialogTitle>
-            <DialogDescription>{t('chat.settings.description')}</DialogDescription>
+            <DialogDescription className="sr-only">{t('chat.settings.description')}</DialogDescription>
           </DialogHeader>
           {active && (
-            <div className="space-y-4 py-2">
+            <div className="space-y-3">
               <div>
-                <label className="mb-1.5 flex items-center gap-1.5 text-meta text-muted">
+                <label className="mb-1 flex items-center gap-1.5 text-meta text-muted">
                   <FolderOpen className="h-3.5 w-3.5" />
                   {t('chat.settings.cwd')}
                 </label>
@@ -146,23 +145,27 @@ export function ChatSettingsDialog({
                   </Button>
                 </div>
               </div>
-              <div className="space-y-1" data-help="chat-session-connect">
-                <p className="text-body font-medium">{t('chat.connect.sessionTitle')}</p>
-                <p className="text-body">{t(chatConnectLabelKey(connectKind))}</p>
-                <p className="text-meta text-muted">{t(sessionChatConnectHintKey(connectKind))}</p>
-                {agentConnectKind !== connectKind ? (
-                  <p className="text-meta text-muted">
-                    {t('chat.connect.agentTitle')}
-                    {' · '}
-                    {t(chatConnectLabelKey(agentConnectKind))}
-                  </p>
-                ) : null}
+              <div
+                className="flex items-baseline justify-between gap-3"
+                data-help="chat-session-connect"
+              >
+                <span className="text-meta text-muted">{t('chat.connect.sessionTitle')}</span>
+                <p className="text-right text-body">
+                  {t(chatConnectLabelKey(connectKind))}
+                  {agentConnectKind !== connectKind ? (
+                    <span className="mt-0.5 block text-meta text-muted">
+                      {t('chat.connect.agentTitle')}
+                      {' · '}
+                      {t(chatConnectLabelKey(agentConnectKind))}
+                    </span>
+                  ) : null}
+                </p>
               </div>
               {connectKind !== 'legacy' ? (
                 <label className="flex items-center justify-between gap-3 text-body" data-help="chat-session-always-allow-setting">
                   <span>
-                    <span className="block font-medium">{t('chat.runtime.sessionRemembered')}</span>
-                    <span className="mt-1 block text-meta text-muted">
+                    <span className="block">{t('chat.runtime.sessionRemembered')}</span>
+                    <span className="text-meta text-muted">
                       {sessionAlways
                         ? t(
                             kiroPermissions
@@ -189,30 +192,31 @@ export function ChatSettingsDialog({
                 </label>
               ) : null}
               {kiroPermissions ? (
-                <fieldset className="space-y-2" disabled={permissionLocked}>
-                  <legend className="text-body font-medium">{t('chat.kiro.permissionTitle')}</legend>
+                <fieldset className="space-y-1.5" disabled={permissionLocked}>
+                  <legend className="text-meta text-muted">{t('chat.kiro.permissionTitle')}</legend>
                   {permissionLocked ? (
                     <p className="text-meta text-muted">{t('chat.kiro.settingsLocked')}</p>
                   ) : null}
-                  <label className="flex cursor-pointer items-start gap-2 rounded px-1 py-1 hover:bg-subtle">
+                  <label className="flex cursor-pointer items-center gap-2 rounded px-1 py-0.5 hover:bg-subtle">
                     <input
                       type="radio"
                       name={`kiro-permission-${active.id}`}
-                      className="mt-1"
                       checked={!approveOn}
                       disabled={permissionLocked}
                       onChange={() => onPatch({ allowDangerous: false })}
                     />
                     <span>
-                      <span className="block font-medium">{t('chat.kiro.permissionAsk')}</span>
-                      <span className="text-meta text-muted">{t('chat.kiro.permissionAskHint')}</span>
+                      {t('chat.kiro.permissionAsk')}
+                      <span className="text-meta text-muted">
+                        {' · '}
+                        {t('chat.kiro.permissionAskHint')}
+                      </span>
                     </span>
                   </label>
-                  <label className="flex cursor-pointer items-start gap-2 rounded px-1 py-1 hover:bg-subtle">
+                  <label className="flex cursor-pointer items-center gap-2 rounded px-1 py-0.5 hover:bg-subtle">
                     <input
                       type="radio"
                       name={`kiro-permission-${active.id}`}
-                      className="mt-1"
                       checked={approveOn}
                       disabled={permissionLocked}
                       onChange={() => {
@@ -221,16 +225,18 @@ export function ChatSettingsDialog({
                       }}
                     />
                     <span>
-                      <span className="block font-medium">{t('chat.kiro.permissionFull')}</span>
-                      <span className="text-meta text-muted">{t('chat.kiro.permissionFullHint')}</span>
+                      {t('chat.kiro.permissionFull')}
+                      <span className="text-meta text-muted">
+                        {' · '}
+                        {t('chat.kiro.permissionFullHint')}
+                      </span>
                     </span>
                   </label>
-                  <p className="text-meta text-muted">{t('chat.kiro.permissionVsCard')}</p>
                 </fieldset>
               ) : (
                 <label className="flex items-center justify-between gap-3 text-body">
                   <span>
-                    <span className="block font-medium">{t('chat.settings.autoApprove')}</span>
+                    <span className="block">{t('chat.settings.autoApprove')}</span>
                     <Tip
                       className="text-meta text-muted"
                       label={
@@ -241,7 +247,6 @@ export function ChatSettingsDialog({
                     >
                       {autoApproveHint(t, approveEffect)}
                     </Tip>
-                    <span className="mt-1 block text-meta text-muted">{t('chat.settings.autoApproveVsCard')}</span>
                   </span>
                   <Switch
                     checked={approveOn}
@@ -259,7 +264,7 @@ export function ChatSettingsDialog({
               )}
             </div>
           )}
-          <DialogFooter>
+          <DialogFooter className="mt-4">
             <Button variant="secondary" onClick={() => onOpenChange(false)}>
               {t('chat.settings.done')}
             </Button>
diff --git a/src/pages/chat/ChatTranscript.test.ts b/src/pages/chat/ChatTranscript.test.ts
index 1ce4eed1..2747bf01 100644
--- a/src/pages/chat/ChatTranscript.test.ts
+++ b/src/pages/chat/ChatTranscript.test.ts
@@ -2,6 +2,7 @@ import { createElement, createRef, type ReactElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { describe, expect, it, vi } from 'vitest';
 import { TooltipProvider } from '@/components/ui/tooltip';
+import type { AgentProcessView } from '@/lib/chat-process';
 import type { ChatMessage, Conversation } from '@/lib/types';
 import { chatTranscriptSurfaceClass } from './chat-model';
 import { ChatTranscript } from './ChatTranscript';
@@ -23,11 +24,11 @@ function conversation(): Conversation {
   };
 }
 
-function userMessage(content: string): ChatMessage {
+function userMessage(content: string, id = 'm-user', turn = 1): ChatMessage {
   return {
-    id: 'm-user',
+    id,
     conversationId: 'c1',
-    turn: 1,
+    turn,
     role: 'user',
     content,
     status: 'ok',
@@ -101,6 +102,57 @@ describe('ChatTranscript surfaces', () => {
     expect(html).not.toContain('示例只填入输入框，由你发送');
   });
 
+  it('puts a clickable thinking bar on the assistant bubble before any body', () => {
+    const process: AgentProcessView = {
+      turn: 1,
+      agent: 'claude',
+      phase: 'running',
+      stdout: '',
+      stderr: '',
+      steps: [{ type: 'thinking', text: 'hidden thinking', done: false }],
+      updatedAt: 1,
+      thinkingStartedAt: Date.now() - 1500,
+    };
+    const html = renderMarkup(
+      createElement(ChatTranscript, {
+        active: conversation(),
+        turns: [
+          {
+            turn: 1,
+            user: userMessage('hello from chat'),
+            agents: [
+              {
+                id: 'm-agent',
+                conversationId: 'c1',
+                turn: 1,
+                role: 'agent',
+                agentId: 'claude',
+                content: '',
+                status: 'running',
+                durationMs: 0,
+                createdAt: '2026-08-16T00:00:00.000Z',
+              },
+            ],
+          },
+        ],
+        processMap: { '1:claude': process },
+        listLoading: false,
+        messagesLoading: false,
+        sending: true,
+        retryDisabled: false,
+        scrollRef: createRef<HTMLDivElement>(),
+        bottomRef: createRef<HTMLDivElement>(),
+        onScroll: () => undefined,
+        onRetry: () => undefined,
+        onOpenProcess: () => undefined,
+      }),
+    );
+    expect(html).toContain('data-help="chat-thinking-bar"');
+    expect(html).toContain('思考中');
+    expect(html).not.toContain('hidden thinking');
+    expect(html).not.toContain('正在想');
+  });
+
   it('does not paint a panel card once a turn exists', () => {
     const html = renderTranscript([
       { turn: 1, user: userMessage('hello from chat'), agents: [] },
@@ -109,5 +161,117 @@ describe('ChatTranscript surfaces', () => {
     expect(html).not.toContain('rounded-composer bg-panel');
     expect(html).not.toContain('rounded-composer bg-canvas');
     expect(html).toContain('hello from chat');
+    expect(html).toContain('id="chat-msg-m-user"');
+    expect(html).not.toContain('data-testid="chat-outline-rail"');
+    expect(html).not.toContain('role="tablist"');
+  });
+
+  it('does not mount an outline for an empty transcript or a single user message', () => {
+    expect(renderTranscript([])).not.toContain('data-testid="chat-outline-rail"');
+    expect(renderTranscript([
+      { turn: 1, user: userMessage('hello from chat'), agents: [] },
+    ])).not.toContain('chat-outline-rail');
+  });
+
+  it('anchors each sent prompt so the outline can jump to it', () => {
+    const first = userMessage('first prompt');
+    const second = {
+      ...userMessage('second prompt'),
+      id: 'm-user-2',
+      turn: 2,
+    };
+    const html = renderTranscript([
+      { turn: 1, user: first, agents: [] },
+      { turn: 2, user: second, agents: [] },
+    ]);
+    expect(html).toContain('id="chat-msg-m-user"');
+    expect(html).toContain('id="chat-msg-m-user-2"');
+    expect(html).toContain('first prompt');
+    expect(html).toContain('second prompt');
+    expect(html).toContain('pointer-events-none');
+    // Unmeasured panel width is 0, so the 720px gate still hides the ticks.
+    expect(html).not.toContain('data-testid="chat-outline-rail"');
+  });
+
+  it('mounts the outline rail when the setting, two prompts, and a 720px panel hold', () => {
+    const html = renderMarkup(
+      createElement(ChatTranscript, {
+        active: conversation(),
+        turns: [
+          { turn: 1, user: userMessage('first prompt', 'u1', 1), agents: [] },
+          { turn: 2, user: userMessage('second prompt', 'u2', 2), agents: [] },
+        ],
+        processMap: {},
+        listLoading: false,
+        messagesLoading: false,
+        sending: false,
+        retryDisabled: false,
+        scrollRef: createRef<HTMLDivElement>(),
+        bottomRef: createRef<HTMLDivElement>(),
+        onScroll: () => undefined,
+        onRetry: () => undefined,
+        measuredWidth: 720,
+        outlineEnabled: true,
+      }),
+    );
+    expect(html).toContain('data-testid="chat-outline-rail"');
+    expect(html).toContain('role="tablist"');
+    expect(html).toContain('role="tab"');
+    expect(html).toContain('type="button"');
+    expect(html).toContain('data-testid="chat-outline-tick-u1"');
+    expect(html).toContain('data-testid="chat-outline-tick-u2"');
+    expect(html).toContain('1 / 2：first prompt');
+    expect(html).toContain('2 / 2：second prompt');
+    expect(html).toContain('data-chat-outline-host');
+  });
+
+  it('does not count an empty measure host as the outline', () => {
+    const html = renderMarkup(
+      createElement(ChatTranscript, {
+        active: conversation(),
+        turns: [
+          { turn: 1, user: userMessage('first prompt', 'u1', 1), agents: [] },
+          { turn: 2, user: userMessage('second prompt', 'u2', 2), agents: [] },
+        ],
+        processMap: {},
+        listLoading: false,
+        messagesLoading: false,
+        sending: false,
+        retryDisabled: false,
+        scrollRef: createRef<HTMLDivElement>(),
+        bottomRef: createRef<HTMLDivElement>(),
+        onScroll: () => undefined,
+        onRetry: () => undefined,
+        measuredWidth: 0,
+        outlineEnabled: true,
+      }),
+    );
+    expect(html).toContain('data-chat-outline-host');
+    expect(html).toContain('data-chat-outline-measure');
+    expect(html).not.toContain('chat-outline-rail');
+    expect(html).not.toContain('role="tablist"');
+    expect(html).not.toContain('chat-outline-tick-');
+  });
+
+  it('does not mount the rail ticks when only one user message exists', () => {
+    const html = renderMarkup(
+      createElement(ChatTranscript, {
+        active: conversation(),
+        turns: [{ turn: 1, user: userMessage('only one', 'u1'), agents: [] }],
+        processMap: {},
+        listLoading: false,
+        messagesLoading: false,
+        sending: false,
+        retryDisabled: false,
+        scrollRef: createRef<HTMLDivElement>(),
+        bottomRef: createRef<HTMLDivElement>(),
+        onScroll: () => undefined,
+        onRetry: () => undefined,
+        measuredWidth: 900,
+        outlineEnabled: true,
+      }),
+    );
+    expect(html).toContain('data-chat-outline-host');
+    expect(html).not.toContain('chat-outline-rail');
   });
 });
diff --git a/src/pages/chat/ChatTranscript.tsx b/src/pages/chat/ChatTranscript.tsx
index 3bc01e0c..e37d4f3f 100644
--- a/src/pages/chat/ChatTranscript.tsx
+++ b/src/pages/chat/ChatTranscript.tsx
@@ -38,6 +38,8 @@ import {
 } from './chat-actions';
 import { emptyStarterChipHint, emptyTranscriptCopy } from './chat-empty-state';
 import { ChatMessageBubble } from './ChatMessageBubble';
+import { ChatOutlineRail } from './ChatOutlineRail';
+import { useChatOutlineEnabled, useOutlinePanelWidth } from './use-chat-outline';
 
 export function ChatTranscript({
   active,
@@ -61,6 +63,9 @@ export function ChatTranscript({
   onPickStarter,
   firstBlocker = null,
   onBlockerAction,
+  onJumpToOutline,
+  measuredWidth,
+  outlineEnabled,
 }: {
   active: Conversation | null;
   turns: TurnGroup[];
@@ -83,8 +88,13 @@ export function ChatTranscript({
   onPickStarter?: (action: ChatActionDef) => void;
   firstBlocker?: ChatSendBlocker | null;
   onBlockerAction?: (target: ChatBlockerPrimaryTarget) => void;
+  onJumpToOutline?: (messageId: string) => void;
+  measuredWidth?: number;
+  outlineEnabled?: boolean;
 }) {
   const { t } = useI18n();
+  const outlineOn = useChatOutlineEnabled(outlineEnabled);
+  const outlinePanel = useOutlinePanelWidth(outlineOn && Boolean(active), measuredWidth);
   if (listLoading && !active) {
     return (
       <div className="flex flex-1 flex-col items-center justify-center gap-3 p-6">
@@ -99,63 +109,50 @@ export function ChatTranscript({
 
   return (
     <div
-      ref={scrollRef}
-      onScroll={onScroll}
-      role="log"
-      aria-live="polite"
-      aria-relevant="additions text"
-      aria-busy={messagesLoading || sending ? 'true' : undefined}
-      className={cn('min-h-0 flex-1 overflow-x-hidden overflow-y-auto', chatTranscriptSurfaceClass)}
-      data-chat-transcript
+      ref={outlinePanel.assignRef}
+      className="relative flex min-h-0 flex-1 flex-col"
+      data-chat-outline-host
     >
-      {messagesLoading && turns.length === 0 ? (
-        <div className="flex h-full flex-col justify-center p-6">
-          <ListSkeleton rows={3} className="mx-auto w-full max-w-2xl" />
-        </div>
-      ) : messagesError && turns.length === 0 ? (
-        <div className="flex h-full items-center justify-center p-6">
-          <ErrorState
-            error={messagesError}
-            title={t('chat.transcript.loadFailed')}
-            onRetry={onRetryMessages ?? (() => {})}
+      <div
+        ref={scrollRef}
+        onScroll={onScroll}
+        role="log"
+        aria-live="polite"
+        aria-relevant="additions text"
+        aria-busy={messagesLoading || sending ? 'true' : undefined}
+        className={cn('min-h-0 flex-1 overflow-x-hidden overflow-y-auto', chatTranscriptSurfaceClass)}
+        data-chat-transcript
+      >
+        {messagesLoading && turns.length === 0 ? (
+          <div className="flex h-full flex-col justify-center p-6">
+            <ListSkeleton rows={3} className="mx-auto w-full max-w-2xl" />
+          </div>
+        ) : messagesError && turns.length === 0 ? (
+          <div className="flex h-full items-center justify-center p-6">
+            <ErrorState
+              error={messagesError}
+              title={t('chat.transcript.loadFailed')}
+              onRetry={onRetryMessages ?? (() => {})}
+            />
+          </div>
+        ) : turns.length === 0 ? (
+          <EmptyTranscriptStart
+            sending={sending}
+            firstBlocker={firstBlocker}
+            onBlockerAction={onBlockerAction}
+            onPickStarter={onPickStarter}
           />
-        </div>
-      ) : turns.length === 0 ? (
-        <EmptyTranscriptStart
-          sending={sending}
-          firstBlocker={firstBlocker}
-          onBlockerAction={onBlockerAction}
-          onPickStarter={onPickStarter}
-        />
-      ) : (
-        <div className="min-h-full" data-chat-transcript-surface>
-          <div className="space-y-6 py-4">
-            {turns.map((g) => {
-              const chips = g.agents.length >= 2 ? turnComparisonChips(g.agents) : [];
-              return (
-                <div key={g.turn} className="space-y-4">
-                  {g.user && (
-                    <ChatMessageBubble
-                      message={g.user}
-                      isLastTurn={g.turn === lastTurn}
-                      multiAgent={g.agents.length > 1}
-                      retryDisabled={retryDisabled || sending}
-                      onRetry={onRetry}
-                      hideRetry={hideLastTurnRetry}
-                      localBasePath={active.cwd ?? undefined}
-                      onOpenLocal={onOpenLocal}
-                    />
-                  )}
-                  {chips.length > 0 && (
-                    <ComparisonBar chips={chips} />
-                  )}
-                  {g.agents.map((m) => {
-                    const agent = m.agentId ?? 'claude';
-                    return (
+        ) : (
+          <div className="min-h-full" data-chat-transcript-surface>
+            <div className="space-y-6 py-4">
+              {turns.map((g) => {
+                const chips = g.agents.length >= 2 ? turnComparisonChips(g.agents) : [];
+                return (
+                  <div key={g.turn} className="space-y-4">
+                    {g.user && (
                       <ChatMessageBubble
-                        key={m.id}
-                        message={m}
-                        process={processMap[processKey(m.turn, agent)]}
+                        key={g.user.id}
+                        message={g.user}
                         isLastTurn={g.turn === lastTurn}
                         multiAgent={g.agents.length > 1}
                         retryDisabled={retryDisabled || sending}
@@ -163,21 +160,48 @@ export function ChatTranscript({
                         hideRetry={hideLastTurnRetry}
                         localBasePath={active.cwd ?? undefined}
                         onOpenLocal={onOpenLocal}
-                        onOpenProcess={onOpenProcess}
-                        onCloseProcess={onCloseProcess}
-                        processPaneOpen={
-                          inspectProcess?.turn === m.turn && inspectProcess.agent === agent
-                        }
                       />
-                    );
-                  })}
-                </div>
-              );
-            })}
-            <div ref={bottomRef} />
+                    )}
+                    {chips.length > 0 && (
+                      <ComparisonBar chips={chips} />
+                    )}
+                    {g.agents.map((m) => {
+                      const agent = m.agentId ?? 'claude';
+                      return (
+                        <ChatMessageBubble
+                          key={m.id}
+                          message={m}
+                          process={processMap[processKey(m.turn, agent)]}
+                          isLastTurn={g.turn === lastTurn}
+                          multiAgent={g.agents.length > 1}
+                          retryDisabled={retryDisabled || sending}
+                          onRetry={onRetry}
+                          hideRetry={hideLastTurnRetry}
+                          localBasePath={active.cwd ?? undefined}
+                          onOpenLocal={onOpenLocal}
+                          onOpenProcess={onOpenProcess}
+                          onCloseProcess={onCloseProcess}
+                          processPaneOpen={
+                            inspectProcess?.turn === m.turn && inspectProcess.agent === agent
+                          }
+                        />
+                      );
+                    })}
+                  </div>
+                );
+              })}
+              <div ref={bottomRef} />
+            </div>
           </div>
-        </div>
-      )}
+        )}
+      </div>
+      <ChatOutlineRail
+        turns={turns}
+        scrollRef={scrollRef}
+        onJumpToPrompt={onJumpToOutline}
+        measuredWidth={outlinePanel.width}
+        enabled={outlineOn}
+      />
     </div>
   );
 }
diff --git a/src/pages/chat/chat-connect-model.ts b/src/pages/chat/chat-connect-model.ts
index e551d353..2bc1858e 100644
--- a/src/pages/chat/chat-connect-model.ts
+++ b/src/pages/chat/chat-connect-model.ts
@@ -37,12 +37,6 @@ export function chatConnectLabelKey(kind: ChatConnectKind): MessageKey {
   return 'chat.connect.legacy';
 }
 
-export function sessionChatConnectHintKey(kind: ChatConnectKind): MessageKey {
-  if (kind === 'acp') return 'chat.connect.sessionHintAcp';
-  if (kind === 'continuous') return 'chat.connect.sessionHintContinuous';
-  return 'chat.connect.sessionHintLegacy';
-}
-
 export function agentChatConnectHintKey(kind: ChatConnectKind): MessageKey {
   if (kind === 'acp') return 'chat.connect.agentHintAcp';
   if (kind === 'continuous') return 'chat.connect.agentHintContinuous';
diff --git a/src/pages/chat/chat-edit-preview.test.ts b/src/pages/chat/chat-edit-preview.test.ts
new file mode 100644
index 00000000..dc45b084
--- /dev/null
+++ b/src/pages/chat/chat-edit-preview.test.ts
@@ -0,0 +1,408 @@
+import { createElement } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it, vi } from 'vitest';
+import { TooltipProvider } from '@/components/ui/tooltip';
+import type { ProcessMap } from '@/lib/chat-process';
+import type { ProcessStep } from '@/lib/types';
+import { ChatEditPreviewPanel, ChatTurnEditList } from './ChatEditPreviewPanel';
+import {
+  extractEditFilesFromSteps,
+  extractTurnEdits,
+  formatSimpleDiff,
+  latestProcessTurn,
+  sameEditPath,
+  turnEditDiffText,
+  turnEditHasInlineDiff,
+} from './chat-edit-preview';
+
+vi.mock('@/components/shared/SourcePreview', () => ({
+  SourcePreview: ({ value, fileName }: { value: string; fileName: string }) =>
+    `PREVIEW:${fileName}:${value}`,
+}));
+
+function tool(
+  name: string,
+  status: string,
+  input?: unknown,
+  result?: string | null,
+): ProcessStep {
+  return { type: 'tool', name, status, input, result };
+}
+
+function mapWith(steps: ProcessStep[], turn = 1, agent: 'codex' | 'grok' = 'codex'): ProcessMap {
+  return {
+    [`${turn}:${agent}`]: {
+      turn,
+      agent,
+      phase: 'running',
+      stdout: '',
+      stderr: '',
+      updatedAt: turn,
+      steps,
+    },
+  };
+}
+
+describe('extractEditFilesFromSteps', () => {
+  it('keeps live Write paths as 正在修改 and completed as 已修改', () => {
+    expect(
+      extractEditFilesFromSteps([
+        tool('Write', 'start', { path: 'src/a.ts' }),
+      ]),
+    ).toEqual([{ path: 'src/a.ts', status: 'live' }]);
+    expect(
+      extractEditFilesFromSteps([
+        tool('Write', 'end', { path: 'src/a.ts' }),
+      ]),
+    ).toEqual([{ path: 'src/a.ts', status: 'done' }]);
+  });
+
+  it('ignores read / execute tools and failed edits', () => {
+    expect(
+      extractEditFilesFromSteps([
+        tool('Read', 'end', { path: 'README.md' }),
+        tool('Bash', 'end', { command: 'ls' }),
+        tool('Write', 'error', { path: 'src/a.ts' }),
+      ]),
+    ).toEqual([]);
+  });
+
+  it('reads target_file, file_path, and file:// URIs', () => {
+    expect(
+      extractEditFilesFromSteps([
+        tool('Edit', 'end', { target_file: '/workspace/src/app.ts' }),
+        tool('StrReplace', 'end', { file_path: 'lib\\b.ts' }),
+        tool('Delete', 'end', { uri: 'file://localhost/workspace/README.md' }),
+      ]),
+    ).toEqual([
+      { path: '/workspace/src/app.ts', status: 'done' },
+      { path: 'lib\\b.ts', status: 'done' },
+      { path: '/workspace/README.md', status: 'done' },
+    ]);
+  });
+
+  it('dedupes the same path and keeps the later status', () => {
+    expect(
+      extractEditFilesFromSteps([
+        tool('Write', 'start', { path: 'src/a.ts' }),
+        tool('StrReplace', 'end', { path: 'src\\a.ts', old_string: 'a', new_string: 'b' }),
+      ]),
+    ).toEqual([
+      {
+        path: 'src\\a.ts',
+        status: 'done',
+        before: 'a',
+        after: 'b',
+      },
+    ]);
+  });
+
+  it('copies old/new text from StrReplace input', () => {
+    const files = extractEditFilesFromSteps([
+      tool('StrReplace', 'end', {
+        path: 'src/app.ts',
+        old_string: "const name = 'old';",
+        new_string: "const name = 'new';",
+      }),
+    ]);
+    expect(files[0]?.before).toBe("const name = 'old';");
+    expect(files[0]?.after).toBe("const name = 'new';");
+    expect(turnEditHasInlineDiff(files[0]!)).toBe(true);
+  });
+
+  it('copies nested changes[] and fileChanges map', () => {
+    expect(
+      extractEditFilesFromSteps([
+        tool('apply_patch', 'end', {
+          changes: [
+            { path: 'src/app.ts', before: 'old', after: 'new' },
+            { path: 'src/b.ts' },
+          ],
+        }),
+      ]),
+    ).toEqual([
+      { path: 'src/app.ts', status: 'done', before: 'old', after: 'new' },
+      { path: 'src/b.ts', status: 'done' },
+    ]);
+
+    const written = extractEditFilesFromSteps([
+      tool('apply_patch', 'end', {
+        fileChanges: {
+          '/tmp/example.txt': { type: 'add', content: 'ok' },
+        },
+      }),
+    ]);
+    expect(written).toEqual([
+      { path: '/tmp/example.txt', status: 'done', after: 'ok' },
+    ]);
+    expect(turnEditHasInlineDiff(written[0]!)).toBe(false);
+  });
+
+  it('reads grok operation.diff when it looks like a unified diff', () => {
+    const files = extractEditFilesFromSteps([
+      tool('edit', 'end', {
+        toolCall: {
+          kind: 'edit',
+          rawInput: {
+            operation: {
+              type: 'update_file',
+              path: 'README.md',
+              diff: '@@ -1,2 +1,3 @@\n hello\n+world\n',
+            },
+          },
+        },
+      }),
+    ]);
+    expect(files[0]?.path).toBe('README.md');
+    expect(files[0]?.diff).toContain('@@ -1,2 +1,3 @@');
+    expect(turnEditHasInlineDiff(files[0]!)).toBe(true);
+  });
+
+  it('does not treat a protocol snippet without old/new as an inline diff', () => {
+    const files = extractEditFilesFromSteps([
+      tool('file_change', 'end', {
+        item: {
+          changes: [
+            {
+              path: '/workspace/probe.txt',
+              kind: { type: 'add' },
+              diff: 'FILECHANGE_OK\n',
+            },
+          ],
+        },
+      }),
+    ]);
+    expect(files[0]?.path).toBe('/workspace/probe.txt');
+    expect(turnEditHasInlineDiff(files[0]!)).toBe(false);
+  });
+
+  it('parses JSON tool results and a path on the tool name', () => {
+    expect(
+      extractEditFilesFromSteps([
+        tool(
+          'Write',
+          'end',
+          { path: 'notes.md' },
+          JSON.stringify({ old_string: 'a', new_string: 'b' }),
+        ),
+      ]),
+    ).toEqual([
+      { path: 'notes.md', status: 'done', before: 'a', after: 'b' },
+    ]);
+    expect(
+      extractEditFilesFromSteps([tool('Write src/named.ts', 'end')]),
+    ).toEqual([{ path: 'src/named.ts', status: 'done' }]);
+  });
+
+  it('reads locations[], files[], and file:// without localhost', () => {
+    expect(
+      extractEditFilesFromSteps([
+        tool('apply_patch', 'end', {
+          locations: [{ path: 'src/c.ts', old_text: 'c1', new_text: 'c2' }],
+        }),
+      ]),
+    ).toEqual([{ path: 'src/c.ts', status: 'done', before: 'c1', after: 'c2' }]);
+    expect(
+      extractEditFilesFromSteps([
+        tool('Write', 'end', { files: ['src/a.ts', { filePath: 'src/b.ts' }] }),
+      ]),
+    ).toEqual([
+      { path: 'src/a.ts', status: 'done' },
+      { path: 'src/b.ts', status: 'done' },
+    ]);
+    expect(
+      extractEditFilesFromSteps([
+        tool('Edit', 'end', { uri: 'file:///workspace/notes.md' }),
+      ]),
+    ).toEqual([{ path: '/workspace/notes.md', status: 'done' }]);
+  });
+
+  it('ignores a bare string, a space-only name, and invalid JSON results', () => {
+    expect(extractEditFilesFromSteps([tool('Write', 'end', 'hello world')])).toEqual([]);
+    expect(extractEditFilesFromSteps([tool('Write readme', 'end')])).toEqual([]);
+    expect(
+      extractEditFilesFromSteps([
+        tool('Write', 'end', { path: 'notes.md' }, '{not-json'),
+      ]),
+    ).toEqual([{ path: 'notes.md', status: 'done' }]);
+  });
+
+  it('stops walking nested item wrappers after three levels', () => {
+    expect(
+      extractEditFilesFromSteps([
+        tool('Write', 'end', {
+          item: { item: { item: { item: { path: 'too-deep.ts' } } } },
+        }),
+      ]),
+    ).toEqual([]);
+    expect(
+      extractEditFilesFromSteps([
+        tool('Write', 'end', {
+          item: { item: { path: 'ok.ts' } },
+        }),
+      ]),
+    ).toEqual([{ path: 'ok.ts', status: 'done' }]);
+  });
+});
+
+describe('extractTurnEdits', () => {
+  it('uses the latest turn and merges agents on that turn', () => {
+    const processMap: ProcessMap = {
+      ...mapWith([tool('Write', 'end', { path: 'old.ts' })], 1, 'codex'),
+      ...mapWith([tool('Write', 'start', { path: 'src/a.ts' })], 2, 'codex'),
+      ...mapWith([tool('Edit', 'end', { path: 'src/b.ts' })], 2, 'grok'),
+    };
+    expect(latestProcessTurn(processMap)).toBe(2);
+    expect(extractTurnEdits(processMap).map((file) => file.path)).toEqual([
+      'src/a.ts',
+      'src/b.ts',
+    ]);
+    expect(extractTurnEdits(processMap, 1)).toEqual([
+      { path: 'old.ts', status: 'done' },
+    ]);
+  });
+
+  it('returns an empty list when there is no process map', () => {
+    expect(extractTurnEdits({})).toEqual([]);
+    expect(latestProcessTurn({})).toBeNull();
+    expect(latestProcessTurn({
+      'x:codex': {
+        agent: 'codex',
+        phase: 'ok',
+        stdout: '',
+        stderr: '',
+        updatedAt: 1,
+        steps: [],
+      } as unknown as ProcessMap[string],
+    })).toBeNull();
+  });
+});
+
+describe('simple diff', () => {
+  it('marks the changed middle lines', () => {
+    expect(formatSimpleDiff('keep\nold\nend', 'keep\nnew\nend', 'src/a.ts')).toBe(
+      [
+        '--- src/a.ts',
+        '+++ src/a.ts',
+        '@@ -2,1 +2,1 @@',
+        '-old',
+        '+new',
+      ].join('\n'),
+    );
+  });
+
+  it('sameEditPath treats slash variants as one file', () => {
+    expect(sameEditPath('src\\a.ts', 'src/a.ts')).toBe(true);
+    expect(sameEditPath('src/a.ts', 'src/b.ts')).toBe(false);
+    expect(sameEditPath('src/a.ts/', 'src/a.ts')).toBe(true);
+    expect(sameEditPath('  src/a.ts  ', 'src/a.ts')).toBe(true);
+  });
+
+  it('turnEditDiffText prefers a real patch over inventing one', () => {
+    expect(
+      turnEditDiffText({
+        path: 'README.md',
+        diff: '@@ -1 +1,2 @@\n hello\n+world\n',
+      }),
+    ).toContain('@@ -1 +1,2 @@');
+    expect(
+      turnEditDiffText({
+        path: 'a.ts',
+        before: 'a',
+        after: 'b',
+      }),
+    ).toContain('-a');
+    expect(
+      turnEditDiffText({
+        path: 'a.ts',
+        after: 'only-new',
+      }),
+    ).toBeNull();
+  });
+});
+
+describe('ChatTurnEditList', () => {
+  it('labels this turn\'s files with 查看修改 / 正在修改 / 已修改', () => {
+    const html = renderToStaticMarkup(
+      createElement(
+        TooltipProvider,
+        null,
+        createElement(ChatTurnEditList, {
+          files: [
+            { path: 'src/a.ts', status: 'live' },
+            { path: 'src/b.ts', status: 'done' },
+          ],
+          selectedPath: 'src\\a.ts',
+          onSelect: () => undefined,
+        }),
+      ),
+    );
+    expect(html).toContain('data-help="chat-turn-edits"');
+    expect(html).toContain('查看修改');
+    expect(html).toContain('正在修改');
+    expect(html).toContain('已修改');
+    expect(html).toContain('src/a.ts');
+    expect(html).toContain('src/b.ts');
+    expect(html).toContain('aria-current="true"');
+  });
+
+  it('draws nothing when this turn has no edited files', () => {
+    expect(
+      renderToStaticMarkup(
+        createElement(ChatTurnEditList, { files: [], onSelect: () => undefined }),
+      ),
+    ).toBe('');
+  });
+});
+
+describe('ChatEditPreviewPanel', () => {
+  it('returns nothing when the pane is closed', () => {
+    expect(
+      renderToStaticMarkup(
+        createElement(ChatEditPreviewPanel, {
+          file: { path: 'src/a.ts', status: 'done', before: 'a', after: 'b' },
+          open: false,
+          onClose: () => undefined,
+        }),
+      ),
+    ).toBe('');
+  });
+
+  it('renders a diff preview from old and new text', () => {
+    const html = renderToStaticMarkup(
+      createElement(
+        TooltipProvider,
+        null,
+        createElement(ChatEditPreviewPanel, {
+          file: { path: 'src/app.ts', status: 'done', before: 'old', after: 'new' },
+          open: true,
+          width: 360,
+          onClose: () => undefined,
+        }),
+      ),
+    );
+    expect(html).toContain('data-chat-edit-preview');
+    expect(html).toContain('app.ts');
+    expect(html).toContain('查看修改');
+    expect(html).toContain('PREVIEW:app.ts.diff:');
+    expect(html).toContain('-old');
+    expect(html).toContain('+new');
+    expect(html).toContain('收起');
+  });
+
+  it('shows the empty-body hint when there is no patch', () => {
+    const html = renderToStaticMarkup(
+      createElement(
+        TooltipProvider,
+        null,
+        createElement(ChatEditPreviewPanel, {
+          file: { path: 'src/a.ts', status: 'live' },
+          open: true,
+          onClose: () => undefined,
+        }),
+      ),
+    );
+    expect(html).toContain('没有内容');
+    expect(html).not.toContain('PREVIEW:');
+  });
+});
diff --git a/src/pages/chat/chat-edit-preview.ts b/src/pages/chat/chat-edit-preview.ts
new file mode 100644
index 00000000..af8e0b72
--- /dev/null
+++ b/src/pages/chat/chat-edit-preview.ts
@@ -0,0 +1,377 @@
+import {
+  classifyToolAction,
+  toolActionTone,
+  type ProcessMap,
+} from '@/lib/chat-process';
+import type { ProcessStep } from '@/lib/types';
+
+export type TurnEditStatus = 'live' | 'done';
+
+export type TurnEditFile = {
+  path: string;
+  status: TurnEditStatus;
+  before?: string;
+  after?: string;
+  diff?: string;
+};
+
+const PATH_KEYS = [
+  'path',
+  'file',
+  'filePath',
+  'file_path',
+  'target_file',
+  'targetFile',
+  'uri',
+  'fileUri',
+  'file_uri',
+] as const;
+
+const BEFORE_KEYS = ['before', 'oldText', 'old_text', 'old_string'] as const;
+const AFTER_KEYS = ['content', 'contents', 'newText', 'new_text', 'new_string', 'after'] as const;
+
+type ToolStep = Extract<ProcessStep, { type: 'tool' }>;
+
+type CollectedEdit = {
+  path: string;
+  before?: string;
+  after?: string;
+  diff?: string;
+};
+
+export function latestProcessTurn(processMap: ProcessMap): number | null {
+  let max = Number.NEGATIVE_INFINITY;
+  for (const view of Object.values(processMap)) {
+    if (typeof view.turn === 'number' && view.turn > max) max = view.turn;
+  }
+  return Number.isFinite(max) ? max : null;
+}
+
+export function sameEditPath(a: string, b: string): boolean {
+  return normalizeEditPath(a) === normalizeEditPath(b);
+}
+
+export function turnEditHasInlineDiff(file: TurnEditFile): boolean {
+  return Boolean(turnEditDiffText(file));
+}
+
+/** Unified diff already on the tool payload, or a simple diff from old+new text. */
+export function turnEditDiffText(file: Pick<TurnEditFile, 'before' | 'after' | 'diff' | 'path'>): string | null {
+  const patch = file.diff?.trim() ? file.diff : '';
+  if (patch && looksLikeUnifiedDiff(patch)) return file.diff ?? patch;
+  if (file.before != null && file.after != null && file.before !== file.after) {
+    return formatSimpleDiff(file.before, file.after, file.path);
+  }
+  return null;
+}
+
+export function formatSimpleDiff(before: string, after: string, path = ''): string {
+  const a = before.split('\n');
+  const b = after.split('\n');
+  let start = 0;
+  while (start < a.length && start < b.length && a[start] === b[start]) start += 1;
+  let endA = a.length;
+  let endB = b.length;
+  while (endA > start && endB > start && a[endA - 1] === b[endB - 1]) {
+    endA -= 1;
+    endB -= 1;
+  }
+  const minusCount = Math.max(0, endA - start);
+  const plusCount = Math.max(0, endB - start);
+  const lines: string[] = [];
+  if (path.trim()) {
+    lines.push(`--- ${path.trim()}`);
+    lines.push(`+++ ${path.trim()}`);
+  }
+  lines.push(`@@ -${start + 1},${minusCount} +${start + 1},${plusCount} @@`);
+  for (let i = start; i < endA; i += 1) lines.push(`-${a[i]}`);
+  for (let i = start; i < endB; i += 1) lines.push(`+${b[i]}`);
+  return lines.join('\n');
+}
+
+export function extractEditFilesFromSteps(steps: ProcessStep[]): TurnEditFile[] {
+  const files: TurnEditFile[] = [];
+  for (const step of steps) {
+    if (step.type !== 'tool') continue;
+    if (classifyToolAction(step.name) !== 'edit') continue;
+    const tone = toolActionTone(step.status);
+    if (tone === 'failed') continue;
+    const status: TurnEditStatus = tone === 'live' ? 'live' : 'done';
+    const collected = filesFromToolStep(step);
+    for (const item of collected) {
+      upsertEditFile(files, { ...item, status });
+    }
+  }
+  return files;
+}
+
+/** This turn's 正在修改 / 已修改 files. Defaults to the latest turn in the map. */
+export function extractTurnEdits(processMap: ProcessMap, turn?: number): TurnEditFile[] {
+  const targetTurn = turn ?? latestProcessTurn(processMap);
+  if (targetTurn == null) return [];
+  const views = Object.values(processMap)
+    .filter((view) => view.turn === targetTurn)
+    .sort((a, b) => a.updatedAt - b.updatedAt);
+  const files: TurnEditFile[] = [];
+  for (const view of views) {
+    for (const file of extractEditFilesFromSteps(view.steps)) {
+      upsertEditFile(files, file);
+    }
+  }
+  return files;
+}
+
+function filesFromToolStep(step: ToolStep): CollectedEdit[] {
+  const fromInput = collectEdits(step.input, 0);
+  const parsedResult = parseMaybeJson(step.result);
+  const fromResult = collectEdits(parsedResult, 0);
+  const merged = mergeCollected(fromInput, fromResult);
+  if (merged.length === 1) {
+    const orphan = textsFromUnknown(parsedResult);
+    if (orphan) merged[0] = overlayTexts(merged[0], orphan);
+  }
+  if (merged.length > 0) return merged;
+  const fallback = pathFromUnknown(step.input) ?? pathFromToolName(step.name);
+  return fallback ? [{ path: fallback }] : [];
+}
+
+function textsFromUnknown(value: unknown): Pick<CollectedEdit, 'before' | 'after' | 'diff'> | null {
+  if (typeof value === 'string' && looksLikeUnifiedDiff(value)) return { diff: value };
+  const rec = asRecord(value);
+  if (!rec) return null;
+  const before = firstText(rec, BEFORE_KEYS);
+  const after = firstText(rec, AFTER_KEYS);
+  const diff = firstText(rec, ['diff', 'patch'] as const);
+  if (before == null && after == null && diff == null) return null;
+  const out: Pick<CollectedEdit, 'before' | 'after' | 'diff'> = {};
+  if (before != null) out.before = before;
+  if (after != null) out.after = after;
+  if (diff != null) out.diff = diff;
+  return out;
+}
+
+function overlayTexts(row: CollectedEdit, extra: Pick<CollectedEdit, 'before' | 'after' | 'diff'>): CollectedEdit {
+  return {
+    path: row.path,
+    before: row.before ?? extra.before,
+    after: row.after ?? extra.after,
+    diff: row.diff ?? extra.diff,
+  };
+}
+
+function collectEdits(value: unknown, depth: number): CollectedEdit[] {
+  if (depth > 3) return [];
+  const rec = asRecord(value);
+  if (!rec) {
+    const path = typeof value === 'string' ? normalizePath(value) : undefined;
+    return path && looksLikeFilePath(path) ? [{ path }] : [];
+  }
+
+  const fromChanges = collectFromArray(rec.changes, depth);
+  if (fromChanges.length) return fromChanges;
+
+  const fileChanges = asRecord(rec.fileChanges);
+  if (fileChanges) {
+    const rows: CollectedEdit[] = [];
+    for (const [path, row] of Object.entries(fileChanges)) {
+      rows.push(...pushChange(row, path, depth));
+    }
+    if (rows.length) return rows;
+  }
+
+  const fromLocations = collectFromArray(rec.locations, depth);
+  if (fromLocations.length) return fromLocations;
+
+  const fromFiles = collectFilesField(rec.files, depth);
+  if (fromFiles.length) return fromFiles;
+
+  if (rec.operation != null) {
+    const fromOperation = pushChange(rec.operation, undefined, depth);
+    if (fromOperation.length) return fromOperation;
+  }
+
+  const self = pushChange(rec, undefined, depth);
+  if (self.length) return self;
+
+  if (rec.item != null) {
+    const nested = collectEdits(rec.item, depth + 1);
+    if (nested.length) return nested;
+  }
+
+  const rawInput = rec.toolCall && asRecord(rec.toolCall)?.rawInput;
+  if (rawInput != null) {
+    const nested = collectEdits(rawInput, depth + 1);
+    if (nested.length) return nested;
+  }
+
+  if (rec.toolCall != null) {
+    const nested = collectEdits(rec.toolCall, depth + 1);
+    if (nested.length) return nested;
+  }
+
+  return [];
+}
+
+function collectFromArray(value: unknown, depth: number): CollectedEdit[] {
+  if (!Array.isArray(value)) return [];
+  const rows: CollectedEdit[] = [];
+  for (const item of value) {
+    rows.push(...pushChange(item, typeof item === 'string' ? item : undefined, depth));
+  }
+  return rows;
+}
+
+function collectFilesField(value: unknown, depth: number): CollectedEdit[] {
+  if (!Array.isArray(value)) return [];
+  const rows: CollectedEdit[] = [];
+  for (const item of value) {
+    if (typeof item === 'string') {
+      const path = normalizePath(item);
+      if (path) rows.push({ path });
+      continue;
+    }
+    rows.push(...pushChange(item, undefined, depth));
+  }
+  return rows;
+}
+
+function pushChange(value: unknown, fallbackPath: string | undefined, depth: number): CollectedEdit[] {
+  const rec = asRecord(value);
+  const path = (rec ? pathFromRecord(rec) : undefined)
+    ?? (fallbackPath ? normalizePath(fallbackPath) : undefined);
+  if (!path) {
+    if (rec && depth < 3) return collectEdits(value, depth + 1);
+    return [];
+  }
+  const before = rec ? firstText(rec, BEFORE_KEYS) : undefined;
+  const after = rec ? firstText(rec, AFTER_KEYS) : undefined;
+  const diff = rec ? firstText(rec, ['diff', 'patch'] as const) : undefined;
+  const row: CollectedEdit = { path };
+  if (before != null) row.before = before;
+  if (after != null) row.after = after;
+  if (diff != null) row.diff = diff;
+  return [row];
+}
+
+function mergeCollected(first: CollectedEdit[], second: CollectedEdit[]): CollectedEdit[] {
+  const out: CollectedEdit[] = [];
+  for (const item of first) upsertCollected(out, item);
+  for (const item of second) upsertCollected(out, item);
+  return out;
+}
+
+function upsertCollected(files: CollectedEdit[], next: CollectedEdit): void {
+  const index = files.findIndex((row) => sameEditPath(row.path, next.path));
+  if (index < 0) {
+    files.push(next);
+    return;
+  }
+  const prev = files[index];
+  files[index] = {
+    path: next.path || prev.path,
+    before: next.before ?? prev.before,
+    after: next.after ?? prev.after,
+    diff: next.diff ?? prev.diff,
+  };
+}
+
+function upsertEditFile(files: TurnEditFile[], next: TurnEditFile): void {
+  const index = files.findIndex((row) => sameEditPath(row.path, next.path));
+  if (index < 0) {
+    files.push(next);
+    return;
+  }
+  const prev = files[index];
+  files[index] = {
+    path: next.path || prev.path,
+    status: next.status,
+    before: next.before ?? prev.before,
+    after: next.after ?? prev.after,
+    diff: next.diff ?? prev.diff,
+  };
+}
+
+function pathFromUnknown(value: unknown): string | undefined {
+  if (typeof value === 'string') {
+    const path = normalizePath(value);
+    return path && looksLikeFilePath(path) ? path : undefined;
+  }
+  const rec = asRecord(value);
+  return rec ? pathFromRecord(rec) : undefined;
+}
+
+function pathFromRecord(rec: Record<string, unknown>): string | undefined {
+  for (const key of PATH_KEYS) {
+    const found = firstString(rec[key]);
+    const path = found ? normalizePath(found) : undefined;
+    if (path) return path;
+  }
+  return undefined;
+}
+
+function pathFromToolName(name: string): string | undefined {
+  const parts = name.trim().split(/\s+/).filter(Boolean);
+  if (parts.length < 2) return undefined;
+  const last = parts[parts.length - 1];
+  if (!last || !looksLikeFilePath(last)) return undefined;
+  return normalizePath(last);
+}
+
+function looksLikeFilePath(value: string): boolean {
+  const trimmed = value.trim();
+  if (!trimmed || /\s/.test(trimmed) && !/[/\\]/.test(trimmed)) return false;
+  return /[/\\]/.test(trimmed) || /\.[A-Za-z0-9]{1,8}$/.test(trimmed);
+}
+
+function normalizePath(raw: string): string | undefined {
+  let trimmed = raw.trim();
+  if (!trimmed) return undefined;
+  if (trimmed.startsWith('file://')) {
+    trimmed = trimmed.slice('file://'.length);
+    if (trimmed.toLowerCase().startsWith('localhost')) {
+      trimmed = trimmed.slice('localhost'.length);
+    }
+  }
+  return trimmed || undefined;
+}
+
+function normalizeEditPath(path: string): string {
+  return path.trim().replace(/\\/g, '/').replace(/\/+$/, '');
+}
+
+function looksLikeUnifiedDiff(text: string): boolean {
+  return /^(diff --git |--- |\+\+\+ |@@ )/m.test(text);
+}
+
+function parseMaybeJson(value: unknown): unknown {
+  if (typeof value !== 'string') return value;
+  const trimmed = value.trim();
+  if (!trimmed) return value;
+  const start = trimmed[0];
+  if (start !== '{' && start !== '[') return value;
+  try {
+    return JSON.parse(trimmed) as unknown;
+  } catch {
+    return value;
+  }
+}
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+  return value as Record<string, unknown>;
+}
+
+function firstText(rec: Record<string, unknown>, keys: readonly string[]): string | undefined {
+  for (const key of keys) {
+    const found = firstString(rec[key]);
+    if (found != null) return found;
+  }
+  return undefined;
+}
+
+function firstString(value: unknown): string | undefined {
+  if (typeof value === 'string' && value.trim()) return value;
+  if (!Array.isArray(value)) return undefined;
+  const parts = value.filter((item): item is string => typeof item === 'string' && Boolean(item.trim()));
+  return parts.length > 0 ? parts.join('\n') : undefined;
+}
diff --git a/src/pages/chat/chat-format.test.ts b/src/pages/chat/chat-format.test.ts
index d5d20e17..19f71ec2 100644
--- a/src/pages/chat/chat-format.test.ts
+++ b/src/pages/chat/chat-format.test.ts
@@ -20,6 +20,7 @@ import {
   resolvePiChatCurrentModel,
   sanitizeCliChatText,
   shouldFetchChatRemoteModels,
+  groupByTurn,
   thinkingChromeLabel,
 } from './chat-format';
 
@@ -143,11 +144,38 @@ describe('chat-format thinking chrome', () => {
     expect(formatDurationMs(65_000)).toBe('1m 5s');
   });
 
+  it('groups user and agent messages by turn so the outline can jump to a prompt', () => {
+    const userFirst = chatMsg({ id: 'u1', role: 'user', content: 'first', turn: 2 });
+    const agentOnly = chatMsg({
+      id: 'a2',
+      role: 'agent',
+      agentId: 'claude',
+      content: 'no user',
+      turn: 1,
+    });
+    const userLater = chatMsg({ id: 'u1b', role: 'user', content: 'overwrite', turn: 2 });
+    const agentReply = chatMsg({
+      id: 'a1',
+      role: 'agent',
+      agentId: 'claude',
+      content: 'ok',
+      turn: 2,
+    });
+    expect(groupByTurn([userFirst, agentOnly, userLater, agentReply])).toEqual([
+      { turn: 1, agents: [agentOnly] },
+      { turn: 2, user: userLater, agents: [agentReply] },
+    ]);
+    expect(groupByTurn([])).toEqual([]);
+  });
+
   it('thinkingChromeLabel matches live / thought-for / done copy', () => {
     expect(thinkingChromeLabel(false, 0, t)).toBe('思考中 · 0ms');
     expect(thinkingChromeLabel(false, 3200, t)).toBe('思考中 · 3.2s');
     expect(thinkingChromeLabel(true, 3200, t)).toBe('思考了 3.2s');
     expect(thinkingChromeLabel(true, 0, t)).toBe('思考完成');
+    const tEn = createTranslator('en');
+    expect(thinkingChromeLabel(false, 3200, tEn)).toBe('Thinking · 3.2s');
+    expect(thinkingChromeLabel(true, 3200, tEn)).toBe('Thought for 3.2s');
   });
 
   it('pins process/thinking overflow to the newest line', () => {
diff --git a/src/pages/chat/chat-grok-follow-up.test.ts b/src/pages/chat/chat-grok-follow-up.test.ts
index c726120f..7fa82cac 100644
--- a/src/pages/chat/chat-grok-follow-up.test.ts
+++ b/src/pages/chat/chat-grok-follow-up.test.ts
@@ -102,6 +102,10 @@ describe('queued follow-up items', () => {
     expect(queuedFollowUpCount(queued)).toBe(2);
     expect(queuedFollowUpCount([{ id: 'blank', text: '  ' }, { id: 'q-3', text: '第三条' }])).toBe(1);
     expect(shiftQueuedFollowUp([])).toBeNull();
+    const withImage = appendQueuedFollowUp([], '带图', 'q-img', {
+      images: [{ path: '/tmp/a.png' }],
+    });
+    expect(withImage[0]?.extras).toEqual({ images: [{ path: '/tmp/a.png' }] });
   });
 
   it('cancels one item without joining the rest', () => {
diff --git a/src/pages/chat/chat-grok-follow-up.ts b/src/pages/chat/chat-grok-follow-up.ts
index 01355e81..f07f6603 100644
--- a/src/pages/chat/chat-grok-follow-up.ts
+++ b/src/pages/chat/chat-grok-follow-up.ts
@@ -1,9 +1,15 @@
 import type { RuntimePhase } from '@/lib/backend/contracts/chat-runtime';
 import { isRuntimeActive } from './chat-runtime-model';
 
+export type QueuedFollowUpExtras = {
+  images?: { path: string }[];
+  skills?: { name: string; path: string }[];
+};
+
 export type QueuedFollowUpItem = {
   id: string;
   text: string;
+  extras?: QueuedFollowUpExtras;
 };
 
 let queuedFollowUpSeq = 0;
@@ -40,11 +46,17 @@ export function chatBusySendMode(input: {
   return 'queue';
 }
 
-export function createQueuedFollowUpItem(text: string, id?: string): QueuedFollowUpItem | null {
+export function createQueuedFollowUpItem(
+  text: string,
+  id?: string,
+  extras?: QueuedFollowUpExtras,
+): QueuedFollowUpItem | null {
   const next = text.trim();
   if (!next) return null;
   queuedFollowUpSeq += 1;
-  return { id: id ?? `queued-${queuedFollowUpSeq}`, text: next };
+  const item: QueuedFollowUpItem = { id: id ?? `queued-${queuedFollowUpSeq}`, text: next };
+  if (extras) item.extras = extras;
+  return item;
 }
 
 export function queuedFollowUpItems(queue: readonly QueuedFollowUpItem[]): QueuedFollowUpItem[] {
@@ -55,8 +67,9 @@ export function appendQueuedFollowUp(
   queue: readonly QueuedFollowUpItem[],
   prompt: string,
   id?: string,
+  extras?: QueuedFollowUpExtras,
 ): QueuedFollowUpItem[] {
-  const item = createQueuedFollowUpItem(prompt, id);
+  const item = createQueuedFollowUpItem(prompt, id, extras);
   if (!item) return [...queue];
   return [...queue, item];
 }
@@ -65,8 +78,9 @@ export function prependQueuedFollowUp(
   queue: readonly QueuedFollowUpItem[],
   prompt: string,
   id?: string,
+  extras?: QueuedFollowUpExtras,
 ): QueuedFollowUpItem[] {
-  const item = createQueuedFollowUpItem(prompt, id);
+  const item = createQueuedFollowUpItem(prompt, id, extras);
   if (!item) return [...queue];
   return [item, ...queue];
 }
diff --git a/src/pages/chat/chat-layout.test.ts b/src/pages/chat/chat-layout.test.ts
index 8825b449..600fea68 100644
--- a/src/pages/chat/chat-layout.test.ts
+++ b/src/pages/chat/chat-layout.test.ts
@@ -18,6 +18,7 @@ describe('chat layout wiring', () => {
     expect(page).not.toContain('flex min-w-0 flex-1 flex-col bg-panel');
     expect(source('ChatMessageBubble.tsx')).toContain('formatChatDisplayContent');
     expect(source('ChatTranscript.tsx')).toContain('overflow-x-hidden overflow-y-auto');
+    expect(source('ChatTranscript.tsx')).toContain('key={g.user.id}');
   });
 
   it('lets Escape stop an in-flight turn', () => {
@@ -118,6 +119,12 @@ describe('chat layout wiring', () => {
     expect(source('ChatMarkdownPreviewPanel.tsx')).toContain('pathTailLabel');
     expect(source('ChatMarkdownPreviewPanel.tsx')).toContain("label={folder}");
     expect(source('index.tsx')).toContain('pushChatPreview');
+    expect(source('index.tsx')).toContain('extractTurnEdits');
+    expect(source('index.tsx')).toContain('ChatTurnEditList');
+    expect(source('index.tsx')).toContain('ChatEditPreviewPanel');
+    expect(source('index.tsx')).toContain('openChatEditPreview');
+    expect(translate('zh', 'chat.preview.viewEdit')).toBe('查看修改');
+    expect(translate('en', 'chat.preview.viewEdit')).toBe('View edits');
   });
 
   it('opens the turn process in the same right-hand pane', () => {
@@ -303,7 +310,8 @@ describe('chat layout wiring', () => {
     expect(rail).toContain('AgentLogo');
     expect(rail).toContain('hint={false}');
     expect(rail).not.toContain('conversationAgentLine');
-    expect(rail).not.toContain('cwdShortName');
+    expect(rail).toContain('data-help="chat-workspace-group"');
+    expect(rail).toContain('aria-expanded');
     expect(rail).toContain('conversationTitle');
     expect(rail).not.toContain('isBlankConversationDraft');
     expect(rail).toContain("t('chat.rail.searchPlaceholder')");
@@ -448,6 +456,22 @@ describe('chat layout wiring', () => {
     expect(header).toContain('chat.kiro.permissionFull');
   });
 
+  it('keeps connect kind in session settings, not the header', () => {
+    const header = source('ChatSessionHeader.tsx');
+    const settings = source('ChatSettingsDialog.tsx');
+    expect(header).not.toContain('chat.connect.sessionTitle');
+    expect(header).not.toContain('data-help="chat-session-connect"');
+    expect(header).toContain('data-help="chat-settings"');
+    expect(settings).toContain('data-help="chat-session-connect"');
+    expect(settings).not.toContain('sessionChatConnectHintKey');
+    expect(settings).not.toContain('chat.settings.autoApproveVsCard');
+    expect(settings).not.toContain('chat.kiro.permissionVsCard');
+    expect(translate('zh', 'chat.connect.sessionTitle')).toBe('这次对话');
+    expect(translate('en', 'chat.connect.sessionTitle')).toBe('This chat');
+    expect(translate('zh', 'chat.settings.description')).toBe('工作目录和自动批准');
+    expect(translate('en', 'chat.settings.description')).toBe('Working folder and auto-approve');
+  });
+
   it('wires chat capability helpers and the Kiro composer placeholder', () => {
     const page = source('index.tsx');
     expect(page).toContain('kiroChatStance');
@@ -468,6 +492,7 @@ describe('chat layout wiring', () => {
     expect(page).toContain('runtimeReady: page.runtime != null');
     expect(page).toContain('legacyNewChatAction');
     expect(page).toContain('handleNewChat');
+    expect(page).toContain('onNewChat={(cwd) => void page.handleNewChat(cwd)}');
   });
 
   it('uses shared Button for chrome icons and composer chips', () => {
@@ -494,6 +519,7 @@ describe('chat layout wiring', () => {
     expect(sessions).toContain('takeChatBootstrap');
     expect(sessions).toContain('boot.cwd');
     expect(sessions).toContain('openConversationFromSession');
+    expect(sessions).toContain('handoffConversationFlight');
     expect(sessions).toContain('boot.sessionId');
   });
 
@@ -535,10 +561,39 @@ describe('chat layout wiring', () => {
     expect(source('ChatMessageBubble.tsx')).not.toContain('ChatPlanBar');
     expect(source('ChatProcessPanel.tsx')).not.toContain('formatVisibleUsage');
     expect(source('index.tsx')).toContain('ChatPlanBar');
+    expect(source('ChatPlanBar.tsx')).toContain('aria-expanded={open}');
+    expect(source('ChatPlanBar.tsx')).toContain('chat.runtime.planProgress');
+    expect(source('ChatPlanBar.tsx')).toContain('runtimePlanStatusKey');
+    expect(translate('zh', 'chat.runtime.planStatusLive')).toBe('进行中');
+    expect(translate('zh', 'chat.runtime.planCollapse')).toBe('收起计划');
+    expect(source('use-chat-page-send.ts')).toContain('recordSnapshotPollFailure');
+    expect(source('index.tsx')).toContain('chat.runtime.snapshotStale');
     expect(source('index.tsx')).toContain('ChatHostTerminals');
     expect(source('ChatHostTerminals.tsx')).toContain('chat.runtime.stopCommand');
     expect(source('ChatHostTerminals.tsx')).not.toContain('xterm');
     expect(translate('zh', 'chat.process.usageTurn')).toBe('当前轮');
     expect(translate('zh', 'chat.process.usageSession')).toBe('累计');
   });
+
+  it('stacks the chat outline on the transcript, not the session rail', () => {
+    expect(source('ChatTranscript.tsx')).toContain('ChatOutlineRail');
+    expect(source('ChatTranscript.tsx')).toContain('relative flex min-h-0 flex-1 flex-col');
+    expect(source('ChatTranscript.tsx')).toContain('onJumpToOutline');
+    expect(source('ChatTranscript.tsx')).toContain('measuredWidth={outlinePanel.width}');
+    expect(source('ChatTranscript.tsx')).toContain('enabled={outlineOn}');
+    expect(source('ChatTranscript.tsx')).toContain('useOutlinePanelWidth');
+    expect(source('ChatTranscript.tsx')).toContain('onJumpToPrompt={onJumpToOutline}');
+    expect(source('ChatOutlineRail.tsx')).toContain('data-chat-outline-measure');
+    expect(source('ChatOutlineRail.tsx')).toContain('outlinePanelWidthReady');
+    expect(source('ChatOutlineRail.tsx')).toContain('if (!isEnabled) return null');
+    expect(source('ChatOutlineRail.tsx')).not.toContain('prompts.length < 2) return null');
+    expect(source('ChatOutlineRail.tsx')).toContain('onJumpToPrompt={onJumpToPrompt}');
+    expect(source('use-chat-outline.ts')).toContain('outlinePanelWidthReady');
+    expect(source('ChatSessionRail.tsx')).not.toContain('ChatOutlineRail');
+    expect(source('index.tsx')).toContain('onJumpToOutline={page.jumpToOutlinePrompt}');
+    expect(source('index.tsx')).toContain('data-chat-stage');
+    expect(source('use-chat-page.ts')).toContain('jumpToOutlinePrompt');
+    expect(source('use-chat-page.ts')).toContain('stickToBottomRef.current = false');
+    expect(source('use-chat-page.ts')).toContain("scrollIntoView({ block: 'start' })");
+  });
 });
diff --git a/src/pages/chat/chat-model.test.ts b/src/pages/chat/chat-model.test.ts
index d18181ad..208bd3e9 100644
--- a/src/pages/chat/chat-model.test.ts
+++ b/src/pages/chat/chat-model.test.ts
@@ -61,7 +61,9 @@ import {
   isBlankConversationDraft,
   draftForFocusedConversation,
   filterConversations,
-  groupConversationsByDay,
+  conversationWorkspaceKey,
+  groupConversationsByWorkspace,
+  UNSET_WORKSPACE_KEY,
   isChatAgentSelectable,
   liveSendingIds,
   incomingSendingIds,
@@ -353,6 +355,20 @@ describe('cwdShortName', () => {
     expect(cwdShortName('/', t)).toBe('/');
     expect(cwdShortName('///', t)).toBe('/');
   });
+
+  it('uses the folder name when the path ends with a current-dir segment', () => {
+    expect(cwdShortName('D:\\projects\\demo\\.', t)).toBe('demo');
+    expect(cwdShortName('/home/user/proj/.', t)).toBe('proj');
+    expect(cwdShortName('C:\\.', t)).toBe('C:');
+  });
+
+  it('does not show a lone dot as the workspace name', () => {
+    expect(cwdShortName('.', t)).toBe('未设目录');
+    expect(cwdShortName('./', t)).toBe('未设目录');
+    expect(cwdShortName('.\\', t)).toBe('未设目录');
+    expect(cwdShortName('..', t)).toBe('未设目录');
+    expect(cwdShortName('../', t)).toBe('未设目录');
+  });
 });
 
 describe('filterConversations', () => {
@@ -375,41 +391,105 @@ describe('filterConversations', () => {
   });
 });
 
-describe('groupConversationsByDay', () => {
-  // 本地时区 2026-08-16 15:00
-  const now = new Date(2026, 7, 16, 15, 0, 0, 0).getTime();
-
-  function at(y: number, m: number, d: number, h = 12): string {
-    return new Date(y, m, d, h, 0, 0, 0).toISOString();
+describe('groupConversationsByWorkspace', () => {
+  function at(day: number, hour = 12): string {
+    return new Date(Date.UTC(2026, 7, day, hour, 0, 0)).toISOString();
   }
 
-  it('buckets across local-day boundaries and drops empty groups', () => {
-    const today = conv({ id: 't', title: 'today', updatedAt: at(2026, 7, 16, 1) });
-    const yesterday = conv({ id: 'y', title: 'yest', updatedAt: at(2026, 7, 15, 23) });
-    const week = conv({ id: 'w', title: 'week', updatedAt: at(2026, 7, 11, 8) });
-    const earlier = conv({ id: 'e', title: 'old', updatedAt: at(2026, 7, 9, 8) });
-    const groups = groupConversationsByDay([today, yesterday, week, earlier], now, t);
+  it('merges the same working directory across Windows case and slash variants', () => {
+    const newer = conv({
+      id: 'a',
+      cwd: 'D:\\projects\\Demo',
+      updatedAt: at(16, 15),
+    });
+    const older = conv({
+      id: 'b',
+      cwd: 'd:/projects/demo/',
+      updatedAt: at(15, 10),
+    });
+    const groups = groupConversationsByWorkspace([older, newer], t);
+    expect(groups).toHaveLength(1);
+    expect(groups[0].key).toBe(conversationWorkspaceKey('D:\\projects\\Demo'));
+    expect(groups[0].label).toBe('Demo');
+    expect(groups[0].cwd).toBe('D:\\projects\\Demo');
+    expect(groups[0].items.map((c) => c.id)).toEqual(['a', 'b']);
+  });
+
+  it('keeps POSIX paths with different case in separate groups', () => {
+    const upper = conv({ id: 'A', cwd: '/tmp/App', updatedAt: at(16) });
+    const lower = conv({ id: 'B', cwd: '/tmp/app', updatedAt: at(15) });
+    const groups = groupConversationsByWorkspace([upper, lower], t);
+    expect(groups.map((g) => g.cwd)).toEqual(['/tmp/App', '/tmp/app']);
+    expect(groups[0].key).not.toBe(groups[1].key);
+  });
+
+  it('puts sessions without a working directory in one unset group', () => {
+    const withDir = conv({ id: 'dir', cwd: '/tmp/app', updatedAt: at(16) });
+    const empty = conv({ id: 'empty', cwd: '   ', updatedAt: at(15) });
+    const missing = conv({ id: 'missing', cwd: null, updatedAt: at(14) });
+    const groups = groupConversationsByWorkspace([withDir, empty, missing], t);
+    expect(groups.map((g) => g.key)).toEqual([
+      conversationWorkspaceKey('/tmp/app'),
+      UNSET_WORKSPACE_KEY,
+    ]);
+    expect(groups[1].label).toBe('未设置工作目录');
+    expect(groups[1].cwd).toBeNull();
+    expect(groups[1].items.map((c) => c.id)).toEqual(['empty', 'missing']);
+    expect(groups[0].items.map((c) => c.id)).toEqual(['dir']);
+  });
+
+  it('sorts groups and items by updated time, newest first', () => {
+    const olderApp = conv({ id: 'old-app', cwd: '/tmp/app', updatedAt: at(10) });
+    const newerApp = conv({ id: 'new-app', cwd: '/tmp/app', updatedAt: at(16) });
+    const other = conv({ id: 'other', cwd: '/tmp/other', updatedAt: at(12) });
+    const groups = groupConversationsByWorkspace([olderApp, other, newerApp], t);
+    expect(groups.map((g) => g.cwd)).toEqual(['/tmp/app', '/tmp/other']);
+    expect(groups[0].items.map((c) => c.id)).toEqual(['new-app', 'old-app']);
+  });
 
-    expect(groups.map((g) => g.key)).toEqual(['today', 'yesterday', 'week', 'earlier']);
-    expect(groups.map((g) => g.label)).toEqual(['今天', '昨天', '近 7 天', '更早']);
-    expect(groups.map((g) => g.items.map((c) => c.id))).toEqual([['t'], ['y'], ['w'], ['e']]);
+  it('keeps colliding folder names as the short label; full path stays on cwd', () => {
+    const alice = conv({ id: 'alice', cwd: '/home/alice/app', updatedAt: at(16) });
+    const bob = conv({ id: 'bob', cwd: '/home/bob/app', updatedAt: at(15) });
+    const groups = groupConversationsByWorkspace([alice, bob], t);
+    expect(groups.map((g) => g.label)).toEqual(['app', 'app']);
+    expect(groups.map((g) => g.cwd)).toEqual(['/home/alice/app', '/home/bob/app']);
   });
 
-  it('keeps input order inside a group and omits empty buckets', () => {
-    const a = conv({ id: 'a', updatedAt: at(2026, 7, 16, 14) });
-    const b = conv({ id: 'b', updatedAt: at(2026, 7, 16, 10) });
-    const groups = groupConversationsByDay([a, b], now, t);
+  it('merges a trailing current-dir segment into the same folder group', () => {
+    const dotted = conv({ id: 'dot', cwd: 'D:\\projects\\Demo\\.', updatedAt: at(16) });
+    const plain = conv({ id: 'plain', cwd: 'D:\\projects\\Demo', updatedAt: at(15) });
+    const groups = groupConversationsByWorkspace([dotted, plain], t);
     expect(groups).toHaveLength(1);
-    expect(groups[0].key).toBe('today');
-    expect(groups[0].items.map((c) => c.id)).toEqual(['a', 'b']);
+    expect(groups[0].label).toBe('Demo');
+    expect(groups[0].items.map((c) => c.id)).toEqual(['dot', 'plain']);
+  });
+
+  it('returns no groups for an empty list and uses id when updated times match', () => {
+    expect(groupConversationsByWorkspace([], t)).toEqual([]);
+    const a = conv({ id: 'b-row', cwd: '/tmp/a', updatedAt: at(10) });
+    const b = conv({ id: 'a-row', cwd: '/tmp/a', updatedAt: at(10) });
+    const groups = groupConversationsByWorkspace([a, b], t);
+    expect(groups).toHaveLength(1);
+    expect(groups[0].items.map((c) => c.id)).toEqual(['a-row', 'b-row']);
   });
 
-  it('puts today-minus-6 in week and today-minus-7 in earlier', () => {
-    const sixDays = conv({ id: 's', updatedAt: at(2026, 7, 10, 12) });
-    const sevenDays = conv({ id: 'v', updatedAt: at(2026, 7, 9, 12) });
-    const groups = groupConversationsByDay([sixDays, sevenDays], now, t);
-    expect(groups.find((g) => g.key === 'week')?.items.map((c) => c.id)).toEqual(['s']);
-    expect(groups.find((g) => g.key === 'earlier')?.items.map((c) => c.id)).toEqual(['v']);
+  it('does not merge a Windows folder with a POSIX folder of the same name', () => {
+    const win = conv({ id: 'win', cwd: 'D:\\tmp\\app', updatedAt: at(16) });
+    const posix = conv({ id: 'posix', cwd: '/tmp/app', updatedAt: at(15) });
+    const groups = groupConversationsByWorkspace([win, posix], t);
+    expect(groups).toHaveLength(2);
+    expect(groups.map((g) => g.cwd)).toEqual(['D:\\tmp\\app', '/tmp/app']);
+    expect(groups.map((g) => g.label)).toEqual(['app', 'app']);
+  });
+});
+
+describe('conversationWorkspaceKey', () => {
+  it('uses one unset key for missing or blank working directories', () => {
+    expect(conversationWorkspaceKey(null)).toBe(UNSET_WORKSPACE_KEY);
+    expect(conversationWorkspaceKey(undefined)).toBe(UNSET_WORKSPACE_KEY);
+    expect(conversationWorkspaceKey('')).toBe(UNSET_WORKSPACE_KEY);
+    expect(conversationWorkspaceKey('   ')).toBe(UNSET_WORKSPACE_KEY);
+    expect(conversationWorkspaceKey('/tmp/app')).toMatch(/^path:/);
   });
 });
 
@@ -598,6 +678,26 @@ describe('newConversationDefaults', () => {
       cwd: '/tmp/app',
     });
   });
+
+  it('places a new session in the current workspace group', () => {
+    const active = conv({
+      id: 'a',
+      agentIds: ['claude'],
+      cwd: '/tmp/app',
+      updatedAt: '2026-08-16T10:00:00.000Z',
+    });
+    const defaults = newConversationDefaults(active, agents);
+    const created = conv({
+      id: 'new',
+      agentIds: defaults.agentIds,
+      cwd: defaults.cwd,
+      updatedAt: '2026-08-16T12:00:00.000Z',
+    });
+    const groups = groupConversationsByWorkspace([created, active], t);
+    expect(defaults.cwd).toBe('/tmp/app');
+    expect(groups).toHaveLength(1);
+    expect(groups[0].items.map((c) => c.id)).toEqual(['new', 'a']);
+  });
 });
 
 describe('selectConversationAgent', () => {
diff --git a/src/pages/chat/chat-model.ts b/src/pages/chat/chat-model.ts
index 942091b6..2e492bf9 100644
--- a/src/pages/chat/chat-model.ts
+++ b/src/pages/chat/chat-model.ts
@@ -11,6 +11,7 @@ import type {
 } from '@/lib/backend/contracts/ticket';
 import type { TranslateFn } from '@/lib/i18n';
 import { processPhaseLabel, type AgentProcessView } from '@/lib/chat-process';
+import { folderNameFromCwd } from '@/lib/open-chat-cwd';
 import { nativeResumeCommand } from '@/lib/session-resume';
 import {
   activeBindingForAgent,
@@ -23,6 +24,7 @@ import type {
   ChatMessageStatus,
   Conversation,
 } from '@/lib/types';
+import { normalizeProjectMergePath } from '@/pages/projects/project-groups';
 import { relativeTime, type TurnGroup } from './chat-format';
 import { streamingStatusKey } from './chat-streaming';
 
@@ -166,21 +168,16 @@ export function chatAgentPickerEmptyCopy(t: TranslateFn, kind: ChatPickerEmptyKi
   return { text: t('chat.picker.none'), action: t('chat.picker.goAgents') };
 }
 
-export type ConversationDayKey = 'today' | 'yesterday' | 'week' | 'earlier';
+/** Conversations without a working directory share this rail group. */
+export const UNSET_WORKSPACE_KEY = 'unset';
 
-export type ConversationDayGroup = {
-  key: ConversationDayKey;
+export type ConversationWorkspaceGroup = {
+  key: string;
   label: string;
+  cwd: string | null;
   items: Conversation[];
 };
 
-const DAY_KEYS: Record<ConversationDayKey, 'chat.day.today' | 'chat.day.yesterday' | 'chat.day.week' | 'chat.day.earlier'> = {
-  today: 'chat.day.today',
-  yesterday: 'chat.day.yesterday',
-  week: 'chat.day.week',
-  earlier: 'chat.day.earlier',
-};
-
 const RETRY_STATUSES = new Set<ChatMessageStatus>(['failed', 'cancelled', 'timeout']);
 
 /** Interactive TUI resume command for a Hub conversation, when a native id is known. */
@@ -207,13 +204,14 @@ export function cwdShortName(cwd: string | null | undefined, t: TranslateFn): st
   if (cwd == null) return t('chat.cwd.unset');
   const trimmed = cwd.trim();
   if (!trimmed) return t('chat.cwd.unset');
+  const name = folderNameFromCwd(trimmed);
+  if (name && name !== '.' && name !== '..') return name;
   const stripped = trimmed.replace(/[\\/]+$/, '');
   if (!stripped) {
     // POSIX 根 `/`（或 `///`）去尾分隔后为空，仍应显示 `/`
     return trimmed.includes('/') ? '/' : t('chat.cwd.unset');
   }
-  const parts = stripped.split(/[\\/]/);
-  return parts[parts.length - 1] || t('chat.cwd.unset');
+  return t('chat.cwd.unset');
 }
 
 export function filterConversations(convs: Conversation[], query: string): Conversation[] {
@@ -226,51 +224,61 @@ export function filterConversations(convs: Conversation[], query: string): Conve
   });
 }
 
-function startOfLocalDay(ms: number): Date {
-  const d = new Date(ms);
-  d.setHours(0, 0, 0, 0);
-  return d;
-}
-
 function parseUpdatedAt(iso: string): number {
   const t = Date.parse(iso.includes('T') ? iso : `${iso.replace(' ', 'T')}Z`);
   return Number.isNaN(t) ? 0 : t;
 }
 
-export function groupConversationsByDay(
+function trimmedConversationCwd(cwd: string | null | undefined): string | null {
+  const trimmed = cwd?.trim();
+  return trimmed ? trimmed : null;
+}
+
+/** Same merge key as history-page path groups: Windows case-insensitive, POSIX not. */
+export function conversationWorkspaceKey(cwd: string | null | undefined): string {
+  const trimmed = trimmedConversationCwd(cwd);
+  if (!trimmed) return UNSET_WORKSPACE_KEY;
+  return `path:${normalizeProjectMergePath(trimmed)}`;
+}
+
+function compareConversationsByUpdatedAt(a: Conversation, b: Conversation): number {
+  return parseUpdatedAt(b.updatedAt) - parseUpdatedAt(a.updatedAt) || a.id.localeCompare(b.id);
+}
+
+/**
+ * Group Hub conversations by working directory. Sessions without a folder stay
+ * in one unset group and never mix with path groups.
+ */
+export function groupConversationsByWorkspace(
   convs: Conversation[],
-  nowMs: number,
   t: TranslateFn,
-): ConversationDayGroup[] {
-  const today = startOfLocalDay(nowMs);
-  const yesterday = new Date(today);
-  yesterday.setDate(yesterday.getDate() - 1);
-  const week = new Date(today);
-  week.setDate(week.getDate() - 6);
-
-  const todayStart = today.getTime();
-  const yesterdayStart = yesterday.getTime();
-  const weekStart = week.getTime();
-
-  const buckets: Record<ConversationDayKey, Conversation[]> = {
-    today: [],
-    yesterday: [],
-    week: [],
-    earlier: [],
-  };
+): ConversationWorkspaceGroup[] {
+  const buckets = new Map<string, Conversation[]>();
+  for (const conversation of convs) {
+    const key = conversationWorkspaceKey(conversation.cwd);
+    const list = buckets.get(key);
+    if (list) list.push(conversation);
+    else buckets.set(key, [conversation]);
+  }
 
-  for (const c of convs) {
-    const ts = parseUpdatedAt(c.updatedAt);
-    if (ts >= todayStart) buckets.today.push(c);
-    else if (ts >= yesterdayStart) buckets.yesterday.push(c);
-    else if (ts >= weekStart) buckets.week.push(c);
-    else buckets.earlier.push(c);
+  const groups: ConversationWorkspaceGroup[] = [];
+  for (const [key, items] of buckets) {
+    const sortedItems = [...items].sort(compareConversationsByUpdatedAt);
+    const primary = sortedItems[0];
+    const cwd = trimmedConversationCwd(primary?.cwd);
+    groups.push({
+      key,
+      label: key === UNSET_WORKSPACE_KEY ? t('chat.header.cwdUnset') : cwdShortName(cwd, t),
+      cwd,
+      items: sortedItems,
+    });
   }
 
-  const order: ConversationDayKey[] = ['today', 'yesterday', 'week', 'earlier'];
-  return order
-    .filter((key) => buckets[key].length > 0)
-    .map((key) => ({ key, label: t(DAY_KEYS[key]), items: buckets[key] }));
+  return groups.sort((a, b) => {
+    const aTs = parseUpdatedAt(a.items[0]?.updatedAt ?? '');
+    const bTs = parseUpdatedAt(b.items[0]?.updatedAt ?? '');
+    return bTs - aTs || a.label.localeCompare(b.label) || a.key.localeCompare(b.key);
+  });
 }
 
 export function sendBlockers(input: {
diff --git a/src/pages/chat/chat-outline-hover.test.ts b/src/pages/chat/chat-outline-hover.test.ts
new file mode 100644
index 00000000..008f5da6
--- /dev/null
+++ b/src/pages/chat/chat-outline-hover.test.ts
@@ -0,0 +1,148 @@
+import { describe, expect, it } from 'vitest';
+import { createChatOutlineHoverIntent } from './chat-outline-hover';
+
+function createFakeScheduler() {
+  const callbacks = new Map<number, () => void>();
+  const delays: number[] = [];
+  let nextId = 1;
+  return {
+    schedule(callback: () => void, delayMs: number) {
+      const id = nextId++;
+      callbacks.set(id, callback);
+      delays.push(delayMs);
+      return id;
+    },
+    cancel(id: number) {
+      callbacks.delete(id);
+    },
+    runPending() {
+      for (const [id, callback] of callbacks) {
+        callbacks.delete(id);
+        callback();
+      }
+    },
+    scheduleCount() {
+      return delays.length;
+    },
+    delays() {
+      return delays;
+    },
+  };
+}
+
+describe('chat outline hover intent', () => {
+  it('counts movement across the rail toward one initial activation', () => {
+    const scheduler = createFakeScheduler();
+    const activations: Array<number | null> = [];
+    const intent = createChatOutlineHoverIntent({
+      activate: (index) => activations.push(index),
+      schedule: scheduler.schedule,
+      cancel: scheduler.cancel,
+    });
+
+    intent.enter({ x: 20, y: 10 });
+    intent.pointAt(1);
+    intent.move({ x: 20, y: 30 });
+    intent.pointAt(2);
+    intent.move({ x: 20, y: 50 });
+    intent.pointAt(3);
+    scheduler.runPending();
+
+    expect({
+      activations,
+      scheduleCount: scheduler.scheduleCount(),
+      delays: scheduler.delays(),
+    }).toEqual({
+      activations: [3],
+      scheduleCount: 1,
+      delays: [150],
+    });
+  });
+
+  it('does not activate while the pointer is crossing horizontally through the rail', () => {
+    const scheduler = createFakeScheduler();
+    const activations: Array<number | null> = [];
+    const intent = createChatOutlineHoverIntent({
+      activate: (index) => activations.push(index),
+      schedule: scheduler.schedule,
+      cancel: scheduler.cancel,
+    });
+
+    intent.enter({ x: 36, y: 20 });
+    intent.pointAt(1);
+    intent.move({ x: 30, y: 20 });
+    intent.move({ x: 24, y: 20 });
+    intent.move({ x: 18, y: 20 });
+    intent.leave();
+    intent.enter({ x: 0, y: 20 });
+    intent.pointAt(2);
+    intent.move({ x: 6, y: 20 });
+    intent.move({ x: 12, y: 20 });
+    intent.leave();
+    scheduler.runPending();
+
+    expect({ activations, scheduleCount: scheduler.scheduleCount() }).toEqual({
+      activations: [null, null],
+      scheduleCount: 7,
+    });
+  });
+
+  it('moves immediately between ticks after the rail activates', () => {
+    const scheduler = createFakeScheduler();
+    const activations: Array<number | null> = [];
+    const intent = createChatOutlineHoverIntent({
+      activate: (index) => activations.push(index),
+      schedule: scheduler.schedule,
+      cancel: scheduler.cancel,
+    });
+
+    intent.pointAt(1);
+    scheduler.runPending();
+    intent.pointAt(5);
+
+    expect(activations).toEqual([1, 5]);
+  });
+
+  it('resets activation when the pointer leaves the rail', () => {
+    const scheduler = createFakeScheduler();
+    const activations: Array<number | null> = [];
+    const intent = createChatOutlineHoverIntent({
+      activate: (index) => activations.push(index),
+      schedule: scheduler.schedule,
+      cancel: scheduler.cancel,
+    });
+
+    intent.pointAt(1);
+    scheduler.runPending();
+    intent.leave();
+    intent.pointAt(2);
+
+    expect({ activations, scheduleCount: scheduler.scheduleCount() }).toEqual({
+      activations: [1, null],
+      scheduleCount: 2,
+    });
+  });
+
+  it('does not activate a pending tick after dispose, and move without enter is idle', () => {
+    const scheduler = createFakeScheduler();
+    const activations: Array<number | null> = [];
+    const intent = createChatOutlineHoverIntent({
+      activate: (index) => activations.push(index),
+      schedule: scheduler.schedule,
+      cancel: scheduler.cancel,
+    });
+
+    intent.pointAt(1);
+    intent.move({ x: 40, y: 20 });
+    intent.dispose();
+    scheduler.runPending();
+    expect(activations).toEqual([]);
+
+    intent.enter({ x: 10, y: 10 });
+    intent.pointAt(2);
+    intent.move({ x: 11, y: 10 });
+    expect(scheduler.scheduleCount()).toBe(2);
+    scheduler.runPending();
+    expect(activations).toEqual([2]);
+  });
+});
diff --git a/src/pages/chat/chat-outline-hover.ts b/src/pages/chat/chat-outline-hover.ts
new file mode 100644
index 00000000..0b03690a
--- /dev/null
+++ b/src/pages/chat/chat-outline-hover.ts
@@ -0,0 +1,82 @@
+export interface ChatOutlineHoverIntent {
+  enter(point: PointerPoint): void;
+  pointAt(index: number): void;
+  move(point: PointerPoint): void;
+  leave(): void;
+  dispose(): void;
+}
+
+interface PointerPoint {
+  x: number;
+  y: number;
+}
+
+const INITIAL_ACTIVATION_DELAY_MS = 150;
+const HORIZONTAL_TRANSIT_DISTANCE_PX = 4;
+
+export function createChatOutlineHoverIntent(input: {
+  activate: (index: number | null) => void;
+  schedule: (callback: () => void, delayMs: number) => number;
+  cancel: (timerId: number) => void;
+}): ChatOutlineHoverIntent {
+  let timerId: number | null = null;
+  let candidateIndex: number | null = null;
+  let motionAnchor: PointerPoint | null = null;
+  let active = false;
+
+  function cancelTimer(): void {
+    if (timerId === null) return;
+    input.cancel(timerId);
+    timerId = null;
+  }
+
+  function scheduleActivation(): void {
+    if (candidateIndex === null) return;
+    cancelTimer();
+    timerId = input.schedule(() => {
+      timerId = null;
+      active = true;
+      if (candidateIndex !== null) input.activate(candidateIndex);
+    }, INITIAL_ACTIVATION_DELAY_MS);
+  }
+
+  return {
+    enter(point) {
+      motionAnchor = point;
+    },
+    pointAt(index) {
+      candidateIndex = index;
+      if (active) {
+        input.activate(index);
+        return;
+      }
+      if (timerId !== null) return;
+      scheduleActivation();
+    },
+    move(point) {
+      if (active || motionAnchor === null) return;
+      const deltaX = point.x - motionAnchor.x;
+      const deltaY = point.y - motionAnchor.y;
+      if (Math.abs(deltaY) >= Math.abs(deltaX)) {
+        motionAnchor = point;
+        return;
+      }
+      if (Math.abs(deltaX) < HORIZONTAL_TRANSIT_DISTANCE_PX) return;
+      motionAnchor = point;
+      scheduleActivation();
+    },
+    leave() {
+      cancelTimer();
+      candidateIndex = null;
+      motionAnchor = null;
+      active = false;
+      input.activate(null);
+    },
+    dispose() {
+      cancelTimer();
+      candidateIndex = null;
+      motionAnchor = null;
+      active = false;
+    },
+  };
+}
diff --git a/src/pages/chat/chat-outline-model.test.ts b/src/pages/chat/chat-outline-model.test.ts
new file mode 100644
index 00000000..7dd85d0a
--- /dev/null
+++ b/src/pages/chat/chat-outline-model.test.ts
@@ -0,0 +1,198 @@
+import { describe, expect, it } from 'vitest';
+import type { ChatMessage } from '@/lib/types';
+import type { TurnGroup } from './chat-format';
+import {
+  OUTLINE_MAGNIFY_RADIUS,
+  OUTLINE_MIN_PANEL_WIDTH_PX,
+  OUTLINE_MIN_PROMPTS,
+  applyOutlineJumpOffset,
+  outlinePanelElement,
+  outlinePanelWidthReady,
+  outlinePromptPreview,
+  outlinePromptsFromTurns,
+  outlineTickSize,
+  planOutlineJumpScroll,
+  promptTickMagnification,
+  readOutlinePanelWidth,
+  resolveActivePromptId,
+  shouldShowChatOutline,
+  type ChatOutlinePrompt,
+} from './chat-outline-model';
+
+function user(id: string, content: string): ChatMessage {
+  return {
+    id,
+    conversationId: 'c1',
+    turn: 1,
+    role: 'user',
+    content,
+    status: 'ok',
+    durationMs: 0,
+    createdAt: '2026-09-20T00:00:00.000Z',
+  };
+}
+
+function prompt(id: string): ChatOutlinePrompt {
+  return { id, preview: id };
+}
+
+describe('promptTickMagnification', () => {
+  it('peaks under the pointer and decays to nothing at the radius', () => {
+    expect(promptTickMagnification(0)).toBe(1);
+    expect(promptTickMagnification(OUTLINE_MAGNIFY_RADIUS)).toBe(0);
+    expect(promptTickMagnification(OUTLINE_MAGNIFY_RADIUS + 10)).toBe(0);
+  });
+
+  it('falls off monotonically and symmetrically around the pointer', () => {
+    const above = [0, 1, 2, 3].map((distance) => promptTickMagnification(distance));
+    const below = [0, -1, -2, -3].map((distance) => promptTickMagnification(distance));
+
+    expect(above).toEqual(below);
+    expect(above).toEqual([...above].sort((left, right) => right - left));
+  });
+
+  it('treats non-finite distances as outside the bulge', () => {
+    expect(promptTickMagnification(Number.NaN)).toBe(0);
+    expect(promptTickMagnification(Number.POSITIVE_INFINITY)).toBe(0);
+  });
+});
+
+describe('outlinePromptPreview', () => {
+  it('collapses whitespace and clips at 120 characters', () => {
+    expect(outlinePromptPreview('  hello   \n  world  ')).toBe('hello world');
+    expect(outlinePromptPreview('a'.repeat(120))).toBe('a'.repeat(120));
+    expect(outlinePromptPreview('a'.repeat(121))).toBe(`${'a'.repeat(120)}…`);
+    expect(outlinePromptPreview('   \n\t  ')).toBe('');
+  });
+
+  it('honors a custom clip limit', () => {
+    expect(outlinePromptPreview('abcdefghij', 6)).toBe('abcdef…');
+    expect(outlinePromptPreview('short', 6)).toBe('short');
+  });
+});
+
+describe('outlinePromptsFromTurns', () => {
+  it('keeps user messages in turn order and skips agent-only turns', () => {
+    const turns: TurnGroup[] = [
+      { turn: 1, user: user('u1', 'first'), agents: [] },
+      { turn: 2, agents: [] },
+      { turn: 3, user: user('u2', 'second  line'), agents: [] },
+    ];
+    expect(outlinePromptsFromTurns(turns)).toEqual([
+      { id: 'u1', preview: 'first' },
+      { id: 'u2', preview: 'second line' },
+    ]);
+  });
+
+  it('returns nothing when every turn is agent-only or empty', () => {
+    expect(outlinePromptsFromTurns([])).toEqual([]);
+    expect(outlinePromptsFromTurns([{ turn: 1, agents: [] }])).toEqual([]);
+  });
+});
+
+describe('shouldShowChatOutline', () => {
+  it('locks the gates at preference on, two user prompts, and 720px', () => {
+    expect(OUTLINE_MIN_PROMPTS).toBe(2);
+    expect(OUTLINE_MIN_PANEL_WIDTH_PX).toBe(720);
+  });
+
+  it('shows only when preference, prompt count, and panel width all hold', () => {
+    const shown = { enabled: true, promptCount: 2, panelWidth: 720 };
+    expect(shouldShowChatOutline(shown)).toBe(true);
+    expect(shouldShowChatOutline({ ...shown, promptCount: 3, panelWidth: 721 })).toBe(true);
+
+    expect(shouldShowChatOutline({ ...shown, enabled: false })).toBe(false);
+    expect(shouldShowChatOutline({ ...shown, promptCount: 0 })).toBe(false);
+    expect(shouldShowChatOutline({ ...shown, promptCount: 1 })).toBe(false);
+    expect(shouldShowChatOutline({ ...shown, panelWidth: 0 })).toBe(false);
+    expect(shouldShowChatOutline({ ...shown, panelWidth: 719 })).toBe(false);
+
+    expect(shouldShowChatOutline({ enabled: false, promptCount: 1, panelWidth: 719 })).toBe(false);
+    expect(shouldShowChatOutline({ enabled: true, promptCount: 5, panelWidth: 719 })).toBe(false);
+    expect(shouldShowChatOutline({ enabled: false, promptCount: 5, panelWidth: 900 })).toBe(false);
+    expect(shouldShowChatOutline({ enabled: true, promptCount: 2, panelWidth: 0 })).toBe(false);
+  });
+
+  it('does not treat a zero-width empty host as a measured panel', () => {
+    expect(outlinePanelWidthReady(0)).toBe(false);
+    expect(outlinePanelWidthReady(Number.NaN)).toBe(false);
+    expect(outlinePanelWidthReady(undefined)).toBe(false);
+    expect(outlinePanelWidthReady(720)).toBe(true);
+  });
+});
+
+describe('outline panel measurement', () => {
+  it('prefers the chat stage ancestor over the inner host', () => {
+    const stage = { id: 'stage' };
+    const host = {
+      closest: (selector: string) => (selector === '[data-chat-stage]' ? stage : null),
+    };
+    expect(outlinePanelElement(host as unknown as Element)).toBe(stage);
+  });
+
+  it('falls back to the host when no stage ancestor exists', () => {
+    const host = { closest: () => null };
+    expect(outlinePanelElement(host as unknown as Element)).toBe(host);
+    expect(outlinePanelElement(null)).toBeNull();
+  });
+
+  it('reads the stage width used for the mount gate', () => {
+    const stage = {
+      closest: () => stage,
+      getBoundingClientRect: () => ({ width: 1100 }),
+    };
+    expect(readOutlinePanelWidth(stage as unknown as Element)).toBe(1100);
+    expect(readOutlinePanelWidth(null)).toBe(0);
+  });
+});
+
+describe('outlineTickSize', () => {
+  it('grows from the resting or current width toward the magnified size', () => {
+    expect(outlineTickSize(false, 0)).toEqual({ width: 10, height: 2 });
+    expect(outlineTickSize(true, 0)).toEqual({ width: 18, height: 2 });
+    expect(outlineTickSize(false, 1)).toEqual({ width: 26, height: 4 });
+    expect(outlineTickSize(true, 1)).toEqual({ width: 26, height: 4 });
+    expect(outlineTickSize(false, 0.5)).toEqual({ width: 18, height: 3 });
+    expect(outlineTickSize(true, 0.5)).toEqual({ width: 22, height: 3 });
+  });
+});
+
+describe('resolveActivePromptId', () => {
+  const prompts = [prompt('a'), prompt('b'), prompt('c')];
+
+  it('marks the last prompt whose top sits on or above the reading line', () => {
+    expect(resolveActivePromptId(prompts, [100, 200, 300], 200)).toBe('b');
+    expect(resolveActivePromptId(prompts, [100, 200, 300], 300)).toBe('c');
+    expect(resolveActivePromptId(prompts, [100, 200, 300], 400)).toBe('c');
+  });
+
+  it('marks nothing above the first prompt', () => {
+    expect(resolveActivePromptId(prompts, [100, 200, 300], 50)).toBeNull();
+    expect(resolveActivePromptId([], [], 100)).toBeNull();
+  });
+
+  it('skips missing or non-finite tops and keeps the last valid mark', () => {
+    expect(resolveActivePromptId(prompts, [100, Number.NaN, 300], 300)).toBe('c');
+    expect(resolveActivePromptId(prompts, [undefined as unknown as number, 200], 200)).toBe('b');
+    expect(resolveActivePromptId(prompts, [Number.POSITIVE_INFINITY, 200, 50], 80)).toBe('c');
+  });
+});
+
+describe('outline jump scroll', () => {
+  it('places the target 8px below the container top', () => {
+    expect(planOutlineJumpScroll(80, 40, 200)).toBe(152);
+    expect(planOutlineJumpScroll(80, 40, 200, 0)).toBe(160);
+  });
+
+  it('writes that offset onto the container after a start-aligned jump', () => {
+    const container = {
+      scrollTop: 120,
+      getBoundingClientRect: () => ({ top: 64 }) as DOMRect,
+    };
+    const target = {
+      getBoundingClientRect: () => ({ top: 64 }) as DOMRect,
+    };
+    applyOutlineJumpOffset(container, target);
+    expect(container.scrollTop).toBe(112);
+  });
+});
diff --git a/src/pages/chat/chat-outline-model.ts b/src/pages/chat/chat-outline-model.ts
new file mode 100644
index 00000000..cc544d1d
--- /dev/null
+++ b/src/pages/chat/chat-outline-model.ts
@@ -0,0 +1,132 @@
+import type { TurnGroup } from './chat-format';
+
+export const OUTLINE_MAGNIFY_RADIUS = 3;
+export const OUTLINE_MIN_PROMPTS = 2;
+export const OUTLINE_MIN_PANEL_WIDTH_PX = 720;
+export const OUTLINE_READING_LINE_PX = 8;
+export const OUTLINE_PREVIEW_LIMIT = 120;
+
+export const OUTLINE_TICK = {
+  restWidth: 10,
+  restHeight: 2,
+  activeWidth: 18,
+  magnifiedWidth: 26,
+  magnifiedHeight: 4,
+} as const;
+
+export type ChatOutlinePrompt = {
+  id: string;
+  preview: string;
+};
+
+/**
+ * Dock-style falloff: 1 under the pointer, easing to 0 at the radius. The raised cosine
+ * has no corner at either end, so sweeping the rail reads as one bulge travelling with
+ * the pointer rather than a band switching on and off.
+ */
+export function promptTickMagnification(slotDistance: number): number {
+  const distance = Math.abs(slotDistance);
+  if (!Number.isFinite(distance) || distance >= OUTLINE_MAGNIFY_RADIUS) {
+    return 0;
+  }
+  return (1 + Math.cos((Math.PI * distance) / OUTLINE_MAGNIFY_RADIUS)) / 2;
+}
+
+export function outlinePromptPreview(text: string, limit = OUTLINE_PREVIEW_LIMIT): string {
+  const collapsed = text.replace(/\s+/g, ' ').trim();
+  if (collapsed.length <= limit) return collapsed;
+  return `${collapsed.slice(0, limit)}…`;
+}
+
+export function outlinePromptsFromTurns(turns: readonly TurnGroup[]): ChatOutlinePrompt[] {
+  const prompts: ChatOutlinePrompt[] = [];
+  for (const group of turns) {
+    if (!group.user) continue;
+    prompts.push({
+      id: group.user.id,
+      preview: outlinePromptPreview(group.user.content),
+    });
+  }
+  return prompts;
+}
+
+export function shouldShowChatOutline(input: {
+  enabled: boolean;
+  promptCount: number;
+  panelWidth: number;
+}): boolean {
+  return (
+    input.enabled &&
+    input.promptCount >= OUTLINE_MIN_PROMPTS &&
+    outlinePanelWidthReady(input.panelWidth) &&
+    input.panelWidth >= OUTLINE_MIN_PANEL_WIDTH_PX
+  );
+}
+
+/** 0 / NaN means “not measured yet”. Do not treat an empty host as a mounted rail. */
+export function outlinePanelWidthReady(width: number | null | undefined): width is number {
+  return typeof width === 'number' && Number.isFinite(width) && width > 0;
+}
+
+/** Chat stage (the wide panel), not the inner adaptive content column. */
+export const OUTLINE_PANEL_SELECTOR = '[data-chat-stage]';
+
+export function outlinePanelElement(node: Element | null): Element | null {
+  if (!node) return null;
+  return node.closest(OUTLINE_PANEL_SELECTOR) ?? node;
+}
+
+export function readOutlinePanelWidth(node: Element | null): number {
+  const panel = outlinePanelElement(node);
+  if (!panel) return 0;
+  const width = panel.getBoundingClientRect().width;
+  return Number.isFinite(width) ? width : 0;
+}
+
+export function outlineTickSize(isActive: boolean, magnification: number): {
+  width: number;
+  height: number;
+} {
+  const restingWidth = isActive ? OUTLINE_TICK.activeWidth : OUTLINE_TICK.restWidth;
+  return {
+    width: restingWidth + magnification * (OUTLINE_TICK.magnifiedWidth - restingWidth),
+    height:
+      OUTLINE_TICK.restHeight +
+      magnification * (OUTLINE_TICK.magnifiedHeight - OUTLINE_TICK.restHeight),
+  };
+}
+
+/** Last prompt whose top edge sits on or above the reading line. */
+export function resolveActivePromptId(
+  prompts: readonly ChatOutlinePrompt[],
+  tops: readonly number[],
+  readingLine: number,
+): string | null {
+  let activeId: string | null = null;
+  for (let i = 0; i < prompts.length; i += 1) {
+    const top = tops[i];
+    if (top == null || !Number.isFinite(top)) continue;
+    if (top <= readingLine) activeId = prompts[i]!.id;
+  }
+  return activeId;
+}
+
+export function planOutlineJumpScroll(
+  containerTop: number,
+  containerScrollTop: number,
+  targetTop: number,
+  offsetPx = OUTLINE_READING_LINE_PX,
+): number {
+  return containerScrollTop + (targetTop - containerTop) - offsetPx;
+}
+
+export function applyOutlineJumpOffset(
+  container: { getBoundingClientRect(): DOMRect; scrollTop: number },
+  target: { getBoundingClientRect(): DOMRect },
+): void {
+  container.scrollTop = planOutlineJumpScroll(
+    container.getBoundingClientRect().top,
+    container.scrollTop,
+    target.getBoundingClientRect().top,
+  );
+}
diff --git a/src/pages/chat/chat-outline-pref.test.ts b/src/pages/chat/chat-outline-pref.test.ts
new file mode 100644
index 00000000..fe49a235
--- /dev/null
+++ b/src/pages/chat/chat-outline-pref.test.ts
@@ -0,0 +1,54 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { StorageKey } from '@/lib/storage-key';
+import {
+  loadChatOutlineEnabled,
+  saveChatOutlineEnabled,
+  subscribeChatOutlineEnabled,
+} from './chat-outline-pref';
+
+const store = new Map<string, string>();
+
+beforeEach(() => {
+  store.clear();
+  vi.stubGlobal('localStorage', {
+    getItem: (key: string) => store.get(key) ?? null,
+    setItem: (key: string, value: string) => {
+      store.set(key, value);
+    },
+    removeItem: (key: string) => {
+      store.delete(key);
+    },
+  });
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe('chat outline preference', () => {
+  it('defaults to on when nothing is stored', () => {
+    expect(loadChatOutlineEnabled()).toBe(true);
+  });
+
+  it('persists off and on through the canonical key', () => {
+    saveChatOutlineEnabled(false);
+    expect(store.get(StorageKey.chatOutlineEnabled)).toBe('0');
+    expect(loadChatOutlineEnabled()).toBe(false);
+
+    saveChatOutlineEnabled(true);
+    expect(store.get(StorageKey.chatOutlineEnabled)).toBe('1');
+    expect(loadChatOutlineEnabled()).toBe(true);
+  });
+
+  it('notifies subscribers so a mounted rail can restore after toggle', () => {
+    const seen: boolean[] = [];
+    const stop = subscribeChatOutlineEnabled((value) => {
+      seen.push(value);
+    });
+    saveChatOutlineEnabled(false);
+    saveChatOutlineEnabled(true);
+    stop();
+    saveChatOutlineEnabled(false);
+    expect(seen).toEqual([false, true]);
+  });
+});
diff --git a/src/pages/chat/chat-outline-pref.ts b/src/pages/chat/chat-outline-pref.ts
new file mode 100644
index 00000000..5163c31c
--- /dev/null
+++ b/src/pages/chat/chat-outline-pref.ts
@@ -0,0 +1,19 @@
+import { loadBool, saveBool, StorageKey } from '@/lib/ui-preferences';
+
+const listeners = new Set<(enabled: boolean) => void>();
+
+export function loadChatOutlineEnabled(): boolean {
+  return loadBool(StorageKey.chatOutlineEnabled, true);
+}
+
+export function saveChatOutlineEnabled(value: boolean): void {
+  saveBool(StorageKey.chatOutlineEnabled, value);
+  for (const listener of listeners) listener(value);
+}
+
+export function subscribeChatOutlineEnabled(listener: (enabled: boolean) => void): () => void {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
diff --git a/src/pages/chat/chat-preview-model.test.ts b/src/pages/chat/chat-preview-model.test.ts
index 791f93ab..55b0d557 100644
--- a/src/pages/chat/chat-preview-model.test.ts
+++ b/src/pages/chat/chat-preview-model.test.ts
@@ -1,9 +1,12 @@
 import { describe, expect, it } from 'vitest';
 import {
   chatPreviewCanBack,
+  chatPreviewLine,
   chatPreviewPath,
+  isChatEditPreview,
   isChatFilePreview,
   isChatProcessInspect,
+  openChatEditPreview,
   openChatPreviewRoot,
   openChatProcessInspect,
   popChatPreview,
@@ -45,4 +48,30 @@ describe('chat preview stack', () => {
       openChatPreviewRoot('/repo/README.md'),
     );
   });
+
+  it('keeps a 1-based line only on file previews', () => {
+    expect(chatPreviewLine(openChatPreviewRoot('/repo/README.md', 12))).toBe(12);
+    expect(chatPreviewLine(openChatPreviewRoot('/repo/README.md', 0))).toBeUndefined();
+    expect(chatPreviewLine(openChatPreviewRoot('/repo/README.md', -1))).toBeUndefined();
+    expect(chatPreviewLine(openChatEditPreview('src/a.ts'))).toBeUndefined();
+    expect(chatPreviewLine(null)).toBeUndefined();
+    const same = pushChatPreview(openChatPreviewRoot('/repo/README.md', 3), '/repo/README.md', 9);
+    expect(chatPreviewLine(same)).toBe(9);
+    expect(chatPreviewPath(same)).toBe('/repo/README.md');
+    expect(pushChatPreview(null, '/repo/README.md', 4)).toEqual(
+      openChatPreviewRoot('/repo/README.md', 4),
+    );
+  });
+
+  it('opens an edit preview by path without a back stack', () => {
+    const target = openChatEditPreview('src/a.ts');
+    expect(isChatEditPreview(target)).toBe(true);
+    expect(isChatFilePreview(target)).toBe(false);
+    expect(chatPreviewPath(target)).toBe('src/a.ts');
+    expect(chatPreviewCanBack(target)).toBe(false);
+    expect(popChatPreview(target)).toBeNull();
+    expect(pushChatPreview(target, '/repo/README.md')).toEqual(
+      openChatPreviewRoot('/repo/README.md'),
+    );
+  });
 });
diff --git a/src/pages/chat/chat-preview-model.ts b/src/pages/chat/chat-preview-model.ts
index 07c912a5..5eca26ce 100644
--- a/src/pages/chat/chat-preview-model.ts
+++ b/src/pages/chat/chat-preview-model.ts
@@ -13,7 +13,15 @@ export type ChatProcessInspectTarget = {
   agent: AgentKey;
 };
 
-export type ChatInspectTarget = ChatFilePreviewTarget | ChatProcessInspectTarget;
+export type ChatEditPreviewTarget = {
+  kind: 'edit';
+  path: string;
+};
+
+export type ChatInspectTarget =
+  | ChatFilePreviewTarget
+  | ChatProcessInspectTarget
+  | ChatEditPreviewTarget;
 
 /** File-or-process inspect target for the chat right pane. */
 export type ChatPreviewTarget = ChatInspectTarget;
@@ -30,7 +38,14 @@ export function isChatProcessInspect(
   return target?.kind === 'process';
 }
 
+export function isChatEditPreview(
+  target: ChatInspectTarget | null | undefined,
+): target is ChatEditPreviewTarget {
+  return target?.kind === 'edit';
+}
+
 export function chatPreviewPath(target: ChatInspectTarget | null | undefined): string {
+  if (isChatEditPreview(target)) return target.path;
   if (!isChatFilePreview(target) || !target.stack.length) return '';
   return target.stack[target.stack.length - 1] ?? '';
 }
@@ -57,6 +72,10 @@ export function openChatProcessInspect(turn: number, agent: AgentKey): ChatProce
   return { kind: 'process', turn, agent };
 }
 
+export function openChatEditPreview(path: string): ChatEditPreviewTarget {
+  return { kind: 'edit', path };
+}
+
 export function pushChatPreview(
   target: ChatInspectTarget | null | undefined,
   next: string,
diff --git a/src/pages/chat/chat-runtime-model.test.ts b/src/pages/chat/chat-runtime-model.test.ts
index ae767add..f00686e3 100644
--- a/src/pages/chat/chat-runtime-model.test.ts
+++ b/src/pages/chat/chat-runtime-model.test.ts
@@ -5,6 +5,7 @@ import {
   acceptsRuntimeSnapshot,
   bindRuntimeSnapshotToAgent,
   canSubmitRuntimeQuestions,
+  fileChangeKindLabel,
   fileChangePreviewHintKey,
   runtimeFileChangePreview,
   runtimeReplyFields,
@@ -21,6 +22,8 @@ import {
   readRuntimeTransport,
   requestMatchesRuntime,
   runtimePlanEntryTone,
+  runtimePlanProgress,
+  runtimePlanStatusKey,
   visibleRuntimePlan,
 } from './chat-runtime-model';
 
@@ -239,5 +242,53 @@ describe('chat runtime transport guards', () => {
     expect(runtimePlanEntryTone('in_progress')).toBe('live');
     expect(runtimePlanEntryTone('completed')).toBe('done');
     expect(runtimePlanEntryTone('pending')).toBe('pending');
+    expect(runtimePlanEntryTone('failed')).toBe('failed');
+    expect(runtimePlanProgress([
+      { content: 'read', status: 'completed' },
+      { content: 'edit', status: 'in_progress' },
+      { content: 'test', status: 'pending' },
+      { content: 'broken', status: 'failed' },
+    ])).toEqual({ total: 4, done: 1, live: 1, pending: 1, failed: 1 });
+    expect(runtimePlanStatusKey('in_progress')).toBe('chat.runtime.planStatusLive');
+    expect(translate('zh', runtimePlanStatusKey('completed'))).toBe('已完成');
+    expect(translate('zh', 'chat.runtime.planProgress', { done: 1, total: 3 })).toBe('1/3 已完成');
+    expect(runtimePlanEntryTone('complete')).toBe('done');
+    expect(runtimePlanEntryTone('DONE')).toBe('done');
+    expect(runtimePlanEntryTone('in-progress')).toBe('live');
+    expect(runtimePlanEntryTone('inprogress')).toBe('live');
+    expect(runtimePlanEntryTone('running')).toBe('live');
+    expect(runtimePlanEntryTone('start')).toBe('live');
+    expect(runtimePlanEntryTone('error')).toBe('failed');
+    expect(runtimePlanEntryTone('cancelled')).toBe('failed');
+    expect(runtimePlanEntryTone('canceled')).toBe('failed');
+    expect(runtimePlanEntryTone(null)).toBe('pending');
+    expect(runtimePlanEntryTone('')).toBe('pending');
+    expect(runtimePlanProgress(null)).toEqual({
+      total: 0, done: 0, live: 0, pending: 0, failed: 0,
+    });
+    expect(runtimePlanProgress([{ content: '   ' }])).toEqual({
+      total: 0, done: 0, live: 0, pending: 0, failed: 0,
+    });
+    expect(runtimePlanStatusKey('canceled')).toBe('chat.runtime.planStatusFailed');
+    expect(fileChangeKindLabel('add', (key, params) => translate('zh', key, params))).toBe('新增');
+    expect(fileChangeKindLabel('delete', (key, params) => translate('zh', key, params))).toBe('删除');
+    expect(fileChangeKindLabel('update', (key, params) => translate('zh', key, params))).toBe('修改');
+    expect(runtimeFileChangePreview({
+      kind: 'file',
+      detail: '',
+      fileChanges: [
+        { path: 'a.ts', kind: 'create_file' },
+        { path: 'b.ts', kind: 'write' },
+        { path: 'c.ts', kind: 'remove_file' },
+      ],
+    })).toEqual({
+      shown: true,
+      empty: true,
+      rows: [
+        { path: 'a.ts', kind: 'add', preview: null },
+        { path: 'b.ts', kind: 'update', preview: null },
+        { path: 'c.ts', kind: 'delete', preview: null },
+      ],
+    });
   });
 });
diff --git a/src/pages/chat/chat-runtime-model.ts b/src/pages/chat/chat-runtime-model.ts
index 1fd167a7..857033db 100644
--- a/src/pages/chat/chat-runtime-model.ts
+++ b/src/pages/chat/chat-runtime-model.ts
@@ -282,7 +282,7 @@ export function visibleRuntimePlan(
   return (plan ?? []).filter((entry) => entry.content.trim().length > 0);
 }
 
-export type RuntimePlanTone = 'live' | 'done' | 'pending';
+export type RuntimePlanTone = 'live' | 'done' | 'pending' | 'failed';
 
 export function runtimePlanEntryTone(status?: string | null): RuntimePlanTone {
   const normalized = (status ?? '').trim().toLowerCase().replace(/-/g, '_');
@@ -297,5 +297,51 @@ export function runtimePlanEntryTone(status?: string | null): RuntimePlanTone {
   ) {
     return 'live';
   }
+  if (
+    normalized === 'failed'
+    || normalized === 'error'
+    || normalized === 'cancelled'
+    || normalized === 'canceled'
+  ) {
+    return 'failed';
+  }
   return 'pending';
 }
+
+export type RuntimePlanProgress = {
+  total: number;
+  done: number;
+  live: number;
+  pending: number;
+  failed: number;
+};
+
+/** Counts from protocol status only. Missing status counts as pending. */
+export function runtimePlanProgress(
+  plan?: RuntimePlanEntry[] | null,
+): RuntimePlanProgress {
+  const entries = visibleRuntimePlan(plan);
+  const progress: RuntimePlanProgress = {
+    total: entries.length,
+    done: 0,
+    live: 0,
+    pending: 0,
+    failed: 0,
+  };
+  for (const entry of entries) {
+    const tone = runtimePlanEntryTone(entry.status);
+    if (tone === 'done') progress.done += 1;
+    else if (tone === 'live') progress.live += 1;
+    else if (tone === 'failed') progress.failed += 1;
+    else progress.pending += 1;
+  }
+  return progress;
+}
+
+export function runtimePlanStatusKey(status?: string | null): MessageKey {
+  const tone = runtimePlanEntryTone(status);
+  if (tone === 'done') return 'chat.runtime.planStatusDone';
+  if (tone === 'live') return 'chat.runtime.planStatusLive';
+  if (tone === 'failed') return 'chat.runtime.planStatusFailed';
+  return 'chat.runtime.planStatusPending';
+}
diff --git a/src/pages/chat/chat-session-switch.test.ts b/src/pages/chat/chat-session-switch.test.ts
new file mode 100644
index 00000000..508550b2
--- /dev/null
+++ b/src/pages/chat/chat-session-switch.test.ts
@@ -0,0 +1,196 @@
+import { createElement, type ReactElement } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it, vi } from 'vitest';
+import { TooltipProvider } from '@/components/ui/tooltip';
+import type { Conversation } from '@/lib/types';
+import { ChatSessionHeader } from './ChatSessionHeader';
+import {
+  adjacentSessionId,
+  chatSessionSwitchShortcutAction,
+  sessionSwitchNeighbors,
+} from './chat-session-switch';
+
+vi.mock('@/components/shared/LanguageProvider', async () => {
+  const { createTranslator } = await import('@/lib/i18n');
+  const t = createTranslator('zh');
+  return {
+    useI18n: () => ({ lang: 'zh', setLanguage: () => undefined, t }),
+  };
+});
+
+vi.mock('@/components/ui/toast', () => ({
+  useToast: () => ({ toast: () => undefined }),
+}));
+
+vi.mock('@/components/layout/ChromeActions', () => ({
+  ChromeActions: () => null,
+}));
+
+const sessions = [{ id: 'a' }, { id: 'b' }, { id: 'c' }];
+
+describe('adjacentSessionId', () => {
+  it('returns null for an empty list', () => {
+    expect(adjacentSessionId([], 'a', 'next')).toBeNull();
+    expect(adjacentSessionId([], null, 'prev')).toBeNull();
+  });
+
+  it('cannot switch a single-item list that is already focused', () => {
+    expect(adjacentSessionId([{ id: 'a' }], 'a', 'next')).toBeNull();
+    expect(adjacentSessionId([{ id: 'a' }], 'a', 'prev')).toBeNull();
+  });
+
+  it('focuses the only session when the current id is missing', () => {
+    expect(adjacentSessionId([{ id: 'a' }], null, 'next')).toBe('a');
+    expect(adjacentSessionId([{ id: 'a' }], 'gone', 'prev')).toBe('a');
+  });
+
+  it('walks the flat list and wraps at both ends', () => {
+    expect(adjacentSessionId(sessions, 'a', 'next')).toBe('b');
+    expect(adjacentSessionId(sessions, 'b', 'next')).toBe('c');
+    expect(adjacentSessionId(sessions, 'c', 'next')).toBe('a');
+    expect(adjacentSessionId(sessions, 'a', 'prev')).toBe('c');
+    expect(adjacentSessionId(sessions, 'b', 'prev')).toBe('a');
+    expect(adjacentSessionId(sessions, 'c', 'prev')).toBe('b');
+  });
+
+  it('lands on the first or last session when the current id is not in the list', () => {
+    expect(adjacentSessionId(sessions, null, 'next')).toBe('a');
+    expect(adjacentSessionId(sessions, 'gone', 'prev')).toBe('c');
+  });
+});
+
+describe('sessionSwitchNeighbors', () => {
+  it('exposes both wrapped neighbors', () => {
+    expect(sessionSwitchNeighbors(sessions, 'b')).toEqual({ prevId: 'a', nextId: 'c' });
+    expect(sessionSwitchNeighbors(sessions, 'a')).toEqual({ prevId: 'c', nextId: 'b' });
+    expect(sessionSwitchNeighbors([{ id: 'a' }], 'a')).toEqual({ prevId: null, nextId: null });
+    expect(sessionSwitchNeighbors(sessions, null)).toEqual({ prevId: 'c', nextId: 'a' });
+    expect(sessionSwitchNeighbors([], 'a')).toEqual({ prevId: null, nextId: null });
+  });
+});
+
+describe('chatSessionSwitchShortcutAction', () => {
+  const base = {
+    key: '',
+    altKey: true,
+    metaKey: false,
+    ctrlKey: false,
+    shiftKey: false,
+    overlayOpen: false,
+  };
+
+  it('maps Alt+ArrowUp / Alt+ArrowDown', () => {
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'ArrowUp' })).toBe('prev');
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'ArrowDown' })).toBe('next');
+    expect(
+      chatSessionSwitchShortcutAction({ ...base, key: 'Unidentified', code: 'ArrowUp' }),
+    ).toBe('prev');
+  });
+
+  it('ignores chords that already belong to Chat', () => {
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'k', ctrlKey: true, altKey: false })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'n', ctrlKey: true, altKey: false })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'Enter', altKey: false })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'Escape', altKey: false })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: '/', altKey: false })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'ArrowUp', altKey: false })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'ArrowUp', ctrlKey: true })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'ArrowUp', overlayOpen: true })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'ArrowUp', shiftKey: true })).toBeNull();
+    expect(chatSessionSwitchShortcutAction({ ...base, key: 'ArrowDown', metaKey: true })).toBeNull();
+  });
+
+  it('reads ArrowDown from code when key is unidentified', () => {
+    expect(
+      chatSessionSwitchShortcutAction({ ...base, key: 'Unidentified', code: 'ArrowDown' }),
+    ).toBe('next');
+  });
+});
+
+function conv(partial?: Partial<Conversation>): Conversation {
+  return {
+    id: 'a',
+    title: '修登录',
+    agentIds: ['claude'],
+    cwd: 'D:\\work\\agenthub',
+    allowDangerous: false,
+    createdAt: '2026-09-20T00:00:00.000Z',
+    updatedAt: '2026-09-20T00:00:00.000Z',
+    ...partial,
+  };
+}
+
+function header(partial?: Partial<Parameters<typeof ChatSessionHeader>[0]>): ReactElement {
+  const active = conv();
+  return createElement(ChatSessionHeader, {
+    active,
+    railOpen: false,
+    sessions: [active, conv({ id: 'b', title: '下一场', cwd: 'D:\\work\\other' })],
+    sendingConversationIds: ['a'],
+    onExpandRail: () => undefined,
+    onRename: async () => true,
+    onFocus: () => undefined,
+    onOpenSettings: () => undefined,
+    onPickWorkingDirectory: () => undefined,
+    ...partial,
+  });
+}
+
+describe('collapsed session switcher', () => {
+  it('shows the current title, working-directory short name, and a sending dot', () => {
+    const html = renderToStaticMarkup(createElement(TooltipProvider, null, header()));
+    expect(html).toContain('data-help="chat-session-switch"');
+    expect(html).toContain('修登录');
+    expect(html).toContain('agenthub');
+    expect(html).toContain('data-sending=""');
+    expect(html).toContain('上一条会话');
+    expect(html).toContain('下一条会话');
+  });
+
+  it('keeps the rename title when the history rail is open', () => {
+    const html = renderToStaticMarkup(createElement(TooltipProvider, null, header({ railOpen: true })));
+    expect(html).not.toContain('data-help="chat-session-switch"');
+    expect(html).toContain('修登录');
+  });
+
+  it('does not show connect copy in the header', () => {
+    const html = renderToStaticMarkup(createElement(TooltipProvider, null, header({ railOpen: true })));
+    expect(html).not.toContain('这次对话怎么接');
+    expect(html).not.toContain('data-help="chat-session-connect"');
+    expect(html).toContain('data-help="chat-settings"');
+    expect(html).toContain('会话设置');
+  });
+
+  it('disables prev/next when the filtered list has one session', () => {
+    const html = renderToStaticMarkup(
+      createElement(TooltipProvider, null, header({ sessions: [conv()] })),
+    );
+    expect(html).toContain('data-help="chat-session-switch"');
+    expect(html).toContain('disabled=""');
+    expect(html).toContain('aria-keyshortcuts="Alt+ArrowUp"');
+    expect(html).toContain('aria-keyshortcuts="Alt+ArrowDown"');
+  });
+
+  it('shows the unset folder name when the current session has no working directory', () => {
+    const html = renderToStaticMarkup(
+      createElement(
+        TooltipProvider,
+        null,
+        header({
+          active: conv({ cwd: null }),
+          sessions: [conv({ cwd: null }), conv({ id: 'b', title: '下一场', cwd: 'D:\\work\\other' })],
+        }),
+      ),
+    );
+    expect(html).toContain('未设目录');
+    expect(html).toContain('修登录');
+  });
+
+  it('falls back to the title button when the history list is empty', () => {
+    const html = renderToStaticMarkup(
+      createElement(TooltipProvider, null, header({ sessions: [] })),
+    );
+    expect(html).not.toContain('data-help="chat-session-switch"');
+    expect(html).toContain('修登录');
+  });
+});
diff --git a/src/pages/chat/chat-session-switch.ts b/src/pages/chat/chat-session-switch.ts
new file mode 100644
index 00000000..4afee8f3
--- /dev/null
+++ b/src/pages/chat/chat-session-switch.ts
@@ -0,0 +1,58 @@
+export type SessionSwitchDirection = 'prev' | 'next';
+
+export type SessionSwitchNeighbors = {
+  prevId: string | null;
+  nextId: string | null;
+};
+
+/**
+ * Previous / next session in the current filtered list.
+ * Wraps at both ends. A single-item list cannot switch.
+ */
+export function adjacentSessionId(
+  sessions: readonly { id: string }[],
+  currentId: string | null,
+  direction: SessionSwitchDirection,
+): string | null {
+  if (sessions.length === 0) return null;
+  const index = currentId == null ? -1 : sessions.findIndex((item) => item.id === currentId);
+  let nextIndex: number;
+  if (index < 0) {
+    nextIndex = direction === 'next' ? 0 : sessions.length - 1;
+  } else if (sessions.length === 1) {
+    return null;
+  } else {
+    const delta = direction === 'next' ? 1 : -1;
+    nextIndex = (index + delta + sessions.length) % sessions.length;
+  }
+  const target = sessions[nextIndex]?.id ?? null;
+  return target && target !== currentId ? target : null;
+}
+
+export function sessionSwitchNeighbors(
+  sessions: readonly { id: string }[],
+  currentId: string | null,
+): SessionSwitchNeighbors {
+  return {
+    prevId: adjacentSessionId(sessions, currentId, 'prev'),
+    nextId: adjacentSessionId(sessions, currentId, 'next'),
+  };
+}
+
+/** Alt+↑ / Alt+↓. Leaves Ctrl+K, Ctrl+N, Enter, Esc, and / alone. */
+export function chatSessionSwitchShortcutAction(input: {
+  key: string;
+  code?: string;
+  altKey: boolean;
+  metaKey: boolean;
+  ctrlKey: boolean;
+  shiftKey: boolean;
+  overlayOpen: boolean;
+}): SessionSwitchDirection | null {
+  if (input.overlayOpen || !input.altKey || input.metaKey || input.ctrlKey || input.shiftKey) {
+    return null;
+  }
+  if (input.key === 'ArrowUp' || input.code === 'ArrowUp') return 'prev';
+  if (input.key === 'ArrowDown' || input.code === 'ArrowDown') return 'next';
+  return null;
+}
diff --git a/src/pages/chat/chat-shortcuts.test.ts b/src/pages/chat/chat-shortcuts.test.ts
index 55f20e34..d9cd3923 100644
--- a/src/pages/chat/chat-shortcuts.test.ts
+++ b/src/pages/chat/chat-shortcuts.test.ts
@@ -14,15 +14,23 @@ describe('chat shortcut overview', () => {
       'stop',
       'actions',
       'history',
+      'prevSession',
+      'nextSession',
       'model',
       'newChat',
       'overview',
     ]);
     expect(CHAT_SHORTCUT_ROWS.find((row) => row.id === 'newChat')?.keys).toBe('Ctrl+N');
+    expect(CHAT_SHORTCUT_ROWS.find((row) => row.id === 'prevSession')?.keys).toBe('Alt+↑');
+    expect(CHAT_SHORTCUT_ROWS.find((row) => row.id === 'nextSession')?.keys).toBe('Alt+↓');
     expect(CHAT_SHORTCUT_ROWS.find((row) => row.id === 'overview')?.keys).toBe('?');
     expect(CHAT_SHORTCUT_ROWS.find((row) => row.id === 'stop')?.keys).toBe('Esc');
     expect(translate('zh', 'chat.shortcuts.stop')).toBe('停止');
     expect(translate('en', 'chat.shortcuts.stop')).toBe('Stop');
+    expect(translate('zh', 'chat.shortcuts.prevSession')).toBe('上一条会话');
+    expect(translate('en', 'chat.shortcuts.prevSession')).toBe('Previous session');
+    expect(translate('zh', 'chat.shortcuts.nextSession')).toBe('下一条会话');
+    expect(translate('en', 'chat.shortcuts.nextSession')).toBe('Next session');
   });
 
   it('shows Cmd on macOS and Ctrl elsewhere', () => {
diff --git a/src/pages/chat/chat-shortcuts.ts b/src/pages/chat/chat-shortcuts.ts
index d87c5577..b348a802 100644
--- a/src/pages/chat/chat-shortcuts.ts
+++ b/src/pages/chat/chat-shortcuts.ts
@@ -14,6 +14,8 @@ export const CHAT_SHORTCUT_ROWS: readonly ChatShortcutRow[] = [
   { id: 'stop', keys: 'Esc', actionKey: 'chat.shortcuts.stop' },
   { id: 'actions', keys: '/', actionKey: 'chat.shortcuts.actions' },
   { id: 'history', keys: 'Ctrl+K', actionKey: 'chat.shortcuts.history' },
+  { id: 'prevSession', keys: 'Alt+↑', actionKey: 'chat.shortcuts.prevSession' },
+  { id: 'nextSession', keys: 'Alt+↓', actionKey: 'chat.shortcuts.nextSession' },
   { id: 'model', keys: 'Ctrl+Shift+I', actionKey: 'chat.shortcuts.model' },
   { id: 'newChat', keys: 'Ctrl+N', actionKey: 'chat.shortcuts.newChat' },
   { id: 'overview', keys: '?', actionKey: 'chat.shortcuts.overview' },
diff --git a/src/pages/chat/chat-snapshot-sync.test.ts b/src/pages/chat/chat-snapshot-sync.test.ts
new file mode 100644
index 00000000..f8b31674
--- /dev/null
+++ b/src/pages/chat/chat-snapshot-sync.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from 'vitest';
+import {
+  beginSnapshotSyncRetry,
+  idleSnapshotSync,
+  recordSnapshotPollFailure,
+  recordSnapshotPollSuccess,
+  SNAPSHOT_BANNER_AFTER_MS,
+  snapshotSyncBannerDelayMs,
+  snapshotSyncForConversation,
+  snapshotSyncShowsBanner,
+} from './chat-snapshot-sync';
+
+describe('snapshot poll failure', () => {
+  it('does not show a banner on the first instant failure', () => {
+    const failed = recordSnapshotPollFailure(idleSnapshotSync(), 'chat-a', new Error('down'), 1_000);
+    expect(failed.failures).toBe(1);
+    expect(snapshotSyncShowsBanner(failed, 1_000)).toBe(false);
+    expect(snapshotSyncBannerDelayMs(failed, 1_000)).toBe(SNAPSHOT_BANNER_AFTER_MS);
+  });
+
+  it('shows one banner after the delay and clears it on success', () => {
+    const first = recordSnapshotPollFailure(idleSnapshotSync(), 'chat-a', new Error('down'), 1_000);
+    const second = recordSnapshotPollFailure(first, 'chat-a', new Error('still down'), 1_080);
+    expect(second.failures).toBe(2);
+    expect(snapshotSyncShowsBanner(second, 1_080)).toBe(false);
+    expect(snapshotSyncShowsBanner(second, 1_000 + SNAPSHOT_BANNER_AFTER_MS)).toBe(true);
+    const retrying = beginSnapshotSyncRetry(second);
+    expect(retrying.retrying).toBe(true);
+    const recovered = recordSnapshotPollSuccess(retrying, 'chat-a');
+    expect(recovered.failures).toBe(0);
+    expect(snapshotSyncShowsBanner(recovered, 9_000)).toBe(false);
+    expect(recordSnapshotPollSuccess(second, 'chat-b').failures).toBe(2);
+  });
+
+  it('resets when switching conversations', () => {
+    const failed = recordSnapshotPollFailure(idleSnapshotSync(), 'chat-a', new Error('down'), 1_000);
+    const switched = snapshotSyncForConversation('chat-b', failed);
+    expect(switched.failures).toBe(0);
+    expect(switched.conversationId).toBe('chat-b');
+    expect(snapshotSyncForConversation('chat-a', failed)).toBe(failed);
+  });
+});
diff --git a/src/pages/chat/chat-snapshot-sync.ts b/src/pages/chat/chat-snapshot-sync.ts
new file mode 100644
index 00000000..8fb82160
--- /dev/null
+++ b/src/pages/chat/chat-snapshot-sync.ts
@@ -0,0 +1,80 @@
+/** Snapshot poll failures must not toast every 80ms. Keep the last view. */
+
+export const SNAPSHOT_BANNER_AFTER_MS = 1000;
+
+export type SnapshotSyncState = {
+  conversationId: string | null;
+  failures: number;
+  firstFailedAt: number | null;
+  lastError: string | null;
+  retrying: boolean;
+};
+
+export function idleSnapshotSync(): SnapshotSyncState {
+  return {
+    conversationId: null,
+    failures: 0,
+    firstFailedAt: null,
+    lastError: null,
+    retrying: false,
+  };
+}
+
+export function snapshotSyncForConversation(
+  conversationId: string | null,
+  previous: SnapshotSyncState = idleSnapshotSync(),
+): SnapshotSyncState {
+  if (previous.conversationId === conversationId) return previous;
+  return { ...idleSnapshotSync(), conversationId };
+}
+
+export function recordSnapshotPollSuccess(
+  state: SnapshotSyncState,
+  conversationId: string,
+): SnapshotSyncState {
+  if (state.conversationId && state.conversationId !== conversationId) return state;
+  return {
+    conversationId,
+    failures: 0,
+    firstFailedAt: null,
+    lastError: null,
+    retrying: false,
+  };
+}
+
+export function recordSnapshotPollFailure(
+  state: SnapshotSyncState,
+  conversationId: string,
+  error: unknown,
+  now: number,
+): SnapshotSyncState {
+  const same = state.conversationId === conversationId && state.failures > 0;
+  const message = error instanceof Error ? error.message : String(error);
+  return {
+    conversationId,
+    failures: same ? state.failures + 1 : 1,
+    firstFailedAt: same ? state.firstFailedAt ?? now : now,
+    lastError: message.trim() || null,
+    retrying: false,
+  };
+}
+
+export function beginSnapshotSyncRetry(state: SnapshotSyncState): SnapshotSyncState {
+  if (!state.conversationId || state.failures === 0) return state;
+  return { ...state, retrying: true };
+}
+
+export function snapshotSyncShowsBanner(state: SnapshotSyncState, now: number): boolean {
+  if (!state.conversationId || state.failures === 0 || state.firstFailedAt == null) {
+    return false;
+  }
+  return now - state.firstFailedAt >= SNAPSHOT_BANNER_AFTER_MS;
+}
+
+export function snapshotSyncBannerDelayMs(state: SnapshotSyncState, now: number): number | null {
+  if (!state.conversationId || state.failures === 0 || state.firstFailedAt == null) {
+    return null;
+  }
+  const remaining = SNAPSHOT_BANNER_AFTER_MS - (now - state.firstFailedAt);
+  return remaining > 0 ? remaining : null;
+}
diff --git a/src/pages/chat/index.tsx b/src/pages/chat/index.tsx
index d34c3238..382df8cb 100644
--- a/src/pages/chat/index.tsx
+++ b/src/pages/chat/index.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { MessagesSquare } from 'lucide-react';
 import { pageRhythm } from '@/components/layout/page-rhythm';
@@ -31,19 +31,30 @@ import {
   chatMainColumnClass,
   chatStageClass,
   composerNativeEditChord,
+  filterConversations,
 } from './chat-model';
 import { subscribeChatShortcutKeydown } from './chat-shortcuts';
+import { useChatSessionSwitch } from './use-chat-session-switch';
 import { chatModShiftIShouldOpenModel } from './chat-model-labels';
 import { formatChatSessionRecord, processUserPromptPreview, type TurnGroup } from './chat-format';
 import { chatBusySendMode, grokLegacyContinueKind } from './chat-grok-follow-up';
+import { ChatEditPreviewPanel, ChatTurnEditList } from './ChatEditPreviewPanel';
 import { ChatMarkdownPreviewPanel } from './ChatMarkdownPreviewPanel';
 import { ChatProcessInspectPanel } from './ChatProcessInspectPanel';
+import {
+  extractTurnEdits,
+  sameEditPath,
+  turnEditHasInlineDiff,
+  type TurnEditFile,
+} from './chat-edit-preview';
 import {
   chatPreviewCanBack,
   chatPreviewLine,
   chatPreviewPath,
+  isChatEditPreview,
   isChatFilePreview,
   isChatProcessInspect,
+  openChatEditPreview,
   openChatPreviewRoot,
   openChatProcessInspect,
   popChatPreview,
@@ -117,6 +128,24 @@ export default function ChatPage() {
     }
     preview.open(previous);
   }, [preview.close, preview.open, preview.target]);
+  const turnEdits = useMemo(() => extractTurnEdits(page.processMap), [page.processMap]);
+  const openTurnEdit = useCallback(
+    (file: TurnEditFile) => {
+      if (turnEditHasInlineDiff(file)) {
+        preview.open(openChatEditPreview(file.path));
+        return;
+      }
+      preview.open(openChatPreviewRoot(file.path));
+    },
+    [preview.open],
+  );
+  const editPreviewPath = isChatEditPreview(preview.target) ? preview.target.path : '';
+  const selectedEdit = editPreviewPath
+    ? turnEdits.find((file) => sameEditPath(file.path, editPreviewPath)) ?? null
+    : null;
+  const showEditDiff = Boolean(
+    selectedEdit && turnEditHasInlineDiff(selectedEdit),
+  );
 
   useEffect(() => {
     preview.reset();
@@ -242,6 +271,16 @@ export default function ChatPage() {
     };
   }, [page.runChatAction]);
 
+  const switchSessions = useMemo(
+    () => filterConversations(page.conversations, page.railQuery),
+    [page.conversations, page.railQuery],
+  );
+  useChatSessionSwitch({
+    sessions: switchSessions,
+    currentId: page.activeId,
+    onFocus: page.focusConversation,
+  });
+
   if (page.error && page.conversations.length === 0 && !page.listLoading) {
     return (
       <div className="flex h-full items-center justify-center p-6">
@@ -287,7 +326,7 @@ export default function ChatPage() {
         hasUsableAgent={page.hasUsableAgent}
         deleteConfirmId={page.deleteConfirmId}
         onToggleRail={() => page.setRailOpen(false)}
-        onNewChat={() => void page.handleNewChat()}
+        onNewChat={(cwd) => void page.handleNewChat(cwd)}
         onFocus={page.focusConversation}
         onRequestDelete={page.setDeleteConfirmId}
         onCancelDelete={() => page.setDeleteConfirmId(null)}
@@ -303,13 +342,14 @@ export default function ChatPage() {
           active={page.active}
           railOpen={page.railOpen}
           recordText={formatChatSessionRecord(page.turns, t('common.you'))}
+          sessions={switchSessions}
+          sendingConversationIds={page.sendingConversationIds}
           onExpandRail={() => page.setRailOpen(true)}
           onRename={page.renameTitle}
+          onFocus={page.focusConversation}
           onOpenSettings={() => page.setSettingsOpen(true)}
           onPickWorkingDirectory={() => void page.pickWorkingDirectory()}
           runtimeLocked={page.runtimeLocked || page.sendingHere}
-          transport={page.runtimeOps.transport}
-          runtimeEnabled={Boolean(page.runtime?.enabled)}
           runtime={page.runtime}
         />
 
@@ -357,6 +397,7 @@ export default function ChatPage() {
               scrollRef={page.transcriptRef}
               bottomRef={page.bottomRef}
               onScroll={page.onTranscriptScroll}
+              onJumpToOutline={page.jumpToOutlinePrompt}
               onRetry={() => void page.retryLast()}
               hideLastTurnRetry={Boolean(page.turnOutcome)}
               onOpenLocal={openFilePreview}
@@ -442,6 +483,24 @@ export default function ChatPage() {
                     onRestoreDraft={() => page.setDraft(page.turnOutcome?.prompt ?? '')}
                   />
                 ) : null}
+                {page.snapshotBannerVisible ? (
+                  <Notice tone="warning" className="mb-2">
+                    <div className="flex flex-wrap items-start justify-between gap-2" data-help="chat-snapshot-stale">
+                      <div className="min-w-0 space-y-1">
+                        <p className="font-medium text-primary">{t('chat.runtime.snapshotStale')}</p>
+                        <p className="text-meta text-secondary">{t('chat.runtime.snapshotStaleHint')}</p>
+                      </div>
+                      <Button
+                        type="button"
+                        size="sm"
+                        variant="secondary"
+                        onClick={() => void page.retryRuntimeSnapshot()}
+                      >
+                        {t('chat.runtime.snapshotRetry')}
+                      </Button>
+                    </div>
+                  </Notice>
+                ) : null}
                 {(() => {
                   const stance = kiroChatStance(page.primaryAgent);
                   if (!stance?.showBanner) return null;
@@ -510,6 +569,11 @@ export default function ChatPage() {
                   );
                 })()}
                 <ChatPlanBar plan={page.runtime?.plan} />
+                <ChatTurnEditList
+                  files={turnEdits}
+                  selectedPath={preview.expanded ? chatPreviewPath(preview.target) : ''}
+                  onSelect={openTurnEdit}
+                />
                 <ChatComposer
                   draft={page.draft}
                   setDraft={page.setDraft}
@@ -650,7 +714,7 @@ export default function ChatPage() {
           resizeAria={t('chat.preview.resizeAria')}
           padBottom={0}
         >
-          {isChatFilePreview(preview.target) ? (
+          {isChatFilePreview(preview.target) || (isChatEditPreview(preview.target) && !showEditDiff) ? (
             <ChatMarkdownPreviewPanel
               path={chatPreviewPath(preview.target)}
               cwd={page.active?.cwd ?? ''}
@@ -663,6 +727,14 @@ export default function ChatPage() {
               onOpenLocal={openNestedFile}
               className="h-full min-w-0"
             />
+          ) : showEditDiff && selectedEdit ? (
+            <ChatEditPreviewPanel
+              file={selectedEdit}
+              open={preview.expanded}
+              width={preview.paneWidth}
+              onClose={preview.close}
+              className="h-full min-w-0"
+            />
           ) : isChatProcessInspect(preview.target) ? (
             <ChatProcessInspectPanel
               view={page.processMap[processKey(preview.target.turn, preview.target.agent)]}
diff --git a/src/pages/chat/runtime-run-state.test.ts b/src/pages/chat/runtime-run-state.test.ts
index 78ca7e22..de2491f4 100644
--- a/src/pages/chat/runtime-run-state.test.ts
+++ b/src/pages/chat/runtime-run-state.test.ts
@@ -111,6 +111,17 @@ describe('runtime state across visits and async sources', () => {
     });
     expect(messages).toHaveLength(1);
     expect(messages[0].content).toBe('haha');
+
+    const user = upsertRuntimeMessage([], {
+      id: 'client-1', conversationId: 'a', turn: 1, role: 'user',
+      content: 'hello', status: 'ok', durationMs: 0, createdAt: '',
+    });
+    const sameUser = upsertRuntimeMessage(user, {
+      id: 'client-1', conversationId: 'a', turn: 1, role: 'user',
+      content: 'hello', status: 'ok', durationMs: 0, createdAt: '',
+    });
+    expect(sameUser).toHaveLength(1);
+    expect(sameUser[0].id).toBe('client-1');
   });
 
   it('serializes a start response ahead of a later poll and rejects an older rewind', async () => {
diff --git a/src/pages/chat/use-chat-outline.ts b/src/pages/chat/use-chat-outline.ts
new file mode 100644
index 00000000..874e527a
--- /dev/null
+++ b/src/pages/chat/use-chat-outline.ts
@@ -0,0 +1,55 @@
+import { useCallback, useEffect, useState } from 'react';
+import {
+  outlinePanelElement,
+  outlinePanelWidthReady,
+  readOutlinePanelWidth,
+} from './chat-outline-model';
+import {
+  loadChatOutlineEnabled,
+  subscribeChatOutlineEnabled,
+} from './chat-outline-pref';
+
+export function useChatOutlineEnabled(override?: boolean): boolean {
+  const [enabled, setEnabled] = useState(loadChatOutlineEnabled);
+  useEffect(() => subscribeChatOutlineEnabled(setEnabled), []);
+  return override ?? enabled;
+}
+
+/**
+ * Measure the chat stage (wide panel). A numeric override is for tests / SSR
+ * so the rail can mount without ResizeObserver.
+ */
+export function useOutlinePanelWidth(enabled: boolean, override?: number): {
+  width: number;
+  assignRef: (node: HTMLDivElement | null) => void;
+} {
+  const [hostNode, setHostNode] = useState<HTMLDivElement | null>(null);
+  const [observed, setObserved] = useState(0);
+
+  const assignRef = useCallback((node: HTMLDivElement | null) => {
+    setHostNode((prev) => (prev === node ? prev : node));
+  }, []);
+
+  useEffect(() => {
+    if (outlinePanelWidthReady(override) || !enabled) return;
+    const node = hostNode;
+    if (!node) return;
+    const apply = () => {
+      const next = readOutlinePanelWidth(node);
+      setObserved((prev) => (prev === next ? prev : next));
+    };
+    apply();
+    if (typeof ResizeObserver === 'undefined') {
+      window.addEventListener('resize', apply);
+      return () => window.removeEventListener('resize', apply);
+    }
+    const observer = new ResizeObserver(apply);
+    observer.observe(outlinePanelElement(node) ?? node);
+    return () => observer.disconnect();
+  }, [enabled, hostNode, override]);
+
+  return {
+    width: outlinePanelWidthReady(override) ? override : observed,
+    assignRef,
+  };
+}
diff --git a/src/pages/chat/use-chat-page-send.ts b/src/pages/chat/use-chat-page-send.ts
index d0c52893..05c6da14 100644
--- a/src/pages/chat/use-chat-page-send.ts
+++ b/src/pages/chat/use-chat-page-send.ts
@@ -63,6 +63,16 @@ import {
   RUNTIME_SNAPSHOT_POLL_ACTIVE_MS,
   RUNTIME_SNAPSHOT_POLL_BACKGROUND_MS,
 } from './chat-streaming';
+import {
+  beginSnapshotSyncRetry,
+  idleSnapshotSync,
+  recordSnapshotPollFailure,
+  recordSnapshotPollSuccess,
+  snapshotSyncBannerDelayMs,
+  snapshotSyncForConversation,
+  snapshotSyncShowsBanner,
+  type SnapshotSyncState,
+} from './chat-snapshot-sync';
 
 /**
  * Chat 发送 / 取消 / 流式事件 / 过程面板。
@@ -117,6 +127,8 @@ export function useChatPageSend(input: {
   const [cancelingIds, setCancelingIds] = useState<string[]>([]);
   const [processMap, setProcessMap] = useState<ProcessMap>({});
   const [runtime, setRuntime] = useState<RuntimeSnapshot | null>(null);
+  const [snapshotSync, setSnapshotSync] = useState<SnapshotSyncState>(idleSnapshotSync);
+  const [snapshotRetryNonce, setSnapshotRetryNonce] = useState(0);
   const runtimeSequenceRef = useRef(new Map<string, number>());
   const runtimeRecordsRef = useRef(new Map<string, RuntimeRunRecord>());
   const runtimeViewsRef = useRef(new Map<string, RuntimeConversationView>());
@@ -162,25 +174,33 @@ export function useChatPageSend(input: {
     publishFollowUps();
   };
 
-  const appendFollowUp = (conversationId: string, prompt: string) => {
+  const appendFollowUp = (
+    conversationId: string,
+    prompt: string,
+    extras?: QueuedFollowUpItem['extras'],
+  ) => {
     setFollowUpQueue(
       conversationId,
-      appendQueuedFollowUp(followUpsRef.current.get(conversationId) ?? [], prompt),
+      appendQueuedFollowUp(followUpsRef.current.get(conversationId) ?? [], prompt, undefined, extras),
     );
   };
 
-  const prependFollowUp = (conversationId: string, prompt: string) => {
+  const prependFollowUp = (
+    conversationId: string,
+    prompt: string,
+    extras?: QueuedFollowUpItem['extras'],
+  ) => {
     setFollowUpQueue(
       conversationId,
-      prependQueuedFollowUp(followUpsRef.current.get(conversationId) ?? [], prompt),
+      prependQueuedFollowUp(followUpsRef.current.get(conversationId) ?? [], prompt, undefined, extras),
     );
   };
 
-  const dequeueFollowUp = (conversationId: string): string | null => {
+  const dequeueFollowUp = (conversationId: string): QueuedFollowUpItem | null => {
     const shifted = shiftQueuedFollowUp(followUpsRef.current.get(conversationId) ?? []);
     if (!shifted) return null;
     setFollowUpQueue(conversationId, shifted.rest);
-    return shifted.next.text;
+    return shifted.next;
   };
 
   const removeFollowUp = (conversationId: string, itemId: string) => {
@@ -281,6 +301,9 @@ export function useChatPageSend(input: {
     const canRender =
       applyUi &&
       acceptsRuntimeSnapshot(activeIdRef.current, activeGenerationRef.current, conversationId, generation);
+    if (conversationId === activeIdRef.current) {
+      setSnapshotSync((previous) => recordSnapshotPollSuccess(previous, conversationId));
+    }
     if (canRender && snapshot.currentMessage) {
       setMessages((previous) => upsertRuntimeMessage(previous, snapshot.currentMessage!));
     }
@@ -359,8 +382,8 @@ export function useChatPageSend(input: {
           },
         );
       } catch (error) {
-        if (!disposed && isLatestRuntimeRead(readId, runtimeReadRef.current.get(id) ?? 0) && runtime?.enabled) {
-          toast({ title: error instanceof Error ? error.message : String(error), variant: 'danger' });
+        if (!disposed && isLatestRuntimeRead(readId, runtimeReadRef.current.get(id) ?? 0)) {
+          setSnapshotSync((previous) => recordSnapshotPollFailure(previous, id, error, Date.now()));
         }
       } finally {
         inFlight = false;
@@ -371,7 +394,20 @@ export function useChatPageSend(input: {
     if (!shouldPoll) return () => { disposed = true; };
     const timer = window.setInterval(() => void read(), RUNTIME_SNAPSHOT_POLL_ACTIVE_MS);
     return () => { disposed = true; window.clearInterval(timer); };
-  }, [activeId, activeAgentId, runtime?.enabled, runtime?.phase]);
+  }, [activeId, activeAgentId, runtime?.enabled, runtime?.phase, snapshotRetryNonce]);
+
+  useEffect(() => {
+    setSnapshotSync((previous) => snapshotSyncForConversation(activeId, previous));
+  }, [activeId]);
+
+  useEffect(() => {
+    const delay = snapshotSyncBannerDelayMs(snapshotSync, Date.now());
+    if (delay == null) return;
+    const timer = window.setTimeout(() => {
+      setSnapshotSync((previous) => ({ ...previous }));
+    }, delay);
+    return () => window.clearTimeout(timer);
+  }, [snapshotSync.conversationId, snapshotSync.failures, snapshotSync.firstFailedAt]);
 
   // Background runs stay owned by their conversations. Poll them so a terminal
   // snapshot can release that session without a page-wide sending lock.
@@ -550,11 +586,11 @@ export function useChatPageSend(input: {
     }
   }
 
-  async function dispatchQueuedFollowUp(conversationId: string, prompt: string) {
-    const text = prompt.trim();
+  async function dispatchQueuedFollowUp(conversationId: string, item: QueuedFollowUpItem) {
+    const text = item.text.trim();
     if (!text) return;
     if (activeIdRef.current === conversationId && !sendingIdsRef.current.has(conversationId)) {
-      await sendPrompt(text, false);
+      await sendPrompt(text, false, item.extras ?? {});
       return;
     }
     markSending(conversationId);
@@ -562,7 +598,7 @@ export function useChatPageSend(input: {
     const applyUi = conversationId === activeIdRef.current;
     const fail = (error: unknown) => {
       clearSendingFor(conversationId);
-      prependFollowUp(conversationId, text);
+      prependFollowUp(conversationId, text, item.extras);
       toast({
         title: error instanceof Error ? error.message : String(error),
         variant: 'danger',
@@ -585,7 +621,7 @@ export function useChatPageSend(input: {
       try {
         await enqueueRuntimeSnapshot(
           conversationId,
-          () => runtimeStart(conversationId, text, crypto.randomUUID()),
+          () => runtimeStart(conversationId, text, crypto.randomUUID(), item.extras),
           (snapshot, sourceVersion) => {
             applyRuntimeSnapshot(
               snapshot,
@@ -614,12 +650,17 @@ export function useChatPageSend(input: {
     }
   }
 
-  async function sendPrompt(prompt: string, clearDraft: boolean) {
+  async function sendPrompt(
+    prompt: string,
+    clearDraft: boolean,
+    extrasOverride?: QueuedFollowUpItem['extras'],
+  ) {
     if (!active) return;
     if (sendingIdsRef.current.has(active.id)) {
       const next = prompt.trim();
       if (!next) return;
-      appendFollowUp(active.id, next);
+      appendFollowUp(active.id, next, getStartExtras?.());
+      clearStartExtras?.();
       if (clearDraft) setDraft('');
       toast({
         title: t('chat.toast.queuedAfterTurn'),
@@ -644,7 +685,8 @@ export function useChatPageSend(input: {
     markSending(sendConvId);
     if (clearDraft) setDraft('');
     const turnGuess = messages.reduce((max, m) => Math.max(max, m.turn), 0) + 1;
-    const localUserId = `local-user-${Date.now()}`;
+    const extras = extrasOverride !== undefined ? extrasOverride : getStartExtras?.();
+    const localUserId = crypto.randomUUID();
     setMessages((prev) => [
       ...prev,
       {
@@ -722,7 +764,7 @@ export function useChatPageSend(input: {
       try {
         await enqueueRuntimeSnapshot(
           sendConvId,
-          () => runtimeStart(sendConvId, prompt, crypto.randomUUID(), getStartExtras?.()),
+          () => runtimeStart(sendConvId, prompt, localUserId, extras),
           async (nextSnapshot, sourceVersion) => {
             const currentStartRecord = runtimeRecordsRef.current.get(sendConvId);
             if (currentStartRecord?.cancelRequested && nextSnapshot.runId && isRuntimeActive(nextSnapshot.phase)) {
@@ -1020,6 +1062,12 @@ export function useChatPageSend(input: {
     }
   }
 
+  async function retryRuntimeSnapshot() {
+    if (!activeId) return;
+    setSnapshotSync((previous) => beginSnapshotSyncRetry(previous));
+    setSnapshotRetryNonce((current) => current + 1);
+  }
+
   async function steerRuntime(prompt: string): Promise<boolean> {
     if (!active || !runtime?.enabled || !runtimeIdRef.current || !prompt.trim()) return false;
     try {
@@ -1057,6 +1105,9 @@ export function useChatPageSend(input: {
     adoptInflight,
     cancelIfSending,
     runtime,
+    snapshotSync,
+    snapshotBannerVisible: snapshotSyncShowsBanner(snapshotSync, Date.now()),
+    retryRuntimeSnapshot,
     submitRuntimeRequest,
     clearSessionAllowAlways,
     steerRuntime,
diff --git a/src/pages/chat/use-chat-page-sessions.test.ts b/src/pages/chat/use-chat-page-sessions.test.ts
index b956d975..4aa4f544 100644
--- a/src/pages/chat/use-chat-page-sessions.test.ts
+++ b/src/pages/chat/use-chat-page-sessions.test.ts
@@ -1,3 +1,4 @@
+import { readFileSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
 import type { Conversation } from '@/lib/types';
 import { mergeHandoffConversations } from './use-chat-page-sessions';
@@ -30,4 +31,20 @@ describe('mergeHandoffConversations', () => {
     const loaded = [conv('a'), conv('b')];
     expect(mergeHandoffConversations([], loaded)).toBe(loaded);
   });
+
+  it('returns the loaded list identity when the handoff session is already present', () => {
+    const folder = conv('folder', 'D:\\work\\app');
+    const existing = conv('existing');
+    const loaded = [folder, existing];
+    expect(mergeHandoffConversations([folder], loaded)).toBe(loaded);
+  });
+});
+
+describe('handleNewChat cwd', () => {
+  it('sanitizes the new-chat folder before createConversation', () => {
+    const src = readFileSync(new URL('./use-chat-page-sessions.ts', import.meta.url), 'utf8');
+    expect(src).toContain('newChatCwdArg');
+    expect(src).toContain('cwd === undefined ? defaults.cwd : cwd');
+    expect(src).not.toContain('cwdOverride === undefined ? defaults.cwd : cwdOverride');
+  });
 });
diff --git a/src/pages/chat/use-chat-page-sessions.ts b/src/pages/chat/use-chat-page-sessions.ts
index 9285e975..76da9a62 100644
--- a/src/pages/chat/use-chat-page-sessions.ts
+++ b/src/pages/chat/use-chat-page-sessions.ts
@@ -28,6 +28,7 @@ import {
   takeChatBootstrap,
 } from '@/lib/chat-bootstrap';
 import { rememberFallbackCwd } from '@/lib/chat-cwd-fallback';
+import { newChatCwdArg } from '@/lib/open-chat-cwd';
 import type { AgentKey, AgentStatus, ChatMessage, Conversation } from '@/lib/types';
 import {
   draftForFocusedConversation,
@@ -38,6 +39,8 @@ import {
 } from './chat-model';
 import { conversationListState, createSingleFlight } from './chat-request';
 
+const handoffConversationFlight = createSingleFlight<Conversation>();
+
 /** Keep conversations created by an in-flight shell/projects handoff when list load returns stale. */
 export function mergeHandoffConversations(
   prev: Conversation[],
@@ -295,13 +298,15 @@ export function useChatPageSessions(input: {
         const fromSession = Boolean(boot.sessionId?.trim() || boot.history?.length);
         let next;
         if (fromSession) {
-          next = await openConversationFromSession({
-            agentId: ids[0],
-            sessionId: boot.sessionId,
-            cwd: boot.cwd ?? null,
-            title: boot.title,
-            history: boot.history ?? [],
-          });
+          next = await handoffConversationFlight(() =>
+            openConversationFromSession({
+              agentId: ids[0],
+              sessionId: boot.sessionId,
+              cwd: boot.cwd ?? null,
+              title: boot.title,
+              history: boot.history ?? [],
+            }),
+          );
           if (boot.fallbackCwd?.trim()) {
             rememberFallbackCwd(next.id, boot.fallbackCwd);
           }
@@ -360,7 +365,7 @@ export function useChatPageSessions(input: {
     // eslint-disable-next-line react-hooks/exhaustive-deps -- one-shot when from= is set
   }, [searchParams]);
 
-  async function handleNewChat() {
+  async function handleNewChat(cwdOverride?: string | null) {
     let status = agentStatus;
     if (!agentsReady) {
       try {
@@ -374,7 +379,11 @@ export function useChatPageSessions(input: {
     if (defaults.agentIds.length === 0) return;
     try {
       if (activeId) draftsRef.current.set(activeId, draft);
-      const conv = await createConversation(defaults.agentIds, defaults.cwd);
+      const cwd = newChatCwdArg(cwdOverride);
+      const conv = await createConversation(
+        defaults.agentIds,
+        cwd === undefined ? defaults.cwd : cwd,
+      );
       setConversations((prev) => [conv, ...prev]);
       setActiveId(conv.id);
       setMessages([]);
diff --git a/src/pages/chat/use-chat-page.ts b/src/pages/chat/use-chat-page.ts
index 78f324ab..105a646c 100644
--- a/src/pages/chat/use-chat-page.ts
+++ b/src/pages/chat/use-chat-page.ts
@@ -13,6 +13,7 @@ import {
 } from '@/pages/agents/agent-card-model';
 import type { AgentKey, ChatMessage } from '@/lib/types';
 import { groupByTurn } from './chat-format';
+import { applyOutlineJumpOffset } from './chat-outline-model';
 import { forgetFallbackCwd, peekFallbackCwd } from '@/lib/chat-cwd-fallback';
 import {
   agentChatEnvReady,
@@ -26,7 +27,7 @@ import {
   firstUserContentByListedConversations,
   filterConversations,
   mergeFirstUserContentById,
-  groupConversationsByDay,
+  groupConversationsByWorkspace,
   isChatAgentSelectable,
   savedLoginAgentIdsFromWallet,
   selectConversationAgent,
@@ -593,6 +594,15 @@ export function useChatPage() {
     stickToBottomRef.current = dist <= STICK_THRESHOLD_PX;
   }, []);
 
+  const jumpToOutlinePrompt = useCallback((messageId: string) => {
+    stickToBottomRef.current = false;
+    const container = transcriptRef.current;
+    const target = document.getElementById(`chat-msg-${messageId}`);
+    if (!container || !target) return;
+    target.scrollIntoView({ block: 'start' });
+    applyOutlineJumpOffset(container, target);
+  }, []);
+
   useEffect(() => {
     if (!stickToBottomRef.current) return;
     bottomRef.current?.scrollIntoView({ block: 'nearest' });
@@ -600,7 +610,7 @@ export function useChatPage() {
 
   const railGroups = useMemo(() => {
     const filtered = filterConversations(conversations, railQuery);
-    return groupConversationsByDay(filtered, Date.now(), t);
+    return groupConversationsByWorkspace(filtered, t);
   }, [conversations, railQuery, t]);
 
   const filteredCount = useMemo(
@@ -722,6 +732,7 @@ export function useChatPage() {
     transcriptRef,
     bottomRef,
     onTranscriptScroll,
+    jumpToOutlinePrompt,
     handleNewChat,
     confirmDelete,
     patchActive,
@@ -748,6 +759,8 @@ export function useChatPage() {
     clearQueuedFollowUp: send.clearQueuedFollowUp,
     continueLegacyGrok: send.continueLegacyGrok,
     runtime: activeRuntime,
+    snapshotBannerVisible: send.snapshotBannerVisible,
+    retryRuntimeSnapshot: send.retryRuntimeSnapshot,
     runtimeLocked: isRuntimeSessionLocked(activeRuntime, {
       conversationId: active?.id,
       nativeSessionId: active?.nativeSessionId,
diff --git a/src/pages/chat/use-chat-session-switch.ts b/src/pages/chat/use-chat-session-switch.ts
new file mode 100644
index 00000000..f569d2e3
--- /dev/null
+++ b/src/pages/chat/use-chat-session-switch.ts
@@ -0,0 +1,38 @@
+import { useEffect } from 'react';
+import { hasEscPriorityOverlay } from '@/lib/skills/preview-keys';
+import {
+  adjacentSessionId,
+  chatSessionSwitchShortcutAction,
+} from './chat-session-switch';
+import { subscribeChatShortcutKeydown } from './chat-shortcuts';
+
+export function useChatSessionSwitch(input: {
+  sessions: readonly { id: string }[];
+  currentId: string | null;
+  onFocus: (id: string) => void;
+}): void {
+  const { sessions, currentId, onFocus } = input;
+  const idsKey = sessions.map((item) => item.id).join('\n');
+
+  useEffect(() => {
+    const list = idsKey === '' ? [] : idsKey.split('\n').map((id) => ({ id }));
+    return subscribeChatShortcutKeydown((event) => {
+      if (event.isComposing) return;
+      const action = chatSessionSwitchShortcutAction({
+        key: event.key,
+        code: event.code,
+        altKey: event.altKey,
+        metaKey: event.metaKey,
+        ctrlKey: event.ctrlKey,
+        shiftKey: event.shiftKey,
+        overlayOpen: hasEscPriorityOverlay(),
+      });
+      if (!action) return;
+      const target = adjacentSessionId(list, currentId, action);
+      if (!target) return;
+      event.preventDefault();
+      event.stopPropagation();
+      onFocus(target);
+    });
+  }, [currentId, idsKey, onFocus]);
+}
diff --git a/src/pages/projects/project-format.test.ts b/src/pages/projects/project-format.test.ts
index 270d4c3b..e7f2f452 100644
--- a/src/pages/projects/project-format.test.ts
+++ b/src/pages/projects/project-format.test.ts
@@ -29,6 +29,15 @@ describe('displayTitle', () => {
     expect(displayTitle({ title: 'app', alias: '   ' })).toBe('app');
     expect(displayTitle({ title: 'app' })).toBe('app');
   });
+
+  it('uses the folder name when the stored title is a current-dir dot', () => {
+    expect(
+      displayTitle({
+        title: '.',
+        actualPath: 'C:\\Users\\demo\\AgentHub\\.',
+      }),
+    ).toBe('AgentHub');
+  });
 });
 
 describe('projectDisplayPath', () => {
diff --git a/src/pages/projects/project-format.ts b/src/pages/projects/project-format.ts
index 8d897e95..6b646305 100644
--- a/src/pages/projects/project-format.ts
+++ b/src/pages/projects/project-format.ts
@@ -1,11 +1,30 @@
 import type { TranslateFn } from '@/lib/i18n';
+import { folderNameFromCwd } from '@/lib/open-chat-cwd';
 import { restoreProjectWorkspacePath } from '@/lib/path-open';
 import { nativeResumeCommand as planResumeCommand } from '@/lib/session-resume';
 import type { AgentProject, AgentSession } from '@/lib/types';
 
-export function displayTitle(p: Pick<AgentProject, 'title' | 'alias'>): string {
-  const a = p.alias?.trim();
-  return a || p.title;
+function usableName(raw?: string | null): string {
+  const name = raw?.trim() ?? '';
+  if (!name || name === '.' || name === '..') return '';
+  return name;
+}
+
+export function displayTitle(
+  p: Pick<AgentProject, 'title' | 'alias'> &
+    Partial<Pick<AgentProject, 'agentId' | 'actualPath' | 'relativePath' | 'storagePath'>>,
+): string {
+  const alias = usableName(p.alias);
+  if (alias) return alias;
+  const title = usableName(p.title);
+  if (title) return title;
+  const path =
+    restoreProjectWorkspacePath(p)
+    || p.actualPath?.trim()
+    || p.relativePath?.trim()
+    || p.storagePath?.trim()
+    || '';
+  return usableName(folderNameFromCwd(path)) || p.title;
 }
 
 /** Restored address for display. Click-to-open still requires a verified actualPath. */
diff --git a/src/pages/projects/project-groups.test.ts b/src/pages/projects/project-groups.test.ts
index cd10a810..7dfa76b1 100644
--- a/src/pages/projects/project-groups.test.ts
+++ b/src/pages/projects/project-groups.test.ts
@@ -84,6 +84,7 @@ describe('groupProjectsByPath', () => {
 
   it('normalizes Windows slash, case, and trailing separators', () => {
     expect(normalizeProjectMergePath('C:\\Users\\demo\\app\\')).toBe('c:/users/demo/app');
+    expect(normalizeProjectMergePath('C:\\Users\\demo\\app\\.')).toBe('c:/users/demo/app');
     expect(normalizeProjectMergePath('\\\\Server\\Share\\App\\')).toBe('//server/share/app');
     expect(projectMergeKey(claudeApp)).toBe(projectMergeKey(grokApp));
   });
@@ -103,6 +104,7 @@ describe('groupProjectsByPath', () => {
     });
     expect(normalizeProjectMergePath('/work/App')).toBe('/work/App');
     expect(normalizeProjectMergePath('/work/app/')).toBe('/work/app');
+    expect(normalizeProjectMergePath('/work/app/.')).toBe('/work/app');
     expect(projectMergeKey(upper)).not.toBe(projectMergeKey(lower));
     expect(groupProjectsByPath([upper, lower], true)).toHaveLength(2);
   });
diff --git a/src/pages/projects/project-groups.ts b/src/pages/projects/project-groups.ts
index 54a6d0b1..b31ab322 100644
--- a/src/pages/projects/project-groups.ts
+++ b/src/pages/projects/project-groups.ts
@@ -31,7 +31,11 @@ function isWindowsWorkspacePath(path: string): boolean {
 /** Unify separators and trailing slashes without conflating POSIX case variants. */
 export function normalizeProjectMergePath(path: string): string {
   const slashUnified = path.replace(/\\/g, '/');
-  const normalized = slashUnified.replace(/\/+$/, '') || '/';
+  let normalized = slashUnified.replace(/\/+$/, '') || '/';
+  // Explorer / PathBuf often keep a trailing `/.` current-dir segment.
+  while (normalized.endsWith('/.') && normalized.length > 2) {
+    normalized = normalized.slice(0, -2).replace(/\/+$/, '') || '/';
+  }
   return isWindowsWorkspacePath(path) ? normalized.toLowerCase() : normalized;
 }
 
diff --git a/src/pages/settings/PreferencesPanel.tsx b/src/pages/settings/PreferencesPanel.tsx
index 38ced053..7d6faf59 100644
--- a/src/pages/settings/PreferencesPanel.tsx
+++ b/src/pages/settings/PreferencesPanel.tsx
@@ -21,6 +21,10 @@ import { applyTheme } from '@/lib/theme';
 import { notifyUsageSettingsChanged } from '@/lib/usage-sync';
 import { cn } from '@/lib/utils';
 import { ACCENT_IDS, ACCENT_PALETTES, CANVAS_IDS, CANVAS_PALETTES } from '@/styles/tokens';
+import {
+  loadChatOutlineEnabled,
+  saveChatOutlineEnabled,
+} from '@/pages/chat/chat-outline-pref';
 import {
   createSettingsPersistenceTracker,
   mergeSettingsResponse,
@@ -70,6 +74,7 @@ export function PreferencesPanel({
   const { t, setLanguage } = useI18n();
   const [accent, setAccent] = useState(loadStoredAccent);
   const [canvas, setCanvas] = useState(loadStoredCanvas);
+  const [chatOutlineEnabled, setChatOutlineEnabled] = useState(loadChatOutlineEnabled);
   const usageBaselineRef = useRef(settings.usageCollectIntervalMin);
   const persistenceTrackerRef = useRef<ReturnType<typeof createSettingsPersistenceTracker> | null>(null);
 
@@ -248,6 +253,18 @@ export function PreferencesPanel({
             })}
           </div>
         </SettingsRow>
+        <SettingsRow
+          label={t('settings.general.chatOutlineLabel')}
+          description={t('settings.general.chatOutlineDescription')}
+        >
+          <Switch
+            checked={chatOutlineEnabled}
+            onCheckedChange={(v) => {
+              setChatOutlineEnabled(v);
+              saveChatOutlineEnabled(v);
+            }}
+          />
+        </SettingsRow>
       </SettingsGroup>
       <SettingsGroup title={t('settings.general.sectionLaunch')}>
         <SettingsRow
diff --git a/src/pages/settings/settings-format.test.ts b/src/pages/settings/settings-format.test.ts
index 29ea8e7c..66da6575 100644
--- a/src/pages/settings/settings-format.test.ts
+++ b/src/pages/settings/settings-format.test.ts
@@ -179,6 +179,22 @@ describe('settings-format i18n helpers', () => {
   it('labels preference groups in the active language', () => {
     expect(tZh('settings.general.sectionAppearance')).toBe('语言与外观');
     expect(tEn('settings.general.sectionAppearance')).toBe('Language and appearance');
+    expect(tZh('settings.general.chatOutlineLabel')).toBe('聊天大纲');
+    expect(tEn('settings.general.chatOutlineLabel')).toBe('Chat outline');
+    expect(tZh('settings.general.chatOutlineDescription')).toBe(
+      '显示用于在提示词之间跳转的大纲',
+    );
+    expect(tEn('settings.general.chatOutlineDescription')).toBe(
+      'Show an outline for jumping between prompts',
+    );
+    expect(tZh('chat.outline.aria')).toBe('聊天大纲');
+    expect(tEn('chat.outline.aria')).toBe('Chat outline');
+    expect(tZh('chat.outline.tick', { n: 1, total: 2, preview: 'hello' })).toBe(
+      '1 / 2：hello',
+    );
+    expect(tEn('chat.outline.tick', { n: 1, total: 2, preview: 'hello' })).toBe(
+      '1 of 2: hello',
+    );
     expect(tZh('settings.general.sectionLaunch')).toBe('启动与关闭');
     expect(tEn('settings.general.sectionLaunch')).toBe('Launch and close');
     expect(tZh('settings.general.sectionSidebarNav')).toBe('侧栏菜单');
diff --git a/src/pages/settings/settings-layout.test.ts b/src/pages/settings/settings-layout.test.ts
index a062288c..da6b5388 100644
--- a/src/pages/settings/settings-layout.test.ts
+++ b/src/pages/settings/settings-layout.test.ts
@@ -95,6 +95,8 @@ describe('settings layout wiring', () => {
     expect(prefs).not.toContain("aria-label={t('settings.general.autoStartLabel')}");
     expect(prefs).not.toContain("aria-label={t('settings.general.closeToTrayLabel')}");
     expect(prefs).not.toContain("aria-label={t('settings.data.usageIntervalLabel')}");
+    expect(prefs).toContain("t('settings.general.chatOutlineLabel')");
+    expect(prefs).not.toContain("aria-label={t('settings.general.chatOutlineLabel')}");
     expect(shared).toContain('aria-labelledby');
     expect(shared).toContain('aria-describedby');
   });