@polka-codes/cli-shared 0.8.20 → 0.8.21

package/dist/index.js

@@ -36783,39 +36783,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)) {
@@ -37422,29 +37389,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"
     }
@@ -37487,6 +37454,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
 `
         }
       ]
@@ -38111,167 +38145,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,
@@ -38496,6 +38369,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:
@@ -38530,7 +38405,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 (\`\`\`).
 
@@ -38869,8 +38744,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"),
@@ -38889,7 +38764,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 */,
@@ -48098,15 +47973,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);
     };
   }, []);
 }
@@ -48288,16 +48163,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();
     }
   };
 };
@@ -48813,6 +48688,24 @@ ${theme.style.description(selectedChoice.description)}` : ``;
   return `${[prefix, message, helpTipTop].filter(Boolean).join(" ")}
 ${page}${helpTipBottom}${choiceDescription}${import_ansi_escapes2.default.cursorHide}`;
 });
+// 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;
+}
+
 // src/utils/listFiles.ts
 var import_ignore = __toESM(require_ignore(), 1);
 import { promises as fs2 } from "node:fs";
@@ -48910,14 +48803,7 @@ async function listFiles(dirPath, recursive, maxCount, cwd, excludeFiles) {
 
 // src/utils/searchFiles.ts
 import { spawn } from "node:child_process";
-
-// ../../node_modules/@vscode/ripgrep/lib/index.js
-var __dirname = "/Users/xiliangchen/projects/polka-codes/node_modules/@vscode/ripgrep/lib";
-var path = __require("path");
-var $rgPath = path.join(__dirname, `../bin/rg${process.platform === "win32" ? ".exe" : ""}`);
-
-// src/utils/searchFiles.ts
-async function searchFiles(path2, regex, filePattern, cwd, excludeFiles) {
+async function searchFiles(path, regex, filePattern, cwd, excludeFiles) {
   const args = [
     "--line-number",
     "--context=5",
@@ -48938,10 +48824,10 @@ async function searchFiles(path2, regex, filePattern, cwd, excludeFiles) {
       args.push("--glob", `!${pattern}`);
     }
   }
-  args.push(regex, path2);
+  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"]
     });
@@ -48967,28 +48853,28 @@ async function searchFiles(path2, regex, filePattern, cwd, excludeFiles) {
 var getProvider = (agentName, config2, options = {}) => {
   const ig = import_ignore2.default().add(options.excludeFiles ?? []);
   const provider2 = {
-    readFile: async (path2) => {
-      if (ig.ignores(path2)) {
-        throw new Error(`Not allow to access file ${path2}`);
+    readFile: async (path) => {
+      if (ig.ignores(path)) {
+        throw new Error(`Not allow to access file ${path}`);
       }
       try {
-        return await readFile(path2, "utf8");
+        return await readFile(path, "utf8");
       } catch (_e2) {
         return;
       }
     },
-    writeFile: async (path2, content) => {
-      if (ig.ignores(path2)) {
-        throw new Error(`Not allow to access file ${path2}`);
+    writeFile: async (path, content) => {
+      if (ig.ignores(path)) {
+        throw new Error(`Not allow to access file ${path}`);
       }
-      await mkdir(dirname(path2), { recursive: true });
-      return await writeFile(path2, content, "utf8");
+      await mkdir(dirname(path), { recursive: true });
+      return await writeFile(path, content, "utf8");
     },
-    removeFile: async (path2) => {
-      if (ig.ignores(path2)) {
-        throw new Error(`Not allow to access file ${path2}`);
+    removeFile: async (path) => {
+      if (ig.ignores(path)) {
+        throw new Error(`Not allow to access file ${path}`);
       }
-      return await unlink(path2);
+      return await unlink(path);
     },
     renameFile: async (sourcePath, targetPath) => {
       if (ig.ignores(sourcePath) || ig.ignores(targetPath)) {
@@ -48996,11 +48882,8 @@ var getProvider = (agentName, config2, options = {}) => {
       }
       return await rename(sourcePath, targetPath);
     },
-    listFiles: async (path2, recursive, maxCount) => {
-      return await listFiles(path2, recursive, maxCount, process.cwd(), options.excludeFiles);
-    },
-    searchFiles: async (path2, regex, filePattern) => {
-      return await searchFiles(path2, regex, filePattern, process.cwd(), options.excludeFiles);
+    listFiles: async (path, recursive, maxCount) => {
+      return await listFiles(path, recursive, maxCount, process.cwd(), options.excludeFiles);
     },
     executeCommand: (command, needApprove) => {
       return new Promise((resolve2, reject) => {
@@ -49057,6 +48940,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli-shared",
-  "version": "0.8.20",
+  "version": "0.8.21",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "@polka-codes/core": "0.8.10",
-    "@vscode/ripgrep": "^1.15.10",
     "ignore": "^7.0.3",
     "lodash": "^4.17.21",
     "yaml": "^2.7.0",