xiaozuoassistant 0.2.56 → 0.2.58

package/dist/server/core/brain.js

@@ -2,6 +2,7 @@ import { config } from '../config/loader.js';
 import { skillRegistry } from '../skills/registry.js';
 import { SYSTEM_PROMPT } from '../config/prompts.js';
 import { createOpenAIClient } from '../llm/openai.js';
+import path from 'path';
 export class Brain {
     constructor() {
         this.openai = createOpenAIClient(config.llm);
@@ -78,6 +79,7 @@ export class Brain {
             if (process.env.DEBUG)
                 console.log('[Brain] Calling LLM...');
             let response = await this.callLLM(messages, newMessage);
+            const fsToolOutcomes = [];
             // Log only the content snippet to avoid flooding logs with full JSON
             const contentSnippet = response.choices[0].message.content ? response.choices[0].message.content.substring(0, 100) + '...' : 'No content';
             if (process.env.DEBUG)
@@ -105,9 +107,24 @@ export class Brain {
                                 : undefined;
                             const result = await skill.execute(functionArgs, ctxForTool);
                             toolResult = JSON.stringify(result);
+                            if (functionName.startsWith('fs_')) {
+                                const isErrorString = typeof result === 'string' && /^error/i.test(result.trim());
+                                fsToolOutcomes.push({
+                                    name: functionName,
+                                    success: !isErrorString,
+                                    error: isErrorString ? String(result) : undefined
+                                });
+                            }
                         }
                         catch (error) {
                             toolResult = JSON.stringify({ error: error.message });
+                            if (functionName.startsWith('fs_')) {
+                                fsToolOutcomes.push({
+                                    name: functionName,
+                                    success: false,
+                                    error: String(error?.message || error)
+                                });
+                            }
                         }
                     }
                     else {
@@ -132,6 +149,30 @@ export class Brain {
             }
             const hitLimit = Boolean(response.choices[0].message.tool_calls) && iterations >= MAX_ITERATIONS;
             const finalContent = response.choices[0].message.content || 'I could not generate a response.';
+            // Hard guard: avoid fabricated "file read success" responses when fs tool didn't actually succeed.
+            const hasExplicitPath = /\/[\w\-./\\]+|\.\w{1,8}\b/.test(newMessage);
+            const asksFileAction = /(读取|读一下|打开|查看|列出|目录|文件|read|open|list|ls|cat)/i.test(newMessage);
+            if (hasExplicitPath && asksFileAction) {
+                const fsSuccess = fsToolOutcomes.some(x => x.success);
+                if (!fsSuccess) {
+                    const lastFsError = [...fsToolOutcomes].reverse().find(x => !x.success)?.error;
+                    const attemptedFsTools = fsToolOutcomes.map(x => x.name);
+                    const absPathMatch = newMessage.match(/\/[^\s"'`]+/);
+                    const requestedPath = absPathMatch ? absPathMatch[0] : '';
+                    const resolvedWorkspace = effectiveWorkspace ? path.resolve(effectiveWorkspace) : '';
+                    const resolvedRequested = requestedPath ? path.resolve(requestedPath) : '';
+                    let workspaceCheck = '';
+                    if (resolvedWorkspace && resolvedRequested) {
+                        const rel = path.relative(resolvedWorkspace, resolvedRequested);
+                        const outside = Boolean(rel) && (rel.startsWith('..') || path.isAbsolute(rel));
+                        workspaceCheck = outside
+                            ? `路径检查：目标路径在 workspace 之外（${resolvedRequested} 不在 ${resolvedWorkspace} 内）。`
+                            : `路径检查：目标路径位于 workspace 内。`;
+                    }
+                    const ws = effectiveWorkspace || '(not set)';
+                    return `未能实际读取文件：文件工具未成功执行。\n当前会话 workspace：${ws}\n请求路径：${requestedPath || '(未识别到明确路径)'}\n${workspaceCheck || '路径检查：无法判定。'}\n${attemptedFsTools.length > 0 ? `已触发工具：${attemptedFsTools.join(', ')}` : '未触发任何 fs_* 文件工具调用（模型未选择工具）。'}\n${lastFsError ? `工具错误：${lastFsError}` : '原因：未拿到可用的文件工具执行结果。请重试，或缩短指令为“读取 <绝对路径>”。'}`;
+                }
+            }
             if (process.env.DEBUG)
                 console.log('[Brain] Final Response (snippet):', finalContent.substring(0, 100) + '...');
             if (!hitLimit)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaozuoassistant",
-  "version": "0.2.56",
+  "version": "0.2.58",
   "description": "A local-first personal AI assistant with multi-channel support and enhanced memory.",
   "author": "mantle.lau",
   "license": "MIT",