lcagent-cli 0.1.7 → 0.1.8

package/README.md

@@ -34,6 +34,7 @@
 `edit_file` 现在有两种模式：
 
 - 文本替换模式：传 `path + oldText + newText`
+- 新建/整文件写入模式：传 `path + content`；若覆盖已有文件，额外传 `replaceEntireFile=true`
 - Patch 模式：传 `patch`，也可以额外传 `path`
 
 Patch 模式当前限制：
@@ -42,6 +43,11 @@ Patch 模式当前限制：
 - patch 需要能对当前文件内容干净应用
 - 如果 `path` 与 patch 头里的目标文件不一致，会直接报错
 
+Windows 下如果模型需要创建目录或文件，优先建议：
+
+- 用 `run_shell` 执行 Windows 兼容命令，而不是 Bash 专用语法
+- 或者直接用 `edit_file` 的 `content` 模式创建文件
+
 ## 安装
 
 ```bash

package/dist/core/systemPrompt.js

@@ -1,11 +1,19 @@
 export function buildSystemPrompt(cwd) {
+    const platform = process.platform;
+    const platformGuidance = platform === 'win32'
+        ? 'Current platform is Windows. For run_shell, use cmd/PowerShell-compatible syntax. Avoid Bash-only constructs such as mkdir -p, brace expansion {a,b}, and heredoc blocks.'
+        : 'Current platform is Unix-like. Use standard POSIX shell syntax for run_shell.';
     return [
         'You are a coding agent running inside a local CLI.',
         'Prefer using tools when they help answer precisely.',
         'Do not invent file contents or command output when tools can verify them.',
         'Before editing code, read the relevant files.',
+        'Use valid structured tool calls only. Never output literal pseudo-tags like <tool_call> or XML wrappers.',
+        'Prefer edit_file for creating or updating files instead of shell redirection when possible.',
         'Explain briefly and act directly.',
         `Current working directory: ${cwd}`,
+        `Current platform: ${platform}`,
+        platformGuidance,
         'Available tools may read files, edit files, search files, and run shell commands.',
     ].join('\n');
 }

package/dist/tools/editFile.d.ts

@@ -4,6 +4,11 @@ declare const inputSchema: z.ZodObject<{
     path: z.ZodOptional<z.ZodString>;
     filePath: z.ZodOptional<z.ZodString>;
     file_path: z.ZodOptional<z.ZodString>;
+    content: z.ZodOptional<z.ZodString>;
+    fileContent: z.ZodOptional<z.ZodString>;
+    file_content: z.ZodOptional<z.ZodString>;
+    replaceEntireFile: z.ZodOptional<z.ZodBoolean>;
+    replace_entire_file: z.ZodOptional<z.ZodBoolean>;
     patch: z.ZodOptional<z.ZodString>;
     diff: z.ZodOptional<z.ZodString>;
     unifiedDiff: z.ZodOptional<z.ZodString>;

package/dist/tools/editFile.js

@@ -7,6 +7,11 @@ const inputSchema = z.object({
     path: z.string().min(1).optional(),
     filePath: z.string().min(1).optional(),
     file_path: z.string().min(1).optional(),
+    content: z.string().optional(),
+    fileContent: z.string().optional(),
+    file_content: z.string().optional(),
+    replaceEntireFile: z.boolean().optional(),
+    replace_entire_file: z.boolean().optional(),
     patch: z.string().optional(),
     diff: z.string().optional(),
     unifiedDiff: z.string().optional(),
@@ -138,12 +143,20 @@ function buildNotFoundDiagnostic(source, oldText) {
 }
 export const editFileTool = {
     name: 'edit_file',
-    description: 'Edit a file either by replacing text or by applying a single-file unified diff patch.',
+    description: 'Edit a file by replacing text, applying a single-file unified diff patch, or creating/replacing a whole file from content.',
     inputSchema,
     inputSchemaJson: {
         type: 'object',
         properties: {
             path: { type: 'string' },
+            content: {
+                type: 'string',
+                description: 'Full file contents to write. Use for creating a new file, or set replaceEntireFile=true to overwrite an existing file.',
+            },
+            replaceEntireFile: {
+                type: 'boolean',
+                description: 'Required with content mode when overwriting an existing file.',
+            },
             patch: {
                 type: 'string',
                 description: 'Unified diff patch for a single file. When provided, oldText/newText are not required.',
@@ -161,21 +174,33 @@ export const editFileTool = {
     isReadOnly: false,
     async execute(input, context) {
         const normalizedPath = input.path ?? input.filePath ?? input.file_path;
+        const fullContent = input.content ?? input.fileContent ?? input.file_content;
+        const replaceEntireFile = input.replaceEntireFile ?? input.replace_entire_file ?? false;
         const patchText = input.patch ?? input.diff ?? input.unifiedDiff ?? input.unified_diff;
         const oldText = input.oldText ?? input.old_text;
         const newText = input.newText ?? input.new_text;
         const replaceAll = input.replaceAll ?? input.replace_all ?? false;
         const occurrence = input.occurrence ?? input.occurrence_index;
-        if (patchText !== undefined && (oldText !== undefined || newText !== undefined)) {
+        if (patchText !== undefined &&
+            (oldText !== undefined || newText !== undefined || fullContent !== undefined)) {
             return {
                 isError: true,
-                content: 'Use either patch mode or oldText/newText mode, not both in the same call.',
+                content: 'Use exactly one edit mode: patch, oldText/newText, or content.',
             };
         }
-        if (patchText === undefined && (!normalizedPath || oldText === undefined || newText === undefined)) {
+        if (fullContent !== undefined &&
+            (oldText !== undefined || newText !== undefined)) {
             return {
                 isError: true,
-                content: 'Missing required fields. Use path + oldText + newText, or provide patch (and optionally path).',
+                content: 'Use either content mode or oldText/newText mode, not both in the same call.',
+            };
+        }
+        if (patchText === undefined &&
+            fullContent === undefined &&
+            (!normalizedPath || oldText === undefined || newText === undefined)) {
+            return {
+                isError: true,
+                content: 'Missing required fields. Use path + oldText + newText, or path + content, or provide patch (and optionally path).',
             };
         }
         if (patchText === undefined && oldText !== undefined && oldText.length === 0) {
@@ -227,9 +252,27 @@ export const editFileTool = {
             current = await readFile(absolutePath, 'utf8');
         }
         catch (error) {
+            if (fullContent !== undefined) {
+                current = '';
+            }
+            else {
+                return {
+                    isError: true,
+                    content: error instanceof Error ? error.message : String(error),
+                };
+            }
+        }
+        if (fullContent !== undefined) {
+            const fileExists = current.length > 0;
+            if (fileExists && !replaceEntireFile) {
+                return {
+                    isError: true,
+                    content: 'Content mode can create a new file, but overwriting an existing file requires replaceEntireFile=true.',
+                };
+            }
+            await writeFile(absolutePath, fullContent, 'utf8');
             return {
-                isError: true,
-                content: error instanceof Error ? error.message : String(error),
+                content: `${fileExists ? 'Replaced' : 'Created'} ${resolvedPath}.`,
             };
         }
         if (patchText !== undefined) {

package/dist/tools/runShell.js

@@ -6,9 +6,60 @@ const inputSchema = z.object({
     command: z.string().min(1).optional(),
     cmd: z.string().min(1).optional(),
 });
+function expandBracePattern(pattern) {
+    const match = pattern.match(/^(.*)\{([^{}]+)\}(.*)$/);
+    if (!match) {
+        return [pattern];
+    }
+    const [, prefix, variants, suffix] = match;
+    return variants
+        .split(',')
+        .flatMap(variant => expandBracePattern(`${prefix}${variant}${suffix}`));
+}
+function tokenizeShellArgs(command) {
+    return command.match(/"[^"]*"|'[^']*'|\S+/g) ?? [];
+}
+function rewriteWindowsMkdirSegment(segment) {
+    const trimmed = segment.trim();
+    const mkdirMatch = trimmed.match(/^mkdir\s+-p\s+(.+)$/i);
+    if (!mkdirMatch) {
+        return segment;
+    }
+    const rawArgs = tokenizeShellArgs(mkdirMatch[1]);
+    const expandedArgs = rawArgs.flatMap(arg => {
+        const unquoted = arg.replace(/^(["'])(.*)\1$/, '$2');
+        return expandBracePattern(unquoted);
+    });
+    if (expandedArgs.length === 0) {
+        return segment;
+    }
+    return expandedArgs
+        .map(path => `mkdir "${path}"`)
+        .join(' && ');
+}
+function normalizeWindowsCommand(command) {
+    const segments = command.split(/\s*&&\s*/);
+    return segments.map(rewriteWindowsMkdirSegment).join(' && ');
+}
+function buildWindowsShellHint(command) {
+    const hints = [];
+    if (/mkdir\s+-p/i.test(command)) {
+        hints.push('`cmd.exe` 不支持 `mkdir -p`；Windows 下可直接用 `mkdir dir` 创建多级目录。');
+    }
+    if (/\{[^{}]+,[^{}]+\}/.test(command)) {
+        hints.push('`cmd.exe` 不支持 Bash 的 `{a,b}` brace expansion。');
+    }
+    if (/<<\s*['"]?\w+['"]?/.test(command)) {
+        hints.push('`cmd.exe` 不支持 Bash heredoc（如 `cat <<EOF`）。');
+    }
+    if (hints.length === 0) {
+        return null;
+    }
+    return ['Windows shell 提示：', ...hints, '优先使用 Windows `cmd`/PowerShell 语法，或直接使用 `edit_file` 写文件。'].join('\n');
+}
 export const runShellTool = {
     name: 'run_shell',
-    description: 'Run a shell command in the current working directory.',
+    description: 'Run a shell command in the current working directory. On Windows, prefer cmd/PowerShell syntax rather than Bash-only syntax like mkdir -p, brace expansion, or heredoc.',
     inputSchema,
     inputSchemaJson: {
         type: 'object',
@@ -24,13 +75,16 @@ export const runShellTool = {
     isReadOnly: false,
     async execute(input, context) {
         try {
-            const command = input.command ?? input.cmd;
-            if (!command) {
+            const rawCommand = input.command ?? input.cmd;
+            if (!rawCommand) {
                 return {
                     isError: true,
                     content: 'Missing required field: command',
                 };
             }
+            const command = process.platform === 'win32'
+                ? normalizeWindowsCommand(rawCommand)
+                : rawCommand;
             const { stdout, stderr } = await execAsync(command, {
                 cwd: context.cwd,
                 shell: process.platform === 'win32' ? process.env.ComSpec || 'cmd.exe' : '/bin/sh',
@@ -43,9 +97,12 @@ export const runShellTool = {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
+            const shellHint = process.platform === 'win32'
+                ? buildWindowsShellHint(input.command ?? input.cmd ?? '')
+                : null;
             return {
                 isError: true,
-                content: message,
+                content: shellHint ? `${message}\n\n${shellHint}` : message,
             };
         }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lcagent-cli",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "A minimal coding agent CLI for terminal-based coding workflows.",
   "type": "module",
   "publishConfig": {