illusion-code 0.2.7__tar.gz → 0.2.9__tar.gz

{illusion_code-0.2.7 → illusion_code-0.2.9}/.github/workflows/publish.yml

@@ -29,7 +29,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install build twine pytest ruff
-          pip install -e ".[dev]"
+          pip install -e ".[dev,all]"
 
       - name: Lint
         run: ruff check src/

{illusion_code-0.2.7 → illusion_code-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: illusion-code
-Version: 0.2.7
+Version: 0.2.9
 Summary: Open-source Python port of Claude Code - an AI-powered CLI coding assistant
 Project-URL: Homepage, https://github.com/YunTaiHua/illusion-code
 Project-URL: Repository, https://github.com/YunTaiHua/illusion-code
@@ -37,6 +37,11 @@ Requires-Dist: typer>=0.12.0
 Requires-Dist: uvicorn[standard]>=0.34.0
 Requires-Dist: watchfiles>=0.20.0
 Requires-Dist: websockets>=12.0
+Provides-Extra: all
+Requires-Dist: aiohttp>=3.9.0; extra == 'all'
+Requires-Dist: cryptography>=42.0.0; extra == 'all'
+Requires-Dist: lark-oapi>=1.4.0; extra == 'all'
+Requires-Dist: qrcode>=7.4.0; extra == 'all'
 Provides-Extra: dev
 Requires-Dist: mypy>=1.10.0; extra == 'dev'
 Requires-Dist: pexpect>=4.9.0; extra == 'dev'

{illusion_code-0.2.7 → illusion_code-0.2.9}/docs/en/architecture.md

@@ -60,6 +60,16 @@ Provides 34 core tools, covering:
 - **Interaction**: `ask_user_question`
 - **Scheduled Tasks**: `cron` (unified tool with status/list/add/update/remove/run actions)
 
+### Scheduled Tasks & Delivery Pipeline
+
+The cron subsystem is composed of three cooperating modules:
+
+- `services/cron.py` — CronJob data model and persistence (`cron.json`)
+- `services/cron_scheduler.py` — scheduler process; runs the prompt in a subprocess and delivers the result to a channel based on the `deliver_to` field
+- `channels/delivery.py` — delivery module; `parse_deliver_to` parses the target, `deliver_to_channel` dispatches to Feishu/WeChat/QQ `_deliver_*` functions
+
+Delivery targets accept `channel:chat_id` (fully qualified) or a bare channel name (combined with the `chat_id` field). Failed jobs include stderr in the delivered text so users can see the error. See [Channels doc](channels.md#cron-job-result-delivery) for details.
+
 ### Permission System
 
 Three permission modes:

{illusion_code-0.2.7 → illusion_code-0.2.9}/docs/en/channels.md

@@ -261,38 +261,94 @@ Send a message to your bot in QQ — private chat replies directly, group chat r
 - **No message editing** — replies are sent as complete text
 - **4000 char limit** — longer replies auto-split into multiple messages with 1.5s delay
 - **File sending** — supports 3-step chunked upload
+- **Markdown dynamic hint** — when `markdown_support` is `true` in `channels.json`, the platform prompt tells the LLM that markdown is available (msg_type=2); when `false` (default), the prompt forces plain text (msg_type=0) and `send_text` auto-degrades to plain text on failure. Keep the default `false` for normal developer accounts without template permissions
+- **Attachment download security** — when downloading QQ inbound attachments, the bot token is only attached for `.qq.com` / `.qq.com.cn` hosts, preventing access_token leakage via malicious URLs
 
 ## Channel Architecture
 
 ```
 src/illusion/channels/
-├── __init__.py          # ChannelRunner (message→agent glue) + maybe_spawn_channel_daemon
-├── base.py              # Channel ABC + InboundMessage + typing methods
+├── __init__.py          # ChannelRunner (message→agent glue) + maybe_spawn_channel_daemon + kill_channel_daemon
+├── base.py              # Channel ABC + InboundMessage + Attachment + typing methods
 ├── base_commands.py     # BaseCommandHandler (shared slash commands)
 ├── config.py            # ChannelsConfig / FeishuChannelConfig / WeixinChannelConfig
+├── delivery.py          # cron job result delivery to channels (parse_deliver_to + deliver_to_channel)
 ├── serve.py             # 'illusion channel serve' entry point (multi-channel)
 ├── pid.py               # PID file management (avoid duplicate daemons)
 ├── feishu/
 │   ├── adapter.py       # FeishuChannel: WS connection, event dispatch, admission control
 │   ├── ws_client.py     # lark-oapi WS client wrapper
-│   ├── messaging.py     # Card send/patch, message rendering
+│   ├── messaging.py     # Card send/patch, message rendering, resolve_receive_id
 │   ├── stream_editor.py # Streaming card editor (throttled patch updates)
 │   ├── session_map.py   # Feishu session store (chat_id → session)
 │   └── commands.py      # FeishuCommandHandler (extends BaseCommandHandler)
 ├── weixin/
 │   ├── __init__.py      # WEIXIN_DEPENDENCIES / ensure_weixin_dependencies
-│   ├── adapter.py       # WeixinChannel: long-poll, admission, context_token, typing
-│   ├── ilink_api.py     # iLink Bot API client (QR login / send / poll / typing)
+│   ├── adapter.py       # WeixinChannel: long-poll, admission, context_token, AES key cache, typing
+│   ├── ilink_api.py     # iLink Bot API client (QR login / send / poll / typing / CDN allowlist)
 │   ├── session_map.py   # WeixinSessionStore (user_id → session)
 │   └── commands.py      # WeixinCommandHandler (extends BaseCommandHandler)
 ├── qq/
 │   ├── __init__.py      # QQ_DEPENDENCIES / ensure_qq_dependencies
-│   ├── adapter.py       # QQChannel: WS connection, admission, message normalization
+│   ├── adapter.py       # QQChannel: WS connection, admission, message normalization, attachment host validation
 │   ├── ws_client.py     # QQ Bot WS gateway client (heartbeat/reconnect/events)
-│   ├── api.py           # QQ Bot REST API client (token/send/upload)
+│   ├── api.py           # QQ Bot REST API client (token/send/upload/_parse_qq_response)
 │   ├── session_map.py   # QQSessionStore (chat_id → session)
 │   └── commands.py      # QQCommandHandler (extends BaseCommandHandler)
 └── tools/
     ├── feishu_doc.py    # feishu_doc_read / feishu_doc_create
-    └── feishu_drive.py  # feishu_drive_list / upload / download
+    ├── feishu_drive.py  # feishu_drive_list / upload / download
+    └── media.py         # SendMediaTool / ReceiveMediaTool (activated by channel config)
 ```
+
+## Cron Job Result Delivery
+
+Cron jobs can deliver execution results to Feishu/WeChat/QQ channel sessions. Configure via the `deliver_to` field in `cron_tool.py`:
+
+- **Empty** — local execution only (terminal output)
+- **`channel:chat_id`** — fully qualified format, e.g. `feishu:oc_xxx` (group), `feishu:ou_xxx` (private), `weixin:wxid_xxx`, `qq:openid`
+- **`channel` (name only)** — requires the `chat_id` field; otherwise treated as "unspecified"
+
+Session filename prefix rules (for extracting the real ID from `~/.illusion/channels/<channel>/sessions/`):
+
+| Channel | Filename format | Real ID |
+|---------|-----------------|---------|
+| Feishu private | `u_ou_xxx.json` | `ou_xxx` (strip `u_` prefix) |
+| Feishu group | `g_oc_xxx_ou_xxx.json` | `oc_xxx` (use the `oc_` part) |
+| WeChat | `u_<wxid>.json` | `<wxid>` (strip `u_` prefix) |
+| QQ | `<openid>.json` | `<openid>` (filename is the ID) |
+
+Delivery failures do not affect task status; only a warning is logged. Failed jobs (non-success status) include stderr in the delivered text so users can see the error.
+
+## Concurrent Message Handling
+
+When a user sends multiple messages in quick succession, `ChannelRunner` serializes agent turns per `chat_id` using an `asyncio.Lock` to prevent session history corruption:
+
+- M1 acquires the lock and starts the agent; M2/M3 enter the queue and wait
+- After M1 completes (or exits pending_replies wait), M2 acquires the lock
+- Permission/ask reply messages are **not locked** — they immediately `set_result` the waiting future, avoiding 300s timeouts
+- Different `chat_id`s run fully in parallel without blocking each other
+
+This ensures conversation history is written in order for the same session, preventing the race condition where "M1/A1 and M3/A3 are lost, only M2/A2 remains."
+
+## Cross-Channel File Transfer
+
+When multiple channels are enabled, the LLM can perceive all enabled channels and transfer files across channels.
+
+### How It Works
+
+1. **Channel-aware prompts**: System prompt includes current channel identity + overview of other enabled channels (with active sessions)
+2. **Cross-channel tool**: `send_to_channel` for cross-channel file transfer, `send_media` for within-current-channel
+3. **Active session list**: Up to 5 recent sessions per channel (sorted by last active time) to help LLM decide delivery target
+
+### Use Cases
+
+- **PC terminal → channel**: User says "send this file to Zhang San on Feishu"
+- **Channel → channel**: User on QQ says "send this file to WeChat"
+- **Within channel (default)**: User on QQ says "send this file" → uses `send_media` to current QQ session
+
+### Limitations
+
+- For cross-channel **text** messages, use cron tasks (`send_to_channel` only supports files)
+- QQ and WeChat file upload APIs are complex; current version uses text prompts as fallback. Feishu is fully supported
+- Active session list comes from session storage directory; users never interacted with won't appear

{illusion_code-0.2.7 → illusion_code-0.2.9}/docs/en/commands.md

@@ -24,7 +24,7 @@ illusion plugin list             # List plugins
 illusion plugin install <source> # Install plugin
 illusion plugin uninstall <name> # Uninstall plugin
 
-# Channel management (Feishu/Lark messaging)
+# Channel management (Feishu/WeChat/QQ messaging)
 illusion channel login           # Interactive channel setup (select channel → configure credentials)
 illusion channel serve           # Run channel daemon in foreground (listen for messages)
 illusion channel status          # View channel status (enabled/connected/PID)

{illusion_code-0.2.7 → illusion_code-0.2.9}/docs/zh-CN/architecture.md

@@ -62,6 +62,16 @@ illusion-code/
 - **交互**: `ask_user_question`
 - **定时任务**: `cron`（统一工具，支持 status/list/add/update/remove/run 操作）
 
+### 定时任务与投递链路
+
+定时任务子系统由三个模块协作：
+
+- `services/cron.py` — 任务数据模型（CronJob）与持久化（`cron.json`）
+- `services/cron_scheduler.py` — 调度器进程，子进程执行提示词，按 `deliver_to` 字段投递结果到渠道
+- `channels/delivery.py` — 渠道投递模块，`parse_deliver_to` 解析目标，`deliver_to_channel` 派发到飞书/微信/QQ 的 `_deliver_*` 函数
+
+投递目标支持 `channel:chat_id` 完全限定格式或仅渠道名（配合 `chat_id` 字段）。任务失败时附 stderr 让用户可见错误。详见 [渠道文档](channels.md#cron-任务结果投递)。
+
 ### 权限系统
 
 三种权限模式：

{illusion_code-0.2.7 → illusion_code-0.2.9}/docs/zh-CN/channels.md

@@ -223,6 +223,7 @@ illusion channel serve      # 前台模式（查看日志）
 - **不支持消息编辑**——回复作为完整文本发送（打字状态指示处理中）
 - **2000 字符限制**——超长回复自动分多条发送，间隔 1.5s
 - **会话过期**——如果看到 `errcode=-14`，重新运行 `illusion channel login` 扫码
+- **附件 AES 加密**——入站图片/视频/文件/语音经 CDN 传输时使用 AES-128-ECB + PKCS#7 加密，密钥按 `{msg_id}:{att_id}` 缓存，跨消息不会串键；依赖 `cryptography` 包（首次登录时自动安装）
 
 ### 快速开始（QQ）
 
@@ -268,33 +269,87 @@ illusion channel serve      # 前台模式（查看日志）
 
 ```
 src/illusion/channels/
-├── __init__.py          # ChannelRunner（消息→agent 粘合层）+ maybe_spawn_channel_daemon
-├── base.py              # Channel 抽象基类 + InboundMessage + 打字状态方法
+├── __init__.py          # ChannelRunner（消息→agent 粘合层）+ maybe_spawn_channel_daemon + kill_channel_daemon
+├── base.py              # Channel 抽象基类 + InboundMessage + Attachment + 打字状态方法
 ├── base_commands.py     # BaseCommandHandler（通用斜杠命令基类）
 ├── config.py            # ChannelsConfig / FeishuChannelConfig / WeixinChannelConfig
+├── delivery.py          # cron 任务结果投递到渠道（parse_deliver_to + deliver_to_channel）
 ├── serve.py             # 'illusion channel serve' 入口（多渠道调度）
 ├── pid.py               # PID 文件管理（避免重复启动守护进程）
 ├── feishu/
 │   ├── adapter.py       # FeishuChannel：WS 连接、事件分发、准入控制
 │   ├── ws_client.py     # lark-oapi WS 客户端包装
-│   ├── messaging.py     # 卡片发送/更新、消息渲染
+│   ├── messaging.py     # 卡片发送/更新、消息渲染、resolve_receive_id
 │   ├── stream_editor.py # 流式卡片编辑器（节流 patch 更新）
 │   ├── session_map.py   # 飞书会话存储（chat_id → 会话）
 │   └── commands.py      # FeishuCommandHandler（继承 BaseCommandHandler）
 ├── weixin/
 │   ├── __init__.py      # WEIXIN_DEPENDENCIES / ensure_weixin_dependencies
-│   ├── adapter.py       # WeixinChannel：长轮询、准入、context_token、打字状态
-│   ├── ilink_api.py     # iLink Bot API 客户端（扫码/收发/打字/分片）
+│   ├── adapter.py       # WeixinChannel：长轮询、准入、context_token、AES 密钥缓存、打字状态
+│   ├── ilink_api.py     # iLink Bot API 客户端（扫码/收发/打字/分片/CDN allowlist）
 │   ├── session_map.py   # WeixinSessionStore（user_id → 会话）
 │   └── commands.py      # WeixinCommandHandler（继承 BaseCommandHandler）
 ├── qq/
 │   ├── __init__.py      # QQ_DEPENDENCIES / ensure_qq_dependencies
-│   ├── adapter.py       # QQChannel：WS 连接、准入、消息标准化
+│   ├── adapter.py       # QQChannel：WS 连接、准入、消息标准化、附件 host 校验
 │   ├── ws_client.py     # QQ Bot WS 网关客户端（心跳/重连/事件分发）
-│   ├── api.py           # QQ Bot REST API 客户端（token/收发/上传）
+│   ├── api.py           # QQ Bot REST API 客户端（token/收发/上传/_parse_qq_response）
 │   ├── session_map.py   # QQSessionStore（chat_id → 会话）
 │   └── commands.py      # QQCommandHandler（继承 BaseCommandHandler）
 └── tools/
     ├── feishu_doc.py    # feishu_doc_read / feishu_doc_create
-    └── feishu_drive.py  # feishu_drive_list / upload / download
+    ├── feishu_drive.py  # feishu_drive_list / upload / download
+    └── media.py         # SendMediaTool / ReceiveMediaTool（按渠道配置激活）
 ```
+
+### Cron 任务结果投递
+
+cron 定时任务支持把执行结果投递到飞书/微信/QQ 渠道会话。配置在 `cron_tool.py` 的 `deliver_to` 字段中指定：
+
+- **空值**——任务仅本地执行（终端输出）
+- **`channel:chat_id`**——完全限定格式，例如 `feishu:oc_xxx`（群聊）、`feishu:ou_xxx`（私聊）、`weixin:wxid_xxx`、`qq:openid`
+- **`channel`（仅渠道名）**——需配合 `chat_id` 字段，否则按"未指定"处理
+
+会话文件名前缀规则（用于从 `~/.illusion/channels/<channel>/sessions/` 提取真实 ID）：
+
+| 渠道 | 文件名格式 | 真实 ID |
+|------|-----------|---------|
+| 飞书私聊 | `u_ou_xxx.json` | `ou_xxx`（去掉 `u_` 前缀） |
+| 飞书群聊 | `g_oc_xxx_ou_xxx.json` | `oc_xxx`（取 `oc_` 部分） |
+| 微信 | `u_<wxid>.json` | `<wxid>`（去掉 `u_` 前缀） |
+| QQ | `<openid>.json` | `<openid>`（文件名即 ID） |
+
+投递失败不影响任务状态，仅记录 warning 日志。任务失败时（非成功状态）会附上 stderr 让用户可见错误。
+
+### 消息并发处理
+
+当用户快速连发多条消息时，`ChannelRunner` 按 `chat_id` 加 `asyncio.Lock` 串行化 agent turn，避免会话历史覆盖：
+
+- M1 拿到锁后开始跑 agent，M2/M3 进入队列等待
+- M1 完成（或退出 pending_replies 等待）后，M2 拿到锁开始处理
+- 权限/询问回复消息**不加锁**，立即 set_result 给等待中的 future，避免 300s 超时
+- 不同 `chat_id` 之间完全并行，互不阻塞
+
+这保证同一会话的对话历史按顺序写入，不会出现"M1/A1 和 M3/A3 丢失、只保留 M2/A2"的 race condition。
+
+## 跨渠道文件传输
+
+当多个渠道同时启用时，LLM 能感知所有已启用渠道并跨渠道传输文件。
+
+### 工作机制
+
+1. **渠道感知提示词**：系统提示词中包含当前渠道身份 + 其他已启用渠道概览（含活跃会话列表）
+2. **跨渠道工具**：`send_to_channel` 工具用于跨渠道发文件，`send_media` 用于当前渠道内发文件
+3. **活跃会话列表**：每个渠道最近 5 个会话（按最后活跃时间排序），帮助 LLM 决定投递目标
+
+### 使用场景
+
+- **PC 终端 → 渠道**：用户在 PC 终端说"把这个文件发到飞书的张三"
+- **渠道 → 渠道**：用户在 QQ 上说"把这个文件发到微信"
+- **渠道内（默认）**：用户在 QQ 上说"发这个文件"→ 用 `send_media` 发到当前 QQ 会话
+
+### 限制
+
+- 跨渠道**文本**消息投递请使用 cron 任务（`send_to_channel` 仅支持文件）
+- QQ 和微信的文件上传 API 较复杂，当前版本暂用文本提示替代，飞书已完整支持
+- 活跃会话列表来自会话存储目录，从未交互过的用户不会出现在列表中

{illusion_code-0.2.7 → illusion_code-0.2.9}/docs/zh-CN/commands.md

@@ -26,7 +26,7 @@ illusion plugin list             # 列出插件
 illusion plugin install <source> # 安装插件
 illusion plugin uninstall <name> # 卸载插件
 
-# 渠道管理（飞书等消息渠道）
+# 渠道管理（飞书/微信/QQ 消息渠道）
 illusion channel login           # 交互式配置渠道（选择渠道 → 配置凭据）
 illusion channel serve           # 前台运行渠道守护进程（监听消息）
 illusion channel status          # 查看渠道状态（启用/连接/PID）

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/terminal/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@illusion/terminal",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@illusion/terminal",
-      "version": "0.2.7",
+      "version": "0.2.9",
       "dependencies": {
         "chalk": "^5.6.2",
         "ink": "^5.1.0",

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/terminal/package.json

@@ -24,5 +24,5 @@
     "tsx": "^4.19.2",
     "typescript": "^5.7.3"
   },
-  "version": "0.2.7"
+  "version": "0.2.9"
 }

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/terminal/src/tools/registry.ts

@@ -120,6 +120,24 @@ function ensureInitialized(): void {
 	register(createGenericTool('mcp_auth', 'McpAuth'));
 	register(createGenericTool('structured_output', 'StructuredOutput'));
 
+	// 渠道媒体工具（当前渠道内发/收文件）
+	register(createGenericTool('send_media', 'SendMedia'));
+	register(createGenericTool('receive_media', 'ReceiveMedia'));
+	// 跨渠道文件传输
+	register(createGenericTool('list_channel_sessions', 'ListChannelSessions'));
+	register(createGenericTool('send_to_channel', 'SendToChannel'));
+	// 飞书文档工具
+	register(createGenericTool('feishu_doc_read', 'FeishuDocRead'));
+	register(createGenericTool('feishu_doc_create', 'FeishuDocCreate'));
+	register(createGenericTool('feishu_doc_write', 'FeishuDocWrite'));
+	register(createGenericTool('feishu_doc_delete', 'FeishuDocDelete'));
+	// 飞书云盘工具
+	register(createGenericTool('feishu_drive_list', 'FeishuDriveList'));
+	register(createGenericTool('feishu_drive_upload', 'FeishuDriveUpload'));
+	register(createGenericTool('feishu_drive_download', 'FeishuDriveDownload'));
+	register(createGenericTool('feishu_drive_mkdir', 'FeishuDriveMkdir'));
+	register(createGenericTool('feishu_drive_delete', 'FeishuDriveDelete'));
+
 	// 专用工具（需要特殊处理）
 	register({
 		name: 'todo_write',

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/terminal/src/version.ts

@@ -6,4 +6,4 @@
  */
 
 /** 当前版本号 */
-export const VERSION = '0.2.7';
+export const VERSION = '0.2.9';

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/web/index.html

@@ -7,6 +7,18 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Inter:opsz,wght@14..32,100..900&family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap" rel="stylesheet" />
     <title>Illusion Code</title>
+    <script>
+      // 预加载主题：在 React 渲染前应用 dark 类，避免深色模式 FOUC 闪烁
+      (function() {
+        try {
+          var stored = localStorage.getItem('illusion-theme');
+          var prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+          if (stored === 'dark' || (stored !== 'light' && prefersDark)) {
+            document.documentElement.classList.add('dark');
+          }
+        } catch (e) { /* 忽略 */ }
+      })();
+    </script>
   </head>
   <body>
     <div id="root"></div>

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@illusion/web",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@illusion/web",
-      "version": "0.2.7",
+      "version": "0.2.9",
       "dependencies": {
         "highlight.js": "^11.11.0",
         "react": "^18.3.1",

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@illusion/web",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "private": true,
   "type": "module",
   "scripts": {

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/web/src/components/ChatArea.tsx

@@ -29,15 +29,32 @@ const BOTTOM_THRESHOLD_PX = 80;
  * - thinkingItems：工具调用 + 中间 assistant 消息（归入"思考过程"可折叠区）
  * - finalAssistant：最后一条含文本的 assistant 消息（始终可见，其 reasoning 归入思考区）
  *
+ * 流式阶段（streaming=true）所有 assistant 消息都视作思考过程的一部分：
+ * 最终回复由 StreamingBuffer 实时展示，避免中间 LLM 消息被误判为最终回复，
+ * 导致后续工具调用显示在消息上方、以及复制/回退按钮闪烁等问题。
+ *
  * @param items - 单轮转录项列表
+ * @param streaming - 是否处于流式输出阶段
  * @returns 拆分结果
  */
-function splitTurnItems(items: TranscriptItem[]) {
+function splitTurnItems(items: TranscriptItem[], streaming: boolean = false) {
   const userItems: TranscriptItem[] = [];
   const thinkingItems: TranscriptItem[] = [];
   let finalAssistant: TranscriptItem | null = null;
 
-  // 找到最后一条有非空 text 的 assistant 消息作为"最终回复"
+  // 流式阶段：所有 assistant 消息归入思考过程，不区分"最终回复"
+  if (streaming) {
+    for (const item of items) {
+      if (item.role === 'user') {
+        userItems.push(item);
+      } else {
+        thinkingItems.push(item);
+      }
+    }
+    return { userItems, thinkingItems, finalAssistant };
+  }
+
+  // 完成态：找最后一条有非空 text 的 assistant 消息作为"最终回复"
   let lastAssistantIdx = -1;
   for (let i = items.length - 1; i >= 0; i--) {
     if (items[i]!.role === 'assistant' && items[i]!.text.trim()) {
@@ -278,6 +295,18 @@ export default function ChatArea({
     el.scrollTop = el.scrollHeight;
   }, [staticItems, assistantBuffer, streamingReasoning, pendingToolCalls, modal]);
 
+  // 用户发送新消息时强制回到底部（忽略用户是否手动上滑过）
+  const userMsgCount = useMemo(() => staticItems.filter((i) => i.role === 'user').length, [staticItems]);
+  const prevUserMsgCountRef = useRef(0);
+  useEffect(() => {
+    if (userMsgCount > prevUserMsgCountRef.current) {
+      userScrolledUpRef.current = false;
+      const el = scrollRef.current;
+      if (el) el.scrollTop = el.scrollHeight;
+    }
+    prevUserMsgCountRef.current = userMsgCount;
+  }, [userMsgCount]);
+
   // 新会话或恢复后重置展开状态
   useEffect(() => {
     setExpanded(false);
@@ -329,8 +358,8 @@ export default function ChatArea({
         {visibleTurns.map((turn, visIdx) => {
           const turnIdx = turnOffset + visIdx;
           const isLastTurn = turnIdx === turns.length - 1;
-          const { userItems, thinkingItems, finalAssistant } = splitTurnItems(turn);
           const autoExpand = busy && isLastTurn;
+          const { userItems, thinkingItems, finalAssistant } = splitTurnItems(turn, autoExpand);
           const turnsToRewind = turns.length - turnIdx;
           return (
             <div key={turnIdx} className={visIdx > 0 ? 'mt-12' : ''}>

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/web/src/components/MessageBubble.tsx

@@ -19,6 +19,7 @@ import rehypeHighlight from 'rehype-highlight';
 import rehypeRaw from 'rehype-raw';
 import 'highlight.js/styles/github.css';
 import { t, type UiLanguage } from '../i18n';
+import { toolDisplayName } from '../utils/toolDisplayName';
 import type { TranscriptItem, PendingToolCall } from '../types/protocol';
 
 /** 从 rehype-highlight 注入的 className 中提取语言名 */
@@ -266,7 +267,9 @@ export default function MessageBubble({ item, toolInputMap, lang = 'zh-CN', onRe
  */
 function ToolResultBubble({ name, text, isError, toolInput }: { name: string; text: string; isError?: boolean; toolInput?: Record<string, unknown> }) {
   const [open, setOpen] = useState(false);
+  // summarizeInput 用原名做大小写不敏感匹配，显示名用映射后的友好名
   const summary = summarizeInput(name, toolInput, name);
+  const displayName = toolDisplayName(name);
 
   return (
     <div className="py-1.5">
@@ -276,7 +279,7 @@ function ToolResultBubble({ name, text, isError, toolInput }: { name: string; te
       >
         <span className={`inline-block w-2 h-2 rounded-full shrink-0 mt-1.5 ${isError ? 'bg-danger' : 'bg-primary'}`} />
         <span>
-          <span className={`font-medium font-mono ${isError ? 'text-danger' : 'text-content-primary'}`}>{name}</span>
+          <span className={`font-medium font-mono ${isError ? 'text-danger' : 'text-content-primary'}`}>{displayName}</span>
           {!open && summary && <span className={`text-xs ${isError ? 'text-danger' : 'text-content-disabled'}`}>（{summary}）</span>}
           {isError && <span className="text-xs text-danger font-medium"> ERROR</span>}
         </span>
@@ -367,11 +370,12 @@ export function ReasoningContent({ text }: { text: string }) {
  */
 export function PendingToolBubble({ call }: { call: PendingToolCall }) {
   const summary = summarizeInput(call.tool_name, call.tool_input, call.tool_name);
+  const displayName = toolDisplayName(call.tool_name);
   return (
     <div className="py-1.5 flex items-start gap-2">
       <span className="inline-block w-2 h-2 rounded-full bg-primary animate-pulse-scale shrink-0 mt-1.5" />
       <span className="text-sm">
-        <span className="font-medium font-mono text-content-primary">{call.tool_name}</span>
+        <span className="font-medium font-mono text-content-primary">{displayName}</span>
         {summary && <span className="text-xs text-content-disabled">（{summary}）</span>}
       </span>
     </div>

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/web/src/components/ModalCard.tsx

@@ -10,6 +10,7 @@
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { t, type UiLanguage } from '../i18n';
+import { toolDisplayName } from '../utils/toolDisplayName';
 
 /**
  * 问题选项接口
@@ -61,6 +62,8 @@ interface PermissionCardProps {
  */
 export function PermissionCard({ modal, lang, onRespond }: PermissionCardProps) {
   const toolName = String(modal.tool_name ?? 'tool');
+  // 显示用友好名；onRespond 回调仍传原始 toolName 给后端识别
+  const displayToolName = toolDisplayName(toolName);
   const reason = modal.reason ? String(modal.reason) : null;
   const requestId = String(modal.request_id ?? '');
 
@@ -75,7 +78,7 @@ export function PermissionCard({ modal, lang, onRespond }: PermissionCardProps)
       <div className="px-4 py-3">
         <div className="text-sm text-content-primary mb-1">
           {lang === 'zh-CN' ? '允许使用工具 ' : 'Allow '}
-          <span className="font-mono font-medium text-primary">{toolName}</span>
+          <span className="font-mono font-medium text-primary">{displayToolName}</span>
           <span>?</span>
         </div>
         {reason && (
@@ -359,7 +362,7 @@ export function QuestionCard({ modal, lang, onRespond }: QuestionCardProps) {
       <div className="px-4 py-3">
         {typeof modal.tool_name === 'string' && modal.tool_name && (
           <div className="text-xs text-content-secondary mb-3">
-            Tool: <span className="font-mono text-primary">{modal.tool_name}</span>
+            Tool: <span className="font-mono text-primary">{toolDisplayName(modal.tool_name)}</span>
           </div>
         )}
 
@@ -402,7 +405,7 @@ export function QuestionCard({ modal, lang, onRespond }: QuestionCardProps) {
                 </button>
               );
             })}
-            {/* "其他"选项：内联输入框，带序号与普通选项格式一致，沙箱等 noCustomInput 场景不显示 */}
+            {/* "其他"选项：内联输入框，与普通选项格式一致（无序号），沙箱等 noCustomInput 场景不显示 */}
             {!noCustomInput && (
               <div
                 className={`w-full text-left px-3 py-2.5 rounded-lg text-sm transition-colors cursor-pointer flex items-start gap-2.5 ${
@@ -431,7 +434,7 @@ export function QuestionCard({ modal, lang, onRespond }: QuestionCardProps) {
                   <span className={`text-sm font-medium shrink-0 ${
                     (isMultiSelect && selectedIndices.has(otherIdx)) || (!isMultiSelect && isOtherFocused) ? 'text-primary' : ''
                   }`}>
-                    {otherIdx + 1}. {lang === 'zh-CN' ? '其他' : 'Other'}
+                    {lang === 'zh-CN' ? '其他' : 'Other'}
                   </span>{' '}
                   {isOtherFocused ? (
                     <input

{illusion_code-0.2.7 → illusion_code-0.2.9}/frontend/web/src/components/RightPanel.tsx

@@ -14,6 +14,7 @@
 
 import { useState } from 'react';
 import { t, type UiLanguage } from '../i18n';
+import { useTheme } from '../hooks/useTheme';
 import TodoPanel from './TodoPanel';
 import type { McpServerSnapshot, PluginSnapshot, RuleSnapshot, SkillSnapshot, TodoItemSnapshot } from '../types/protocol';
 
@@ -59,6 +60,8 @@ export default function RightPanel({
   lang, status, connected, busy, collapsed, onToggle, todoItems,
   skills, plugins, rules, mcpServers, width = 260,
 }: RightPanelProps) {
+  // 主题（深色/浅色）— 在折叠判断前调用以保证 hook 始终执行
+  const { theme, toggleTheme } = useTheme();
   // 上下文使用量
   const contextWindow = Number(status?.context_window ?? 0);
   const contextTokens = Number(status?.context_tokens ?? 0);
@@ -88,22 +91,37 @@ export default function RightPanel({
 
   return (
     <aside className="glass-panel border-l border-white/30 flex flex-col h-full shrink-0 overflow-y-auto select-none" style={{ width: `${width}px` }}>
-      {/* 折叠按钮 */}
-      <div className="px-5 pt-3 pb-1 flex justify-end">
+      {/* 标题行：主题切换按钮 + 居中标题 + 折叠按钮（3 列 grid 严格居中） */}
+      <div className="grid grid-cols-3 items-center px-5 pt-3 pb-2">
+        <button onClick={toggleTheme} title={t(lang, 'toggle_theme')}
+          aria-label={t(lang, 'toggle_theme')}
+          className="justify-self-start w-7 h-7 flex items-center justify-center rounded-lg text-content-secondary glass-option-hover hover:text-content-primary transition-colors cursor-pointer">
+          {theme === 'dark' ? (
+            /* 太阳图标（深色模式下点击切换到浅色） */
+            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round">
+              <circle cx="8" cy="8" r="3" />
+              <path d="M8 1.5v1.5M8 13v1.5M1.5 8h1.5M13 8h1.5M3.4 3.4l1.1 1.1M11.5 11.5l1.1 1.1M3.4 12.6l1.1-1.1M11.5 4.5l1.1-1.1" />
+            </svg>
+          ) : (
+            /* 月亮图标（浅色模式下点击切换到深色） */
+            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round">
+              <path d="M13 8.5a5 5 0 0 1-5.5-5.5 5 5 0 1 0 5.5 5.5z" />
+            </svg>
+          )}
+        </button>
+        <span className="justify-self-center font-display font-bold text-content-primary text-sm tracking-wider">{t(lang, 'management_title')}</span>
         <button onClick={onToggle} title={t(lang, 'collapse_panel')}
-          className="w-7 h-7 flex items-center justify-center rounded-lg text-content-secondary glass-option-hover hover:text-content-primary transition-colors cursor-pointer">
+          className="justify-self-end w-7 h-7 flex items-center justify-center rounded-lg text-content-secondary glass-option-hover hover:text-content-primary transition-colors cursor-pointer">
           <svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round">
             <path d="M6 3l5 5-5 5" />
           </svg>
         </button>
       </div>
 
-      {/* Todo 列表 */}
-      {todoItems.length > 0 && (
-        <div className="px-3 pb-3">
-          <TodoPanel items={todoItems} />
-        </div>
-      )}
+      {/* Todo 列表（始终显示，空列表显示占位） */}
+      <div className="px-3 pb-3">
+        <TodoPanel items={todoItems} lang={lang} />
+      </div>
 
       {/* Skills */}
       {skills.length > 0 && (
@@ -208,7 +226,7 @@ function CollapsibleSection({
           <path d="M6 3l5 5-5 5" />
         </svg>
         <span className="text-xs font-semibold text-content-primary tracking-wide">{title}</span>
-        <span className="text-[10px] text-content-secondary bg-white/50 px-1.5 py-0.5 rounded-full tabular-nums">{count}</span>
+        <span className="text-[10px] text-content-secondary bg-[var(--badge-bg)] px-1.5 py-0.5 rounded-full tabular-nums">{count}</span>
         {subtitle && <span className="text-xs text-content-disabled ml-auto">{subtitle}</span>}
       </button>
       <div className="grid transition-[grid-template-rows] duration-200 ease-out" style={{ gridTemplateRows: collapsed ? '0fr' : '1fr' }}>
@@ -237,7 +255,7 @@ function ItemRow({ name, description, tag }: { name: string; description: string
       >
         <span className="text-content-primary font-medium truncate flex-1 text-left">{name}</span>
         {tag && (
-          <span className="text-[10px] text-primary/80 bg-white/50 px-1.5 py-0.5 rounded-full font-medium shrink-0">{tag}</span>
+          <span className="text-[10px] text-primary/80 bg-[var(--badge-bg)] px-1.5 py-0.5 rounded-full font-medium shrink-0">{tag}</span>
         )}
       </button>
       {expanded && hasDesc && (