@polka-codes/cli-shared 0.9.3 → 0.9.5

package/dist/index.js

@@ -27185,7 +27185,17 @@ var toolInfo7 = {
           return true;
       }
       return val;
-    }, exports_external.boolean().optional().default(true)).describe("Whether to list files recursively. Use true for recursive listing, false or omit for top-level only.").meta({ usageValue: "true or false (optional)" })
+    }, exports_external.boolean().optional().default(true)).describe("Whether to list files recursively. Use true for recursive listing, false or omit for top-level only.").meta({ usageValue: "true or false (optional)" }),
+    includeIgnored: exports_external.preprocess((val) => {
+      if (typeof val === "string") {
+        const lower = val.toLowerCase();
+        if (lower === "false")
+          return false;
+        if (lower === "true")
+          return true;
+      }
+      return val;
+    }, exports_external.boolean().optional().default(false)).describe("Whether to include ignored files. Use true to include files ignored by .gitignore.").meta({ usageValue: "true or false (optional)" })
   }).meta({
     examples: [
       {
@@ -27206,8 +27216,8 @@ var handler7 = async (provider, args) => {
       message: "Not possible to list files. Abort."
     };
   }
-  const { path, maxCount, recursive } = toolInfo7.parameters.parse(args);
-  const [files, limitReached] = await provider.listFiles(path, recursive, maxCount);
+  const { path, maxCount, recursive, includeIgnored } = toolInfo7.parameters.parse(args);
+  const [files, limitReached] = await provider.listFiles(path, recursive, maxCount, includeIgnored);
   return {
     type: "Reply" /* Reply */,
     message: `<list_files_path>${path}</list_files_path>
@@ -27236,7 +27246,17 @@ var toolInfo8 = {
         return [];
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
-    }, exports_external.array(exports_external.string())).describe("The path of the file to read").meta({ usageValue: "Comma separated paths here" })
+    }, exports_external.array(exports_external.string())).describe("The path of the file to read").meta({ usageValue: "Comma separated paths here" }),
+    includeIgnored: exports_external.preprocess((val) => {
+      if (typeof val === "string") {
+        const lower = val.toLowerCase();
+        if (lower === "false")
+          return false;
+        if (lower === "true")
+          return true;
+      }
+      return val;
+    }, exports_external.boolean().optional().default(false)).describe("Whether to include ignored files. Use true to include files ignored by .gitignore.").meta({ usageValue: "true or false (optional)" })
   }).meta({
     examples: [
       {
@@ -27262,10 +27282,10 @@ var handler8 = async (provider, args) => {
       message: "Not possible to read file. Abort."
     };
   }
-  const { path: paths } = toolInfo8.parameters.parse(args);
+  const { path: paths, includeIgnored } = toolInfo8.parameters.parse(args);
   const resp = [];
   for (const path of paths) {
-    const fileContent = await provider.readFile(path);
+    const fileContent = await provider.readFile(path, includeIgnored);
     if (!fileContent) {
       resp.push(`<read_file_file_content path="${path}" file_not_found="true" />`);
     } else {
@@ -27575,7 +27595,7 @@ var handler11 = async (provider, args) => {
   }
   try {
     const { path, diff } = toolInfo11.parameters.parse(args);
-    const fileContent = await provider.readFile(path);
+    const fileContent = await provider.readFile(path, false);
     if (fileContent == null) {
       return {
         type: "Error" /* Error */,
@@ -50997,23 +51017,30 @@ ${instance.prompt}`;
     const requestTimeoutSeconds = this.config.requestTimeoutSeconds ?? 90;
     let respMessages = [];
     for (let i = 0;i < retryCount; i++) {
+      if (this.#aborted) {
+        break;
+      }
       respMessages = [];
       let timeout;
+      let requestAbortController;
+      requestAbortController = new AbortController;
+      this.#abortController = requestAbortController;
       const resetTimeout = () => {
         if (timeout) {
           clearTimeout(timeout);
         }
-        if (requestTimeoutSeconds > 0) {
+        if (requestTimeoutSeconds > 0 && requestAbortController) {
           timeout = setTimeout(() => {
-            console.debug(`No data received for ${requestTimeoutSeconds} seconds. Aborting request.`);
-            this.abort();
+            console.debug(`Request timeout after ${requestTimeoutSeconds} seconds. Canceling current request attempt ${i + 1}/${retryCount}.`);
+            requestAbortController?.abort();
           }, requestTimeoutSeconds * 1000);
         }
       };
-      this.#abortController = new AbortController;
       try {
+        resetTimeout();
         const streamTextOptions = {
           model: this.ai,
+          temperature: 0,
           messages,
           providerOptions: this.config.parameters?.providerOptions,
           onChunk: async ({ chunk }) => {
@@ -51033,7 +51060,7 @@ ${instance.prompt}`;
           onError: async (error81) => {
             console.error("Error in stream:", error81);
           },
-          abortSignal: this.#abortController.signal
+          abortSignal: requestAbortController.signal
         };
         if (this.config.toolFormat === "native") {
           streamTextOptions.tools = this.#toolSet;
@@ -51046,11 +51073,19 @@ ${instance.prompt}`;
         });
         const resp = await stream.response;
         respMessages = resp.messages;
+        if (timeout) {
+          clearTimeout(timeout);
+          timeout = undefined;
+        }
       } catch (error81) {
         if (error81 instanceof Error && error81.name === "AbortError") {
-          break;
+          if (this.#aborted) {
+            break;
+          }
+          console.debug(`Request attempt ${i + 1} timed out, will retry`);
+        } else {
+          console.error("Error in stream:", error81);
         }
-        console.error("Error in stream:", error81);
       } finally {
         if (timeout) {
           clearTimeout(timeout);
@@ -51062,16 +51097,26 @@ ${instance.prompt}`;
       if (this.#aborted) {
         break;
       }
-      console.debug(`Retrying request ${i + 1} of ${retryCount}`);
+      if (i < retryCount - 1) {
+        console.debug(`Retrying request ${i + 2} of ${retryCount}`);
+      }
     }
     if (respMessages.length === 0) {
       if (this.#aborted) {
         return [];
       }
-      throw new Error("No assistant message received");
+      throw new Error("No assistant message received after all retry attempts");
     }
     this.#messages.push(...respMessages);
     if (this.config.toolFormat === "native") {
+      const assistantText = respMessages.map((msg) => {
+        if (typeof msg.content === "string") {
+          return msg.content;
+        }
+        return msg.content.map((part) => part.type === "text" || part.type === "reasoning" ? part.text : "").join("");
+      }).join(`
+`);
+      await this.#callback({ kind: "EndRequest" /* EndRequest */, agent: this, message: assistantText });
       return respMessages.flatMap((msg) => {
         if (msg.role === "assistant") {
           const content = msg.content;
@@ -51079,7 +51124,7 @@ ${instance.prompt}`;
             return [{ type: "text", content }];
           }
           return content.flatMap((part) => {
-            if (part.type === "text") {
+            if (part.type === "text" || part.type === "reasoning") {
               return [{ type: "text", content: part.text }];
             }
             if (part.type === "tool-call") {
@@ -52035,37 +52080,48 @@ var prompt5 = `
 
 You are a senior software engineer reviewing code changes.
 
+## Critical Instructions
+**ONLY review the actual changes shown in the diff.** Do not comment on existing code that wasn't modified.
+
 ## Viewing Changes
-- Use **git_diff** to inspect code.
-  - **Pull request**: use the provided commit range.
-  - **Local changes**: diff staged or unstaged files.
+- **Use git_diff** to inspect the actual code changes for each relevant file.
+  - **Pull request**: use the provided commit range for the git_diff tool.
+  - **Local changes**: diff staged or unstaged files using the git_diff tool.
 - If a pull request is present you may receive:
   - <pr_title>
   - <pr_description>
   - <commit_messages>
 - A <review_instructions> tag tells you the focus of the review.
+- File status information is provided in <file_status> - use this to understand which files were modified, added, deleted, or renamed.
+
+## Review Guidelines
+Focus exclusively on the changed lines (+ additions, - deletions, modified lines):
+- **Specific issues**: Point to exact problems in the changed code with line references
+- **Actionable fixes**: Provide concrete solutions, not vague suggestions
+- **Clear reasoning**: Explain why each issue matters and how to fix it
+- **Avoid generic advice**: No generic suggestions like "add more tests", "improve documentation", or "follow best practices" unless directly related to a specific problem in the diff
 
-## Focus Areas
-- Readability and maintainability
-- Correctness, edge cases, potential bugs
-- Performance implications
-- Clarity of intent
-- Best-practice adherence
+## What NOT to review
+- Existing unchanged code
+- Overall project structure or architecture (unless directly impacted by changes)
+- Generic best practices unrelated to the specific changes
+- Missing features or functionality not part of this diff
 
 ## Output Format
 Do **not** include praise or positive feedback. Ignore generated files such as lock files.
+Only include reviews for actual issues found in the changed code.
 
 Return your review as a JSON object inside a \`\`\`json block, wrapped like:
 <tool_attempt_completion>
 <tool_parameter_result>
 \`\`\`json
 {
-  "overview": "Summary of overall concerns.",
+  "overview": "Summary of specific issues found in the diff changes, or 'No issues found' if the changes look good.",
   "specificReviews": [
     {
       "file": "path/filename.ext",
       "lines": "N or N-M",
-      "review": "Describe the issue and actionable fix or improvement."
+      "review": "Specific issue with the changed code and exact actionable fix."
     }
   ]
 }
@@ -52093,14 +52149,21 @@ ${params.pullRequestDescription}
       parts.push(`<commit_messages>
 ${params.commitMessages}
 </commit_messages>`);
+    }
+    if (params.changedFiles && params.changedFiles.length > 0) {
+      const fileList = params.changedFiles.map((file3) => `${file3.status}: ${file3.path}`).join(`
+`);
+      parts.push(`<file_status>
+${fileList}
+</file_status>`);
     }
     let instructions = "";
     if (params.commitRange) {
-      instructions = `Review the pull request. Get the diff using the git_diff tool with the commit range '${params.commitRange}'.`;
+      instructions = `Review the pull request. Use the git_diff tool with commit range '${params.commitRange}' to inspect the actual code changes. File status information is already provided above.`;
     } else if (params.staged) {
-      instructions = "Review the staged changes. Get the diff using the git_diff tool with staged: true.";
+      instructions = "Review the staged changes. Use the git_diff tool with staged: true to inspect the actual code changes. File status information is already provided above.";
     } else {
-      instructions = "Review the unstaged changes. Get the diff using the git_diff tool.";
+      instructions = "Review the unstaged changes. Use the git_diff tool to inspect the actual code changes. File status information is already provided above.";
     }
     parts.push(`<review_instructions>
 ${instructions}
@@ -52135,6 +52198,7 @@ ${output}`,
 var executeTool = async (definition, ai, params, usageMeter) => {
   const resp = await generateText({
     model: ai,
+    temperature: 0,
     system: definition.prompt,
     messages: [
       {
@@ -57496,13 +57560,16 @@ async function extendPatterns(basePatterns, dirPath) {
 function createIgnore(patterns) {
   return import_ignore.default().add(patterns);
 }
-async function listFiles(dirPath, recursive, maxCount, cwd, excludeFiles) {
-  let rootPatterns = [...DEFAULT_IGNORES, ...excludeFiles || []];
-  try {
-    const rootGitignore = await fs.readFile(join2(cwd, ".gitignore"), "utf8");
-    const lines = rootGitignore.split(/\r?\n/).filter(Boolean);
-    rootPatterns = [...rootPatterns, ...lines];
-  } catch {}
+async function listFiles(dirPath, recursive, maxCount, cwd, excludeFiles, includeIgnored) {
+  let rootPatterns = [...excludeFiles || []];
+  if (!includeIgnored) {
+    rootPatterns.push(...DEFAULT_IGNORES);
+    try {
+      const rootGitignore = await fs.readFile(join2(cwd, ".gitignore"), "utf8");
+      const lines = rootGitignore.split(/\r?\n/).filter(Boolean);
+      rootPatterns = [...rootPatterns, ...lines];
+    } catch {}
+  }
   const results = [];
   const processedDirs = new Set;
   const queue = [
@@ -57515,7 +57582,7 @@ async function listFiles(dirPath, recursive, maxCount, cwd, excludeFiles) {
   while (queue.length > 0) {
     const { path: currentPath, patterns: parentPatterns, relPath: currentRelPath } = queue.shift();
     processedDirs.add(currentRelPath);
-    const mergedPatterns = await extendPatterns(parentPatterns, currentPath);
+    const mergedPatterns = includeIgnored ? parentPatterns : await extendPatterns(parentPatterns, currentPath);
     const folderIg = createIgnore(mergedPatterns);
     const entries = await fs.readdir(currentPath, { withFileTypes: true });
     entries.sort((a, b) => a.name.localeCompare(b.name));
@@ -57611,8 +57678,8 @@ async function searchFiles(path, regex, filePattern, cwd, excludeFiles) {
 var getProvider = (_agentName, _config, options = {}) => {
   const ig = import_ignore2.default().add(options.excludeFiles ?? []);
   const provider2 = {
-    readFile: async (path) => {
-      if (ig.ignores(path)) {
+    readFile: async (path, includeIgnored) => {
+      if (!includeIgnored && ig.ignores(path)) {
         throw new Error(`Not allow to access file ${path}`);
       }
       try {
@@ -57640,8 +57707,8 @@ var getProvider = (_agentName, _config, options = {}) => {
       }
       return await rename(sourcePath, targetPath);
     },
-    listFiles: async (path, recursive, maxCount) => {
-      return await listFiles(path, recursive, maxCount, process.cwd(), options.excludeFiles);
+    listFiles: async (path, recursive, maxCount, includeIgnored) => {
+      return await listFiles(path, recursive, maxCount, process.cwd(), options.excludeFiles, includeIgnored);
     },
     executeCommand: (command, _needApprove) => {
       return new Promise((resolve3, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli-shared",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",
@@ -17,7 +17,7 @@
     "build": "bun build src/index.ts --outdir dist --target node"
   },
   "dependencies": {
-    "@polka-codes/core": "0.9.1",
+    "@polka-codes/core": "0.9.4",
     "ignore": "^7.0.3",
     "lodash": "^4.17.21",
     "yaml": "^2.7.0",