illusion-code 0.2.6__tar.gz → 0.2.8__tar.gz

{illusion_code-0.2.6 → illusion_code-0.2.8}/.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.6 → illusion_code-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: illusion-code
-Version: 0.2.6
+Version: 0.2.8
 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.6 → illusion_code-0.2.8}/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.6 → illusion_code-0.2.8}/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.6 → illusion_code-0.2.8}/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.6 → illusion_code-0.2.8}/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.6 → illusion_code-0.2.8}/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.6 → illusion_code-0.2.8}/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.6 → illusion_code-0.2.8}/frontend/terminal/package-lock.json

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

{illusion_code-0.2.6 → illusion_code-0.2.8}/frontend/terminal/package.json

@@ -24,5 +24,5 @@
     "tsx": "^4.19.2",
     "typescript": "^5.7.3"
   },
-  "version": "0.2.6"
+  "version": "0.2.8"
 }

{illusion_code-0.2.6 → illusion_code-0.2.8}/frontend/terminal/src/components/ConversationView.tsx

@@ -680,12 +680,15 @@ function wrapForPrefix(text: string, terminalWidth: number, prefix: string): str
 }
 
 function truncateToDisplayWidth(text: string, maxWidth: number): string {
-	if (stringWidth(text) <= maxWidth) {
-		return text;
+	// 将 tab 替换为空格，因为 string-width 将 tab 算作1字符宽度，
+	// 但终端中 tab 会展开为多个空格，导致宽度计算偏小、截断不足
+	const expanded = text.replace(/\t/g, '        ');
+	if (stringWidth(expanded) <= maxWidth) {
+		return expanded;
 	}
 	let result = '';
 	let width = 0;
-	for (const ch of text) {
+	for (const ch of expanded) {
 		const charWidth = stringWidth(ch);
 		if (width + charWidth > Math.max(1, maxWidth - 1)) {
 			break;

{illusion_code-0.2.6 → illusion_code-0.2.8}/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.6 → illusion_code-0.2.8}/frontend/terminal/src/version.ts

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

{illusion_code-0.2.6 → illusion_code-0.2.8}/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.6 → illusion_code-0.2.8}/frontend/web/package-lock.json

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

{illusion_code-0.2.6 → illusion_code-0.2.8}/frontend/web/package.json

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

{illusion_code-0.2.6 → illusion_code-0.2.8}/frontend/web/src/App.tsx

@@ -53,6 +53,12 @@ export default function App() {
   // 内联选项状态
   const [inlineOptions, setInlineOptions] = useState<SelectRequestPayload | null>(null);
 
+  // 回退确认弹窗状态
+  const [rewindConfirm, setRewindConfirm] = useState<{ turns: number } | null>(null);
+  // 重新生成：存储待重发的 user 消息文本，rewind 完成后自动重发
+  const pendingRegenerateRef = useRef<string | null>(null);
+  const prevBusyRef = useRef(false);
+
   // Toast 状态
   const [toastMessage, setToastMessage] = useState<{ text: string; type: 'success' | 'error' | 'info' } | null>(null);
   const [toastExiting, setToastExiting] = useState(false);
@@ -231,6 +237,57 @@ export default function App() {
   /** 处理停止当前任务 */
   const handleStop = () => { session.sendRequest({ type: 'stop' }); };
 
+  /**
+   * 处理回退到指定轮次
+   *
+   * 由 ChatArea 中 user 消息的撤销按钮触发，弹出模式选择弹窗。
+   *
+   * @param turnsToRewind - 需要回退的轮次数
+   */
+  const handleRewindToTurn = useCallback((turnsToRewind: number) => {
+    setRewindConfirm({ turns: turnsToRewind });
+  }, []);
+
+  /**
+   * 确认回退 —— 根据用户选择的模式执行 /rewind N mode
+   *
+   * 通过 submit_line 通道（treat_as_text 缺省=false）直接走命令注册表，
+   * 绕过 web_query 的多步弹窗流程。
+   *
+   * @param mode - 回退模式：code / conversation / both
+   */
+  const handleConfirmRewind = useCallback((mode: string) => {
+    const turns = rewindConfirm?.turns ?? 1;
+    setRewindConfirm(null);
+    session.setBusyTrue();
+    session.sendRequest({ type: 'submit_line', line: `/rewind ${turns} ${mode}` });
+  }, [rewindConfirm, session]);
+
+  /**
+   * 处理重新生成
+   *
+   * 找到最后一条 user 消息文本，先 /rewind 1 both 回退一轮，
+   * rewind 完成后（busy→false）自动重发 user 消息。
+   */
+  const handleRegenerate = useCallback(() => {
+    const lastUserMsg = [...session.staticItems].reverse().find((i) => i.role === 'user' && !i.text.startsWith('/'));
+    if (!lastUserMsg) return;
+    pendingRegenerateRef.current = lastUserMsg.text;
+    session.setBusyTrue();
+    session.sendRequest({ type: 'submit_line', line: '/rewind 1 both' });
+  }, [session]);
+
+  // 监听 busy 状态变化：rewind 完成后自动重发 user 消息（重新生成）
+  useEffect(() => {
+    if (prevBusyRef.current && !session.busy && pendingRegenerateRef.current) {
+      const text = pendingRegenerateRef.current;
+      pendingRegenerateRef.current = null;
+      session.setBusyTrue();
+      session.sendRequest({ type: 'submit_line', line: text, treat_as_text: true });
+    }
+    prevBusyRef.current = session.busy;
+  }, [session.busy, session]);
+
   /** 处理新建会话 */
   const handleNewSession = () => {
     session.sendRequest({ type: 'web_new_session' });
@@ -345,7 +402,8 @@ export default function App() {
           streamingReasoning={session.streamingReasoning} pendingToolCalls={session.pendingToolCalls}
           busy={session.busy} connected={session.connected}
           modal={session.modal} onPermissionResponse={handlePermissionResponse}
-          onQuestionResponse={handleQuestionResponse} restoringSessionId={session.restoringSessionId} />
+          onQuestionResponse={handleQuestionResponse} restoringSessionId={session.restoringSessionId}
+          onRewindToTurn={handleRewindToTurn} onRegenerate={handleRegenerate} />
         <PromptInput lang={lang} busy={session.busy} connected={session.connected}
           commands={session.commands} onSubmit={handleSubmit} onStop={handleStop}
           inlineOptions={inlineOptions} onInlineSelect={handleInlineSelect} onInlineClose={handleInlineClose} />
@@ -407,6 +465,44 @@ export default function App() {
         </div>
       )}
 
+      {/* 回退确认弹窗（选择回退范围） */}
+      {rewindConfirm && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center">
+          <div className="absolute inset-0 bg-black/35 backdrop-blur-md animate-fade-in" onClick={() => setRewindConfirm(null)} />
+          <div className="relative glass-overlay rounded-2xl w-[380px] flex flex-col animate-scale-in modal-origin-center">
+            <div className="px-6 py-4 border-b border-border-light">
+              <h3 className="text-lg font-semibold text-content-primary">{t(lang, 'rewind_confirm_title')}</h3>
+            </div>
+            <div className="py-2 px-1">
+              {([
+                { mode: 'both', label: t(lang, 'rewind_both'), desc: t(lang, 'rewind_both_desc') },
+                { mode: 'conversation', label: t(lang, 'rewind_conversation'), desc: t(lang, 'rewind_conversation_desc') },
+                { mode: 'code', label: t(lang, 'rewind_code'), desc: t(lang, 'rewind_code_desc') },
+              ] as const).map((opt) => (
+                <button
+                  key={opt.mode}
+                  onClick={() => handleConfirmRewind(opt.mode)}
+                  className="w-full text-left px-6 py-3 cursor-pointer glass-option-hover transition-colors rounded-lg flex items-center justify-between group"
+                >
+                  <div>
+                    <div className="text-sm font-medium text-content-primary">{opt.label}</div>
+                    <div className="text-xs text-content-disabled mt-0.5">{opt.desc}</div>
+                  </div>
+                  <svg className="w-4 h-4 text-content-disabled opacity-0 group-hover:opacity-100 transition-opacity" viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
+                    <path d="M6 3l5 5-5 5" />
+                  </svg>
+                </button>
+              ))}
+            </div>
+            <div className="px-6 py-4 border-t border-border-light flex justify-end">
+              <button onClick={() => setRewindConfirm(null)} className="px-4 py-2 text-sm text-content-secondary glass-option-hover rounded-lg transition-colors cursor-pointer border border-white/40">
+                {t(lang, 'cancel')}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
       {/* Toast 通知 */}
       {toastMessage && (
         <div