@polka-codes/core 0.9.3 → 0.9.4

package/dist/_tsup-dts-rollup.d.ts

@@ -738,7 +738,7 @@ export declare const default_alias_3: {
 export declare const default_alias_4: {
     readonly name: "reviewDiff";
     readonly description: "Reviews a git diff";
-    readonly prompt: "\n# Code Review Prompt\n\nYou are a senior software engineer reviewing code changes.\n\n## Viewing Changes\n- Use **git_diff** to inspect code.\n  - **Pull request**: use the provided commit range.\n  - **Local changes**: diff staged or unstaged files.\n- If a pull request is present you may receive:\n  - <pr_title>\n  - <pr_description>\n  - <commit_messages>\n- A <review_instructions> tag tells you the focus of the review.\n\n## Focus Areas\n- Readability and maintainability\n- Correctness, edge cases, potential bugs\n- Performance implications\n- Clarity of intent\n- Best-practice adherence\n\n## Output Format\nDo **not** include praise or positive feedback. Ignore generated files such as lock files.\n\nReturn your review as a JSON object inside a ```json block, wrapped like:\n<tool_attempt_completion>\n<tool_parameter_result>\n```json\n{\n  \"overview\": \"Summary of overall concerns.\",\n  \"specificReviews\": [\n    {\n      \"file\": \"path/filename.ext\",\n      \"lines\": \"N or N-M\",\n      \"review\": \"Describe the issue and actionable fix or improvement.\"\n    }\n  ]\n}\n```\n</tool_parameter_result>\n</tool_attempt_completion>\n";
+    readonly prompt: "\n# Code Review Prompt\n\nYou are a senior software engineer reviewing code changes.\n\n## Critical Instructions\n**ONLY review the actual changes shown in the diff.** Do not comment on existing code that wasn't modified.\n\n## Viewing Changes\n- **Use git_diff** to inspect the actual code changes for each relevant file.\n  - **Pull request**: use the provided commit range for the git_diff tool.\n  - **Local changes**: diff staged or unstaged files using the git_diff tool.\n- If a pull request is present you may receive:\n  - <pr_title>\n  - <pr_description>\n  - <commit_messages>\n- A <review_instructions> tag tells you the focus of the review.\n- File status information is provided in <file_status> - use this to understand which files were modified, added, deleted, or renamed.\n\n## Review Guidelines\nFocus exclusively on the changed lines (+ additions, - deletions, modified lines):\n- **Specific issues**: Point to exact problems in the changed code with line references\n- **Actionable fixes**: Provide concrete solutions, not vague suggestions\n- **Clear reasoning**: Explain why each issue matters and how to fix it\n- **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\n\n## What NOT to review\n- Existing unchanged code\n- Overall project structure or architecture (unless directly impacted by changes)\n- Generic best practices unrelated to the specific changes\n- Missing features or functionality not part of this diff\n\n## Output Format\nDo **not** include praise or positive feedback. Ignore generated files such as lock files.\nOnly include reviews for actual issues found in the changed code.\n\nReturn your review as a JSON object inside a ```json block, wrapped like:\n<tool_attempt_completion>\n<tool_parameter_result>\n```json\n{\n  \"overview\": \"Summary of specific issues found in the diff changes, or 'No issues found' if the changes look good.\",\n  \"specificReviews\": [\n    {\n      \"file\": \"path/filename.ext\",\n      \"lines\": \"N or N-M\",\n      \"review\": \"Specific issue with the changed code and exact actionable fix.\"\n    }\n  ]\n}\n```\n</tool_parameter_result>\n</tool_attempt_completion>\n";
     readonly formatInput: (params: Input_2) => string;
     readonly parseOutput: (output: string) => Output_2;
     readonly agent: (options: SharedAgentOptions) => AnalyzerAgent;
@@ -963,6 +963,10 @@ declare type Input_2 = {
     commitMessages?: string;
     commitRange?: string;
     staged?: boolean;
+    changedFiles?: Array<{
+        path: string;
+        status: string;
+    }>;
 };
 
 declare type InteractionProvider = {
@@ -1197,6 +1201,10 @@ declare const reviewDiff: (options: SharedAgentOptions, params: {
     commitMessages?: string;
     commitRange?: string;
     staged?: boolean;
+    changedFiles?: Array<{
+        path: string;
+        status: string;
+    }>;
 }) => Promise<{
     overview: string;
     specificReviews: {

package/dist/index.js

@@ -1811,21 +1811,29 @@ ${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 * 1e3);
         }
       };
-      this.#abortController = new AbortController();
       try {
+        resetTimeout();
         const streamTextOptions = {
           model: this.ai,
           messages,
@@ -1847,7 +1855,7 @@ ${instance.prompt}`;
           onError: async (error) => {
             console.error("Error in stream:", error);
           },
-          abortSignal: this.#abortController.signal
+          abortSignal: requestAbortController.signal
         };
         if (this.config.toolFormat === "native") {
           streamTextOptions.tools = this.#toolSet;
@@ -1860,11 +1868,19 @@ ${instance.prompt}`;
         });
         const resp = await stream.response;
         respMessages = resp.messages;
+        if (timeout) {
+          clearTimeout(timeout);
+          timeout = void 0;
+        }
       } catch (error) {
         if (error instanceof Error && error.name === "AbortError") {
-          break;
+          if (this.#aborted) {
+            break;
+          }
+          console.debug(`Request attempt ${i + 1} timed out, will retry`);
+        } else {
+          console.error("Error in stream:", error);
         }
-        console.error("Error in stream:", error);
       } finally {
         if (timeout) {
           clearTimeout(timeout);
@@ -1876,13 +1892,15 @@ ${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") {
@@ -1893,7 +1911,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") {
@@ -3360,37 +3378,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."
     }
   ]
 }
@@ -3418,14 +3447,20 @@ ${params.pullRequestDescription}
       parts.push(`<commit_messages>
 ${params.commitMessages}
 </commit_messages>`);
+    }
+    if (params.changedFiles && params.changedFiles.length > 0) {
+      const fileList = params.changedFiles.map((file) => `${file.status}: ${file.path}`).join("\n");
+      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}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/core",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",