zencode-cli 0.1.0 → 0.2.2

package/dist/bin/zencode.js

@@ -9,129 +9,16 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/config/defaults.ts
-var DEFAULT_CONFIG;
-var init_defaults = __esm({
-  "src/config/defaults.ts"() {
-    "use strict";
-    DEFAULT_CONFIG = {
-      model: "deepseek-chat",
-      api_key: "",
-      base_url: "https://api.deepseek.com/v1",
-      temperature: 0.7,
-      max_tokens: 8192,
-      agent_mode: "dual",
-      collaboration: "delegated",
-      dual_agent: {},
-      features: {
-        git: "auto",
-        mcp: "off",
-        planning_layer: "on",
-        parallel_agents: "on",
-        todo: "on"
-      },
-      permissions: {
-        auto_approve: ["read-file", "glob", "grep", "spawn-agents", "todo", "memo"],
-        require_approval: ["write-file", "edit-file", "bash", "git"]
-      },
-      mcp_servers: [],
-      prompts: [],
-      max_tool_output: 3e4
-    };
-  }
-});
-
-// src/config/loader.ts
-import * as fs from "fs";
-import * as path from "path";
-import * as os from "os";
-import { parse as parseYaml } from "yaml";
-function deepMerge(target, source) {
-  const result = { ...target };
-  for (const key of Object.keys(source)) {
-    const sourceVal = source[key];
-    const targetVal = target[key];
-    if (sourceVal !== void 0 && sourceVal !== null && typeof sourceVal === "object" && !Array.isArray(sourceVal) && typeof targetVal === "object" && !Array.isArray(targetVal) && targetVal !== null) {
-      result[key] = deepMerge(targetVal, sourceVal);
-    } else if (sourceVal !== void 0) {
-      result[key] = sourceVal;
-    }
-  }
-  return result;
-}
-function loadYamlFile(filePath) {
-  try {
-    const content = fs.readFileSync(filePath, "utf-8");
-    return parseYaml(content) || {};
-  } catch {
-    return {};
-  }
-}
-function loadEnvConfig() {
-  const config = {};
-  if (process.env["ZENCODE_API_KEY"]) {
-    config.api_key = process.env["ZENCODE_API_KEY"];
-  }
-  if (process.env["ZENCODE_MODEL"]) {
-    config.model = process.env["ZENCODE_MODEL"];
-  }
-  if (process.env["ZENCODE_BASE_URL"]) {
-    config.base_url = process.env["ZENCODE_BASE_URL"];
-  }
-  if (process.env["ZENCODE_MODE"]) {
-    const mode = process.env["ZENCODE_MODE"];
-    if (mode === "dual" || mode === "single") {
-      config.agent_mode = mode;
-    }
-  }
-  return config;
-}
-function loadCliConfig(opts) {
-  const config = {};
-  if (opts.model) config.model = opts.model;
-  if (opts.apiKey) config.api_key = opts.apiKey;
-  if (opts.baseUrl) config.base_url = opts.baseUrl;
-  if (opts.single) config.agent_mode = "single";
-  if (opts.dual) config.agent_mode = "dual";
-  if (opts.mode) {
-    const m = opts.mode;
-    if (m === "delegated" || m === "autonomous" || m === "controlled") {
-      config.collaboration = m;
-    }
-  }
-  return config;
-}
-function loadConfig(cliOpts = {}) {
-  const globalConfigPath = path.join(os.homedir(), ".zencode", "config.yaml");
-  const projectDirConfigPath = path.resolve(".zencode", "config.yaml");
-  const projectFileConfigPath = path.resolve(".zencode.yaml");
-  let config = { ...DEFAULT_CONFIG };
-  config = deepMerge(config, loadYamlFile(globalConfigPath));
-  config = deepMerge(config, loadYamlFile(projectDirConfigPath));
-  config = deepMerge(config, loadYamlFile(projectFileConfigPath));
-  config = deepMerge(config, loadEnvConfig());
-  config = deepMerge(config, loadCliConfig(cliOpts));
-  return config;
-}
-function resolveModelConfig(config, role) {
-  const roleConfig = config.dual_agent[role] || {};
-  return {
-    model: roleConfig.model || config.model,
-    api_key: roleConfig.api_key || config.api_key,
-    base_url: roleConfig.base_url || config.base_url,
-    temperature: roleConfig.temperature ?? config.temperature,
-    max_tokens: roleConfig.max_tokens ?? config.max_tokens
-  };
-}
-var init_loader = __esm({
-  "src/config/loader.ts"() {
-    "use strict";
-    init_defaults();
-  }
-});
-
 // src/llm/client.ts
 import OpenAI from "openai";
+function isAbortError(error) {
+  if (!error) return false;
+  const err = error;
+  const name = err.name || err.cause?.name || "";
+  const code = err.code || err.cause?.code || "";
+  const message = err.message || "";
+  return name === "AbortError" || name === "APIUserAbortError" || code === "ABORT_ERR" || /abort|aborted|cancel|cancelled|canceled|interrupted/i.test(message);
+}
 function createLLMClient(options) {
   return new LLMClient(options);
 }
@@ -144,6 +31,7 @@ var init_client = __esm({
       model;
       temperature;
       maxTokens;
+      activeAbortController = null;
       constructor(options) {
         this.client = new OpenAI({
           apiKey: options.apiKey,
@@ -168,15 +56,34 @@ var init_client = __esm({
           params.tools = tools;
           params.tool_choice = "auto";
         }
+        const abortController = new AbortController();
+        this.activeAbortController = abortController;
         try {
-          const stream = await this.client.chat.completions.create(params);
+          const stream = await this.client.chat.completions.create(params, {
+            signal: abortController.signal
+          });
           let contentParts = [];
+          let reasoningParts = [];
+          let reasoningStarted = false;
+          let reasoningEnded = false;
           const toolCallMap = /* @__PURE__ */ new Map();
           for await (const chunk of stream) {
             const choice = chunk.choices[0];
             if (!choice) continue;
             const delta = choice.delta;
+            if (delta.reasoning_content) {
+              reasoningParts.push(delta.reasoning_content);
+              if (!reasoningStarted) {
+                reasoningStarted = true;
+                callbacks.onContent?.("<think>");
+              }
+              callbacks.onContent?.(delta.reasoning_content);
+            }
             if (delta.content) {
+              if (reasoningStarted && !reasoningEnded) {
+                reasoningEnded = true;
+                callbacks.onContent?.("</think>");
+              }
               contentParts.push(delta.content);
               callbacks.onContent?.(delta.content);
             }
@@ -204,6 +111,10 @@ var init_client = __esm({
               }
             }
           }
+          if (reasoningStarted && !reasoningEnded) {
+            reasoningEnded = true;
+            callbacks.onContent?.("</think>");
+          }
           const toolCalls = [];
           for (const [, tc] of [...toolCallMap.entries()].sort(([a], [b]) => a - b)) {
             const toolCall = {
@@ -218,10 +129,14 @@ var init_client = __esm({
             callbacks.onToolCall?.(toolCall);
           }
           const fullContent = contentParts.join("");
+          const fullReasoning = reasoningParts.join("");
           const assistantMessage = {
             role: "assistant",
             content: fullContent || null
           };
+          if (fullReasoning) {
+            assistantMessage.reasoning_content = fullReasoning;
+          }
           if (toolCalls.length > 0) {
             assistantMessage.tool_calls = toolCalls;
           }
@@ -229,8 +144,14 @@ var init_client = __esm({
           return assistantMessage;
         } catch (error) {
           const err = error instanceof Error ? error : new Error(String(error));
-          callbacks.onError?.(err);
+          if (!isAbortError(err)) {
+            callbacks.onError?.(err);
+          }
           throw err;
+        } finally {
+          if (this.activeAbortController === abortController) {
+            this.activeAbortController = null;
+          }
         }
       }
       /**
@@ -258,6 +179,10 @@ var init_client = __esm({
           role: "assistant",
           content: msg.content
         };
+        const reasoning = msg.reasoning_content;
+        if (reasoning && typeof reasoning === "string") {
+          result.reasoning_content = reasoning;
+        }
         if (msg.tool_calls && msg.tool_calls.length > 0) {
           result.tool_calls = msg.tool_calls.map((tc) => ({
             id: tc.id,
@@ -273,6 +198,12 @@ var init_client = __esm({
       get modelName() {
         return this.model;
       }
+      abortActiveStream() {
+        if (this.activeAbortController) {
+          this.activeAbortController.abort();
+          this.activeAbortController = null;
+        }
+      }
     };
   }
 });
@@ -446,6 +377,10 @@ var init_write_file = __esm({
           content: {
             type: "string",
             description: "\u8981\u5199\u5165\u7684\u6587\u4EF6\u5185\u5BB9"
+          },
+          overwrite: {
+            type: "boolean",
+            description: "\u6587\u4EF6\u5DF2\u5B58\u5728\u65F6\u662F\u5426\u786E\u8BA4\u8986\u76D6\uFF0C\u9ED8\u8BA4 false"
           }
         },
         required: ["path", "content"]
@@ -538,14 +473,24 @@ var init_edit_file = __esm({
 
 // src/tools/bash.ts
 import { exec } from "child_process";
-var DEFAULT_TIMEOUT, bashTool;
+function decodeBuffer(buf) {
+  if (!IS_WIN) return buf.toString("utf-8");
+  try {
+    const decoder = new TextDecoder("gbk");
+    return decoder.decode(buf);
+  } catch {
+    return buf.toString("utf-8");
+  }
+}
+var DEFAULT_TIMEOUT, IS_WIN, bashTool;
 var init_bash = __esm({
   "src/tools/bash.ts"() {
     "use strict";
     DEFAULT_TIMEOUT = 12e4;
+    IS_WIN = process.platform === "win32";
     bashTool = {
       name: "bash",
-      description: "\u6267\u884C shell \u547D\u4EE4\u3002\u7528\u4E8E\u8FD0\u884C\u6784\u5EFA\u3001\u6D4B\u8BD5\u3001git \u64CD\u4F5C\u7B49\u7CFB\u7EDF\u547D\u4EE4\u3002\u4E0D\u8981\u7528 bash \u505A\u6587\u4EF6\u8BFB\u5199\uFF08\u7528 read-file/edit-file/write-file\uFF09\u6216\u641C\u7D22\uFF08\u7528 glob/grep\uFF09\u3002",
+      description: IS_WIN ? "\u6267\u884C\u7CFB\u7EDF\u547D\u4EE4\uFF08shell: cmd.exe\uFF09\u3002\u7528\u4E8E\u8FD0\u884C\u6784\u5EFA\u3001\u6D4B\u8BD5\u3001git \u7B49\u3002Windows \u73AF\u5883\u8BF7\u4F7F\u7528 Windows \u547D\u4EE4\uFF08dir\u3001type\u3001copy\uFF09\u6216 Python \u8DE8\u5E73\u53F0\u547D\u4EE4\uFF0C\u4E0D\u8981\u4F7F\u7528 Unix \u547D\u4EE4\uFF08ls\u3001cat\u3001cp\uFF09\u3002\u4E0D\u8981\u7528 bash \u505A\u6587\u4EF6\u8BFB\u5199\uFF08\u7528 read-file/edit-file/write-file\uFF09\u6216\u641C\u7D22\uFF08\u7528 glob/grep\uFF09\u3002" : "\u6267\u884C shell \u547D\u4EE4\uFF08shell: /bin/bash\uFF09\u3002\u7528\u4E8E\u8FD0\u884C\u6784\u5EFA\u3001\u6D4B\u8BD5\u3001git \u64CD\u4F5C\u7B49\u7CFB\u7EDF\u547D\u4EE4\u3002\u4E0D\u8981\u7528 bash \u505A\u6587\u4EF6\u8BFB\u5199\uFF08\u7528 read-file/edit-file/write-file\uFF09\u6216\u641C\u7D22\uFF08\u7528 glob/grep\uFF09\u3002",
       parameters: {
         type: "object",
         properties: {
@@ -564,7 +509,7 @@ var init_bash = __esm({
       async execute(params) {
         const command = params["command"];
         const timeout = params["timeout"] || DEFAULT_TIMEOUT;
-        return new Promise((resolve7) => {
+        return new Promise((resolve10) => {
           exec(
             command,
             {
@@ -572,9 +517,12 @@ var init_bash = __esm({
               timeout,
               maxBuffer: 1024 * 1024 * 10,
               // 10MB
-              shell: process.platform === "win32" ? "cmd.exe" : "/bin/bash"
+              shell: process.platform === "win32" ? "cmd.exe" : "/bin/bash",
+              encoding: "buffer"
             },
-            (error, stdout, stderr) => {
+            (error, stdoutBuf, stderrBuf) => {
+              const stdout = stdoutBuf ? decodeBuffer(stdoutBuf) : "";
+              const stderr = stderrBuf ? decodeBuffer(stderrBuf) : "";
               let output = "";
               if (stdout) output += stdout;
               if (stderr) output += (output ? "\n" : "") + `[stderr]
@@ -585,7 +533,7 @@ ${stderr}`;
               } else if (error && !stdout && !stderr) {
                 output = `\u547D\u4EE4\u6267\u884C\u5931\u8D25\uFF1A${error.message}`;
               }
-              resolve7({ content: output || "\uFF08\u65E0\u8F93\u51FA\uFF09" });
+              resolve10({ content: output || "\uFF08\u65E0\u8F93\u51FA\uFF09" });
             }
           );
         });
@@ -896,6 +844,18 @@ var init_conversation = __esm({
           content
         });
       }
+      /**
+       * 清除历史消息中的 reasoning_content（新一轮对话开始时调用）
+       * deepseek-reasoner 要求同一轮 tool call 循环内保留 reasoning_content，
+       * 但新一轮用户问题开始时应清除以节省带宽，API 也会忽略旧的 reasoning_content
+       */
+      clearReasoningContent() {
+        for (const msg of this.messages) {
+          if (msg.reasoning_content !== void 0) {
+            msg.reasoning_content = void 0;
+          }
+        }
+      }
       /**
        * 获取完整的消息列表（包含系统提示词）
        */
@@ -929,6 +889,47 @@ var init_conversation = __esm({
   }
 });
 
+// src/core/read-tracker.ts
+import * as fs6 from "fs";
+import * as path6 from "path";
+var ReadTracker;
+var init_read_tracker = __esm({
+  "src/core/read-tracker.ts"() {
+    "use strict";
+    ReadTracker = class {
+      files = /* @__PURE__ */ new Set();
+      /** 标记文件已被读取 */
+      markRead(filePath) {
+        this.files.add(this.normalize(filePath));
+      }
+      /** 标记文件已被写入（新建/重写，agent 已知内容） */
+      markWritten(filePath) {
+        this.files.add(this.normalize(filePath));
+      }
+      /** 检查文件是否已读取 */
+      hasRead(filePath) {
+        return this.files.has(this.normalize(filePath));
+      }
+      /**
+       * 检查 write-file 是否会覆盖已有文件
+       * @returns 警告消息（需要拦截），或 null（可以继续执行）
+       */
+      checkWriteOverwrite(filePath, overwrite) {
+        const resolved = path6.resolve(filePath);
+        if (!overwrite && fs6.existsSync(resolved)) {
+          return `\u26A0 \u6587\u4EF6\u5DF2\u5B58\u5728\uFF1A${filePath}
+\u4FEE\u6539\u5DF2\u6709\u6587\u4EF6\u8BF7\u7528 read-file + edit-file\uFF08\u66F4\u7CBE\u786E\u5B89\u5168\uFF09\u3002
+\u5982\u786E\u9700\u5B8C\u6574\u91CD\u5199\uFF0C\u8BF7\u91CD\u65B0\u8C03\u7528 write-file \u5E76\u8BBE\u7F6E overwrite: true\u3002`;
+        }
+        return null;
+      }
+      normalize(filePath) {
+        return filePath.replace(/\\/g, "/").replace(/^\.\//, "");
+      }
+    };
+  }
+});
+
 // src/core/agent.ts
 var Agent;
 var init_agent = __esm({
@@ -936,12 +937,15 @@ var init_agent = __esm({
     "use strict";
     init_permission();
     init_conversation();
+    init_read_tracker();
     Agent = class {
       conversation;
       client;
       registry;
       config;
       fixedTools;
+      readTracker = new ReadTracker();
+      interrupted = false;
       constructor(client, registry, config, systemPrompt, tools) {
         this.client = client;
         this.registry = registry;
@@ -954,9 +958,12 @@ var init_agent = __esm({
        * 执行一轮完整的 agent 循环
        */
       async run(userMessage, callbacks = {}) {
+        this.interrupted = false;
+        this.conversation.clearReasoningContent();
         this.conversation.addUserMessage(userMessage);
         let lastContent = "";
         while (true) {
+          if (this.interrupted) break;
           const tools = this.fixedTools || this.registry.toToolDefinitions();
           const assistantMsg = await this.client.chatStream(
             this.conversation.getMessages(),
@@ -969,6 +976,7 @@ var init_agent = __esm({
             break;
           }
           for (const toolCall of assistantMsg.tool_calls) {
+            if (this.interrupted) break;
             const toolName = toolCall.function.name;
             let params;
             try {
@@ -978,6 +986,26 @@ var init_agent = __esm({
               continue;
             }
             try {
+              if (toolName === "edit-file") {
+                const editPath = params["path"];
+                if (!this.readTracker.hasRead(editPath)) {
+                  this.conversation.addToolResult(
+                    toolCall.id,
+                    `\u26A0 \u7981\u6B62\u7F16\u8F91\u672A\u8BFB\u53D6\u7684\u6587\u4EF6\u3002\u8BF7\u5148 read-file "${editPath}" \u4E86\u89E3\u5F53\u524D\u5185\u5BB9\uFF0C\u518D edit-file\u3002`
+                  );
+                  continue;
+                }
+              }
+              if (toolName === "write-file") {
+                const warn = this.readTracker.checkWriteOverwrite(
+                  params["path"],
+                  params["overwrite"]
+                );
+                if (warn) {
+                  this.conversation.addToolResult(toolCall.id, warn);
+                  continue;
+                }
+              }
               const permLevel = this.registry.getPermissionLevel(toolName);
               if (permLevel === "deny") {
                 callbacks.onDenied?.(toolName);
@@ -998,6 +1026,11 @@ var init_agent = __esm({
               }
               const result = await this.registry.execute(toolName, params, this.config.max_tool_output);
               callbacks.onToolResult?.(toolName, result.content, result.truncated ?? false);
+              if (toolName === "read-file") {
+                this.readTracker.markRead(params["path"]);
+              } else if (toolName === "write-file") {
+                this.readTracker.markWritten(params["path"]);
+              }
               this.conversation.addToolResult(toolCall.id, result.content);
             } catch (err) {
               const msg = err instanceof Error ? err.message : String(err);
@@ -1010,6 +1043,10 @@ var init_agent = __esm({
         }
         return lastContent;
       }
+      interrupt() {
+        this.interrupted = true;
+        this.client.abortActiveStream();
+      }
       /**
        * 获取对话历史
        */
@@ -1020,448 +1057,76 @@ var init_agent = __esm({
   }
 });
 
-// src/core/dual-agent/coder.ts
-var Coder;
-var init_coder = __esm({
-  "src/core/dual-agent/coder.ts"() {
+// src/core/prompt/layers/core.ts
+import * as os2 from "os";
+function buildCorePrompt() {
+  const shellInfo = IS_WIN2 ? 'cmd.exe\uFF08Windows\uFF09\u3002\u8BF7\u4F7F\u7528 Windows \u547D\u4EE4\uFF08dir\u3001type\u3001copy \u7B49\uFF09\u6216 Python \u8DE8\u5E73\u53F0\u547D\u4EE4\uFF08python -c "..."\uFF09\uFF0C\u4E0D\u8981\u4F7F\u7528 Unix \u547D\u4EE4\uFF08ls\u3001cat\u3001cp \u7B49\uFF09' : "/bin/bash";
+  return `\u4F60\u662F ZenCode\uFF0C\u4E00\u4E2A CLI \u73AF\u5883\u4E0B\u7684 AI \u7F16\u7A0B\u52A9\u624B\u3002\u4F60\u5E2E\u52A9\u7528\u6237\u5B8C\u6210\u8F6F\u4EF6\u5DE5\u7A0B\u4EFB\u52A1\uFF1A\u4FEEbug\u3001\u52A0\u529F\u80FD\u3001\u91CD\u6784\u4EE3\u7801\u3001\u89E3\u91CA\u4EE3\u7801\u7B49\u3002
+
+\u5DE5\u4F5C\u76EE\u5F55\uFF1A${process.cwd()}
+\u7CFB\u7EDF\uFF1A${os2.platform()} ${os2.arch()}
+
+# \u5DE5\u5177\u4F7F\u7528\u539F\u5219
+
+\u4F60\u6709\u4EE5\u4E0B\u5DE5\u5177\u53EF\u7528\uFF0C\u8BF7\u6839\u636E\u4EFB\u52A1\u9009\u62E9\u6700\u5408\u9002\u7684\u5DE5\u5177\uFF1A
+
+- **read-file**\uFF1A\u8BFB\u53D6\u6587\u4EF6\u5185\u5BB9\u3002\u4FEE\u6539\u4EE3\u7801\u524D\u5FC5\u987B\u5148\u8BFB\u53D6\u76EE\u6807\u6587\u4EF6\u3002\u652F\u6301 offset/limit \u8BFB\u53D6\u5927\u6587\u4EF6\u7684\u7279\u5B9A\u90E8\u5206\u3002
+- **edit-file**\uFF1A\u901A\u8FC7\u5B57\u7B26\u4E32\u66FF\u6362\u7F16\u8F91\u6587\u4EF6\u3002\u4F18\u5148\u4F7F\u7528 edit-file \u800C\u975E write-file \u4FEE\u6539\u5DF2\u6709\u6587\u4EF6\u2014\u2014\u5B83\u66F4\u7CBE\u786E\u3001\u66F4\u5B89\u5168\u3002
+  - \u26A0\uFE0F \u7CFB\u7EDF\u5F3A\u5236\uFF1A\u672A\u7528 read-file \u8BFB\u53D6\u8FC7\u7684\u6587\u4EF6\u65E0\u6CD5 edit-file\uFF0C\u4F1A\u88AB\u62E6\u622A
+  - old_string \u5FC5\u987B\u4E0E\u6587\u4EF6\u4E2D\u7684\u5185\u5BB9**\u5B8C\u5168\u4E00\u81F4**\uFF08\u5305\u62EC\u7F29\u8FDB\u3001\u7A7A\u683C\u3001\u6362\u884C\u7B26\uFF09
+  - old_string \u4E0D\u552F\u4E00\u65F6\uFF0C\u5305\u542B\u66F4\u591A\u4E0A\u4E0B\u6587\u884C\uFF08\u5EFA\u8BAE 3-5 \u884C\uFF09\u4F7F\u5176\u552F\u4E00
+  - \u4E0D\u8981\u51ED\u8BB0\u5FC6\u731C\u6D4B\u6587\u4EF6\u5185\u5BB9\uFF0C\u5FC5\u987B\u57FA\u4E8E read-file \u7684\u5B9E\u9645\u8FD4\u56DE\u503C
+- **write-file**\uFF1A\u521B\u5EFA\u65B0\u6587\u4EF6\u6216\u5B8C\u6574\u91CD\u5199\u6587\u4EF6\u3002\u4EC5\u5728\u521B\u5EFA\u65B0\u6587\u4EF6\u6216\u9700\u8981\u5927\u5E45\u91CD\u5199\u65F6\u4F7F\u7528\u3002
+- **glob**\uFF1A\u6309\u6A21\u5F0F\u641C\u7D22\u6587\u4EF6\u8DEF\u5F84\u3002\u7528\u4E8E\u67E5\u627E\u6587\u4EF6\u4F4D\u7F6E\uFF08\u5982 \`**/*.ts\`\u3001\`src/**/config.*\`\uFF09\u3002
+- **grep**\uFF1A\u5728\u6587\u4EF6\u5185\u5BB9\u4E2D\u641C\u7D22\u6B63\u5219\u8868\u8FBE\u5F0F\u3002\u7528\u4E8E\u67E5\u627E\u51FD\u6570\u5B9A\u4E49\u3001\u5F15\u7528\u3001\u7279\u5B9A\u4EE3\u7801\u6A21\u5F0F\u3002
+- **bash**\uFF1A\u6267\u884C\u7CFB\u7EDF\u547D\u4EE4\uFF0C\u5F53\u524D shell\uFF1A${shellInfo}\u3002\u7528\u4E8E\u8FD0\u884C\u6784\u5EFA\u3001\u6D4B\u8BD5\u3001git \u64CD\u4F5C\u7B49\u3002\u4E0D\u8981\u7528 bash \u505A\u80FD\u7528\u4E0A\u8FF0\u5DE5\u5177\u5B8C\u6210\u7684\u4E8B\uFF08\u6587\u4EF6\u8BFB\u5199\u7528 read-file/edit-file/write-file\uFF0C\u641C\u7D22\u7528 glob/grep\uFF09\u3002
+
+\u5173\u952E\u89C4\u5219\uFF1A
+- **\u5148\u8BFB\u540E\u6539**\uFF1A\u4FEE\u6539\u6587\u4EF6\u524D\u5FC5\u987B read-file \u8BFB\u53D6\u8BE5\u6587\u4EF6\uFF08\u7CFB\u7EDF\u4F1A\u62E6\u622A\u672A\u8BFB\u53D6\u5C31 edit \u7684\u64CD\u4F5C\uFF09
+- edit-file \u7684 old_string \u5FC5\u987B\u4ECE read-file \u8FD4\u56DE\u7684\u5185\u5BB9\u4E2D\u7CBE\u786E\u590D\u5236\uFF0C\u4E0D\u8981\u624B\u52A8\u8F93\u5165\u6216\u51ED\u8BB0\u5FC6
+- \u4F18\u5148 edit-file \u7F16\u8F91\u5DF2\u6709\u6587\u4EF6\uFF0C\u800C\u975E write-file \u91CD\u5199
+- \u4E0D\u8981\u521B\u5EFA\u4E0D\u5FC5\u8981\u7684\u65B0\u6587\u4EF6\uFF0C\u4F18\u5148\u5728\u73B0\u6709\u6587\u4EF6\u4E2D\u4FEE\u6539
+- \u53EA\u505A\u5FC5\u8981\u7684\u6700\u5C0F\u6539\u52A8\uFF0C\u4E0D\u505A\u989D\u5916"\u6539\u8FDB"
+- \u4E0D\u8981\u6DFB\u52A0\u7528\u6237\u672A\u8981\u6C42\u7684\u6CE8\u91CA\u3001\u6587\u6863\u3001\u7C7B\u578B\u6CE8\u89E3
+- \u4E0D\u8981\u5F15\u5165\u5B89\u5168\u6F0F\u6D1E\uFF08\u6CE8\u5165\u3001XSS\u3001SQL \u6CE8\u5165\u7B49 OWASP Top 10\uFF09
+- \u5F15\u7528\u4EE3\u7801\u65F6\u4F7F\u7528 \`\u6587\u4EF6\u8DEF\u5F84:\u884C\u53F7\` \u683C\u5F0F\uFF08\u5982 \`src/app.ts:42\`\uFF09\uFF0C\u65B9\u4FBF\u7528\u6237\u8DF3\u8F6C
+
+# \u4EA4\u4E92\u98CE\u683C
+
+- \u4FDD\u6301\u6280\u672F\u5BA2\u89C2\u6027\uFF0C\u57FA\u4E8E\u4E8B\u5B9E\u56DE\u7B54\uFF0C\u4E0D\u8FC7\u5EA6\u8D5E\u540C\u6216\u606D\u7EF4\u7528\u6237\uFF0C\u5FC5\u8981\u65F6\u76F4\u63A5\u6307\u51FA\u95EE\u9898
+- \u4E0D\u786E\u5B9A\u65F6\u5148\u8C03\u67E5\u9A8C\u8BC1\uFF0C\u800C\u975E\u76F4\u89C9\u6027\u5730\u786E\u8BA4\u7528\u6237\u7684\u5047\u8BBE
+- \u4E0D\u8981\u7ED9\u51FA\u65F6\u95F4\u9884\u4F30\uFF08"\u5927\u6982\u9700\u8981\u51E0\u5206\u949F"\u4E4B\u7C7B\uFF09
+- \u56DE\u590D\u7B80\u6D01\uFF0C\u76F4\u63A5\u7ED9\u7ED3\u679C`;
+}
+var IS_WIN2;
+var init_core = __esm({
+  "src/core/prompt/layers/core.ts"() {
     "use strict";
-    init_conversation();
-    init_permission();
-    Coder = class {
-      client;
-      registry;
-      config;
-      systemPrompt;
-      tools;
-      constructor(client, registry, config, systemPrompt, tools) {
-        this.client = client;
-        this.registry = registry;
-        this.config = config;
-        this.systemPrompt = systemPrompt;
-        this.tools = tools;
-      }
-      /**
-       * 执行编码任务（短生命周期，每次新建会话）
-       *
-       * @param taskMessage 调度者发来的任务描述（作为 user message）
-       * @param callbacks 回调
-       * @returns 编码者的最终响应
-       */
-      async execute(taskMessage, callbacks = {}) {
-        const conversation = new Conversation();
-        conversation.setSystemPrompt(this.systemPrompt);
-        conversation.addUserMessage(taskMessage);
-        let lastContent = "";
-        while (true) {
-          const assistantMsg = await this.client.chatStream(
-            conversation.getMessages(),
-            this.tools.length > 0 ? this.tools : void 0,
-            callbacks
-          );
-          conversation.addAssistantMessage(assistantMsg);
-          if (!assistantMsg.tool_calls || assistantMsg.tool_calls.length === 0) {
-            lastContent = assistantMsg.content || "";
-            break;
-          }
-          for (const toolCall of assistantMsg.tool_calls) {
-            const toolName = toolCall.function.name;
-            let params;
-            try {
-              params = JSON.parse(toolCall.function.arguments);
-            } catch {
-              conversation.addToolResult(toolCall.id, "\u53C2\u6570\u89E3\u6790\u5931\u8D25\uFF1A\u65E0\u6548\u7684 JSON");
-              continue;
-            }
-            try {
-              const permLevel = this.registry.getPermissionLevel(toolName);
-              if (permLevel === "deny") {
-                callbacks.onDenied?.(toolName);
-                conversation.addToolResult(toolCall.id, `\u5DE5\u5177 "${toolName}" \u5DF2\u88AB\u7981\u6B62\u6267\u884C`);
-                continue;
-              }
-              if (permLevel === "auto") {
-                callbacks.onToolExecuting?.(toolName, params);
-              }
-              if (permLevel === "confirm") {
-                const confirmResult = await confirmExecution(toolName, params);
-                if (!confirmResult.approved) {
-                  callbacks.onDenied?.(toolName, confirmResult.feedback);
-                  const denyMsg = confirmResult.feedback ? `\u7528\u6237\u62D2\u7EDD\u4E86\u6B64\u64CD\u4F5C\uFF0C\u7528\u6237\u53CD\u9988: ${confirmResult.feedback}` : "\u7528\u6237\u62D2\u7EDD\u4E86\u6B64\u64CD\u4F5C";
-                  conversation.addToolResult(toolCall.id, denyMsg);
-                  continue;
-                }
-              }
-              const result = await this.registry.execute(toolName, params, this.config.max_tool_output);
-              callbacks.onToolResult?.(toolName, result.content, result.truncated ?? false);
-              conversation.addToolResult(toolCall.id, result.content);
-            } catch (err) {
-              const msg = err instanceof Error ? err.message : String(err);
-              conversation.addToolResult(toolCall.id, `\u5DE5\u5177\u6267\u884C\u5F02\u5E38\uFF1A${msg}`);
-            }
-          }
-          if (assistantMsg.content) {
-            lastContent = assistantMsg.content;
-          }
-        }
-        return lastContent;
-      }
-    };
+    IS_WIN2 = os2.platform() === "win32";
   }
 });
 
-// src/core/dual-agent/modes.ts
-function getMode(name) {
-  switch (name) {
-    case "delegated":
-      return DELEGATED_MODE;
-    case "autonomous":
-      return AUTONOMOUS_MODE;
-    case "controlled":
-      return CONTROLLED_MODE;
-    default:
-      return DELEGATED_MODE;
-  }
-}
-var CODER_IDENTITY, DELEGATED_MODE, AUTONOMOUS_MODE, CONTROLLED_MODE;
-var init_modes = __esm({
-  "src/core/dual-agent/modes.ts"() {
-    "use strict";
-    CODER_IDENTITY = `\u4F60\u662F\u7F16\u7801\u5B50 Agent\u3002\u6309\u4EE5\u4E0B\u987A\u5E8F\u5DE5\u4F5C\uFF1A
+// src/core/prompt/layers/planning.ts
+function buildPlanningPrompt() {
+  return `# \u5DE5\u4F5C\u65B9\u6CD5
 
-1. **\u8BFB memo**\uFF1A\u5982\u679C\u4EFB\u52A1\u63D0\u5230\u4E86 memo key\uFF0C\u5148 memo read \u83B7\u53D6\u8C03\u5EA6\u8005\u8BB0\u5F55\u7684\u4E0A\u4E0B\u6587
-2. **\u7F16\u7801**\uFF1A
-   - \u65B0\u5EFA\u6587\u4EF6 \u2192 \u76F4\u63A5 write-file
-   - \u4FEE\u6539\u6587\u4EF6 \u2192 read-file \u9605\u8BFB\u8981\u6539\u7684\u6587\u4EF6 \u2192 edit-file \u4FEE\u6539
-3. **\u5199 memo**\uFF1A\u5B8C\u6210\u540E memo write \u8BB0\u5F55\u6539\u52A8\u6458\u8981\uFF08key \u5982 "done-xxx"\uFF09\uFF0C\u4FBF\u4E8E\u8C03\u5EA6\u8005\u4E86\u89E3\u8FDB\u5C55
-4. **\u56DE\u590D**\uFF1A\u4E00\u53E5\u8BDD\u8BF4\u660E\u7ED3\u679C
+\u5904\u7406\u7F16\u7A0B\u4EFB\u52A1\u65F6\uFF1A
+1. \u5148\u7528 read-file / grep / glob \u9605\u8BFB\u76F8\u5173\u4EE3\u7801\uFF0C\u7406\u89E3\u73B0\u6709\u903B\u8F91\u548C\u4E0A\u4E0B\u6587
+2. \u5224\u65AD\u4EFB\u52A1\u7684\u590D\u6742\u7A0B\u5EA6\uFF0C\u7B80\u5355\u4EFB\u52A1\u76F4\u63A5\u6267\u884C\uFF0C\u590D\u6742\u4EFB\u52A1\u5148\u505A\u8BA1\u5212
+3. \u5982\u679C\u7528\u6237\u7684\u8981\u6C42\u4E0D\u6E05\u6670\uFF0C\u4E00\u5B9A\u8981\u8BE2\u95EE\u7528\u6237\uFF0C\u786E\u5B9A\u7EC6\u8282
 
-## \u7981\u6B62
-- \u274C \u7F16\u7801\u524D\u505A\u63A2\u7D22\uFF08bash ls/dir/pwd\u3001glob\u3001grep\uFF09\u2014 \u8C03\u5EA6\u8005\u5DF2\u7ECF\u505A\u8FC7\u4E86\uFF0C\u7ED3\u679C\u5728 memo \u4E2D
-- \u274C \u8F93\u51FA\u8BA1\u5212\u3001\u5206\u6790\u3001\u601D\u8DEF\u8BF4\u660E \u2014 \u76F4\u63A5\u52A8\u624B
-- \u274C \u505A\u4EFB\u52A1\u8303\u56F4\u5916\u7684\u6539\u52A8
-- \u274C \u6DFB\u52A0\u672A\u8981\u6C42\u7684\u6CE8\u91CA\u3001\u6587\u6863\u3001\u9519\u8BEF\u5904\u7406
-- \u274C \u8FC7\u5EA6\u5DE5\u7A0B\u5316`;
-    DELEGATED_MODE = {
-      name: "delegated",
-      description: "A\u6536\u96C6\u4E0A\u4E0B\u6587\u5E76\u59D4\u6D3E\uFF0CB\u62E5\u6709\u5B8C\u6574\u5DE5\u5177\u72EC\u7ACB\u6267\u884C",
-      coderHasTools: true,
-      coderToolNames: ["read-file", "write-file", "edit-file", "bash", "glob", "grep", "memo"],
-      coderSystemPrompt: `${CODER_IDENTITY}`
-    };
-    AUTONOMOUS_MODE = {
-      name: "autonomous",
-      description: "A\u89C4\u5212\uFF0CB\u81EA\u4E3B\u6267\u884C\uFF08\u9002\u5408\u80FD\u529B\u5F3A\u7684\u6A21\u578B\uFF09",
-      coderHasTools: true,
-      coderToolNames: ["read-file", "write-file", "edit-file", "bash", "glob", "grep", "memo"],
-      coderSystemPrompt: `${CODER_IDENTITY}`
-    };
-    CONTROLLED_MODE = {
-      name: "controlled",
-      description: "A\u5168\u6743\u7BA1\u7406\uFF0CB\u53EA\u8FD4\u56DE\u4EE3\u7801",
-      coderHasTools: false,
-      coderSystemPrompt: "\u4F60\u662F\u88AB\u8C03\u5EA6\u8005\u6D3E\u51FA\u7684\u5B50 Agent\u3002\u6839\u636E\u63D0\u4F9B\u7684\u4EE3\u7801\u548C\u9700\u6C42\uFF0C\u53EA\u8FD4\u56DE\u4FEE\u6539\u540E\u7684\u4EE3\u7801\u3002\u4E0D\u8981\u81EA\u884C\u64CD\u4F5C\u6587\u4EF6\uFF0C\u4E0D\u8981\u505A\u989D\u5916\u6539\u52A8\u3002"
-    };
-  }
-});
-
-// src/core/dual-agent/orchestrator.ts
-var SEND_TO_CODER_TOOL, Orchestrator;
-var init_orchestrator = __esm({
-  "src/core/dual-agent/orchestrator.ts"() {
-    "use strict";
-    init_client();
-    init_loader();
-    init_conversation();
-    init_permission();
-    init_coder();
-    init_modes();
-    SEND_TO_CODER_TOOL = {
-      type: "function",
-      function: {
-        name: "send-to-coder",
-        description: "\u5C06\u7F16\u7801\u4EFB\u52A1\u53D1\u9001\u7ED9\u7F16\u7801 Agent\u3002\u4F20\u5165\u4EFB\u52A1\u63CF\u8FF0\u548C\u76F8\u5173\u4EE3\u7801\u4E0A\u4E0B\u6587\uFF0C\u7F16\u7801 Agent \u5C06\u8FD4\u56DE\u4EE3\u7801\u6216\u89E3\u51B3\u65B9\u6848\u3002",
-        parameters: {
-          type: "object",
-          properties: {
-            task: {
-              type: "string",
-              description: "\u8981\u53D1\u9001\u7ED9\u7F16\u7801 Agent \u7684\u4EFB\u52A1\u63CF\u8FF0\uFF0C\u5305\u542B\u76F8\u5173\u4EE3\u7801\u4E0A\u4E0B\u6587"
-            }
-          },
-          required: ["task"]
-        }
-      }
-    };
-    Orchestrator = class {
-      conversation;
-      orchestratorClient;
-      coderClient;
-      registry;
-      config;
-      mode;
-      baseSystemPrompt;
-      memoStore;
-      constructor(registry, config, systemPrompt, memoStore) {
-        this.registry = registry;
-        this.config = config;
-        this.mode = config.collaboration;
-        this.baseSystemPrompt = systemPrompt;
-        this.memoStore = memoStore;
-        const orchConfig = resolveModelConfig(config, "orchestrator");
-        this.orchestratorClient = createLLMClient({
-          apiKey: orchConfig.api_key,
-          baseURL: orchConfig.base_url,
-          model: orchConfig.model,
-          temperature: orchConfig.temperature,
-          maxTokens: orchConfig.max_tokens
-        });
-        const coderConfig = resolveModelConfig(config, "coder");
-        this.coderClient = createLLMClient({
-          apiKey: coderConfig.api_key,
-          baseURL: coderConfig.base_url,
-          model: coderConfig.model,
-          temperature: coderConfig.temperature,
-          maxTokens: coderConfig.max_tokens
-        });
-        this.conversation = new Conversation();
-        this.conversation.setSystemPrompt(this.buildSystemPrompt());
-      }
-      /**
-       * 动态获取调度者的工具列表：注册表工具 + send-to-coder
-       */
-      getTools() {
-        return [
-          ...this.registry.toToolDefinitions(),
-          SEND_TO_CODER_TOOL
-        ];
-      }
-      /**
-       * 构建调度者的系统提示词（包含当前协作模式）
-       */
-      buildSystemPrompt() {
-        const modeInfo = getMode(this.mode);
-        return `${this.baseSystemPrompt}
-
-# \u4F60\u662F\u8C03\u5EA6\u8005 Agent
-
-\u534F\u4F5C\u6A21\u5F0F\uFF1A${modeInfo.name} - ${modeInfo.description}
-
-\u4F60\u662F\u4FA6\u5BDF\u5175 + \u6307\u6325\u5B98\u3002\u4F60\u81EA\u5DF1\u4E0D\u5199\u4EE3\u7801\uFF0C\u4F60\u7684\u804C\u8D23\u662F\uFF1A\u6536\u96C6\u60C5\u62A5 \u2192 \u8BB0\u5165 memo \u2192 \u59D4\u6D3E\u7F16\u7801 Agent\u3002
-
-## \u6838\u5FC3\u6D41\u7A0B
-
-1. **\u8BC4\u4F30**\uFF1A\u4EFB\u52A1\u662F\u5426\u9700\u8981\u4E86\u89E3\u73B0\u6709\u4EE3\u7801\uFF1F
-   - \u9700\u8981\u4FEE\u6539\u73B0\u6709\u6587\u4EF6\u3001\u9700\u8981\u4E0E\u73B0\u6709\u4EE3\u7801\u98CE\u683C\u4E00\u81F4\u3001\u9700\u8981\u7406\u89E3\u4F9D\u8D56\u5173\u7CFB \u2192 \u5148\u6536\u96C6
-   - \u9700\u6C42\u5B8C\u5168\u81EA\u5305\u542B\u3001\u76EE\u6807\u8DEF\u5F84\u5DF2\u660E\u786E \u2192 \u8DF3\u5230\u7B2C 3 \u6B65
-
-2. **\u6536\u96C6\u4E0A\u4E0B\u6587**\uFF08\u9AD8\u6548\uFF0C\u4E0D\u91CD\u590D\uFF09
-   - \u7528 glob/grep \u5B9A\u4F4D\uFF08\u4E00\u6B21\u5C31\u591F\uFF0C\u4E0D\u8981\u540C\u4E00\u76EE\u6807\u67E5\u591A\u6B21\uFF09
-   - \u7528 read-file \u6216 spawn-agents \u5E76\u884C\u8BFB\u53D6\u5173\u952E\u6587\u4EF6
-   - **\u5FC5\u987B memo write \u8BB0\u5F55\u53D1\u73B0**\uFF0Ckey \u7528\u6709\u610F\u4E49\u7684\u540D\u79F0
-     \u4F8B\uFF1Amemo write key="demo-structure" value="demo/ \u4E0B\u6709 weather.html\uFF08\u5929\u6C14\u7EC4\u4EF6\u793A\u4F8B\uFF09\uFF0C\u4F7F\u7528\u7EAF HTML+CSS+JS \u5355\u6587\u4EF6\u7ED3\u6784"
-   - \u7CBE\u70BC\u6458\u8981\uFF0C\u4E0D\u8981\u590D\u5236\u6574\u4E2A\u6587\u4EF6\u5185\u5BB9
-
-3. **\u59D4\u6D3E\u7F16\u7801**\uFF1Asend-to-coder
-   - task \u4E2D\u5199\u6E05\uFF1A\u505A\u4EC0\u4E48 + \u76EE\u6807\u8DEF\u5F84 + \u5F15\u7528 memo key
-     \u4F8B\uFF1Atask="\u5728 demo/newyear.html \u521B\u5EFA\u9A6C\u5E74\u6625\u8282\u795D\u798F\u7F51\u9875\u3002\u9879\u76EE\u73B0\u6709\u7ED3\u6784\u89C1 memo key 'demo-structure'\u3002\u8981\u6C42\uFF1A\u5355\u6587\u4EF6 HTML\uFF0C\u5305\u542B\u5185\u8054 CSS \u548C JS\uFF0C\u4E2D\u6587\u5185\u5BB9\u3002"
-   - \u6BCF\u6B21\u53EA\u53D1\u4E00\u4E2A\u5177\u4F53\u6B65\u9AA4
-
-4. **\u8FED\u4EE3/\u9A8C\u8BC1**\uFF1A\u9700\u8981\u65F6\u7EE7\u7EED\u59D4\u6D3E\u6216\u7528 bash \u8FD0\u884C\u9A8C\u8BC1
-
-## \u91CD\u8981
-
-- memo \u662F\u4F60\u4E0E\u7F16\u7801 Agent \u7684\u5171\u4EAB\u8BB0\u5FC6\uFF0C\u662F\u534F\u4F5C\u7684\u6838\u5FC3\u6865\u6881
-- \u4E0D\u8981\u91CD\u590D\u63A2\u7D22\uFF08glob \u67E5\u8FC7\u5C31\u4E0D\u8981\u518D bash ls \u540C\u4E00\u76EE\u5F55\uFF09
-- bash \u7528\u4E8E\u6267\u884C\u547D\u4EE4\uFF08\u6784\u5EFA\u3001\u6D4B\u8BD5\uFF09\uFF0C\u4E0D\u9700\u8981\u59D4\u6D3E
-- \u5B8C\u6210\u6240\u6709\u6B65\u9AA4\u540E\u7B80\u8981\u544A\u77E5\u7528\u6237\u7ED3\u679C`;
-      }
-      /**
-       * 切换协作模式
-       */
-      setMode(mode) {
-        this.mode = mode;
-        this.conversation.setSystemPrompt(this.buildSystemPrompt());
-      }
-      /**
-       * 执行用户请求
-       */
-      async run(userMessage, callbacks = {}) {
-        callbacks.onModeInfo?.(this.mode);
-        this.conversation.addUserMessage(userMessage);
-        let lastContent = "";
-        while (true) {
-          const tools = this.getTools();
-          const assistantMsg = await this.orchestratorClient.chatStream(
-            this.conversation.getMessages(),
-            tools,
-            callbacks
-          );
-          this.conversation.addAssistantMessage(assistantMsg);
-          if (!assistantMsg.tool_calls || assistantMsg.tool_calls.length === 0) {
-            lastContent = assistantMsg.content || "";
-            break;
-          }
-          for (const toolCall of assistantMsg.tool_calls) {
-            const toolName = toolCall.function.name;
-            let params;
-            try {
-              params = JSON.parse(toolCall.function.arguments);
-            } catch {
-              this.conversation.addToolResult(toolCall.id, "\u53C2\u6570\u89E3\u6790\u5931\u8D25\uFF1A\u65E0\u6548\u7684 JSON");
-              continue;
-            }
-            try {
-              if (toolName === "send-to-coder") {
-                const task = params["task"];
-                const coderResponse = await this.invokeCoder(task, callbacks);
-                this.conversation.addToolResult(toolCall.id, coderResponse);
-                continue;
-              }
-              const permLevel = this.registry.getPermissionLevel(toolName);
-              if (permLevel === "deny") {
-                callbacks.onDenied?.(toolName);
-                this.conversation.addToolResult(toolCall.id, `\u5DE5\u5177 "${toolName}" \u5DF2\u88AB\u7981\u6B62\u6267\u884C`);
-                continue;
-              }
-              if (permLevel === "auto") {
-                callbacks.onToolExecuting?.(toolName, params);
-              }
-              if (permLevel === "confirm") {
-                const confirmResult = await confirmExecution(toolName, params);
-                if (!confirmResult.approved) {
-                  callbacks.onDenied?.(toolName, confirmResult.feedback);
-                  const denyMsg = confirmResult.feedback ? `\u7528\u6237\u62D2\u7EDD\u4E86\u6B64\u64CD\u4F5C\uFF0C\u7528\u6237\u53CD\u9988: ${confirmResult.feedback}` : "\u7528\u6237\u62D2\u7EDD\u4E86\u6B64\u64CD\u4F5C";
-                  this.conversation.addToolResult(toolCall.id, denyMsg);
-                  continue;
-                }
-              }
-              const result = await this.registry.execute(toolName, params, this.config.max_tool_output);
-              callbacks.onToolResult?.(toolName, result.content, result.truncated ?? false);
-              this.conversation.addToolResult(toolCall.id, result.content);
-            } catch (err) {
-              const msg = err instanceof Error ? err.message : String(err);
-              this.conversation.addToolResult(toolCall.id, `\u5DE5\u5177\u6267\u884C\u5F02\u5E38\uFF1A${msg}`);
-            }
-          }
-          if (assistantMsg.content) {
-            lastContent = assistantMsg.content;
-          }
-        }
-        return lastContent;
-      }
-      /**
-       * 调用编码者 Agent
-       */
-      async invokeCoder(task, callbacks) {
-        callbacks.onCoderStart?.();
-        const modeInfo = getMode(this.mode);
-        let coderTools = [];
-        if (modeInfo.coderHasTools && modeInfo.coderToolNames) {
-          coderTools = this.registry.toToolDefinitions(modeInfo.coderToolNames);
-        }
-        let taskWithMemo = task;
-        if (this.memoStore) {
-          const index = this.memoStore.buildIndex();
-          if (index) {
-            taskWithMemo += `
-
-[\u5171\u4EAB\u5907\u5FD8\u5F55]
-${index}`;
-          }
-        }
-        taskWithMemo += "\n\n[\u91CD\u8981\uFF1A\u7ACB\u5373\u5F00\u59CB\u7F16\u7801\uFF0C\u4E0D\u8981\u63A2\u7D22\uFF0C\u4E0D\u8981\u8F93\u51FA\u5206\u6790]";
-        const coder = new Coder(
-          this.coderClient,
-          this.registry,
-          this.config,
-          modeInfo.coderSystemPrompt,
-          coderTools
-        );
-        const response = await coder.execute(taskWithMemo, {
-          onContent: callbacks.onContent,
-          onToolCallStreaming: callbacks.onToolCallStreaming,
-          onToolExecuting: callbacks.onToolExecuting,
-          onToolResult: callbacks.onToolResult,
-          onDenied: callbacks.onDenied
-        });
-        callbacks.onCoderEnd?.(response);
-        return response;
-      }
-      /**
-       * 获取对话历史
-       */
-      getConversation() {
-        return this.conversation;
-      }
-    };
-  }
-});
-
-// src/core/prompt/layers/core.ts
-import * as os2 from "os";
-function buildCorePrompt() {
-  return `\u4F60\u662F ZenCode\uFF0C\u4E00\u4E2A CLI \u73AF\u5883\u4E0B\u7684 AI \u7F16\u7A0B\u52A9\u624B\u3002\u4F60\u5E2E\u52A9\u7528\u6237\u5B8C\u6210\u8F6F\u4EF6\u5DE5\u7A0B\u4EFB\u52A1\uFF1A\u4FEEbug\u3001\u52A0\u529F\u80FD\u3001\u91CD\u6784\u4EE3\u7801\u3001\u89E3\u91CA\u4EE3\u7801\u7B49\u3002
-
-\u5DE5\u4F5C\u76EE\u5F55\uFF1A${process.cwd()}
-\u7CFB\u7EDF\uFF1A${os2.platform()} ${os2.arch()}
-
-# \u5DE5\u5177\u4F7F\u7528\u539F\u5219
-
-\u4F60\u6709\u4EE5\u4E0B\u5DE5\u5177\u53EF\u7528\uFF0C\u8BF7\u6839\u636E\u4EFB\u52A1\u9009\u62E9\u6700\u5408\u9002\u7684\u5DE5\u5177\uFF1A
-
-- **read-file**\uFF1A\u8BFB\u53D6\u6587\u4EF6\u5185\u5BB9\u3002\u4FEE\u6539\u4EE3\u7801\u524D\u5FC5\u987B\u5148\u8BFB\u53D6\u76EE\u6807\u6587\u4EF6\u3002\u652F\u6301 offset/limit \u8BFB\u53D6\u5927\u6587\u4EF6\u7684\u7279\u5B9A\u90E8\u5206\u3002
-- **edit-file**\uFF1A\u901A\u8FC7\u5B57\u7B26\u4E32\u66FF\u6362\u7F16\u8F91\u6587\u4EF6\u3002\u4F18\u5148\u4F7F\u7528 edit-file \u800C\u975E write-file \u4FEE\u6539\u5DF2\u6709\u6587\u4EF6\u2014\u2014\u5B83\u66F4\u7CBE\u786E\u3001\u66F4\u5B89\u5168\u3002old_string \u5FC5\u987B\u552F\u4E00\u5339\u914D\uFF0C\u5339\u914D\u5931\u8D25\u65F6\u63D0\u4F9B\u66F4\u591A\u4E0A\u4E0B\u6587\u4F7F\u5176\u552F\u4E00\u3002
-- **write-file**\uFF1A\u521B\u5EFA\u65B0\u6587\u4EF6\u6216\u5B8C\u6574\u91CD\u5199\u6587\u4EF6\u3002\u4EC5\u5728\u521B\u5EFA\u65B0\u6587\u4EF6\u6216\u9700\u8981\u5927\u5E45\u91CD\u5199\u65F6\u4F7F\u7528\u3002
-- **glob**\uFF1A\u6309\u6A21\u5F0F\u641C\u7D22\u6587\u4EF6\u8DEF\u5F84\u3002\u7528\u4E8E\u67E5\u627E\u6587\u4EF6\u4F4D\u7F6E\uFF08\u5982 \`**/*.ts\`\u3001\`src/**/config.*\`\uFF09\u3002
-- **grep**\uFF1A\u5728\u6587\u4EF6\u5185\u5BB9\u4E2D\u641C\u7D22\u6B63\u5219\u8868\u8FBE\u5F0F\u3002\u7528\u4E8E\u67E5\u627E\u51FD\u6570\u5B9A\u4E49\u3001\u5F15\u7528\u3001\u7279\u5B9A\u4EE3\u7801\u6A21\u5F0F\u3002
-- **bash**\uFF1A\u6267\u884C shell \u547D\u4EE4\u3002\u7528\u4E8E\u8FD0\u884C\u6784\u5EFA\u3001\u6D4B\u8BD5\u3001git \u64CD\u4F5C\u7B49\u3002\u4E0D\u8981\u7528 bash \u505A\u80FD\u7528\u4E0A\u8FF0\u5DE5\u5177\u5B8C\u6210\u7684\u4E8B\uFF08\u5982\u4E0D\u8981\u7528 cat \u8BFB\u6587\u4EF6\u3001\u4E0D\u8981\u7528 sed \u7F16\u8F91\u6587\u4EF6\u3001\u4E0D\u8981\u7528 find \u641C\u7D22\u6587\u4EF6\uFF09\u3002
-
-\u5173\u952E\u89C4\u5219\uFF1A
-- \u4FEE\u6539\u4EE3\u7801\u524D\u5148\u7528 read-file \u9605\u8BFB\u76F8\u5173\u6587\u4EF6\uFF0C\u7406\u89E3\u73B0\u6709\u903B\u8F91
-- \u4F18\u5148 edit-file \u7F16\u8F91\u5DF2\u6709\u6587\u4EF6\uFF0C\u800C\u975E write-file \u91CD\u5199
-- \u4E0D\u8981\u521B\u5EFA\u4E0D\u5FC5\u8981\u7684\u65B0\u6587\u4EF6\uFF0C\u4F18\u5148\u5728\u73B0\u6709\u6587\u4EF6\u4E2D\u4FEE\u6539
-- \u53EA\u505A\u5FC5\u8981\u7684\u6700\u5C0F\u6539\u52A8\uFF0C\u4E0D\u505A\u989D\u5916"\u6539\u8FDB"
-- \u4E0D\u8981\u6DFB\u52A0\u7528\u6237\u672A\u8981\u6C42\u7684\u6CE8\u91CA\u3001\u6587\u6863\u3001\u7C7B\u578B\u6CE8\u89E3
-- \u4E0D\u8981\u5F15\u5165\u5B89\u5168\u6F0F\u6D1E\uFF08\u6CE8\u5165\u3001XSS\u3001SQL \u6CE8\u5165\u7B49 OWASP Top 10\uFF09
-- \u5F15\u7528\u4EE3\u7801\u65F6\u4F7F\u7528 \`\u6587\u4EF6\u8DEF\u5F84:\u884C\u53F7\` \u683C\u5F0F\uFF08\u5982 \`src/app.ts:42\`\uFF09\uFF0C\u65B9\u4FBF\u7528\u6237\u8DF3\u8F6C
-
-# \u4EA4\u4E92\u98CE\u683C
-
-- \u4FDD\u6301\u6280\u672F\u5BA2\u89C2\u6027\uFF0C\u57FA\u4E8E\u4E8B\u5B9E\u56DE\u7B54\uFF0C\u4E0D\u8FC7\u5EA6\u8D5E\u540C\u6216\u606D\u7EF4\u7528\u6237\uFF0C\u5FC5\u8981\u65F6\u76F4\u63A5\u6307\u51FA\u95EE\u9898
-- \u4E0D\u786E\u5B9A\u65F6\u5148\u8C03\u67E5\u9A8C\u8BC1\uFF0C\u800C\u975E\u76F4\u89C9\u6027\u5730\u786E\u8BA4\u7528\u6237\u7684\u5047\u8BBE
-- \u4E0D\u8981\u7ED9\u51FA\u65F6\u95F4\u9884\u4F30\uFF08"\u5927\u6982\u9700\u8981\u51E0\u5206\u949F"\u4E4B\u7C7B\uFF09
-- \u56DE\u590D\u7B80\u6D01\uFF0C\u76F4\u63A5\u7ED9\u7ED3\u679C`;
-}
-var init_core = __esm({
-  "src/core/prompt/layers/core.ts"() {
-    "use strict";
-  }
-});
-
-// src/core/prompt/layers/planning.ts
-function buildPlanningPrompt() {
-  return `# \u5DE5\u4F5C\u65B9\u6CD5
-
-\u5904\u7406\u7F16\u7A0B\u4EFB\u52A1\u65F6\uFF1A
-1. \u5148\u7528 read-file / grep / glob \u9605\u8BFB\u76F8\u5173\u4EE3\u7801\uFF0C\u7406\u89E3\u73B0\u6709\u903B\u8F91\u548C\u4E0A\u4E0B\u6587
-2. \u786E\u5B9A\u65B9\u6848\u540E\u76F4\u63A5\u5B9E\u65BD\uFF0C\u4E0D\u8981\u957F\u7BC7\u89E3\u91CA\u8BA1\u5212
-3. \u6539\u5B8C\u5373\u6B62\uFF0C\u4E0D\u8981\u81EA\u884C"\u9A8C\u8BC1"\u6216"\u6D4B\u8BD5"
-
-\u591A\u6B65\u4EFB\u52A1\u7BA1\u7406\uFF1A
-- \u5BF9\u4E8E 3 \u4E2A\u4EE5\u4E0A\u6B65\u9AA4\u7684\u4EFB\u52A1\uFF0C\u4F7F\u7528 todo \u5DE5\u5177\u521B\u5EFA\u8BA1\u5212\u518D\u9010\u6B65\u6267\u884C
-- \u5F00\u59CB\u6B65\u9AA4\u524D\u6807\u8BB0 in-progress\uFF0C\u5B8C\u6210\u540E\u6807\u8BB0 completed
-- \u6BCF\u6B65\u5B8C\u6210\u540E\u68C0\u67E5\u8BA1\u5212\uFF0C\u51B3\u5B9A\u4E0B\u4E00\u6B65
-
-\u4EE3\u7801\u8D28\u91CF\uFF1A
-- \u4E0D\u8981\u5199\u4E0D\u5FC5\u8981\u7684\u6D4B\u8BD5\uFF1B\u5982\u679C\u8981\u5199\u6D4B\u8BD5\uFF0C\u5148\u786E\u8BA4\u9879\u76EE\u7684\u6D4B\u8BD5\u6846\u67B6\u548C\u4F9D\u8D56\uFF0C\u786E\u4FDD\u80FD\u5B9E\u9645\u8FD0\u884C
-- \u4E0D\u8981\u8FC7\u5EA6\u5DE5\u7A0B\u5316\uFF1A\u4E0D\u8981\u4E3A\u4E00\u6B21\u6027\u64CD\u4F5C\u521B\u5EFA\u62BD\u8C61\u3001\u4E0D\u8981\u4E3A\u5047\u8BBE\u7684\u672A\u6765\u9700\u6C42\u8BBE\u8BA1
-- \u4E0D\u8981\u4E3A\u4E0D\u53EF\u80FD\u53D1\u751F\u7684\u573A\u666F\u6DFB\u52A0\u9519\u8BEF\u5904\u7406\uFF1B\u53EA\u5728\u7CFB\u7EDF\u8FB9\u754C\uFF08\u7528\u6237\u8F93\u5165\u3001\u5916\u90E8 API\uFF09\u505A\u6821\u9A8C
-- \u5982\u679C\u5220\u9664\u4E86\u4EE3\u7801\uFF0C\u5C31\u5F7B\u5E95\u5220\u9664\uFF0C\u4E0D\u8981\u7559\u6CE8\u91CA\u8BF4"\u5DF2\u79FB\u9664"\uFF0C\u4E0D\u8981\u4FDD\u7559\u672A\u4F7F\u7528\u7684\u517C\u5BB9\u6027\u53D8\u91CF
-- \u4E09\u884C\u76F8\u4F3C\u4EE3\u7801\u4F18\u4E8E\u4E00\u4E2A\u8FC7\u65E9\u7684\u62BD\u8C61`;
-}
-var init_planning = __esm({
-  "src/core/prompt/layers/planning.ts"() {
-    "use strict";
+\u591A\u6B65\u4EFB\u52A1\u7BA1\u7406\uFF1A
+- \u5BF9\u4E8E 3 \u4E2A\u4EE5\u4E0A\u6B65\u9AA4\u7684\u4EFB\u52A1\uFF0C\u4F7F\u7528 todo \u5DE5\u5177\u521B\u5EFA\u8BA1\u5212\u518D\u9010\u6B65\u6267\u884C
+- \u5F00\u59CB\u6B65\u9AA4\u524D\u6807\u8BB0 in-progress\uFF0C\u5B8C\u6210\u540E\u6807\u8BB0 completed
+- \u6BCF\u6B65\u5B8C\u6210\u540E\u68C0\u67E5\u8BA1\u5212\uFF0C\u51B3\u5B9A\u4E0B\u4E00\u6B65
+
+\u4EE3\u7801\u8D28\u91CF\uFF1A
+- \u5982\u679C\u5220\u9664\u4E86\u4EE3\u7801\uFF0C\u5C31\u5F7B\u5E95\u5220\u9664\uFF0C\u4E0D\u8981\u7559\u6CE8\u91CA\u8BF4"\u5DF2\u79FB\u9664"\uFF0C\u4E0D\u8981\u4FDD\u7559\u672A\u4F7F\u7528\u7684\u517C\u5BB9\u6027\u53D8\u91CF
+- \u4E0D\u8981\u7559\u4E0BTODO\u7136\u540E\u653E\u7740\u4E0D\u7BA1`;
+}
+var init_planning = __esm({
+  "src/core/prompt/layers/planning.ts"() {
+    "use strict";
   }
 });
 
@@ -1481,7 +1146,7 @@ function buildParallelPrompt() {
   \u6B63\u786E\uFF1Aspawn-agents \u540C\u65F6\u8BFB auth controller\u3001auth service\u3001auth middleware\u3001auth types
   \u9519\u8BEF\uFF1A\u5148 read-file controller\uFF0C\u518D read-file service\uFF0C\u518D read-file middleware...
 
-\u6BCF\u4E2A\u5B50 Agent \u6709\u72EC\u7ACB\u5BF9\u8BDD\uFF0C\u9ED8\u8BA4\u53EF\u7528 read-file\u3001glob\u3001grep\u3001memo\u3002`;
+\u6BCF\u4E2A\u5B50 Agent \u6709\u72EC\u7ACB\u5BF9\u8BDD\uFF0C\u9ED8\u8BA4\u53EF\u7528 read-file\u3001glob\u3001grep\u3002`;
 }
 var init_parallel = __esm({
   "src/core/prompt/layers/parallel.ts"() {
@@ -1514,12 +1179,30 @@ var init_git = __esm({
   }
 });
 
+// src/core/prompt/layers/agents.ts
+function buildAgentsPrompt(agents) {
+  if (agents.length === 0) return null;
+  const agentList = agents.map((a) => `- **${a.name}**\uFF1A${a.description}`).join("\n");
+  return `# \u5B50 Agent
+
+\u4F60\u53EF\u4EE5\u901A\u8FC7 dispatch \u5DE5\u5177\u8C03\u5EA6\u4EE5\u4E0B\u4E13\u7528\u5B50 Agent\uFF1A
+
+${agentList}
+
+\u4F7F\u7528\u573A\u666F\uFF1A\u5F53\u4EFB\u52A1\u9700\u8981\u4E13\u4E1A\u89D2\u8272\uFF08\u5982\u4EE3\u7801\u5BA1\u67E5\u3001\u67B6\u6784\u5206\u6790\uFF09\u4E14\u5B50 Agent \u7684\u80FD\u529B\u6BD4\u4F60\u76F4\u63A5\u505A\u66F4\u5408\u9002\u65F6\uFF0C\u4F7F\u7528 dispatch \u59D4\u6D3E\u3002`;
+}
+var init_agents = __esm({
+  "src/core/prompt/layers/agents.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/prompt/layers/project.ts
-import * as fs6 from "fs/promises";
-import * as path6 from "path";
+import * as fs7 from "fs/promises";
+import * as path7 from "path";
 async function buildProjectPrompt() {
   try {
-    const content = await fs6.readFile(path6.resolve("ZENCODE.md"), "utf-8");
+    const content = await fs7.readFile(path7.resolve("ZENCODE.md"), "utf-8");
     return content.trim() || null;
   } catch {
     return null;
@@ -1529,8 +1212,8 @@ async function loadUserPrompts(paths) {
   const prompts = [];
   for (const p of paths) {
     try {
-      const resolved = p.startsWith("~") ? path6.join(process.env["HOME"] || process.env["USERPROFILE"] || "", p.slice(1)) : path6.resolve(p);
-      const content = await fs6.readFile(resolved, "utf-8");
+      const resolved = p.startsWith("~") ? path7.join(process.env["HOME"] || process.env["USERPROFILE"] || "", p.slice(1)) : path7.resolve(p);
+      const content = await fs7.readFile(resolved, "utf-8");
       if (content.trim()) {
         prompts.push(content.trim());
       }
@@ -1546,16 +1229,16 @@ var init_project = __esm({
 });
 
 // src/core/prompt/builder.ts
-import * as fs7 from "fs";
+import * as fs8 from "fs";
 function isGitRepo() {
   try {
-    fs7.statSync(".git");
+    fs8.statSync(".git");
     return true;
   } catch {
     return false;
   }
 }
-async function buildPrompt(config) {
+async function buildPrompt(config, agents) {
   const layers = [];
   layers.push(buildCorePrompt());
   if (config.features.planning_layer === "on") {
@@ -1568,6 +1251,12 @@ async function buildPrompt(config) {
   if (config.features.parallel_agents === "on") {
     layers.push(buildParallelPrompt());
   }
+  if (agents && agents.length > 0) {
+    const agentsPrompt = buildAgentsPrompt(agents);
+    if (agentsPrompt) {
+      layers.push(agentsPrompt);
+    }
+  }
   const projectPrompt = await buildProjectPrompt();
   if (projectPrompt) {
     layers.push(projectPrompt);
@@ -1586,6 +1275,7 @@ var init_builder = __esm({
     init_planning();
     init_parallel();
     init_git();
+    init_agents();
     init_project();
   }
 });
@@ -1640,69 +1330,267 @@ var init_todo_store = __esm({
   }
 });
 
-// src/core/memo-store.ts
-var MAX_ENTRIES, MAX_CONTENT_LENGTH, MemoStore;
-var init_memo_store = __esm({
-  "src/core/memo-store.ts"() {
+// src/core/sub-agents/registry.ts
+var SubAgentConfigRegistry;
+var init_registry2 = __esm({
+  "src/core/sub-agents/registry.ts"() {
     "use strict";
-    MAX_ENTRIES = 30;
-    MAX_CONTENT_LENGTH = 3e3;
-    MemoStore = class {
-      entries = /* @__PURE__ */ new Map();
-      write(key, content, author = "agent") {
-        const trimmed = content.slice(0, MAX_CONTENT_LENGTH);
-        const entry = { key, content: trimmed, author, updatedAt: Date.now() };
-        if (!this.entries.has(key) && this.entries.size >= MAX_ENTRIES) {
-          let oldest = null;
-          let oldestTime = Infinity;
-          for (const [k, v] of this.entries) {
-            if (v.updatedAt < oldestTime) {
-              oldestTime = v.updatedAt;
-              oldest = k;
-            }
-          }
-          if (oldest) this.entries.delete(oldest);
-        }
-        this.entries.set(key, entry);
-        return entry;
+    SubAgentConfigRegistry = class {
+      configs = /* @__PURE__ */ new Map();
+      register(config) {
+        this.configs.set(config.name, config);
       }
-      read(key) {
-        return this.entries.get(key) ?? null;
+      get(name) {
+        return this.configs.get(name);
+      }
+      has(name) {
+        return this.configs.has(name);
       }
       list() {
-        return [...this.entries.values()].map((e) => ({
-          key: e.key,
-          author: e.author,
-          preview: e.content.slice(0, 80)
-        }));
+        return [...this.configs.values()];
       }
-      delete(key) {
-        return this.entries.delete(key);
+      listNames() {
+        return [...this.configs.keys()];
       }
-      clear() {
-        this.entries.clear();
+      /**
+       * 生成子 Agent 列表描述（用于 dispatch 工具的说明）
+       */
+      buildAgentListDescription() {
+        if (this.configs.size === 0) return "\u6682\u65E0\u53EF\u7528\u5B50 Agent";
+        return [...this.configs.values()].map((s) => `- ${s.name}: ${s.description}`).join("\n");
+      }
+    };
+  }
+});
+
+// src/core/sub-agents/presets.ts
+var presetAgents;
+var init_presets = __esm({
+  "src/core/sub-agents/presets.ts"() {
+    "use strict";
+    presetAgents = [
+      {
+        name: "reviewer",
+        description: "\u4EE3\u7801\u5BA1\u67E5\uFF1A\u53D1\u73B0 bug\u3001\u5B89\u5168\u6F0F\u6D1E\u3001\u6027\u80FD\u95EE\u9898",
+        prompt: `\u4F60\u662F\u4EE3\u7801\u5BA1\u67E5\u4E13\u5BB6\u3002\u5BA1\u67E5\u7528\u6237\u6307\u5B9A\u7684\u4EE3\u7801\uFF0C\u8F93\u51FA\u53D1\u73B0\u7684\u95EE\u9898\u3002
+
+\u5BA1\u67E5\u7EF4\u5EA6\uFF08\u6309\u4F18\u5148\u7EA7\uFF09\uFF1A
+1. \u6B63\u786E\u6027\uFF1A\u903B\u8F91\u9519\u8BEF\u3001\u8FB9\u754C\u6761\u4EF6\u3001\u7A7A\u503C/\u672A\u5B9A\u4E49\u5904\u7406
+2. \u5B89\u5168\uFF1A\u6CE8\u5165\u3001XSS\u3001\u654F\u611F\u4FE1\u606F\u6CC4\u9732\u3001\u6743\u9650\u68C0\u67E5
+3. \u6027\u80FD\uFF1A\u4E0D\u5FC5\u8981\u7684\u5FAA\u73AF\u3001\u5185\u5B58\u6CC4\u6F0F\u3001N+1 \u67E5\u8BE2
+4. \u53EF\u7EF4\u62A4\u6027\uFF1A\u547D\u540D\u3001\u91CD\u590D\u4EE3\u7801\u3001\u8FC7\u5EA6\u590D\u6742
+
+\u8F93\u51FA\u683C\u5F0F\uFF1A
+- \u6BCF\u4E2A\u95EE\u9898\uFF1A\u6587\u4EF6\u8DEF\u5F84:\u884C\u53F7 + \u95EE\u9898\u63CF\u8FF0 + \u5EFA\u8BAE\u4FEE\u590D
+- \u6CA1\u6709\u95EE\u9898\u5C31\u8BF4\u6CA1\u6709\u95EE\u9898\uFF0C\u4E0D\u8981\u786C\u51D1
+- \u4E0D\u8981\u91CD\u5199\u4EE3\u7801\uFF0C\u53EA\u6307\u51FA\u95EE\u9898\u548C\u4FEE\u590D\u65B9\u5411`,
+        tools: ["read-file", "glob", "grep"],
+        max_turns: 10,
+        timeout: 60
+      },
+      {
+        name: "researcher",
+        description: "\u4EE3\u7801\u5E93\u7814\u7A76\uFF1A\u6DF1\u5EA6\u5206\u6790\u67B6\u6784\u3001\u4F9D\u8D56\u548C\u5B9E\u73B0\u7EC6\u8282",
+        prompt: `\u4F60\u662F\u4EE3\u7801\u5E93\u7814\u7A76\u5458\u3002\u6DF1\u5165\u5206\u6790\u7528\u6237\u6307\u5B9A\u7684\u4EE3\u7801\u5E93\u6216\u6A21\u5757\uFF0C\u8F93\u51FA\u7ED3\u6784\u5316\u7684\u5206\u6790\u62A5\u544A\u3002
+
+\u5206\u6790\u65B9\u6CD5\uFF1A
+1. \u5148 glob \u4E86\u89E3\u6587\u4EF6\u7ED3\u6784
+2. grep \u641C\u7D22\u5173\u952E\u5165\u53E3\u70B9\u3001\u5BFC\u51FA\u3001\u4F9D\u8D56
+3. read-file \u9605\u8BFB\u6838\u5FC3\u6587\u4EF6
+
+\u8F93\u51FA\u5185\u5BB9\uFF1A
+- \u6A21\u5757\u804C\u8D23\u548C\u8FB9\u754C
+- \u5173\u952E\u6587\u4EF6\u53CA\u5176\u4F5C\u7528
+- \u6570\u636E\u6D41\u548C\u8C03\u7528\u94FE
+- \u5916\u90E8\u4F9D\u8D56
+- \u5982\u6709\u7528\u6237\u5177\u4F53\u95EE\u9898\uFF0C\u9488\u5BF9\u6027\u56DE\u7B54`,
+        tools: ["read-file", "glob", "grep"],
+        max_turns: 15,
+        timeout: 120
+      },
+      {
+        name: "refactor",
+        description: "\u91CD\u6784\u4E13\u5BB6\uFF1A\u5206\u6790\u4EE3\u7801\u7ED3\u6784\u5E76\u5B9E\u65BD\u91CD\u6784",
+        prompt: `\u4F60\u662F\u91CD\u6784\u4E13\u5BB6\u3002\u5206\u6790\u7528\u6237\u6307\u5B9A\u7684\u4EE3\u7801\uFF0C\u627E\u51FA\u53EF\u91CD\u6784\u7684\u70B9\u5E76\u5B9E\u65BD\u91CD\u6784\u3002
+
+\u91CD\u6784\u539F\u5219\uFF1A
+- \u53EA\u505A\u6709\u660E\u786E\u6536\u76CA\u7684\u91CD\u6784\uFF08\u6D88\u9664\u91CD\u590D\u3001\u964D\u4F4E\u590D\u6742\u5EA6\u3001\u6539\u5584\u547D\u540D\uFF09
+- \u4FDD\u6301\u884C\u4E3A\u4E0D\u53D8\uFF0C\u4E0D\u6DFB\u52A0\u65B0\u529F\u80FD
+- \u6BCF\u6B21\u53EA\u505A\u4E00\u4E2A\u91CD\u6784\uFF0C\u4E0D\u8981\u540C\u65F6\u6539\u592A\u591A
+- \u4FEE\u6539\u524D\u5FC5\u987B read-file \u786E\u8BA4\u5F53\u524D\u5185\u5BB9
+
+\u5E38\u89C1\u91CD\u6784\uFF1A
+- \u63D0\u53D6\u91CD\u590D\u4EE3\u7801\u4E3A\u51FD\u6570
+- \u7B80\u5316\u8FC7\u6DF1\u7684\u5D4C\u5957\uFF08\u63D0\u524D\u8FD4\u56DE\uFF09
+- \u62C6\u5206\u8FC7\u5927\u7684\u51FD\u6570
+- \u6539\u5584\u547D\u540D\u4F7F\u610F\u56FE\u66F4\u6E05\u6670`,
+        tools: ["read-file", "write-file", "edit-file", "glob", "grep"],
+        max_turns: 15,
+        timeout: 120
+      }
+    ];
+  }
+});
+
+// src/core/sub-agents/loader.ts
+import * as fs9 from "fs";
+import * as path8 from "path";
+import * as os3 from "os";
+import { parse as parseYaml2 } from "yaml";
+function loadAgentYaml(filePath) {
+  try {
+    const content = fs9.readFileSync(filePath, "utf-8");
+    const parsed = parseYaml2(content);
+    if (!parsed || typeof parsed !== "object") return null;
+    if (!parsed["name"] || !parsed["prompt"] || !parsed["tools"]) return null;
+    return {
+      name: parsed["name"],
+      description: parsed["description"] || "",
+      prompt: parsed["prompt"],
+      tools: parsed["tools"],
+      max_turns: parsed["max_turns"],
+      timeout: parsed["timeout"],
+      model: parsed["model"]
+    };
+  } catch {
+    return null;
+  }
+}
+function loadAgentsFromDir(dir) {
+  try {
+    if (!fs9.existsSync(dir)) return [];
+    const files = fs9.readdirSync(dir).filter((f) => f.endsWith(".yaml") || f.endsWith(".yml"));
+    const agents = [];
+    for (const file of files) {
+      const agent = loadAgentYaml(path8.join(dir, file));
+      if (agent) agents.push(agent);
+    }
+    return agents;
+  } catch {
+    return [];
+  }
+}
+function loadAllAgentConfigs() {
+  const configMap = /* @__PURE__ */ new Map();
+  for (const agent of presetAgents) {
+    configMap.set(agent.name, agent);
+  }
+  const globalDir = path8.join(os3.homedir(), ".zencode", "agents");
+  for (const agent of loadAgentsFromDir(globalDir)) {
+    configMap.set(agent.name, agent);
+  }
+  const projectDir = path8.resolve(".zencode", "agents");
+  for (const agent of loadAgentsFromDir(projectDir)) {
+    configMap.set(agent.name, agent);
+  }
+  return [...configMap.values()];
+}
+var init_loader = __esm({
+  "src/core/sub-agents/loader.ts"() {
+    "use strict";
+    init_presets();
+  }
+});
+
+// src/core/skills/registry.ts
+var SkillRegistry;
+var init_registry3 = __esm({
+  "src/core/skills/registry.ts"() {
+    "use strict";
+    SkillRegistry = class {
+      skills = /* @__PURE__ */ new Map();
+      register(skill) {
+        this.skills.set(skill.name, skill);
+      }
+      get(name) {
+        return this.skills.get(name);
+      }
+      has(name) {
+        return this.skills.has(name);
+      }
+      list() {
+        return [...this.skills.values()];
+      }
+      listNames() {
+        return [...this.skills.keys()];
       }
       /**
-       * 生成简短的备忘录索引（用于注入 Agent 系统提示词）
-       * 仅包含 key 列表和简短预览，占用极少 token
+       * 展开 skill 的 prompt 模板，替换 $ARGS 为用户参数
        */
-      buildIndex() {
-        if (this.entries.size === 0) return null;
-        const lines = [...this.entries.values()].map(
-          (e) => `- ${e.key}: ${e.content.slice(0, 50)}`
-        );
-        return lines.join("\n");
+      expandPrompt(skill, args) {
+        if (args && skill.prompt.includes("$ARGS")) {
+          return skill.prompt.replace(/\$ARGS/g, args);
+        }
+        if (args) {
+          return `${skill.prompt}
+
+\u7528\u6237\u8865\u5145: ${args}`;
+        }
+        return skill.prompt;
       }
     };
   }
 });
 
+// src/core/skills/loader.ts
+import * as fs10 from "fs";
+import * as path9 from "path";
+import * as os4 from "os";
+import { parse as parseYaml3 } from "yaml";
+function loadSkillYaml(filePath) {
+  try {
+    const content = fs10.readFileSync(filePath, "utf-8");
+    const parsed = parseYaml3(content);
+    if (!parsed || typeof parsed !== "object") return null;
+    if (!parsed["name"] || !parsed["prompt"]) return null;
+    return {
+      name: parsed["name"],
+      description: parsed["description"] || "",
+      prompt: parsed["prompt"]
+    };
+  } catch {
+    return null;
+  }
+}
+function loadSkillsFromDir(dir) {
+  try {
+    if (!fs10.existsSync(dir)) return [];
+    const files = fs10.readdirSync(dir).filter((f) => f.endsWith(".yaml") || f.endsWith(".yml"));
+    const skills = [];
+    for (const file of files) {
+      const skill = loadSkillYaml(path9.join(dir, file));
+      if (skill) skills.push(skill);
+    }
+    return skills;
+  } catch {
+    return [];
+  }
+}
+function loadAllSkills() {
+  const skillMap = /* @__PURE__ */ new Map();
+  const globalDir = path9.join(os4.homedir(), ".zencode", "skills");
+  for (const skill of loadSkillsFromDir(globalDir)) {
+    skillMap.set(skill.name, skill);
+  }
+  const projectDir = path9.resolve(".zencode", "skills");
+  for (const skill of loadSkillsFromDir(projectDir)) {
+    skillMap.set(skill.name, skill);
+  }
+  return [...skillMap.values()];
+}
+var init_loader2 = __esm({
+  "src/core/skills/loader.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/sub-agent.ts
 var DEFAULT_TIMEOUT_MS, SubAgent;
 var init_sub_agent = __esm({
   "src/core/sub-agent.ts"() {
     "use strict";
     init_conversation();
+    init_read_tracker();
     DEFAULT_TIMEOUT_MS = 12e4;
     SubAgent = class {
       client;
@@ -1712,8 +1600,7 @@ var init_sub_agent = __esm({
       allowedTools;
       maxTurns;
       timeoutMs;
-      memoStore;
-      constructor(client, registry, config, task, allowedTools = ["read-file", "glob", "grep", "memo"], maxTurns = 10, timeoutMs = DEFAULT_TIMEOUT_MS, memoStore) {
+      constructor(client, registry, config, task, allowedTools = ["read-file", "glob", "grep"], maxTurns = 10, timeoutMs = DEFAULT_TIMEOUT_MS) {
         this.client = client;
         this.registry = registry;
         this.config = config;
@@ -1721,7 +1608,6 @@ var init_sub_agent = __esm({
         this.allowedTools = allowedTools.filter((t) => t !== "spawn-agents" && t !== "todo");
         this.maxTurns = Math.min(maxTurns, 15);
         this.timeoutMs = timeoutMs;
-        this.memoStore = memoStore;
       }
       async run() {
         return Promise.race([
@@ -1739,17 +1625,9 @@ var init_sub_agent = __esm({
       }
       async execute() {
         const conversation = new Conversation();
-        let systemPrompt = `\u4F60\u662F ZenCode \u5B50 Agent\u3002\u4F60\u7684\u4EFB\u52A1\uFF1A${this.task}
+        const readTracker = new ReadTracker();
+        const systemPrompt = `\u4F60\u662F ZenCode \u5B50 Agent\u3002\u4F60\u7684\u4EFB\u52A1\uFF1A${this.task}
 \u5B8C\u6210\u540E\u76F4\u63A5\u8FD4\u56DE\u7ED3\u679C\uFF0C\u4E0D\u8981\u591A\u4F59\u89E3\u91CA\u3002`;
-        if (this.memoStore) {
-          const index = this.memoStore.buildIndex();
-          if (index) {
-            systemPrompt += `
-
-[\u5171\u4EAB\u5907\u5FD8\u5F55 - \u53EF\u7528 memo read \u8BFB\u53D6\u8BE6\u60C5]
-${index}`;
-          }
-        }
         conversation.setSystemPrompt(systemPrompt);
         conversation.addUserMessage(this.task);
         const tools = this.registry.toToolDefinitions(this.allowedTools);
@@ -1781,11 +1659,36 @@ ${index}`;
               continue;
             }
             try {
+              if (toolName === "edit-file") {
+                const editPath = params["path"];
+                if (!readTracker.hasRead(editPath)) {
+                  conversation.addToolResult(
+                    toolCall.id,
+                    `\u26A0 \u7981\u6B62\u7F16\u8F91\u672A\u8BFB\u53D6\u7684\u6587\u4EF6\u3002\u8BF7\u5148 read-file "${editPath}" \u4E86\u89E3\u5F53\u524D\u5185\u5BB9\uFF0C\u518D edit-file\u3002`
+                  );
+                  continue;
+                }
+              }
+              if (toolName === "write-file") {
+                const warn = readTracker.checkWriteOverwrite(
+                  params["path"],
+                  params["overwrite"]
+                );
+                if (warn) {
+                  conversation.addToolResult(toolCall.id, warn);
+                  continue;
+                }
+              }
               const result = await this.registry.execute(
                 toolName,
                 params,
                 this.config.max_tool_output
               );
+              if (toolName === "read-file") {
+                readTracker.markRead(params["path"]);
+              } else if (toolName === "write-file") {
+                readTracker.markWritten(params["path"]);
+              }
               conversation.addToolResult(toolCall.id, result.content);
             } catch (err) {
               const msg = err instanceof Error ? err.message : String(err);
@@ -1803,7 +1706,7 @@ ${index}`;
 });
 
 // src/tools/spawn-agents.ts
-function createSpawnAgentsTool(client, registry, config, tracker, memoStore) {
+function createSpawnAgentsTool(client, registry, config, tracker) {
   return {
     name: "spawn-agents",
     description: "\u5E76\u884C\u542F\u52A8\u591A\u4E2A\u5B50 Agent \u6267\u884C\u4EFB\u52A1\u3002\u6BCF\u4E2A\u5B50 Agent \u6709\u72EC\u7ACB\u5BF9\u8BDD\uFF0C\u9ED8\u8BA4\u53EA\u80FD\u7528\u53EA\u8BFB\u5DE5\u5177 (read-file, glob, grep)\u3002\u9002\u7528\u4E8E\u540C\u65F6\u8BFB\u53D6\u548C\u5206\u6790\u591A\u4E2A\u6587\u4EF6\u3001\u641C\u7D22\u591A\u4E2A\u6A21\u5F0F\u7B49\u573A\u666F\u3002",
@@ -1857,7 +1760,7 @@ function createSpawnAgentsTool(client, registry, config, tracker, memoStore) {
         if (tools.length === 0) {
           tools = DEFAULT_TOOLS.filter((t) => autoTools.includes(t));
         }
-        return new SubAgent(client, registry, config, task.description, tools, maxTurns, void 0, memoStore);
+        return new SubAgent(client, registry, config, task.description, tools, maxTurns);
       });
       const wrappedRuns = agents.map(
         (agent) => agent.run().then(
@@ -1898,7 +1801,7 @@ var init_spawn_agents = __esm({
   "src/tools/spawn-agents.ts"() {
     "use strict";
     init_sub_agent();
-    DEFAULT_TOOLS = ["read-file", "glob", "grep", "memo"];
+    DEFAULT_TOOLS = ["read-file", "glob", "grep"];
     MAX_CONCURRENT = 10;
     MAX_TURNS_LIMIT = 15;
   }
@@ -2012,96 +1915,262 @@ var init_todo = __esm({
   }
 });
 
-// src/tools/memo.ts
-function createMemoTool(store) {
+// src/core/sub-agents/runner.ts
+var DEFAULT_MAX_TURNS, SubAgentRunner;
+var init_runner = __esm({
+  "src/core/sub-agents/runner.ts"() {
+    "use strict";
+    init_conversation();
+    init_permission();
+    init_read_tracker();
+    DEFAULT_MAX_TURNS = 15;
+    SubAgentRunner = class {
+      client;
+      registry;
+      config;
+      agentConfig;
+      constructor(client, registry, config, agentConfig) {
+        this.client = client;
+        this.registry = registry;
+        this.config = config;
+        this.agentConfig = agentConfig;
+      }
+      /**
+       * 执行子 Agent 任务
+       */
+      async execute(task, context, callbacks = {}) {
+        const timeoutMs = (this.agentConfig.timeout ?? 120) * 1e3;
+        const maxTurns = this.agentConfig.max_turns ?? DEFAULT_MAX_TURNS;
+        return Promise.race([
+          this.run(task, context, maxTurns, callbacks),
+          this.timeout(timeoutMs)
+        ]);
+      }
+      timeout(ms) {
+        return new Promise((_, reject) => {
+          setTimeout(
+            () => reject(new Error(`\u5B50 Agent "${this.agentConfig.name}" \u8D85\u65F6\uFF08${ms / 1e3}s\uFF09`)),
+            ms
+          );
+        });
+      }
+      async run(task, context, maxTurns, callbacks) {
+        const conversation = new Conversation();
+        const readTracker = new ReadTracker();
+        conversation.setSystemPrompt(this.agentConfig.prompt);
+        let taskMessage = task;
+        if (context) {
+          taskMessage += `
+
+[\u4E0A\u4E0B\u6587]
+${context}`;
+        }
+        conversation.addUserMessage(taskMessage);
+        const tools = this.registry.toToolDefinitions(this.agentConfig.tools);
+        let lastContent = "";
+        for (let turn = 0; turn < maxTurns; turn++) {
+          const assistantMsg = await this.client.chatStream(
+            conversation.getMessages(),
+            tools.length > 0 ? tools : void 0,
+            callbacks
+          );
+          conversation.addAssistantMessage(assistantMsg);
+          if (!assistantMsg.tool_calls || assistantMsg.tool_calls.length === 0) {
+            lastContent = assistantMsg.content || "";
+            break;
+          }
+          for (const toolCall of assistantMsg.tool_calls) {
+            const toolName = toolCall.function.name;
+            if (!this.agentConfig.tools.includes(toolName)) {
+              conversation.addToolResult(
+                toolCall.id,
+                `\u5B50 Agent "${this.agentConfig.name}" \u4E0D\u5141\u8BB8\u4F7F\u7528\u5DE5\u5177 "${toolName}"`
+              );
+              continue;
+            }
+            let params;
+            try {
+              params = JSON.parse(toolCall.function.arguments);
+            } catch {
+              conversation.addToolResult(toolCall.id, "\u53C2\u6570\u89E3\u6790\u5931\u8D25\uFF1A\u65E0\u6548\u7684 JSON");
+              continue;
+            }
+            try {
+              if (toolName === "edit-file") {
+                const editPath = params["path"];
+                if (!readTracker.hasRead(editPath)) {
+                  conversation.addToolResult(
+                    toolCall.id,
+                    `\u26A0 \u7981\u6B62\u7F16\u8F91\u672A\u8BFB\u53D6\u7684\u6587\u4EF6\u3002\u8BF7\u5148 read-file "${editPath}" \u4E86\u89E3\u5F53\u524D\u5185\u5BB9\uFF0C\u518D edit-file\u3002`
+                  );
+                  continue;
+                }
+              }
+              if (toolName === "write-file") {
+                const warn = readTracker.checkWriteOverwrite(
+                  params["path"],
+                  params["overwrite"]
+                );
+                if (warn) {
+                  conversation.addToolResult(toolCall.id, warn);
+                  continue;
+                }
+              }
+              const permLevel = this.registry.getPermissionLevel(toolName);
+              if (permLevel === "deny") {
+                callbacks.onDenied?.(toolName);
+                conversation.addToolResult(toolCall.id, `\u5DE5\u5177 "${toolName}" \u5DF2\u88AB\u7981\u6B62\u6267\u884C`);
+                continue;
+              }
+              if (permLevel === "auto") {
+                callbacks.onToolExecuting?.(toolName, params);
+              }
+              if (permLevel === "confirm") {
+                const confirmResult = await confirmExecution(toolName, params);
+                if (!confirmResult.approved) {
+                  callbacks.onDenied?.(toolName, confirmResult.feedback);
+                  const denyMsg = confirmResult.feedback ? `\u7528\u6237\u62D2\u7EDD\u4E86\u6B64\u64CD\u4F5C\uFF0C\u7528\u6237\u53CD\u9988: ${confirmResult.feedback}` : "\u7528\u6237\u62D2\u7EDD\u4E86\u6B64\u64CD\u4F5C";
+                  conversation.addToolResult(toolCall.id, denyMsg);
+                  continue;
+                }
+              }
+              const result = await this.registry.execute(toolName, params, this.config.max_tool_output);
+              callbacks.onToolResult?.(toolName, result.content, result.truncated ?? false);
+              if (toolName === "read-file") {
+                readTracker.markRead(params["path"]);
+              } else if (toolName === "write-file") {
+                readTracker.markWritten(params["path"]);
+              }
+              conversation.addToolResult(toolCall.id, result.content);
+            } catch (err) {
+              const msg = err instanceof Error ? err.message : String(err);
+              conversation.addToolResult(toolCall.id, `\u5DE5\u5177\u6267\u884C\u5F02\u5E38\uFF1A${msg}`);
+            }
+          }
+          if (assistantMsg.content) {
+            lastContent = assistantMsg.content;
+          }
+        }
+        return lastContent;
+      }
+    };
+  }
+});
+
+// src/tools/dispatch.ts
+function createDispatchTool(defaultClient, toolRegistry, config, agentRegistry, callbacks) {
   return {
-    name: "memo",
-    description: "\u5171\u4EAB\u5907\u5FD8\u5F55\uFF1A\u5728\u591A\u4E2A Agent \u4E4B\u95F4\u5171\u4EAB\u4FE1\u606F\u3002write \u5199\u5165\u53D1\u73B0/\u51B3\u7B56/\u6458\u8981\u4F9B\u5176\u4ED6 Agent \u8BFB\u53D6\uFF0Cread \u6309 key \u8BFB\u53D6\uFF0Clist \u67E5\u770B\u6240\u6709\u53EF\u7528\u6761\u76EE\u3002",
+    name: "dispatch",
+    description: "\u8C03\u5EA6\u5B50 Agent \u6267\u884C\u4E13\u95E8\u4EFB\u52A1\u3002\u5B50 Agent \u6709\u72EC\u7ACB\u5BF9\u8BDD\u548C\u4E13\u5C5E\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF0C\u9002\u7528\u4E8E\u9700\u8981\u4E13\u4E1A\u89D2\u8272\u7684\u573A\u666F\u3002",
     parameters: {
       type: "object",
       properties: {
-        action: {
+        agent: {
           type: "string",
-          description: "\u64CD\u4F5C\u7C7B\u578B",
-          enum: ["write", "read", "list", "delete", "clear"]
+          description: `\u5B50 Agent \u540D\u79F0\u3002\u53EF\u9009: ${agentRegistry.listNames().join(", ")}`,
+          enum: agentRegistry.listNames()
         },
-        key: {
+        task: {
           type: "string",
-          description: "write/read/delete \u65F6\u5FC5\u586B\uFF1A\u5907\u5FD8\u5F55 key"
+          description: "\u8981\u6267\u884C\u7684\u5177\u4F53\u4EFB\u52A1\u63CF\u8FF0"
         },
-        content: {
+        context: {
           type: "string",
-          description: "write \u65F6\u5FC5\u586B\uFF1A\u8981\u5199\u5165\u7684\u5185\u5BB9\uFF08\u5EFA\u8BAE\u7B80\u6D01\u6458\u8981\uFF0C\u6700\u591A 3000 \u5B57\u7B26\uFF09"
+          description: "\u53EF\u9009\u7684\u989D\u5916\u4E0A\u4E0B\u6587\u4FE1\u606F\uFF08\u5982\u53C2\u8003\u6587\u4EF6\u8DEF\u5F84\u3001\u4F9D\u8D56\u5173\u7CFB\u7B49\uFF09"
         }
       },
-      required: ["action"]
+      required: ["agent", "task"]
     },
     permissionLevel: "auto",
     async execute(params) {
-      const action = params["action"];
-      switch (action) {
-        case "write": {
-          const key = params["key"];
-          const content = params["content"];
-          if (!key || !content) {
-            return { content: "\u9519\u8BEF\uFF1Awrite \u9700\u8981\u63D0\u4F9B key \u548C content" };
-          }
-          const entry = store.write(key, content);
-          return { content: `\u5DF2\u5199\u5165 memo [${entry.key}]\uFF08${entry.content.length} \u5B57\u7B26\uFF09` };
-        }
-        case "read": {
-          const key = params["key"];
-          if (!key) {
-            return { content: "\u9519\u8BEF\uFF1Aread \u9700\u8981\u63D0\u4F9B key" };
-          }
-          const entry = store.read(key);
-          if (!entry) {
-            return { content: `memo [${key}] \u4E0D\u5B58\u5728` };
-          }
-          return { content: `[${entry.key}] by ${entry.author}:
-${entry.content}` };
-        }
-        case "list": {
-          const items = store.list();
-          if (items.length === 0) {
-            return { content: "\u5907\u5FD8\u5F55\u4E3A\u7A7A" };
-          }
-          const lines = items.map(
-            (item) => `[${item.key}] (${item.author}) ${item.preview}`
-          );
-          return { content: `\u5171 ${items.length} \u6761\u5907\u5FD8\u5F55\uFF1A
-${lines.join("\n")}` };
-        }
-        case "delete": {
-          const key = params["key"];
-          if (!key) {
-            return { content: "\u9519\u8BEF\uFF1Adelete \u9700\u8981\u63D0\u4F9B key" };
-          }
-          const ok = store.delete(key);
-          return { content: ok ? `\u5DF2\u5220\u9664 memo [${key}]` : `memo [${key}] \u4E0D\u5B58\u5728` };
-        }
-        case "clear": {
-          store.clear();
-          return { content: "\u5907\u5FD8\u5F55\u5DF2\u6E05\u7A7A" };
-        }
-        default:
-          return { content: `\u9519\u8BEF\uFF1A\u672A\u77E5\u64CD\u4F5C "${action}"\u3002\u652F\u6301: write, read, list, delete, clear` };
+      const agentName = params["agent"];
+      const task = params["task"];
+      const context = params["context"];
+      const agentConfig = agentRegistry.get(agentName);
+      if (!agentConfig) {
+        return { content: `\u9519\u8BEF\uFF1A\u672A\u627E\u5230\u5B50 Agent "${agentName}"\u3002\u53EF\u7528: ${agentRegistry.listNames().join(", ")}` };
+      }
+      let client = defaultClient;
+      if (agentConfig.model) {
+        client = createLLMClient({
+          apiKey: agentConfig.model.api_key || config.api_key,
+          baseURL: agentConfig.model.base_url || config.base_url,
+          model: agentConfig.model.model || config.model,
+          temperature: config.temperature,
+          maxTokens: config.max_tokens
+        });
+      }
+      const runner = new SubAgentRunner(client, toolRegistry, config, agentConfig);
+      try {
+        const result = await runner.execute(task, context, callbacks?.() ?? {});
+        return { content: result || "\uFF08\u5B50 Agent \u6267\u884C\u5B8C\u6210\uFF0C\u65E0\u8F93\u51FA\uFF09" };
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        return { content: `\u5B50 Agent \u6267\u884C\u9519\u8BEF\uFF1A${msg}` };
       }
     }
   };
 }
-var init_memo = __esm({
-  "src/tools/memo.ts"() {
+var init_dispatch = __esm({
+  "src/tools/dispatch.ts"() {
     "use strict";
+    init_runner();
+    init_client();
   }
 });
 
 // src/cli/tui/bridge.ts
+function gray(text) {
+  return `${ANSI_GRAY}${text}${ANSI_RESET}`;
+}
 function createThinkFilter() {
   let inThink = false;
   let tagBuffer = "";
-  let lineStart = true;
+  let thinkLineBuffer = "";
+  let thinkHasVisibleContent = false;
+  let thinkLastEmittedBlank = false;
   let postThink = false;
+  function flushThinkLine(rawLine) {
+    const normalized = rawLine.trim();
+    if (!thinkHasVisibleContent && normalized.length === 0) return "";
+    if (normalized.length === 0) {
+      if (thinkLastEmittedBlank) return "";
+      thinkLastEmittedBlank = true;
+      return "\n";
+    }
+    thinkHasVisibleContent = true;
+    thinkLastEmittedBlank = false;
+    return `${gray(`  ${normalized}`)}
+`;
+  }
+  function appendOutsideText(current, text) {
+    if (!postThink) return current + text;
+    let result = current;
+    for (let i = 0; i < text.length; i++) {
+      const ch = text[i];
+      if (postThink && (ch === "\n" || ch === "\r" || ch === " " || ch === "	")) {
+        continue;
+      }
+      postThink = false;
+      result += text.slice(i);
+      break;
+    }
+    return result;
+  }
+  function appendThinkText(current, text) {
+    let result = current;
+    for (let i = 0; i < text.length; i++) {
+      const ch = text[i];
+      if (ch === "\r") continue;
+      if (ch === "\n") {
+        result += flushThinkLine(thinkLineBuffer);
+        thinkLineBuffer = "";
+      } else {
+        thinkLineBuffer += ch;
+      }
+    }
+    return result;
+  }
   return function filter(text) {
     let result = "";
     for (let i = 0; i < text.length; i++) {
@@ -2110,24 +2179,25 @@ function createThinkFilter() {
         tagBuffer += ch;
         if (tagBuffer === "<think>") {
           inThink = true;
-          lineStart = true;
+          thinkLineBuffer = "";
+          thinkHasVisibleContent = false;
+          thinkLastEmittedBlank = false;
           tagBuffer = "";
-          result += `\u256D\u2500 \u{1F4AD} ${THINK_BORDER}
+          result += `${gray("Thinking")}
 `;
         } else if (tagBuffer === "</think>") {
           inThink = false;
           postThink = true;
           tagBuffer = "";
-          result += `
-\u2570${THINK_BORDER}\u2500\u2500\u2500
-
-`;
-        } else if (!"<think>".startsWith(tagBuffer) && !"</think>".startsWith(tagBuffer)) {
-          if (inThink && lineStart) {
-            result += "\u2502 ";
-            lineStart = false;
+          if (thinkLineBuffer.length > 0) {
+            result += flushThinkLine(thinkLineBuffer);
+            thinkLineBuffer = "";
           }
-          result += tagBuffer;
+          while (result.endsWith("\n\n\n")) result = result.slice(0, -1);
+          result += "\n";
+        } else if (!"<think>".startsWith(tagBuffer) && !"</think>".startsWith(tagBuffer)) {
+          if (inThink) result = appendThinkText(result, tagBuffer);
+          else result = appendOutsideText(result, tagBuffer);
           tagBuffer = "";
         }
         continue;
@@ -2136,34 +2206,20 @@ function createThinkFilter() {
         tagBuffer = "<";
         continue;
       }
-      if (inThink) {
-        if (lineStart) {
-          result += "\u2502 ";
-          lineStart = false;
-        }
-        result += ch;
-        if (ch === "\n") {
-          lineStart = true;
-        }
-      } else {
-        if (postThink) {
-          if (ch === "\n" || ch === "\r" || ch === " " || ch === "	") continue;
-          postThink = false;
-        }
-        result += ch;
-      }
+      if (inThink) result = appendThinkText(result, ch);
+      else result = appendOutsideText(result, ch);
     }
     return result;
   };
 }
-function createTokenBatcher(dispatch) {
+function createTokenBatcher(dispatch, type) {
   let buffer = "";
   let timer = null;
   function flush() {
     if (buffer.length > 0) {
       const text = buffer;
       buffer = "";
-      dispatch({ type: "APPEND_CONTENT", text });
+      dispatch({ type, text });
     }
   }
   function start() {
@@ -2208,8 +2264,10 @@ function registerConfirmToolId(toolName, id) {
   activeToolIds.set(toolName, id);
 }
 function createBridgeCallbacks(dispatch) {
-  const batcher = createTokenBatcher(dispatch);
-  const thinkFilter = createThinkFilter();
+  const contentBatcher = createTokenBatcher(dispatch, "APPEND_CONTENT");
+  const thoughtBatcher = createTokenBatcher(dispatch, "APPEND_THOUGHT");
+  let inThink = false;
+  let tagBuffer = "";
   activeToolIds = /* @__PURE__ */ new Map();
   streamingToolIds = /* @__PURE__ */ new Map();
   lastStreamingArgs = /* @__PURE__ */ new Map();
@@ -2228,12 +2286,41 @@ function createBridgeCallbacks(dispatch) {
   }
   return {
     onContent: (text) => {
-      const filtered = thinkFilter(text);
-      if (filtered) batcher.append(filtered);
+      for (let i = 0; i < text.length; i++) {
+        const ch = text[i];
+        if (tagBuffer.length > 0 || ch === "<") {
+          tagBuffer += ch;
+          if (tagBuffer === "<think>") {
+            contentBatcher.flush();
+            inThink = true;
+            tagBuffer = "";
+            continue;
+          } else if (tagBuffer === "</think>") {
+            thoughtBatcher.flush();
+            inThink = false;
+            tagBuffer = "";
+            continue;
+          } else if (!"<think>".startsWith(tagBuffer) && !"</think>".startsWith(tagBuffer)) {
+            if (inThink) {
+              thoughtBatcher.append(tagBuffer);
+            } else {
+              contentBatcher.append(tagBuffer);
+            }
+            tagBuffer = "";
+          }
+          continue;
+        }
+        if (inThink) {
+          thoughtBatcher.append(ch);
+        } else {
+          contentBatcher.append(ch);
+        }
+      }
     },
     onToolCallStreaming: (index, name, accumulatedArgs) => {
       if (!streamingToolIds.has(index)) {
-        batcher.flush();
+        contentBatcher.flush();
+        thoughtBatcher.flush();
         const id2 = `tool-${++toolCallCounter}`;
         streamingToolIds.set(index, id2);
         activeToolIds.set(name, id2);
@@ -2253,8 +2340,10 @@ function createBridgeCallbacks(dispatch) {
     },
     onToolExecuting: (name, params) => {
       flushStreamingUpdate();
-      batcher.flush();
-      batcher.pause();
+      contentBatcher.flush();
+      thoughtBatcher.flush();
+      contentBatcher.pause();
+      thoughtBatcher.pause();
       const existingId = activeToolIds.get(name);
       const id = existingId || `tool-${++toolCallCounter}`;
       activeToolIds.set(name, id);
@@ -2268,41 +2357,36 @@ function createBridgeCallbacks(dispatch) {
       if (isWriteTool) {
         const code = extractCodeFromArgs(name, lastStreamingArgs.get(id) || "");
         const codeLines = code ? code.split("\n").length : 0;
-        summary = codeLines > 0 ? `${codeLines} \u884C` : truncated ? "\u8F93\u51FA\u5DF2\u622A\u65AD" : `${lines.length} \u884C`;
+        summary = codeLines > 0 ? `${codeLines} lines` : truncated ? "truncated" : `${lines.length} lines`;
       } else {
-        summary = truncated ? `\u8F93\u51FA\u5DF2\u622A\u65AD` : `${lines.length} \u884C`;
+        summary = truncated ? `truncated` : `${lines.length} lines`;
       }
       const preview = lines.slice(0, 5).join("\n").slice(0, 200);
       const resultContent = lines.length > 5 || preview.length >= 200 ? preview + "..." : preview;
       dispatch({ type: "TOOL_RESULT", id, resultSummary: summary, resultContent });
     },
-    onCoderStart: () => {
-      batcher.flush();
-      dispatch({ type: "CODER_START" });
-    },
-    onCoderEnd: () => {
-      dispatch({ type: "CODER_END" });
-    },
     onDenied: (toolName, feedback) => {
       const id = activeToolIds.get(toolName) || `tool-${++toolCallCounter}`;
       dispatch({ type: "TOOL_DENIED", id, feedback });
     },
     onError: (err) => {
-      batcher.stop();
+      contentBatcher.stop();
+      thoughtBatcher.stop();
       dispatch({ type: "SET_ERROR", error: err.message });
     },
-    // Called internally when streaming is complete
     _stopBatcher: () => {
-      batcher.stop();
+      contentBatcher.stop();
+      thoughtBatcher.stop();
     }
   };
 }
-var BATCH_INTERVAL_MS, THINK_BORDER, toolCallCounter, activeToolIds, streamingToolIds, lastStreamingArgs;
+var BATCH_INTERVAL_MS, ANSI_GRAY, ANSI_RESET, toolCallCounter, activeToolIds, streamingToolIds, lastStreamingArgs;
 var init_bridge = __esm({
   "src/cli/tui/bridge.ts"() {
     "use strict";
     BATCH_INTERVAL_MS = 64;
-    THINK_BORDER = "\u2500".repeat(40);
+    ANSI_GRAY = "\x1B[90m";
+    ANSI_RESET = "\x1B[0m";
     toolCallCounter = 0;
     activeToolIds = /* @__PURE__ */ new Map();
     streamingToolIds = /* @__PURE__ */ new Map();
@@ -2361,15 +2445,12 @@ var init_sub_agent_tracker = __esm({
 });
 
 // src/cli/tui/state.ts
-function createInitialState(modelName, agentMode, collaboration) {
+function createInitialState(modelName) {
   return {
     messages: [],
     isRunning: false,
     error: void 0,
-    coderWorking: false,
     modelName,
-    agentMode,
-    collaboration,
     todoPlan: null,
     subAgentProgress: null
   };
@@ -2439,6 +2520,21 @@ function tuiReducer(state, action) {
         })
       };
     }
+    case "APPEND_THOUGHT": {
+      return {
+        ...state,
+        messages: updateLastAssistant(state.messages, (msg) => {
+          const blocks = [...msg.blocks];
+          const last = blocks[blocks.length - 1];
+          if (last && last.type === "thought") {
+            blocks[blocks.length - 1] = { type: "thought", text: last.text + action.text };
+          } else {
+            blocks.push({ type: "thought", text: action.text });
+          }
+          return { ...msg, blocks };
+        })
+      };
+    }
     case "TOOL_EXECUTING": {
       return {
         ...state,
@@ -2584,14 +2680,8 @@ function tuiReducer(state, action) {
       return { ...state, error: action.error, isRunning: false };
     case "CLEAR_ERROR":
       return { ...state, error: void 0 };
-    case "CODER_START":
-      return { ...state, coderWorking: true };
-    case "CODER_END":
-      return { ...state, coderWorking: false };
     case "CLEAR_MESSAGES":
       return { ...state, messages: [] };
-    case "SET_MODE":
-      return { ...state, agentMode: action.agentMode, collaboration: action.collaboration };
     case "SET_TODO_PLAN":
       return { ...state, todoPlan: action.plan };
     case "SET_SUB_AGENT_PROGRESS":
@@ -2614,136 +2704,78 @@ import { jsx, jsxs } from "react/jsx-runtime";
 function getToolParamSummary(name, params) {
   switch (name) {
     case "bash":
-      return String(params["command"] || "").slice(0, 60);
+      return String(params["command"] || "").slice(0, 100);
     case "read-file":
     case "write-file":
     case "edit-file":
       return String(params["path"] || "");
     case "glob":
-      return String(params["pattern"] || "");
     case "grep":
       return String(params["pattern"] || "");
-    case "send-to-coder":
-      return String(params["task"] || "").slice(0, 40);
-    case "spawn-agents": {
-      const tasks = params["tasks"];
-      if (!tasks) return "";
-      if (tasks.length <= 2) {
-        return tasks.map((t) => t.description.slice(0, 30)).join(", ");
-      }
-      return `${tasks.length} \u4E2A\u5E76\u884C\u4EFB\u52A1`;
-    }
-    case "todo": {
-      const action = String(params["action"] || "");
-      const id = params["id"] ? ` [${params["id"]}]` : "";
-      return `${action}${id}`;
-    }
-    case "memo": {
-      const action = String(params["action"] || "");
-      const key = params["key"] ? ` [${params["key"]}]` : "";
-      return `${action}${key}`;
-    }
-    default: {
-      const keys = Object.keys(params);
-      if (keys.length > 0 && keys[0]) {
-        return String(params[keys[0]] || "").slice(0, 40);
-      }
-      return "";
-    }
-  }
-}
-function getToolIcon(name) {
-  switch (name) {
-    case "bash":
-      return "$";
-    case "write-file":
-      return "+";
-    case "edit-file":
-      return "\xB1";
-    case "read-file":
-      return "\u{1F4C4}";
-    case "glob":
-      return "\u{1F50D}";
-    case "grep":
-      return "\u{1F50D}";
-    case "spawn-agents":
-      return "\u26A1";
-    case "todo":
-      return "\u{1F4CB}";
-    case "memo":
-      return "\u{1F4DD}";
     default:
-      return "\u2699";
+      const keys = Object.keys(params);
+      return keys.length > 0 ? String(params[keys[0]] || "").slice(0, 60) : "";
   }
 }
-function getCodeContent(name, params) {
-  if (name === "write-file") {
-    return params["content"] || null;
+function truncateContent(text, maxLines) {
+  const lines = text.split("\n");
+  const result = [];
+  for (let line of lines) {
+    if (result.length >= maxLines) break;
+    result.push(line.replace(/\r/g, "").replace(/\t/g, "  "));
   }
-  if (name === "edit-file") {
-    return params["new_string"] || null;
+  if (lines.length > maxLines) {
+    result.push(`... (and ${lines.length - maxLines} more lines)`);
   }
-  return null;
-}
-function truncateCode(code, maxLines) {
-  const lines = code.split("\n");
-  if (lines.length <= maxLines) return code;
-  return lines.slice(0, maxLines).join("\n") + `
-... (\u5171 ${lines.length} \u884C)`;
+  return result;
 }
 function ToolCallLine({ toolCall }) {
-  const { name, params, status, resultSummary, resultContent, denyFeedback } = toolCall;
+  const { name, params, status, resultContent, denyFeedback } = toolCall;
   const summary = getToolParamSummary(name, params);
-  const icon = getToolIcon(name);
-  const isWriteTool = name === "write-file" || name === "edit-file";
-  const rawCode = isWriteTool && status === "done" ? getCodeContent(name, params) : null;
-  let statusNode;
-  let statusText = "";
-  switch (status) {
-    case "running":
-      statusNode = /* @__PURE__ */ jsx(Text, { color: "yellow", children: "\u23F3" });
-      break;
-    case "done":
-      statusNode = /* @__PURE__ */ jsx(Text, { color: "green", children: "\u2713" });
-      statusText = resultSummary || "";
-      break;
-    case "denied":
-      statusNode = /* @__PURE__ */ jsx(Text, { color: "red", children: "\u2717" });
-      statusText = "denied";
-      break;
-    case "confirming":
-      statusNode = /* @__PURE__ */ jsx(Text, { color: "yellow", children: "\u26A0" });
-      statusText = "[y/N]";
-      break;
+  let borderColor = "#504945";
+  let titleColor = "#fabd2f";
+  let statusColor = "#fabd2f";
+  let statusText = "RUNNING";
+  if (status === "done") {
+    borderColor = "#b8bb26";
+    titleColor = "#b8bb26";
+    statusColor = "#b8bb26";
+    statusText = "DONE";
+  } else if (status === "denied") {
+    borderColor = "#fb4934";
+    titleColor = "#fb4934";
+    statusColor = "#fb4934";
+    statusText = "DENIED";
+  } else if (status === "confirming") {
+    borderColor = "#fe8019";
+    titleColor = "#fe8019";
+    statusColor = "#fe8019";
+    statusText = "CONFIRM";
   }
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [
-    /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
-      statusNode,
-      /* @__PURE__ */ jsxs(Text, { color: "yellow", bold: true, children: [
-        icon,
-        " ",
-        name
-      ] }),
-      summary ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: summary }) : null,
-      statusText ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: statusText }) : null
-    ] }),
-    status === "done" && rawCode && /* @__PURE__ */ jsx(Box, { marginLeft: 3, marginTop: 0, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: truncateCode(rawCode, 5) }) }),
-    status === "done" && !isWriteTool && resultContent && /* @__PURE__ */ jsx(
-      Box,
-      {
-        marginLeft: 3,
-        marginTop: 0,
-        borderStyle: "single",
-        borderColor: "gray",
-        paddingX: 1,
-        children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: resultContent })
-      }
-    ),
-    status === "denied" && denyFeedback && /* @__PURE__ */ jsxs(Box, { marginLeft: 3, gap: 1, children: [
-      /* @__PURE__ */ jsx(Text, { color: "red", children: "\u53CD\u9988:" }),
-      /* @__PURE__ */ jsx(Text, { children: denyFeedback })
-    ] })
-  ] });
+  const contentLines = resultContent ? truncateContent(resultContent, 15) : [];
+  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginTop: 0, marginBottom: 1, width: "100%", children: /* @__PURE__ */ jsxs(
+    Box,
+    {
+      flexDirection: "column",
+      borderStyle: "round",
+      borderColor,
+      paddingX: 1,
+      width: "100%",
+      children: [
+        /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
+          /* @__PURE__ */ jsx(Box, { backgroundColor: statusColor, width: 9, justifyContent: "center", children: /* @__PURE__ */ jsx(Text, { color: "#282828", bold: true, children: statusText }) }),
+          /* @__PURE__ */ jsx(Text, { color: titleColor, bold: true, children: name.toUpperCase() }),
+          /* @__PURE__ */ jsx(Text, { color: "#ebdbb2", dimColor: true, italic: true, wrap: "truncate-end", children: summary })
+        ] }),
+        status === "done" && contentLines.length > 0 && /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginTop: 1, children: contentLines.map((line, i) => /* @__PURE__ */ jsx(Text, { color: "#ebdbb2", wrap: "truncate-end", children: line }, i)) }),
+        status === "denied" && denyFeedback && /* @__PURE__ */ jsxs(Box, { gap: 1, marginTop: 0, children: [
+          /* @__PURE__ */ jsx(Text, { color: "#fb4934", bold: true, children: "REASON:" }),
+          /* @__PURE__ */ jsx(Text, { color: "#ebdbb2", children: denyFeedback })
+        ] }),
+        status === "confirming" && /* @__PURE__ */ jsx(Box, { marginTop: 0, children: /* @__PURE__ */ jsx(Text, { color: "#fe8019", italic: true, children: "Waiting for your permission..." }) })
+      ]
+    }
+  ) });
 }
 var init_ToolCallLine = __esm({
   "src/cli/tui/components/ToolCallLine.tsx"() {
@@ -2762,209 +2794,94 @@ var init_MessageBubble = __esm({
     init_ToolCallLine();
     MessageBubble = React.memo(function MessageBubble2({ message }) {
       const { role, blocks, isStreaming } = message;
-      const color = role === "user" ? "green" : role === "assistant" ? "cyan" : "gray";
-      const icon = role === "user" ? ">" : role === "assistant" ? "\u25C6" : "\u2022";
-      return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginBottom: 1, children: [
-        blocks.map((block, i) => {
-          if (block.type === "text") {
-            return /* @__PURE__ */ jsxs2(Box2, { children: [
-              i === 0 ? /* @__PURE__ */ jsxs2(Text2, { color, bold: true, children: [
-                icon,
-                " "
-              ] }) : /* @__PURE__ */ jsx2(Text2, { children: "  " }),
-              /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", flexGrow: 1, children: /* @__PURE__ */ jsx2(Text2, { children: block.text }) })
-            ] }, `text-${i}`);
-          } else {
-            return /* @__PURE__ */ jsx2(ToolCallLine, { toolCall: block.toolCall }, block.toolCall.id);
-          }
-        }),
-        blocks.length === 0 && /* @__PURE__ */ jsxs2(Box2, { children: [
-          /* @__PURE__ */ jsxs2(Text2, { color, bold: true, children: [
-            icon,
-            " "
-          ] }),
-          isStreaming && /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "..." })
-        ] })
-      ] });
-    });
-  }
-});
-
-// src/cli/tui/components/ChatArea.tsx
-import React2, { useRef } from "react";
-import { Static, Box as Box3, Text as Text3 } from "ink";
-import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
-function splitMessages(messages) {
-  let staticEnd = 0;
-  for (let i = 0; i < messages.length; i++) {
-    if (messages[i].isStreaming || messages[i].confirmPending) break;
-    staticEnd = i + 1;
-  }
-  const dynamicMsgs = messages.slice(staticEnd);
-  const streamingMsg = dynamicMsgs.find((m) => m.isStreaming) || null;
-  const otherDynamic = dynamicMsgs.filter((m) => m !== streamingMsg);
-  return {
-    staticMsgs: messages.slice(0, staticEnd),
-    streamingMsg,
-    otherDynamic
-  };
-}
-function extractFromBlocks(msg, staticItems, dynamicNodes, isStreaming) {
-  let lineIdx = 0;
-  for (let bi = 0; bi < msg.blocks.length; bi++) {
-    const block = msg.blocks[bi];
-    const isLastBlock = bi === msg.blocks.length - 1;
-    if (block.type === "text") {
-      const lines = block.text.split("\n");
-      if (isStreaming && isLastBlock) {
-        const partial = lines.pop() || "";
-        for (const line of lines) {
-          staticItems.push({
-            id: `${msg.id}-L${lineIdx}`,
-            type: "line",
-            text: line,
-            isFirstLine: lineIdx === 0
-          });
-          lineIdx++;
-        }
-        if (partial || lineIdx === 0) {
-          dynamicNodes.push(
-            /* @__PURE__ */ jsxs3(Box3, { children: [
-              /* @__PURE__ */ jsx3(Text3, { color: "cyan", bold: true, children: lineIdx === 0 ? "\u25C6 " : "  " }),
-              /* @__PURE__ */ jsx3(Box3, { flexGrow: 1, children: /* @__PURE__ */ jsx3(Text3, { children: partial }) })
-            ] }, "partial")
-          );
-        }
-      } else {
-        for (const line of lines) {
-          staticItems.push({
-            id: `${msg.id}-L${lineIdx}`,
-            type: "line",
-            text: line,
-            isFirstLine: lineIdx === 0
-          });
-          lineIdx++;
-        }
-      }
-    } else if (block.type === "tool") {
-      const tc = block.toolCall;
-      const isWriteTool = tc.name === "write-file" || tc.name === "edit-file";
-      staticItems.push({
-        id: `${msg.id}-TH${tc.id}`,
-        type: "tool-header",
-        toolCall: tc
-      });
-      if (isWriteTool && tc.status === "running" && isStreaming) {
-        const lineCount = parseInt(tc.streamingContent || "0", 10);
-        dynamicNodes.push(
-          /* @__PURE__ */ jsx3(Box3, { paddingX: 1, marginLeft: 4, children: /* @__PURE__ */ jsxs3(Text3, { color: "cyan", children: [
-            "\u270E \u751F\u6210\u4E2D...",
-            lineCount > 0 ? ` ${lineCount} \u884C` : ""
-          ] }) }, `tool-progress-${tc.id}`)
-        );
-      }
-      if (tc.status === "done" || tc.status === "denied") {
-        staticItems.push({
-          id: `${msg.id}-TD${tc.id}`,
-          type: "tool-done",
-          toolCall: tc
-        });
-      }
-    }
-  }
-}
-function renderStaticItem(item) {
-  if (item.type === "message") {
-    return /* @__PURE__ */ jsx3(Box3, { paddingX: 1, children: /* @__PURE__ */ jsx3(MessageBubble, { message: item.message }) }, item.id);
-  }
-  if (item.type === "line") {
-    return /* @__PURE__ */ jsxs3(Box3, { paddingX: 1, children: [
-      /* @__PURE__ */ jsx3(Text3, { color: "cyan", bold: true, children: item.isFirstLine ? "\u25C6 " : "  " }),
-      /* @__PURE__ */ jsx3(Text3, { children: item.text })
-    ] }, item.id);
-  }
-  if (item.type === "tool-header") {
-    const tc = item.toolCall;
-    const icon = getToolIcon(tc.name);
-    const summary = getToolParamSummary(tc.name, tc.params);
-    return /* @__PURE__ */ jsx3(Box3, { paddingX: 1, marginLeft: 2, children: /* @__PURE__ */ jsxs3(Box3, { gap: 1, children: [
-      /* @__PURE__ */ jsx3(Text3, { color: "yellow", children: "\u23F3" }),
-      /* @__PURE__ */ jsxs3(Text3, { color: "yellow", bold: true, children: [
-        icon,
-        " ",
-        tc.name
-      ] }),
-      summary ? /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: summary }) : null
-    ] }) }, item.id);
-  }
-  if (item.type === "tool-done") {
-    return /* @__PURE__ */ jsx3(Box3, { paddingX: 1, marginLeft: 0, children: /* @__PURE__ */ jsx3(ToolCallLine, { toolCall: item.toolCall }) }, item.id);
+      const isUser = role === "user";
+      const label = isUser ? "USER" : "AI";
+      const labelBg = isUser ? "#b8bb26" : "#83a598";
+      const labelFg = "#282828";
+      const contentColor = isUser ? "#ebdbb2" : "#ebdbb2";
+      return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginBottom: 1, width: "100%", children: [
+        /* @__PURE__ */ jsxs2(Box2, { marginBottom: 0, children: [
+          /* @__PURE__ */ jsx2(Box2, { backgroundColor: labelBg, width: 9, paddingLeft: 1, marginRight: 1, children: /* @__PURE__ */ jsx2(Text2, { color: labelFg, bold: true, children: label }) }),
+          isStreaming && /* @__PURE__ */ jsx2(Text2, { color: "#83a598", dimColor: true, italic: true, children: "typing..." })
+        ] }),
+        /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", width: "100%", children: [
+          blocks.map((block, i) => {
+            if (block.type === "text") {
+              const text = block.text.trim();
+              if (!text && !isStreaming) return null;
+              return /* @__PURE__ */ jsx2(Box2, { paddingLeft: 2, marginBottom: i < blocks.length - 1 ? 1 : 0, width: "100%", children: /* @__PURE__ */ jsx2(Text2, { color: contentColor, children: text }) }, `text-${i}`);
+            } else if (block.type === "thought") {
+              return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginBottom: 0, width: "100%", children: [
+                /* @__PURE__ */ jsx2(Box2, { gap: 1, marginBottom: 0, children: /* @__PURE__ */ jsx2(Box2, { backgroundColor: "#504945", width: 9, justifyContent: "center", children: /* @__PURE__ */ jsx2(Text2, { color: "#a89984", bold: true, children: "THINK" }) }) }),
+                /* @__PURE__ */ jsx2(Box2, { paddingLeft: 2, marginBottom: 0, children: /* @__PURE__ */ jsx2(Text2, { color: "#928374", italic: true, children: block.text.trim() }) })
+              ] }, `thought-${i}`);
+            } else {
+              return /* @__PURE__ */ jsx2(Box2, { paddingLeft: 2, width: "100%", children: /* @__PURE__ */ jsx2(ToolCallLine, { toolCall: block.toolCall }) }, block.toolCall.id);
+            }
+          }),
+          blocks.length === 0 && isStreaming && /* @__PURE__ */ jsx2(Box2, { paddingLeft: 2, children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "..." }) })
+        ] })
+      ] });
+    });
   }
-  return null;
-}
+});
+
+// src/cli/tui/components/ChatArea.tsx
+import React2 from "react";
+import { Box as Box3 } from "ink";
+import { jsx as jsx3 } from "react/jsx-runtime";
 var ChatArea;
 var init_ChatArea = __esm({
   "src/cli/tui/components/ChatArea.tsx"() {
     "use strict";
     init_MessageBubble();
-    init_ToolCallLine();
     ChatArea = React2.memo(function ChatArea2({ messages }) {
-      const { staticMsgs, streamingMsg, otherDynamic } = splitMessages(messages);
-      const streamedIds = useRef(/* @__PURE__ */ new Set());
-      if (streamingMsg) {
-        streamedIds.current.add(streamingMsg.id);
-      }
-      const currentItems = [];
-      for (const msg of staticMsgs) {
-        if (streamedIds.current.has(msg.id)) {
-          const ignore = [];
-          extractFromBlocks(msg, currentItems, ignore, false);
-        } else {
-          currentItems.push({ id: msg.id, type: "message", message: msg });
-        }
-      }
-      const dynamicNodes = [];
-      if (streamingMsg) {
-        extractFromBlocks(streamingMsg, currentItems, dynamicNodes, true);
-      }
-      const seenIds = useRef(/* @__PURE__ */ new Set());
-      const accumulated = useRef([]);
-      let hasNew = false;
-      for (const item of currentItems) {
-        if (!seenIds.current.has(item.id)) {
-          seenIds.current.add(item.id);
-          accumulated.current.push(item);
-          hasNew = true;
-        }
-      }
-      if (hasNew) {
-        accumulated.current = [...accumulated.current];
-      }
-      const staticItems = accumulated.current;
-      const showPlaceholder = streamingMsg && streamingMsg.blocks.length === 0;
-      return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-        staticItems.length > 0 && /* @__PURE__ */ jsx3(Static, { items: staticItems, children: renderStaticItem }),
-        (dynamicNodes.length > 0 || showPlaceholder) && /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", paddingX: 1, children: [
-          showPlaceholder && /* @__PURE__ */ jsxs3(Box3, { children: [
-            /* @__PURE__ */ jsx3(Text3, { color: "cyan", bold: true, children: "\u25C6 " }),
-            /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "..." })
-          ] }),
-          dynamicNodes
-        ] }),
-        otherDynamic.map((msg) => /* @__PURE__ */ jsx3(Box3, { paddingX: 1, children: /* @__PURE__ */ jsx3(MessageBubble, { message: msg }) }, msg.id))
-      ] });
+      return /* @__PURE__ */ jsx3(Box3, { flexDirection: "column", width: "100%", children: messages.map((msg) => /* @__PURE__ */ jsx3(MessageBubble, { message: msg }, msg.id)) });
     });
   }
 });
 
 // src/cli/tui/components/InputArea.tsx
-import { useState } from "react";
-import { Box as Box4, Text as Text4, useInput } from "ink";
-import { Fragment, jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
-function CleanTextInput({ onSubmit, placeholder }) {
+import { useRef, useState } from "react";
+import { Box as Box4, Text as Text3, useInput } from "ink";
+import { Fragment, jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
+function CleanTextInput({
+  onSubmit,
+  placeholder,
+  onExitRequest,
+  onScroll
+}) {
   const [value, setValue] = useState("");
   const [cursor, setCursor] = useState(0);
+  const lastCtrlCAtRef = useRef(0);
   useInput((input, key) => {
+    if (onScroll) {
+      if (key.pageUp || key.upArrow && key.shift) {
+        onScroll("up");
+        return;
+      }
+      if (key.pageDown || key.downArrow && key.shift) {
+        onScroll("down");
+        return;
+      }
+    }
+    if (input === "c" && key.ctrl) {
+      if (value.length > 0) {
+        setValue("");
+        setCursor(0);
+        lastCtrlCAtRef.current = 0;
+        return;
+      }
+      const now = Date.now();
+      const isDoublePress = now - lastCtrlCAtRef.current <= 1200;
+      if (isDoublePress) {
+        onExitRequest();
+        lastCtrlCAtRef.current = 0;
+      } else {
+        lastCtrlCAtRef.current = now;
+      }
+      return;
+    }
     if (key.return) {
       const trimmed = value.trim();
       if (trimmed) {
@@ -3017,30 +2934,33 @@ function CleanTextInput({ onSubmit, placeholder }) {
     setCursor((prev) => prev + input.length);
   });
   if (value.length === 0) {
-    return /* @__PURE__ */ jsxs4(Fragment, { children: [
-      /* @__PURE__ */ jsx4(Text4, { inverse: true, children: " " }),
-      /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: placeholder || "" })
+    return /* @__PURE__ */ jsxs3(Fragment, { children: [
+      /* @__PURE__ */ jsx4(Text3, { inverse: true, children: " " }),
+      /* @__PURE__ */ jsx4(Text3, { dimColor: true, children: placeholder || "" })
     ] });
   }
   const before = value.slice(0, cursor);
   const at = cursor < value.length ? value[cursor] : " ";
   const after = cursor < value.length ? value.slice(cursor + 1) : "";
-  return /* @__PURE__ */ jsxs4(Fragment, { children: [
-    /* @__PURE__ */ jsx4(Text4, { children: before }),
-    /* @__PURE__ */ jsx4(Text4, { inverse: true, children: at }),
-    /* @__PURE__ */ jsx4(Text4, { children: after })
+  return /* @__PURE__ */ jsxs3(Fragment, { children: [
+    /* @__PURE__ */ jsx4(Text3, { children: before }),
+    /* @__PURE__ */ jsx4(Text3, { inverse: true, children: at }),
+    /* @__PURE__ */ jsx4(Text3, { children: after })
   ] });
 }
-function InputArea({ onSubmit, isRunning }) {
-  return /* @__PURE__ */ jsxs4(Box4, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx4(Text4, { color: isRunning ? "gray" : "green", bold: true, children: "> " }),
-    isRunning ? /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "\u7B49\u5F85\u56DE\u590D\u4E2D..." }) : /* @__PURE__ */ jsx4(
+function InputArea({ onSubmit, isRunning, onExitRequest, onScroll }) {
+  return /* @__PURE__ */ jsxs3(Box4, { paddingX: 0, children: [
+    /* @__PURE__ */ jsx4(Box4, { backgroundColor: isRunning ? "#504945" : "#b8bb26", paddingX: 1, marginRight: 1, children: /* @__PURE__ */ jsx4(Text3, { color: "#282828", bold: true, children: isRunning ? " WAIT " : " INPUT " }) }),
+    /* @__PURE__ */ jsx4(Box4, { flexGrow: 1, children: isRunning ? /* @__PURE__ */ jsx4(Box4, { flexGrow: 1, onWheel: (event) => {
+    }, children: /* @__PURE__ */ jsx4(Text3, { color: "#a89984", italic: true, children: "Thinking..." }) }) : /* @__PURE__ */ jsx4(
       CleanTextInput,
       {
         onSubmit,
-        placeholder: "\u8F93\u5165\u6D88\u606F\u6216 /\u547D\u4EE4..."
+        placeholder: "Type a message or /command...",
+        onExitRequest,
+        onScroll
       }
-    )
+    ) })
   ] });
 }
 var init_InputArea = __esm({
@@ -3050,43 +2970,36 @@ var init_InputArea = __esm({
 });
 
 // src/cli/tui/components/StatusBar.tsx
-import { Box as Box5, Text as Text5 } from "ink";
-import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
-function StatusBar({ agentMode, collaboration, coderWorking, isRunning, modelName, todoPlan, subAgentProgress }) {
-  const modeLabel = agentMode === "dual" ? `dual(${collaboration})` : "single";
+import { Box as Box5, Text as Text4 } from "ink";
+import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+function StatusBar({ isRunning, modelName, todoPlan, subAgentProgress }) {
   const todoProgress = todoPlan ? `${todoPlan.items.filter((i) => i.status === "completed").length}/${todoPlan.items.length}` : null;
-  return /* @__PURE__ */ jsxs5(Box5, { paddingX: 1, gap: 1, children: [
-    /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "\u2500\u2500" }),
-    /* @__PURE__ */ jsx5(Text5, { bold: true, children: modeLabel }),
-    /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "\u25B6" }),
-    /* @__PURE__ */ jsx5(Text5, { bold: true, children: modelName }),
-    coderWorking && /* @__PURE__ */ jsxs5(Fragment2, { children: [
-      /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "\u2502" }),
-      /* @__PURE__ */ jsx5(Text5, { color: "yellow", children: "\u2699 coder" })
-    ] }),
-    isRunning && !coderWorking && !subAgentProgress && /* @__PURE__ */ jsxs5(Fragment2, { children: [
-      /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "\u2502" }),
-      /* @__PURE__ */ jsx5(Text5, { color: "cyan", children: "thinking..." })
-    ] }),
-    subAgentProgress && /* @__PURE__ */ jsxs5(Fragment2, { children: [
-      /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "\u2502" }),
-      /* @__PURE__ */ jsxs5(Text5, { color: "magenta", children: [
-        "\u26A1 ",
-        subAgentProgress.completed + subAgentProgress.failed,
-        "/",
-        subAgentProgress.total,
-        " agents"
-      ] })
-    ] }),
-    todoProgress && /* @__PURE__ */ jsxs5(Fragment2, { children: [
-      /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "\u2502" }),
-      /* @__PURE__ */ jsxs5(Text5, { color: "cyan", children: [
-        "plan ",
-        todoProgress
+  return /* @__PURE__ */ jsxs4(Box5, { marginTop: 1, children: [
+    /* @__PURE__ */ jsx5(Box5, { backgroundColor: "#3c3836", paddingX: 1, children: /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", bold: true, children: " ZENCODE " }) }),
+    /* @__PURE__ */ jsxs4(Box5, { backgroundColor: "#504945", paddingX: 1, flexGrow: 1, children: [
+      /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", children: modelName }),
+      isRunning && !subAgentProgress && /* @__PURE__ */ jsxs4(Fragment2, { children: [
+        /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", children: " \u2502 " }),
+        /* @__PURE__ */ jsx5(Text4, { color: "#8ec07c", children: "\u25CF thinking..." })
+      ] }),
+      subAgentProgress && /* @__PURE__ */ jsxs4(Fragment2, { children: [
+        /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", children: " \u2502 " }),
+        /* @__PURE__ */ jsxs4(Text4, { color: "#b8bb26", children: [
+          "\u{1F916} Agents: ",
+          subAgentProgress.completed + subAgentProgress.failed,
+          "/",
+          subAgentProgress.total
+        ] })
+      ] }),
+      todoProgress && /* @__PURE__ */ jsxs4(Fragment2, { children: [
+        /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", children: " \u2502 " }),
+        /* @__PURE__ */ jsxs4(Text4, { color: "#fabd2f", children: [
+          "\u{1F4CB} Plan: ",
+          todoProgress
+        ] })
       ] })
     ] }),
-    /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "\u2502" }),
-    /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "/help" })
+    /* @__PURE__ */ jsx5(Box5, { backgroundColor: "#3c3836", paddingX: 1, children: /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", children: "/help" }) })
   ] });
 }
 var init_StatusBar = __esm({
@@ -3097,8 +3010,8 @@ var init_StatusBar = __esm({
 
 // src/cli/tui/components/ConfirmPrompt.tsx
 import { useState as useState2 } from "react";
-import { Box as Box6, Text as Text6, useInput as useInput2 } from "ink";
-import { Fragment as Fragment3, jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Box as Box6, Text as Text5, useInput as useInput2 } from "ink";
+import { Fragment as Fragment3, jsx as jsx6, jsxs as jsxs5 } from "react/jsx-runtime";
 function getToolDetails(toolName, params) {
   const lines = [];
   let label = toolName;
@@ -3184,18 +3097,18 @@ function FeedbackInput({ onSubmit }) {
     setCursor((prev) => prev + input.length);
   });
   if (value.length === 0) {
-    return /* @__PURE__ */ jsxs6(Fragment3, { children: [
-      /* @__PURE__ */ jsx6(Text6, { inverse: true, children: " " }),
-      /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "\u8F93\u5165\u53CD\u9988\u6307\u4EE4\u7ED9 AI..." })
+    return /* @__PURE__ */ jsxs5(Fragment3, { children: [
+      /* @__PURE__ */ jsx6(Text5, { inverse: true, children: " " }),
+      /* @__PURE__ */ jsx6(Text5, { dimColor: true, children: "\u8F93\u5165\u53CD\u9988\u6307\u4EE4\u7ED9 AI..." })
     ] });
   }
   const before = value.slice(0, cursor);
   const at = cursor < value.length ? value[cursor] : " ";
   const after = cursor < value.length ? value.slice(cursor + 1) : "";
-  return /* @__PURE__ */ jsxs6(Fragment3, { children: [
-    /* @__PURE__ */ jsx6(Text6, { children: before }),
-    /* @__PURE__ */ jsx6(Text6, { inverse: true, children: at }),
-    /* @__PURE__ */ jsx6(Text6, { children: after })
+  return /* @__PURE__ */ jsxs5(Fragment3, { children: [
+    /* @__PURE__ */ jsx6(Text5, { children: before }),
+    /* @__PURE__ */ jsx6(Text5, { inverse: true, children: at }),
+    /* @__PURE__ */ jsx6(Text5, { children: after })
   ] });
 }
 function ConfirmPrompt({ confirm, onRespond }) {
@@ -3223,66 +3136,69 @@ function ConfirmPrompt({ confirm, onRespond }) {
   }, { isActive: !feedbackMode });
   const { lines, label } = getToolDetails(confirm.toolName, confirm.params);
   if (feedbackMode) {
-    return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", paddingX: 1, children: [
-      /* @__PURE__ */ jsxs6(
+    return /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", paddingX: 0, marginY: 1, children: [
+      /* @__PURE__ */ jsx6(Box6, { backgroundColor: "#fe8019", paddingX: 1, children: /* @__PURE__ */ jsx6(Text5, { color: "#282828", bold: true, children: " FEEDBACK " }) }),
+      /* @__PURE__ */ jsxs5(
         Box6,
         {
           flexDirection: "column",
           borderStyle: "round",
-          borderColor: "yellow",
+          borderColor: "#fe8019",
           paddingX: 1,
           children: [
-            /* @__PURE__ */ jsx6(Text6, { bold: true, color: "yellow", children: label }),
-            lines.map((line, i) => /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: line }, i))
+            /* @__PURE__ */ jsx6(Text5, { bold: true, color: "#fabd2f", children: label }),
+            lines.map((line, i) => /* @__PURE__ */ jsx6(Text5, { color: "#a89984", children: line }, i)),
+            /* @__PURE__ */ jsxs5(Box6, { marginTop: 1, gap: 1, children: [
+              /* @__PURE__ */ jsx6(Text5, { color: "#83a598", bold: true, children: "Reason: " }),
+              /* @__PURE__ */ jsx6(
+                FeedbackInput,
+                {
+                  onSubmit: (text) => {
+                    const trimmed = text.trim();
+                    if (trimmed) {
+                      onRespond({ feedback: trimmed });
+                    } else {
+                      setFeedbackMode(false);
+                    }
+                  }
+                }
+              )
+            ] })
           ]
         }
       ),
-      /* @__PURE__ */ jsxs6(Box6, { paddingX: 1, gap: 1, children: [
-        /* @__PURE__ */ jsx6(Text6, { color: "cyan", children: "\u53CD\u9988: " }),
-        /* @__PURE__ */ jsx6(
-          FeedbackInput,
-          {
-            onSubmit: (text) => {
-              const trimmed = text.trim();
-              if (trimmed) {
-                onRespond({ feedback: trimmed });
-              } else {
-                setFeedbackMode(false);
-              }
-            }
-          }
-        )
-      ] }),
-      /* @__PURE__ */ jsx6(Box6, { paddingX: 1, children: /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "Enter \u53D1\u9001  Esc \u8FD4\u56DE\u9009\u62E9" }) })
+      /* @__PURE__ */ jsx6(Box6, { paddingX: 1, children: /* @__PURE__ */ jsx6(Text5, { dimColor: true, children: "Enter to send \xB7 Esc to cancel" }) })
     ] });
   }
-  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs6(
+  return /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", paddingX: 0, marginY: 1, children: [
+    /* @__PURE__ */ jsx6(Box6, { backgroundColor: "#fe8019", paddingX: 1, children: /* @__PURE__ */ jsx6(Text5, { color: "#282828", bold: true, children: " CONFIRMATION REQUIRED " }) }),
+    /* @__PURE__ */ jsxs5(
       Box6,
       {
         flexDirection: "column",
         borderStyle: "round",
-        borderColor: "yellow",
+        borderColor: "#fe8019",
         paddingX: 1,
         children: [
-          /* @__PURE__ */ jsx6(Text6, { bold: true, color: "yellow", children: label }),
-          lines.map((line, i) => /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: line }, i))
+          /* @__PURE__ */ jsx6(Text5, { bold: true, color: "#fabd2f", children: label }),
+          lines.map((line, i) => /* @__PURE__ */ jsx6(Text5, { color: "#a89984", children: line }, i)),
+          /* @__PURE__ */ jsx6(Box6, { marginTop: 1, gap: 2, justifyContent: "center", children: OPTIONS.map((opt, i) => {
+            const isSelected = i === selected;
+            const optColor = opt.key === "deny" ? "#fb4934" : opt.key === "allow" ? "#b8bb26" : "#8ec07c";
+            return /* @__PURE__ */ jsx6(Box6, { children: isSelected ? /* @__PURE__ */ jsxs5(Text5, { bold: true, backgroundColor: optColor, color: "#282828", children: [
+              " ",
+              opt.label,
+              " "
+            ] }) : /* @__PURE__ */ jsxs5(Text5, { color: optColor, children: [
+              " ",
+              opt.label,
+              " "
+            ] }) }, opt.key);
+          }) })
         ]
       }
     ),
-    /* @__PURE__ */ jsx6(Box6, { marginTop: 0, paddingX: 1, gap: 2, children: OPTIONS.map((opt, i) => {
-      const isSelected = i === selected;
-      return /* @__PURE__ */ jsx6(Box6, { children: isSelected ? /* @__PURE__ */ jsxs6(Text6, { bold: true, color: "cyan", inverse: true, children: [
-        " ",
-        opt.label,
-        " "
-      ] }) : /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
-        " ",
-        opt.label,
-        " "
-      ] }) }, opt.key);
-    }) }),
-    /* @__PURE__ */ jsx6(Box6, { paddingX: 1, children: /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "\u2190 \u2192 \u9009\u62E9  Enter \u786E\u8BA4  y \u5141\u8BB8  n \u62D2\u7EDD  a \u59CB\u7EC8  Tab \u53CD\u9988" }) })
+    /* @__PURE__ */ jsx6(Box6, { paddingX: 1, children: /* @__PURE__ */ jsx6(Text5, { dimColor: true, children: "\u2190 \u2192 select \xB7 Enter confirm \xB7 y/n shortcuts \xB7 Tab feedback" }) })
   ] });
 }
 var OPTIONS;
@@ -3298,55 +3214,57 @@ var init_ConfirmPrompt = __esm({
 });
 
 // src/cli/tui/components/TodoPanel.tsx
-import { Box as Box7, Text as Text7 } from "ink";
-import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
+import { Box as Box7, Text as Text6 } from "ink";
+import { jsx as jsx7, jsxs as jsxs6 } from "react/jsx-runtime";
 function getStatusIcon(status) {
   switch (status) {
     case "completed":
-      return "\u25CF";
+      return "\u2705";
     case "in-progress":
-      return "\u25D0";
+      return "\u23F3";
     default:
-      return "\u25CB";
+      return "\u26AA";
   }
 }
 function getStatusColor(status) {
   switch (status) {
     case "completed":
-      return "green";
+      return "#b8bb26";
     case "in-progress":
-      return "yellow";
+      return "#fabd2f";
     default:
-      return "gray";
+      return "#928374";
   }
 }
 function TodoPanel({ plan }) {
   const completed = plan.items.filter((i) => i.status === "completed").length;
   const total = plan.items.length;
-  return /* @__PURE__ */ jsxs7(
+  return /* @__PURE__ */ jsxs6(
     Box7,
     {
       flexDirection: "column",
       borderStyle: "round",
-      borderColor: "cyan",
+      borderColor: "#83a598",
       paddingX: 1,
-      marginBottom: 0,
+      marginY: 1,
       children: [
-        /* @__PURE__ */ jsxs7(Box7, { justifyContent: "space-between", children: [
-          /* @__PURE__ */ jsx7(Text7, { bold: true, color: "cyan", children: "Plan" }),
-          /* @__PURE__ */ jsxs7(Text7, { dimColor: true, children: [
+        /* @__PURE__ */ jsxs6(Box7, { justifyContent: "space-between", marginBottom: 1, children: [
+          /* @__PURE__ */ jsx7(Text6, { bold: true, color: "#83a598", children: "\u{1F4CB} PROJECT PLAN" }),
+          /* @__PURE__ */ jsxs6(Text6, { color: "#ebdbb2", children: [
             completed,
             "/",
-            total
+            total,
+            " tasks"
           ] })
         ] }),
-        plan.items.map((item) => /* @__PURE__ */ jsxs7(Box7, { gap: 1, children: [
-          /* @__PURE__ */ jsx7(Text7, { color: getStatusColor(item.status), children: getStatusIcon(item.status) }),
+        plan.items.map((item) => /* @__PURE__ */ jsxs6(Box7, { gap: 1, children: [
+          /* @__PURE__ */ jsx7(Text6, { color: getStatusColor(item.status), children: getStatusIcon(item.status) }),
           /* @__PURE__ */ jsx7(
-            Text7,
+            Text6,
             {
-              color: item.status === "completed" ? "green" : void 0,
+              color: item.status === "completed" ? "#b8bb26" : item.status === "in-progress" ? "#fabd2f" : "#ebdbb2",
               dimColor: item.status === "pending",
+              strikethrough: item.status === "completed",
               children: item.title
             }
           )
@@ -3361,26 +3279,62 @@ var init_TodoPanel = __esm({
   }
 });
 
+// src/cli/tui/components/Header.tsx
+import { Box as Box8, Text as Text7 } from "ink";
+import { jsx as jsx8, jsxs as jsxs7 } from "react/jsx-runtime";
+function Header({ modelName }) {
+  return /* @__PURE__ */ jsx8(
+    Box8,
+    {
+      flexDirection: "column",
+      width: "100%",
+      borderStyle: "round",
+      borderColor: "#504945",
+      paddingX: 1,
+      marginTop: 0,
+      marginBottom: 1,
+      children: /* @__PURE__ */ jsxs7(Box8, { justifyContent: "space-between", children: [
+        /* @__PURE__ */ jsxs7(Box8, { gap: 1, children: [
+          /* @__PURE__ */ jsx8(Text7, { bold: true, color: "#fe8019", children: "ZEN CODE" }),
+          /* @__PURE__ */ jsx8(Text7, { color: "#a89984", dimColor: true, children: "v0.2.1" })
+        ] }),
+        /* @__PURE__ */ jsx8(Text7, { color: "#83a598", bold: true, children: modelName })
+      ] })
+    }
+  );
+}
+var init_Header = __esm({
+  "src/cli/tui/components/Header.tsx"() {
+    "use strict";
+  }
+});
+
 // src/cli/tui/App.tsx
 import { useReducer, useCallback, useEffect, useRef as useRef2, useState as useState3 } from "react";
-import { Box as Box8, Text as Text8, useInput as useInput3 } from "ink";
-import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
-function App({ config, client, agent, orchestrator, registry, todoStore, memoStore, subAgentTracker }) {
+import { Box as Box9, Text as Text8, useInput as useInput3, useStdout } from "ink";
+import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
+function App({ config, client, agent, registry, todoStore, subAgentTracker, agentRegistry, skillRegistry }) {
+  const { stdout } = useStdout();
+  const [, setWidth] = useState3(stdout.columns);
+  useEffect(() => {
+    const onResize = () => {
+      setWidth(stdout.columns);
+    };
+    stdout.on("resize", onResize);
+    return () => {
+      stdout.off("resize", onResize);
+    };
+  }, [stdout]);
   const [state, dispatch] = useReducer(
     tuiReducer,
-    createInitialState(
-      config.model,
-      config.agent_mode,
-      config.collaboration
-    )
+    createInitialState(config.model)
   );
   const [resetKey, setResetKey] = useState3(0);
+  const currentCallbacksRef = useRef2(null);
   const agentRef = useRef2(agent);
-  const orchestratorRef = useRef2(orchestrator);
   const todoStoreRef = useRef2(todoStore);
   const subAgentTrackerRef = useRef2(subAgentTracker);
   agentRef.current = agent;
-  orchestratorRef.current = orchestrator;
   todoStoreRef.current = todoStore;
   subAgentTrackerRef.current = subAgentTracker;
   useEffect(() => {
@@ -3420,7 +3374,7 @@ function App({ config, client, agent, orchestrator, registry, todoStore, memoSto
   );
   useEffect(() => {
     setStructuredConfirmHandler((toolName, params) => {
-      return new Promise((resolve7) => {
+      return new Promise((resolve10) => {
         const id = `confirm-${Date.now()}`;
         registerConfirmToolId(toolName, id);
         dispatch({
@@ -3431,13 +3385,13 @@ function App({ config, client, agent, orchestrator, registry, todoStore, memoSto
           resolve: (result) => {
             if (result === "always") {
               registry.addAutoApprove(toolName);
-              resolve7({ approved: true });
+              resolve10({ approved: true });
             } else if (result === "allow") {
-              resolve7({ approved: true });
+              resolve10({ approved: true });
             } else if (result === "deny") {
-              resolve7({ approved: false });
+              resolve10({ approved: false });
             } else {
-              resolve7({ approved: false, feedback: result.feedback });
+              resolve10({ approved: false, feedback: result.feedback });
             }
           }
         });
@@ -3447,39 +3401,53 @@ function App({ config, client, agent, orchestrator, registry, todoStore, memoSto
       setStructuredConfirmHandler(null);
     };
   }, [registry]);
+  const runAgent = useCallback(async (text) => {
+    dispatch({ type: "ADD_USER_MESSAGE", text });
+    dispatch({ type: "START_ASSISTANT" });
+    dispatch({ type: "SET_RUNNING", running: true });
+    const callbacks = createBridgeCallbacks(dispatch);
+    currentCallbacksRef.current = callbacks;
+    try {
+      await agentRef.current.run(text, callbacks);
+    } catch (err) {
+      if (!isAbortError(err)) {
+        const msg = err instanceof Error ? err.message : String(err);
+        dispatch({ type: "SET_ERROR", error: msg });
+      }
+    } finally {
+      currentCallbacksRef.current = null;
+    }
+    callbacks._stopBatcher?.();
+    dispatch({ type: "FINISH_STREAMING" });
+    dispatch({ type: "SET_RUNNING", running: false });
+  }, []);
   const handleSubmit = useCallback(async (text) => {
     if (text.startsWith("/")) {
+      const parts = text.slice(1).split(/\s+/);
+      const skillName = parts[0];
+      const skillArgs = parts.slice(1).join(" ");
+      const skill = skillRegistry.get(skillName);
+      if (skill) {
+        const expandedPrompt = skillRegistry.expandPrompt(skill, skillArgs);
+        await runAgent(expandedPrompt);
+        return;
+      }
       handleSlashCommand2(text, {
         config,
-        orchestrator: orchestratorRef.current,
+        agent: agentRef.current,
         registry,
         dispatch,
         setResetKey,
         client,
         todoStore,
-        memoStore,
-        subAgentTracker
+        subAgentTracker,
+        agentRegistry,
+        skillRegistry
       });
       return;
     }
-    dispatch({ type: "ADD_USER_MESSAGE", text });
-    dispatch({ type: "START_ASSISTANT" });
-    dispatch({ type: "SET_RUNNING", running: true });
-    const callbacks = createBridgeCallbacks(dispatch);
-    try {
-      if (config.agent_mode === "single") {
-        await agentRef.current.run(text, callbacks);
-      } else {
-        await orchestratorRef.current.run(text, callbacks);
-      }
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      dispatch({ type: "SET_ERROR", error: msg });
-    }
-    callbacks._stopBatcher?.();
-    dispatch({ type: "FINISH_STREAMING" });
-    dispatch({ type: "SET_RUNNING", running: false });
-  }, [config]);
+    await runAgent(text);
+  }, [config, runAgent]);
   const handleConfirmResponse = useCallback((result) => {
     if (confirmPending) {
       confirmPending.resolve(result);
@@ -3497,114 +3465,118 @@ function App({ config, client, agent, orchestrator, registry, todoStore, memoSto
     }
   }, [confirmPending, state.messages]);
   useInput3((input, key) => {
-    if (input === "c" && key.ctrl) {
+    if (key.escape) {
       if (state.isRunning) {
+        agentRef.current.interrupt();
+        currentCallbacksRef.current?._stopBatcher?.();
         dispatch({ type: "SET_RUNNING", running: false });
         dispatch({ type: "FINISH_STREAMING" });
-      } else {
-        process.exit(0);
       }
       return;
     }
+    if (input === "c" && key.ctrl) {
+      if (state.isRunning) {
+        agentRef.current.interrupt();
+        currentCallbacksRef.current?._stopBatcher?.();
+        dispatch({ type: "SET_RUNNING", running: false });
+        dispatch({ type: "FINISH_STREAMING" });
+        return;
+      }
+    }
     if (input === "d" && key.ctrl) {
       process.exit(0);
     }
   });
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx8(Box8, { flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsx8(ChatArea, { messages: state.messages }) }),
-    state.error && /* @__PURE__ */ jsxs8(
-      Box8,
-      {
-        borderStyle: "round",
-        borderColor: "red",
-        paddingX: 1,
-        marginBottom: 1,
-        children: [
-          /* @__PURE__ */ jsx8(Text8, { color: "red", bold: true, children: "\u2716 Error: " }),
-          /* @__PURE__ */ jsx8(Text8, { color: "red", children: state.error })
-        ]
-      }
-    ),
-    confirmPending && /* @__PURE__ */ jsx8(
-      ConfirmPrompt,
-      {
-        confirm: confirmPending,
-        onRespond: handleConfirmResponse
-      }
-    ),
-    state.todoPlan && /* @__PURE__ */ jsx8(TodoPanel, { plan: state.todoPlan }),
-    /* @__PURE__ */ jsx8(
+  return /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", paddingX: 0, width: "100%", children: [
+    /* @__PURE__ */ jsxs8(Box9, { paddingX: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx9(Header, { modelName: state.modelName }),
+      /* @__PURE__ */ jsx9(ChatArea, { messages: state.messages })
+    ] }),
+    state.error && /* @__PURE__ */ jsxs8(Box9, { borderStyle: "round", borderColor: "#fb4934", paddingX: 1, marginBottom: 1, children: [
+      /* @__PURE__ */ jsx9(Text8, { color: "#fb4934", bold: true, children: "ERROR: " }),
+      /* @__PURE__ */ jsx9(Text8, { color: "#fb4934", children: state.error })
+    ] }),
+    confirmPending && /* @__PURE__ */ jsx9(ConfirmPrompt, { confirm: confirmPending, onRespond: handleConfirmResponse }),
+    state.todoPlan && /* @__PURE__ */ jsx9(TodoPanel, { plan: state.todoPlan }),
+    /* @__PURE__ */ jsx9(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx9(
       InputArea,
       {
         onSubmit: handleSubmit,
-        isRunning: state.isRunning || !!confirmPending
+        isRunning: state.isRunning || !!confirmPending,
+        onExitRequest: () => process.exit(0)
       }
-    ),
-    /* @__PURE__ */ jsx8(
+    ) }),
+    /* @__PURE__ */ jsx9(Box9, { marginTop: 0, children: /* @__PURE__ */ jsx9(
       StatusBar,
       {
-        agentMode: state.agentMode,
-        collaboration: state.collaboration,
-        coderWorking: state.coderWorking,
         isRunning: state.isRunning,
         modelName: state.modelName,
         todoPlan: state.todoPlan,
         subAgentProgress: state.subAgentProgress
       }
-    )
+    ) })
   ] }, resetKey);
 }
 function handleSlashCommand2(input, ctx) {
-  const { config, orchestrator, registry, dispatch, setResetKey, client, todoStore, memoStore, subAgentTracker } = ctx;
+  const { config, agent, registry, dispatch, setResetKey, client, todoStore, subAgentTracker, agentRegistry, skillRegistry } = ctx;
   const parts = input.trim().split(/\s+/);
   const command = parts[0];
   switch (command) {
     case "/help":
       dispatch({ type: "ADD_USER_MESSAGE", text: input });
       dispatch({ type: "START_ASSISTANT" });
-      dispatch({
-        type: "APPEND_CONTENT",
-        text: `\u53EF\u7528\u547D\u4EE4:
+      {
+        let helpText = `\u53EF\u7528\u547D\u4EE4:
   /help                \u663E\u793A\u6B64\u5E2E\u52A9\u4FE1\u606F
-  /mode [\u6A21\u5F0F]         \u5207\u6362\u534F\u4F5C\u6A21\u5F0F (delegated/autonomous/controlled)
-  /single              \u5207\u6362\u5230\u5355 Agent \u6A21\u5F0F
-  /dual                \u5207\u6362\u5230\u53CC Agent \u6A21\u5F0F
+  /skills              \u5217\u51FA\u6240\u6709\u53EF\u7528\u6280\u80FD
+  /agents              \u5217\u51FA\u6240\u6709\u53EF\u7528\u5B50 Agent
   /parallel            \u5207\u6362\u5E76\u884C\u5B50 Agent \u529F\u80FD on/off
   /todo                \u5207\u6362 todo \u8BA1\u5212\u529F\u80FD on/off
   /clear               \u6E05\u7A7A\u5BF9\u8BDD\u5386\u53F2
   /info                \u663E\u793A\u5F53\u524D\u914D\u7F6E
   Ctrl+C               \u53D6\u6D88\u5F53\u524D\u8BF7\u6C42 / \u9000\u51FA
-  Ctrl+D               \u9000\u51FA`
-      });
+  Ctrl+D               \u9000\u51FA`;
+        const skills = skillRegistry.list();
+        if (skills.length > 0) {
+          helpText += `
+
+\u53EF\u7528\u6280\u80FD:
+${skills.map((s) => `  /${s.name}  ${s.description}`).join("\n")}`;
+        }
+        dispatch({ type: "APPEND_CONTENT", text: helpText });
+      }
       dispatch({ type: "FINISH_STREAMING" });
       break;
-    case "/mode": {
-      const mode = parts[1];
-      if (!mode) {
-        dispatch({ type: "ADD_USER_MESSAGE", text: input });
-        dispatch({ type: "START_ASSISTANT" });
-        dispatch({
-          type: "APPEND_CONTENT",
-          text: `\u5F53\u524D\u534F\u4F5C\u6A21\u5F0F: ${config.collaboration}
-\u53EF\u9009: delegated, autonomous, controlled`
-        });
-        dispatch({ type: "FINISH_STREAMING" });
-      } else if (["delegated", "autonomous", "controlled"].includes(mode)) {
-        config.collaboration = mode;
-        orchestrator?.setMode(mode);
-        dispatch({ type: "SET_MODE", agentMode: config.agent_mode, collaboration: mode });
+    case "/skills": {
+      const skills = skillRegistry.list();
+      dispatch({ type: "ADD_USER_MESSAGE", text: input });
+      dispatch({ type: "START_ASSISTANT" });
+      if (skills.length === 0) {
+        dispatch({ type: "APPEND_CONTENT", text: "\u6682\u65E0\u53EF\u7528\u6280\u80FD\u3002\u5728 ~/.zencode/skills/ \u6216 .zencode/skills/ \u653E\u7F6E YAML \u6587\u4EF6\u6DFB\u52A0\u6280\u80FD\u3002" });
+      } else {
+        const lines = skills.map((s) => `  /${s.name}: ${s.description}`);
+        dispatch({ type: "APPEND_CONTENT", text: `\u53EF\u7528\u6280\u80FD (${skills.length}):
+${lines.join("\n")}` });
       }
+      dispatch({ type: "FINISH_STREAMING" });
       break;
     }
-    case "/single":
-      config.agent_mode = "single";
-      dispatch({ type: "SET_MODE", agentMode: "single", collaboration: config.collaboration });
-      break;
-    case "/dual":
-      config.agent_mode = "dual";
-      dispatch({ type: "SET_MODE", agentMode: "dual", collaboration: config.collaboration });
+    case "/agents": {
+      const agents = agentRegistry.list();
+      dispatch({ type: "ADD_USER_MESSAGE", text: input });
+      dispatch({ type: "START_ASSISTANT" });
+      if (agents.length === 0) {
+        dispatch({ type: "APPEND_CONTENT", text: "\u6682\u65E0\u53EF\u7528\u5B50 Agent\u3002" });
+      } else {
+        const lines = agents.map((a) => `  ${a.name}: ${a.description} [tools: ${a.tools.join(", ")}]`);
+        dispatch({ type: "APPEND_CONTENT", text: `\u53EF\u7528\u5B50 Agent (${agents.length}):
+${lines.join("\n")}` });
+      }
+      dispatch({ type: "FINISH_STREAMING" });
       break;
+    }
     case "/clear":
+      agent.getConversation().clear();
       dispatch({ type: "CLEAR_MESSAGES" });
       setResetKey((prev) => prev + 1);
       break;
@@ -3615,7 +3587,7 @@ function handleSlashCommand2(input, ctx) {
       if (next === "off") {
         registry.unregister("spawn-agents");
       } else if (!registry.has("spawn-agents")) {
-        registry.register(createSpawnAgentsTool(client, registry, config, subAgentTracker, memoStore));
+        registry.register(createSpawnAgentsTool(client, registry, config, subAgentTracker));
       }
       dispatch({ type: "ADD_USER_MESSAGE", text: input });
       dispatch({ type: "START_ASSISTANT" });
@@ -3644,9 +3616,9 @@ function handleSlashCommand2(input, ctx) {
       dispatch({
         type: "APPEND_CONTENT",
         text: `\u6A21\u578B: ${config.model}
-Agent \u6A21\u5F0F: ${config.agent_mode}
-\u534F\u4F5C\u6A21\u5F0F: ${config.collaboration}
-\u57FA\u7840 URL: ${config.base_url}`
+\u57FA\u7840 URL: ${config.base_url}
+\u5B50 Agent: ${agentRegistry.listNames().join(", ") || "\u65E0"}
+\u6280\u80FD: ${skillRegistry.listNames().map((n) => "/" + n).join(", ") || "\u65E0"}`
       });
       dispatch({ type: "FINISH_STREAMING" });
       break;
@@ -3664,6 +3636,7 @@ Agent \u6A21\u5F0F: ${config.agent_mode}
 var init_App = __esm({
   "src/cli/tui/App.tsx"() {
     "use strict";
+    init_client();
     init_permission();
     init_state();
     init_bridge();
@@ -3674,6 +3647,7 @@ var init_App = __esm({
     init_StatusBar();
     init_ConfirmPrompt();
     init_TodoPanel();
+    init_Header();
   }
 });
 
@@ -3683,10 +3657,14 @@ __export(tui_exports, {
   startTui: () => startTui
 });
 import { render } from "ink";
-import { jsx as jsx9 } from "react/jsx-runtime";
+import { jsx as jsx10 } from "react/jsx-runtime";
 async function startTui(options) {
   const { config } = options;
-  const { systemPrompt } = await buildPrompt(config);
+  const agentRegistry = new SubAgentConfigRegistry();
+  for (const agentConfig of loadAllAgentConfigs()) {
+    agentRegistry.register(agentConfig);
+  }
+  const { systemPrompt } = await buildPrompt(config, agentRegistry.list());
   const registry = new ToolRegistry();
   registerCoreTools(registry);
   registry.setPermissions(config.permissions);
@@ -3698,32 +3676,37 @@ async function startTui(options) {
     maxTokens: config.max_tokens
   });
   const todoStore = new TodoStore();
-  const memoStore = new MemoStore();
   const subAgentTracker = new SubAgentTracker();
+  const skillRegistry = new SkillRegistry();
+  for (const skill of loadAllSkills()) {
+    skillRegistry.register(skill);
+  }
   if (config.features.parallel_agents === "on") {
-    registry.register(createSpawnAgentsTool(client, registry, config, subAgentTracker, memoStore));
+    registry.register(createSpawnAgentsTool(client, registry, config, subAgentTracker));
   }
   if (config.features.todo === "on") {
     registry.register(createTodoTool(todoStore));
   }
-  registry.register(createMemoTool(memoStore));
+  registry.register(createDispatchTool(client, registry, config, agentRegistry));
   const agent = new Agent(client, registry, config, systemPrompt);
-  const orchestrator = new Orchestrator(registry, config, systemPrompt, memoStore);
   const { waitUntilExit } = render(
-    /* @__PURE__ */ jsx9(
+    /* @__PURE__ */ jsx10(
       App,
       {
         config,
         client,
         agent,
-        orchestrator,
         registry,
         todoStore,
-        memoStore,
-        subAgentTracker
+        subAgentTracker,
+        agentRegistry,
+        skillRegistry
       }
     ),
-    { patchConsole: true }
+    {
+      patchConsole: true,
+      exitOnCtrlC: false
+    }
   );
   await waitUntilExit();
 }
@@ -3734,41 +3717,129 @@ var init_tui = __esm({
     init_registry();
     init_register();
     init_agent();
-    init_orchestrator();
     init_builder();
     init_todo_store();
-    init_memo_store();
     init_sub_agent_tracker();
+    init_registry2();
+    init_loader();
+    init_registry3();
+    init_loader2();
     init_spawn_agents();
     init_todo();
-    init_memo();
+    init_dispatch();
     init_App();
   }
 });
 
 // src/cli/index.ts
-init_loader();
+import { Command } from "commander";
+
+// src/config/loader.ts
+import * as fs from "fs";
+import * as path from "path";
+import * as os from "os";
+import { parse as parseYaml } from "yaml";
+
+// src/config/defaults.ts
+var DEFAULT_CONFIG = {
+  model: "deepseek-chat",
+  api_key: "",
+  base_url: "https://api.deepseek.com/v1",
+  temperature: 0.7,
+  max_tokens: 8192,
+  features: {
+    git: "auto",
+    mcp: "off",
+    planning_layer: "on",
+    parallel_agents: "on",
+    todo: "on"
+  },
+  permissions: {
+    auto_approve: ["read-file", "glob", "grep", "spawn-agents", "todo", "dispatch"],
+    require_approval: ["write-file", "edit-file", "bash", "git"]
+  },
+  mcp_servers: [],
+  prompts: [],
+  max_tool_output: 3e4
+};
+
+// src/config/loader.ts
+function deepMerge(target, source) {
+  const result = { ...target };
+  for (const key of Object.keys(source)) {
+    const sourceVal = source[key];
+    const targetVal = target[key];
+    if (sourceVal !== void 0 && sourceVal !== null && typeof sourceVal === "object" && !Array.isArray(sourceVal) && typeof targetVal === "object" && !Array.isArray(targetVal) && targetVal !== null) {
+      result[key] = deepMerge(targetVal, sourceVal);
+    } else if (sourceVal !== void 0) {
+      result[key] = sourceVal;
+    }
+  }
+  return result;
+}
+function loadYamlFile(filePath) {
+  try {
+    const content = fs.readFileSync(filePath, "utf-8");
+    return parseYaml(content) || {};
+  } catch {
+    return {};
+  }
+}
+function loadEnvConfig() {
+  const config = {};
+  if (process.env["ZENCODE_API_KEY"]) {
+    config.api_key = process.env["ZENCODE_API_KEY"];
+  }
+  if (process.env["ZENCODE_MODEL"]) {
+    config.model = process.env["ZENCODE_MODEL"];
+  }
+  if (process.env["ZENCODE_BASE_URL"]) {
+    config.base_url = process.env["ZENCODE_BASE_URL"];
+  }
+  return config;
+}
+function loadCliConfig(opts) {
+  const config = {};
+  if (opts.model) config.model = opts.model;
+  if (opts.apiKey) config.api_key = opts.apiKey;
+  if (opts.baseUrl) config.base_url = opts.baseUrl;
+  return config;
+}
+function loadConfig(cliOpts = {}) {
+  const globalConfigPath = path.join(os.homedir(), ".zencode", "config.yaml");
+  const projectDirConfigPath = path.resolve(".zencode", "config.yaml");
+  const projectFileConfigPath = path.resolve(".zencode.yaml");
+  let config = { ...DEFAULT_CONFIG };
+  config = deepMerge(config, loadYamlFile(globalConfigPath));
+  config = deepMerge(config, loadYamlFile(projectDirConfigPath));
+  config = deepMerge(config, loadYamlFile(projectFileConfigPath));
+  config = deepMerge(config, loadEnvConfig());
+  config = deepMerge(config, loadCliConfig(cliOpts));
+  return config;
+}
+
+// src/cli/index.ts
 init_client();
 init_registry();
 init_register();
 init_agent();
-init_orchestrator();
 init_builder();
-import { Command } from "commander";
 
 // src/cli/repl.ts
 init_client();
 init_registry();
 init_agent();
-init_orchestrator();
 init_builder();
 init_register();
 init_permission();
 init_todo_store();
-init_memo_store();
+init_registry2();
+init_loader();
+init_registry3();
+init_loader2();
 init_spawn_agents();
 init_todo();
-init_memo();
+init_dispatch();
 init_bridge();
 import * as readline from "readline";
 
@@ -3800,12 +3871,8 @@ function printToolCall(toolName, params) {
     const action = String(params["action"]);
     const id = params["id"] ? ` [${params["id"]}]` : "";
     detail = ` ${chalk2.dim(`${action}${id}`)}`;
-  } else if (toolName === "memo" && params["action"]) {
-    const action = String(params["action"]);
-    const key = params["key"] ? ` [${params["key"]}]` : "";
-    detail = ` ${chalk2.dim(`${action}${key}`)}`;
   }
-  const icon = toolName === "spawn-agents" ? "\u26A1" : toolName === "todo" ? "\u{1F4CB}" : toolName === "memo" ? "\u{1F4DD}" : "\u2699";
+  const icon = toolName === "spawn-agents" ? "\u26A1" : toolName === "todo" ? "\u{1F4CB}" : "\u2699";
   console.log(chalk2.yellow(`  ${icon} ${toolName}`) + detail);
 }
 function printToolResult(toolName, result, truncated) {
@@ -3828,10 +3895,9 @@ function printWarning(message) {
 function printSuccess(message) {
   console.log(chalk2.green(`\u2713 ${message}`));
 }
-function printWelcome(modelName, mode) {
+function printWelcome(modelName) {
   console.log(chalk2.bold.cyan("\n  ZenCode") + chalk2.dim(" - \u6781\u7B80 AI \u7F16\u7A0B\u52A9\u624B\n"));
   console.log(chalk2.dim(`  \u6A21\u578B: ${modelName}`));
-  console.log(chalk2.dim(`  \u6A21\u5F0F: ${mode}`));
   console.log(chalk2.dim(`  \u8F93\u5165 /help \u67E5\u770B\u547D\u4EE4\uFF0CCtrl+C \u9000\u51FA
 `));
 }
@@ -3845,9 +3911,8 @@ function handleSlashCommand(input, context) {
       console.log(`
 \u53EF\u7528\u547D\u4EE4:
   /help                \u663E\u793A\u6B64\u5E2E\u52A9\u4FE1\u606F
-  /mode [\u6A21\u5F0F]         \u5207\u6362\u534F\u4F5C\u6A21\u5F0F (delegated/autonomous/controlled)
-  /single              \u5207\u6362\u5230\u5355 Agent \u6A21\u5F0F
-  /dual                \u5207\u6362\u5230\u53CC Agent \u6A21\u5F0F
+  /skills              \u5217\u51FA\u6240\u6709\u53EF\u7528\u6280\u80FD\uFF08\u7528\u6237\u81EA\u5B9A\u4E49\u659C\u6760\u547D\u4EE4\uFF09
+  /agents              \u5217\u51FA\u6240\u6709\u53EF\u7528\u5B50 Agent
   /parallel            \u5207\u6362\u5E76\u884C\u5B50 Agent \u529F\u80FD on/off
   /todo                \u5207\u6362 todo \u8BA1\u5212\u529F\u80FD on/off
   /clear               \u6E05\u7A7A\u5BF9\u8BDD\u5386\u53F2
@@ -3855,33 +3920,33 @@ function handleSlashCommand(input, context) {
   /exit                \u9000\u51FA
 `);
       return true;
-    case "/mode": {
-      const mode = parts[1];
-      if (!mode) {
-        printInfo(`\u5F53\u524D\u534F\u4F5C\u6A21\u5F0F: ${context.config.collaboration}`);
-        printInfo("\u53EF\u9009: delegated, autonomous, controlled");
-        return true;
-      }
-      if (["delegated", "autonomous", "controlled"].includes(mode)) {
-        context.config.collaboration = mode;
-        context.setMode?.(mode);
-        printSuccess(`\u5DF2\u5207\u6362\u5230 ${mode} \u6A21\u5F0F`);
+    case "/skills": {
+      const skills = context.skillRegistry.list();
+      if (skills.length === 0) {
+        printInfo("\u6682\u65E0\u53EF\u7528\u6280\u80FD\u3002\u5728 ~/.zencode/skills/ \u6216 .zencode/skills/ \u4E2D\u6DFB\u52A0 YAML \u6587\u4EF6\u5B9A\u4E49\u6280\u80FD\u3002");
       } else {
-        printError(`\u65E0\u6548\u6A21\u5F0F: ${mode}\u3002\u53EF\u9009: delegated, autonomous, controlled`);
+        printInfo(`\u53EF\u7528\u6280\u80FD (${skills.length}):`);
+        for (const s of skills) {
+          printInfo(`  /${s.name}: ${s.description}`);
+        }
       }
       return true;
     }
-    case "/single":
-      context.config.agent_mode = "single";
-      printSuccess("\u5DF2\u5207\u6362\u5230\u5355 Agent \u6A21\u5F0F");
-      return true;
-    case "/dual":
-      context.config.agent_mode = "dual";
-      printSuccess("\u5DF2\u5207\u6362\u5230\u53CC Agent \u6A21\u5F0F");
+    case "/agents": {
+      const agents = context.agentRegistry.list();
+      if (agents.length === 0) {
+        printInfo("\u6682\u65E0\u53EF\u7528\u5B50 Agent");
+      } else {
+        printInfo(`\u53EF\u7528\u5B50 Agent (${agents.length}):`);
+        for (const a of agents) {
+          printInfo(`  ${a.name}: ${a.description}`);
+        }
+      }
       return true;
+    }
     case "/clear":
-      printSuccess("\u5BF9\u8BDD\u5386\u53F2\u5DF2\u6E05\u7A7A\uFF08\u5C06\u5728\u4E0B\u6B21\u5BF9\u8BDD\u65F6\u751F\u6548\uFF09");
-      return true;
+      printSuccess("\u5BF9\u8BDD\u5386\u53F2\u5DF2\u6E05\u7A7A");
+      return "clear";
     case "/parallel": {
       const current = context.config.features.parallel_agents;
       const next = current === "on" ? "off" : "on";
@@ -3890,7 +3955,7 @@ function handleSlashCommand(input, context) {
         context.registry.unregister("spawn-agents");
       } else if (!context.registry.has("spawn-agents")) {
         context.registry.register(
-          createSpawnAgentsTool(context.client, context.registry, context.config, void 0, context.memoStore)
+          createSpawnAgentsTool(context.client, context.registry, context.config)
         );
       }
       printSuccess(`\u5E76\u884C\u5B50 Agent \u529F\u80FD\u5DF2${next === "on" ? "\u5F00\u542F" : "\u5173\u95ED"}`);
@@ -3910,9 +3975,9 @@ function handleSlashCommand(input, context) {
     }
     case "/info":
       printInfo(`\u6A21\u578B: ${context.config.model}`);
-      printInfo(`Agent \u6A21\u5F0F: ${context.config.agent_mode}`);
-      printInfo(`\u534F\u4F5C\u6A21\u5F0F: ${context.config.collaboration}`);
       printInfo(`\u57FA\u7840 URL: ${context.config.base_url}`);
+      printInfo(`\u5B50 Agent: ${context.agentRegistry.listNames().join(", ") || "\u65E0"}`);
+      printInfo(`\u6280\u80FD: ${context.skillRegistry.listNames().join(", ") || "\u65E0"}`);
       return true;
     case "/exit":
       process.exit(0);
@@ -3923,7 +3988,11 @@ function handleSlashCommand(input, context) {
 }
 async function startRepl(options) {
   const { config } = options;
-  const { systemPrompt } = await buildPrompt(config);
+  const agentRegistry = new SubAgentConfigRegistry();
+  for (const agentConfig of loadAllAgentConfigs()) {
+    agentRegistry.register(agentConfig);
+  }
+  const { systemPrompt } = await buildPrompt(config, agentRegistry.list());
   const registry = new ToolRegistry();
   registerCoreTools(registry);
   registry.setPermissions(config.permissions);
@@ -3935,23 +4004,19 @@ async function startRepl(options) {
     maxTokens: config.max_tokens
   });
   const todoStore = new TodoStore();
-  const memoStore = new MemoStore();
   if (config.features.parallel_agents === "on") {
-    registry.register(createSpawnAgentsTool(client, registry, config, void 0, memoStore));
+    registry.register(createSpawnAgentsTool(client, registry, config));
   }
   if (config.features.todo === "on") {
     registry.register(createTodoTool(todoStore));
   }
-  registry.register(createMemoTool(memoStore));
-  let singleAgent;
-  let orchestrator;
-  if (config.agent_mode === "single") {
-    singleAgent = new Agent(client, registry, config, systemPrompt);
-  } else {
-    orchestrator = new Orchestrator(registry, config, systemPrompt, memoStore);
+  const skillRegistry = new SkillRegistry();
+  for (const skill of loadAllSkills()) {
+    skillRegistry.register(skill);
   }
-  const modeLabel = config.agent_mode === "dual" ? `\u53CCAgent (${config.collaboration})` : "\u5355Agent";
-  printWelcome(config.model, modeLabel);
+  registry.register(createDispatchTool(client, registry, config, agentRegistry));
+  let agent = new Agent(client, registry, config, systemPrompt);
+  printWelcome(config.model);
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -3959,13 +4024,13 @@ async function startRepl(options) {
     historySize: 100
   });
   setConfirmHandler(async (promptText) => {
-    return new Promise((resolve7) => {
+    return new Promise((resolve10) => {
       process.stdout.write(promptText);
       const onData = (data) => {
         process.stdin.removeListener("data", onData);
         process.stdin.pause();
         const answer = data.toString().trim().toLowerCase();
-        resolve7(answer === "y");
+        resolve10(answer === "y");
       };
       process.stdin.resume();
       process.stdin.once("data", onData);
@@ -3979,29 +4044,75 @@ async function startRepl(options) {
       return;
     }
     if (input.startsWith("/")) {
+      const slashParts = input.slice(1).split(/\s+/);
+      const skillName = slashParts[0] ?? "";
+      const skillArgs = slashParts.slice(1).join(" ");
+      const skill = skillRegistry.get(skillName);
+      if (skill) {
+        const expandedPrompt = skillRegistry.expandPrompt(skill, skillArgs);
+        rl.pause();
+        let isStreaming2 = false;
+        const thinkFilter2 = createThinkFilter();
+        const callbacks2 = {
+          onContent: (text) => {
+            const filtered = thinkFilter2(text);
+            if (!filtered) return;
+            if (!isStreaming2) {
+              isStreaming2 = true;
+              process.stdout.write("\n");
+            }
+            printStream(filtered);
+          },
+          onToolExecuting: (name, params) => {
+            if (isStreaming2) {
+              process.stdout.write("\n");
+              isStreaming2 = false;
+            }
+            printToolCall(name, params);
+          },
+          onToolResult: (name, result, truncated) => {
+            printToolResult(name, result, truncated);
+          },
+          onError: (err) => {
+            if (isStreaming2) {
+              process.stdout.write("\n");
+              isStreaming2 = false;
+            }
+            printError(err.message);
+          }
+        };
+        try {
+          await agent.run(expandedPrompt, callbacks2);
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          printError(msg);
+        }
+        if (isStreaming2) {
+          process.stdout.write("\n");
+        }
+        console.log();
+        rl.resume();
+        rl.prompt();
+        return;
+      }
       const handled = handleSlashCommand(input, {
         config,
-        orchestrator,
         registry,
         client,
         todoStore,
-        memoStore,
-        setMode: (mode) => {
-          orchestrator?.setMode(mode);
-        }
+        agentRegistry,
+        skillRegistry
       });
+      if (handled === "clear") {
+        agent = new Agent(client, registry, config, systemPrompt);
+        rl.prompt();
+        return;
+      }
       if (handled) {
         rl.prompt();
         return;
       }
     }
-    if (config.agent_mode === "single" && !singleAgent) {
-      singleAgent = new Agent(client, registry, config, systemPrompt);
-      orchestrator = void 0;
-    } else if (config.agent_mode === "dual" && !orchestrator) {
-      orchestrator = new Orchestrator(registry, config, systemPrompt, memoStore);
-      singleAgent = void 0;
-    }
     rl.pause();
     let isStreaming = false;
     const thinkFilter = createThinkFilter();
@@ -4025,16 +4136,6 @@ async function startRepl(options) {
       onToolResult: (name, result, truncated) => {
         printToolResult(name, result, truncated);
       },
-      onCoderStart: () => {
-        if (isStreaming) {
-          process.stdout.write("\n");
-          isStreaming = false;
-        }
-        printInfo("\u7F16\u7801 Agent \u5F00\u59CB\u5DE5\u4F5C...");
-      },
-      onCoderEnd: () => {
-        printInfo("\u7F16\u7801 Agent \u5B8C\u6210");
-      },
       onError: (err) => {
         if (isStreaming) {
           process.stdout.write("\n");
@@ -4044,11 +4145,7 @@ async function startRepl(options) {
       }
     };
     try {
-      if (config.agent_mode === "single" && singleAgent) {
-        await singleAgent.run(input, callbacks);
-      } else if (orchestrator) {
-        await orchestrator.run(input, callbacks);
-      }
+      await agent.run(input, callbacks);
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       printError(msg);
@@ -4068,13 +4165,18 @@ async function startRepl(options) {
 
 // src/cli/index.ts
 init_todo_store();
-init_memo_store();
+init_registry2();
+init_loader();
 init_spawn_agents();
 init_todo();
-init_memo();
+init_dispatch();
 init_bridge();
 async function runOnce(prompt, config) {
-  const { systemPrompt } = await buildPrompt(config);
+  const agentRegistry = new SubAgentConfigRegistry();
+  for (const agentConfig of loadAllAgentConfigs()) {
+    agentRegistry.register(agentConfig);
+  }
+  const { systemPrompt } = await buildPrompt(config, agentRegistry.list());
   const registry = new ToolRegistry();
   registerCoreTools(registry);
   registry.setPermissions(config.permissions);
@@ -4086,14 +4188,13 @@ async function runOnce(prompt, config) {
     maxTokens: config.max_tokens
   });
   const todoStore = new TodoStore();
-  const memoStore = new MemoStore();
   if (config.features.parallel_agents === "on") {
-    registry.register(createSpawnAgentsTool(client, registry, config, void 0, memoStore));
+    registry.register(createSpawnAgentsTool(client, registry, config));
   }
   if (config.features.todo === "on") {
     registry.register(createTodoTool(todoStore));
   }
-  registry.register(createMemoTool(memoStore));
+  registry.register(createDispatchTool(client, registry, config, agentRegistry));
   let isStreaming = false;
   const thinkFilter = createThinkFilter();
   const callbacks = {
@@ -4115,28 +4216,13 @@ async function runOnce(prompt, config) {
     onToolResult: (name, result, truncated) => {
       printToolResult(name, result, truncated);
     },
-    onCoderStart: () => {
-      if (isStreaming) {
-        process.stdout.write("\n");
-        isStreaming = false;
-      }
-      printInfo("\u7F16\u7801 Agent \u5F00\u59CB\u5DE5\u4F5C...");
-    },
-    onCoderEnd: () => {
-      printInfo("\u7F16\u7801 Agent \u5B8C\u6210");
-    },
     onError: (err) => {
       printError(err.message);
     }
   };
   try {
-    if (config.agent_mode === "single") {
-      const agent = new Agent(client, registry, config, systemPrompt);
-      await agent.run(prompt, callbacks);
-    } else {
-      const orchestrator = new Orchestrator(registry, config, systemPrompt, memoStore);
-      await orchestrator.run(prompt, callbacks);
-    }
+    const agent = new Agent(client, registry, config, systemPrompt);
+    await agent.run(prompt, callbacks);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     printError(msg);
@@ -4148,7 +4234,7 @@ async function runOnce(prompt, config) {
 }
 function createCli() {
   const program2 = new Command();
-  program2.name("zencode").description("\u6781\u7B80 CLI AI \u7F16\u7A0B\u5DE5\u5177").version("0.1.0").option("-m, --model <model>", "\u6307\u5B9A\u6A21\u578B\u540D\u79F0").option("-k, --api-key <key>", "API \u5BC6\u94A5").option("-u, --base-url <url>", "API \u57FA\u7840 URL").option("--single", "\u4F7F\u7528\u5355 Agent \u6A21\u5F0F").option("--dual", "\u4F7F\u7528\u53CC Agent \u6A21\u5F0F").option("--mode <mode>", "\u534F\u4F5C\u6A21\u5F0F (delegated/autonomous/controlled)").option("--simple", "\u4F7F\u7528\u7B80\u5355 REPL \u6A21\u5F0F\uFF08\u975E\u5168\u5C4F TUI\uFF09").argument("[prompt...]", "\u76F4\u63A5\u6267\u884C\u7684\u63D0\u793A\u8BCD\uFF08\u975E\u4EA4\u4E92\u5F0F\uFF09").action(async (promptParts, opts) => {
+  program2.name("zencode").description("\u6781\u7B80 CLI AI \u7F16\u7A0B\u5DE5\u5177").version("0.2.1").option("-m, --model <model>", "\u6307\u5B9A\u6A21\u578B\u540D\u79F0").option("-k, --api-key <key>", "API \u5BC6\u94A5").option("-u, --base-url <url>", "API \u57FA\u7840 URL").option("--simple", "\u4F7F\u7528\u7B80\u5355 REPL \u6A21\u5F0F\uFF08\u975E\u5168\u5C4F TUI\uFF09").argument("[prompt...]", "\u76F4\u63A5\u6267\u884C\u7684\u63D0\u793A\u8BCD\uFF08\u975E\u4EA4\u4E92\u5F0F\uFF09").action(async (promptParts, opts) => {
     const config = loadConfig(opts);
     if (!config.api_key) {
       printError("\u672A\u8BBE\u7F6E API \u5BC6\u94A5\u3002\u8BF7\u901A\u8FC7\u4EE5\u4E0B\u65B9\u5F0F\u4E4B\u4E00\u8BBE\u7F6E\uFF1A");