@polka-codes/cli 0.8.20 → 0.8.21

package/dist/index.js

@@ -38447,7 +38447,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.8.20";
+var version = "0.8.21";
 
 // ../core/src/AiService/AiServiceBase.ts
 class AiServiceBase {
@@ -47758,39 +47758,6 @@ __export(exports_allTools, {
   askFollowupQuestion: () => askFollowupQuestion_default
 });
 
-// ../core/src/tools/utils/editFile.ts
-var START_OF_FILE = "<<<START_OF_FILE>>>";
-var END_OF_FILE = "<<<END_OF_FILE>>>";
-var editFile = async (fileContent, operations) => {
-  if (!operations || operations.length === 0) {
-    throw new Error("At least one edit operation is required");
-  }
-  let updatedContent = fileContent;
-  for (const operation of operations) {
-    updatedContent = await applyEditOperation(updatedContent, operation);
-  }
-  return updatedContent;
-};
-async function applyEditOperation(fileContent, operation) {
-  const { search, replace } = operation;
-  if (search === START_OF_FILE && replace === END_OF_FILE) {
-    throw new Error("Cannot search for START_OF_FILE and replace with END_OF_FILE");
-  }
-  if (search === END_OF_FILE && replace === START_OF_FILE) {
-    throw new Error("Cannot search for END_OF_FILE and replace with START_OF_FILE");
-  }
-  if (search === START_OF_FILE) {
-    return replace + fileContent;
-  }
-  if (search === END_OF_FILE) {
-    return fileContent + replace;
-  }
-  const index = fileContent.indexOf(search);
-  if (index === -1) {
-    throw new Error(`Could not find text: ${search}`);
-  }
-  return fileContent.slice(0, index) + replace + fileContent.slice(index + search.length);
-}
 // ../core/src/tools/utils/getArg.ts
 var getString = (args, name, defaultValue) => {
   if (typeof args !== "object" || Array.isArray(args)) {
@@ -48397,29 +48364,29 @@ var toolInfo7 = {
     {
       name: "diff",
       description: `One or more SEARCH/REPLACE blocks following this exact format:
-  \`\`\`
-  <<<<<<< SEARCH
-  [exact content to find]
-  =======
-  [new content to replace with]
-  >>>>>>> REPLACE
-  \`\`\`
-  Critical rules:
-  1. SEARCH content must match the associated file section to find EXACTLY:
-     * Match character-for-character including whitespace, indentation, line endings
-     * Include all comments, docstrings, etc.
-  2. SEARCH/REPLACE blocks will ONLY replace the first match occurrence.
-     * Including multiple unique SEARCH/REPLACE blocks if you need to make multiple changes.
-     * Include *just* enough lines in each SEARCH section to uniquely match each set of lines that need to change.
-     * When using multiple SEARCH/REPLACE blocks, list them in the order they appear in the file.
-  3. Keep SEARCH/REPLACE blocks concise:
-     * Break large SEARCH/REPLACE blocks into a series of smaller blocks that each change a small portion of the file.
-     * Include just the changing lines, and a few surrounding lines if needed for uniqueness.
-     * Do not include long runs of unchanging lines in SEARCH/REPLACE blocks.
-     * Each line must be complete. Never truncate lines mid-way through as this can cause matching failures.
-  4. Special operations:
-     * To move code: Use two SEARCH/REPLACE blocks (one to delete from original + one to insert at new location)
-     * To delete code: Use empty REPLACE section`,
+\`\`\`
+<<<<<<< SEARCH
+[exact content to find]
+=======
+[new content to replace with]
+>>>>>>> REPLACE
+\`\`\`
+Critical rules:
+1. SEARCH content must match the associated file section to find EXACTLY:
+    * Match character-for-character including whitespace, indentation, line endings
+    * Include all comments, docstrings, etc.
+2. SEARCH/REPLACE blocks will ONLY replace the first match occurrence.
+    * Including multiple unique SEARCH/REPLACE blocks if you need to make multiple changes.
+    * Include *just* enough lines in each SEARCH section to uniquely match each set of lines that need to change.
+    * When using multiple SEARCH/REPLACE blocks, list them in the order they appear in the file.
+3. Keep SEARCH/REPLACE blocks concise:
+    * Break large SEARCH/REPLACE blocks into a series of smaller blocks that each change a small portion of the file.
+    * Include just the changing lines, and a few surrounding lines if needed for uniqueness.
+    * Do not include long runs of unchanging lines in SEARCH/REPLACE blocks.
+    * Each line must be complete. Never truncate lines mid-way through as this can cause matching failures.
+4. Special operations:
+    * To move code: Use two SEARCH/REPLACE blocks (one to delete from original + one to insert at new location)
+    * To delete code: Use empty REPLACE section`,
       required: true,
       usageValue: "Search and replace blocks here"
     }
@@ -48462,6 +48429,73 @@ function handleSubmit() {
 return (
   <div>
 >>>>>>> REPLACE
+`
+        }
+      ]
+    },
+    {
+      description: "Request to perform a simple, single-line replacement",
+      parameters: [
+        {
+          name: "path",
+          value: "src/config.js"
+        },
+        {
+          name: "diff",
+          value: `
+<<<<<<< SEARCH
+const API_URL = 'https://api.example.com';
+=======
+const API_URL = 'https://api.staging.example.com';
+>>>>>>> REPLACE
+`
+        }
+      ]
+    },
+    {
+      description: "Request to add a new function to a file",
+      parameters: [
+        {
+          name: "path",
+          value: "src/utils.js"
+        },
+        {
+          name: "diff",
+          value: `
+<<<<<<< SEARCH
+function helperA() {
+  // ...
+}
+=======
+function helperA() {
+  // ...
+}
+
+function newHelper() {
+  // implementation
+}
+>>>>>>> REPLACE
+`
+        }
+      ]
+    },
+    {
+      description: "Request to delete a block of code from a file",
+      parameters: [
+        {
+          name: "path",
+          value: "src/app.js"
+        },
+        {
+          name: "diff",
+          value: `
+<<<<<<< SEARCH
+function oldFeature() {
+  // This is no longer needed
+}
+
+=======
+>>>>>>> REPLACE
 `
         }
       ]
@@ -49086,167 +49120,6 @@ var renameFile_default = {
   handler: handler13,
   isAvailable: isAvailable13
 };
-// ../core/src/tools/editFile.ts
-var toolInfo14 = {
-  name: "edit_file",
-  description: "Request to edit file contents using search/replace operations. Supports multiple edit operations in a single call.",
-  parameters: [
-    {
-      name: "path",
-      description: "The path of the file to edit",
-      required: true,
-      usageValue: "File path here"
-    },
-    {
-      name: "operations",
-      description: "Edit operation with search and replace parameters",
-      required: true,
-      allowMultiple: true,
-      children: [
-        {
-          name: "search",
-          description: `Text to search for and replace (use ${START_OF_FILE} to insert at file start, ${END_OF_FILE} to insert at file end)`,
-          required: true,
-          usageValue: "Text to find and replace"
-        },
-        {
-          name: "replace",
-          description: "Text to replace the search text with",
-          required: true,
-          usageValue: "Replacement text"
-        }
-      ],
-      usageValue: "operations here"
-    }
-  ],
-  examples: [
-    {
-      description: "Replace specific text",
-      parameters: [
-        {
-          name: "path",
-          value: "src/main.ts"
-        },
-        {
-          name: "operations",
-          value: {
-            search: `function oldFunction() {
-  return 42;
-}`,
-            replace: `function newFunction() {
-  return "new implementation";
-}`
-          }
-        }
-      ]
-    },
-    {
-      description: "Insert at start of file",
-      parameters: [
-        {
-          name: "path",
-          value: "src/header.ts"
-        },
-        {
-          name: "operations",
-          value: {
-            search: START_OF_FILE,
-            replace: `// File header comment
-`
-          }
-        }
-      ]
-    },
-    {
-      description: "Multiple operations in one call",
-      parameters: [
-        {
-          name: "path",
-          value: "src/utils.ts"
-        },
-        {
-          name: "operations",
-          value: [
-            {
-              search: 'import React from "react"',
-              replace: 'import React, { useState } from "react"'
-            },
-            {
-              search: `function Component() {
-  return (`,
-              replace: `function Component() {
-  const [state, setState] = useState(false);
-  return (`
-            }
-          ]
-        }
-      ]
-    },
-    {
-      description: "Append content at end of file",
-      parameters: [
-        {
-          name: "path",
-          value: "src/footer.ts"
-        },
-        {
-          name: "operations",
-          value: {
-            search: END_OF_FILE,
-            replace: `
-// End of file appended comment
-`
-          }
-        }
-      ]
-    }
-  ],
-  permissionLevel: 2 /* Write */
-};
-var handler14 = async (provider, args) => {
-  if (!provider.readFile || !provider.writeFile) {
-    return {
-      type: "Error" /* Error */,
-      message: "Not possible to edit file. Abort."
-    };
-  }
-  const path = getString(args, "path");
-  const operations = getArray(args, "operations");
-  if (!operations || operations.length === 0) {
-    return {
-      type: "Error" /* Error */,
-      message: `<error><edit_file_path>${path}</edit_file_path><error_message>At least one edit operation is required</error_message></error>`
-    };
-  }
-  const fileContent = await provider.readFile(path);
-  if (fileContent == null) {
-    return {
-      type: "Error" /* Error */,
-      message: `<error><edit_file_path>${path}</edit_file_path><error_message>File not found</error_message></error>`
-    };
-  }
-  try {
-    const result = await editFile(fileContent, operations);
-    await provider.writeFile(path, result);
-    return {
-      type: "Reply" /* Reply */,
-      message: `<edit_file_path>${path}</edit_file_path>`
-    };
-  } catch (error) {
-    return {
-      type: "Error" /* Error */,
-      message: `<error><edit_file_path>${path}</edit_file_path><error_message>${error instanceof Error ? error.message : String(error)}</error_message></error>`
-    };
-  }
-};
-var isAvailable14 = (provider) => {
-  return !!provider.readFile && !!provider.writeFile;
-};
-var editFile_default = {
-  ...toolInfo14,
-  handler: handler14,
-  isAvailable: isAvailable14
-};
 // ../core/src/getAvailableTools.ts
 var getAvailableTools = ({
   provider: provider2,
@@ -49471,6 +49344,8 @@ Tool use is formatted using XML-style tags. The tool name is enclosed in opening
 ...
 </${toolNamePrefix}tool_name>
 
+**It is crucial that all tags are correctly nested and closed.**
+
 ## Array Parameters
 
 To create an array of values for a parameter, repeat the parameter tag multiple times:
@@ -49505,7 +49380,7 @@ You can also combine array parameters with nested objects:
 </${parameterPrefix}key>
 </${toolNamePrefix}example_tool>
 
-Always adhere to this format for the tool use to ensure proper parsing and execution.
+Always adhere to this format, ensuring every opening tag has a matching closing tag, to ensure proper parsing and execution.
 
 NEVER surround tool use with triple backticks (\`\`\`).
 
@@ -49844,8 +49719,8 @@ ${instance.prompt}`;
   }
   async#invokeTool(name, args) {
     try {
-      const handler15 = this.handlers[name]?.handler;
-      if (!handler15) {
+      const handler14 = this.handlers[name]?.handler;
+      if (!handler14) {
         return {
           type: "Error" /* Error */,
           message: responsePrompts.errorInvokeTool(name, "Tool not found"),
@@ -49864,7 +49739,7 @@ ${instance.prompt}`;
       if (resp) {
         return resp;
       }
-      return await handler15(this.config.provider, args);
+      return await handler14(this.config.provider, args);
     } catch (error) {
       return {
         type: "Error" /* Error */,
@@ -50203,7 +50078,7 @@ var editingFilesPrompt = (toolNamePrefix) => `
 
 EDITING FILES
 
-You have two file-manipulation tools: **${toolNamePrefix}write_to_file** (full overwrite) and **${toolNamePrefix}edit_file** (targeted anchor-based edits). Choose the smallest safe operation for every change.
+You have two file-manipulation tools: **${toolNamePrefix}write_to_file** (full overwrite) and **${toolNamePrefix}replace_in_file** (targeted anchor-based edits). Choose the smallest safe operation for every change.
 
 # ${toolNamePrefix}write_to_file
 
@@ -50215,16 +50090,16 @@ You have two file-manipulation tools: **${toolNamePrefix}write_to_file** (full o
 
 - Initial file creation, such as when scaffolding a new project.
 - Overwriting large boilerplate files where you want to replace the entire content at once.
-- When the complexity or number of changes would make ${toolNamePrefix}edit_file unwieldy or error-prone.
+- When the complexity or number of changes would make ${toolNamePrefix}replace_in_file unwieldy or error-prone.
 - When you need to completely restructure a file's content or change its fundamental organization.
 
 ## Important Considerations
 
 - Using ${toolNamePrefix}write_to_file requires providing the file's complete final content.
-- If you only need to make small changes to an existing file, consider using ${toolNamePrefix}edit_file instead to avoid unnecessarily rewriting the entire file.
+- If you only need to make small changes to an existing file, consider using ${toolNamePrefix}replace_in_file instead to avoid unnecessarily rewriting the entire file.
 - While ${toolNamePrefix}write_to_file should not be your default choice, don't hesitate to use it when the situation truly calls for it.
 
-# ${toolNamePrefix}edit_file
+# ${toolNamePrefix}replace_in_file
 
 ## Purpose
 
@@ -50243,10 +50118,10 @@ You have two file-manipulation tools: **${toolNamePrefix}write_to_file** (full o
 
 # Choosing the Appropriate Tool
 
-- **Default to ${toolNamePrefix}edit_file** for most changes. It keeps diffs small and reduces risk.
+- **Default to ${toolNamePrefix}replace_in_file** for most changes. It keeps diffs small and reduces risk.
 - **Use ${toolNamePrefix}write_to_file** when:
   - Creating new files
-  - The changes are so extensive that using ${toolNamePrefix}edit_file would be more complex or risky
+  - The changes are so extensive that using ${toolNamePrefix}replace_in_file would be more complex or risky
   - You need to completely reorganize or restructure a file
   - The file is relatively small and the changes affect most of its content
   - You're generating boilerplate or template files
@@ -50254,9 +50129,9 @@ You have two file-manipulation tools: **${toolNamePrefix}write_to_file** (full o
 # Workflow Tips
 
 1. Before editing, assess the scope of your changes and decide which tool to use.
-2. For targeted edits, apply ${toolNamePrefix}edit_file with carefully crafted before/after text anchors. If you need multiple changes, you can stack multiple operations within a single ${toolNamePrefix}edit_file call.
+2. For targeted edits, apply ${toolNamePrefix}replace_in_file with carefully crafted before/after text anchors. If you need multiple changes, you can stack multiple operations within a single ${toolNamePrefix}replace_in_file call.
 3. For major overhauls or initial file creation, rely on ${toolNamePrefix}write_to_file.
-4. Once the file has been edited with either ${toolNamePrefix}write_to_file or ${toolNamePrefix}edit_file, the system will provide you with the final state of the modified file. Use this updated content as the reference point for any subsequent operations, since it reflects any auto-formatting or user-applied changes.
+4. Once the file has been edited with either ${toolNamePrefix}write_to_file or ${toolNamePrefix}replace_in_file, the system will provide you with the final state of the modified file. Use this updated content as the reference point for any subsequent operations, since it reflects any auto-formatting or user-applied changes.
 
 Picking the right tool keeps edits minimal, safe, and easy to review.
 `;
@@ -50270,10 +50145,10 @@ RULES
   For text files (e.g. README.md), append a footer with the same notice.
 - Never describe what changed inside code comments; comments must focus on purpose or usage only.
 - Before using ${toolNamePrefix}execute_command, consider SYSTEM INFORMATION to ensure commands suit the user's OS. If a command must run in a subdirectory, prepend a single \`cd childDir &&\` segment.
-- Use ${toolNamePrefix}search_files for broad analysis, then ${toolNamePrefix}read_file to inspect context, and finally ${toolNamePrefix}edit_file or ${toolNamePrefix}write_to_file to modify.
-- Prefer ${toolNamePrefix}edit_file for focused edits; choose ${toolNamePrefix}write_to_file for new files or complete rewrites.
+- Use ${toolNamePrefix}search_files for broad analysis, then ${toolNamePrefix}read_file to inspect context, and finally ${toolNamePrefix}replace_in_file or ${toolNamePrefix}write_to_file to modify.
+- Prefer ${toolNamePrefix}replace_in_file for focused edits; choose ${toolNamePrefix}write_to_file for new files or complete rewrites.
 - When creating a new file, look for existing files with similar content or patterns; if found, read them and use their structure or conventions as a reference.
-- Use before/after text anchors in ${toolNamePrefix}edit_file to target changes. If multiple operations are needed, list them in file order.
+- Use before/after text anchors in ${toolNamePrefix}replace_in_file to target changes. If multiple operations are needed, list them in file order.
 - Do not guess unseen content. Read existing files first unless creating new ones.
 - Follow existing style, lint, and naming conventions. Ensure all changes compile and pass tests where applicable.
 - ALWAYS wait for the user's confirmation after each tool call before starting the next step.
@@ -59768,15 +59643,15 @@ function useKeypress(userHandler) {
   signal.current = userHandler;
   useEffect((rl) => {
     let ignore = false;
-    const handler15 = withUpdates((_input, event) => {
+    const handler14 = withUpdates((_input, event) => {
       if (ignore)
         return;
       signal.current(event, rl);
     });
-    rl.input.on("keypress", handler15);
+    rl.input.on("keypress", handler14);
     return () => {
       ignore = true;
-      rl.input.removeListener("keypress", handler15);
+      rl.input.removeListener("keypress", handler14);
     };
   }, []);
 }
@@ -59958,16 +59833,16 @@ class Emitter {
 
 class SignalExitBase {
 }
-var signalExitWrap = (handler15) => {
+var signalExitWrap = (handler14) => {
   return {
     onExit(cb, opts) {
-      return handler15.onExit(cb, opts);
+      return handler14.onExit(cb, opts);
     },
     load() {
-      return handler15.load();
+      return handler14.load();
     },
     unload() {
-      return handler15.unload();
+      return handler14.unload();
     }
   };
 };
@@ -60575,6 +60450,24 @@ ${theme.style.description(selectedChoice.description)}` : ``;
   return `${[prefix, message, helpTipTop].filter(Boolean).join(" ")}
 ${page}${helpTipBottom}${choiceDescription}${import_ansi_escapes3.default.cursorHide}`;
 });
+// ../cli-shared/src/utils/checkRipgrep.ts
+import { spawnSync } from "node:child_process";
+var rgAvailability = {
+  isAvailable: null
+};
+function checkRipgrep() {
+  if (rgAvailability.isAvailable !== null) {
+    return rgAvailability.isAvailable;
+  }
+  const rg = spawnSync("rg", ["--version"]);
+  if (rg.error || rg.status !== 0) {
+    rgAvailability.isAvailable = false;
+    return false;
+  }
+  rgAvailability.isAvailable = true;
+  return true;
+}
+
 // ../cli-shared/src/utils/listFiles.ts
 var import_ignore = __toESM(require_ignore(), 1);
 import { promises as fs2 } from "node:fs";
@@ -60672,7 +60565,6 @@ async function listFiles(dirPath, recursive, maxCount, cwd, excludeFiles) {
 
 // ../cli-shared/src/utils/searchFiles.ts
 import { spawn } from "node:child_process";
-import { rgPath } from "@vscode/ripgrep";
 async function searchFiles(path, regex, filePattern, cwd, excludeFiles) {
   const args = [
     "--line-number",
@@ -60697,7 +60589,7 @@ async function searchFiles(path, regex, filePattern, cwd, excludeFiles) {
   args.push(regex, path);
   return new Promise((resolve2, reject) => {
     const results = [];
-    const rg = spawn(rgPath, args, {
+    const rg = spawn("rg", args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -60755,9 +60647,6 @@ var getProvider = (agentName, config2, options = {}) => {
     listFiles: async (path, recursive, maxCount) => {
       return await listFiles(path, recursive, maxCount, process.cwd(), options.excludeFiles);
     },
-    searchFiles: async (path, regex, filePattern) => {
-      return await searchFiles(path, regex, filePattern, process.cwd(), options.excludeFiles);
-    },
     executeCommand: (command, needApprove) => {
       return new Promise((resolve2, reject) => {
         options.command?.onStarted(command);
@@ -60813,6 +60702,13 @@ var getProvider = (agentName, config2, options = {}) => {
       return;
     }
   };
+  if (checkRipgrep()) {
+    provider2.searchFiles = async (path, regex, filePattern) => {
+      return await searchFiles(path, regex, filePattern, process.cwd(), options.excludeFiles);
+    };
+  } else {
+    console.error("Error: ripgrep (rg) is not installed. Search file tool is disabled. Please install it from https://github.com/BurntSushi/ripgrep#installation");
+  }
   return provider2;
 };
 // ../../node_modules/chalk/source/vendor/ansi-styles/index.js
@@ -61854,7 +61750,7 @@ var runChat = async (opts, command) => {
 };
 
 // src/commands/commit.ts
-import { execSync, spawnSync } from "node:child_process";
+import { execSync, spawnSync as spawnSync2 } from "node:child_process";
 
 // ../../node_modules/ora/index.js
 import process10 from "node:process";
@@ -62511,7 +62407,7 @@ var commitCommand = new Command("commit").description("Create a commit with AI-g
 Commit message:
 ${result.response}`);
     try {
-      spawnSync("git", ["commit", "-m", result.response], { stdio: "inherit" });
+      spawnSync2("git", ["commit", "-m", result.response], { stdio: "inherit" });
     } catch {
       console.error("Error: Commit failed");
       process.exit(1);
@@ -66627,7 +66523,7 @@ ${newConfig.provider.toUpperCase()}_API_KEY=${newConfig.apiKey}`;
 });
 
 // src/commands/pr.ts
-import { execSync as execSync2, spawnSync as spawnSync2 } from "node:child_process";
+import { execSync as execSync2, spawnSync as spawnSync3 } from "node:child_process";
 var prCommand = new Command("pr").description("Create a GitHub pull request").argument("[message]", "Optional context for the commit message generation").action(async (message, _options, command) => {
   const options = command.parent?.opts() ?? {};
   const { providerConfig, config: config3 } = parseOptions(options);
@@ -66687,7 +66583,7 @@ var prCommand = new Command("pr").description("Create a GitHub pull request").ar
     console.log("Title:", prDetails.response.title);
     console.log(prDetails.response.description);
     await new Promise((resolve2) => setTimeout(resolve2, 10));
-    spawnSync2("gh", ["pr", "create", "--title", prDetails.response.title.trim(), "--body", prDetails.response.description.trim()], {
+    spawnSync3("gh", ["pr", "create", "--title", prDetails.response.title.trim(), "--body", prDetails.response.description.trim()], {
       stdio: "inherit"
     });
     usage.printUsage();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli",
-  "version": "0.8.20",
+  "version": "0.8.21",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",
@@ -14,7 +14,7 @@
     }
   },
   "scripts": {
-    "build": "bun build src/index.ts --outdir dist --target node --external=@vscode/ripgrep"
+    "build": "bun build src/index.ts --outdir dist --target node"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.2.3",