From 45b50e4dc707d9407925bcd8fa0ee92095790e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B4=AB=E5=BD=B1233?= <thzxx@users.noreply.gitee.com>
Date: Thu, 16 Jul 2026 16:56:32 +0800
Subject: [PATCH] =?UTF-8?q?v0.16.11:=20Plan=20Mode=20=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E6=80=A7=E6=B8=85=E7=90=86=20=E2=80=94=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=9B=E5=BA=A6=E6=B3=A8=E5=85=A5=E5=92=8C?=
 =?UTF-8?q?=E6=AD=BB=E4=BB=A3=E7=A0=81=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除项:
- Plan Mode 每轮进度注入代码（formatPlanStatus() 主动注入到 user 消息）
  AI 改为从 plan_track mark_done/status 工具返回值自行推断进度
- _lastPlanStatus 死代码链（agent-engine.ts 2 处保存 + input-area.ts 2 处清空）
  保存后从未被读取使用，纯死代码
- formatPlanStatus import（已无调用点）
- _lastPlanStatus 和 _planLastInjectedDone StateKey 声明

简化项:
- "计划已批准"消息移除 (web_search、write_file 等) 工具名列举，让 AI 自行判断

修正项:
- L2431 注释从"AI 可通过 formatPlanStatus() 看到剩余步骤"
  改为"AI 通过 plan_track mark_done/status 的工具返回值获知进度"

总计 8 文件变更
---
 README.md                             |  6 +++---
 package-lock.json                     |  4 ++--
 package.json                          |  2 +-
 src/main/menu.ts                      |  2 +-
 src/renderer/components/input-area.ts |  5 -----
 src/renderer/index.html               |  2 +-
 src/renderer/services/agent-engine.ts | 29 ++++-----------------------
 src/renderer/types.d.ts               |  2 --
 8 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 6983e27..9645f91 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/version-v0.16.10-E8734A?style=flat-square" alt="version">
+  <img src="https://img.shields.io/badge/version-v0.16.11-E8734A?style=flat-square" alt="version">
   <img src="https://img.shields.io/badge/electron-33+-47848F?style=flat-square&logo=electron" alt="electron">
   <img src="https://img.shields.io/badge/typescript-5.7+-3178C6?style=flat-square&logo=typescript" alt="typescript">
   <img src="https://img.shields.io/badge/license-MIT-green?style=flat-square" alt="license">
@@ -253,7 +253,7 @@ npm start
 ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ npm run dist
 ```
 
-产出：`release/Metona Ollama Setup v0.16.10.exe`
+产出：`release/Metona Ollama Setup v0.16.11.exe`
 
 ## 🛠️ 常用命令
 
@@ -501,7 +501,7 @@ npm start
 ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ npm run dist
 ```
 
-Output: `release/Metona Ollama Setup v0.16.10.exe`
+Output: `release/Metona Ollama Setup v0.16.11.exe`
 
 ## 🛠️ Common Commands
 
diff --git a/package-lock.json b/package-lock.json
index 5fc3d96..ef6323a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "metona-ollama-desktop",
-  "version": "0.16.10",
+  "version": "0.16.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "metona-ollama-desktop",
-      "version": "0.16.10",
+      "version": "0.16.11",
       "license": "MIT",
       "dependencies": {
         "ffmpeg-static": "^5.2.0",
diff --git a/package.json b/package.json
index a16cbd9..bd6906f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metona-ollama-desktop",
-  "version": "0.16.10",
+  "version": "0.16.11",
   "description": "Metona Ollama - TypeScript + Electron 桌面 AI 聊天客户端",
   "main": "dist/main/main.js",
   "author": "thzxx",
diff --git a/src/main/menu.ts b/src/main/menu.ts
index 7235831..c1da712 100644
--- a/src/main/menu.ts
+++ b/src/main/menu.ts
@@ -101,7 +101,7 @@ export function createMenu(): void {
             dialog.showMessageBox(mainWindow!, {
               type: 'info',
               title: '关于 Metona Ollama',
-              message: 'Metona Ollama Desktop v0.16.10',
+              message: 'Metona Ollama Desktop v0.16.11',
               detail: 'TypeScript + Electron Ollama AI 聊天客户端\n\nhttps://gitee.com/thzxx/metona-ollama',
               icon: getIconPath()
             });
diff --git a/src/renderer/components/input-area.ts b/src/renderer/components/input-area.ts
index 122197b..8100ce6 100644
--- a/src/renderer/components/input-area.ts
+++ b/src/renderer/components/input-area.ts
@@ -669,8 +669,6 @@ async function handleRetry(): Promise<void> {
           // renderMessages 统一渲染 session 数据，先清掉流式 placeholder 避免 DOM 重复
           clearMessagesDOM();
           renderMessages();
-          // ── 消费 _lastPlanStatus（不再保存为 session 消息，避免 system 消息渲染到聊天界面）──
-          state.set('_lastPlanStatus', '');
         await saveCurrentSession();
       }
     });
@@ -1372,9 +1370,6 @@ async function sendMessageWithAgentLoop(text: string, currentSession: ChatSessio
         // 先移除流式 placeholder 再 renderMessages，避免未渲染(纯文本)和已渲染(markdown)两个卡片同时存在
         removeCurrentPlaceholder();
         renderMessages();
-
-        // ── 消费 _lastPlanStatus（不再保存为 session 消息，避免 system 消息渲染到聊天界面）──
-        state.set('_lastPlanStatus', '');
         await saveCurrentSession();
       }
     });
diff --git a/src/renderer/index.html b/src/renderer/index.html
index 77b9420..7be3b82 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -28,7 +28,7 @@
         <div class="header-left">
             <img class="logo" src="./assets/icons/llama.png" alt="logo" />
             <span class="app-title">Metona Ollama</span>
-            <span class="app-version">v0.16.10</span>
+            <span class="app-version">v0.16.11</span>
             <button class="icon-btn help-btn" id="btnHelp" title="使用帮助">
                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                     <circle cx="12" cy="12" r="10"/><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"/>
diff --git a/src/renderer/services/agent-engine.ts b/src/renderer/services/agent-engine.ts
index b0d7ba0..15caa54 100644
--- a/src/renderer/services/agent-engine.ts
+++ b/src/renderer/services/agent-engine.ts
@@ -13,7 +13,6 @@ import {
   needsConfirmation,
   initPlanTracker,
   getPlanTracker,
-  formatPlanStatus,
   clearPlanTracker,
 } from './tool-registry.js';
 import {
@@ -1484,20 +1483,8 @@ async function handleThinking(
   ctx.thinking = '';
   ctx.toolCalls.length = 0;
 
-  // ── Plan Mode 执行进度注入 — 仅在进度变化时注入，避免每轮重复 ──
-  if (ctx.mode === 'plan' && ctx.loopCount >= 1) {
-    const tracker = getPlanTracker();
-    if (tracker.active && tracker.steps.length > 0) {
-      const lastDone = state.get<number>('_planLastInjectedDone', -1);
-      if (tracker.done !== lastDone) {
-        const status = formatPlanStatus();
-        if (status) {
-          ctx.messages.push({ role: 'user', content: status, ephemeral: true });
-          state.set('_planLastInjectedDone', tracker.done);
-        }
-      }
-    }
-  }
+  // Plan Mode 进度注入已删除 — AI 调用 plan_track mark_done 后工具返回值已含进度，
+  // AI 应从上下文自行推断或主动调用 plan_track status 查询
 
 	  const abortController = registerAbortController();
 
@@ -2371,7 +2358,7 @@ async function handleReflecting(
       }
       ctx.messages.push({
         role: 'user',
-        content: '计划已批准。现在开始执行——请直接调用工具（web_search、write_file 等）来完成每一步。不要描述计划，直接行动。',
+        content: '计划已批准。现在开始执行——请直接调用工具来完成每一步。不要描述计划，直接行动。',
         ephemeral: true,
       });
       transition(ctx, S.THINKING);
@@ -2440,17 +2427,10 @@ async function handleReflecting(
 
   // Completion Gate 已删除 — 所有检查项（notThinking/toolResultReview/contextEfficiency/planModeCompletion）均已删除
   // AI 应基于工具结果和上下文自行判断是否需要继续或完成
-  // Plan Mode 下 AI 可通过 formatPlanStatus() 看到剩余步骤，应自行决定是否继续
+  // Plan Mode 下 AI 通过 plan_track mark_done/status 的工具返回值获知进度，应自行决定是否继续
 
   logInfo('模型停止工具调用 → ReAct Agent Loop 结束');
-  // ── 保存 Plan Mode 最终进度到状态，供下一轮 Loop 注入历史 ──
   // 注意：不在此处 clearPlanTracker，由 finally 块统一处理（保存 resumeData 后清理）
-  if (ctx.mode === 'plan') {
-    const tracker = getPlanTracker();
-    if (tracker.active && tracker.steps.length > 0) {
-      state.set('_lastPlanStatus', formatPlanStatus());
-    }
-  }
 
   // ── 自动记忆提取（异步，不阻塞用户看到回复）──
   // P3 #12 修复：在 cleanupAbortController 之前捕获 signal 引用，避免竞态
@@ -2730,7 +2710,6 @@ default:
           savedAt: Date.now(),
         };
         state.set('_planResumeData', resumeData);
-        state.set('_lastPlanStatus', formatPlanStatus());
       }
     }
     clearPlanTracker();
diff --git a/src/renderer/types.d.ts b/src/renderer/types.d.ts
index 87f7fd7..9bd2818 100644
--- a/src/renderer/types.d.ts
+++ b/src/renderer/types.d.ts
@@ -288,8 +288,6 @@ export type StateKey =
   | 'loopWatchdogMs'
   | '_planTracker'
   | '_planResumeData'
-  | '_lastPlanStatus'
-  | '_planLastInjectedDone'
   | 'globalToolMode'
   | 'planAutoConfirm';