From d479666182a1ff2387408d0d1543231b46a1cd37 Mon Sep 17 00:00:00 2001
From: thzxx <thzxx@gitee.com>
Date: Sat, 11 Jul 2026 23:46:55 +0800
Subject: [PATCH] =?UTF-8?q?v0.16.1:=20=E4=BC=98=E5=8C=96Reflecting?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5=E8=AF=B4=E4=BA=86=E5=81=9A=E4=BD=86=E6=B2=A1?=
 =?UTF-8?q?=E5=81=9A=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91=EF=BC=8C=E9=99=8D?=
 =?UTF-8?q?=E4=BD=8E=E8=AF=AF=E5=88=A4=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                             |  6 +--
 package-lock.json                     |  4 +-
 package.json                          |  2 +-
 src/main/menu.ts                      |  2 +-
 src/renderer/index.html               |  2 +-
 src/renderer/services/agent-engine.ts | 71 +++++++++++++++++++++------
 6 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index c79e1f4..88ab12f 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.0-E8734A?style=flat-square" alt="version">
+  <img src="https://img.shields.io/badge/version-v0.16.1-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.0.exe`
+产出：`release/Metona Ollama Setup v0.16.1.exe`
 
 ## 🛠️ 常用命令
 
@@ -501,7 +501,7 @@ npm start
 ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ npm run dist
 ```
 
-Output: `release/Metona Ollama Setup v0.16.0.exe`
+Output: `release/Metona Ollama Setup v0.16.1.exe`
 
 ## 🛠️ Common Commands
 
diff --git a/package-lock.json b/package-lock.json
index f841e42..a5d3009 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "metona-ollama-desktop",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "metona-ollama-desktop",
-      "version": "0.16.0",
+      "version": "0.16.1",
       "license": "MIT",
       "dependencies": {
         "ffmpeg-static": "^5.2.0",
diff --git a/package.json b/package.json
index ba89bd0..1db113c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metona-ollama-desktop",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "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 c4ded45..e59ea70 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.0',
+              message: 'Metona Ollama Desktop v0.16.1',
               detail: 'TypeScript + Electron Ollama AI 聊天客户端\n\nhttps://gitee.com/thzxx/metona-ollama',
               icon: getIconPath()
             });
diff --git a/src/renderer/index.html b/src/renderer/index.html
index ee44785..f17cbb9 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.0</span>
+            <span class="app-version">v0.16.1</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 ec02cd5..b47a482 100644
--- a/src/renderer/services/agent-engine.ts
+++ b/src/renderer/services/agent-engine.ts
@@ -2601,25 +2601,66 @@ async function handleReflecting(
 
   // ── 异常3: 模型说了要做但没调用工具 → 注入提醒再给一次机会 ──
   // 场景：AI 回复"我来写入文件"但未发出 write_file 工具调用
+  // 优化：区分"意图声明"（将来时）与"结果描述"（完成时），避免对总结性回复误判
   if (ctx.toolCalls.length === 0 && ctx.content.trim() && ctx.loopCount <= 3) {
     const text = ctx.content.toLowerCase();
-    const actionHints: Array<{ pattern: RegExp; tool: string; hint: string }> = [
-      { pattern: /写入|写文件|写入文件|保存.*文件|创建.*文件|生成.*文件|输出.*文件|write.*file/i, tool: 'write_file', hint: '你提到了写入/创建文件，但没有调用 write_file 工具。请直接调用 write_file 工具执行写入操作。' },
-      { pattern: /搜索|查找|搜一下|查一下|检索|search/i, tool: 'web_search', hint: '你提到了搜索，但没有调用 web_search 工具。请直接调用 web_search 工具执行搜索。' },
-      { pattern: /抓取|获取.*内容|fetch|获取.*网页/i, tool: 'web_fetch', hint: '你提到了抓取网页，但没有调用 web_fetch 工具。请直接调用 web_fetch 工具获取网页内容。' },
-      { pattern: /运行.*命令|执行.*命令|run.*command/i, tool: 'run_command', hint: '你提到了运行命令，但没有调用 run_command 工具。请直接调用 run_command 工具执行命令。' },
-      { pattern: /下载/i, tool: 'download_file', hint: '你提到了下载，但没有调用 download_file 工具。请直接调用 download_file 工具执行下载。' },
+    const contentLen = ctx.content.trim().length;
+
+    // 结果描述迹象 — 回复中包含这些，说明模型在总结/描述而非空谈
+    const resultIndicators = [
+      /根据.*(结果|内容|返回|输出)/, /搜索结果/, /查询结果/, /查找结果/,
+      /结果显示/, /结果如下/, /已找到/, /已获取/, /已完成/, /已经.*(写入|保存|创建|搜索|执行)/,
+      /从.*获取/, /已写入/, /已保存/, /已创建/, /已执行/,
+      /search result/, /found that/, /according to/i,
     ];
-    const matched = actionHints.find(h => h.pattern.test(text) && !ctx.allToolRecords.some(r => r.name === h.tool));
-    if (matched) {
-      logWarn(`Reflecting: 检测到"说了做但没做" → ${matched.tool}，注入提醒`);
-      ctx.messages.push({
-        role: 'user',
-        content: matched.hint,
-        ephemeral: true,
+    const isDescribingResult = resultIndicators.some(p => p.test(text));
+
+    // 意图声明模式 — 只有明确表达"将要做"时才视为"说了没做"
+    const intentPatterns = [
+      /我来.*(写入|写文件|创建|生成|保存|搜索|查找|抓取|运行|执行|下载)/,
+      /让我.*(写入|写文件|创建|生成|保存|搜索|查找|抓取|运行|执行|下载)/,
+      /我将.*(写入|写文件|创建|生成|保存|搜索|查找|抓取|运行|执行|下载)/,
+      /接下来.*(写入|写文件|创建|生成|保存|搜索|查找|抓取|运行|执行|下载)/,
+      /现在.*(写入|写文件|创建|生成|保存|搜索|查找|抓取|运行|执行|下载)/,
+      /需要.*(写入|写文件|创建|生成|保存|搜索|查找|抓取|运行|执行|下载)/,
+      /i('?)ll (write|create|search|fetch|run|execute|download)/i,
+      /let me (write|create|search|fetch|run|execute|download)/i,
+      /i will (write|create|search|fetch|run|execute|download)/i,
+      /i need to (write|create|search|fetch|run|execute|download)/i,
+    ];
+    const hasIntentStatement = intentPatterns.some(p => p.test(text));
+
+    // 上一轮已调用的工具 — 本轮可能在总结结果，不触发
+    const lastLoopToolNames = (ctx.prevToolCalls || []).map(c => c.function.name);
+
+    // 触发条件：有意图声明（高置信度），或短回复中匹配关键词且非结果描述（低置信度）
+    const shouldCheck = hasIntentStatement || (contentLen < 300 && !isDescribingResult);
+
+    if (shouldCheck) {
+      const actionHints: Array<{ pattern: RegExp; tool: string; hint: string }> = [
+        { pattern: /写入|写文件|写入文件|保存.*文件|创建.*文件|生成.*文件|输出.*文件|write.*file/i, tool: 'write_file', hint: '你提到了写入/创建文件，但没有调用 write_file 工具。请直接调用 write_file 工具执行写入操作。' },
+        // web_search 正则保持宽泛，由 resultIndicators + lastLoopToolNames 两层防护避免误判
+        { pattern: /搜索|搜一下|检索|search/i, tool: 'web_search', hint: '你提到了搜索，但没有调用 web_search 工具。请直接调用 web_search 工具执行搜索。' },
+        { pattern: /抓取|获取.*内容|fetch|获取.*网页/i, tool: 'web_fetch', hint: '你提到了抓取网页，但没有调用 web_fetch 工具。请直接调用 web_fetch 工具获取网页内容。' },
+        { pattern: /运行.*命令|执行.*命令|run.*command/i, tool: 'run_command', hint: '你提到了运行命令，但没有调用 run_command 工具。请直接调用 run_command 工具执行命令。' },
+        { pattern: /下载/i, tool: 'download_file', hint: '你提到了下载，但没有调用 download_file 工具。请直接调用 download_file 工具执行下载。' },
+      ];
+      const matched = actionHints.find(h => {
+        if (!h.pattern.test(text)) return false;
+        if (ctx.allToolRecords.some(r => r.name === h.tool)) return false; // 整个会话已调用过
+        if (lastLoopToolNames.includes(h.tool)) return false; // 上一轮调用过，本轮可能在总结
+        return true;
       });
-      transition(ctx, S.THINKING);
-      return;
+      if (matched) {
+        logWarn(`Reflecting: 检测到"说了做但没做" → ${matched.tool}，注入提醒`);
+        ctx.messages.push({
+          role: 'user',
+          content: matched.hint,
+          ephemeral: true,
+        });
+        transition(ctx, S.THINKING);
+        return;
+      }
     }
   }