xiaozuoassistant 0.2.57 → 0.2.59

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);
@@ -54,6 +55,12 @@ export class Brain {
             config.workspace ||
             '').trim();
         const localRuntimeContext = `\n\n[Local Runtime]\nYou are running on the user's local machine (not a cloud-only assistant).\nYou can use built-in tools to list/read/write files within the current session workspace.\nWorkspace: ${effectiveWorkspace || '(not set)'}\nRules:\n- When asked to list/read/write files, use the provided tools (fs_list_directory / fs_read_file / fs_write_file) instead of asking the user to run shell commands.\n- Never claim you are unable to access the local filesystem in general.\n- If a user provides a path outside the current workspace, explain that access is limited to the workspace for safety, and ask the user to switch the session workspace or move files into the workspace.\n- For files sent from Feishu, check workspace/downloads/<botName>/ first.\n`.trimEnd();
+        // Deterministic fast-path: for explicit file read/list requests with absolute path,
+        // execute filesystem tools directly instead of relying on model tool selection.
+        const directFsResult = await this.tryDirectFsIntent(newMessage, context, effectiveWorkspace);
+        if (directFsResult) {
+            return directFsResult;
+        }
         // Convert history messages to the format expected by OpenAI
         // Strategy: Keep last N messages to avoid context window overflow
         // TODO: A better strategy would be token-based truncation.
@@ -155,8 +162,21 @@ export class Brain {
                 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${lastFsError ? `工具错误：${lastFsError}` : '请确认目标路径在当前 workspace 内，或先切换会话 workspace 后重试。'}`;
+                    return `未能实际读取文件：文件工具未成功执行。\n当前会话 workspace：${ws}\n请求路径：${requestedPath || '(未识别到明确路径)'}\n${workspaceCheck || '路径检查：无法判定。'}\n${attemptedFsTools.length > 0 ? `已触发工具：${attemptedFsTools.join(', ')}` : '未触发任何 fs_* 文件工具调用（模型未选择工具）。'}\n${lastFsError ? `工具错误：${lastFsError}` : '原因：未拿到可用的文件工具执行结果。请重试，或缩短指令为“读取 <绝对路径>”。'}`;
                 }
             }
             if (process.env.DEBUG)
@@ -288,5 +308,49 @@ Format: [{"title": "...", "content": "..."}]` },
         }
         throw lastError;
     }
+    async tryDirectFsIntent(newMessage, context, effectiveWorkspace) {
+        const absPathMatch = newMessage.match(/\/[^\s"'`]+/);
+        if (!absPathMatch)
+            return null;
+        const requestedPath = absPathMatch[0];
+        const asksRead = /(读取|读一下|打开|查看|read|cat)/i.test(newMessage);
+        const asksList = /(列出|目录|list|ls)/i.test(newMessage);
+        if (!asksRead && !asksList)
+            return null;
+        const ws = (effectiveWorkspace || '').trim();
+        const resolvedWorkspace = ws ? path.resolve(ws) : '';
+        const resolvedRequested = path.resolve(requestedPath);
+        if (resolvedWorkspace) {
+            const rel = path.relative(resolvedWorkspace, resolvedRequested);
+            const outside = Boolean(rel) && (rel.startsWith('..') || path.isAbsolute(rel));
+            if (outside) {
+                return `未能实际读取文件：目标路径不在当前会话 workspace 内。\n当前会话 workspace：${resolvedWorkspace}\n请求路径：${resolvedRequested}\n路径检查：目标路径在 workspace 之外。`;
+            }
+        }
+        if (asksRead) {
+            const skill = skillRegistry.getSkill('fs_read_file');
+            if (!skill) {
+                return '未能实际读取文件：fs_read_file 工具不可用。';
+            }
+            const result = await skill.execute({ path: requestedPath }, context);
+            if (typeof result === 'string' && /^error/i.test(result.trim())) {
+                return `未能实际读取文件：文件工具执行失败。\n当前会话 workspace：${resolvedWorkspace || '(not set)'}\n请求路径：${resolvedRequested}\n工具错误：${result}`;
+            }
+            return `已读取 \`${resolvedRequested}\` 内容如下：\n\n${String(result)}`;
+        }
+        const skill = skillRegistry.getSkill('fs_list_directory');
+        if (!skill) {
+            return '未能列出目录：fs_list_directory 工具不可用。';
+        }
+        const result = await skill.execute({ path: requestedPath }, context);
+        if (typeof result === 'string' && /^error/i.test(result.trim())) {
+            return `未能列出目录：文件工具执行失败。\n当前会话 workspace：${resolvedWorkspace || '(not set)'}\n请求路径：${resolvedRequested}\n工具错误：${result}`;
+        }
+        if (Array.isArray(result)) {
+            const lines = result.map((item) => `${item.type === 'directory' ? '📁' : '📄'} ${item.name}`);
+            return `目录 \`${resolvedRequested}\` 列表：\n${lines.join('\n')}`;
+        }
+        return `目录 \`${resolvedRequested}\` 列表结果：\n${JSON.stringify(result, null, 2)}`;
+    }
 }
 export const brain = Brain.getInstance();

package/package.json

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