openhorse 0.2.22 → 0.2.23

package/dist/tools/index.js

@@ -75,7 +75,7 @@ exports.TOOLS = [
     // File tools
     (0, tool_1.buildTool)({
         name: 'read_file',
-        description: '读取文件的全部内容。返回文件内容字符串。',
+        description: '读取文件内容，支持从指定行开始分页。返回文件内容字符串。',
         parameters: {
             type: 'object',
             properties: {
@@ -87,6 +87,10 @@ exports.TOOLS = [
                     type: 'number',
                     description: '最大读取行数（可选，默认 500 行）',
                 },
+                offset: {
+                    type: 'number',
+                    description: '开始读取的行号（可选，1-based，默认第 1 行）',
+                },
             },
             required: ['path'],
         },
@@ -96,11 +100,19 @@ exports.TOOLS = [
             if (!path || typeof path !== 'string') {
                 return { success: false, output: '', error: 'read_file requires a path parameter' };
             }
-            return readFileSync_(path, args.maxLines, context.cwd);
+            const maxLines = readPositiveInteger(args.maxLines, 'maxLines', 500);
+            if (typeof maxLines === 'string') {
+                return { success: false, output: '', error: maxLines };
+            }
+            const offset = readPositiveInteger(args.offset, 'offset', 1);
+            if (typeof offset === 'string') {
+                return { success: false, output: '', error: offset };
+            }
+            return readFileSync_(path, maxLines, offset, context.cwd);
         },
         isReadOnly: () => true,
         isConcurrencySafe: () => true,
-        userFacingName: (args) => `Read ${args.path}`,
+        userFacingName: args => `Read ${args.path}`,
         getSummary: (args, result) => {
             const path = args.path;
             if (!result.success)
@@ -144,7 +156,7 @@ exports.TOOLS = [
             // Destructive operation - ask for confirmation in default mode
             return { behavior: 'ask', reason: 'Write operation may modify existing files' };
         },
-        userFacingName: (args) => `Write ${args.path}`,
+        userFacingName: args => `Write ${args.path}`,
         getSummary: (args, result) => {
             const path = args.path;
             if (!result.success)
@@ -180,7 +192,7 @@ exports.TOOLS = [
         },
         isReadOnly: () => true,
         isConcurrencySafe: () => true,
-        userFacingName: (args) => `List ${args.path}`,
+        userFacingName: args => `List ${args.path}`,
         getSummary: (args, result) => {
             const path = args.path;
             if (!result.success)
@@ -223,7 +235,7 @@ exports.TOOLS = [
             // Issue #32 #3.2: 传递 abortSignal
             return execCommand_(command, args.cwd, args.timeout, args.maxOutput, context.abortSignal, context.cwd);
         },
-        isDestructive: (args) => {
+        isDestructive: args => {
             const cmd = args.command || '';
             return /(rm\s+-rf|mkfs|dd\s)/.test(cmd);
         },
@@ -232,7 +244,10 @@ exports.TOOLS = [
             // Use the bash_security module for comprehensive checks
             const security = (0, bash_security_1.assessCommandSecurity)(cmd);
             if (security.level === 'blocked') {
-                return { behavior: 'deny', reason: security.reason || `Command blocked by safety policy: ${cmd.slice(0, 50)}` };
+                return {
+                    behavior: 'deny',
+                    reason: security.reason || `Command blocked by safety policy: ${cmd.slice(0, 50)}`,
+                };
             }
             if (security.level === 'safe' && security.isReadOnly) {
                 return { behavior: 'allow' };
@@ -243,15 +258,15 @@ exports.TOOLS = [
             // Default: ask for confirmation
             return { behavior: 'ask', reason: 'Command requires confirmation' };
         },
-        isReadOnly: (args) => {
+        isReadOnly: args => {
             const cmd = args.command || '';
             return (0, bash_security_1.isReadOnlyCommand)(cmd);
         },
-        isConcurrencySafe: (args) => {
+        isConcurrencySafe: args => {
             const cmd = args.command || '';
             return (0, bash_security_1.isReadOnlyCommand)(cmd);
         },
-        userFacingName: (args) => `Exec ${compactOneLine(args.command || '', 80)}`,
+        userFacingName: args => `Exec ${compactOneLine(args.command || '', 80)}`,
         getSummary: (args, result) => {
             const command = args.command || '';
             const commandSummary = command ? `\n  $ ${compactOneLine(command, 160)}` : '';
@@ -327,7 +342,7 @@ exports.TOOLS = [
         checkPermissions: (_args, _context) => {
             return { behavior: 'ask', reason: 'Edit operation modifies file contents' };
         },
-        userFacingName: (args) => `Edit ${args.path}`,
+        userFacingName: args => `Edit ${args.path}`,
         getSummary: (args, result) => {
             const path = args.path;
             if (!result.success)
@@ -363,7 +378,7 @@ exports.TOOLS = [
         },
         isReadOnly: () => true,
         isConcurrencySafe: () => true,
-        userFacingName: (args) => `Glob ${args.pattern}`,
+        userFacingName: args => `Glob ${args.pattern}`,
         getSummary: (args, result) => {
             const pattern = args.pattern;
             if (!result.success)
@@ -407,7 +422,7 @@ exports.TOOLS = [
         },
         isReadOnly: () => true,
         isConcurrencySafe: () => true,
-        userFacingName: (args) => `Grep ${args.pattern}`,
+        userFacingName: args => `Grep ${args.pattern}`,
         getSummary: (args, result) => {
             const pattern = args.pattern;
             if (!result.success)
@@ -445,7 +460,7 @@ exports.TOOLS = [
         execute: async (args, context) => executeBatchRead(args, context),
         isReadOnly: () => true,
         isConcurrencySafe: () => true,
-        userFacingName: (args) => {
+        userFacingName: args => {
             const count = Array.isArray(args.steps) ? args.steps.length : 0;
             return `Batch read ${count} steps`;
         },
@@ -492,7 +507,11 @@ exports.TOOLS = [
                 return { success: false, output: '', error: 'memory_save requires a name parameter' };
             }
             if (!type || !['user', 'feedback', 'project', 'reference'].includes(type)) {
-                return { success: false, output: '', error: 'memory_save requires a valid type: user, feedback, project, or reference' };
+                return {
+                    success: false,
+                    output: '',
+                    error: 'memory_save requires a valid type: user, feedback, project, or reference',
+                };
             }
             if (!content || typeof content !== 'string') {
                 return { success: false, output: '', error: 'memory_save requires a content parameter' };
@@ -521,7 +540,7 @@ exports.TOOLS = [
             }
         },
         isReadOnly: () => false,
-        userFacingName: (args) => `Memory save ${args.name}`,
+        userFacingName: args => `Memory save ${args.name}`,
         getSummary: (args, result) => {
             const name = args.name;
             const type = args.type;
@@ -609,7 +628,7 @@ exports.TOOLS = [
             }
         },
         isReadOnly: () => true,
-        userFacingName: (args) => `Memory recall ${args.query || 'all'}`,
+        userFacingName: args => `Memory recall ${args.query || 'all'}`,
         getSummary: (args, result) => {
             const query = args.query || 'all';
             if (!result.success)
@@ -661,7 +680,7 @@ exports.TOOLS = [
             }
         },
         isReadOnly: () => false,
-        userFacingName: (args) => `Memory forget ${args.name}`,
+        userFacingName: args => `Memory forget ${args.name}`,
         getSummary: (args, result) => {
             const name = args.name;
             if (!result.success)
@@ -756,7 +775,7 @@ exports.TOOLS = [
             }
         },
         isReadOnly: () => true,
-        userFacingName: (args) => `History search ${args.query}`,
+        userFacingName: args => `History search ${args.query}`,
         getSummary: (args, result) => {
             const query = args.query;
             if (!result.success)
@@ -836,7 +855,15 @@ function truncateToBytes(text, maxBytes) {
         cut--;
     return { text: buf.subarray(0, cut).toString('utf-8'), bytes: cut };
 }
-async function readFileSync_(path, maxLines, cwd) {
+function readPositiveInteger(value, name, defaultValue) {
+    if (value === undefined)
+        return defaultValue;
+    if (typeof value !== 'number' || !Number.isSafeInteger(value) || value < 1) {
+        return `read_file ${name} must be a positive integer`;
+    }
+    return value;
+}
+async function readFileSync_(path, maxLines, offset, cwd) {
     try {
         const normalizedPath = normalizeToolPath(path);
         const resolved = safePath(path, cwd);
@@ -844,35 +871,48 @@ async function readFileSync_(path, maxLines, cwd) {
             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: ${normalizedPath}` };
+            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');
-        const limit = maxLines ?? 500;
         const maxBytes = 51200; // 50KB byte limit
-        if (lines.length > limit) {
-            const truncated = lines.slice(0, limit).join('\n');
-            const byteLen = Buffer.byteLength(truncated, 'utf8');
-            const notice = `\n\n[... truncated, ${lines.length - limit} more lines]`;
+        if (offset > lines.length) {
+            return {
+                success: false,
+                output: '',
+                error: `read_file offset ${offset} is beyond the file (${lines.length} lines)`,
+            };
+        }
+        const startIndex = offset - 1;
+        const selectedLines = lines.slice(startIndex, startIndex + maxLines);
+        const selected = selectedLines.join('\n');
+        const remainingLines = Math.max(0, lines.length - startIndex - selectedLines.length);
+        if (remainingLines > 0) {
+            const byteLen = Buffer.byteLength(selected, 'utf8');
+            const notice = `\n\n[... truncated, ${remainingLines} more lines; showing lines ${offset}-${offset + selectedLines.length - 1} of ${lines.length}]`;
             if (byteLen > maxBytes) {
-                const cut = truncateToBytes(truncated, maxBytes);
+                const cut = truncateToBytes(selected, maxBytes);
                 return {
                     success: true,
                     output: cut.text + `\n\n[... truncated at ${cut.bytes}B]`,
                 };
             }
-            return { success: true, output: truncated + notice };
+            return { success: true, output: selected + notice };
         }
-        // Also apply byte limit to full content
-        const byteLen = Buffer.byteLength(content, 'utf8');
+        // Also apply byte limit to the selected page.
+        const byteLen = Buffer.byteLength(selected, 'utf8');
         if (byteLen > maxBytes) {
-            const cut = truncateToBytes(content, maxBytes);
+            const cut = truncateToBytes(selected, maxBytes);
             return {
                 success: true,
                 output: cut.text + `\n\n[... truncated at ${cut.bytes}B of ${byteLen}B]`,
             };
         }
-        return { success: true, output: content };
+        return { success: true, output: selected };
     }
     catch (err) {
         return { success: false, output: '', error: String(err.message) };
@@ -883,7 +923,10 @@ async function writeFileSync_(path, content, cwd) {
         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 ${normalizedPath}` };
+        return {
+            success: true,
+            output: `Wrote ${content.split('\n').length} lines to ${normalizedPath}`,
+        };
     }
     catch (err) {
         return { success: false, output: '', error: String(err.message) };
@@ -927,14 +970,15 @@ async function listFiles_(path, maxDepth, cwd) {
     // Limit output to 500 entries
     const maxEntries = 500;
     const output = results.length > maxEntries
-        ? results.slice(0, maxEntries).join('\n') + `\n\n[... truncated, ${results.length - maxEntries} more entries]`
+        ? results.slice(0, maxEntries).join('\n') +
+            `\n\n[... truncated, ${results.length - maxEntries} more entries]`
         : results.join('\n');
     return { success: true, output };
 }
 // Issue #32 #3.2: execCommand_ 支持 abortSignal
 async function execCommand_(command, cwd, timeout, maxOutput, abortSignal, baseCwd) {
-    return new Promise((resolve) => {
-        const workdir = cwd ? safePath(cwd, baseCwd) : baseCwd ?? process.cwd();
+    return new Promise(resolve => {
+        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
@@ -1044,7 +1088,7 @@ async function execCommand_(command, cwd, timeout, maxOutput, abortSignal, baseC
                 }
             }
         });
-        child.on('close', (code) => {
+        child.on('close', code => {
             if (interrupted === 'aborted') {
                 finish({
                     success: false,
@@ -1079,11 +1123,13 @@ async function execCommand_(command, cwd, timeout, maxOutput, abortSignal, baseC
                 finish({
                     success: true,
                     output: finalOutput || '(no output)',
-                    error: stderrTruncated ? errOutput + '\n\n[... stderr truncated]' : errOutput || undefined,
+                    error: stderrTruncated
+                        ? errOutput + '\n\n[... stderr truncated]'
+                        : errOutput || undefined,
                 });
             }
         });
-        child.on('error', (err) => {
+        child.on('error', err => {
             finish({
                 success: false,
                 output: '',
@@ -1155,7 +1201,10 @@ function formatEditPreview(params) {
  */
 function fuzzyMatch(content, oldString) {
     // Strategy 1: Line-by-line matching (allow different indentation)
-    const oldLines = oldString.split('\n').map(l => l.trim()).filter(Boolean);
+    const oldLines = oldString
+        .split('\n')
+        .map(l => l.trim())
+        .filter(Boolean);
     const contentLines = content.split('\n');
     const lineMatches = [];
     for (let i = 0; i <= contentLines.length - oldLines.length; i++) {
@@ -1205,7 +1254,11 @@ async function editFile_(path, old_string, new_string, replace_all, fuzzy_match,
             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: ${normalizedPath}` };
+            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
@@ -1243,7 +1296,11 @@ async function editFile_(path, old_string, new_string, replace_all, fuzzy_match,
             // Try fuzzy match strategies
             const fuzzyResult = fuzzyMatch(content, old_string);
             if (fuzzyResult === null) {
-                return { success: false, output: '', error: `old_string not found in file: ${old_string.slice(0, 100)}...` };
+                return {
+                    success: false,
+                    output: '',
+                    error: `old_string not found in file: ${old_string.slice(0, 100)}...`,
+                };
             }
             if (preview) {
                 return {
@@ -1270,7 +1327,10 @@ async function editFile_(path, old_string, new_string, replace_all, fuzzy_match,
                 return {
                     success: false,
                     output: '',
-                    error: `Fuzzy match found ${fuzzyResult.matches.length} candidates. Provide a more specific string. First 3 candidates:\n${fuzzyResult.matches.slice(0, 3).map((m, i) => `  ${i + 1}: "${m.slice(0, 80)}..."`).join('\n')}`,
+                    error: `Fuzzy match found ${fuzzyResult.matches.length} candidates. Provide a more specific string. First 3 candidates:\n${fuzzyResult.matches
+                        .slice(0, 3)
+                        .map((m, i) => `  ${i + 1}: "${m.slice(0, 80)}..."`)
+                        .join('\n')}`,
                 };
             }
             // Use the single fuzzy match only.
@@ -1324,13 +1384,17 @@ function escapeRegExp(str) {
  */
 async function glob_(pattern, basePath, cwd) {
     try {
-        const normalizedBasePath = basePath ? normalizeToolPath(basePath) : cwd ?? process.cwd();
-        const base = basePath ? safePath(basePath, cwd) : cwd ?? 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: ${normalizedBasePath}` };
         }
         if (!(0, fs_1.statSync)(base).isDirectory()) {
-            return { success: false, output: '', error: `Path is not a directory: ${normalizedBasePath}` };
+            return {
+                success: false,
+                output: '',
+                error: `Path is not a directory: ${normalizedBasePath}`,
+            };
         }
         const results = [];
         // Convert glob pattern to regex.
@@ -1395,7 +1459,8 @@ async function glob_(pattern, basePath, cwd) {
         const maxMatches = 200;
         const sorted = results.sort();
         const output = sorted.length > maxMatches
-            ? sorted.slice(0, maxMatches).join('\n') + `\n\n[... truncated, ${sorted.length - maxMatches} more matches]`
+            ? sorted.slice(0, maxMatches).join('\n') +
+                `\n\n[... truncated, ${sorted.length - maxMatches} more matches]`
             : sorted.join('\n');
         return { success: true, output };
     }
@@ -1408,8 +1473,8 @@ async function glob_(pattern, basePath, cwd) {
  */
 async function grep_(pattern, basePath, globPattern, contextLines, cwd) {
     try {
-        const normalizedBasePath = basePath ? normalizeToolPath(basePath) : cwd ?? process.cwd();
-        const base = basePath ? safePath(basePath, cwd) : cwd ?? 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: ${normalizedBasePath}` };
         }
@@ -1465,10 +1530,10 @@ async function grep_(pattern, basePath, globPattern, contextLines, cwd) {
                 });
                 const lines = [];
                 const relPath = (0, path_1.relative)(base, file);
-                rl.on('line', (line) => {
+                rl.on('line', line => {
                     lines.push(line);
                 });
-                await new Promise((resolve) => {
+                await new Promise(resolve => {
                     rl.on('close', resolve);
                 });
                 // Search for matches
@@ -1541,7 +1606,9 @@ function parseBatchReadSteps(rawSteps) {
                 stepArgs = JSON.parse(stepArgs);
             }
             catch {
-                return { error: `batch_read step ${i + 1} args must be an object or valid JSON object string` };
+                return {
+                    error: `batch_read step ${i + 1} args must be an object or valid JSON object string`,
+                };
             }
         }
         if (!isRecord(stepArgs)) {
@@ -1554,7 +1621,9 @@ function parseBatchReadSteps(rawSteps) {
 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'),
+        output: steps
+            .map(step => `${step.index}. ${step.tool}: ${step.summary || (step.success ? 'ok' : step.error || 'error')}`)
+            .join('\n'),
         summary,
         steps,
     };
@@ -1579,25 +1648,29 @@ async function executeBatchRead(args, context) {
         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, [{
+            return buildBatchReadPayload(false, error, [
+                {
                     index: i + 1,
                     tool: step.tool,
                     args: step.args,
                     success: false,
                     error,
                     output: '',
-                }], error);
+                },
+            ], error);
         }
         if (!tool || tool.isReadOnly?.(step.args) !== true) {
             const error = `Tool ${step.tool} is unavailable or not read-only`;
-            return buildBatchReadPayload(false, error, [{
+            return buildBatchReadPayload(false, error, [
+                {
                     index: i + 1,
                     tool: step.tool,
                     args: step.args,
                     success: false,
                     error,
                     output: '',
-                }], error);
+                },
+            ], error);
         }
     }
     const stepResults = [];
@@ -1699,7 +1772,9 @@ function summarizeToolResult(tool, args, result) {
  * 获取可用工具名称列表
  */
 function getToolNames() {
-    return getRuntimeTools().map(t => t.name).join(', ');
+    return getRuntimeTools()
+        .map(t => t.name)
+        .join(', ');
 }
 // Re-export bash_security module
 var bash_security_2 = require("./bash_security");