diff --git a/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/DesktopStreamHub.java b/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/DesktopStreamHub.java
new file mode 100644
index 0000000000000000000000000000000000000000..af158149ce411e524a3fe031898eac01144f4f16
--- /dev/null
+++ b/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/DesktopStreamHub.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2017-2026 noear.org and authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+package org.noear.solon.codecli.portal.desktop;
+
+import org.noear.snack4.ONode;
+import org.noear.solon.net.websocket.WebSocket;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 桌面端流式消息中转站。
+ *
+ * <p>Agent 运行不再绑定首次建立的 WebSocket。每个会话保留一个有界增量缓冲区，
+ * 新连接可以从最后确认的 sequence 继续回放，再无缝接收实时消息。</p>
+ */
+final class DesktopStreamHub {
+    private static final Logger LOG = LoggerFactory.getLogger(DesktopStreamHub.class);
+    private static final int MAX_REPLAY_MESSAGES = 4096;
+    private static final long COMPLETED_TTL_MILLIS = 5 * 60 * 1000L;
+
+    private final Map<String, StreamState> streams = new ConcurrentHashMap<>();
+
+    void begin(String sessionId, WebSocket socket) {
+        cleanupExpired();
+        StreamState next = new StreamState(sessionId);
+        next.addSubscriber(socket);
+        streams.put(sessionId, next);
+    }
+
+    boolean attach(String sessionId, WebSocket socket, long afterSequence) {
+        cleanupExpired();
+        StreamState state = streams.get(sessionId);
+        if (state == null) {
+            return false;
+        }
+        return state.attachAndReplay(socket, Math.max(0L, afterSequence));
+    }
+
+    void subscribe(String sessionId, WebSocket socket) {
+        StreamState state = streams.get(sessionId);
+        if (state == null) {
+            state = new StreamState(sessionId);
+            streams.put(sessionId, state);
+        }
+        state.addSubscriber(socket);
+    }
+
+    void detach(WebSocket socket) {
+        if (socket == null) {
+            return;
+        }
+        for (StreamState state : streams.values()) {
+            state.removeSubscriber(socket);
+        }
+    }
+
+    boolean emit(String sessionId, String json) {
+        if (json == null || json.isEmpty()) {
+            return false;
+        }
+        StreamState state = streams.get(sessionId);
+        if (state == null) {
+            LOG.debug("[DesktopStreamHub] Ignore chunk without stream state: {}", sessionId);
+            return false;
+        }
+        state.emit(json);
+        return true;
+    }
+
+    private void cleanupExpired() {
+        long now = System.currentTimeMillis();
+        streams.entrySet().removeIf(entry -> entry.getValue().isExpired(now));
+    }
+
+    private static final class StreamState {
+        private final String sessionId;
+        private final Set<WebSocket> subscribers = new HashSet<>();
+        private final ArrayDeque<ReplayMessage> replay = new ArrayDeque<>();
+        private long nextSequence = 1L;
+        private long completedAt;
+
+        private StreamState(String sessionId) {
+            this.sessionId = sessionId;
+        }
+
+        synchronized void addSubscriber(WebSocket socket) {
+            if (socket != null) {
+                subscribers.add(socket);
+            }
+        }
+
+        synchronized boolean attachAndReplay(WebSocket socket, long afterSequence) {
+            if (socket == null) {
+                return false;
+            }
+            ReplayMessage oldest = replay.peekFirst();
+            if (oldest != null && oldest.sequence > afterSequence + 1L) {
+                LOG.warn("[DesktopStreamHub] Replay gap for session {}: requested after {}, oldest is {}",
+                        sessionId, afterSequence, oldest.sequence);
+                return false;
+            }
+            subscribers.add(socket);
+            for (ReplayMessage message : replay) {
+                if (message.sequence > afterSequence && !send(socket, message.json)) {
+                    subscribers.remove(socket);
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        synchronized void removeSubscriber(WebSocket socket) {
+            subscribers.remove(socket);
+        }
+
+        synchronized void emit(String json) {
+            long sequence = nextSequence++;
+            ONode node = ONode.ofJson(json).set("sequence", sequence);
+            String sequencedJson = node.toJson();
+            replay.addLast(new ReplayMessage(sequence, sequencedJson));
+            while (replay.size() > MAX_REPLAY_MESSAGES) {
+                replay.removeFirst();
+            }
+
+            String type = node.get("type") == null ? null : node.get("type").getString();
+            if ("done".equalsIgnoreCase(type) || "error".equalsIgnoreCase(type)) {
+                completedAt = System.currentTimeMillis();
+            }
+
+            List<WebSocket> failed = new ArrayList<>();
+            for (WebSocket socket : subscribers) {
+                if (!send(socket, sequencedJson)) {
+                    failed.add(socket);
+                }
+            }
+            subscribers.removeAll(failed);
+        }
+
+        synchronized boolean isExpired(long now) {
+            return completedAt > 0L && now - completedAt >= COMPLETED_TTL_MILLIS;
+        }
+
+        private boolean send(WebSocket socket, String json) {
+            try {
+                socket.send(json);
+                return true;
+            } catch (Throwable error) {
+                LOG.debug("[DesktopStreamHub] Send failed for session {}: {}", sessionId, error.getMessage());
+                return false;
+            }
+        }
+    }
+
+    private static final class ReplayMessage {
+        private final long sequence;
+        private final String json;
+
+        private ReplayMessage(long sequence, String json) {
+            this.sequence = sequence;
+            this.json = json;
+        }
+    }
+}
diff --git a/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/WsController.java b/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/WsController.java
index f8508d383675de80d8a04d0b7c0b87a4dbe9d77c..6854d8ce049ab7495419c64850c4d0c12ffe46ab 100644
--- a/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/WsController.java
+++ b/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/WsController.java
@@ -4,6 +4,7 @@ import org.noear.snack4.ONode;
 import org.noear.solon.ai.chat.ChatConfig;
 import org.noear.solon.ai.chat.ChatModel;
 import org.noear.solon.ai.harness.HarnessEngine;
+import org.noear.solon.ai.talents.mount.MountDir;
 import org.noear.solon.annotation.*;
 import org.noear.solon.codecli.config.AgentFlags;
 import org.noear.solon.codecli.config.AgentSettings;
@@ -52,6 +53,33 @@ public class WsController {
         return Result.succeed(data);
     }
 
+    /**
+     * 重新扫描桌面端指定的挂载池，使新创建的 Skill/Agent 立即进入运行时。
+     */
+    @Post
+    @Mapping("/desktop/settings/mounts/refresh")
+    public Result mountsRefresh(@Param("alias") String alias) {
+        if (Assert.isEmpty(alias)) {
+            return Result.failure("alias is required");
+        }
+
+        MountDir mountDir = engine.getMount(alias);
+        if (mountDir == null) {
+            return Result.failure("挂载池不存在: " + alias);
+        }
+        if (!mountDir.isEnabled()) {
+            return Result.failure("挂载池未启用: " + alias);
+        }
+
+        try {
+            engine.refreshMount(alias);
+            return Result.succeed("刷新成功");
+        } catch (Exception e) {
+            LOG.warn("[Desktop] Failed to refresh mount {}: {}", alias, e.getMessage());
+            return Result.failure("刷新挂载池失败");
+        }
+    }
+
 
     /**
      * 通过 ModelsAdapterManager 从远程 API 获取可用模型列表
diff --git a/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/WsGate.java b/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/WsGate.java
index d2bed06aeed75681fbbadd8a8eaefb5e0d0af120..e8d71e31b92d5c6d744a97bf45e9c99c205d7b59 100644
--- a/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/WsGate.java
+++ b/soloncode-cli/src/main/java/org/noear/solon/codecli/portal/desktop/WsGate.java
@@ -76,6 +76,7 @@ public class WsGate extends SimpleWebSocketListener {
 
     private final HarnessEngine engine;
     private final AgentSettings agentSettings;
+    private final DesktopStreamHub streamHub = new DesktopStreamHub();
 
     public WsGate(HarnessEngine engine, AgentSettings agentSettings) {
         this.engine = engine;
@@ -105,6 +106,22 @@ public class WsGate extends SimpleWebSocketListener {
             AgentSession session = engine.getSession(sessionId);
             session.attrs().putIfAbsent(HarnessEngine.ATTR_CWD, sessionCwd);
         }
+
+        if ("1".equals(socket.param("resume"))) {
+            long afterSequence = parseSequence(socket.param("afterSequence"));
+            if (!streamHub.attach(sessionId, socket, afterSequence)) {
+                socket.send(new ONode().set("type", "error")
+                        .set("sessionId", sessionId)
+                        .set("text", "会话流已失效，无法恢复连接")
+                        .toJson());
+                socket.close();
+            }
+        }
+    }
+
+    @Override
+    public void onClose(WebSocket socket) {
+        streamHub.detach(socket);
     }
 
     @Override
@@ -153,16 +170,22 @@ public class WsGate extends SimpleWebSocketListener {
                     interruptModelName = engine.getMainModel().getConfig().getNameOrModel();
                 }
 
-                socket.send(new ONode().set("type", "reason")
+                String interruptReason = new ONode().set("type", "reason")
                         .set("sessionId", session.getSessionId())
                         .set("text", "[Task interrupted]")
-                        .toJson());
+                        .toJson();
+                if (!streamHub.emit(sessionId, interruptReason)) {
+                    socket.send(interruptReason);
+                }
 
-                socket.send(new ONode().set("type", "done")
+                String interruptDone = new ONode().set("type", "done")
                         .set("sessionId", session.getSessionId())
                         .set("modelName", interruptModelName)
                         .set("totalTokens", 0)
-                        .set("elapsedMs", 0).toJson());
+                        .set("elapsedMs", 0).toJson();
+                if (!streamHub.emit(sessionId, interruptDone)) {
+                    socket.send(interruptDone);
+                }
                 return;
             }
 
@@ -314,6 +337,7 @@ public class WsGate extends SimpleWebSocketListener {
 
             String finalCwd = cwd;
             AtomicBoolean terminalSent = new AtomicBoolean(false);
+            streamHub.begin(finalSessionId, socket);
             Disposable disposable = engine.prompt(prompt)
                     .session(session)
                     .options(o -> {
@@ -329,7 +353,7 @@ public class WsGate extends SimpleWebSocketListener {
                         // ReActChunk 需要优先处理 metrics 收集（无论 hasContent 状态）
                         String msg = null;
                         if (chunk instanceof ReActChunk) {
-                            onReActChunk((ReActChunk) chunk, finalSessionId, socket, terminalSent);
+                            onReActChunk((ReActChunk) chunk, finalSessionId, terminalSent);
                             return;
                         } else if (chunk instanceof ReasonChunk) {
                             msg = onReasonChunk((ReasonChunk) chunk, finalSessionId);
@@ -342,12 +366,12 @@ public class WsGate extends SimpleWebSocketListener {
                         }
 
                         if (Assert.isNotEmpty(msg)) {
-                            socket.send(msg);
+                            streamHub.emit(finalSessionId, msg);
                         }
                     })
-                    .doOnComplete(() -> sendDoneIfNeeded(socket, terminalSent, finalSessionId,
+                    .doOnComplete(() -> sendDoneIfNeeded(terminalSent, finalSessionId,
                             chatModel.getConfig().getNameOrModel(), 0, 0))
-                    .doOnError(err -> sendErrorIfNeeded(socket, terminalSent, finalSessionId, err))
+                    .doOnError(err -> sendErrorIfNeeded(terminalSent, finalSessionId, err))
                     .subscribe();
 
             Disposable old = (Disposable) session.attrs().put("disposable", disposable);
@@ -361,24 +385,24 @@ public class WsGate extends SimpleWebSocketListener {
         }
     }
 
-    private void onReActChunk(ReActChunk chunk, String finalSessionId, WebSocket socket,
+    private void onReActChunk(ReActChunk chunk, String finalSessionId,
                               AtomicBoolean terminalSent) {
         ReActTrace trace = chunk.getTrace();
         Long start_time = trace.getOriginalPrompt().attrAs("start_time");
         long elapsed = start_time != null ? System.currentTimeMillis() - start_time : 0;
         long totalTokens = trace.getMetrics() != null ? trace.getMetrics().getTotalTokens() : 0;
 
-        sendDoneIfNeeded(socket, terminalSent, finalSessionId,
+        sendDoneIfNeeded(terminalSent, finalSessionId,
                 trace.getOptions().getChatModel().getNameOrModel(), totalTokens, elapsed);
     }
 
-    private void sendDoneIfNeeded(WebSocket socket, AtomicBoolean terminalSent, String sessionId,
+    private void sendDoneIfNeeded(AtomicBoolean terminalSent, String sessionId,
                                   String modelName, long totalTokens, long elapsedMs) {
         if (!terminalSent.compareAndSet(false, true)) {
             return;
         }
 
-        socket.send(new ONode().set("type", "done")
+        streamHub.emit(sessionId, new ONode().set("type", "done")
                 .set("sessionId", sessionId)
                 .set("modelName", modelName)
                 .set("totalTokens", totalTokens)
@@ -386,19 +410,30 @@ public class WsGate extends SimpleWebSocketListener {
                 .toJson());
     }
 
-    private void sendErrorIfNeeded(WebSocket socket, AtomicBoolean terminalSent, String sessionId,
+    private void sendErrorIfNeeded(AtomicBoolean terminalSent, String sessionId,
                                    Throwable error) {
         if (!terminalSent.compareAndSet(false, true)) {
             return;
         }
 
         String errorMessage = error.getMessage() != null ? error.getMessage() : error.getClass().getSimpleName();
-        socket.send(new ONode().set("type", "error")
+        streamHub.emit(sessionId, new ONode().set("type", "error")
                 .set("sessionId", sessionId)
                 .set("text", errorMessage)
                 .toJson());
     }
 
+    private long parseSequence(String value) {
+        if (value == null || value.isEmpty()) {
+            return 0L;
+        }
+        try {
+            return Long.parseLong(value);
+        } catch (NumberFormatException ignored) {
+            return 0L;
+        }
+    }
+
     private String onReasonChunk(ReasonChunk chunk, String finalSessionId) {
         if (!chunk.isToolCalls() && chunk.getMessage() != null) {
             String content = chunk.getMessage().getContent();
@@ -538,6 +573,7 @@ public class WsGate extends SimpleWebSocketListener {
             applyReasoningEffort(hitlPrompt, reasoningEffort);
             
             AtomicBoolean terminalSent = new AtomicBoolean(false);
+            streamHub.subscribe(sessionId, socket);
             Disposable disposable = engine.prompt(hitlPrompt)
                     .session(session)
                     .options(o -> {
@@ -551,7 +587,7 @@ public class WsGate extends SimpleWebSocketListener {
                     .doFinally(signal -> session.attrs().remove("disposable"))
                     .doOnNext(chunk -> {
                         if (chunk instanceof ReActChunk) {
-                            onReActChunk((ReActChunk) chunk, sessionId, socket, terminalSent);
+                            onReActChunk((ReActChunk) chunk, sessionId, terminalSent);
                             return;
                         }
                         String msg = null;
@@ -565,12 +601,12 @@ public class WsGate extends SimpleWebSocketListener {
                             msg = onThoughtChunk((ThoughtChunk) chunk, sessionId);
                         }
                         if (Assert.isNotEmpty(msg)) {
-                            socket.send(msg);
+                            streamHub.emit(sessionId, msg);
                         }
                     })
-                    .doOnComplete(() -> sendDoneIfNeeded(socket, terminalSent, sessionId,
+                    .doOnComplete(() -> sendDoneIfNeeded(terminalSent, sessionId,
                             chatModel.getConfig().getNameOrModel(), 0, 0))
-                    .doOnError(err -> sendErrorIfNeeded(socket, terminalSent, sessionId, err))
+                    .doOnError(err -> sendErrorIfNeeded(terminalSent, sessionId, err))
                     .subscribe();
 
             session.attrs().put("disposable", disposable);
@@ -822,6 +858,7 @@ public class WsGate extends SimpleWebSocketListener {
         Prompt prompt = Prompt.of(input).attrPut("start_time", System.currentTimeMillis());
         applyReasoningEffort(prompt, reasoningEffort);
         AtomicBoolean terminalSent = new AtomicBoolean(false);
+        streamHub.begin(finalSessionId, socket);
         Disposable disposable = engine.prompt(prompt)
                 .session(session)
                 .options(o -> {
@@ -835,7 +872,7 @@ public class WsGate extends SimpleWebSocketListener {
                 .doFinally(signal -> session.attrs().remove("disposable"))
                 .doOnNext(chunk -> {
                     if (chunk instanceof ReActChunk) {
-                        onReActChunk((ReActChunk) chunk, finalSessionId, socket, terminalSent);
+                        onReActChunk((ReActChunk) chunk, finalSessionId, terminalSent);
                         return;
                     }
                     String msg = null;
@@ -849,12 +886,12 @@ public class WsGate extends SimpleWebSocketListener {
                         msg = onThoughtChunk((ThoughtChunk) chunk, finalSessionId);
                     }
                     if (Assert.isNotEmpty(msg)) {
-                        socket.send(msg);
+                        streamHub.emit(finalSessionId, msg);
                     }
                 })
-                .doOnComplete(() -> sendDoneIfNeeded(socket, terminalSent, finalSessionId,
+                .doOnComplete(() -> sendDoneIfNeeded(terminalSent, finalSessionId,
                         chatModel.getConfig().getNameOrModel(), 0, 0))
-                .doOnError(err -> sendErrorIfNeeded(socket, terminalSent, finalSessionId, err))
+                .doOnError(err -> sendErrorIfNeeded(terminalSent, finalSessionId, err))
                 .subscribe();
 
         Disposable old = (Disposable) session.attrs().put("disposable", disposable);
diff --git a/soloncode-desktop/package.json b/soloncode-desktop/package.json
index b3f940941c9c9c269d4b5edc9821f06ed9ec49b9..5e475e2e5445a57d45db325a38c2cf5e9f6e1fbd 100644
--- a/soloncode-desktop/package.json
+++ b/soloncode-desktop/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite --port 5173",
     "build": "tsc --noEmit && vite build",
+    "test": "node --experimental-strip-types --test tests/*.test.ts",
     "preview": "vite preview",
     "tauri": "tauri",
     "tauri:dev": "tauri dev",
diff --git a/soloncode-desktop/src-tauri/src/lib.rs b/soloncode-desktop/src-tauri/src/lib.rs
index db1fd0a04d80dd1c0c3f7fbe73dc771ec4018bbc..58cbde01cad670d279a20ac137047ad63507c763 100644
--- a/soloncode-desktop/src-tauri/src/lib.rs
+++ b/soloncode-desktop/src-tauri/src/lib.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 use std::fs;
 use std::io::{Read as IoRead, Write as IoWrite};
 use base64::Engine;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::process::{Child, Command};
 use std::sync::Mutex;
 use std::net::TcpStream;
@@ -787,9 +787,13 @@ fn copy_dir_recursive(src: &Path, dst: &Path) -> Result<(), String> {
         let entry = entry.map_err(|e| format!("读取条目失败: {}", e))?;
         let src_path = entry.path();
         let dst_path = dst.join(entry.file_name());
-        if src_path.is_dir() {
+        let file_type = entry.file_type().map_err(|e| format!("读取条目类型失败: {}", e))?;
+        if file_type.is_symlink() {
+            return Err("不支持复制包含符号链接的目录".to_string());
+        }
+        if file_type.is_dir() {
             copy_dir_recursive(&src_path, &dst_path)?;
-        } else {
+        } else if file_type.is_file() {
             fs::copy(&src_path, &dst_path).map_err(|e| format!("复制文件失败: {}", e))?;
         }
     }
@@ -2061,6 +2065,183 @@ fn validate_resource_name(name: &str) -> Result<String, String> {
     Ok(trimmed.to_string())
 }
 
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct ManagedResourceResult {
+    name: String,
+    path: String,
+}
+
+fn managed_resource_marker(kind: &str) -> Result<&'static str, String> {
+    match kind {
+        "skill" => Ok("SKILL.md"),
+        "agent" => Ok("AGENT.md"),
+        _ => Err("不支持的资源类型".to_string()),
+    }
+}
+
+fn validate_managed_resource_path(resource_path: &str, kind: &str) -> Result<(PathBuf, &'static str), String> {
+    let marker = managed_resource_marker(kind)?;
+    let source = Path::new(resource_path);
+    if !source.is_absolute() {
+        return Err("资源路径必须是绝对路径".to_string());
+    }
+    let metadata = fs::symlink_metadata(source).map_err(|_| "资源目录不存在".to_string())?;
+    if metadata.file_type().is_symlink() {
+        return Err("不支持修改符号链接资源".to_string());
+    }
+    if !metadata.is_dir() {
+        return Err("资源路径不是目录".to_string());
+    }
+    let canonical = fs::canonicalize(source).map_err(|e| format!("无法解析资源路径: {}", e))?;
+    let marker_path = canonical.join(marker);
+    let marker_metadata = fs::symlink_metadata(&marker_path)
+        .map_err(|_| format!("资源目录缺少 {}", marker))?;
+    if !marker_metadata.is_file() || marker_metadata.file_type().is_symlink() {
+        return Err(format!("{} 必须是普通文件", marker));
+    }
+    Ok((canonical, marker))
+}
+
+fn replace_frontmatter_name(content: &str, new_name: &str) -> String {
+    let newline = if content.contains("\r\n") { "\r\n" } else { "\n" };
+    let trailing_newline = content.ends_with('\n');
+    let mut lines: Vec<String> = content.lines().map(str::to_string).collect();
+    if lines.first().is_some_and(|line| line.trim() == "---") {
+        let end = lines.iter().enumerate().skip(1)
+            .find_map(|(index, line)| (line.trim() == "---").then_some(index));
+        if let Some(end_index) = end {
+            if let Some(name_index) = (1..end_index).find(|index| lines[*index].trim_start().starts_with("name:")) {
+                lines[name_index] = format!("name: {}", new_name);
+            } else {
+                lines.insert(1, format!("name: {}", new_name));
+            }
+        } else {
+            lines.insert(0, format!("---{newline}name: {new_name}{newline}---"));
+        }
+    } else {
+        lines.insert(0, format!("---{newline}name: {new_name}{newline}---"));
+    }
+    let mut result = lines.join(newline);
+    if trailing_newline || content.is_empty() {
+        result.push_str(newline);
+    }
+    result
+}
+
+fn update_managed_resource_name(resource_dir: &Path, marker: &str, new_name: &str) -> Result<(), String> {
+    let marker_path = resource_dir.join(marker);
+    let content = fs::read_to_string(&marker_path).map_err(|e| format!("读取 {} 失败: {}", marker, e))?;
+    let updated = replace_frontmatter_name(&content, new_name);
+    fs::write(&marker_path, updated).map_err(|e| format!("更新 {} 失败: {}", marker, e))
+}
+
+fn copy_resource_name(source: &Path) -> Result<String, String> {
+    let raw = source.file_name().and_then(|value| value.to_str()).unwrap_or("resource");
+    let mut base: String = raw.chars()
+        .map(|ch| if ch.is_alphanumeric() || ch == '-' || ch == '_' { ch } else { '-' })
+        .take(44)
+        .collect();
+    base = base.trim_matches('-').to_string();
+    if base.is_empty() {
+        base = "resource".to_string();
+    }
+    validate_resource_name(&base)
+}
+
+#[tauri::command]
+fn rename_managed_resource(resource_path: &str, kind: &str, new_name: &str) -> Result<ManagedResourceResult, String> {
+    let name = validate_resource_name(new_name)?;
+    let (source, marker) = validate_managed_resource_path(resource_path, kind)?;
+    let parent = source.parent().ok_or("无法获取资源父目录")?;
+    let target = parent.join(&name);
+    if source == target {
+        return Ok(ManagedResourceResult { name, path: source.to_string_lossy().to_string() });
+    }
+    if target.exists() {
+        return Err("同名资源已存在".to_string());
+    }
+
+    fs::rename(&source, &target).map_err(|e| format!("重命名资源目录失败: {}", e))?;
+    if let Err(error) = update_managed_resource_name(&target, marker, &name) {
+        let _ = fs::rename(&target, &source);
+        return Err(error);
+    }
+    Ok(ManagedResourceResult { name, path: target.to_string_lossy().to_string() })
+}
+
+#[tauri::command]
+fn copy_managed_resource(resource_path: &str, kind: &str) -> Result<ManagedResourceResult, String> {
+    let (source, marker) = validate_managed_resource_path(resource_path, kind)?;
+    let parent = source.parent().ok_or("无法获取资源父目录")?;
+    let base = copy_resource_name(&source)?;
+    let mut index = 1_u32;
+    let (name, target) = loop {
+        let suffix = if index == 1 { "-copy".to_string() } else { format!("-copy-{}", index) };
+        let candidate = format!("{}{}", base, suffix);
+        let target = parent.join(&candidate);
+        if !target.exists() {
+            break (candidate, target);
+        }
+        index = index.checked_add(1).ok_or("副本数量过多")?;
+    };
+
+    if let Err(error) = copy_dir_recursive(&source, &target) {
+        let _ = fs::remove_dir_all(&target);
+        return Err(error);
+    }
+    if let Err(error) = update_managed_resource_name(&target, marker, &name) {
+        let _ = fs::remove_dir_all(&target);
+        return Err(error);
+    }
+    Ok(ManagedResourceResult { name, path: target.to_string_lossy().to_string() })
+}
+
+#[tauri::command]
+fn delete_managed_resource(resource_path: &str, kind: &str) -> Result<(), String> {
+    let (source, _) = validate_managed_resource_path(resource_path, kind)?;
+    fs::remove_dir_all(source).map_err(|e| format!("删除资源失败: {}", e))
+}
+
+#[cfg(test)]
+mod managed_resource_tests {
+    use super::{copy_managed_resource, delete_managed_resource, rename_managed_resource};
+    use std::fs;
+    use std::time::{SystemTime, UNIX_EPOCH};
+
+    #[test]
+    fn renames_copies_and_deletes_only_valid_resources() {
+        let unique = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos();
+        let root = std::env::temp_dir().join(format!("soloncode-managed-resource-{unique}"));
+        let source = root.join("demo");
+        fs::create_dir_all(&source).unwrap();
+        fs::write(source.join("SKILL.md"), "---\nname: demo\ndescription: test\n---\n\n# Demo\n").unwrap();
+
+        let renamed = rename_managed_resource(source.to_str().unwrap(), "skill", "renamed").unwrap();
+        let renamed_path = root.join("renamed");
+        assert_eq!(renamed.path, fs::canonicalize(&renamed_path).unwrap().to_string_lossy());
+        assert!(fs::read_to_string(renamed_path.join("SKILL.md")).unwrap().contains("name: renamed"));
+
+        let copied = copy_managed_resource(renamed_path.to_str().unwrap(), "skill").unwrap();
+        let copied_path = root.join("renamed-copy");
+        assert_eq!(copied.path, fs::canonicalize(&copied_path).unwrap().to_string_lossy());
+        assert!(fs::read_to_string(copied_path.join("SKILL.md")).unwrap().contains("name: renamed-copy"));
+
+        delete_managed_resource(copied_path.to_str().unwrap(), "skill").unwrap();
+        assert!(!copied_path.exists());
+        fs::remove_dir_all(root).unwrap();
+    }
+
+    #[test]
+    fn rejects_directories_without_expected_marker() {
+        let unique = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos();
+        let root = std::env::temp_dir().join(format!("soloncode-invalid-resource-{unique}"));
+        fs::create_dir_all(&root).unwrap();
+        assert!(delete_managed_resource(root.to_str().unwrap(), "agent").is_err());
+        fs::remove_dir_all(root).unwrap();
+    }
+}
+
 /// 创建新 Skill（在 ~/.soloncode/skills/{name}/SKILL.md 生成模板）
 #[tauri::command]
 fn create_skill(name: String, description: String, content: Option<String>) -> Result<String, String> {
@@ -2208,6 +2389,9 @@ pub fn run() {
             list_skills,
             toggle_skill,
             create_skill,
+            rename_managed_resource,
+            copy_managed_resource,
+            delete_managed_resource,
             list_agents,
             toggle_agent,
             create_agent
diff --git a/soloncode-desktop/src/App.css b/soloncode-desktop/src/App.css
index 4d78cacc8007d07a83cc5443c4352b0431ed8fdd..b643f633ca96bf0bf0f7ddb59ce1ff6231daccc9 100644
--- a/soloncode-desktop/src/App.css
+++ b/soloncode-desktop/src/App.css
@@ -443,7 +443,7 @@ select option {
   background: var(--cb-vscode-input-background);
   color: var(--cb-vscode-foreground);
   font-size: 13px;
-  z-index: 9999;
+  z-index: 10001;
   pointer-events: none;
   animation: fadeInOut 5s ease-in-out forwards;
   border: 1px solid var(--cb-vscode-panel-border);
diff --git a/soloncode-desktop/src/App.tsx b/soloncode-desktop/src/App.tsx
index 6a1c1f95e2c41d23607434424e4a52e9b65ebabd..c103e17d79cc3b34edabcc90007ab0b577429e5a 100644
--- a/soloncode-desktop/src/App.tsx
+++ b/soloncode-desktop/src/App.tsx
@@ -8,7 +8,12 @@ import { ExplorerPanel } from './components/sidebar/ExplorerPanel';
 import { GitPanel } from './components/sidebar/GitPanel';
 import { ExtensionsPanel } from './components/sidebar/ExtensionsPanel';
 import { SessionsPanel, type Session, type Project } from './components/sidebar/SessionsPanel';
-import { AutomationPanel } from './components/sidebar/AutomationPanel';
+import {
+  AutomationDetail,
+  AutomationPanel,
+  type AutomationModelOption,
+  type AutomationUpdateInput,
+} from './components/sidebar/AutomationPanel';
 import { SkillsPanel } from './components/sidebar/SkillsPanel';
 import { AgentsPanel } from './components/sidebar/AgentsPanel';
 import { SettingsPanel, type Settings } from './components/sidebar/SettingsPanel';
@@ -26,7 +31,22 @@ import { useBackend } from './hooks/useBackend';
 import { useGit } from './hooks/useGit';
 import { useFileManager } from './hooks/useFileManager';
 import { useSessions } from './hooks/useSessions';
-import { UNLINKED_PROJECT, addAutomation, saveMessage, db, type DbAutomation } from './db';
+import {
+  UNLINKED_PROJECT,
+  addAutomation,
+  addAutomationRun,
+  deleteAutomation,
+  getAllAutomations,
+  getAutomation,
+  updateAutomation,
+  updateAutomationRun,
+  saveMessage,
+  db,
+  type DbAutomation,
+  type DbAutomationRun,
+} from './db';
+import { cronMatchesDate, getCronMinuteKey, getCronValidationError, getLatestCronRun } from './utils/cron';
+import type { GeneratedAutomationPlan } from './utils/automationPlan';
 import { useWorkspace } from './hooks/useWorkspace';
 import type { Conversation, Plugin, Theme } from './types';
 import type { GitFileStatus } from './services/gitService';
@@ -233,9 +253,11 @@ function hasMeaningfulReviewChange(file: GitFileStatus, stats: { additions: numb
   return file.status === 'deleted';
 }
 
-function createPromptTitle(prompt: string): string {
-  const oneLine = prompt.trim().replace(/\s+/g, ' ');
-  return oneLine.length > 28 ? `${oneLine.slice(0, 28)}...` : oneLine;
+function getAutomationRunError(error: unknown): string {
+  const message = error instanceof Error
+    ? error.message
+    : (typeof error === 'string' ? error : '自动化运行失败');
+  return message.trim().replace(/\s+/g, ' ').slice(0, 300) || '自动化运行失败';
 }
 
 function App() {
@@ -248,8 +270,15 @@ function App() {
   const [promptCreation, setPromptCreation] = useState<PromptCreationMode | null>(null);
   const [aiCreateRefreshKey, setAiCreateRefreshKey] = useState(0);
   const [automationRefreshKey, setAutomationRefreshKey] = useState(0);
+  const [selectedAutomation, setSelectedAutomation] = useState<DbAutomation | null>(null);
+  const [runningAutomationId, setRunningAutomationId] = useState<number | null>(null);
+  const runningAutomationIdRef = useRef<number | null>(null);
+  const scheduledAutomationQueueRef = useRef<number[]>([]);
+  const scheduledAutomationQueueProcessingRef = useRef(false);
+  const [scheduledAutomationQueueVersion, setScheduledAutomationQueueVersion] = useState(0);
   const [automationPrompt, setAutomationPrompt] = useState<{
     runId: string;
+    sessionId: string;
     prompt: string;
     modelId: string;
     modelName: string;
@@ -259,6 +288,8 @@ function App() {
   const [sessionRunStates, setSessionRunStates] = useState<Record<string, 'running' | 'completed' | 'error'>>({});
   const [sessionReviewFiles, setSessionReviewFiles] = useState<Record<string, ChatReviewFile[]>>({});
   const resolvedSessionIdsRef = useRef<Record<string, string>>({});
+  const automationRunBySessionRef = useRef<Record<string, number>>({});
+  const lastAutomationScheduleCheckRef = useRef<Date | null>(null);
   const sessionReviewBaselinesRef = useRef<Record<string, ReviewBaseline>>({});
   const sessionReviewBaselinePromisesRef = useRef<Record<string, Promise<void>>>({});
   const [currentTheme, setCurrentTheme] = useState<Theme>(() => {
@@ -268,6 +299,22 @@ function App() {
     return theme;
   });
 
+  const automationModels = useMemo<AutomationModelOption[]>(() => {
+    const options = new Map<string, AutomationModelOption>();
+    for (const provider of settings.providers) {
+      if (!provider.enabled) continue;
+      if (provider.availableModels?.length) {
+        for (const model of provider.availableModels) {
+          const id = `${provider.id}__${model.id}`;
+          options.set(id, { id, name: model.id, label: `${model.id} · ${provider.name}` });
+        }
+      } else if (provider.model) {
+        options.set(provider.id, { id: provider.id, name: provider.model, label: `${provider.model} · ${provider.name}` });
+      }
+    }
+    return Array.from(options.values());
+  }, [settings.providers]);
+
   const toggleTheme = useCallback(() => {
     setCurrentTheme(prev => {
       const next = prev === 'dark' ? 'light' : 'dark';
@@ -361,12 +408,17 @@ function App() {
   const { backendPort, backendPortRef, backendStatus, startBackend, reconnectBackend } = useBackend();
   const {
     openFiles, activeFilePath, activeFile, setActiveFilePath,
-    handleFileSelect, handleFileClose, handleContentChange,
+    handleFileSelect: handleFileSelectInternal, handleFileClose, handleContentChange,
     handleFileSave, handleSaveCurrentFile, clearEditorState, setOpenFiles,
   } = useFileManager(null, () => {
     setPanelState(prev => ({ ...prev, editorVisible: false }));
   });
 
+  const handleFileSelect = useCallback(async (path: string) => {
+    setSelectedAutomation(null);
+    await handleFileSelectInternal(path);
+  }, [handleFileSelectInternal]);
+
   const {
     sessions, currentSessionId, setCurrentSessionId, currentConversation,
     handleNewSession, handleDeleteSession, handleUpdateSessionTitle,
@@ -376,6 +428,14 @@ function App() {
   } = useSessions(null, {
     onSessionIdResolved: (oldId, newId) => {
       resolvedSessionIdsRef.current[oldId] = newId;
+      const automationRunId = automationRunBySessionRef.current[oldId];
+      if (automationRunId) {
+        automationRunBySessionRef.current[newId] = automationRunId;
+        delete automationRunBySessionRef.current[oldId];
+        void updateAutomationRun(automationRunId, { sessionId: newId }).catch(err => {
+          console.error('[App] 更新自动化运行记录会话失败:', err);
+        });
+      }
       setSessionRunStates(prev => {
         const state = prev[oldId];
         if (!state) return prev;
@@ -422,8 +482,8 @@ function App() {
 
   const chatWorkspacePath = useMemo(() => {
     if (currentConversation.workspacePath === UNLINKED_PROJECT) return null;
-    return currentConversation.workspacePath || activeProjectPath;
-  }, [activeProjectPath, currentConversation.workspacePath]);
+    return currentConversation.workspacePath || null;
+  }, [currentConversation.workspacePath]);
 
   useEffect(() => {
     setChatWorkspacePath(chatWorkspacePath);
@@ -630,6 +690,7 @@ function App() {
         ],
       });
       if (selectedPath && typeof selectedPath === 'string') {
+        setSelectedAutomation(null);
         const file = await fileService.openFile(selectedPath);
         setOpenFiles(prev => prev.some(f => f.path === selectedPath) ? prev : [...prev, file]);
         setActiveFilePath(selectedPath);
@@ -662,7 +723,7 @@ function App() {
   }, [activeProjectPath, handleFileSelect]);
 
   const captureReviewBaseline = useCallback(async (sessionId: string, workspacePath?: string | null) => {
-    const cwd = workspacePath && workspacePath !== UNLINKED_PROJECT ? workspacePath : activeProjectPath;
+    const cwd = workspacePath && workspacePath !== UNLINKED_PROJECT ? workspacePath : null;
     if (!cwd) {
       delete sessionReviewBaselinesRef.current[sessionId];
       delete sessionReviewBaselinePromisesRef.current[sessionId];
@@ -686,10 +747,10 @@ function App() {
         delete sessionReviewBaselinePromisesRef.current[sessionId];
       }
     }
-  }, [activeProjectPath]);
+  }, []);
 
   const captureSessionReviewFiles = useCallback(async (sessionId: string, workspacePath?: string | null) => {
-    const cwd = workspacePath && workspacePath !== UNLINKED_PROJECT ? workspacePath : activeProjectPath;
+    const cwd = workspacePath && workspacePath !== UNLINKED_PROJECT ? workspacePath : null;
     if (!cwd) {
       setSessionReviewFiles(prev => {
         const next = { ...prev };
@@ -761,6 +822,11 @@ function App() {
     toastTimer.current = setTimeout(() => setToast(null), 5000);
   }, []);
 
+  const handleSkillInstalled = useCallback((skillName: string) => {
+    setAiCreateRefreshKey(current => current + 1);
+    showToast(`Skill "${skillName}" 安装成功，列表已刷新`);
+  }, [showToast]);
+
   useEffect(() => {
     if (!backendPort || !settings.autoCheckUpdates || autoUpdateCheckedRef.current) return;
 
@@ -811,13 +877,18 @@ function App() {
   const handleSelectSession = useCallback((id: string) => {
     setCurrentSessionId(id);
     const session = sessions.find(s => s.id === id);
+    setChatWorkspacePath(session?.workspacePath && session.workspacePath !== UNLINKED_PROJECT
+      ? session.workspacePath
+      : null);
     if (session?.workspacePath && session.workspacePath !== UNLINKED_PROJECT && session.workspacePath !== activeProjectPath) {
       void handleSetActiveProject(session.workspacePath);
     }
   }, [sessions, activeProjectPath, handleSetActiveProject, setCurrentSessionId]);
 
   const handleCreateSessionInProject = useCallback((projectId?: string) => {
-    setNewSessionFromProject(true);
+    const linked = Boolean(projectId && projectId !== UNLINKED_PROJECT);
+    setNewSessionFromProject(linked);
+    setChatWorkspacePath(linked ? projectId! : null);
     if (projectId && projectId !== UNLINKED_PROJECT && projectId !== activeProjectPath) {
       void handleSetActiveProject(projectId);
     }
@@ -864,17 +935,15 @@ function App() {
   }, []);
 
   const handleStartPromptCreation = useCallback((type: PromptCreationType) => {
-    if (type === 'automation' && !activeProjectPath) {
-      showToast('请先选择一个项目');
-      return;
-    }
     setPanelState(prev => ({ ...prev, chatVisible: true }));
     setSidebarCollapsed(false);
     setAutomationPrompt(null);
-    setNewSessionFromProject(!!activeProjectPath);
+    setNewSessionFromProject(false);
+    setChatWorkspacePath(null);
 
     const label = type === 'skill' ? 'Skill' : type === 'agent' ? 'Agent' : '自动化';
-    const sessionId = handleNewSession(type === 'automation' ? activeProjectPath! : undefined, `创建 ${label}`);
+    const projectId = type === 'automation' ? UNLINKED_PROJECT : undefined;
+    const sessionId = handleNewSession(projectId, `创建 ${label}`);
     if (!sessionId) {
       showToast(`无法进入${label}创建模式`);
       return;
@@ -884,14 +953,16 @@ function App() {
       id: `${type}-${Date.now()}`,
       sessionId,
       type,
+      projectId,
       template: type === 'skill' ? settings.skillPrompt : type === 'agent' ? settings.agentPrompt : undefined,
     });
-  }, [activeProjectPath, handleNewSession, settings.agentPrompt, settings.skillPrompt]);
+  }, [handleNewSession, settings.agentPrompt, settings.skillPrompt]);
 
-  const handleAiCreateComplete = useCallback(async (info: { type: 'skill' | 'agent'; name: string; error?: string }) => {
+  const handleAiCreateComplete = useCallback(async (info: { type: PromptCreationType; name: string; error?: string }) => {
     setPromptCreation(null);
     if (info.error) {
-      showToast(`${info.type === 'skill' ? 'Skill' : 'Agent'} "${info.name}" 创建失败`);
+      if (info.type === 'automation') showToast(`自动化创建失败：${info.error}`);
+      else showToast(`${info.type === 'skill' ? 'Skill' : 'Agent'} "${info.name}" 创建失败`);
       return;
     }
     try {
@@ -902,7 +973,9 @@ function App() {
         const agents = await invoke<Array<{ name: string; description: string; path: string; enabled: boolean }>>('list_agents');
         setSettings(prev => ({ ...prev, agents: agents.map(a => ({ ...a, source: 'discovered' as const })) }));
       }
-      showToast(`${info.type === 'skill' ? 'Skill' : 'Agent'} "${info.name}" 已创建`);
+      if (info.type !== 'automation') {
+        showToast(`${info.type === 'skill' ? 'Skill' : 'Agent'} "${info.name}" 已创建`);
+      }
     } catch (err) {
       console.error('[App] AI 创建完成刷新失败:', err);
     } finally {
@@ -910,73 +983,349 @@ function App() {
     }
   }, []);
 
-  const handleCreateAutomationFromPrompt = useCallback(async (rawPrompt: string, options: SendOptions) => {
-    const prompt = rawPrompt.trim();
+  const handleCreateAutomationFromPrompt = useCallback(async (plan: GeneratedAutomationPlan, options: SendOptions) => {
     const creation = promptCreation?.type === 'automation' ? promptCreation : null;
-    const project = activeProjectPath
-      ? projects.find(item => item.id === activeProjectPath)
-      : undefined;
-    if (!creation || !activeProjectPath || !project) {
-      showToast('当前项目不可用，请重新进入自动化创建模式');
-      return;
-    }
-    if (!prompt || prompt.length > 10000) {
-      showToast(prompt ? '自动化提示词不能超过 10000 个字符' : '请输入自动化提示词');
-      return;
+    if (!creation) {
+      throw new Error('自动化创建上下文已失效，请重新进入创建模式');
     }
+    const projectId = creation.projectId || UNLINKED_PROJECT;
+    const project = projectId === UNLINKED_PROJECT
+      ? { id: UNLINKED_PROJECT, name: '未关联项目' }
+      : projects.find(item => item.id === projectId);
+    if (!project) throw new Error('创建自动化时选择的项目已不可用');
     if (!options.model || !options.modelName) {
-      showToast('请先选择一个可用模型');
-      return;
+      throw new Error('请先选择一个可用模型');
     }
 
     const now = new Date().toISOString();
     try {
       await addAutomation({
-        title: createPromptTitle(prompt),
-        prompt,
-        projectId: activeProjectPath,
+        title: plan.title,
+        prompt: plan.prompt,
+        projectId: project.id,
         projectName: project.name,
         modelId: options.model,
         modelName: options.modelName,
         reasoningEffort: options.reasoningEffort,
+        scheduleEnabled: plan.scheduleEnabled,
+        cron: plan.cron,
         createdAt: now,
         updatedAt: now,
         runCount: 0,
       });
       setPromptCreation(null);
       setAutomationRefreshKey(current => current + 1);
-      if (creation.sessionId.startsWith('temp-')) handleDeleteSession(creation.sessionId);
+      const creationSessionId = resolvedSessionIdsRef.current[creation.sessionId] || creation.sessionId;
+      handleDeleteSession(creationSessionId);
       setActiveActivity('automation');
-      showToast('自动化已创建');
+      showToast(plan.scheduleEnabled ? '定时自动化已创建' : '自动化已创建');
     } catch (err) {
       console.error('[App] 创建自动化失败:', err);
-      showToast('创建自动化失败');
+      throw err;
     }
-  }, [activeProjectPath, handleDeleteSession, projects, promptCreation]);
+  }, [handleDeleteSession, projects, promptCreation]);
 
-  const handleRunAutomation = useCallback(async (automation: DbAutomation) => {
-    const project = projects.find(item => item.id === automation.projectId);
-    if (!project) throw new Error(`项目已不在列表中：${automation.projectName}`);
+  const handleRunAutomation = useCallback(async (automation: DbAutomation, automationRunId?: number) => {
+    const unlinked = automation.projectId === UNLINKED_PROJECT;
+    const project = unlinked ? null : projects.find(item => item.id === automation.projectId);
+    if (!unlinked && !project) throw new Error(`项目已不在列表中：${automation.projectName}`);
 
-    await handleSetActiveProject(automation.projectId);
+    if (unlinked) setChatWorkspacePath(null);
+    else await handleSetActiveProject(automation.projectId);
     setPanelState(prev => ({ ...prev, chatVisible: true }));
     setSidebarCollapsed(false);
-    setNewSessionFromProject(true);
+    setNewSessionFromProject(!unlinked);
     setPromptCreation(null);
 
     const sessionId = handleNewSession(automation.projectId, automation.title);
     if (!sessionId) throw new Error('无法创建自动化会话');
+    if (automationRunId) {
+      automationRunBySessionRef.current[sessionId] = automationRunId;
+    }
 
     setAutomationPrompt({
       runId: `${automation.id || 'automation'}-${Date.now()}`,
+      sessionId,
       prompt: automation.prompt,
       modelId: automation.modelId,
       modelName: automation.modelName,
       reasoningEffort: automation.reasoningEffort,
     });
     setActiveActivity('sessions');
+    return sessionId;
   }, [handleNewSession, handleSetActiveProject, projects]);
 
+  const handleSelectAutomation = useCallback((automation: DbAutomation) => {
+    setSelectedAutomation(automation);
+    setPanelState(prev => ({ ...prev, editorVisible: true }));
+  }, []);
+
+  const handleAutomationDeleted = useCallback((automationId: number) => {
+    if (selectedAutomation?.id !== automationId) return;
+    setSelectedAutomation(null);
+    if (openFiles.length === 0) {
+      setPanelState(prev => ({ ...prev, editorVisible: false }));
+    }
+  }, [openFiles.length, selectedAutomation?.id]);
+
+  const handleRunAutomationFromDetail = useCallback(async (
+    automation: DbAutomation,
+    trigger: 'manual' | 'scheduled' = 'manual',
+  ): Promise<boolean> => {
+    if (!automation.id || runningAutomationIdRef.current !== null) return false;
+    runningAutomationIdRef.current = automation.id;
+    setRunningAutomationId(automation.id);
+    const startedAt = new Date().toISOString();
+    let automationRunId: number;
+
+    try {
+      automationRunId = await addAutomationRun({
+        automationId: automation.id,
+        status: 'running',
+        trigger,
+        projectId: automation.projectId,
+        projectName: automation.projectName,
+        modelId: automation.modelId,
+        modelName: automation.modelName,
+        reasoningEffort: automation.reasoningEffort,
+        startedAt,
+      });
+    } catch (err) {
+      runningAutomationIdRef.current = null;
+      setRunningAutomationId(null);
+      console.error('[App] 保存自动化运行记录失败:', err);
+      showToast('无法保存运行记录，自动化未启动');
+      return false;
+    }
+
+    try {
+      const sessionId = await handleRunAutomation(automation, automationRunId);
+      try {
+        await updateAutomationRun(automationRunId, { sessionId });
+      } catch (err) {
+        console.error('[App] 关联自动化运行会话失败:', err);
+      }
+
+      const lastRunAt = startedAt;
+      const updated = {
+        ...automation,
+        lastRunAt,
+        runCount: automation.runCount + 1,
+        updatedAt: lastRunAt,
+      };
+      try {
+        await updateAutomation(automation.id, {
+          lastRunAt,
+          runCount: updated.runCount,
+          updatedAt: lastRunAt,
+        });
+      } catch (err) {
+        console.error('[App] 更新自动化运行统计失败:', err);
+      }
+      setSelectedAutomation(current => current?.id === updated.id ? updated : current);
+      setAutomationRefreshKey(current => current + 1);
+      if (trigger === 'scheduled') showToast(`定时任务 "${automation.title}" 已启动`);
+      return true;
+    } catch (err) {
+      for (const [mappedSessionId, mappedRunId] of Object.entries(automationRunBySessionRef.current)) {
+        if (mappedRunId === automationRunId) delete automationRunBySessionRef.current[mappedSessionId];
+      }
+      const completedAt = new Date().toISOString();
+      await updateAutomationRun(automationRunId, {
+        status: 'error',
+        completedAt,
+        error: getAutomationRunError(err),
+      }).catch(updateErr => {
+        console.error('[App] 更新自动化失败记录失败:', updateErr);
+      });
+      setAutomationRefreshKey(current => current + 1);
+      runningAutomationIdRef.current = null;
+      setRunningAutomationId(null);
+      console.error('[App] 运行自动化失败:', err);
+      showToast(err instanceof Error ? err.message : '运行自动化失败');
+      return false;
+    }
+  }, [handleRunAutomation, showToast]);
+
+  const handleSaveAutomation = useCallback(async (
+    automation: DbAutomation,
+    updates: AutomationUpdateInput,
+  ): Promise<boolean> => {
+    if (!automation.id || runningAutomationIdRef.current === automation.id) return false;
+    const title = updates.title.trim();
+    const prompt = updates.prompt.trim();
+    const cron = updates.cron.trim().replace(/\s+/g, ' ');
+    if (!title || title.length > 100) {
+      showToast('任务名称应为 1-100 个字符');
+      return false;
+    }
+    if (!prompt || prompt.length > 10000) {
+      showToast('任务提示词应为 1-10000 个字符');
+      return false;
+    }
+    const cronError = getCronValidationError(cron);
+    if (cronError) {
+      showToast(cronError);
+      return false;
+    }
+    const project = updates.projectId === UNLINKED_PROJECT
+      ? { id: UNLINKED_PROJECT, name: '未关联项目' }
+      : projects.find(item => item.id === updates.projectId);
+    const model = automationModels.find(item => item.id === updates.modelId);
+    if (!project || !model) {
+      showToast(!project ? '请选择一个可用项目' : '请选择一个可用模型');
+      return false;
+    }
+
+    const updatedAt = new Date().toISOString();
+    const nextAutomation: DbAutomation = {
+      ...automation,
+      ...updates,
+      title,
+      prompt,
+      cron,
+      projectName: project.name,
+      modelName: model.name,
+      updatedAt,
+    };
+    try {
+      await updateAutomation(automation.id, {
+        title,
+        prompt,
+        projectId: project.id,
+        projectName: project.name,
+        modelId: model.id,
+        modelName: model.name,
+        reasoningEffort: updates.reasoningEffort,
+        scheduleEnabled: updates.scheduleEnabled,
+        cron,
+        updatedAt,
+      });
+      if (!updates.scheduleEnabled) {
+        scheduledAutomationQueueRef.current = scheduledAutomationQueueRef.current.filter(id => id !== automation.id);
+        setScheduledAutomationQueueVersion(current => current + 1);
+      }
+      setSelectedAutomation(nextAutomation);
+      setAutomationRefreshKey(current => current + 1);
+      showToast('自动化配置已保存');
+      return true;
+    } catch (error) {
+      console.error('[App] 保存自动化配置失败:', error);
+      showToast('保存自动化配置失败');
+      return false;
+    }
+  }, [automationModels, projects, showToast]);
+
+  useEffect(() => {
+    let checking = false;
+    const checkSchedules = async () => {
+      if (checking) return;
+      checking = true;
+      try {
+        const now = new Date();
+        const previousCheck = lastAutomationScheduleCheckRef.current;
+        lastAutomationScheduleCheckRef.current = now;
+        const automations = await getAllAutomations();
+        let queued = false;
+        for (const automation of automations) {
+          if (!automation.id || !automation.scheduleEnabled) continue;
+          let scheduledFor: Date | null = null;
+          try {
+            const cron = automation.cron || '0 9 * * *';
+            scheduledFor = previousCheck
+              ? getLatestCronRun(cron, previousCheck, now)
+              : (cronMatchesDate(cron, now) ? new Date(Math.floor(now.getTime() / 60_000) * 60_000) : null);
+          } catch (error) {
+            console.error(`[App] 自动化 ${automation.id} 的 Cron 无效:`, error);
+            continue;
+          }
+          if (!scheduledFor) continue;
+          const minuteKey = getCronMinuteKey(scheduledFor);
+          if (automation.lastScheduledAt === minuteKey) continue;
+          await updateAutomation(automation.id, { lastScheduledAt: minuteKey });
+          if (!scheduledAutomationQueueRef.current.includes(automation.id)) {
+            scheduledAutomationQueueRef.current.push(automation.id);
+            queued = true;
+          }
+        }
+        if (queued) {
+          setAutomationRefreshKey(current => current + 1);
+          setScheduledAutomationQueueVersion(current => current + 1);
+        }
+      } catch (error) {
+        console.error('[App] 检查自动化定时任务失败:', error);
+      } finally {
+        checking = false;
+      }
+    };
+
+    void checkSchedules();
+    const timer = window.setInterval(() => { void checkSchedules(); }, 30_000);
+    const handleFocus = () => { void checkSchedules(); };
+    window.addEventListener('focus', handleFocus);
+    return () => {
+      window.clearInterval(timer);
+      window.removeEventListener('focus', handleFocus);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (runningAutomationIdRef.current !== null || scheduledAutomationQueueProcessingRef.current) return;
+    const automationId = scheduledAutomationQueueRef.current.shift();
+    if (automationId === undefined) return;
+    scheduledAutomationQueueProcessingRef.current = true;
+    void (async () => {
+      try {
+        const automation = await getAutomation(automationId);
+        if (automation?.scheduleEnabled) {
+          await handleRunAutomationFromDetail(automation, 'scheduled');
+        }
+      } catch (error) {
+        console.error('[App] 启动排队的自动化任务失败:', error);
+      } finally {
+        scheduledAutomationQueueProcessingRef.current = false;
+        setScheduledAutomationQueueVersion(current => current + 1);
+      }
+    })();
+  }, [handleRunAutomationFromDetail, runningAutomationId, scheduledAutomationQueueVersion]);
+
+  const handleDeleteAutomationFromDetail = useCallback(async (automation: DbAutomation) => {
+    if (!automation.id || runningAutomationId !== null) return;
+    try {
+      await deleteAutomation(automation.id);
+      setSelectedAutomation(null);
+      if (openFiles.length === 0) {
+        setPanelState(prev => ({ ...prev, editorVisible: false }));
+      }
+      setAutomationRefreshKey(current => current + 1);
+      showToast(`自动化任务 "${automation.title}" 已删除`);
+    } catch (err) {
+      console.error('[App] 删除自动化失败:', err);
+      showToast('删除自动化失败');
+    }
+  }, [openFiles.length, runningAutomationId]);
+
+  const handleCloseAutomationDetail = useCallback(() => {
+    setSelectedAutomation(null);
+    if (openFiles.length === 0) {
+      setPanelState(prev => ({ ...prev, editorVisible: false }));
+    }
+  }, [openFiles.length]);
+
+  const handleOpenAutomationRun = useCallback((run: DbAutomationRun) => {
+    if (!run.sessionId) return;
+    const sessionId = resolvedSessionIdsRef.current[run.sessionId] || run.sessionId;
+    if (!sessions.some(session => session.id === sessionId)) {
+      showToast('该运行记录关联的对话已不存在');
+      return;
+    }
+    handleCloseAutomationDetail();
+    setPanelState(prev => ({ ...prev, chatVisible: true }));
+    setSidebarCollapsed(false);
+    setActiveActivity('sessions');
+    handleSelectSession(sessionId);
+  }, [handleCloseAutomationDetail, handleSelectSession, sessions, showToast]);
+
   // 渲染侧边栏内容
   const renderSidebarContent = () => {
     if (sidebarCollapsed) return null;
@@ -986,7 +1335,7 @@ function App() {
           <ExplorerPanel
             projects={projects} activeProjectPath={activeProjectPath} refreshKey={projectRefreshKey}
             onFileSelect={handleFileSelect} onOpenFolder={handleOpenFolder} onCreateProject={handleCreateProject}
-            onRemoveProject={handleRemoveProject} onSetActiveProject={handleSetActiveProject}
+            onRemoveProject={handleRemoveProject} onRenameProject={handleRenameProject} onSetActiveProject={handleSetActiveProject}
             onRefreshProject={refreshFileTree} onNewFile={handleNewFile} onNewFolder={handleNewFolder}
             onRename={handleRename} onDelete={handleDelete} onCopy={handleCopy} onMove={handleMove}
           />
@@ -1013,8 +1362,10 @@ function App() {
           <AutomationPanel
             projects={projects}
             refreshKey={automationRefreshKey}
+            selectedAutomationId={selectedAutomation?.id}
             onCreateWithPrompt={() => handleStartPromptCreation('automation')}
-            onRunAutomation={handleRunAutomation}
+            onSelectAutomation={handleSelectAutomation}
+            onAutomationDeleted={handleAutomationDeleted}
           />
         );
       case 'skills':
@@ -1035,9 +1386,25 @@ function App() {
       if (!panelState.editorVisible) return null;
       return (
         <div key="editor" className="panel-wrapper editor-wrapper" style={bothVisible ? { width: panelState.editorWidth } : undefined}>
-          <Suspense fallback={<div className="panel-loading">Loading editor...</div>}>
-            <EditorPanel files={openFiles} activeFilePath={activeFilePath} onFileSelect={setActiveFilePath} onFileClose={(path) => { handleFileClose(path); setDiffFiles(prev => { const next = { ...prev }; delete next[path]; return next; }); }} onContentChange={handleContentChange} onFileSave={handleFileSave} theme={currentTheme} editorTheme={settings.editorTheme} fontSize={settings.fontSize} tabSize={settings.tabSize} autoSave={settings.autoSave} formatOnSave={settings.formatOnSave} diffLines={diffLines} diffFiles={diffFiles} />
-          </Suspense>
+          {selectedAutomation ? (
+            <AutomationDetail
+              automation={selectedAutomation}
+              projects={projects}
+              models={automationModels}
+              running={runningAutomationId === selectedAutomation.id}
+              runDisabled={runningAutomationId !== null && runningAutomationId !== selectedAutomation.id}
+              runRefreshKey={automationRefreshKey}
+              onRun={automation => { void handleRunAutomationFromDetail(automation); }}
+              onOpenRun={handleOpenAutomationRun}
+              onSave={handleSaveAutomation}
+              onDelete={automation => { void handleDeleteAutomationFromDetail(automation); }}
+              onClose={handleCloseAutomationDetail}
+            />
+          ) : (
+            <Suspense fallback={<div className="panel-loading">Loading editor...</div>}>
+              <EditorPanel files={openFiles} activeFilePath={activeFilePath} onFileSelect={setActiveFilePath} onFileClose={(path) => { handleFileClose(path); setDiffFiles(prev => { const next = { ...prev }; delete next[path]; return next; }); }} onContentChange={handleContentChange} onFileSave={handleFileSave} theme={currentTheme} editorTheme={settings.editorTheme} fontSize={settings.fontSize} tabSize={settings.tabSize} autoSave={settings.autoSave} formatOnSave={settings.formatOnSave} diffLines={diffLines} diffFiles={diffFiles} />
+            </Suspense>
+          )}
           {bothVisible && <div className="resize-handle vertical" onMouseDown={(e) => startResize('editor', e)} />}
         </div>
       );
@@ -1050,12 +1417,14 @@ function App() {
           <ChatView
             currentConversation={currentConversation} plugins={plugins} workspacePath={chatWorkspacePath || undefined} projectName={workspaceName || undefined}
             theme={currentTheme} backendPort={backendPort} onUpdateSessionTitle={handleUpdateSessionTitle} onNewSession={(title) => {
-              setNewSessionFromProject(!!activeProjectPath);
-              return handleNewSession(activeProjectPath || UNLINKED_PROJECT, title);
+              setNewSessionFromProject(false);
+              setChatWorkspacePath(null);
+              return handleNewSession(UNLINKED_PROJECT, title);
             }}
             sessions={sessions} sessionRunStates={sessionRunStates} maxSteps={settings.maxSteps} onSelectSession={handleSelectSession}
             providers={settings.providers} agents={settings.agents} activeProviderId={settings.activeProviderId} onActiveProviderChange={(providerId: string) => { setSettings(prev => { const updated = { ...prev, activeProviderId: providerId }; settingsService.save(updated); return updated; }); }}
-            activeFileName={activeFile?.name} activeFilePath={activeFilePath || undefined}
+            activeFileName={chatWorkspacePath ? activeFile?.name : undefined}
+            activeFilePath={chatWorkspacePath ? (activeFilePath || undefined) : undefined}
             onFileSelect={handleChatFileSelect}
             reviewFiles={currentSessionId ? (sessionReviewFiles[currentSessionId] || []) : []}
             onReviewFileSelect={handleDiffFileSelect}
@@ -1069,8 +1438,30 @@ function App() {
               setAutomationPrompt(current => current?.runId === runId ? null : current);
             }}
             newSessionFromProject={newSessionFromProject}
-            onSessionRunStateChange={(sessionId, status) => {
+            onSessionRunStateChange={(sessionId, status, error) => {
               setSessionRunStates(prev => ({ ...prev, [sessionId]: status }));
+              if (status === 'completed' || status === 'error') {
+                const resolvedSessionId = resolvedSessionIdsRef.current[sessionId] || sessionId;
+                const automationRunId = automationRunBySessionRef.current[sessionId]
+                  || automationRunBySessionRef.current[resolvedSessionId];
+                if (automationRunId) {
+                  for (const [mappedSessionId, mappedRunId] of Object.entries(automationRunBySessionRef.current)) {
+                    if (mappedRunId === automationRunId) delete automationRunBySessionRef.current[mappedSessionId];
+                  }
+                  const completedAt = new Date().toISOString();
+                  void updateAutomationRun(automationRunId, {
+                    status,
+                    completedAt,
+                    error: status === 'error' ? getAutomationRunError(error || '会话执行失败') : undefined,
+                  }).then(() => {
+                    setAutomationRefreshKey(current => current + 1);
+                  }).catch(err => {
+                    console.error('[App] 完成自动化运行记录失败:', err);
+                  });
+                  runningAutomationIdRef.current = null;
+                  setRunningAutomationId(null);
+                }
+              }
               if (status === 'running') {
                 setSessionReviewFiles(prev => {
                   const next = { ...prev };
@@ -1225,7 +1616,7 @@ function App() {
         onReconnect={() => reconnectBackend((updater) => setSettings(updater))}
       />
       {toast && <div className="toast-message">{toast}</div>}
-      <SettingsPanel visible={settingsVisible} settings={settings} onSettingsChange={handleSettingsChange} onClose={() => setSettingsVisible(false)} backendPort={backendPort} workspacePath={activeProjectPath} sessionId={currentSessionId} />
+      <SettingsPanel visible={settingsVisible} settings={settings} onSettingsChange={handleSettingsChange} onClose={() => setSettingsVisible(false)} onSkillInstalled={handleSkillInstalled} backendPort={backendPort} workspacePath={activeProjectPath} sessionId={currentSessionId} />
     </div>
     </div>
   );
diff --git a/soloncode-desktop/src/components/ChatHeader.css b/soloncode-desktop/src/components/ChatHeader.css
index 36a37a6b06e7f4d2340f2c5edd57eba8d735db42..8bc42c7bb80dc4f7bfbc7b7badf1d1bb0a3e1052 100644
--- a/soloncode-desktop/src/components/ChatHeader.css
+++ b/soloncode-desktop/src/components/ChatHeader.css
@@ -127,19 +127,13 @@
   white-space: nowrap;
 }
 
-.chat-task-section {
-  margin-top: 12px;
-  padding-top: 10px;
-  border-top: 1px solid var(--cb-vscode-panel-border);
-}
-
 .chat-review-section {
   margin-top: 12px;
   padding-top: 10px;
   border-top: 1px solid var(--cb-vscode-panel-border);
 }
 
-.chat-task-heading {
+.chat-section-heading {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -149,150 +143,6 @@
   font-weight: 600;
 }
 
-.chat-task-list {
-  max-height: 340px;
-  overflow-y: auto;
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  padding-right: 2px;
-}
-
-.chat-result-card-shell {
-  width: 100%;
-  border: 1px solid var(--cb-vscode-panel-border);
-  border-radius: 8px;
-  background-color: var(--cb-vscode-input-background);
-  color: var(--cb-text-primary);
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  padding: 10px;
-  text-align: left;
-  cursor: pointer;
-  transition: border-color 0.16s, background-color 0.16s, box-shadow 0.16s;
-}
-
-.chat-result-card-shell:hover {
-  border-color: rgba(14, 99, 156, 0.48);
-  background-color: var(--cb-vscode-list-hoverBackground);
-}
-
-.chat-result-card-shell.selected {
-  border-color: var(--cb-accent);
-  box-shadow: 0 0 0 1px rgba(14, 99, 156, 0.18);
-}
-
-.chat-task-card-header {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 10px;
-  min-width: 0;
-}
-
-.chat-task-card-title {
-  min-width: 0;
-  color: var(--cb-text-primary);
-  font-size: 13px;
-  font-weight: 600;
-  line-height: 1.35;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.chat-task-tag {
-  flex: 0 0 auto;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  padding: 2px 7px;
-  font-size: 12px;
-  line-height: 1.25;
-}
-
-.chat-task-tag.info {
-  color: var(--cb-text-secondary);
-  background-color: var(--cb-text-secondary);
-  background-color: rgba(144, 147, 153, 0.12);
-  border-color: rgba(144, 147, 153, 0.24);
-}
-
-.chat-task-tag.primary {
-  color: #409eff;
-  background-color: rgba(64, 158, 255, 0.12);
-  border-color: rgba(64, 158, 255, 0.24);
-}
-
-.chat-task-tag.success {
-  color: #67c23a;
-  background-color: rgba(103, 194, 58, 0.12);
-  border-color: rgba(103, 194, 58, 0.24);
-}
-
-.chat-task-tag.danger {
-  color: #f56c6c;
-  background-color: rgba(245, 108, 108, 0.12);
-  border-color: rgba(245, 108, 108, 0.24);
-}
-
-.chat-task-card-footer {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-}
-
-.chat-task-card-meta {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-  color: var(--cb-text-secondary);
-  font-size: 12px;
-}
-
-.chat-task-card-meta span {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.chat-task-progress {
-  width: 100%;
-  height: 6px;
-  border-radius: 999px;
-  overflow: hidden;
-  background-color: rgba(144, 147, 153, 0.16);
-}
-
-.chat-task-progress span {
-  display: block;
-  height: 100%;
-  border-radius: inherit;
-  background-color: #909399;
-  transition: width 0.2s ease;
-}
-
-.chat-task-progress.primary span {
-  background-color: #409eff;
-}
-
-.chat-task-progress.success span {
-  background-color: #67c23a;
-}
-
-.chat-task-progress.danger span {
-  background-color: #f56c6c;
-}
-
-.chat-task-empty {
-  padding: 18px 8px;
-  color: var(--cb-text-secondary);
-  font-size: 12px;
-  text-align: center;
-}
-
 .chat-review-file-list {
   display: flex;
   flex-direction: column;
diff --git a/soloncode-desktop/src/components/ChatHeader.tsx b/soloncode-desktop/src/components/ChatHeader.tsx
index bd53b99c4a3227f9d49f4c9563d121b7266a9637..5a1911b3558cfed058f090fb69a235becf3b244a 100644
--- a/soloncode-desktop/src/components/ChatHeader.tsx
+++ b/soloncode-desktop/src/components/ChatHeader.tsx
@@ -1,15 +1,7 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { Icon } from './common/Icon';
 import './ChatHeader.css';
 
-export interface ChatHeaderTask {
-  id: string;
-  title: string;
-  status: 'pending' | 'in_progress' | 'done';
-  group?: string;
-  line?: number;
-}
-
 export interface ChatReviewFile {
   path: string;
   status: 'modified' | 'added' | 'deleted' | 'untracked';
@@ -25,9 +17,6 @@ interface ChatHeaderProps {
   startedAt?: string;
   totalTokens?: number;
   totalConversations?: number;
-  tasks?: ChatHeaderTask[];
-  activeTaskId?: string;
-  onSelectTask?: (id: string) => void;
   reviewFiles?: ChatReviewFile[];
   onReviewFileSelect?: (path: string) => void;
   openInfoSignal?: number;
@@ -64,16 +53,6 @@ function formatRelativeTime(value?: string) {
   return new Date(value).toLocaleDateString('zh-CN');
 }
 
-function getTaskStatusMeta(status?: ChatHeaderTask['status']) {
-  if (status === 'in_progress') {
-    return { label: '进行中', tone: 'primary', progress: 50 };
-  }
-  if (status === 'done') {
-    return { label: '已完成', tone: 'success', progress: 100 };
-  }
-  return { label: '待处理', tone: 'info', progress: 0 };
-}
-
 function getFileName(path: string) {
   return path.split(/[\\/]/).pop() || path;
 }
@@ -93,9 +72,6 @@ export function ChatHeader({
   startedAt,
   totalTokens = 0,
   totalConversations = 0,
-  tasks = [],
-  activeTaskId,
-  onSelectTask,
   reviewFiles = [],
   onReviewFileSelect,
   openInfoSignal,
@@ -126,19 +102,6 @@ export function ChatHeader({
     if (openInfoSignal > 0) setInfoOpen(true);
   }, [openInfoSignal]);
 
-  const sortedTasks = useMemo(() => {
-    return [...tasks].sort((a, b) => {
-      if (typeof a.line === 'number' && typeof b.line === 'number') return a.line - b.line;
-      return 0;
-    });
-  }, [tasks]);
-
-  const handleSelectTask = (id: string) => {
-    if (!onSelectTask) return;
-    onSelectTask?.(id);
-    setInfoOpen(false);
-  };
-
   return (
     <header className="chat-header">
       <div className="chat-title">
@@ -181,7 +144,7 @@ export function ChatHeader({
             </div>
             {reviewFiles.length > 0 && (
               <div className="chat-review-section">
-                <div className="chat-task-heading">
+                <div className="chat-section-heading">
                   <span>审查文件</span>
                   <span>{formatNumber(reviewFiles.length)}</span>
                 </div>
@@ -205,46 +168,6 @@ export function ChatHeader({
                 </div>
               </div>
             )}
-            <div className="chat-task-section">
-              <div className="chat-task-heading">
-                <span>任务列表</span>
-                <span>{formatNumber(sortedTasks.length)}</span>
-              </div>
-              <div className="chat-task-list">
-                {sortedTasks.length === 0 && (
-                  <div className="chat-task-empty">暂无任务</div>
-                )}
-                {sortedTasks.map((task, index) => {
-                  const statusMeta = getTaskStatusMeta(task.status);
-                  const isActiveTask = activeTaskId === task.id;
-                  const progress = statusMeta.progress;
-                  return (
-                    <button
-                      key={task.id}
-                      type="button"
-                      className={`chat-result-card-shell${isActiveTask ? ' selected' : ''}`}
-                      onClick={() => handleSelectTask(task.id)}
-                    >
-                      <span className="chat-task-card-header">
-                        <span className="chat-task-card-title">任务 {index + 1} · {task.title}</span>
-                        <span className={`chat-task-tag ${statusMeta.tone}`}>
-                          {statusMeta.label}
-                        </span>
-                      </span>
-                      <span className="chat-task-card-footer">
-                        <span className="chat-task-card-meta">
-                          <span>{task.group || '当前任务清单'}</span>
-                          {typeof task.line === 'number' && <span>第 {formatNumber(task.line)} 行</span>}
-                        </span>
-                        <span className={`chat-task-progress ${statusMeta.tone}`}>
-                          <span style={{ width: `${progress}%` }} />
-                        </span>
-                      </span>
-                    </button>
-                  );
-                })}
-              </div>
-            </div>
           </div>
         )}
       </div>
diff --git a/soloncode-desktop/src/components/ChatMessages.tsx b/soloncode-desktop/src/components/ChatMessages.tsx
index 95ac26dd370b6f8c262e6629f16db943d8705805..bbbd67632c94e1a3ff50c6229980574203c9938d 100644
--- a/soloncode-desktop/src/components/ChatMessages.tsx
+++ b/soloncode-desktop/src/components/ChatMessages.tsx
@@ -8,6 +8,7 @@ import { ThinkBlock } from './ThinkBlock';
 import { ActionBlock } from './ActionBlock';
 import { ActionGroupBlock } from './ActionGroupBlock';
 import type { Message, Theme, ContentItem } from '../types';
+import { isTodoToolName } from '../utils/todoTools';
 import './ChatMessages.css';
 
 interface ChatMessagesProps {
@@ -474,6 +475,14 @@ export const ChatMessages = forwardRef<ChatMessagesRef, ChatMessagesProps>(
   ({ messages, isLoading, thinkingElapsedSeconds = 0, theme, projectName, onDeleteMessage, onHitlAction, onFileSelect }, ref) => {
     const virtuosoRef = useRef<VirtuosoHandle>(null);
     const autoFollowRef = useRef(true);
+    const visibleMessages = useMemo(() => {
+      return messages.reduce<Message[]>((result, message) => {
+        const contents = message.contents.filter(item => !isTodoToolName(item.toolName));
+        if (contents.length === 0) return result;
+        result.push(contents.length === message.contents.length ? message : { ...message, contents });
+        return result;
+      }, []);
+    }, [messages]);
 
     useImperativeHandle(ref, () => ({
       scrollToBottom() {
@@ -482,20 +491,20 @@ export const ChatMessages = forwardRef<ChatMessagesRef, ChatMessagesProps>(
       }
     }));
 
-    const showThinkingRow = isLoading && messages[messages.length - 1]?.role !== 'ASSISTANT';
+    const showThinkingRow = isLoading && visibleMessages[visibleMessages.length - 1]?.role !== 'ASSISTANT';
 
     const itemContent = useCallback((index: number) => {
-      if (showThinkingRow && index === messages.length) {
+      if (showThinkingRow && index === visibleMessages.length) {
         return <ThinkingRow elapsedSeconds={thinkingElapsedSeconds} />;
       }
-      const message = messages[index];
-      const isStreamingMessage = isLoading && index === messages.length - 1 && message?.role === 'ASSISTANT';
+      const message = visibleMessages[index];
+      const isStreamingMessage = isLoading && index === visibleMessages.length - 1 && message?.role === 'ASSISTANT';
       return (
         <MessageRow message={message} theme={theme} onDelete={onDeleteMessage} onHitlAction={onHitlAction} onFileSelect={onFileSelect} isStreaming={isStreamingMessage} />
       );
-    }, [messages, isLoading, showThinkingRow, thinkingElapsedSeconds, theme, onDeleteMessage, onHitlAction, onFileSelect]);
+    }, [visibleMessages, isLoading, showThinkingRow, thinkingElapsedSeconds, theme, onDeleteMessage, onHitlAction, onFileSelect]);
 
-    if (messages.length === 0 && !isLoading) {
+    if (visibleMessages.length === 0 && !isLoading) {
       return (
         <div className="chat-messages">
           <div className="empty-messages">
@@ -511,14 +520,14 @@ export const ChatMessages = forwardRef<ChatMessagesRef, ChatMessagesProps>(
         <Virtuoso
           className="chat-messages-list"
           ref={virtuosoRef}
-          totalCount={messages.length + (showThinkingRow ? 1 : 0)}
+          totalCount={visibleMessages.length + (showThinkingRow ? 1 : 0)}
           itemContent={itemContent}
           followOutput={(isAtBottom) => autoFollowRef.current && isAtBottom ? 'auto' : false}
           atBottomStateChange={(atBottom) => {
             autoFollowRef.current = atBottom;
           }}
-          initialTopMostItemIndex={Math.max(0, messages.length - 1)}
-          computeItemKey={(index) => showThinkingRow && index === messages.length ? 'thinking' : (messages[index]?.id ?? index)}
+          initialTopMostItemIndex={Math.max(0, visibleMessages.length - 1)}
+          computeItemKey={(index) => showThinkingRow && index === visibleMessages.length ? 'thinking' : (visibleMessages[index]?.id ?? index)}
           style={{ height: '100%' }}
         />
         {false && (
diff --git a/soloncode-desktop/src/components/ChatTaskList.css b/soloncode-desktop/src/components/ChatTaskList.css
new file mode 100644
index 0000000000000000000000000000000000000000..59ba5d20a26a5395cead9a68fa0f1994bc4f0cf1
--- /dev/null
+++ b/soloncode-desktop/src/components/ChatTaskList.css
@@ -0,0 +1,233 @@
+.chat-task-panel {
+  position: relative;
+  z-index: 20;
+  width: 100%;
+  max-width: var(--input-max-width, 60%);
+  margin: 0 auto;
+  padding: 0 10px 4px;
+  box-sizing: border-box;
+}
+
+.chat-task-trigger {
+  width: 100%;
+  min-height: 38px;
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  padding: 7px 11px;
+  border: 1px solid var(--cb-vscode-panel-border);
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--cb-vscode-input-background) 82%, var(--cb-vscode-editor-background));
+  color: var(--cb-text-primary);
+  cursor: pointer;
+  text-align: left;
+  transition: border-color 0.16s, background-color 0.16s;
+}
+
+.chat-task-trigger:hover,
+.chat-task-trigger:focus-visible {
+  border-color: color-mix(in srgb, var(--cb-accent) 52%, var(--cb-vscode-panel-border));
+  background: var(--cb-vscode-list-hoverBackground);
+  outline: none;
+}
+
+.chat-task-panel.expanded .chat-task-trigger {
+  border-radius: 0 0 10px 10px;
+  border-color: color-mix(in srgb, var(--cb-accent) 42%, var(--cb-vscode-panel-border));
+}
+
+.chat-task-trigger-icon {
+  width: 22px;
+  height: 22px;
+  flex: 0 0 auto;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 7px;
+  color: var(--cb-accent);
+  background: color-mix(in srgb, var(--cb-accent) 13%, transparent);
+}
+
+.chat-task-trigger-main {
+  min-width: 0;
+  flex: 1;
+  display: flex;
+  align-items: baseline;
+  gap: 8px;
+}
+
+.chat-task-trigger-title {
+  flex: 0 0 auto;
+  font-size: 12px;
+  font-weight: 650;
+}
+
+.chat-task-trigger-summary {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--cb-text-secondary);
+  font-size: 11px;
+}
+
+.chat-task-trigger-progress {
+  width: clamp(48px, 12%, 84px);
+  height: 4px;
+  flex: 0 0 auto;
+  overflow: hidden;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--cb-text-secondary) 18%, transparent);
+}
+
+.chat-task-trigger-progress > span {
+  display: block;
+  height: 100%;
+  border-radius: inherit;
+  background: #67c23a;
+  transition: width 0.2s ease;
+}
+
+.chat-task-content {
+  position: absolute;
+  right: 10px;
+  bottom: calc(100% - 1px);
+  left: 10px;
+  overflow: hidden;
+  border: 1px solid color-mix(in srgb, var(--cb-accent) 42%, var(--cb-vscode-panel-border));
+  border-bottom: 0;
+  border-radius: 10px 10px 0 0;
+  background: color-mix(in srgb, var(--cb-vscode-input-background) 88%, var(--cb-vscode-editor-background));
+  box-shadow: 0 -10px 24px rgba(0, 0, 0, 0.2);
+}
+
+.chat-task-items {
+  max-height: min(260px, 32vh);
+  margin: 0;
+  padding: 5px;
+  overflow-y: auto;
+  list-style: none;
+}
+
+.chat-task-item {
+  min-height: 40px;
+  display: grid;
+  grid-template-columns: 22px minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 9px;
+  padding: 6px 7px;
+  border-radius: 7px;
+}
+
+.chat-task-item + .chat-task-item {
+  border-top: 1px solid color-mix(in srgb, var(--cb-vscode-panel-border) 72%, transparent);
+  border-radius: 0;
+}
+
+.chat-task-item:hover {
+  background: var(--cb-vscode-list-hoverBackground);
+}
+
+.chat-task-index {
+  width: 20px;
+  height: 20px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--cb-vscode-panel-border);
+  border-radius: 50%;
+  color: var(--cb-text-secondary);
+  font-size: 10px;
+  line-height: 1;
+}
+
+.chat-task-item.primary .chat-task-index {
+  border-color: rgba(64, 158, 255, 0.45);
+  color: #409eff;
+  background: rgba(64, 158, 255, 0.1);
+}
+
+.chat-task-item.success .chat-task-index {
+  border-color: rgba(103, 194, 58, 0.4);
+  color: #67c23a;
+  background: rgba(103, 194, 58, 0.1);
+}
+
+.chat-task-item-main {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.chat-task-item-title,
+.chat-task-item-meta {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.chat-task-item-title {
+  color: var(--cb-text-primary);
+  font-size: 12px;
+  font-weight: 550;
+}
+
+.chat-task-item.success .chat-task-item-title {
+  color: var(--cb-text-secondary);
+  text-decoration: line-through;
+}
+
+.chat-task-item-meta {
+  color: var(--cb-text-secondary);
+  font-size: 10px;
+}
+
+.chat-task-status {
+  flex: 0 0 auto;
+  padding: 2px 6px;
+  border: 1px solid transparent;
+  border-radius: 999px;
+  font-size: 10px;
+  line-height: 1.25;
+}
+
+.chat-task-status.info {
+  color: var(--cb-text-secondary);
+  border-color: rgba(144, 147, 153, 0.24);
+  background: rgba(144, 147, 153, 0.1);
+}
+
+.chat-task-status.primary {
+  color: #409eff;
+  border-color: rgba(64, 158, 255, 0.24);
+  background: rgba(64, 158, 255, 0.1);
+}
+
+.chat-task-status.success {
+  color: #67c23a;
+  border-color: rgba(103, 194, 58, 0.24);
+  background: rgba(103, 194, 58, 0.1);
+}
+
+.empty-center-container > .chat-task-panel {
+  max-width: 100%;
+  padding-right: 0;
+  padding-left: 0;
+}
+
+.empty-center-container > .chat-task-panel .chat-task-content {
+  right: 0;
+  left: 0;
+}
+
+@media (max-width: 720px) {
+  .chat-task-trigger-progress {
+    display: none;
+  }
+
+  .chat-task-status {
+    display: none;
+  }
+}
diff --git a/soloncode-desktop/src/components/ChatTaskList.tsx b/soloncode-desktop/src/components/ChatTaskList.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..691161d94100b55ed978d697d059c7e3f46854bf
--- /dev/null
+++ b/soloncode-desktop/src/components/ChatTaskList.tsx
@@ -0,0 +1,88 @@
+import { useId, useMemo, useState } from 'react';
+import { Icon } from './common/Icon';
+import './ChatTaskList.css';
+
+export interface ChatTask {
+  id: string;
+  title: string;
+  status: 'pending' | 'in_progress' | 'done';
+  group?: string;
+  line?: number;
+}
+
+interface ChatTaskListProps {
+  tasks: ChatTask[];
+}
+
+function getTaskStatusMeta(status: ChatTask['status']) {
+  if (status === 'in_progress') return { label: '进行中', tone: 'primary' };
+  if (status === 'done') return { label: '已完成', tone: 'success' };
+  return { label: '待处理', tone: 'info' };
+}
+
+export function ChatTaskList({ tasks }: ChatTaskListProps) {
+  const [expanded, setExpanded] = useState(false);
+  const contentId = useId();
+  const sortedTasks = useMemo(() => {
+    return [...tasks].sort((a, b) => {
+      if (typeof a.line === 'number' && typeof b.line === 'number') return a.line - b.line;
+      return 0;
+    });
+  }, [tasks]);
+  const completedCount = sortedTasks.filter(task => task.status === 'done').length;
+  const inProgressCount = sortedTasks.filter(task => task.status === 'in_progress').length;
+  const progress = sortedTasks.length > 0 ? Math.round((completedCount / sortedTasks.length) * 100) : 0;
+
+  if (sortedTasks.length === 0) return null;
+
+  return (
+    <section className={`chat-task-panel${expanded ? ' expanded' : ''}`} aria-label="任务列表">
+      {expanded && (
+        <div id={contentId} className="chat-task-content">
+          <ol className="chat-task-items">
+            {sortedTasks.map((task, index) => {
+              const status = getTaskStatusMeta(task.status);
+              return (
+                <li key={task.id} className={`chat-task-item ${status.tone}`}>
+                  <span className="chat-task-index">{index + 1}</span>
+                  <span className="chat-task-item-main">
+                    <span className="chat-task-item-title">{task.title}</span>
+                    {(task.group || typeof task.line === 'number') && (
+                      <span className="chat-task-item-meta">
+                        {task.group || '当前任务清单'}
+                        {typeof task.line === 'number' && ` · 第 ${task.line} 行`}
+                      </span>
+                    )}
+                  </span>
+                  <span className={`chat-task-status ${status.tone}`}>{status.label}</span>
+                </li>
+              );
+            })}
+          </ol>
+        </div>
+      )}
+      <button
+        type="button"
+        className="chat-task-trigger"
+        onClick={() => setExpanded(current => !current)}
+        aria-expanded={expanded}
+        aria-controls={contentId}
+      >
+        <span className="chat-task-trigger-icon" aria-hidden="true">
+          <Icon name="check" size={13} />
+        </span>
+        <span className="chat-task-trigger-main">
+          <span className="chat-task-trigger-title">任务列表</span>
+          <span className="chat-task-trigger-summary">
+            已完成 {completedCount}/{sortedTasks.length}
+            {inProgressCount > 0 && ` · ${inProgressCount} 项进行中`}
+          </span>
+        </span>
+        <span className="chat-task-trigger-progress" aria-hidden="true">
+          <span style={{ width: `${progress}%` }} />
+        </span>
+        <Icon name={expanded ? 'chevron-down' : 'chevron-up'} size={14} />
+      </button>
+    </section>
+  );
+}
diff --git a/soloncode-desktop/src/components/ChatView.tsx b/soloncode-desktop/src/components/ChatView.tsx
index c1cf76ac70baac806401d0aafe88c6da1d443edb..d496e11e0598b43dc559c718b78e16abe9a01511 100644
--- a/soloncode-desktop/src/components/ChatView.tsx
+++ b/soloncode-desktop/src/components/ChatView.tsx
@@ -3,12 +3,20 @@ import { invoke } from '@tauri-apps/api/core';
 import type { Message, Conversation, Theme, Plugin, ContentType, ContentItem } from '../types';
 import { normalizeProviderType, type ModelProvider } from '../services/settingsService';
 import { fileService } from '../services/fileService';
-import { saveMessage, getMessagesByConversation } from '../db';
-import { ChatHeader, type ChatHeaderTask, type ChatReviewFile } from './ChatHeader';
+import { saveMessage, updateMessage, getMessagesByConversation } from '../db';
+import { ChatHeader, type ChatReviewFile } from './ChatHeader';
+import { ChatTaskList, type ChatTask } from './ChatTaskList';
 import { ChatMessages } from './ChatMessages';
 import { ChatInput, type ChatAgentOption, type SendOptions, type ChatMode, type ReasoningEffort } from './ChatInput';
 import { Icon } from './common/Icon';
 import type { Session } from './sidebar/SessionsPanel';
+import {
+  buildAutomationPlanningPrompt,
+  parseGeneratedAutomationPlan,
+  type GeneratedAutomationPlan,
+} from '../utils/automationPlan';
+import { isTodoToolName } from '../utils/todoTools';
+import { withRetry } from '../utils/retry';
 import '../views/ChatPage.css';
 
 export type PromptCreationType = 'skill' | 'agent' | 'automation';
@@ -17,6 +25,7 @@ export interface PromptCreationMode {
   id: string;
   sessionId: string;
   type: PromptCreationType;
+  projectId?: string;
   template?: string;
 }
 
@@ -30,7 +39,7 @@ const promptCreationCopy: Record<PromptCreationType, { slogan: string; fileName?
     fileName: 'AGENT.md',
   },
   automation: {
-    slogan: '描述需要重复执行的任务，将关联当前项目、模型和推理程度',
+    slogan: '描述执行频率和工作内容，模型会识别调度并补全实际执行提示词',
   },
 };
 
@@ -164,31 +173,38 @@ interface ChatViewProps {
   onReviewFileSelect?: (path: string) => void;
   onReviewFileDiscard?: (path: string) => void;
   promptCreation?: PromptCreationMode | null;
-  onCreateAutomationFromPrompt?: (prompt: string, options: SendOptions) => Promise<void>;
+  onCreateAutomationFromPrompt?: (plan: GeneratedAutomationPlan, options: SendOptions) => Promise<void>;
   automationPrompt?: {
     runId: string;
+    sessionId: string;
     prompt: string;
     modelId: string;
     modelName: string;
     reasoningEffort: ReasoningEffort;
   } | null;
   onAutomationPromptConsumed?: (runId: string) => void;
-  onAiCreateComplete?: (info: { type: 'skill' | 'agent'; name: string; error?: string }) => void;
+  onAiCreateComplete?: (info: { type: PromptCreationType; name: string; error?: string }) => void;
   newSessionFromProject?: boolean;
-  onSessionRunStateChange?: (sessionId: string, status: 'running' | 'completed' | 'error') => void;
+  onSessionRunStateChange?: (sessionId: string, status: 'running' | 'completed' | 'error', error?: string) => void;
   onSessionMessageSaved?: (sessionId: string, count?: number) => void;
 }
 
 // 全局 WebSocket 连接管理器（每次请求独立连接�?
 const STREAM_BATCH_INTERVAL_MS = 16;
 const STREAM_BATCH_CHARS = 24;
+const WS_CONNECT_RETRY_DELAYS_MS = [300, 700, 1500];
+const WS_RECONNECT_DELAYS_MS = [500, 1000, 2000, 4000, 8000];
 
 class WebSocketManager {
   private static instance: WebSocketManager | null = null;
   private activeWs = new Map<string, WebSocket>();
   private intentionallyClosedWs = new WeakSet<WebSocket>();
-  private messageCallback: ((data: any) => void) | null = null;
-  private statusCallback: ((sessionId: string, status: 'running' | 'completed' | 'error') => void) | null = null;
+  private lastSequenceBySession = new Map<string, number>();
+  private reconnectAttempts = new Map<string, number>();
+  private reconnectTimers = new Map<string, ReturnType<typeof setTimeout>>();
+  private terminalSessions = new Set<string>();
+  private messageCallback: ((data: any) => void | Promise<void>) | null = null;
+  private statusCallback: ((sessionId: string, status: 'running' | 'completed' | 'error', error?: string) => void) | null = null;
   private backendPort: number | null = null;
   private workspacePath: string | null = null;
 
@@ -214,7 +230,7 @@ class WebSocketManager {
     this.workspacePath = path;
   }
 
-  private getWebSocketUrl(sessionId?: string): string {
+  private getWebSocketUrl(sessionId?: string, resume = false): string {
     const host = this.backendPort
       ? `localhost:${this.backendPort}`
       : (import.meta.env.VITE_WS_HOST || 'localhost:4808');
@@ -226,16 +242,21 @@ class WebSocketManager {
     if (this.workspacePath) {
       params.set('X-Session-Cwd', this.workspacePath);
     }
+    if (resume && sessionId) {
+      params.set('resume', '1');
+      params.set('afterSequence', String(this.lastSequenceBySession.get(sessionId) || 0));
+    }
     const query = params.toString();
     return `${protocol}://${host}/desktop/ws${query ? '?' + query : ''}`;
   }
 
   /** 每次请求创建独立 WebSocket 连接 */
-  private createConnection(sessionId?: string): Promise<WebSocket> {
+  private createConnection(sessionId?: string, resume = false, manageSession = false): Promise<WebSocket> {
     return new Promise((resolve, reject) => {
-      const wsUrl = this.getWebSocketUrl(sessionId);
+      const wsUrl = this.getWebSocketUrl(sessionId, resume);
       console.log('[WS] Connecting to:', wsUrl);
       const ws = new WebSocket(wsUrl);
+      if (sessionId && manageSession) this.bindSessionSocket(sessionId, ws);
 
       const onOpen = () => {
         cleanup();
@@ -262,11 +283,25 @@ class WebSocketManager {
     });
   }
 
-  registerCallback(callback: (data: any) => void) {
+  private async createConnectionWithRetry(sessionId: string): Promise<WebSocket> {
+    let lastError: unknown;
+    for (let attempt = 0; attempt <= WS_CONNECT_RETRY_DELAYS_MS.length; attempt++) {
+      try {
+        return await this.createConnection(sessionId);
+      } catch (error) {
+        lastError = error;
+        if (attempt >= WS_CONNECT_RETRY_DELAYS_MS.length) break;
+        await new Promise(resolve => setTimeout(resolve, WS_CONNECT_RETRY_DELAYS_MS[attempt]));
+      }
+    }
+    throw lastError instanceof Error ? lastError : new Error('WebSocket connection failed');
+  }
+
+  registerCallback(callback: (data: any) => void | Promise<void>) {
     this.messageCallback = callback;
   }
 
-  registerStatusCallback(callback: (sessionId: string, status: 'running' | 'completed' | 'error') => void) {
+  registerStatusCallback(callback: (sessionId: string, status: 'running' | 'completed' | 'error', error?: string) => void) {
     this.statusCallback = callback;
   }
 
@@ -276,71 +311,137 @@ class WebSocketManager {
 
   async sendMessage(request: any): Promise<void> {
     const sessionId = request.sessionId?.toString() || '';
-    const ws = await this.createConnection(sessionId);
-    let terminalReceived = false;
+    if (!sessionId) throw new Error('Session ID is required');
+    this.closeSession(sessionId);
+    this.terminalSessions.delete(sessionId);
+    this.lastSequenceBySession.set(sessionId, 0);
+    this.reconnectAttempts.set(sessionId, 0);
+    const ws = await this.createConnectionWithRetry(sessionId);
     if (sessionId) {
-      this.closeSession(sessionId);
       this.activeWs.set(sessionId, ws);
       this.statusCallback?.(sessionId, 'running');
     }
 
-    ws.onmessage = (event) => {
+    this.bindSessionSocket(sessionId, ws);
+
+    // sessionId 已通过 URL 参数传递，从 body 中移除。
+    const payload = { ...request };
+    delete payload.sessionId;
+    try {
+      ws.send(JSON.stringify(payload));
+    } catch (error) {
+      this.terminalSessions.add(sessionId);
+      this.closeSession(sessionId);
+      throw error;
+    }
+  }
+
+  private bindSessionSocket(sessionId: string, ws: WebSocket) {
+    ws.onmessage = (event) => this.handleSessionMessage(sessionId, ws, event);
+    ws.onclose = () => {
+      if (this.activeWs.get(sessionId) === ws) {
+        this.activeWs.delete(sessionId);
+      }
+      if (!this.terminalSessions.has(sessionId) && !this.intentionallyClosedWs.has(ws)) {
+        this.scheduleReconnect(sessionId);
+      }
+    };
+  }
+
+  private handleSessionMessage(sessionId: string, ws: WebSocket, event: MessageEvent) {
+    try {
+      const data = event.data;
+      if (typeof data !== 'string') throw new Error('Unsupported WebSocket frame type');
+      if (data.trim() === '[DONE]') {
+        this.finishSession(sessionId, ws, { type: 'done', sessionId });
+        return;
+      }
+      const parsed: unknown = JSON.parse(data);
+      if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) throw new Error('Invalid WebSocket message');
+      const msg = parsed as Record<string, any>;
+      if (typeof msg.type !== 'string') throw new Error('WebSocket message type is required');
+      if (msg.text !== undefined && typeof msg.text !== 'string') throw new Error('Invalid WebSocket message text');
+      if (msg.sessionId !== undefined && typeof msg.sessionId !== 'string' && typeof msg.sessionId !== 'number') {
+        throw new Error('Invalid WebSocket session ID');
+      }
+
+      const msgSessionId = (msg.sessionId || sessionId).toString();
+      msg.sessionId = msgSessionId;
+      this.reconnectAttempts.set(msgSessionId, 0);
+      if (typeof msg.sequence === 'number' && Number.isSafeInteger(msg.sequence) && msg.sequence > 0) {
+        const previousSequence = this.lastSequenceBySession.get(msgSessionId) || 0;
+        if (msg.sequence <= previousSequence) return;
+        this.lastSequenceBySession.set(msgSessionId, msg.sequence);
+      }
+
+      const messageType = msg.type.toLowerCase();
+      if (messageType === 'done' || messageType === 'error') {
+        this.finishSession(msgSessionId, ws, msg);
+        return;
+      }
+      this.dispatchMessage(msg);
+    } catch (error) {
+      console.warn('[WS] Failed to parse message:', error);
+    }
+  }
+
+  private finishSession(sessionId: string, ws: WebSocket, message: Record<string, any>) {
+    this.terminalSessions.add(sessionId);
+    this.clearReconnectTimer(sessionId);
+    const messageType = String(message.type || '').toLowerCase();
+    if (messageType === 'done') this.statusCallback?.(sessionId, 'completed');
+    else this.statusCallback?.(sessionId, 'error', message.text || '会话执行失败');
+    this.dispatchMessage(message);
+    if (ws.readyState === WebSocket.OPEN) ws.close();
+  }
+
+  private scheduleReconnect(sessionId: string) {
+    if (this.reconnectTimers.has(sessionId) || this.terminalSessions.has(sessionId)) return;
+    const attempt = this.reconnectAttempts.get(sessionId) || 0;
+    if (attempt >= WS_RECONNECT_DELAYS_MS.length) {
+      this.terminalSessions.add(sessionId);
+      const text = '连接恢复失败，请重试';
+      this.statusCallback?.(sessionId, 'error', text);
+      this.dispatchMessage({ type: 'error', sessionId, text });
+      return;
+    }
+
+    const timer = setTimeout(async () => {
+      this.reconnectTimers.delete(sessionId);
+      if (this.terminalSessions.has(sessionId)) return;
+      this.reconnectAttempts.set(sessionId, attempt + 1);
       try {
-        const data = event.data;
-        if (typeof data !== 'string') {
-          throw new Error('Unsupported WebSocket frame type');
-        }
-        if (data.trim() === '[DONE]') {
-          terminalReceived = true;
-          if (sessionId) this.statusCallback?.(sessionId, 'completed');
-          this.messageCallback?.({ type: 'done', sessionId });
+        const ws = await this.createConnection(sessionId, true, true);
+        if (this.terminalSessions.has(sessionId)) {
+          this.intentionallyClosedWs.add(ws);
           ws.close();
           return;
         }
-        const parsed: unknown = JSON.parse(data);
-        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-          throw new Error('Invalid WebSocket message');
-        }
-        const msg = parsed as Record<string, any>;
-        if (typeof msg.type !== 'string') {
-          throw new Error('WebSocket message type is required');
-        }
-        if (msg.text !== undefined && typeof msg.text !== 'string') {
-          throw new Error('Invalid WebSocket message text');
-        }
-        if (msg.sessionId !== undefined && typeof msg.sessionId !== 'string' && typeof msg.sessionId !== 'number') {
-          throw new Error('Invalid WebSocket session ID');
-        }
-        const msgSessionId = (msg.sessionId || sessionId || '').toString();
-        if (msgSessionId && !msg.sessionId) msg.sessionId = msgSessionId;
-        const messageType = typeof msg.type === 'string' ? msg.type.toLowerCase() : '';
-        if (messageType === 'done' || messageType === 'error') terminalReceived = true;
-        if (msgSessionId && messageType === 'done') this.statusCallback?.(msgSessionId, 'completed');
-        if (msgSessionId && messageType === 'error') this.statusCallback?.(msgSessionId, 'error');
-        this.messageCallback?.(msg);
-        if (terminalReceived) ws.close();
-      } catch (e) {
-        console.warn('[WS] Failed to parse message:', e);
+        this.activeWs.set(sessionId, ws);
+        this.statusCallback?.(sessionId, 'running');
+      } catch (error) {
+        console.warn(`[WS] Reconnect attempt ${attempt + 1} failed:`, error);
+        this.scheduleReconnect(sessionId);
       }
-    };
+    }, WS_RECONNECT_DELAYS_MS[attempt]);
+    this.reconnectTimers.set(sessionId, timer);
+  }
 
-    ws.onclose = () => {
-      if (sessionId && this.activeWs.get(sessionId) === ws) {
-        this.activeWs.delete(sessionId);
-      }
-      if (sessionId && !terminalReceived && !this.intentionallyClosedWs.has(ws)) {
-        this.statusCallback?.(sessionId, 'error');
-        this.messageCallback?.({
-          type: 'error',
-          sessionId,
-          text: 'WebSocket 连接已中断，请重试',
-        });
+  private dispatchMessage(message: Record<string, any>) {
+    try {
+      const result = this.messageCallback?.(message);
+      if (result) {
+        void result.catch(error => console.error('[WS] Message handler failed:', error));
       }
-    };
+    } catch (error) {
+      console.error('[WS] Message handler failed:', error);
+    }
+  }
 
-    // sessionId 已通过 URL 参数传递，�?body 中移�?
-    delete request.sessionId;
-    ws.send(JSON.stringify(request));
+  private clearReconnectTimer(sessionId: string) {
+    const timer = this.reconnectTimers.get(sessionId);
+    if (timer) clearTimeout(timer);
+    this.reconnectTimers.delete(sessionId);
   }
 
   /** 取消当前请求：关闭连�?*/
@@ -349,7 +450,19 @@ class WebSocketManager {
   }
 
   cancelSession(sessionId: string) {
-    this.closeSession(sessionId);
+    this.terminalSessions.add(sessionId);
+    this.clearReconnectTimer(sessionId);
+    const ws = this.activeWs.get(sessionId);
+    if (ws?.readyState === WebSocket.OPEN) {
+      try {
+        ws.send(JSON.stringify({ input: '[(sec)interrupt]' }));
+      } catch {
+        // Closing the socket below is still sufficient to stop client-side streaming.
+      }
+      setTimeout(() => this.closeSession(sessionId), 50);
+    } else {
+      this.closeSession(sessionId);
+    }
   }
 
   getSessionSocket(sessionId: string): WebSocket | null {
@@ -372,6 +485,7 @@ class WebSocketManager {
   }
 
   private closeActive() {
+    for (const sessionId of this.reconnectTimers.keys()) this.clearReconnectTimer(sessionId);
     for (const ws of this.activeWs.values()) {
       this.intentionallyClosedWs.add(ws);
       ws.close();
@@ -380,6 +494,7 @@ class WebSocketManager {
   }
 
   private closeSession(sessionId: string) {
+    this.clearReconnectTimer(sessionId);
     const ws = this.activeWs.get(sessionId);
     if (ws) {
       this.intentionallyClosedWs.add(ws);
@@ -414,17 +529,8 @@ function estimateMessageTokens(messages: Message[]) {
   return Math.ceil(text.length / 4);
 }
 
-function normalizeTodoToolName(toolName?: string) {
-  return (toolName || '').toLowerCase().replace(/[_\s-]/g, '');
-}
-
-function isTodoTool(toolName?: string) {
-  const name = normalizeTodoToolName(toolName);
-  return name === 'todoread' || name === 'todowrite';
-}
-
-function parseTodoMarkdown(raw: string): ChatHeaderTask[] {
-  const tasks: ChatHeaderTask[] = [];
+function parseTodoMarkdown(raw: string): ChatTask[] {
+  const tasks: ChatTask[] = [];
   let currentGroup = '';
   String(raw || '').split(/\r?\n/).forEach((line, index) => {
     const heading = line.match(/^\s*##\s+(.+)$/);
@@ -435,7 +541,7 @@ function parseTodoMarkdown(raw: string): ChatHeaderTask[] {
     const match = line.match(/^\s*-\s*\[([ xX/])\]\s+(.+)$/);
     if (!match) return;
     const statusChar = match[1];
-    const status: ChatHeaderTask['status'] = statusChar === ' '
+    const status: ChatTask['status'] = statusChar === ' '
       ? 'pending'
       : (statusChar === '/' ? 'in_progress' : 'done');
     const title = match[2].trim();
@@ -451,14 +557,14 @@ function parseTodoMarkdown(raw: string): ChatHeaderTask[] {
 }
 
 function getTodoMarkdownFromContent(item: ContentItem) {
-  if (!isTodoTool(item.toolName)) return null;
+  if (!isTodoToolName(item.toolName)) return null;
   const todosArg = item.args?.todos;
   if (typeof todosArg === 'string' && todosArg.trim()) return todosArg;
   return item.text || '';
 }
 
-function extractLatestTodoTasks(messages: Message[]): ChatHeaderTask[] {
-  let latest: ChatHeaderTask[] | null = null;
+function extractLatestTodoTasks(messages: Message[]): ChatTask[] {
+  let latest: ChatTask[] | null = null;
   for (const message of messages) {
     for (const item of message.contents || []) {
       const markdown = getTodoMarkdownFromContent(item);
@@ -469,7 +575,7 @@ function extractLatestTodoTasks(messages: Message[]): ChatHeaderTask[] {
   return latest || [];
 }
 
-function mapTodoApiItems(items: any[]): ChatHeaderTask[] {
+function mapTodoApiItems(items: any[]): ChatTask[] {
   return (Array.isArray(items) ? items : []).map((item, index) => {
     const status = item.status === 'done'
       ? 'done'
@@ -482,7 +588,7 @@ function mapTodoApiItems(items: any[]): ChatHeaderTask[] {
       status,
       group: item.group || '',
       line,
-    } satisfies ChatHeaderTask;
+    } satisfies ChatTask;
   });
 }
 
@@ -662,7 +768,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
   const [chatMode, setChatMode] = useState<ChatMode>('default');
   const [reviewInfoSignal, setReviewInfoSignal] = useState(0);
   const [thinkingElapsedSeconds, setThinkingElapsedSeconds] = useState(0);
-  const [sessionTodoTasks, setSessionTodoTasks] = useState<Record<string, ChatHeaderTask[]>>({});
+  const [sessionTodoTasks, setSessionTodoTasks] = useState<Record<string, ChatTask[]>>({});
   const chatMessagesRef = useRef<{ scrollToBottom: () => void } | null>(null);
   const sessionIdRef = useRef<string>('');
   const conversationIdRef = useRef<string | number>('');
@@ -670,7 +776,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
   const streamingSessionIdRef = useRef<string | null>(null);
   const thinkingStartedAtBySessionRef = useRef(new Map<string, number>());
   const aiCreateRef = useRef<
-    { type: 'skill'; name: string } | { type: 'agent' } | null
+    { type: 'skill'; name: string } | { type: 'agent' } | { type: 'automation'; options: SendOptions } | null
   >(null);
   const automationPromptSentRef = useRef<string | null>(null);
   const onUpdateSessionTitleRef = useRef(onUpdateSessionTitle);
@@ -681,6 +787,10 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
   onSessionRunStateChangeRef.current = onSessionRunStateChange;
   const onSessionMessageSavedRef = useRef(onSessionMessageSaved);
   onSessionMessageSavedRef.current = onSessionMessageSaved;
+  const onCreateAutomationFromPromptRef = useRef(onCreateAutomationFromPrompt);
+  onCreateAutomationFromPromptRef.current = onCreateAutomationFromPrompt;
+  const onAiCreateCompleteRef = useRef(onAiCreateComplete);
+  onAiCreateCompleteRef.current = onAiCreateComplete;
   const workspacePathRef = useRef(workspacePath);
   workspacePathRef.current = workspacePath;
 
@@ -819,6 +929,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
         item.forceNewSegment = false;
       }
       buildLiveMessages(item.sessionId, segments);
+      scheduleAssistantPersistence(item.sessionId);
       return;
     }
     if (item.type === 'ACTION') {
@@ -829,6 +940,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
         item.forceNewSegment = false;
       }
       buildLiveMessages(item.sessionId, segments);
+      scheduleAssistantPersistence(item.sessionId);
       return;
     }
     if (last && last.type === 'TEXT' && !item.forceNewSegment) {
@@ -839,6 +951,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
       item.forceNewSegment = false;
     }
     buildLiveMessages(item.sessionId, segments);
+    scheduleAssistantPersistence(item.sessionId);
   }
 
   function hasPendingQueuedChars(sessionId: string) {
@@ -936,16 +1049,22 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
     thinkingStartedAtBySessionRef.current.delete(sessionId);
   }
 
-  const pendingPersistRef = useRef<{
+  type PendingPersist = {
     sessionId: string;
     userMessage: { timestamp: string; contents: string };
     messageText: string;
-  } | null>(null);
-  const pendingPersistBySessionRef = useRef(new Map<string, {
-    sessionId: string;
-    userMessage: { timestamp: string; contents: string };
-    messageText: string;
-  }>());
+    userMessageId?: number;
+  };
+  type AssistantDraftPersistence = {
+    messageId?: number;
+    lastContents?: string;
+    metadata?: Message['metadata'];
+    timer?: ReturnType<typeof setTimeout>;
+    writeChain: Promise<void>;
+  };
+  const pendingPersistRef = useRef<PendingPersist | null>(null);
+  const pendingPersistBySessionRef = useRef(new Map<string, PendingPersist>());
+  const assistantDraftsBySessionRef = useRef(new Map<string, AssistantDraftPersistence>());
 
   // 当前 assistant 消息 ID
   const assistantMsgIdRef = useRef<number>(0);
@@ -966,7 +1085,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
       isStreamingRef.current = false;
       streamingSessionIdRef.current = null;
       if (timedOutSessionId) {
-        onSessionRunStateChangeRef.current?.(timedOutSessionId, 'error');
+        onSessionRunStateChangeRef.current?.(timedOutSessionId, 'error', '等待响应超时');
       }
     }, 120000);
   }, []);
@@ -978,7 +1097,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
     }
   }, []);
   const updateSessionTodosFromTool = useCallback((sessionId: string, toolName?: string, text?: string, args?: Record<string, unknown>) => {
-    if (!sessionId || !isTodoTool(toolName)) return;
+    if (!sessionId || !isTodoToolName(toolName)) return;
     const todosArg = args?.todos;
     const markdown = typeof todosArg === 'string' && todosArg.trim() ? todosArg : (text || '');
     setSessionTodoTasks(prev => ({
@@ -1029,6 +1148,70 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
       .filter(item => item.text.length > 0);
   }
 
+  function getAssistantDraftState(sessionId: string) {
+    let state = assistantDraftsBySessionRef.current.get(sessionId);
+    if (!state) {
+      state = { writeChain: Promise.resolve() };
+      assistantDraftsBySessionRef.current.set(sessionId, state);
+    }
+    return state;
+  }
+
+  async function writeAssistantSnapshot(sessionId: string, state: AssistantDraftPersistence) {
+    const segments = isSessionVisible(sessionId)
+      ? accumulatedContentRef.current
+      : (backgroundContentBySessionRef.current.get(sessionId) || []);
+    const items = buildContentItems(segments);
+    if (items.length === 0) return;
+    const contents = JSON.stringify({ items, metadata: state.metadata });
+    if (contents === state.lastContents) return;
+
+    if (state.messageId) {
+      await withRetry(() => updateMessage(state.messageId!, {
+        contents,
+      }));
+    } else {
+      state.messageId = await withRetry(() => saveMessage({
+        conversationId: sessionId,
+        role: 'ASSISTANT',
+        timestamp: new Date().toLocaleTimeString(),
+        contents,
+        workspacePath: workspacePathRef.current,
+      }));
+      onSessionMessageSavedRef.current?.(sessionId, 1);
+    }
+    state.lastContents = contents;
+  }
+
+  function scheduleAssistantPersistence(sessionId: string) {
+    const state = getAssistantDraftState(sessionId);
+    if (state.timer) return;
+    const delay = state.messageId ? 200 : 0;
+    state.timer = setTimeout(() => {
+      state.timer = undefined;
+      state.writeChain = state.writeChain
+        .then(() => writeAssistantSnapshot(sessionId, state!))
+        .catch(error => console.error('[ChatView] 增量保存助手消息失败:', error));
+    }, delay);
+  }
+
+  async function flushAssistantPersistence(sessionId: string, metadata?: Message['metadata']) {
+    const state = getAssistantDraftState(sessionId);
+    state.metadata = metadata || state.metadata;
+    if (state.timer) {
+      clearTimeout(state.timer);
+      state.timer = undefined;
+    }
+    state.writeChain = state.writeChain.then(() => writeAssistantSnapshot(sessionId, state));
+    try {
+      await state.writeChain;
+    } catch (error) {
+      console.error('[ChatView] 保存助手消息最终状态失败:', error);
+    } finally {
+      assistantDraftsBySessionRef.current.delete(sessionId);
+    }
+  }
+
   // 注册消息回调（只注册一次，通过 ref 获取当前 sessionId�?
   useEffect(() => {
     const wsManager = WebSocketManager.getInstance();
@@ -1045,14 +1228,16 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
         pendingPersistRef.current = null;
       }
 
-      await saveMessage({
-        conversationId: pending.sessionId,
-        role: 'USER',
-        timestamp: pending.userMessage.timestamp,
-        contents: pending.userMessage.contents,
-        workspacePath: workspacePathRef.current,
-      });
-      onSessionMessageSavedRef.current?.(pending.sessionId, 1);
+      if (!pending.userMessageId) {
+        pending.userMessageId = await withRetry(() => saveMessage({
+          conversationId: pending.sessionId,
+          role: 'USER',
+          timestamp: pending.userMessage.timestamp,
+          contents: pending.userMessage.contents,
+          workspacePath: workspacePathRef.current,
+        }));
+        onSessionMessageSavedRef.current?.(pending.sessionId, 1);
+      }
 
       return {
         sessionId: pending.sessionId,
@@ -1072,20 +1257,11 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
           const pending = await flushPendingUserMessage(msgSessionId);
           const backgroundSegments = backgroundContentBySessionRef.current.get(msgSessionId) || [];
           const contentItems = buildContentItems(backgroundSegments);
-          if (contentItems.length > 0) {
-            await saveMessage({
-              conversationId: pending?.sessionId || msgSessionId,
-              role: 'ASSISTANT',
-              timestamp: new Date().toLocaleTimeString(),
-              contents: JSON.stringify({ items: contentItems, metadata: {
-                modelName: data.modelName,
-                totalTokens: data.totalTokens,
-                elapsedMs: data.elapsedMs,
-              } }),
-              workspacePath: workspacePathRef.current,
-            });
-            onSessionMessageSavedRef.current?.(pending?.sessionId || msgSessionId, 1);
-          }
+          await flushAssistantPersistence(msgSessionId, contentItems.length > 0 ? {
+            modelName: data.modelName,
+            totalTokens: data.totalTokens,
+            elapsedMs: data.elapsedMs,
+          } : undefined);
           if (pending?.wasNew && onUpdateSessionTitleRef.current) {
             onUpdateSessionTitleRef.current(pending.sessionId, pending.title);
           }
@@ -1123,15 +1299,9 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
             return [...filtered, finalMsg];
           });
 
-          // 保存助手消息（用 temp ID，后�?reassignMessages 会统一转换�?
-          await saveMessage({
-            conversationId: pending?.sessionId || msgSessionId,
-            role: 'ASSISTANT',
-            timestamp: finalMsg.timestamp,
-            contents: JSON.stringify({ items: contentItems, metadata: finalMsg.metadata }),
-            workspacePath: workspacePathRef.current,
-          });
-          onSessionMessageSavedRef.current?.(pending?.sessionId || msgSessionId, 1);
+          await flushAssistantPersistence(msgSessionId, finalMsg.metadata);
+        } else {
+          await flushAssistantPersistence(msgSessionId);
         }
 
         // 所有消息保存后，触发会话持久化（reassignMessages 会把 temp ID 转为 real ID�?
@@ -1153,8 +1323,8 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
               if (type === 'skill') {
                 const { name } = creation;
                 await invoke('create_skill', { name, description: '', content: aiContent });
-                onAiCreateComplete?.({ type, name });
-              } else {
+                onAiCreateCompleteRef.current?.({ type, name });
+              } else if (type === 'agent') {
                 const generatedName = extractGeneratedAgentName(aiContent);
                 if (!generatedName) {
                   throw new Error('AI 未生成有效的 Agent 名称');
@@ -1162,16 +1332,20 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
                 const name = await createUniqueAgentName(generatedName);
                 const content = applyGeneratedAgentName(aiContent, name);
                 await invoke('create_agent', { name, description: '', content });
-                onAiCreateComplete?.({ type, name });
+                onAiCreateCompleteRef.current?.({ type, name });
+              } else {
+                const plan = parseGeneratedAutomationPlan(aiContent);
+                if (!onCreateAutomationFromPromptRef.current) throw new Error('自动化保存处理器不可用');
+                await onCreateAutomationFromPromptRef.current(plan, creation.options);
               }
             } catch (err) {
               console.error('[ChatView] AI 创建自动保存失败:', err);
-              const displayName = type === 'skill' ? creation.name : '自动命名 Agent';
-              onAiCreateComplete?.({ type, name: displayName, error: String(err) });
+              const displayName = type === 'skill' ? creation.name : type === 'agent' ? '自动命名 Agent' : '自动化';
+              onAiCreateCompleteRef.current?.({ type, name: displayName, error: String(err) });
             }
           } else {
-            const displayName = type === 'skill' ? creation.name : '自动命名 Agent';
-            onAiCreateComplete?.({ type, name: displayName, error: 'AI 未返回可保存的内容' });
+            const displayName = type === 'skill' ? creation.name : type === 'agent' ? '自动命名 Agent' : '自动化';
+            onAiCreateCompleteRef.current?.({ type, name: displayName, error: 'AI 未返回可保存的内容' });
           }
           aiCreateRef.current = null;
         }
@@ -1191,15 +1365,28 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
       }
 
       if (data.type === 'error') {
+        if (aiCreateRef.current) {
+          const creation = aiCreateRef.current;
+          aiCreateRef.current = null;
+          const displayName = creation.type === 'skill'
+            ? creation.name
+            : (creation.type === 'agent' ? '自动命名 Agent' : '自动化');
+          onAiCreateCompleteRef.current?.({
+            type: creation.type,
+            name: displayName,
+            error: data.text || '生成请求失败',
+          });
+        }
         if (!isCurrentSession) {
           const pending = await flushPendingUserMessage(msgSessionId);
-          await saveMessage({
+          await flushAssistantPersistence(msgSessionId);
+          await withRetry(() => saveMessage({
             conversationId: pending?.sessionId || msgSessionId,
             role: 'ERROR',
             timestamp: new Date().toLocaleTimeString(),
             contents: JSON.stringify([{ type: 'ERROR', text: data.text || '未知错误' }]),
             workspacePath: workspacePathRef.current,
-          });
+          }));
           onSessionMessageSavedRef.current?.(pending?.sessionId || msgSessionId, 1);
           if (pending?.wasNew && onUpdateSessionTitleRef.current) {
             onUpdateSessionTitleRef.current(pending.sessionId, pending.title);
@@ -1217,6 +1404,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
 
         // 即使出错也要持久化用户消�?
         const pending = await flushPendingUserMessage(msgSessionId);
+        await flushAssistantPersistence(msgSessionId);
 
         const errorText = data.text || '未知错误';
         const errorMsg: Message = {
@@ -1227,13 +1415,13 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
         };
         setMessages(prev => [...prev, errorMsg]);
 
-        await saveMessage({
+        await withRetry(() => saveMessage({
           conversationId: pending?.sessionId || msgSessionId,
           role: 'ERROR',
           timestamp: errorMsg.timestamp,
           contents: JSON.stringify(errorMsg.contents),
           workspacePath: workspacePathRef.current,
-        });
+        }));
         onSessionMessageSavedRef.current?.(pending?.sessionId || msgSessionId, 1);
 
         // 所有消息保存后，触发会话持久化
@@ -1289,7 +1477,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
       ) as ContentType;
       let text = filterEmptyTags(data.text || '');
       if (rawType === 'COMMAND') text += '\n';
-      if (type === 'ACTION' && isTodoTool(data.toolName)) {
+      if (type === 'ACTION' && isTodoToolName(data.toolName)) {
         updateSessionTodosFromTool(msgSessionId, data.toolName, text, data.args);
       }
 
@@ -1360,6 +1548,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
           }
           break;
       }
+      scheduleAssistantPersistence(msgSessionId);
 
       // 实时更新显示（RAF 节流，合并多�?chunk�?
       if (isCurrentSession) {
@@ -1368,8 +1557,8 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
     };
 
     wsManager.registerCallback(handleMessage);
-    wsManager.registerStatusCallback((sessionId, status) => {
-      onSessionRunStateChangeRef.current?.(sessionId, status);
+    wsManager.registerStatusCallback((sessionId, status, error) => {
+      onSessionRunStateChangeRef.current?.(sessionId, status, error);
     });
 
     return () => {
@@ -1402,7 +1591,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
     }
 
     if (contextParts.length > 0) {
-      fullMessage = `${contextParts.join('\n\n')}\n\n${messageText}`;
+      fullMessage = `${contextParts.join('\n\n')}\n\n${fullMessage}`;
     }
 
     // 拼接文本附件内容（图片通过 attachments 字段单独发送）
@@ -1478,6 +1667,16 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
     try {
       const wsManager = WebSocketManager.getInstance();
 
+      pendingPersist.userMessageId = await withRetry(() => saveMessage({
+        conversationId: pendingPersist.sessionId,
+        role: 'USER',
+        timestamp: pendingPersist.userMessage.timestamp,
+        contents: pendingPersist.userMessage.contents,
+        workspacePath,
+      }));
+      onSessionMessageSavedRef.current?.(pendingPersist.sessionId, 1);
+      getAssistantDraftState(pendingPersist.sessionId);
+
       // 开启会话时注册模型到后�?
       // options.model 格式: "providerId" �?"providerId__modelId"
       const sepIdx = options.model.indexOf('__');
@@ -1543,14 +1742,17 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
       if (pending) {
         pendingPersistBySessionRef.current.delete(pending.sessionId);
         if (pendingPersistRef.current?.sessionId === pending.sessionId) pendingPersistRef.current = null;
-        await saveMessage({
-          conversationId: pending.sessionId,
-          role: 'USER',
-          timestamp: pending.userMessage.timestamp,
-          contents: pending.userMessage.contents,
-          workspacePath,
-        });
-        onSessionMessageSaved?.(pending.sessionId, 1);
+        if (!pending.userMessageId) {
+          pending.userMessageId = await withRetry(() => saveMessage({
+            conversationId: pending.sessionId,
+            role: 'USER',
+            timestamp: pending.userMessage.timestamp,
+            contents: pending.userMessage.contents,
+            workspacePath,
+          }));
+          onSessionMessageSaved?.(pending.sessionId, 1);
+        }
+        await flushAssistantPersistence(pending.sessionId);
 
         const errorMessage: Message = {
           id: Date.now() + 1,
@@ -1560,13 +1762,13 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
         };
         setMessages(prev => [...prev, errorMessage]);
 
-        await saveMessage({
+        await withRetry(() => saveMessage({
           conversationId: pending.sessionId,
           role: 'ERROR',
           timestamp: errorMessage.timestamp,
           contents: JSON.stringify(errorMessage.contents),
           workspacePath,
-        });
+        }));
         onSessionMessageSaved?.(pending.sessionId, 1);
 
         // 触发会话持久化（reassignMessages 会处�?temp→real�?
@@ -1584,12 +1786,20 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
       if (aiCreateRef.current) {
         const creation = aiCreateRef.current;
         aiCreateRef.current = null;
-        onAiCreateComplete?.({
+        const displayName = creation.type === 'skill'
+          ? creation.name
+          : (creation.type === 'agent' ? '自动命名 Agent' : '自动化');
+        onAiCreateCompleteRef.current?.({
           type: creation.type,
-          name: creation.type === 'skill' ? creation.name : '自动命名 Agent',
+          name: displayName,
           error: '生成请求失败',
         });
       }
+      onSessionRunStateChangeRef.current?.(
+        sessionId!,
+        'error',
+        error instanceof Error ? error.message : '命令发送失败',
+      );
     }
   }, [currentConversation, onAiCreateComplete, onNewSession, onUpdateSessionTitle, workspacePath, providers, activeFilePath, maxSteps]);
 
@@ -1597,7 +1807,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
   useEffect(() => {
     if (!automationPrompt || automationPromptSentRef.current === automationPrompt.runId) return;
     const conversationId = currentConversation.id?.toString();
-    if (!conversationId) return;
+    if (!conversationId || conversationId !== automationPrompt.sessionId) return;
 
     automationPromptSentRef.current = automationPrompt.runId;
     void sendMessage(automationPrompt.prompt, {
@@ -1620,7 +1830,8 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
     }
 
     if (activeCreation.type === 'automation') {
-      void onCreateAutomationFromPrompt?.(message, options);
+      aiCreateRef.current = { type: 'automation', options };
+      void sendMessage(message, options, buildAutomationPlanningPrompt(message));
       return;
     }
 
@@ -1697,8 +1908,11 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
     const id = currentConversationId?.toString();
     if (!id || id.startsWith('temp-') || id.startsWith('pending-') || !backendPort) return;
     let cancelled = false;
-    fetch(`http://localhost:${backendPort}/web/chat/todos?sessionId=${encodeURIComponent(id)}`)
-      .then(resp => resp.ok ? resp.json() : null)
+    withRetry(async () => {
+      const resp = await fetch(`http://localhost:${backendPort}/web/chat/todos?sessionId=${encodeURIComponent(id)}`);
+      if (!resp.ok) throw new Error(`Todo request failed: ${resp.status}`);
+      return resp.json();
+    }, [300, 700, 1500])
       .then(res => {
         if (cancelled) return;
         const items = res?.data?.items || [];
@@ -1737,7 +1951,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
     }
   }, []);
 
-  const handleStop = useCallback(() => {
+  const handleStop = useCallback(async () => {
     const stoppedSessionId = sessionIdRef.current;
     WebSocketManager.getInstance().cancelSession(stoppedSessionId);
     clearLoadingTimer();
@@ -1764,6 +1978,17 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
       });
     }
 
+    await flushAssistantPersistence(stoppedSessionId);
+    const pending = pendingPersistBySessionRef.current.get(stoppedSessionId);
+    if (pending) {
+      pendingPersistBySessionRef.current.delete(stoppedSessionId);
+      if (pendingPersistRef.current?.sessionId === stoppedSessionId) pendingPersistRef.current = null;
+      if (pending.sessionId.startsWith('temp-') && onUpdateSessionTitleRef.current) {
+        const title = pending.messageText.trim().slice(0, 20) + (pending.messageText.trim().length > 20 ? '...' : '');
+        void onUpdateSessionTitleRef.current(pending.sessionId, title);
+      }
+    }
+
     // 重置累积�?
     accumulatedContentRef.current = [];
     clearLiveSession(stoppedSessionId);
@@ -1843,7 +2068,6 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
           startedAt={headerStartedAt}
           totalTokens={headerTotalTokens}
           totalConversations={totalConversationCount}
-          tasks={currentTodoTasks}
           reviewFiles={reviewFiles}
           onReviewFileSelect={onReviewFileSelect}
           openInfoSignal={reviewInfoSignal}
@@ -1862,6 +2086,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
           {showReviewFiles && (
             <ReviewFilesBar files={reviewFiles} onReview={onReviewFileSelect} onDiscard={onReviewFileDiscard} />
           )}
+          <ChatTaskList key={currentConversationIdString || 'new'} tasks={currentTodoTasks} />
           <ChatInput onSend={handleChatInputSend} isLoading={isCurrentConversationLoading} onStop={handleStop} providers={providers} agents={agents} activeProviderId={activeProviderId} onModelChange={handleModelChange} activeFileName={promptCreationUi?.fileName || activeFileName} backendPort={backendPort} showStartWork={!workspacePath && !activePromptCreation} onNewProject={onNewProject} onOpenFolder={onOpenFolder} workspacePath={workspacePath} mode={chatMode} onModeChange={setChatMode} baseContextTokens={baseContextTokens} />
         </div>
       ) : (
@@ -1869,6 +2094,7 @@ export function ChatView({ currentConversation, plugins, workspacePath, projectN
           {showReviewFiles && (
             <ReviewFilesBar files={reviewFiles} onReview={onReviewFileSelect} onDiscard={onReviewFileDiscard} />
           )}
+          <ChatTaskList key={currentConversationIdString || 'current'} tasks={currentTodoTasks} />
           <ChatInput onSend={handleChatInputSend} isLoading={isCurrentConversationLoading} onStop={handleStop} providers={providers} agents={agents} activeProviderId={activeProviderId} onModelChange={handleModelChange} activeFileName={promptCreationUi?.fileName || activeFileName} backendPort={backendPort} showStartWork={!workspacePath && !activePromptCreation} onNewProject={onNewProject} onOpenFolder={onOpenFolder} workspacePath={workspacePath} mode={chatMode} onModeChange={setChatMode} baseContextTokens={baseContextTokens} />
         </>
       )}
diff --git a/soloncode-desktop/src/components/common/ConfirmDialog.css b/soloncode-desktop/src/components/common/ConfirmDialog.css
index f1f8476d8f9be8f67393e3d1f267ba641f4e728e..ca56cabfb984f1b71e8b4c97bb7e989105c64c22 100644
--- a/soloncode-desktop/src/components/common/ConfirmDialog.css
+++ b/soloncode-desktop/src/components/common/ConfirmDialog.css
@@ -50,6 +50,36 @@
   margin-bottom: 20px;
 }
 
+.confirm-input-field {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  margin: -6px 0 20px;
+  color: var(--cb-text-secondary, #858699);
+  font-size: 11px;
+}
+
+.confirm-input-field input {
+  height: 30px;
+  padding: 0 8px;
+  border: 1px solid var(--cb-vscode-input-border, var(--cb-vscode-widget-border, #474747));
+  border-radius: 4px;
+  outline: none;
+  background: var(--cb-vscode-input-background, #3c3c3c);
+  color: var(--cb-vscode-input-foreground, var(--cb-text-primary, #cccccc));
+  font: inherit;
+  font-size: 13px;
+}
+
+.confirm-input-field input:focus {
+  border-color: var(--cb-accent);
+}
+
+.confirm-input-field small {
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+  font-size: 10px;
+}
+
 .confirm-actions {
   display: flex;
   justify-content: flex-end;
@@ -71,6 +101,11 @@
   background: var(--cb-vscode-list-hoverBackground, #2a2d2e);
 }
 
+.confirm-btn:disabled {
+  opacity: 0.45;
+  cursor: default;
+}
+
 .confirm-btn.danger {
   background: #c74e39;
   border-color: #c74e39;
diff --git a/soloncode-desktop/src/components/common/ConfirmDialog.tsx b/soloncode-desktop/src/components/common/ConfirmDialog.tsx
index 59d0eb831b25009053764b751507477075bf9844..6bbb2a1d7e811ad389f848389b95238e99298463 100644
--- a/soloncode-desktop/src/components/common/ConfirmDialog.tsx
+++ b/soloncode-desktop/src/components/common/ConfirmDialog.tsx
@@ -10,6 +10,11 @@ interface ConfirmDialogProps {
   confirmLabel?: string;
   cancelLabel?: string;
   danger?: boolean;
+  inputLabel?: string;
+  inputValue?: string;
+  inputError?: string;
+  confirmDisabled?: boolean;
+  onInputChange?: (value: string) => void;
   onConfirm: () => void;
   onCancel: () => void;
 }
@@ -20,25 +25,52 @@ export function ConfirmDialog({
   confirmLabel = '确认',
   cancelLabel = '取消',
   danger = false,
+  inputLabel,
+  inputValue,
+  inputError,
+  confirmDisabled = false,
+  onInputChange,
   onConfirm,
   onCancel,
 }: ConfirmDialogProps) {
   const confirmRef = useRef<HTMLButtonElement>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  useEffect(() => {
+    if (inputValue !== undefined) {
+      inputRef.current?.focus();
+      inputRef.current?.select();
+    } else {
+      confirmRef.current?.focus();
+    }
+  }, []);
 
   useEffect(() => {
-    confirmRef.current?.focus();
     const handleKey = (e: KeyboardEvent) => {
       if (e.key === 'Escape') onCancel();
+      if (e.key === 'Enter' && inputValue !== undefined && !confirmDisabled) onConfirm();
     };
     document.addEventListener('keydown', handleKey);
     return () => document.removeEventListener('keydown', handleKey);
-  }, [onCancel]);
+  }, [confirmDisabled, inputValue, onCancel, onConfirm]);
 
   return (
     <div className="confirm-overlay" onClick={onCancel}>
       <div className="confirm-dialog" onClick={(e) => e.stopPropagation()}>
         <div className="confirm-title">{title}</div>
         <div className="confirm-message">{message}</div>
+        {inputValue !== undefined && (
+          <label className="confirm-input-field">
+            {inputLabel && <span>{inputLabel}</span>}
+            <input
+              ref={inputRef}
+              value={inputValue}
+              maxLength={64}
+              onChange={event => onInputChange?.(event.target.value)}
+            />
+            {inputError && <small>{inputError}</small>}
+          </label>
+        )}
         <div className="confirm-actions">
           <button className="confirm-btn cancel" onClick={onCancel}>
             {cancelLabel}
@@ -46,6 +78,7 @@ export function ConfirmDialog({
           <button
             ref={confirmRef}
             className={`confirm-btn${danger ? ' danger' : ''}`}
+            disabled={confirmDisabled}
             onClick={onConfirm}
           >
             {confirmLabel}
diff --git a/soloncode-desktop/src/components/common/ContextMenu.tsx b/soloncode-desktop/src/components/common/ContextMenu.tsx
index eac20522bc71e8e665006988c7a316a166c63d6f..1d7e3cd5ddfc2b486d98766dfd5ba1fa510c4072 100644
--- a/soloncode-desktop/src/components/common/ContextMenu.tsx
+++ b/soloncode-desktop/src/components/common/ContextMenu.tsx
@@ -72,7 +72,7 @@ export function ContextMenu({ x, y, items, onItemClick, onClose }: ContextMenuPr
         return (
           <div
             key={item.id}
-            className={`dropdown-item${item.disabled ? ' disabled' : ''}`}
+            className={`dropdown-item${item.disabled ? ' disabled' : ''}${item.danger ? ' danger' : ''}`}
             onClick={(e) => {
               e.stopPropagation();
               if (!item.disabled) {
diff --git a/soloncode-desktop/src/components/common/DropdownMenu.css b/soloncode-desktop/src/components/common/DropdownMenu.css
index bc01a3b66a07dec3dbcc401d2e65ade883d08943..9de1309a896bc9ef3a01c7cb116b83ee6e5dd61e 100644
--- a/soloncode-desktop/src/components/common/DropdownMenu.css
+++ b/soloncode-desktop/src/components/common/DropdownMenu.css
@@ -71,6 +71,10 @@
   background: transparent;
 }
 
+.dropdown-item.danger:not(.disabled) {
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+}
+
 .dropdown-item-label {
   flex: 1;
 }
diff --git a/soloncode-desktop/src/components/common/DropdownMenu.tsx b/soloncode-desktop/src/components/common/DropdownMenu.tsx
index c9dbd12a471d8779182cca1f36c5c7872bf817d4..11c627fe1e6730368f5dea102f711f0cd3c56f25 100644
--- a/soloncode-desktop/src/components/common/DropdownMenu.tsx
+++ b/soloncode-desktop/src/components/common/DropdownMenu.tsx
@@ -10,6 +10,7 @@ export interface MenuItem {
   label: string;
   shortcut?: string;
   disabled?: boolean;
+  danger?: boolean;
   divider?: boolean;
   children?: MenuItem[];
 }
@@ -109,7 +110,7 @@ export function DropdownMenu({ trigger, items, onItemClick, align = 'left' }: Dr
     return (
       <div
         key={item.id}
-        className={`dropdown-item${item.disabled ? ' disabled' : ''}${hasChildren ? ' has-children' : ''}`}
+        className={`dropdown-item${item.disabled ? ' disabled' : ''}${item.danger ? ' danger' : ''}${hasChildren ? ' has-children' : ''}`}
         onClick={(e) => {
           e.stopPropagation();
           handleItemClick(item);
diff --git a/soloncode-desktop/src/components/common/Icon.tsx b/soloncode-desktop/src/components/common/Icon.tsx
index 61f48f5add5e9087caca8f9597ee4d0328f43545..da206a7d08c8018d767552366536677352b468db 100644
--- a/soloncode-desktop/src/components/common/Icon.tsx
+++ b/soloncode-desktop/src/components/common/Icon.tsx
@@ -52,7 +52,7 @@ const iconPaths: Record<IconName, string> = {
   'extensions': 'M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z',
   'skills': 'M15 4V2M15 16v-2M8 9h2M20 9h2M17.8 11.8L19 13M17.8 6.2L19 5M12.2 11.8L11 13M12.2 6.2L11 5M15 9l-6 6-4-4 6-6z',
   'agents': 'M12 2a5 5 0 0 1 5 5v3a5 5 0 0 1-10 0V7a5 5 0 0 1 5-5zM2 20a10 10 0 0 1 20 0H2z',
-  'automation': 'M17 2l4 4-4 4M3 11V9a3 3 0 0 1 3-3h15M7 22l-4-4 4-4M21 13v2a3 3 0 0 1-3 3H3',
+  'automation': 'M12 22a10 10 0 1 0 0-20 10 10 0 0 0 0 20M12 6v6l-4 2',
   'channels': 'M4.5 3a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zM1 4.5a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0zm13.5-1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zM11 4.5a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0zM6 12.5a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0zm3.5-1.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z',
   'sessions': 'M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z',
   'settings': 'M12 12m-3 0a3 3 0 1 0 6 0a3 3 0 1 0 -6 0M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 1 1-2.83-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 1 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 1 1 2.83-2.83l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 1 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 1 1 2.83 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 1 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z',
diff --git a/soloncode-desktop/src/components/sidebar/AgentsPanel.css b/soloncode-desktop/src/components/sidebar/AgentsPanel.css
index 8a5c2a192964d1caba32a358497d460fe9a83302..574421bfe9b3e173dd0128db8e23ca6058dacb52 100644
--- a/soloncode-desktop/src/components/sidebar/AgentsPanel.css
+++ b/soloncode-desktop/src/components/sidebar/AgentsPanel.css
@@ -9,6 +9,20 @@
   overflow-y: auto;
 }
 
+.resource-action-message {
+  margin: 6px 8px;
+  padding: 6px 8px;
+  border-radius: 4px;
+  background-color: rgba(76, 175, 80, 0.12);
+  color: #4caf50;
+  font-size: 11px;
+}
+
+.resource-action-message.error {
+  background-color: rgba(241, 76, 76, 0.12);
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+}
+
 .agents-panel .file-node.disabled-item {
   opacity: 0.5;
 }
diff --git a/soloncode-desktop/src/components/sidebar/AgentsPanel.tsx b/soloncode-desktop/src/components/sidebar/AgentsPanel.tsx
index 0ae13f5feb75eec11f2bd0e8af10e7020dbbeaf1..142eafff03155c7ec37eba1ed64298f3e1e8e0c9 100644
--- a/soloncode-desktop/src/components/sidebar/AgentsPanel.tsx
+++ b/soloncode-desktop/src/components/sidebar/AgentsPanel.tsx
@@ -1,7 +1,10 @@
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { invoke } from '@tauri-apps/api/core';
 import { Icon, getFileIconName } from '../common/Icon';
+import { ConfirmDialog } from '../common/ConfirmDialog';
+import { ContextMenu } from '../common/ContextMenu';
 import type { AgentConfig } from '../../services/settingsService';
+import { getManagedResourceNameError, managedResourceService } from '../../services/managedResourceService';
 import '../sidebar/ExplorerPanel.css';
 import './AgentsPanel.css';
 
@@ -18,6 +21,11 @@ interface AgentsPanelProps {
 export function AgentsPanel({ agents, onAgentsChange, activeAgent, onAgentChange, onFileSelect, onCreateWithAI, refreshKey = 0 }: AgentsPanelProps) {
   const [loading, setLoading] = useState(false);
   const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set());
+  const [contextMenu, setContextMenu] = useState<{ x: number; y: number; agent: AgentConfig } | null>(null);
+  const [renameTarget, setRenameTarget] = useState<{ agent: AgentConfig; value: string } | null>(null);
+  const [deleteTarget, setDeleteTarget] = useState<AgentConfig | null>(null);
+  const [actionMessage, setActionMessage] = useState<{ text: string; error?: boolean } | null>(null);
+  const [actionPending, setActionPending] = useState(false);
   const onAgentsChangeRef = useRef(onAgentsChange);
   onAgentsChangeRef.current = onAgentsChange;
 
@@ -31,16 +39,14 @@ export function AgentsPanel({ agents, onAgentsChange, activeAgent, onAgentChange
         enabled: boolean;
       }>>('list_agents');
 
-      if (backendAgents.length > 0) {
-        const mapped: AgentConfig[] = backendAgents.map(a => ({
-          name: a.name,
-          description: a.description,
-          path: a.path,
-          enabled: a.enabled,
-          source: 'discovered' as const,
-        }));
-        onAgentsChangeRef.current(mapped);
-      }
+      const mapped: AgentConfig[] = backendAgents.map(a => ({
+        name: a.name,
+        description: a.description,
+        path: a.path,
+        enabled: a.enabled,
+        source: 'discovered' as const,
+      }));
+      onAgentsChangeRef.current(mapped);
     } catch (err) {
       console.warn('[AgentsPanel] 加载后端 agents 失败:', err);
     } finally {
@@ -74,6 +80,66 @@ export function AgentsPanel({ agents, onAgentsChange, activeAgent, onAgentChange
   };
 
   const enabledCount = agents.filter(a => a.enabled).length;
+  const renameError = renameTarget ? getManagedResourceNameError(renameTarget.value) : '';
+
+  const handleContextAction = useCallback((action: string) => {
+    const target = contextMenu?.agent;
+    setContextMenu(null);
+    if (!target?.path) return;
+    setActionMessage(null);
+    if (action === 'rename') {
+      setRenameTarget({ agent: target, value: target.name });
+    } else if (action === 'copy') {
+      setActionPending(true);
+      void managedResourceService.copy(target.path, 'agent')
+        .then(result => {
+          setActionMessage({ text: `已复制为 ${result.name}` });
+          return loadFromBackend();
+        })
+        .catch(error => {
+          console.error('[AgentsPanel] 复制 Agent 失败:', error);
+          setActionMessage({ text: '复制 Agent 失败', error: true });
+        })
+        .finally(() => setActionPending(false));
+    } else if (action === 'delete') {
+      setDeleteTarget(target);
+    }
+  }, [contextMenu, loadFromBackend]);
+
+  const confirmRename = useCallback(async () => {
+    if (!renameTarget?.agent.path || getManagedResourceNameError(renameTarget.value) || actionPending) return;
+    setActionPending(true);
+    try {
+      const wasActive = activeAgent === renameTarget.agent.name;
+      const result = await managedResourceService.rename(renameTarget.agent.path, 'agent', renameTarget.value);
+      setRenameTarget(null);
+      if (wasActive) onAgentChange(result.name);
+      setActionMessage({ text: `已重命名为 ${result.name}` });
+      await loadFromBackend();
+    } catch (error) {
+      console.error('[AgentsPanel] 重命名 Agent 失败:', error);
+      setActionMessage({ text: '重命名 Agent 失败', error: true });
+    } finally {
+      setActionPending(false);
+    }
+  }, [actionPending, activeAgent, loadFromBackend, onAgentChange, renameTarget]);
+
+  const confirmDelete = useCallback(async () => {
+    if (!deleteTarget?.path || actionPending) return;
+    setActionPending(true);
+    try {
+      await managedResourceService.delete(deleteTarget.path, 'agent');
+      if (activeAgent === deleteTarget.name) onAgentChange('default');
+      setDeleteTarget(null);
+      setActionMessage({ text: `已删除 ${deleteTarget.name}` });
+      await loadFromBackend();
+    } catch (error) {
+      console.error('[AgentsPanel] 删除 Agent 失败:', error);
+      setActionMessage({ text: '删除 Agent 失败', error: true });
+    } finally {
+      setActionPending(false);
+    }
+  }, [actionPending, activeAgent, deleteTarget, loadFromBackend, onAgentChange]);
 
   function renderAgentNode(agent: AgentConfig, index: number) {
     const isExpanded = expandedFolders.has(agent.path);
@@ -90,6 +156,11 @@ export function AgentsPanel({ agents, onAgentsChange, activeAgent, onAgentChange
               toggleFolder(agent.path);
             }
           }}
+          onContextMenu={event => {
+            event.preventDefault();
+            event.stopPropagation();
+            setContextMenu({ x: event.clientX, y: event.clientY, agent });
+          }}
         >
           <span className="chevron-icon">
             <Icon name={isExpanded ? 'chevron-down' : 'chevron-right'} size={12} />
@@ -135,6 +206,7 @@ export function AgentsPanel({ agents, onAgentsChange, activeAgent, onAgentChange
       </div>
 
       <div className="panel-content agents-list">
+        {actionMessage && <div className={`resource-action-message${actionMessage.error ? ' error' : ''}`}>{actionMessage.text}</div>}
         {loading && (
           <div className="empty-state">
             <div className="empty-text">加载中...</div>
@@ -154,6 +226,44 @@ export function AgentsPanel({ agents, onAgentsChange, activeAgent, onAgentChange
 
         {!loading && agents.map((agent, index) => renderAgentNode(agent, index))}
       </div>
+      {contextMenu && (
+        <ContextMenu
+          x={contextMenu.x}
+          y={contextMenu.y}
+          items={[
+            { id: 'rename', label: '重命名', disabled: actionPending },
+            { id: 'copy', label: '复制', disabled: actionPending },
+            { id: 'delete', label: '删除', danger: true, disabled: actionPending },
+          ]}
+          onItemClick={handleContextAction}
+          onClose={() => setContextMenu(null)}
+        />
+      )}
+      {renameTarget && (
+        <ConfirmDialog
+          title="重命名 Agent"
+          message="名称会同步写入 AGENT.md。"
+          inputLabel="Agent 名称"
+          inputValue={renameTarget.value}
+          inputError={renameError}
+          confirmLabel={actionPending ? '处理中' : '重命名'}
+          confirmDisabled={Boolean(renameError) || actionPending}
+          onInputChange={value => setRenameTarget(current => current ? { ...current, value } : null)}
+          onConfirm={() => { void confirmRename(); }}
+          onCancel={() => { if (!actionPending) setRenameTarget(null); }}
+        />
+      )}
+      {deleteTarget && (
+        <ConfirmDialog
+          title="删除 Agent"
+          message={`将删除「${deleteTarget.name}」及其目录中的全部文件，此操作无法撤销。`}
+          confirmLabel={actionPending ? '处理中' : '删除'}
+          confirmDisabled={actionPending}
+          danger
+          onConfirm={() => { void confirmDelete(); }}
+          onCancel={() => { if (!actionPending) setDeleteTarget(null); }}
+        />
+      )}
     </div>
   );
 }
diff --git a/soloncode-desktop/src/components/sidebar/AutomationPanel.css b/soloncode-desktop/src/components/sidebar/AutomationPanel.css
new file mode 100644
index 0000000000000000000000000000000000000000..4a28daf404337d1a8c09299ad85b7257ddc572ce
--- /dev/null
+++ b/soloncode-desktop/src/components/sidebar/AutomationPanel.css
@@ -0,0 +1,769 @@
+.automation-panel,
+.automation-detail {
+  height: 100%;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  color: var(--cb-text-primary);
+  background-color: var(--cb-vscode-editor-background);
+}
+
+.automation-header,
+.automation-detail-header {
+  min-height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 10px 0 12px;
+  border-bottom: 1px solid var(--cb-vscode-panel-border);
+  box-sizing: border-box;
+}
+
+.automation-header-label,
+.automation-detail-heading {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  min-width: 0;
+}
+
+.automation-header-title,
+.automation-detail-heading span {
+  font-size: 11px;
+  font-weight: 600;
+  letter-spacing: 0.5px;
+  text-transform: uppercase;
+  color: var(--cb-text-secondary);
+}
+
+.automation-count {
+  min-width: 16px;
+  height: 16px;
+  padding: 0 4px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 8px;
+  background-color: var(--cb-vscode-badge-background, var(--cb-accent));
+  color: var(--cb-vscode-badge-foreground, #fff);
+  font-size: 9px;
+  box-sizing: border-box;
+}
+
+.automation-header-add,
+.automation-delete-btn,
+.automation-detail-close {
+  border: none;
+  border-radius: 4px;
+  background: transparent;
+  color: var(--cb-text-secondary);
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.automation-header-add {
+  width: 24px;
+  height: 24px;
+}
+
+.automation-header-add:hover,
+.automation-delete-btn:hover,
+.automation-detail-close:hover {
+  color: var(--cb-text-primary);
+  background-color: var(--cb-vscode-list-hoverBackground);
+}
+
+.automation-error {
+  margin: 8px 8px 0;
+  padding: 6px 8px;
+  border-radius: 4px;
+  background-color: rgba(241, 76, 76, 0.12);
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+  font-size: 11px;
+}
+
+.automation-list {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  padding: 5px 5px 10px;
+}
+
+.automation-empty {
+  min-height: 180px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 7px;
+  color: var(--cb-text-secondary);
+  text-align: center;
+}
+
+.automation-empty span {
+  font-size: 12px;
+}
+
+.automation-empty small {
+  max-width: 190px;
+  font-size: 11px;
+  line-height: 1.45;
+  opacity: 0.65;
+}
+
+.automation-task-row {
+  min-height: 48px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 6px 5px 6px 8px;
+  border: 1px solid transparent;
+  border-radius: 5px;
+  cursor: pointer;
+  outline: none;
+  box-sizing: border-box;
+}
+
+.automation-task-row:hover,
+.automation-task-row:focus-visible {
+  background-color: var(--cb-vscode-list-hoverBackground);
+}
+
+.automation-task-row.selected {
+  border-color: color-mix(in srgb, var(--cb-accent) 45%, transparent);
+  background-color: var(--cb-vscode-list-activeSelectionBackground, rgba(0, 122, 204, 0.18));
+}
+
+.automation-task-icon {
+  flex: 0 0 auto;
+  color: var(--cb-accent);
+}
+
+.automation-task-content {
+  min-width: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+}
+
+.automation-task-title,
+.automation-task-meta {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.automation-task-title {
+  font-size: 12px;
+  font-weight: 500;
+}
+
+.automation-task-meta {
+  color: var(--cb-text-secondary);
+  font-size: 10px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.automation-task-schedule-dot {
+  width: 6px;
+  height: 6px;
+  flex: 0 0 6px;
+  border-radius: 50%;
+  background-color: var(--cb-text-secondary);
+  opacity: 0.45;
+}
+
+.automation-task-schedule-dot.enabled {
+  background-color: #4caf50;
+  opacity: 1;
+}
+
+.automation-task-meta.missing,
+.automation-detail-field .missing {
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+}
+
+.automation-delete-btn {
+  width: 22px;
+  height: 22px;
+  flex: 0 0 auto;
+  opacity: 0;
+}
+
+.automation-task-row:hover .automation-delete-btn,
+.automation-task-row:focus-within .automation-delete-btn,
+.automation-task-row.selected .automation-delete-btn {
+  opacity: 1;
+}
+
+.automation-detail {
+  width: 100%;
+}
+
+.automation-detail-header {
+  background-color: var(--cb-vscode-sideBar-background);
+}
+
+.automation-detail-close {
+  width: 24px;
+  height: 24px;
+}
+
+.automation-detail-scroll {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  padding: clamp(18px, 4vw, 42px);
+}
+
+.automation-detail-hero {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 20px;
+  padding-bottom: 24px;
+  border-bottom: 1px solid var(--cb-vscode-panel-border);
+}
+
+.automation-detail-hero h2 {
+  margin: 0 0 7px;
+  font-size: 22px;
+  line-height: 1.3;
+}
+
+.automation-detail-title-field {
+  min-width: 0;
+  flex: 1;
+}
+
+.automation-detail-title-field label,
+.automation-detail-field label,
+.automation-cron-field label {
+  display: block;
+  margin-bottom: 6px;
+  color: var(--cb-text-secondary);
+  font-size: 10px;
+}
+
+.automation-detail-title-field input {
+  width: 100%;
+  max-width: 520px;
+  padding: 4px 7px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  background: transparent;
+  color: var(--cb-text-primary);
+  font: inherit;
+  font-size: 22px;
+  font-weight: 600;
+  line-height: 1.3;
+  box-sizing: border-box;
+}
+
+.automation-detail-title-field input:hover,
+.automation-detail-title-field input:focus {
+  border-color: var(--cb-vscode-input-border, var(--cb-vscode-widget-border));
+  background-color: var(--cb-vscode-input-background, var(--cb-vscode-editor-background));
+  outline: none;
+}
+
+.automation-detail-hero p {
+  margin: 0;
+  color: var(--cb-text-secondary);
+  font-size: 12px;
+}
+
+.automation-detail-status {
+  flex: 0 0 auto;
+  padding: 4px 9px;
+  border-radius: 12px;
+  background-color: rgba(76, 175, 80, 0.14);
+  color: #4caf50;
+  font-size: 11px;
+}
+
+.automation-detail-status.missing {
+  background-color: rgba(241, 76, 76, 0.12);
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+}
+
+.automation-detail-status.scheduled {
+  background-color: rgba(66, 165, 245, 0.14);
+  color: #42a5f5;
+}
+
+.automation-detail-section {
+  padding-top: 24px;
+}
+
+.automation-detail-section h3 {
+  margin: 0 0 10px;
+  color: var(--cb-text-secondary);
+  font-size: 11px;
+  font-weight: 600;
+  letter-spacing: 0.4px;
+  text-transform: uppercase;
+}
+
+.automation-detail-prompt {
+  padding: 14px 16px;
+  border: 1px solid var(--cb-vscode-widget-border);
+  border-radius: 7px;
+  background-color: var(--cb-vscode-textCodeBlock-background, var(--cb-vscode-sideBar-background));
+  font-size: 13px;
+  line-height: 1.65;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+}
+
+.automation-detail-prompt-input {
+  width: 100%;
+  min-height: 112px;
+  resize: vertical;
+  color: var(--cb-text-primary);
+  font-family: inherit;
+  box-sizing: border-box;
+}
+
+.automation-detail-prompt-input:focus,
+.automation-detail-field select:focus,
+.automation-cron-field input:focus {
+  border-color: var(--cb-accent);
+  outline: none;
+}
+
+.automation-detail-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 10px;
+}
+
+.automation-detail-field {
+  min-width: 0;
+  min-height: 76px;
+  padding: 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  border: 1px solid var(--cb-vscode-widget-border);
+  border-radius: 7px;
+}
+
+.automation-detail-field > span,
+.automation-detail-field > label,
+.automation-detail-field small,
+.automation-detail-times {
+  color: var(--cb-text-secondary);
+  font-size: 10px;
+}
+
+.automation-detail-field select,
+.automation-cron-field input {
+  width: 100%;
+  height: 30px;
+  padding: 0 8px;
+  border: 1px solid var(--cb-vscode-input-border, var(--cb-vscode-widget-border));
+  border-radius: 4px;
+  background-color: var(--cb-vscode-input-background, var(--cb-vscode-editor-background));
+  color: var(--cb-vscode-input-foreground, var(--cb-text-primary));
+  font: inherit;
+  font-size: 12px;
+  box-sizing: border-box;
+}
+
+.automation-detail-field select:disabled,
+.automation-cron-field input:disabled,
+.automation-detail-title-field input:disabled,
+.automation-detail-prompt-input:disabled {
+  opacity: 0.58;
+}
+
+.automation-detail-field strong,
+.automation-detail-field small {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.automation-detail-field strong {
+  font-size: 13px;
+  font-weight: 500;
+}
+
+.automation-detail-reasoning {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.automation-reasoning-dot {
+  width: 7px;
+  height: 7px;
+  flex: 0 0 7px;
+  border-radius: 50%;
+  background-color: #808080;
+}
+
+.automation-reasoning-dot.low { background-color: #4caf50; }
+.automation-reasoning-dot.medium { background-color: #42a5f5; }
+.automation-reasoning-dot.high { background-color: #ff9800; }
+.automation-reasoning-dot.max { background-color: #ab47bc; }
+
+.automation-detail-times {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px 20px;
+}
+
+.automation-schedule-section {
+  padding-bottom: 4px;
+}
+
+.automation-schedule-heading {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 12px;
+}
+
+.automation-schedule-heading h3 {
+  margin-bottom: 4px;
+}
+
+.automation-schedule-heading p {
+  margin: 0;
+  color: var(--cb-text-secondary);
+  font-size: 10px;
+}
+
+.automation-schedule-switch {
+  width: 34px;
+  height: 18px;
+  padding: 2px;
+  flex: 0 0 auto;
+  border: 1px solid var(--cb-vscode-widget-border);
+  border-radius: 10px;
+  background-color: var(--cb-vscode-input-background, transparent);
+  cursor: pointer;
+  transition: background-color 120ms ease, border-color 120ms ease;
+}
+
+.automation-schedule-switch span {
+  width: 12px;
+  height: 12px;
+  display: block;
+  border-radius: 50%;
+  background-color: var(--cb-text-secondary);
+  transition: transform 120ms ease, background-color 120ms ease;
+}
+
+.automation-schedule-switch.enabled {
+  border-color: var(--cb-accent);
+  background-color: var(--cb-accent);
+}
+
+.automation-schedule-switch.enabled span {
+  transform: translateX(16px);
+  background-color: #fff;
+}
+
+.automation-schedule-switch:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+.automation-cron-field {
+  padding: 12px;
+  border: 1px solid var(--cb-vscode-widget-border);
+  border-radius: 7px;
+}
+
+.automation-cron-field input {
+  font-family: var(--cb-vscode-editor-font-family, Consolas, monospace);
+}
+
+.automation-cron-field small,
+.automation-last-scheduled {
+  display: block;
+  margin-top: 7px;
+  color: var(--cb-text-secondary);
+  font-size: 10px;
+}
+
+.automation-field-error,
+.automation-detail-save-error {
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+  font-size: 10px;
+}
+
+.automation-field-error,
+.automation-next-run {
+  margin-top: 7px;
+}
+
+.automation-next-run {
+  color: #4caf50;
+  font-size: 10px;
+}
+
+.automation-cron-presets {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+  margin-top: 8px;
+}
+
+.automation-cron-presets button {
+  height: 24px;
+  padding: 0 8px;
+  border: 1px solid var(--cb-vscode-widget-border);
+  border-radius: 4px;
+  background: transparent;
+  color: var(--cb-text-secondary);
+  cursor: pointer;
+  font-size: 10px;
+}
+
+.automation-cron-presets button:hover:not(:disabled) {
+  color: var(--cb-text-primary);
+  background-color: var(--cb-vscode-list-hoverBackground);
+}
+
+.automation-run-history-section {
+  padding-bottom: 8px;
+}
+
+.automation-run-history-heading {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+}
+
+.automation-run-history-heading h3 {
+  margin-bottom: 0;
+}
+
+.automation-run-history-heading > span {
+  min-width: 17px;
+  height: 17px;
+  padding: 0 4px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 9px;
+  background-color: var(--cb-vscode-badge-background, var(--cb-accent));
+  color: var(--cb-vscode-badge-foreground, #fff);
+  font-size: 9px;
+  box-sizing: border-box;
+}
+
+.automation-run-history {
+  margin-top: 10px;
+  border: 1px solid var(--cb-vscode-widget-border);
+  border-radius: 7px;
+  overflow: hidden;
+}
+
+.automation-run-history-empty {
+  margin-top: 10px;
+  padding: 20px 14px;
+  border: 1px dashed var(--cb-vscode-widget-border);
+  border-radius: 7px;
+  color: var(--cb-text-secondary);
+  font-size: 11px;
+  text-align: center;
+}
+
+.automation-run-record {
+  width: 100%;
+  display: grid;
+  grid-template-columns: 76px minmax(0, 1fr);
+  gap: 12px;
+  padding: 12px 14px;
+  border: 0;
+  background: transparent;
+  color: inherit;
+  font: inherit;
+  text-align: left;
+}
+
+.automation-run-record.clickable {
+  cursor: pointer;
+  transition: background-color 0.12s ease;
+}
+
+.automation-run-record.clickable:hover {
+  background-color: var(--cb-vscode-list-hoverBackground);
+}
+
+.automation-run-record.clickable:focus-visible {
+  outline: 1px solid var(--cb-accent);
+  outline-offset: -1px;
+}
+
+.automation-run-record:disabled {
+  cursor: default;
+  opacity: 1;
+}
+
+.automation-run-record + .automation-run-record {
+  border-top: 1px solid var(--cb-vscode-panel-border);
+}
+
+.automation-run-record-marker {
+  display: flex;
+  align-items: center;
+  align-self: start;
+  gap: 6px;
+  padding-top: 2px;
+}
+
+.automation-run-status-dot {
+  width: 7px;
+  height: 7px;
+  flex: 0 0 7px;
+  border-radius: 50%;
+  background-color: #808080;
+}
+
+.automation-run-status-dot.running { background-color: #42a5f5; }
+.automation-run-status-dot.completed { background-color: #4caf50; }
+.automation-run-status-dot.error { background-color: var(--cb-vscode-errorForeground, #f14c4c); }
+
+.automation-run-status {
+  font-size: 10px;
+  white-space: nowrap;
+}
+
+.automation-run-status.running { color: #42a5f5; }
+.automation-run-status.completed { color: #4caf50; }
+.automation-run-status.error { color: var(--cb-vscode-errorForeground, #f14c4c); }
+
+.automation-run-record-content {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.automation-run-record-primary,
+.automation-run-record-meta {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 6px 12px;
+}
+
+.automation-run-record-primary strong {
+  font-size: 11px;
+  font-weight: 500;
+}
+
+.automation-run-record-primary span,
+.automation-run-record-meta,
+.automation-run-session {
+  color: var(--cb-text-secondary);
+  font-size: 10px;
+}
+
+.automation-run-record-meta span,
+.automation-run-session {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.automation-run-session {
+  max-width: 100%;
+}
+
+.automation-run-error {
+  padding: 5px 7px;
+  border-radius: 4px;
+  background-color: rgba(241, 76, 76, 0.1);
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+  font-size: 10px;
+  line-height: 1.4;
+  overflow-wrap: anywhere;
+}
+
+.automation-detail-actions {
+  min-height: 56px;
+  padding: 9px 14px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 8px;
+  border-top: 1px solid var(--cb-vscode-panel-border);
+  background-color: var(--cb-vscode-sideBar-background);
+  box-sizing: border-box;
+}
+
+.automation-detail-save-error {
+  max-width: 260px;
+  margin-right: auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.automation-detail-delete,
+.automation-detail-save,
+.automation-detail-run {
+  height: 30px;
+  padding: 0 12px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  border-radius: 5px;
+  cursor: pointer;
+  font-size: 12px;
+}
+
+.automation-detail-delete {
+  border: 1px solid var(--cb-vscode-widget-border);
+  background: transparent;
+  color: var(--cb-text-secondary);
+}
+
+.automation-detail-run {
+  border: 1px solid var(--cb-accent);
+  background-color: var(--cb-accent);
+  color: #fff;
+}
+
+.automation-detail-save {
+  border: 1px solid var(--cb-vscode-widget-border);
+  background-color: var(--cb-vscode-button-secondaryBackground, var(--cb-vscode-list-hoverBackground));
+  color: var(--cb-text-primary);
+}
+
+.automation-detail-delete:hover:not(:disabled) {
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+  border-color: var(--cb-vscode-errorForeground, #f14c4c);
+}
+
+.automation-detail-run:disabled,
+.automation-detail-save:disabled,
+.automation-detail-delete:disabled {
+  opacity: 0.45;
+  cursor: default;
+}
+
+@media (max-width: 760px) {
+  .automation-detail-grid {
+    grid-template-columns: 1fr;
+  }
+
+  .automation-run-record {
+    grid-template-columns: 1fr;
+    gap: 7px;
+  }
+}
diff --git a/soloncode-desktop/src/components/sidebar/AutomationPanel.tsx b/soloncode-desktop/src/components/sidebar/AutomationPanel.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..83b33f2e8287be0a39b980d1553dc3e9229bc54b
--- /dev/null
+++ b/soloncode-desktop/src/components/sidebar/AutomationPanel.tsx
@@ -0,0 +1,531 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { Icon } from '../common/Icon';
+import {
+  UNLINKED_PROJECT,
+  deleteAutomation,
+  getAllAutomations,
+  getAutomationRuns,
+  type DbAutomation,
+  type DbAutomationRun,
+} from '../../db';
+import type { Project } from './SessionsPanel';
+import { getCronValidationError, getNextCronRun } from '../../utils/cron';
+import './AutomationPanel.css';
+
+export interface AutomationModelOption {
+  id: string;
+  name: string;
+  label: string;
+}
+
+export interface AutomationUpdateInput {
+  title: string;
+  prompt: string;
+  projectId: string;
+  modelId: string;
+  reasoningEffort: DbAutomation['reasoningEffort'];
+  scheduleEnabled: boolean;
+  cron: string;
+}
+
+interface AutomationPanelProps {
+  projects: Project[];
+  refreshKey?: number;
+  selectedAutomationId?: number | null;
+  onCreateWithPrompt: () => void;
+  onSelectAutomation: (automation: DbAutomation) => void;
+  onAutomationDeleted?: (automationId: number) => void;
+}
+
+interface AutomationDetailProps {
+  automation: DbAutomation;
+  projects: Project[];
+  models: AutomationModelOption[];
+  running?: boolean;
+  runDisabled?: boolean;
+  runRefreshKey?: number;
+  onRun: (automation: DbAutomation) => void;
+  onOpenRun: (run: DbAutomationRun) => void;
+  onSave: (automation: DbAutomation, updates: AutomationUpdateInput) => Promise<boolean>;
+  onDelete: (automation: DbAutomation) => void;
+  onClose: () => void;
+}
+
+function formatTime(value?: string) {
+  if (!value) return '尚未运行';
+  const date = new Date(value);
+  return Number.isNaN(date.getTime()) ? '未知' : date.toLocaleString();
+}
+
+function reasoningLabel(effort: DbAutomation['reasoningEffort']) {
+  return ({ low: '低', medium: '中', high: '高', max: '最高' } as const)[effort];
+}
+
+function runStatusLabel(status: DbAutomationRun['status']) {
+  return ({ running: '运行中', completed: '已完成', error: '失败' } as const)[status];
+}
+
+function formatDuration(run: DbAutomationRun) {
+  if (!run.completedAt) return run.status === 'running' ? '进行中' : '-';
+  const startedAt = new Date(run.startedAt).getTime();
+  const completedAt = new Date(run.completedAt).getTime();
+  if (!Number.isFinite(startedAt) || !Number.isFinite(completedAt)) return '-';
+  const seconds = Math.max(0, Math.round((completedAt - startedAt) / 1000));
+  if (seconds < 60) return `${seconds} 秒`;
+  const minutes = Math.floor(seconds / 60);
+  return `${minutes} 分 ${seconds % 60} 秒`;
+}
+
+function createAutomationDraft(automation: DbAutomation): AutomationUpdateInput {
+  return {
+    title: automation.title,
+    prompt: automation.prompt,
+    projectId: automation.projectId,
+    modelId: automation.modelId,
+    reasoningEffort: automation.reasoningEffort,
+    scheduleEnabled: automation.scheduleEnabled ?? false,
+    cron: automation.cron || '0 9 * * *',
+  };
+}
+
+function automationDraftChanged(automation: DbAutomation, draft: AutomationUpdateInput): boolean {
+  return draft.title !== automation.title
+    || draft.prompt !== automation.prompt
+    || draft.projectId !== automation.projectId
+    || draft.modelId !== automation.modelId
+    || draft.reasoningEffort !== automation.reasoningEffort
+    || draft.scheduleEnabled !== (automation.scheduleEnabled ?? false)
+    || draft.cron !== (automation.cron || '0 9 * * *');
+}
+
+export function AutomationPanel({
+  projects,
+  refreshKey = 0,
+  selectedAutomationId,
+  onCreateWithPrompt,
+  onSelectAutomation,
+  onAutomationDeleted,
+}: AutomationPanelProps) {
+  const [automations, setAutomations] = useState<DbAutomation[]>([]);
+  const [error, setError] = useState('');
+
+  useEffect(() => {
+    getAllAutomations()
+      .then(items => {
+        setAutomations(items);
+        if (selectedAutomationId) {
+          const selected = items.find(item => item.id === selectedAutomationId);
+          if (selected) onSelectAutomation(selected);
+        }
+      })
+      .catch(err => {
+        console.error('[AutomationPanel] 加载自动化失败:', err);
+        setError('加载自动化失败');
+      });
+  }, [onSelectAutomation, refreshKey, selectedAutomationId]);
+
+  const handleDelete = useCallback(async (automation: DbAutomation) => {
+    if (!automation.id) return;
+    try {
+      await deleteAutomation(automation.id);
+      setAutomations(current => current.filter(item => item.id !== automation.id));
+      onAutomationDeleted?.(automation.id);
+    } catch (err) {
+      console.error('[AutomationPanel] 删除自动化失败:', err);
+      setError('删除自动化失败');
+    }
+  }, [onAutomationDeleted]);
+
+  return (
+    <div className="automation-panel">
+      <div className="automation-header">
+        <div className="automation-header-label">
+          <span className="automation-header-title">自动化任务</span>
+          <span className="automation-count">{automations.length}</span>
+        </div>
+        <button
+          type="button"
+          className="automation-header-add"
+          title="根据提示词新建自动化"
+          onClick={() => {
+            setError('');
+            onCreateWithPrompt();
+          }}
+        >
+          <Icon name="add" size={14} />
+        </button>
+      </div>
+
+      {error && <div className="automation-error">{error}</div>}
+
+      <div className="automation-list">
+        {automations.length === 0 && (
+          <div className="automation-empty">
+            <Icon name="automation" size={28} />
+            <span>暂无自动化任务</span>
+            <small>点击右上角新增，通过提示词创建任务</small>
+          </div>
+        )}
+
+        {automations.map(automation => {
+          const projectAvailable = automation.projectId === UNLINKED_PROJECT
+            || projects.some(project => project.id === automation.projectId);
+          const selected = automation.id === selectedAutomationId;
+          return (
+            <div
+              key={automation.id}
+              className={`automation-task-row${selected ? ' selected' : ''}`}
+              role="button"
+              tabIndex={0}
+              aria-selected={selected}
+              onClick={() => onSelectAutomation(automation)}
+              onKeyDown={event => {
+                if (event.key === 'Enter' || event.key === ' ') {
+                  event.preventDefault();
+                  onSelectAutomation(automation);
+                }
+              }}
+            >
+              <Icon name="automation" size={15} className="automation-task-icon" />
+              <div className="automation-task-content">
+                <span className="automation-task-title" title={automation.title}>{automation.title}</span>
+                <span className={`automation-task-meta${projectAvailable ? '' : ' missing'}`} title={automation.projectId}>
+                  <span className={`automation-task-schedule-dot${automation.scheduleEnabled ? ' enabled' : ''}`} />
+                  {automation.scheduleEnabled ? automation.cron : automation.projectName} · {automation.runCount > 0 ? `已运行 ${automation.runCount} 次` : '未运行'}
+                </span>
+              </div>
+              <button
+                type="button"
+                className="automation-delete-btn"
+                title="删除自动化"
+                onClick={event => {
+                  event.stopPropagation();
+                  void handleDelete(automation);
+                }}
+              >
+                <Icon name="delete" size={12} />
+              </button>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
+export function AutomationDetail({
+  automation,
+  projects,
+  models,
+  running = false,
+  runDisabled = false,
+  runRefreshKey = 0,
+  onRun,
+  onOpenRun,
+  onSave,
+  onDelete,
+  onClose,
+}: AutomationDetailProps) {
+  const [runs, setRuns] = useState<DbAutomationRun[]>([]);
+  const [runsLoading, setRunsLoading] = useState(false);
+  const [draft, setDraft] = useState<AutomationUpdateInput>(() => createAutomationDraft(automation));
+  const [saving, setSaving] = useState(false);
+  const [saveError, setSaveError] = useState('');
+
+  useEffect(() => {
+    setDraft(createAutomationDraft(automation));
+    setSaveError('');
+  }, [automation.id, automation.updatedAt]);
+
+  const dirty = automationDraftChanged(automation, draft);
+  const projectAvailable = draft.projectId === UNLINKED_PROJECT
+    || projects.some(project => project.id === draft.projectId);
+  const modelAvailable = models.some(model => model.id === draft.modelId);
+  const cronError = useMemo(() => getCronValidationError(draft.cron), [draft.cron]);
+  const nextCronRun = useMemo(() => {
+    if (!draft.scheduleEnabled || cronError) return null;
+    try {
+      return getNextCronRun(draft.cron);
+    } catch {
+      return null;
+    }
+  }, [cronError, draft.cron, draft.scheduleEnabled]);
+  const modelOptions = useMemo(() => {
+    if (models.some(model => model.id === draft.modelId)) return models;
+    return [{ id: automation.modelId, name: automation.modelName, label: `${automation.modelName}（当前不可用）` }, ...models];
+  }, [automation.modelId, automation.modelName, draft.modelId, models]);
+  const validationError = !draft.title.trim()
+    ? '任务名称不能为空'
+    : !draft.prompt.trim()
+      ? '任务提示词不能为空'
+      : !projectAvailable
+        ? '请选择一个可用项目'
+        : !modelAvailable
+          ? '请选择一个可用模型'
+          : cronError;
+
+  const handleSave = useCallback(async () => {
+    if (!dirty || validationError || saving || running) return;
+    const normalized: AutomationUpdateInput = {
+      ...draft,
+      title: draft.title.trim(),
+      prompt: draft.prompt.trim(),
+      cron: draft.cron.trim().replace(/\s+/g, ' '),
+    };
+    setSaving(true);
+    setSaveError('');
+    try {
+      const saved = await onSave(automation, normalized);
+      if (!saved) setSaveError('保存失败，请检查配置后重试');
+    } catch (error) {
+      console.error('[AutomationDetail] 保存自动化失败:', error);
+      setSaveError('保存失败，请稍后重试');
+    } finally {
+      setSaving(false);
+    }
+  }, [automation, dirty, draft, onSave, running, saving, validationError]);
+
+  useEffect(() => {
+    let cancelled = false;
+    if (!automation.id) {
+      setRuns([]);
+      return () => { cancelled = true; };
+    }
+
+    setRunsLoading(true);
+    getAutomationRuns(automation.id)
+      .then(items => {
+        if (!cancelled) setRuns(items);
+      })
+      .catch(err => {
+        console.error('[AutomationDetail] 加载运行记录失败:', err);
+        if (!cancelled) setRuns([]);
+      })
+      .finally(() => {
+        if (!cancelled) setRunsLoading(false);
+      });
+
+    return () => { cancelled = true; };
+  }, [automation.id, runRefreshKey]);
+
+  return (
+    <div className="automation-detail">
+      <div className="automation-detail-header">
+        <div className="automation-detail-heading">
+          <Icon name="automation" size={16} />
+          <span>自动化详情</span>
+        </div>
+        <button type="button" className="automation-detail-close" title="关闭详情" onClick={onClose}>
+          <Icon name="close" size={14} />
+        </button>
+      </div>
+
+      <div className="automation-detail-scroll">
+        <div className="automation-detail-hero">
+          <div className="automation-detail-title-field">
+            <label htmlFor={`automation-title-${automation.id}`}>任务名称</label>
+            <input
+              id={`automation-title-${automation.id}`}
+              value={draft.title}
+              maxLength={100}
+              disabled={running || saving}
+              onChange={event => setDraft(current => ({ ...current, title: event.target.value }))}
+            />
+            <p>{projectAvailable ? '已关联项目，可以运行' : '关联项目已不可用'}</p>
+          </div>
+          <span className={`automation-detail-status${!projectAvailable ? ' missing' : draft.scheduleEnabled ? ' scheduled' : ''}`}>
+            {!projectAvailable ? '项目缺失' : draft.scheduleEnabled ? '定时已开启' : '定时关闭'}
+          </span>
+        </div>
+
+        <section className="automation-detail-section">
+          <h3>任务提示词</h3>
+          <textarea
+            className="automation-detail-prompt automation-detail-prompt-input"
+            value={draft.prompt}
+            maxLength={10000}
+            rows={5}
+            disabled={running || saving}
+            onChange={event => setDraft(current => ({ ...current, prompt: event.target.value }))}
+          />
+        </section>
+
+        <section className="automation-detail-section">
+          <h3>关联配置</h3>
+          <div className="automation-detail-grid">
+            <div className="automation-detail-field">
+              <label htmlFor={`automation-project-${automation.id}`}>项目</label>
+              <select
+                id={`automation-project-${automation.id}`}
+                value={draft.projectId}
+                disabled={running || saving}
+                onChange={event => setDraft(current => ({ ...current, projectId: event.target.value }))}
+              >
+                <option value={UNLINKED_PROJECT}>未关联项目</option>
+                {draft.projectId !== UNLINKED_PROJECT && !projects.some(project => project.id === draft.projectId) && (
+                  <option value={draft.projectId}>{automation.projectName}（不可用）</option>
+                )}
+                {projects.map(project => <option key={project.id} value={project.id}>{project.name}</option>)}
+              </select>
+              <small title={draft.projectId}>{draft.projectId === UNLINKED_PROJECT ? '不使用项目目录' : draft.projectId}</small>
+            </div>
+            <div className="automation-detail-field">
+              <label htmlFor={`automation-model-${automation.id}`}>模型</label>
+              <select
+                id={`automation-model-${automation.id}`}
+                value={draft.modelId}
+                disabled={running || saving}
+                onChange={event => setDraft(current => ({ ...current, modelId: event.target.value }))}
+              >
+                {modelOptions.map(model => <option key={model.id} value={model.id}>{model.label}</option>)}
+              </select>
+              <small title={draft.modelId}>{draft.modelId}</small>
+            </div>
+            <div className="automation-detail-field">
+              <label htmlFor={`automation-reasoning-${automation.id}`}>推理程度</label>
+              <select
+                id={`automation-reasoning-${automation.id}`}
+                value={draft.reasoningEffort}
+                disabled={running || saving}
+                onChange={event => setDraft(current => ({ ...current, reasoningEffort: event.target.value as DbAutomation['reasoningEffort'] }))}
+              >
+                <option value="low">低（low）</option>
+                <option value="medium">中（medium）</option>
+                <option value="high">高（high）</option>
+                <option value="max">最高（max）</option>
+              </select>
+              <small className="automation-detail-reasoning"><span className={`automation-reasoning-dot ${draft.reasoningEffort}`} />{reasoningLabel(draft.reasoningEffort)}</small>
+            </div>
+            <div className="automation-detail-field">
+              <span>运行次数</span>
+              <strong>{automation.runCount} 次</strong>
+              <small>上次运行：{formatTime(automation.lastRunAt)}</small>
+            </div>
+          </div>
+        </section>
+
+        <section className="automation-detail-section automation-schedule-section">
+          <div className="automation-schedule-heading">
+            <div>
+              <h3>定时执行</h3>
+              <p>桌面应用运行期间，按本机时区自动触发</p>
+            </div>
+            <button
+              type="button"
+              role="switch"
+              aria-checked={draft.scheduleEnabled}
+              className={`automation-schedule-switch${draft.scheduleEnabled ? ' enabled' : ''}`}
+              disabled={running || saving}
+              onClick={() => setDraft(current => ({ ...current, scheduleEnabled: !current.scheduleEnabled }))}
+            >
+              <span />
+            </button>
+          </div>
+          <div className="automation-cron-field">
+            <label htmlFor={`automation-cron-${automation.id}`}>Cron 表达式</label>
+            <input
+              id={`automation-cron-${automation.id}`}
+              value={draft.cron}
+              maxLength={100}
+              spellCheck={false}
+              disabled={running || saving}
+              aria-invalid={Boolean(cronError)}
+              onChange={event => setDraft(current => ({ ...current, cron: event.target.value }))}
+            />
+            <small>分钟　小时　日　月　星期（0 和 7 均表示星期日）</small>
+            {cronError ? (
+              <div className="automation-field-error">{cronError}</div>
+            ) : draft.scheduleEnabled ? (
+              <div className="automation-next-run">下次运行：{nextCronRun ? nextCronRun.toLocaleString() : '一年内无匹配时间'}</div>
+            ) : null}
+          </div>
+          <div className="automation-cron-presets">
+            <button type="button" disabled={running || saving} onClick={() => setDraft(current => ({ ...current, cron: '*/15 * * * *' }))}>每 15 分钟</button>
+            <button type="button" disabled={running || saving} onClick={() => setDraft(current => ({ ...current, cron: '0 * * * *' }))}>每小时</button>
+            <button type="button" disabled={running || saving} onClick={() => setDraft(current => ({ ...current, cron: '0 9 * * *' }))}>每天 9:00</button>
+            <button type="button" disabled={running || saving} onClick={() => setDraft(current => ({ ...current, cron: '0 9 * * 1-5' }))}>工作日 9:00</button>
+          </div>
+          {automation.lastScheduledAt && <div className="automation-last-scheduled">上次计划触发：{formatTime(automation.lastScheduledAt)}</div>}
+        </section>
+
+        <section className="automation-detail-section">
+          <h3>时间信息</h3>
+          <div className="automation-detail-times">
+            <span>创建于 {formatTime(automation.createdAt)}</span>
+            <span>更新于 {formatTime(automation.updatedAt)}</span>
+          </div>
+        </section>
+
+        <section className="automation-detail-section automation-run-history-section">
+          <div className="automation-run-history-heading">
+            <h3>运行记录</h3>
+            <span>{runs.length}</span>
+          </div>
+          {runsLoading ? (
+            <div className="automation-run-history-empty">加载运行记录...</div>
+          ) : runs.length === 0 ? (
+            <div className="automation-run-history-empty">暂无运行记录</div>
+          ) : (
+            <div className="automation-run-history">
+              {runs.map(run => (
+                <button
+                  key={run.id}
+                  type="button"
+                  className={`automation-run-record${run.sessionId ? ' clickable' : ''}`}
+                  disabled={!run.sessionId}
+                  title={run.sessionId ? '打开本次运行的对话' : '该运行记录没有关联会话'}
+                  aria-label={run.sessionId ? `打开 ${formatTime(run.startedAt)} 的运行对话` : undefined}
+                  onClick={() => onOpenRun(run)}
+                >
+                  <div className="automation-run-record-marker">
+                    <span className={`automation-run-status-dot ${run.status}`} />
+                    <span className={`automation-run-status ${run.status}`}>{runStatusLabel(run.status)}</span>
+                  </div>
+                  <div className="automation-run-record-content">
+                    <div className="automation-run-record-primary">
+                      <strong>{formatTime(run.startedAt)}</strong>
+                      <span>{formatDuration(run)}</span>
+                      <span>{run.trigger === 'scheduled' ? '定时触发' : '手动触发'}</span>
+                    </div>
+                    <div className="automation-run-record-meta">
+                      <span title={run.projectId}>{run.projectName}</span>
+                      <span title={run.modelId}>{run.modelName}</span>
+                      <span>推理 {reasoningLabel(run.reasoningEffort)}</span>
+                    </div>
+                    {run.sessionId && <div className="automation-run-session" title={run.sessionId}>打开对话 · 会话：{run.sessionId}</div>}
+                    {run.error && <div className="automation-run-error">{run.error}</div>}
+                  </div>
+                </button>
+              ))}
+            </div>
+          )}
+        </section>
+      </div>
+
+      <div className="automation-detail-actions">
+        {(saveError || (dirty && validationError)) && <span className="automation-detail-save-error">{saveError || validationError}</span>}
+        <button type="button" className="automation-detail-delete" disabled={running} onClick={() => onDelete(automation)}>
+          <Icon name="delete" size={13} />删除任务
+        </button>
+        <button
+          type="button"
+          className="automation-detail-save"
+          disabled={!dirty || Boolean(validationError) || running || saving}
+          onClick={() => { void handleSave(); }}
+        >
+          <Icon name={saving ? 'loading' : 'save'} size={13} />{saving ? '保存中' : '保存更改'}
+        </button>
+        <button
+          type="button"
+          className="automation-detail-run"
+          disabled={!projectAvailable || !modelAvailable || dirty || running || runDisabled}
+          onClick={() => onRun(automation)}
+          title={dirty ? '请先保存更改' : !modelAvailable ? '当前模型不可用' : undefined}
+        >
+          <Icon name={running ? 'loading' : 'send'} size={13} />
+          {running ? '运行中' : '立即运行'}
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/soloncode-desktop/src/components/sidebar/ExplorerPanel.css b/soloncode-desktop/src/components/sidebar/ExplorerPanel.css
index fbe90b2f0998478c0b14196e31a94d067da00ef4..09045969c6d721c7f6f50b313af571ee6da5bd88 100644
--- a/soloncode-desktop/src/components/sidebar/ExplorerPanel.css
+++ b/soloncode-desktop/src/components/sidebar/ExplorerPanel.css
@@ -12,6 +12,20 @@
   overflow-y: auto;
 }
 
+.resource-action-message {
+  margin: 6px 8px;
+  padding: 6px 8px;
+  border-radius: 4px;
+  background-color: rgba(76, 175, 80, 0.12);
+  color: #4caf50;
+  font-size: 11px;
+}
+
+.resource-action-message.error {
+  background-color: rgba(241, 76, 76, 0.12);
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+}
+
 /* 项目根节点 */
 .project-root {
   border-bottom: 1px solid var(--cb-vscode-panel-border);
diff --git a/soloncode-desktop/src/components/sidebar/ExplorerPanel.tsx b/soloncode-desktop/src/components/sidebar/ExplorerPanel.tsx
index 0c057258c7eb0dabdc000cfde33d44498c858a40..16b1317537919b628047de45b0716963cf6fd9e3 100644
--- a/soloncode-desktop/src/components/sidebar/ExplorerPanel.tsx
+++ b/soloncode-desktop/src/components/sidebar/ExplorerPanel.tsx
@@ -6,9 +6,10 @@ import { useState, useCallback, useEffect, useRef } from 'react';
 import { Icon, getFileIconName } from '../common/Icon';
 import { ContextMenu } from '../common/ContextMenu';
 import { ConfirmDialog } from '../common/ConfirmDialog';
-import type { MenuItem } from '../common/DropdownMenu';
+import { DropdownMenu, type MenuItem } from '../common/DropdownMenu';
 import { fileService } from '../../services/fileService';
 import { revealItemInDir } from '@tauri-apps/plugin-opener';
+import { copyTextToClipboard } from '../../utils/clipboard';
 import './ExplorerPanel.css';
 
 interface FileNode {
@@ -34,7 +35,8 @@ interface ExplorerPanelProps {
   onFileSelect: (path: string) => void;
   onOpenFolder: () => void;
   onCreateProject: () => void;
-  onRemoveProject: (id: string) => void;
+  onRemoveProject: (id: string) => Promise<void>;
+  onRenameProject: (id: string, name: string) => Promise<void>;
   onSetActiveProject: (path: string) => void;
   onRefreshProject: (projectPath: string) => void;
   onNewFile: (projectPath: string) => void;
@@ -62,6 +64,17 @@ function getBaseName(name: string): string {
   return dot >= 0 ? name.slice(0, dot) : name;
 }
 
+function getProjectNameError(value: string): string {
+  const name = value.trim();
+  if (!name) return '项目名称不能为空';
+  if (Array.from(name).length > 64) return '项目名称不能超过 64 个字符';
+  if (name === '.' || name === '..' || name.endsWith('.') || name.endsWith(' ')) return '项目名称格式无效';
+  if (!/^[\p{L}\p{N} _().-]+$/u.test(name)) return '名称包含不支持的字符';
+  const stem = name.split('.')[0].toUpperCase();
+  if (/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/.test(stem)) return '该名称是系统保留名称';
+  return '';
+}
+
 export function ExplorerPanel({
   projects,
   activeProjectPath,
@@ -70,6 +83,7 @@ export function ExplorerPanel({
   onOpenFolder,
   onCreateProject,
   onRemoveProject,
+  onRenameProject,
   onSetActiveProject,
   onRefreshProject,
   onNewFile,
@@ -123,6 +137,11 @@ export function ExplorerPanel({
     y: number;
     projectPath: string;
   } | null>(null);
+  const [renameProjectTarget, setRenameProjectTarget] = useState<Project | null>(null);
+  const [renameProjectValue, setRenameProjectValue] = useState('');
+  const [deleteProjectTarget, setDeleteProjectTarget] = useState<Project | null>(null);
+  const [projectActionPending, setProjectActionPending] = useState(false);
+  const [projectActionMessage, setProjectActionMessage] = useState<{ text: string; error?: boolean } | null>(null);
 
   const prevRefreshKey = useRef(refreshKey);
 
@@ -207,8 +226,9 @@ export function ExplorerPanel({
   }, [loadProjectTree, onRefreshProject]);
 
   // 关闭项目
-  const handleRemoveProject = useCallback((projectPath: string, e?: React.MouseEvent) => {
+  const handleRemoveProject = useCallback(async (projectPath: string, e?: React.MouseEvent) => {
     e?.stopPropagation();
+    await onRemoveProject(projectPath);
     setProjectTrees(prev => {
       const next = new Map(prev);
       next.delete(projectPath);
@@ -219,7 +239,6 @@ export function ExplorerPanel({
       next.delete(projectPath);
       return next;
     });
-    onRemoveProject(projectPath);
   }, [onRemoveProject]);
 
   // 在系统资源管理器中打开
@@ -441,9 +460,28 @@ export function ExplorerPanel({
       case 'open-in-explorer':
         await handleOpenInExplorer(path);
         break;
-      case 'close':
-        handleRemoveProject(path);
+      case 'rename': {
+        const project = projects.find(item => item.id === path);
+        if (project) {
+          setRenameProjectTarget(project);
+          setRenameProjectValue(project.name);
+        }
+        break;
+      }
+      case 'copy':
+        try {
+          await copyTextToClipboard(path);
+          setProjectActionMessage({ text: '项目路径已复制' });
+        } catch (error) {
+          console.error('[ExplorerPanel] 复制项目路径失败:', error);
+          setProjectActionMessage({ text: '复制项目路径失败', error: true });
+        }
+        break;
+      case 'delete': {
+        const project = projects.find(item => item.id === path);
+        if (project) setDeleteProjectTarget(project);
         break;
+      }
       case 'new-file':
         await onNewFile(path);
         break;
@@ -451,7 +489,31 @@ export function ExplorerPanel({
         await onNewFolder(path);
         break;
     }
-  }, [projectContextMenu, handleOpenInExplorer, handleRemoveProject, onNewFile, onNewFolder]);
+  }, [projectContextMenu, handleOpenInExplorer, onNewFile, onNewFolder, projects]);
+
+  const handleRenameProjectConfirm = useCallback(async () => {
+    if (!renameProjectTarget || getProjectNameError(renameProjectValue) || projectActionPending) return;
+    setProjectActionPending(true);
+    try {
+      await onRenameProject(renameProjectTarget.id, renameProjectValue.trim());
+      setRenameProjectTarget(null);
+      setRenameProjectValue('');
+      setProjectActionMessage({ text: '项目已重命名' });
+    } catch (error) {
+      console.error('[ExplorerPanel] 重命名项目失败:', error);
+      setProjectActionMessage({ text: error instanceof Error ? error.message : '重命名项目失败', error: true });
+    } finally {
+      setProjectActionPending(false);
+    }
+  }, [onRenameProject, projectActionPending, renameProjectTarget, renameProjectValue]);
+
+  const handleNewProjectAction = useCallback((itemId: string) => {
+    if (itemId === 'new-empty-project') {
+      onCreateProject();
+    } else if (itemId === 'use-existing-project') {
+      onOpenFolder();
+    }
+  }, [onCreateProject, onOpenFolder]);
 
   const handleConfirmDelete = useCallback(async () => {
     if (confirmDialog) {
@@ -499,7 +561,8 @@ export function ExplorerPanel({
   // ==================== 渲染 ====================
 
   function renderFileNode(node: FileNode, projectPath: string, depth: number = 0) {
-    const indent = depth * 16;
+    // 项目根目录本身占一层，子目录和文件从下一层开始缩进。
+    const indent = (depth + 1) * 16;
     const isExpanded = expandedFolders.has(node.path);
     const isLoading = loadingFolders.has(node.path);
     const isRenaming = renamingPath === node.path;
@@ -588,7 +651,7 @@ export function ExplorerPanel({
           <span className="chevron-icon">
             <Icon name={isExpanded ? 'chevron-down' : 'chevron-right'} size={12} />
           </span>
-          <Icon name="folder-root" size={16} className="file-icon" />
+          <Icon name={isExpanded ? 'folder-open' : 'folder'} size={16} className="file-icon" />
           <span className="project-root-name" title={project.id}>{project.name}</span>
           <div className="project-root-actions">
             <button className="project-root-action" title="刷新" onClick={(e) => handleRefreshProject(project.id, e)}>
@@ -630,15 +693,23 @@ export function ExplorerPanel({
       <div className="panel-header">
         <span className="panel-title">项目管理</span>
         <div className="panel-actions">
-          <button className="panel-action" title="打开文件夹" onClick={onOpenFolder}>
-            <Icon name="folder-add" size={16} />
-          </button>
-          <button className="panel-action" title="新建项目" onClick={onCreateProject}>
-            <Icon name="add" size={16} />
-          </button>
+          <DropdownMenu
+            align="right"
+            items={[
+              { id: 'new-empty-project', label: '新建空项目' },
+              { id: 'use-existing-project', label: '使用现有项目' },
+            ]}
+            onItemClick={handleNewProjectAction}
+            trigger={(
+              <button className="panel-action" title="新建项目" aria-label="新建项目">
+                <Icon name="add" size={16} />
+              </button>
+            )}
+          />
         </div>
       </div>
       <div className="projects-list">
+        {projectActionMessage && <div className={`resource-action-message${projectActionMessage.error ? ' error' : ''}`}>{projectActionMessage.text}</div>}
         {hasProjects ? (
           projects.map(project => renderProject(project))
         ) : null}
@@ -665,8 +736,10 @@ export function ExplorerPanel({
             { id: 'new-file', label: '新建文件' },
             { id: 'new-folder', label: '新建文件夹' },
             { id: 'divider-1', label: '', divider: true },
+            { id: 'rename', label: '重命名' },
+            { id: 'copy', label: '复制路径' },
             { id: 'open-in-explorer', label: '在资源管理器中打开' },
-            { id: 'close', label: '关闭项目' },
+            { id: 'delete', label: '删除', danger: true },
           ]}
           onItemClick={handleProjectContextAction}
           onClose={() => setProjectContextMenu(null)}
@@ -685,6 +758,43 @@ export function ExplorerPanel({
           onCancel={() => setConfirmDialog(null)}
         />
       )}
+      {renameProjectTarget && (
+        <ConfirmDialog
+          title="重命名项目"
+          message="项目目录会在原父目录中同步重命名。"
+          inputLabel="项目名称"
+          inputValue={renameProjectValue}
+          inputError={getProjectNameError(renameProjectValue)}
+          confirmLabel={projectActionPending ? '处理中' : '重命名'}
+          confirmDisabled={Boolean(getProjectNameError(renameProjectValue)) || projectActionPending}
+          onInputChange={setRenameProjectValue}
+          onConfirm={() => { void handleRenameProjectConfirm(); }}
+          onCancel={() => { if (!projectActionPending) setRenameProjectTarget(null); }}
+        />
+      )}
+      {deleteProjectTarget && (
+        <ConfirmDialog
+          title="删除项目"
+          message={`仅将「${deleteProjectTarget.name}」从项目管理中移除，不会删除磁盘上的项目目录和文件。`}
+          confirmLabel="删除"
+          confirmDisabled={projectActionPending}
+          danger
+          onConfirm={() => {
+            setProjectActionPending(true);
+            void handleRemoveProject(deleteProjectTarget.id)
+              .then(() => {
+                setDeleteProjectTarget(null);
+                setProjectActionMessage({ text: '项目已从列表删除' });
+              })
+              .catch(error => {
+                console.error('[ExplorerPanel] 删除项目管理项失败:', error);
+                setProjectActionMessage({ text: '删除项目失败', error: true });
+              })
+              .finally(() => setProjectActionPending(false));
+          }}
+          onCancel={() => { if (!projectActionPending) setDeleteProjectTarget(null); }}
+        />
+      )}
     </div>
   );
 }
diff --git a/soloncode-desktop/src/components/sidebar/SessionsPanel.tsx b/soloncode-desktop/src/components/sidebar/SessionsPanel.tsx
index 2a78814590910ce7efd0f8318354a7bfa2387e74..f2062921bef28082b1118ea22f9057bbd29bf105 100644
--- a/soloncode-desktop/src/components/sidebar/SessionsPanel.tsx
+++ b/soloncode-desktop/src/components/sidebar/SessionsPanel.tsx
@@ -3,7 +3,9 @@ import { revealItemInDir } from '@tauri-apps/plugin-opener';
 import { Icon } from '../common/Icon';
 import { ConfirmDialog } from '../common/ConfirmDialog';
 import { ContextMenu } from '../common/ContextMenu';
+import { DropdownMenu } from '../common/DropdownMenu';
 import { UNLINKED_PROJECT } from '../../db';
+import { copyTextToClipboard } from '../../utils/clipboard';
 import './SessionsPanel.css';
 
 export interface Session {
@@ -72,6 +74,8 @@ export function SessionsPanel({
   const [syncingIds, setSyncingIds] = useState<Set<string>>(new Set());
   const [confirmSync, setConfirmSync] = useState<{ sessionId: string; title: string } | null>(null);
   const [confirmSyncAll, setConfirmSyncAll] = useState(false);
+  const [deleteProjectTarget, setDeleteProjectTarget] = useState<Project | null>(null);
+  const [projectActionMessage, setProjectActionMessage] = useState<{ text: string; error?: boolean } | null>(null);
   const [projectContextMenu, setProjectContextMenu] = useState<{
     x: number;
     y: number;
@@ -149,7 +153,7 @@ export function SessionsPanel({
     setProjectContextMenu(null);
     const rect = event.currentTarget.getBoundingClientRect();
     const width = 150;
-    const height = 124;
+    const height = 156;
     const x = Math.min(rect.right + 4, window.innerWidth - width - 8);
     const y = Math.min(rect.top, window.innerHeight - height - 8);
     setProjectMenu({ x: Math.max(8, x), y: Math.max(8, y), projectId });
@@ -235,10 +239,28 @@ export function SessionsPanel({
       revealItemInDir(targetProjectId).catch(err => {
         console.error('[SessionsPanel] 打开资源管理器失败:', err);
       });
-    } else if (itemId === 'remove') {
-      onRemoveProject(targetProjectId);
+    } else if (itemId === 'copy') {
+      const copyPath = async () => {
+        await copyTextToClipboard(targetProjectId);
+        setProjectActionMessage({ text: '项目路径已复制' });
+      };
+      void copyPath().catch(error => {
+        console.error('[SessionsPanel] 复制项目路径失败:', error);
+        setProjectActionMessage({ text: '复制项目路径失败', error: true });
+      });
+    } else if (itemId === 'delete') {
+      const project = projects.find(item => item.id === targetProjectId);
+      if (project) setDeleteProjectTarget(project);
+    }
+  }, [beginProjectRename, onPinProject, projectContextMenu, projectMenu, projects]);
+
+  const handleNewProjectAction = useCallback((itemId: string) => {
+    if (itemId === 'new-empty-project') {
+      onCreateProject();
+    } else if (itemId === 'use-existing-project') {
+      onAddProject();
     }
-  }, [beginProjectRename, onPinProject, onRemoveProject, projectContextMenu, projectMenu]);
+  }, [onCreateProject, onAddProject]);
 
   function renderSessionList(sessionList: Session[]) {
     return sessionList.map(session => {
@@ -308,20 +330,42 @@ export function SessionsPanel({
           onCancel={() => setConfirmSyncAll(false)}
         />
       )}
+      {deleteProjectTarget && (
+        <ConfirmDialog
+          title="删除项目"
+          message={`仅将「${deleteProjectTarget.name}」从项目管理中移除，不会删除磁盘上的项目目录和文件。`}
+          confirmLabel="删除"
+          danger
+          onConfirm={() => {
+            onRemoveProject(deleteProjectTarget.id);
+            setDeleteProjectTarget(null);
+            setProjectActionMessage({ text: '项目已从列表删除' });
+          }}
+          onCancel={() => setDeleteProjectTarget(null)}
+        />
+      )}
 
       <div className="panel-header">
         <span className="panel-title">项目</span>
         <div className="panel-header-actions">
-          <button className="new-session-btn" onClick={onCreateProject} title="新建项目">
-            <Icon name="add" size={16} />
-          </button>
-          <button className="new-session-btn" onClick={onAddProject} title="打开项目">
-            <Icon name="folder" size={14} />
-          </button>
+          <DropdownMenu
+            align="right"
+            items={[
+              { id: 'new-empty-project', label: '新建空项目' },
+              { id: 'use-existing-project', label: '使用现有项目' },
+            ]}
+            onItemClick={handleNewProjectAction}
+            trigger={(
+              <button className="new-session-btn" title="新建项目" aria-label="新建项目">
+                <Icon name="add" size={16} />
+              </button>
+            )}
+          />
         </div>
       </div>
 
       <div className="sessions-list">
+        {projectActionMessage && <div className={`resource-action-message${projectActionMessage.error ? ' error' : ''}`}>{projectActionMessage.text}</div>}
         {projectEntries.length > 0 && projectEntries.map(entry => {
           const projectSessions = sessionsByProject.get(entry.id) || [];
           const isExpanded = expandedProjects.has(entry.id);
@@ -344,6 +388,7 @@ export function SessionsPanel({
                   <input
                     className="project-rename-input"
                     value={renameProjectValue}
+                    maxLength={64}
                     autoFocus
                     onChange={event => setRenameProjectValue(event.target.value)}
                     onClick={event => event.stopPropagation()}
@@ -434,8 +479,9 @@ export function SessionsPanel({
               disabled: projects[0]?.id === projectContextMenu.projectId,
             },
             { id: 'rename', label: '重命名' },
+            { id: 'copy', label: '复制路径' },
             { id: 'open-in-explorer', label: '在资源管理器中打开' },
-            { id: 'remove', label: '移除' },
+            { id: 'delete', label: '删除', danger: true },
           ]}
           onItemClick={handleProjectAction}
           onClose={() => setProjectContextMenu(null)}
@@ -472,6 +518,15 @@ export function SessionsPanel({
             <Icon name="edit" size={14} />
             <span>重命名</span>
           </button>
+          <button
+            type="button"
+            className="project-menu-item"
+            role="menuitem"
+            onClick={() => handleProjectAction('copy', menuProject.id)}
+          >
+            <Icon name="copy" size={14} />
+            <span>复制路径</span>
+          </button>
           <button
             type="button"
             className="project-menu-item"
@@ -485,10 +540,10 @@ export function SessionsPanel({
             type="button"
             className="project-menu-item danger"
             role="menuitem"
-            onClick={() => handleProjectAction('remove', menuProject.id)}
+            onClick={() => handleProjectAction('delete', menuProject.id)}
           >
             <Icon name="delete" size={14} />
-            <span>移除</span>
+            <span>删除</span>
           </button>
         </div>
       )}
diff --git a/soloncode-desktop/src/components/sidebar/SettingsPanel.tsx b/soloncode-desktop/src/components/sidebar/SettingsPanel.tsx
index 839e6b6b7b8ab44a690a9f7bc571236ceb8f66b9..b1372f784a97bf471d53e31c4825840518ffa66a 100644
--- a/soloncode-desktop/src/components/sidebar/SettingsPanel.tsx
+++ b/soloncode-desktop/src/components/sidebar/SettingsPanel.tsx
@@ -35,6 +35,7 @@ interface SettingsPanelProps {
   settings: Settings;
   onSettingsChange: (settings: Settings) => void;
   onClose: () => void;
+  onSkillInstalled?: (skillName: string) => void;
   backendPort?: number | null;
   workspacePath?: string | null;
   sessionId?: string;
@@ -55,7 +56,7 @@ const menuItems: { key: SettingsMenuKey; icon: IconName; label: string }[] = [
   ...(import.meta.env.DEV ? [{ key: 'logs' as SettingsMenuKey, icon: 'terminal' as IconName, label: '日志' }] : []),
 ];
 
-export function SettingsPanel({ visible, settings, onSettingsChange, onClose, backendPort, workspacePath, sessionId }: SettingsPanelProps) {
+export function SettingsPanel({ visible, settings, onSettingsChange, onClose, onSkillInstalled, backendPort, workspacePath, sessionId }: SettingsPanelProps) {
   const [activeMenu, setActiveMenu] = useState<SettingsMenuKey>('general');
   const [localSettings, setLocalSettings] = useState(settings);
 
@@ -238,7 +239,7 @@ export function SettingsPanel({ visible, settings, onSettingsChange, onClose, ba
               />
             )}
             {activeMenu === 'skills' && (
-              <SkillsSettings backendPort={backendPort} />
+              <SkillsSettings backendPort={backendPort} onSkillInstalled={onSkillInstalled} />
             )}
             {activeMenu === 'prompts' && (
               <PromptsSettings
@@ -1127,8 +1128,11 @@ function LspSettings({ servers, onAdd, onRemove, onUpdate }: {
 }
 
 /* ==================== Skills 设置（挂载池 + 市场） ==================== */
-function SkillsSettings({ backendPort }: { backendPort?: number | null }) {
-  const [mounts, setMounts] = useState<Array<{ alias: string; path: string; system: boolean }>>([]);
+function SkillsSettings({ backendPort, onSkillInstalled }: {
+  backendPort?: number | null;
+  onSkillInstalled?: (skillName: string) => void;
+}) {
+  const [mounts, setMounts] = useState<Array<{ alias: string; path: string; system: boolean; type?: string }>>([]);
   const [poolSkills, setPoolSkills] = useState<Record<string, Array<{ name: string; description: string }>>>({});
   const [loading, setLoading] = useState(false);
   const [showAddPool, setShowAddPool] = useState(false);
@@ -1174,10 +1178,11 @@ function SkillsSettings({ backendPort }: { backendPort?: number | null }) {
     setLoading(true);
     try {
       const list = await fetchJson("/web/settings/mounts") || [];
-      setMounts(list);
+      const skillMounts = list.filter((mount: { type?: string }) => !mount.type || mount.type === "SKILLS");
+      setMounts(skillMounts);
       const skillsMap: Record<string, Array<{ name: string; description: string }>> = {};
-      await Promise.all(list.map(async (m: any) => {
-        try { skillsMap[m.alias] = await fetchJson("/web/settings/mounts/skills", { alias: m.alias }) || []; }
+      await Promise.all(skillMounts.map(async (m: any) => {
+        try { skillsMap[m.alias] = await fetchJson("/web/settings/mounts/content", { alias: m.alias, type: "SKILLS" }) || []; }
         catch { skillsMap[m.alias] = []; }
       }));
       setPoolSkills(skillsMap);
@@ -1237,7 +1242,16 @@ function SkillsSettings({ backendPort }: { backendPort?: number | null }) {
   const handleInstall = async (slug: string, mountAlias: string) => {
     if (!backendPort) return;
     setInstallingSlug(slug);
-    try { await postJson("/web/settings/skills/install", { slug, marketName: selectedMarket, mountAlias }); await loadMounts(); }
+    try {
+      await postJson("/web/settings/skills/install", { slug, marketName: selectedMarket, mountAlias });
+      if (mountAlias) {
+        try { await postJson("/desktop/settings/mounts/refresh", { alias: mountAlias }); }
+        catch (err) { console.warn("refresh installed skill failed:", err); }
+      }
+      await loadMounts();
+      const installedItem = marketItems.find(item => item.slug === slug);
+      onSkillInstalled?.(installedItem?.displayName || installedItem?.name || slug);
+    }
     catch (err) { console.warn("install failed:", err); }
     finally { setInstallingSlug(null); }
   };
diff --git a/soloncode-desktop/src/components/sidebar/SkillsPanel.css b/soloncode-desktop/src/components/sidebar/SkillsPanel.css
index 50d396148c3fa38777dbbd3ffd6add8f0d08508d..fe668c81c0e72b2456a3b683c8f6317c0f2a37dd 100644
--- a/soloncode-desktop/src/components/sidebar/SkillsPanel.css
+++ b/soloncode-desktop/src/components/sidebar/SkillsPanel.css
@@ -11,6 +11,20 @@
   overflow-y: auto;
 }
 
+.resource-action-message {
+  margin: 6px 8px;
+  padding: 6px 8px;
+  border-radius: 4px;
+  background-color: rgba(76, 175, 80, 0.12);
+  color: #4caf50;
+  font-size: 11px;
+}
+
+.resource-action-message.error {
+  background-color: rgba(241, 76, 76, 0.12);
+  color: var(--cb-vscode-errorForeground, #f14c4c);
+}
+
 /* Tab Bar */
 .skills-tab-bar {
   display: flex;
diff --git a/soloncode-desktop/src/components/sidebar/SkillsPanel.tsx b/soloncode-desktop/src/components/sidebar/SkillsPanel.tsx
index 9e1fa41b8ed7489071ef01bbb3cfd3c481454ad8..7af6d0c0a659f4ab633a4752bc659c3546049f95 100644
--- a/soloncode-desktop/src/components/sidebar/SkillsPanel.tsx
+++ b/soloncode-desktop/src/components/sidebar/SkillsPanel.tsx
@@ -1,7 +1,10 @@
 import { useState, useEffect, useCallback } from "react";
 import { Icon } from "../common/Icon";
+import { ConfirmDialog } from "../common/ConfirmDialog";
+import { ContextMenu } from "../common/ContextMenu";
 import { skillService } from "../../services/skillService";
 import type { MountPool, PoolSkill } from "../../services/skillService";
+import { getManagedResourceNameError, managedResourceService } from "../../services/managedResourceService";
 import "../sidebar/ExplorerPanel.css";
 import "../sidebar/SessionsPanel.css";
 import "./SkillsPanel.css";
@@ -18,6 +21,11 @@ export function SkillsPanel({ backendPort, onFileSelect, onCreateWithAI, refresh
   const [poolSkills, setPoolSkills] = useState<Record<string, PoolSkill[]>>({});
   const [loading, setLoading] = useState(false);
   const [collapsedPools, setCollapsedPools] = useState<Set<string>>(new Set());
+  const [contextMenu, setContextMenu] = useState<{ x: number; y: number; mount: MountPool; skill: PoolSkill } | null>(null);
+  const [renameTarget, setRenameTarget] = useState<{ mount: MountPool; skill: PoolSkill; value: string } | null>(null);
+  const [deleteTarget, setDeleteTarget] = useState<{ mount: MountPool; skill: PoolSkill } | null>(null);
+  const [actionMessage, setActionMessage] = useState<{ text: string; error?: boolean } | null>(null);
+  const [actionPending, setActionPending] = useState(false);
 
   const loadMounts = useCallback(async () => {
     if (!backendPort) return;
@@ -26,6 +34,14 @@ export function SkillsPanel({ backendPort, onFileSelect, onCreateWithAI, refresh
       const list = await skillService.getMounts(backendPort);
       const skillMounts = list.filter(mount => mount.type === "SKILLS");
       setMounts(skillMounts);
+
+      // Tauri 在独立进程中写入 Skill，文件监听可能尚未完成刷新。
+      // 主动让 CLI 重新扫描挂载池，确保管理列表和运行时立即可用。
+      for (const mount of skillMounts) {
+        try { await skillService.refreshMount(backendPort, mount.alias); }
+        catch (err) { console.warn(`[SkillsPanel] refresh mount ${mount.alias} failed:`, err); }
+      }
+
       const skillsMap: Record<string, PoolSkill[]> = {};
       await Promise.all(skillMounts.map(async (m) => {
         try { skillsMap[m.alias] = await skillService.getPoolSkills(backendPort, m.alias); }
@@ -48,6 +64,63 @@ export function SkillsPanel({ backendPort, onFileSelect, onCreateWithAI, refresh
 
   const totalSkills = Object.values(poolSkills).reduce((sum, arr) => sum + arr.length, 0);
   const visibleMounts = mounts.filter(mount => (poolSkills[mount.alias]?.length || 0) > 0);
+  const renameError = renameTarget ? getManagedResourceNameError(renameTarget.value) : '';
+
+  const handleContextAction = useCallback((action: string) => {
+    const target = contextMenu;
+    setContextMenu(null);
+    if (!target || target.mount.system || !target.skill.path) return;
+    setActionMessage(null);
+    if (action === 'rename') {
+      setRenameTarget({ ...target, value: target.skill.name });
+    } else if (action === 'copy') {
+      setActionPending(true);
+      void managedResourceService.copy(target.skill.path, 'skill')
+        .then(result => {
+          setActionMessage({ text: `已复制为 ${result.name}` });
+          return loadMounts();
+        })
+        .catch(error => {
+          console.error('[SkillsPanel] 复制 Skill 失败:', error);
+          setActionMessage({ text: '复制 Skill 失败', error: true });
+        })
+        .finally(() => setActionPending(false));
+    } else if (action === 'delete') {
+      setDeleteTarget(target);
+    }
+  }, [contextMenu, loadMounts]);
+
+  const confirmRename = useCallback(async () => {
+    if (!renameTarget?.skill.path || getManagedResourceNameError(renameTarget.value) || actionPending) return;
+    setActionPending(true);
+    try {
+      const result = await managedResourceService.rename(renameTarget.skill.path, 'skill', renameTarget.value);
+      setRenameTarget(null);
+      setActionMessage({ text: `已重命名为 ${result.name}` });
+      await loadMounts();
+    } catch (error) {
+      console.error('[SkillsPanel] 重命名 Skill 失败:', error);
+      setActionMessage({ text: '重命名 Skill 失败', error: true });
+    } finally {
+      setActionPending(false);
+    }
+  }, [actionPending, loadMounts, renameTarget]);
+
+  const confirmDelete = useCallback(async () => {
+    if (!deleteTarget?.skill.path || actionPending) return;
+    setActionPending(true);
+    try {
+      await managedResourceService.delete(deleteTarget.skill.path, 'skill');
+      setDeleteTarget(null);
+      setActionMessage({ text: `已删除 ${deleteTarget.skill.name}` });
+      await loadMounts();
+    } catch (error) {
+      console.error('[SkillsPanel] 删除 Skill 失败:', error);
+      setActionMessage({ text: '删除 Skill 失败', error: true });
+    } finally {
+      setActionPending(false);
+    }
+  }, [actionPending, deleteTarget, loadMounts]);
 
   return (
     <div className="skills-panel">
@@ -61,6 +134,7 @@ export function SkillsPanel({ backendPort, onFileSelect, onCreateWithAI, refresh
       </div>
 
       <div className="panel-content skills-list">
+        {actionMessage && <div className={`resource-action-message${actionMessage.error ? ' error' : ''}`}>{actionMessage.text}</div>}
         {!backendPort && <div className="empty-state"><div className="empty-text">等待后端连接...</div></div>}
         {backendPort && loading && <div className="empty-state"><div className="empty-text">加载中...</div></div>}
         {backendPort && !loading && visibleMounts.length === 0 && <div className="empty-state"><div className="empty-text">暂无 Skills</div></div>}
@@ -77,7 +151,7 @@ export function SkillsPanel({ backendPort, onFileSelect, onCreateWithAI, refresh
               </div>
               {!collapsed && skills.map(skill => (
                 <div
-                  key={skill.name}
+                  key={skill.path || skill.name}
                   className="file-node file"
                   style={{ paddingLeft: "20px", cursor: skill.path ? "pointer" : "default" }}
                   onClick={() => {
@@ -86,6 +160,11 @@ export function SkillsPanel({ backendPort, onFileSelect, onCreateWithAI, refresh
                       onFileSelect(mdPath);
                     }
                   }}
+                  onContextMenu={event => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    setContextMenu({ x: event.clientX, y: event.clientY, mount, skill });
+                  }}
                 >
                   <span className="chevron-placeholder" />
                   <Icon name="skills" size={16} className="file-icon" />
@@ -96,6 +175,45 @@ export function SkillsPanel({ backendPort, onFileSelect, onCreateWithAI, refresh
           );
         })}
       </div>
+      {contextMenu && (
+        <ContextMenu
+          x={contextMenu.x}
+          y={contextMenu.y}
+          items={[
+            ...(contextMenu.mount.system ? [{ id: 'readonly', label: '系统 Skill（只读）', disabled: true }] : []),
+            { id: 'rename', label: '重命名', disabled: contextMenu.mount.system || !contextMenu.skill.path || actionPending },
+            { id: 'copy', label: '复制', disabled: contextMenu.mount.system || !contextMenu.skill.path || actionPending },
+            { id: 'delete', label: '删除', danger: true, disabled: contextMenu.mount.system || !contextMenu.skill.path || actionPending },
+          ]}
+          onItemClick={handleContextAction}
+          onClose={() => setContextMenu(null)}
+        />
+      )}
+      {renameTarget && (
+        <ConfirmDialog
+          title="重命名 Skill"
+          message="名称会同步写入 SKILL.md。"
+          inputLabel="Skill 名称"
+          inputValue={renameTarget.value}
+          inputError={renameError}
+          confirmLabel={actionPending ? '处理中' : '重命名'}
+          confirmDisabled={Boolean(renameError) || actionPending}
+          onInputChange={value => setRenameTarget(current => current ? { ...current, value } : null)}
+          onConfirm={() => { void confirmRename(); }}
+          onCancel={() => { if (!actionPending) setRenameTarget(null); }}
+        />
+      )}
+      {deleteTarget && (
+        <ConfirmDialog
+          title="删除 Skill"
+          message={`将删除「${deleteTarget.skill.name}」及其目录中的全部文件，此操作无法撤销。`}
+          confirmLabel={actionPending ? '处理中' : '删除'}
+          confirmDisabled={actionPending}
+          danger
+          onConfirm={() => { void confirmDelete(); }}
+          onCancel={() => { if (!actionPending) setDeleteTarget(null); }}
+        />
+      )}
     </div>
   );
 }
diff --git a/soloncode-desktop/src/db.ts b/soloncode-desktop/src/db.ts
index ae97923df3ab91730c75a058d265eb2b4e9e4b42..4513a9bfe0ee1a09836df7d4f1f267696eae8620 100644
--- a/soloncode-desktop/src/db.ts
+++ b/soloncode-desktop/src/db.ts
@@ -43,12 +43,34 @@ export interface DbAutomation {
   modelId: string;
   modelName: string;
   reasoningEffort: AutomationReasoningEffort;
+  scheduleEnabled: boolean;
+  cron: string;
+  lastScheduledAt?: string;
   createdAt: string;
   updatedAt: string;
   lastRunAt?: string;
   runCount: number;
 }
 
+export type AutomationRunStatus = 'running' | 'completed' | 'error';
+export type AutomationRunTrigger = 'manual' | 'scheduled';
+
+export interface DbAutomationRun {
+  id?: number;
+  automationId: number;
+  sessionId?: string;
+  status: AutomationRunStatus;
+  trigger?: AutomationRunTrigger;
+  projectId: string;
+  projectName: string;
+  modelId: string;
+  modelName: string;
+  reasoningEffort: AutomationReasoningEffort;
+  startedAt: string;
+  completedAt?: string;
+  error?: string;
+}
+
 /** 未关联项目的特殊标记 */
 export const UNLINKED_PROJECT = '__unlinked__';
 
@@ -127,6 +149,7 @@ class SolonCodeDatabase extends Dexie {
   agents!: Table<DbAgent>;
   projects!: Table<DbProject>;
   automations!: Table<DbAutomation>;
+  automationRuns!: Table<DbAutomationRun>;
 
   constructor() {
     super('SolonCodeDB');
@@ -158,6 +181,17 @@ class SolonCodeDatabase extends Dexie {
     this.version(8).stores({
       automations: '++id, projectId, createdAt, lastRunAt',
     });
+    // v9: 新增自动化运行记录表
+    this.version(9).stores({
+      automationRuns: '++id, automationId, sessionId, status, startedAt',
+    });
+    // v10: 自动化支持 Cron 定时开关
+    this.version(10).stores({
+      automations: '++id, projectId, scheduleEnabled, createdAt, lastRunAt',
+    }).upgrade(transaction => transaction.table<DbAutomation>('automations').toCollection().modify(automation => {
+      if (typeof automation.scheduleEnabled !== 'boolean') automation.scheduleEnabled = false;
+      if (!automation.cron) automation.cron = '0 9 * * *';
+    }));
   }
 }
 
@@ -180,6 +214,10 @@ export async function saveMessage(message: Omit<DbMessage, 'id'>): Promise<numbe
   return await db.messages.add(message);
 }
 
+export async function updateMessage(id: number, changes: Partial<Omit<DbMessage, 'id'>>): Promise<void> {
+  await db.messages.update(id, changes);
+}
+
 export async function reassignMessages(oldConvId: string | number, newConvId: string | number): Promise<void> {
   const numId = typeof oldConvId === 'string' ? parseInt(oldConvId, 10) : oldConvId;
   const ids = isNaN(numId) ? [oldConvId] : [oldConvId, numId];
@@ -377,8 +415,33 @@ export async function updateAutomation(id: number, updates: Partial<DbAutomation
   await db.automations.update(id, updates);
 }
 
+export async function getAutomation(id: number): Promise<DbAutomation | undefined> {
+  return await db.automations.get(id);
+}
+
 export async function deleteAutomation(id: number): Promise<void> {
-  await db.automations.delete(id);
+  await db.transaction('rw', [db.automations, db.automationRuns], async () => {
+    await db.automationRuns.where('automationId').equals(id).delete();
+    await db.automations.delete(id);
+  });
+}
+
+export async function getAutomationRuns(automationId: number): Promise<DbAutomationRun[]> {
+  if (!Number.isInteger(automationId) || automationId <= 0) return [];
+  const runs = await db.automationRuns
+    .where('automationId')
+    .equals(automationId)
+    .toArray();
+  return runs.sort((left, right) => right.startedAt.localeCompare(left.startedAt));
+}
+
+export async function addAutomationRun(run: Omit<DbAutomationRun, 'id'>): Promise<number> {
+  return await db.automationRuns.add(run);
+}
+
+export async function updateAutomationRun(id: number, updates: Partial<DbAutomationRun>): Promise<void> {
+  if (!Number.isInteger(id) || id <= 0) return;
+  await db.automationRuns.update(id, updates);
 }
 
 // ==================== 全局设置（键值对） ====================
diff --git a/soloncode-desktop/src/hooks/useSessions.ts b/soloncode-desktop/src/hooks/useSessions.ts
index 6ce026d55da7e091fb8c0a4e298afb1289ac3cbe..2a9417da02d04f4af63c3c77d35301475fe71de9 100644
--- a/soloncode-desktop/src/hooks/useSessions.ts
+++ b/soloncode-desktop/src/hooks/useSessions.ts
@@ -70,15 +70,16 @@ export function useSessions(
     }
 
     const tempId = `temp-${Date.now()}`;
-    const workspacePath = projectId === UNLINKED_PROJECT
-      ? UNLINKED_PROJECT
-      : (projectId || activeProjectPath || UNLINKED_PROJECT);
+    // 只有调用方显式传入项目时才关联；恢复的活跃项目不能作为隐式默认值。
+    const workspacePath = projectId && projectId !== UNLINKED_PROJECT
+      ? projectId
+      : UNLINKED_PROJECT;
     const title = _title || '新会话';
     const timestamp = new Date().toISOString();
     setPendingSession({ id: tempId, title, timestamp, messageCount: 0, workspacePath });
     setCurrentSessionId(tempId);
     return tempId;
-  }, [activeProjectPath, currentSessionId, sessions]);
+  }, [currentSessionId, sessions]);
 
   const handleDeleteSession = useCallback((id: string) => {
     const remaining = sessions.filter(s => s.id !== id);
@@ -111,7 +112,7 @@ export function useSessions(
     if (resolving) return resolving;
 
     const pending = pendingSession?.id === sessionId ? pendingSession : null;
-    const sessionWsPath = pending?.workspacePath || activeProjectPath || UNLINKED_PROJECT;
+    const sessionWsPath = pending?.workspacePath || UNLINKED_PROJECT;
     const resolvePromise = (async () => {
       try {
         const dbId = await saveConversation({
diff --git a/soloncode-desktop/src/services/managedResourceService.ts b/soloncode-desktop/src/services/managedResourceService.ts
new file mode 100644
index 0000000000000000000000000000000000000000..68945a6e64b1984054bfec054fdcc0e90fb4f5fe
--- /dev/null
+++ b/soloncode-desktop/src/services/managedResourceService.ts
@@ -0,0 +1,36 @@
+import { invoke } from '@tauri-apps/api/core';
+
+export type ManagedResourceKind = 'skill' | 'agent';
+
+export interface ManagedResourceResult {
+  name: string;
+  path: string;
+}
+
+export function getManagedResourceNameError(value: string): string {
+  const name = value.trim();
+  if (!name) return '名称不能为空';
+  if (Array.from(name).length > 64) return '名称不能超过 64 个字符';
+  if (!/^[\p{L}\p{N}_-]+$/u.test(name)) return '只能包含文字、数字、短横线和下划线';
+  const upper = name.toUpperCase();
+  if (/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/.test(upper)) return '该名称是系统保留名称';
+  return '';
+}
+
+export const managedResourceService = {
+  rename(path: string, kind: ManagedResourceKind, newName: string): Promise<ManagedResourceResult> {
+    return invoke<ManagedResourceResult>('rename_managed_resource', {
+      resourcePath: path,
+      kind,
+      newName: newName.trim(),
+    });
+  },
+
+  copy(path: string, kind: ManagedResourceKind): Promise<ManagedResourceResult> {
+    return invoke<ManagedResourceResult>('copy_managed_resource', { resourcePath: path, kind });
+  },
+
+  delete(path: string, kind: ManagedResourceKind): Promise<void> {
+    return invoke<void>('delete_managed_resource', { resourcePath: path, kind });
+  },
+};
diff --git a/soloncode-desktop/src/services/skillService.ts b/soloncode-desktop/src/services/skillService.ts
index 18c5b7104b10715544e947c8218358c51048f1af..ae7731b77d27569e47680bb390eba36d7acbf63f 100644
--- a/soloncode-desktop/src/services/skillService.ts
+++ b/soloncode-desktop/src/services/skillService.ts
@@ -81,6 +81,10 @@ export const skillService = {
     await post(port, '/web/settings/mounts/remove', { alias });
   },
 
+  async refreshMount(port: number, alias: string): Promise<void> {
+    await post(port, '/desktop/settings/mounts/refresh', { alias });
+  },
+
   async getPoolSkills(port: number, alias: string): Promise<PoolSkill[]> {
     const skills = await get<BackendPoolSkill[]>(port, '/web/settings/mounts/content', {
       alias,
diff --git a/soloncode-desktop/src/utils/automationPlan.ts b/soloncode-desktop/src/utils/automationPlan.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e9f856d0d69f460f2d84ed5bb022dc9224b0a3b4
--- /dev/null
+++ b/soloncode-desktop/src/utils/automationPlan.ts
@@ -0,0 +1,57 @@
+import { getCronValidationError } from './cron.ts';
+
+export interface GeneratedAutomationPlan {
+  title: string;
+  prompt: string;
+  scheduleEnabled: boolean;
+  cron: string;
+}
+
+function stripJsonFence(content: string): string {
+  const trimmed = content.trim();
+  const fenced = trimmed.match(/^```(?:json)?\s*\r?\n([\s\S]*?)\r?\n```$/i);
+  return (fenced?.[1] || trimmed).trim();
+}
+
+export function parseGeneratedAutomationPlan(content: string): GeneratedAutomationPlan {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(stripJsonFence(content));
+  } catch {
+    throw new Error('模型未返回有效的自动化 JSON');
+  }
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw new Error('模型返回的自动化配置格式无效');
+  }
+
+  const value = parsed as Record<string, unknown>;
+  const title = typeof value.title === 'string' ? value.title.trim() : '';
+  const prompt = typeof value.prompt === 'string' ? value.prompt.trim() : '';
+  const scheduleEnabled = value.scheduleEnabled;
+  const cron = typeof value.cron === 'string' ? value.cron.trim().replace(/\s+/g, ' ') : '';
+
+  if (!title || Array.from(title).length > 100) throw new Error('模型生成的任务名称无效');
+  if (!prompt || prompt.length > 10000) throw new Error('模型生成的执行提示词无效');
+  if (typeof scheduleEnabled !== 'boolean') throw new Error('模型未正确判断是否启用定时');
+  const cronError = getCronValidationError(cron);
+  if (cronError) throw new Error(`模型生成的 Cron 无效：${cronError}`);
+
+  return { title, prompt, scheduleEnabled, cron };
+}
+
+export function buildAutomationPlanningPrompt(userRequest: string): string {
+  return [
+    '你是自动化任务规划器。请理解用户真正要重复执行的工作，并把简略需求补充成可独立、稳定执行的提示词。',
+    '用户输入同时可能包含执行频率和工作内容。频率只写入 Cron，不要保留在执行提示词中。',
+    '执行提示词必须明确动作、目标和期望返回结果；不要只是机械截取或改写原句。',
+    '如果用户没有表达定时要求，将 scheduleEnabled 设为 false，cron 使用默认值 "0 9 * * *"。',
+    'Cron 必须是 5 段格式：分钟 小时 日 月 星期。',
+    '只输出一个 JSON 对象，不要输出 Markdown、解释或额外文字，结构必须严格如下：',
+    '{"title":"简洁的任务名称","prompt":"补充完整的实际执行提示词","scheduleEnabled":true,"cron":"* * * * *"}',
+    '示例：用户输入“每分钟说一次你好”时，应输出：',
+    '{"title":"每分钟说你好","prompt":"请说你好，返回你好","scheduleEnabled":true,"cron":"* * * * *"}',
+    '',
+    '用户需求：',
+    userRequest.trim(),
+  ].join('\n');
+}
diff --git a/soloncode-desktop/src/utils/clipboard.ts b/soloncode-desktop/src/utils/clipboard.ts
new file mode 100644
index 0000000000000000000000000000000000000000..5932e72f62730600db3b4825c2fdcfa6da8acc99
--- /dev/null
+++ b/soloncode-desktop/src/utils/clipboard.ts
@@ -0,0 +1,19 @@
+export async function copyTextToClipboard(value: string): Promise<void> {
+  try {
+    await navigator.clipboard.writeText(value);
+    return;
+  } catch {
+    // Tauri 自定义协议或浏览器权限受限时使用兼容方案。
+  }
+
+  const textarea = document.createElement('textarea');
+  textarea.value = value;
+  textarea.style.position = 'fixed';
+  textarea.style.opacity = '0';
+  textarea.setAttribute('readonly', '');
+  document.body.appendChild(textarea);
+  textarea.select();
+  const copied = document.execCommand('copy');
+  textarea.remove();
+  if (!copied) throw new Error('Clipboard unavailable');
+}
diff --git a/soloncode-desktop/src/utils/cron.ts b/soloncode-desktop/src/utils/cron.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ddc1b031ae1360f464a162b3a8cfd1576a992765
--- /dev/null
+++ b/soloncode-desktop/src/utils/cron.ts
@@ -0,0 +1,145 @@
+interface ParsedCronField {
+  values: Set<number>;
+  wildcard: boolean;
+}
+
+interface ParsedCronExpression {
+  minute: ParsedCronField;
+  hour: ParsedCronField;
+  dayOfMonth: ParsedCronField;
+  month: ParsedCronField;
+  dayOfWeek: ParsedCronField;
+}
+
+const MAX_CRON_LENGTH = 100;
+
+function parseInteger(value: string, min: number, max: number): number {
+  if (!/^\d+$/.test(value)) throw new Error('Cron 只能包含整数、范围、列表和步长');
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed) || parsed < min || parsed > max) {
+    throw new Error(`Cron 数值必须在 ${min}-${max} 之间`);
+  }
+  return parsed;
+}
+
+function parseField(source: string, min: number, max: number, normalize?: (value: number) => number): ParsedCronField {
+  const values = new Set<number>();
+  const tokens = source.split(',');
+  if (tokens.some(token => !token)) throw new Error('Cron 列表项不能为空');
+
+  for (const token of tokens) {
+    const stepParts = token.split('/');
+    if (stepParts.length > 2) throw new Error('Cron 步长格式不正确');
+    const base = stepParts[0];
+    const step = stepParts[1] === undefined ? 1 : parseInteger(stepParts[1], 1, max - min + 1);
+    let start: number;
+    let end: number;
+
+    if (base === '*') {
+      start = min;
+      end = max;
+    } else if (base.includes('-')) {
+      const range = base.split('-');
+      if (range.length !== 2) throw new Error('Cron 范围格式不正确');
+      start = parseInteger(range[0], min, max);
+      end = parseInteger(range[1], min, max);
+      if (start > end) throw new Error('Cron 范围起始值不能大于结束值');
+    } else {
+      start = parseInteger(base, min, max);
+      end = stepParts[1] === undefined ? start : max;
+    }
+
+    for (let value = start; value <= end; value += step) {
+      values.add(normalize ? normalize(value) : value);
+    }
+  }
+
+  const expectedSize = normalize ? max - min : max - min + 1;
+  return { values, wildcard: values.size === expectedSize };
+}
+
+export function parseCronExpression(expression: string): ParsedCronExpression {
+  const normalized = expression.trim().replace(/\s+/g, ' ');
+  if (!normalized) throw new Error('请输入 Cron 表达式');
+  if (normalized.length > MAX_CRON_LENGTH) throw new Error(`Cron 表达式不能超过 ${MAX_CRON_LENGTH} 个字符`);
+  const fields = normalized.split(' ');
+  if (fields.length !== 5) throw new Error('Cron 必须包含 5 段：分钟 小时 日 月 星期');
+
+  return {
+    minute: parseField(fields[0], 0, 59),
+    hour: parseField(fields[1], 0, 23),
+    dayOfMonth: parseField(fields[2], 1, 31),
+    month: parseField(fields[3], 1, 12),
+    dayOfWeek: parseField(fields[4], 0, 7, value => value === 7 ? 0 : value),
+  };
+}
+
+export function getCronValidationError(expression: string): string | null {
+  try {
+    parseCronExpression(expression);
+    return null;
+  } catch (error) {
+    return error instanceof Error ? error.message : 'Cron 表达式无效';
+  }
+}
+
+function parsedCronMatchesDate(parsed: ParsedCronExpression, date: Date): boolean {
+  if (!parsed.minute.values.has(date.getMinutes())) return false;
+  if (!parsed.hour.values.has(date.getHours())) return false;
+  if (!parsed.month.values.has(date.getMonth() + 1)) return false;
+
+  const dayOfMonthMatches = parsed.dayOfMonth.values.has(date.getDate());
+  const dayOfWeekMatches = parsed.dayOfWeek.values.has(date.getDay());
+  if (!parsed.dayOfMonth.wildcard && !parsed.dayOfWeek.wildcard) {
+    return dayOfMonthMatches || dayOfWeekMatches;
+  }
+  return dayOfMonthMatches && dayOfWeekMatches;
+}
+
+export function cronMatchesDate(expression: string, date: Date): boolean {
+  return parsedCronMatchesDate(parseCronExpression(expression), date);
+}
+
+export function getCronMinuteKey(date: Date): string {
+  return new Date(Math.floor(date.getTime() / 60_000) * 60_000).toISOString();
+}
+
+/**
+ * 返回检查间隔内最近一次应触发的时间。
+ *
+ * 渲染进程在窗口最小化、系统休眠时可能错过 setInterval 的精确分钟，
+ * 因此调度器恢复后需要补偿检查，而不是只匹配恢复时的当前分钟。
+ */
+export function getLatestCronRun(
+  expression: string,
+  afterExclusive: Date,
+  throughInclusive = new Date(),
+  maxLookbackMinutes = 7 * 24 * 60,
+): Date | null {
+  const afterTime = afterExclusive.getTime();
+  const throughTime = throughInclusive.getTime();
+  if (!Number.isFinite(afterTime) || !Number.isFinite(throughTime) || throughTime <= afterTime) return null;
+
+  const parsed = parseCronExpression(expression);
+  const latestMinute = Math.floor(throughTime / 60_000) * 60_000;
+  const firstMinuteAfter = Math.floor(afterTime / 60_000) * 60_000 + 60_000;
+  const lookback = Math.max(1, Math.floor(maxLookbackMinutes));
+  const earliestMinute = Math.max(firstMinuteAfter, latestMinute - (lookback - 1) * 60_000);
+
+  for (let time = latestMinute; time >= earliestMinute; time -= 60_000) {
+    const candidate = new Date(time);
+    if (parsedCronMatchesDate(parsed, candidate)) return candidate;
+  }
+  return null;
+}
+
+export function getNextCronRun(expression: string, after = new Date()): Date | null {
+  const parsed = parseCronExpression(expression);
+  const candidate = new Date(Math.floor(after.getTime() / 60_000) * 60_000 + 60_000);
+  const maxChecks = 366 * 24 * 60;
+  for (let index = 0; index < maxChecks; index++) {
+    if (parsedCronMatchesDate(parsed, candidate)) return candidate;
+    candidate.setMinutes(candidate.getMinutes() + 1);
+  }
+  return null;
+}
diff --git a/soloncode-desktop/src/utils/todoTools.ts b/soloncode-desktop/src/utils/todoTools.ts
new file mode 100644
index 0000000000000000000000000000000000000000..3e8bd69b752205c8758bb4481c7e7abb2c57220a
--- /dev/null
+++ b/soloncode-desktop/src/utils/todoTools.ts
@@ -0,0 +1,4 @@
+export function isTodoToolName(toolName?: string) {
+  const normalized = (toolName || '').toLowerCase().replace(/[_\s-]/g, '');
+  return normalized === 'todoread' || normalized === 'todowrite';
+}
diff --git a/soloncode-desktop/tests/automationPlan.test.ts b/soloncode-desktop/tests/automationPlan.test.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e084578f7b336c625a038f52e0a140d847d7f37c
--- /dev/null
+++ b/soloncode-desktop/tests/automationPlan.test.ts
@@ -0,0 +1,38 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import {
+  buildAutomationPlanningPrompt,
+  parseGeneratedAutomationPlan,
+} from '../src/utils/automationPlan.ts';
+
+test('planning prompt asks the model to understand and enrich the work', () => {
+  const prompt = buildAutomationPlanningPrompt('每分钟说一次你好');
+  assert.match(prompt, /理解用户真正要重复执行的工作/);
+  assert.match(prompt, /"prompt":"请说你好，返回你好"/);
+  assert.match(prompt, /用户需求：\n每分钟说一次你好/);
+});
+
+test('accepts a valid generated automation plan', () => {
+  assert.deepEqual(parseGeneratedAutomationPlan(JSON.stringify({
+    title: '每分钟说你好',
+    prompt: '请说你好，返回你好',
+    scheduleEnabled: true,
+    cron: '* * * * *',
+  })), {
+    title: '每分钟说你好',
+    prompt: '请说你好，返回你好',
+    scheduleEnabled: true,
+    cron: '* * * * *',
+  });
+});
+
+test('accepts JSON fenced by the model', () => {
+  const plan = parseGeneratedAutomationPlan('```json\n{"title":"日报","prompt":"请汇总今日工作并返回摘要","scheduleEnabled":true,"cron":"0 18 * * 1-5"}\n```');
+  assert.equal(plan.prompt, '请汇总今日工作并返回摘要');
+  assert.equal(plan.cron, '0 18 * * 1-5');
+});
+
+test('rejects malformed or unsafe generated plans', () => {
+  assert.throws(() => parseGeneratedAutomationPlan('不是 JSON'), /有效的自动化 JSON/);
+  assert.throws(() => parseGeneratedAutomationPlan('{"title":"任务","prompt":"执行","scheduleEnabled":true,"cron":"bad"}'), /Cron 无效/);
+});
diff --git a/soloncode-desktop/tests/cron.test.ts b/soloncode-desktop/tests/cron.test.ts
new file mode 100644
index 0000000000000000000000000000000000000000..82083bda7894b58732669acbce963b41aeeb2116
--- /dev/null
+++ b/soloncode-desktop/tests/cron.test.ts
@@ -0,0 +1,45 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import {
+  cronMatchesDate,
+  getCronMinuteKey,
+  getLatestCronRun,
+} from '../src/utils/cron.ts';
+
+test('cronMatchesDate matches a normal scheduled minute', () => {
+  assert.equal(cronMatchesDate('0 10 * * *', new Date(2026, 6, 16, 10, 0, 30)), true);
+  assert.equal(cronMatchesDate('0 10 * * *', new Date(2026, 6, 16, 10, 1, 0)), false);
+});
+
+test('getLatestCronRun recovers a minute missed by a delayed timer', () => {
+  const result = getLatestCronRun(
+    '0 10 * * *',
+    new Date(2026, 6, 16, 9, 59, 40),
+    new Date(2026, 6, 16, 10, 2, 10),
+  );
+
+  assert.ok(result);
+  assert.equal(result.getHours(), 10);
+  assert.equal(result.getMinutes(), 0);
+});
+
+test('getLatestCronRun collapses several missed recurring minutes to the latest run', () => {
+  const result = getLatestCronRun(
+    '* * * * *',
+    new Date(2026, 6, 16, 10, 0, 10),
+    new Date(2026, 6, 16, 10, 4, 45),
+  );
+
+  assert.ok(result);
+  assert.equal(getCronMinuteKey(result), getCronMinuteKey(new Date(2026, 6, 16, 10, 4, 0)));
+});
+
+test('getLatestCronRun does not repeat the minute containing the previous check', () => {
+  const result = getLatestCronRun(
+    '* * * * *',
+    new Date(2026, 6, 16, 10, 0, 10),
+    new Date(2026, 6, 16, 10, 0, 50),
+  );
+
+  assert.equal(result, null);
+});
diff --git a/soloncode-desktop/tests/retry.test.ts b/soloncode-desktop/tests/retry.test.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c6bf0ae6e84850842d2aa71e69b2af7867fbabd0
--- /dev/null
+++ b/soloncode-desktop/tests/retry.test.ts
@@ -0,0 +1,23 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { withRetry } from '../src/utils/retry.ts';
+
+test('retries a transient failure and returns the successful result', async () => {
+  let attempts = 0;
+  const result = await withRetry(async () => {
+    attempts++;
+    if (attempts < 3) throw new Error('temporary');
+    return 'ok';
+  }, [0, 0]);
+  assert.equal(result, 'ok');
+  assert.equal(attempts, 3);
+});
+
+test('stops retrying after the configured attempts', async () => {
+  let attempts = 0;
+  await assert.rejects(() => withRetry(async () => {
+    attempts++;
+    throw new Error('persistent');
+  }, [0, 0]), /persistent/);
+  assert.equal(attempts, 3);
+});
diff --git a/soloncode-desktop/tests/todoTools.test.ts b/soloncode-desktop/tests/todoTools.test.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d6de53f6fdb0ead53ab40f1ddb4e26a0bcd49cdf
--- /dev/null
+++ b/soloncode-desktop/tests/todoTools.test.ts
@@ -0,0 +1,15 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { isTodoToolName } from '../src/utils/todoTools.ts';
+
+test('recognizes TodoRead and TodoWrite tool-name variants', () => {
+  for (const name of ['TodoRead', 'todo_read', 'todo-read', 'TODO WRITE', 'todowrite']) {
+    assert.equal(isTodoToolName(name), true, name);
+  }
+});
+
+test('does not hide unrelated tools', () => {
+  for (const name of [undefined, '', 'Read', 'Write', 'TodoList']) {
+    assert.equal(isTodoToolName(name), false, String(name));
+  }
+});