openhorse 0.2.8 → 0.2.10

package/dist/tools/index.js

@@ -32,6 +32,9 @@ const plan_1 = require("./plan");
 const git_1 = require("./git");
 const lsp_1 = require("./lsp");
 const bash_security_1 = require("./bash_security");
+const BATCH_READ_ALLOWED_TOOLS = new Set(['git_status', 'list_files', 'glob', 'grep', 'read_file']);
+const BATCH_READ_MAX_STEPS = 8;
+const BATCH_READ_STEP_OUTPUT_MAX_BYTES = 1600;
 // ============================================================================
 // 工具集
 // ============================================================================
@@ -72,9 +75,10 @@ exports.TOOLS = [
             if (!path || typeof path !== 'string') {
                 return { success: false, output: '', error: 'read_file requires a path parameter' };
             }
-            return readFileSync_(path, args.maxLines);
+            return readFileSync_(path, args.maxLines, context.cwd);
         },
         isReadOnly: () => true,
+        isConcurrencySafe: () => true,
         userFacingName: (args) => `Read ${args.path}`,
         getSummary: (args, result) => {
             const path = args.path;
@@ -112,7 +116,7 @@ exports.TOOLS = [
             if (typeof content !== 'string') {
                 return { success: false, output: '', error: 'write_file requires a content parameter' };
             }
-            return writeFileSync_(path, content);
+            return writeFileSync_(path, content, context.cwd);
         },
         isDestructive: () => true,
         checkPermissions: (args, context) => {
@@ -145,13 +149,13 @@ exports.TOOLS = [
             },
             required: ['path'],
         },
-        execute: async (args) => {
+        execute: async (args, context) => {
             // Ensure path is a valid string
             const path = args.path;
             if (!path || typeof path !== 'string') {
                 return { success: false, output: '', error: 'list_files requires a path parameter' };
             }
-            return listFiles_(path, args.maxDepth);
+            return listFiles_(path, args.maxDepth, context.cwd);
         },
         isReadOnly: () => true,
         isConcurrencySafe: () => true,
@@ -196,7 +200,7 @@ exports.TOOLS = [
                 return { success: false, output: '', error: 'exec_command requires a command parameter' };
             }
             // Issue #32 #3.2: 传递 abortSignal
-            return execCommand_(command, args.cwd, args.timeout, args.maxOutput, context.abortSignal);
+            return execCommand_(command, args.cwd, args.timeout, args.maxOutput, context.abortSignal, context.cwd);
         },
         isDestructive: (args) => {
             const cmd = args.command || '';
@@ -222,6 +226,10 @@ exports.TOOLS = [
             const cmd = args.command || '';
             return (0, bash_security_1.isReadOnlyCommand)(cmd);
         },
+        isConcurrencySafe: (args) => {
+            const cmd = args.command || '';
+            return (0, bash_security_1.isReadOnlyCommand)(cmd);
+        },
         userFacingName: (args) => `Exec ${args.command?.slice(0, 60) || ''}`,
         getSummary: (args, result) => {
             const cmd = args.command?.slice(0, 40) || '';
@@ -289,7 +297,7 @@ exports.TOOLS = [
                 lastEditFileArgs.turnId = context.turnId;
             lastEditFileArgs.updatedAt = Date.now();
             (0, tool_state_1.setToolState)({ lastEditFileArgs });
-            return editFile_(path, old_string, new_string, args.replace_all, args.fuzzy_match, args.preview);
+            return editFile_(path, old_string, new_string, args.replace_all, args.fuzzy_match, args.preview, context.cwd);
         },
         isDestructive: () => true,
         checkPermissions: (args, context) => {
@@ -321,13 +329,13 @@ exports.TOOLS = [
             },
             required: ['pattern'],
         },
-        execute: async (args) => {
+        execute: async (args, context) => {
             // Ensure pattern is a valid string
             const pattern = args.pattern;
             if (!pattern || typeof pattern !== 'string') {
                 return { success: false, output: '', error: 'glob requires a pattern parameter' };
             }
-            return glob_(pattern, args.path);
+            return glob_(pattern, args.path, context.cwd);
         },
         isReadOnly: () => true,
         isConcurrencySafe: () => true,
@@ -365,13 +373,13 @@ exports.TOOLS = [
             },
             required: ['pattern'],
         },
-        execute: async (args) => {
+        execute: async (args, context) => {
             // Ensure pattern is a valid string
             const pattern = args.pattern;
             if (!pattern || typeof pattern !== 'string') {
                 return { success: false, output: '', error: 'grep requires a pattern parameter' };
             }
-            return grep_(pattern, args.path, args.glob, args.context);
+            return grep_(pattern, args.path, args.glob, args.context, context.cwd);
         },
         isReadOnly: () => true,
         isConcurrencySafe: () => true,
@@ -384,6 +392,46 @@ exports.TOOLS = [
             return `🔎 grep /${pattern}/ → ${count} matches`;
         },
     }),
+    (0, tool_1.buildTool)({
+        name: 'batch_read',
+        description: 'Run up to 8 read-only exploration tool calls in one ordered batch. Allowed tools: git_status, list_files, glob, grep, read_file.',
+        parameters: {
+            type: 'object',
+            properties: {
+                steps: {
+                    type: 'array',
+                    description: 'Array of steps: [{ "tool": "read_file", "args": { "path": "package.json" } }]. Max 8 steps.',
+                    items: {
+                        type: 'object',
+                        properties: {
+                            tool: { type: 'string', description: 'Allowed read-only tool name' },
+                            args: { type: 'object', description: 'Arguments for the tool' },
+                        },
+                        required: ['tool', 'args'],
+                    },
+                    maxItems: BATCH_READ_MAX_STEPS,
+                },
+                reason: {
+                    type: 'string',
+                    description: 'Optional reason for this read-only batch.',
+                },
+            },
+            required: ['steps'],
+        },
+        execute: async (args, context) => executeBatchRead(args, context),
+        isReadOnly: () => true,
+        isConcurrencySafe: () => true,
+        userFacingName: (args) => {
+            const count = Array.isArray(args.steps) ? args.steps.length : 0;
+            return `Batch read ${count} steps`;
+        },
+        getSummary: (args, result) => {
+            if (!result.success)
+                return '📚 batch_read → error';
+            const count = Array.isArray(args.steps) ? args.steps.length : 0;
+            return `📚 batch_read → ${count} steps`;
+        },
+    }),
     // Memory tools
     (0, tool_1.buildTool)({
         name: 'memory_save',
@@ -710,23 +758,55 @@ function getRuntimeTools() {
 // ============================================================================
 // 工具实现
 // ============================================================================
-/** 安全路径解析 — 防止路径遍历攻击 */
-function safePath(input) {
-    const resolved = (0, path_1.resolve)(input);
-    const cwd = process.cwd();
-    if ((0, path_1.relative)(cwd, resolved).startsWith('..')) {
-        return cwd;
+/** Normalize model/tool path strings before resolving them on disk. */
+function normalizeToolPath(input) {
+    let value = input.trim();
+    const markdownLink = value.match(/^!?\[[^\]]*\]\(([\s\S]+)\)$/u);
+    if (markdownLink) {
+        value = markdownLink[1].trim();
+        if (value.startsWith('<')) {
+            const end = value.indexOf('>');
+            if (end >= 0) {
+                value = value.slice(1, end);
+            }
+        }
+        else {
+            value = value.replace(/\s+["'][\s\S]*["']$/u, '');
+        }
+    }
+    if ((value.startsWith('`') && value.endsWith('`')) ||
+        (value.startsWith('"') && value.endsWith('"')) ||
+        (value.startsWith("'") && value.endsWith("'"))) {
+        value = value.slice(1, -1);
+    }
+    if (value.startsWith('file://')) {
+        try {
+            return decodeURIComponent(new URL(value).pathname);
+        }
+        catch {
+            value = value.replace(/^file:\/\//u, '');
+        }
+    }
+    try {
+        return decodeURIComponent(value);
+    }
+    catch {
+        return value;
     }
-    return resolved;
 }
-async function readFileSync_(path, maxLines) {
+/** Resolve tool path parameters relative to the current tool cwd. */
+function safePath(input, cwd = process.cwd()) {
+    return (0, path_1.resolve)(cwd, normalizeToolPath(input));
+}
+async function readFileSync_(path, maxLines, cwd) {
     try {
-        const resolved = safePath(path);
+        const normalizedPath = normalizeToolPath(path);
+        const resolved = safePath(path, cwd);
         if (!(0, fs_1.existsSync)(resolved)) {
-            return { success: false, output: '', error: `File not found: ${path}` };
+            return { success: false, output: '', error: `File not found: ${normalizedPath}` };
         }
         if ((0, fs_1.statSync)(resolved).isDirectory()) {
-            return { success: false, output: '', error: `Path is a directory, not a file: ${path}` };
+            return { success: false, output: '', error: `Path is a directory, not a file: ${normalizedPath}` };
         }
         const content = (0, fs_1.readFileSync)(resolved, 'utf-8');
         const lines = content.split('\n');
@@ -755,23 +835,25 @@ async function readFileSync_(path, maxLines) {
         return { success: false, output: '', error: String(err.message) };
     }
 }
-async function writeFileSync_(path, content) {
+async function writeFileSync_(path, content, cwd) {
     try {
-        const resolved = safePath(path);
+        const normalizedPath = normalizeToolPath(path);
+        const resolved = safePath(path, cwd);
         (0, fs_1.writeFileSync)(resolved, content, 'utf-8');
-        return { success: true, output: `Wrote ${content.split('\n').length} lines to ${path}` };
+        return { success: true, output: `Wrote ${content.split('\n').length} lines to ${normalizedPath}` };
     }
     catch (err) {
         return { success: false, output: '', error: String(err.message) };
     }
 }
-async function listFiles_(path, maxDepth) {
-    const resolved = safePath(path);
+async function listFiles_(path, maxDepth, cwd) {
+    const normalizedPath = normalizeToolPath(path);
+    const resolved = safePath(path, cwd);
     if (!(0, fs_1.existsSync)(resolved)) {
-        return { success: false, output: '', error: `Path not found: ${path}` };
+        return { success: false, output: '', error: `Path not found: ${normalizedPath}` };
     }
     if (!(0, fs_1.statSync)(resolved).isDirectory()) {
-        return { success: true, output: path };
+        return { success: true, output: normalizedPath };
     }
     const depth = maxDepth ?? 2;
     const results = [];
@@ -807,9 +889,9 @@ async function listFiles_(path, maxDepth) {
     return { success: true, output };
 }
 // Issue #32 #3.2: execCommand_ 支持 abortSignal
-async function execCommand_(command, cwd, timeout, maxOutput, abortSignal) {
+async function execCommand_(command, cwd, timeout, maxOutput, abortSignal, baseCwd) {
     return new Promise((resolve) => {
-        const workdir = cwd ? safePath(cwd) : process.cwd();
+        const workdir = cwd ? safePath(cwd, baseCwd) : baseCwd ?? process.cwd();
         const timeoutMs = timeout ?? 30000;
         const maxBytes = maxOutput ?? 51200; // Default 50KB, Issue #28 fix
         // Use spawn for streaming output with truncation support
@@ -1072,14 +1154,15 @@ function fuzzyMatch(content, oldString) {
     }
     return null;
 }
-async function editFile_(path, old_string, new_string, replace_all, fuzzy_match, preview) {
+async function editFile_(path, old_string, new_string, replace_all, fuzzy_match, preview, cwd) {
     try {
-        const resolved = safePath(path);
+        const normalizedPath = normalizeToolPath(path);
+        const resolved = safePath(path, cwd);
         if (!(0, fs_1.existsSync)(resolved)) {
-            return { success: false, output: '', error: `File not found: ${path}` };
+            return { success: false, output: '', error: `File not found: ${normalizedPath}` };
         }
         if ((0, fs_1.statSync)(resolved).isDirectory()) {
-            return { success: false, output: '', error: `Path is a directory, not a file: ${path}` };
+            return { success: false, output: '', error: `Path is a directory, not a file: ${normalizedPath}` };
         }
         const content = (0, fs_1.readFileSync)(resolved, 'utf-8');
         // Check if old_string exists exactly
@@ -1154,7 +1237,7 @@ async function editFile_(path, old_string, new_string, replace_all, fuzzy_match,
             (0, fs_1.writeFileSync)(resolved, newContent, 'utf-8');
             return {
                 success: true,
-                output: `Fuzzy edited ${path} (matched by ${fuzzyResult.strategy}, "${match.slice(0, 50)}...")`,
+                output: `Fuzzy edited ${normalizedPath} (matched by ${fuzzyResult.strategy}, "${match.slice(0, 50)}...")`,
             };
         }
         // If not replace_all, require unique match
@@ -1178,7 +1261,7 @@ async function editFile_(path, old_string, new_string, replace_all, fuzzy_match,
         (0, fs_1.writeFileSync)(resolved, newContent, 'utf-8');
         return {
             success: true,
-            output: `Replaced ${count} occurrence(s) of old_string with new_string in ${path}`,
+            output: `Replaced ${count} occurrence(s) of old_string with new_string in ${normalizedPath}`,
         };
     }
     catch (err) {
@@ -1196,14 +1279,15 @@ function escapeRegExp(str) {
  * Glob 模式匹配 - 简化版实现
  * 支持: **（递归目录）、*（任意字符）、?（单个字符）
  */
-async function glob_(pattern, basePath) {
+async function glob_(pattern, basePath, cwd) {
     try {
-        const base = basePath ? safePath(basePath) : process.cwd();
+        const normalizedBasePath = basePath ? normalizeToolPath(basePath) : cwd ?? process.cwd();
+        const base = basePath ? safePath(basePath, cwd) : cwd ?? process.cwd();
         if (!(0, fs_1.existsSync)(base)) {
-            return { success: false, output: '', error: `Path not found: ${basePath}` };
+            return { success: false, output: '', error: `Path not found: ${normalizedBasePath}` };
         }
         if (!(0, fs_1.statSync)(base).isDirectory()) {
-            return { success: false, output: '', error: `Path is not a directory: ${basePath}` };
+            return { success: false, output: '', error: `Path is not a directory: ${normalizedBasePath}` };
         }
         const results = [];
         // Convert glob pattern to regex
@@ -1270,11 +1354,12 @@ async function glob_(pattern, basePath) {
 /**
  * Grep 搜索 - 在文件中搜索正则表达式
  */
-async function grep_(pattern, basePath, globPattern, contextLines) {
+async function grep_(pattern, basePath, globPattern, contextLines, cwd) {
     try {
-        const base = basePath ? safePath(basePath) : process.cwd();
+        const normalizedBasePath = basePath ? normalizeToolPath(basePath) : cwd ?? process.cwd();
+        const base = basePath ? safePath(basePath, cwd) : cwd ?? process.cwd();
         if (!(0, fs_1.existsSync)(base)) {
-            return { success: false, output: '', error: `Path not found: ${basePath}` };
+            return { success: false, output: '', error: `Path not found: ${normalizedBasePath}` };
         }
         const regex = new RegExp(pattern);
         const context = contextLines ?? 0;
@@ -1368,6 +1453,137 @@ async function grep_(pattern, basePath, globPattern, contextLines) {
         return { success: false, output: '', error: String(err.message) };
     }
 }
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function parseBatchReadSteps(rawSteps) {
+    let value = rawSteps;
+    if (typeof value === 'string') {
+        try {
+            value = JSON.parse(value);
+        }
+        catch {
+            return { error: 'batch_read steps must be an array or a valid JSON array string' };
+        }
+    }
+    if (!Array.isArray(value)) {
+        return { error: 'batch_read requires steps to be an array' };
+    }
+    if (value.length === 0) {
+        return { error: 'batch_read requires at least one step' };
+    }
+    if (value.length > BATCH_READ_MAX_STEPS) {
+        return { error: `batch_read supports at most ${BATCH_READ_MAX_STEPS} steps` };
+    }
+    const steps = [];
+    for (let i = 0; i < value.length; i++) {
+        const step = value[i];
+        if (!isRecord(step)) {
+            return { error: `batch_read step ${i + 1} must be an object` };
+        }
+        if (typeof step.tool !== 'string' || !step.tool) {
+            return { error: `batch_read step ${i + 1} requires a tool string` };
+        }
+        let stepArgs = step.args;
+        if (typeof stepArgs === 'string') {
+            try {
+                stepArgs = JSON.parse(stepArgs);
+            }
+            catch {
+                return { error: `batch_read step ${i + 1} args must be an object or valid JSON object string` };
+            }
+        }
+        if (!isRecord(stepArgs)) {
+            return { error: `batch_read step ${i + 1} requires args to be an object` };
+        }
+        steps.push({ tool: step.tool, args: stepArgs });
+    }
+    return { steps };
+}
+function buildBatchReadPayload(success, summary, steps, error) {
+    const payload = {
+        success,
+        output: steps.map(step => `${step.index}. ${step.tool}: ${step.summary || (step.success ? 'ok' : step.error || 'error')}`).join('\n'),
+        summary,
+        steps,
+    };
+    if (error) {
+        payload.error = error;
+    }
+    return {
+        success,
+        output: JSON.stringify(payload, null, 2),
+        summary,
+        error,
+    };
+}
+async function executeBatchRead(args, context) {
+    const parsed = parseBatchReadSteps(args.steps);
+    if (parsed.error || !parsed.steps) {
+        return buildBatchReadPayload(false, parsed.error || 'Invalid batch_read request', [], parsed.error);
+    }
+    const runtimeTools = getRuntimeTools();
+    for (let i = 0; i < parsed.steps.length; i++) {
+        const step = parsed.steps[i];
+        const tool = runtimeTools.find(t => t.name === step.tool);
+        if (!BATCH_READ_ALLOWED_TOOLS.has(step.tool)) {
+            const error = `Tool ${step.tool} is not allowed in batch_read`;
+            return buildBatchReadPayload(false, error, [{
+                    index: i + 1,
+                    tool: step.tool,
+                    args: step.args,
+                    success: false,
+                    error,
+                    output: '',
+                }], error);
+        }
+        if (!tool || tool.isReadOnly?.(step.args) !== true) {
+            const error = `Tool ${step.tool} is unavailable or not read-only`;
+            return buildBatchReadPayload(false, error, [{
+                    index: i + 1,
+                    tool: step.tool,
+                    args: step.args,
+                    success: false,
+                    error,
+                    output: '',
+                }], error);
+        }
+    }
+    const stepResults = [];
+    for (let i = 0; i < parsed.steps.length; i++) {
+        const step = parsed.steps[i];
+        try {
+            const rawResult = await executeTool(step.tool, step.args, context.abortSignal, context);
+            const envelope = JSON.parse(rawResult);
+            const output = typeof envelope.output === 'string'
+                ? envelope.output
+                : JSON.stringify(envelope.output ?? '');
+            stepResults.push({
+                index: i + 1,
+                tool: step.tool,
+                args: step.args,
+                success: envelope.success === true,
+                summary: typeof envelope.summary === 'string' ? envelope.summary : undefined,
+                error: typeof envelope.error === 'string' ? envelope.error : undefined,
+                output: (0, tool_artifacts_1.truncateForContext)(output, BATCH_READ_STEP_OUTPUT_MAX_BYTES),
+            });
+        }
+        catch (err) {
+            stepResults.push({
+                index: i + 1,
+                tool: step.tool,
+                args: step.args,
+                success: false,
+                error: err?.message || String(err),
+                output: '',
+            });
+        }
+    }
+    const okCount = stepResults.filter(step => step.success).length;
+    const success = okCount === stepResults.length;
+    const summary = `batch_read completed ${okCount}/${stepResults.length} steps`;
+    return buildBatchReadPayload(success, summary, stepResults, success ? undefined : summary);
+}
 // ============================================================================
 // 统一执行入口
 // ============================================================================