@polka-codes/runner 0.8.13 → 0.8.15

package/dist/index.js

@@ -32748,7 +32748,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.8.13";
+var version = "0.8.15";
 
 // src/runner.ts
 import { execSync } from "node:child_process";
@@ -54236,14 +54236,8 @@ async function listFiles(dirPath, recursive, maxCount, cwd, excludeFiles) {
 
 // ../cli-shared/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" : ""}`);
-
-// ../cli-shared/src/utils/searchFiles.ts
-async function searchFiles(path2, regex, filePattern, cwd, excludeFiles) {
+import { rgPath } from "@vscode/ripgrep";
+async function searchFiles(path, regex, filePattern, cwd, excludeFiles) {
   const args = [
     "--line-number",
     "--context=5",
@@ -54264,10 +54258,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(rgPath, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -54293,28 +54287,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)) {
@@ -54322,11 +54316,11 @@ 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);
+    listFiles: async (path, recursive, maxCount) => {
+      return await listFiles(path, recursive, maxCount, process.cwd(), options.excludeFiles);
     },
-    searchFiles: async (path2, regex, filePattern) => {
-      return await searchFiles(path2, regex, filePattern, 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) => {
@@ -54745,8 +54739,8 @@ function getErrorMap3() {
   return overrideErrorMap3;
 }
 var makeIssue3 = (params) => {
-  const { data, path: path2, errorMaps, issueData } = params;
-  const fullPath = [...path2, ...issueData.path || []];
+  const { data, path, errorMaps, issueData } = params;
+  const fullPath = [...path, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -54874,11 +54868,11 @@ var _ZodEnum_cache3;
 var _ZodNativeEnum_cache3;
 
 class ParseInputLazyPath3 {
-  constructor(parent, value, path2, key2) {
+  constructor(parent, value, path, key2) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path2;
+    this._path = path;
     this._key = key2;
   }
   get path() {
@@ -58677,12 +58671,21 @@ class Runner {
             if (resp.type === "Reply" /* Reply */) {
               return responsePrompts.toolResults(request.tool, resp.message);
             }
-            return responsePrompts.errorInvokeTool(request.tool, `Unexpected tool response: ${JSON.stringify(resp)}`);
+            return {
+              type: "error",
+              message: responsePrompts.errorInvokeTool(request.tool, `Unexpected tool response: ${JSON.stringify(resp)}`)
+            };
           }
-          return responsePrompts.errorInvokeTool(request.tool, "Tool not available");
+          return {
+            type: "error",
+            message: responsePrompts.errorInvokeTool(request.tool, "Tool not available")
+          };
         } catch (toolError) {
           console.error(`Error executing tool ${request.tool}:`, toolError);
-          return responsePrompts.errorInvokeTool(request.tool, toolError);
+          return {
+            type: "error",
+            message: responsePrompts.errorInvokeTool(request.tool, toolError)
+          };
         }
       };
       const respMsg = await fn();
@@ -58699,6 +58702,13 @@ class Runner {
           index: request.index
         });
         return;
+      } else if (respMsg.type === "error") {
+        responses.push({
+          index: request.index,
+          tool: request.tool,
+          response: respMsg.message
+        });
+        break;
       }
     }
     this.wsManager.sendMessage({
@@ -58751,9 +58761,9 @@ class Runner {
 `).filter((line) => line.trim().length > 0);
     for (const line of lines2) {
       const statusCode = line.substring(0, 2);
-      const path2 = line.substring(3);
+      const path = line.substring(3);
       if (statusCode.startsWith("R")) {
-        const parts = path2.split(" -> ");
+        const parts = path.split(" -> ");
         if (parts.length === 2) {
           const [oldPath, newPath] = parts;
           changes.push({
@@ -58765,50 +58775,50 @@ class Runner {
         }
       }
       if (statusCode === "??") {
-        changes.push({ status: "added", path: path2 });
+        changes.push({ status: "added", path });
       } else if (statusCode.includes("A")) {
-        changes.push({ status: "added", path: path2 });
+        changes.push({ status: "added", path });
       } else if (statusCode.includes("M")) {
-        changes.push({ status: "modified", path: path2 });
+        changes.push({ status: "modified", path });
       } else if (statusCode.includes("D")) {
-        changes.push({ status: "deleted", path: path2 });
+        changes.push({ status: "deleted", path });
       }
     }
     return changes;
   }
-  async sendFileContent(path2) {
+  async sendFileContent(path) {
     try {
-      const stat = await fs3.stat(path2).catch(() => null);
+      const stat = await fs3.stat(path).catch(() => null);
       if (!stat) {
-        console.error(`File or directory not found: ${path2}`);
+        console.error(`File or directory not found: ${path}`);
         return;
       }
       if (stat.isDirectory()) {
-        const [files] = await listFiles(path2, true, 1000, process.cwd());
+        const [files] = await listFiles(path, true, 1000, process.cwd());
         for (const file of files) {
           await this.sendFileContent(file);
         }
       } else if (stat.isFile()) {
-        const content = await fs3.readFile(path2, "utf8");
+        const content = await fs3.readFile(path, "utf8");
         this.wsManager.sendMessage({
           type: "file",
-          path: path2,
+          path,
           content
         });
-        console.log(`Sent content for file: ${path2}`);
+        console.log(`Sent content for file: ${path}`);
       } else {
-        console.error(`Path is not a file or directory: ${path2}`);
+        console.error(`Path is not a file or directory: ${path}`);
       }
     } catch (error) {
-      console.error(`Error processing path ${path2}:`, error);
+      console.error(`Error processing path ${path}:`, error);
     }
   }
-  sendFileDeleted(path2) {
+  sendFileDeleted(path) {
     this.wsManager.sendMessage({
       type: "file_deleted",
-      path: path2
+      path
     });
-    console.log(`Sent file_deleted for: ${path2}`);
+    console.log(`Sent file_deleted for: ${path}`);
   }
 }
 async function runRunner(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/runner",
-  "version": "0.8.13",
+  "version": "0.8.15",
   "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"
+    "build": "bun build src/index.ts --outdir dist --target node --external=@vscode/ripgrep"
   },
   "dependencies": {
     "@polka-codes/cli-shared": "0.8.10",