@polka-codes/cli 0.9.3 → 0.9.4

package/dist/index.js

@@ -39731,7 +39731,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.9.3";
+var version = "0.9.4";
 
 // ../../node_modules/@inquirer/core/dist/esm/lib/key.js
 var isUpKey = (key) => key.name === "up" || key.name === "k" || key.ctrl && key.name === "p";
@@ -76672,21 +76672,27 @@ ${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,
           messages,
@@ -76708,7 +76714,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;
@@ -76721,11 +76727,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);
@@ -76737,13 +76751,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") {
@@ -76754,7 +76770,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") {
@@ -78151,37 +78167,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."
     }
   ]
 }
@@ -78209,14 +78236,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}
@@ -103767,13 +103801,14 @@ var getModel = (config5, debugLogging = false) => {
       console.dir(requestBody, { depth: null });
     }
     if (TRACING_FILE) {
-      appendFileSync(TRACING_FILE, JSON.stringify({
+      appendFileSync(TRACING_FILE, `${JSON.stringify({
         type: "request",
         timestamp: new Date().toISOString(),
         url: url4,
         headers: options?.headers,
         body: requestBody
-      }, null, 2));
+      }, null, 2)}
+`);
     }
     const res = await fetch(url4, options);
     if (debugLogging) {
@@ -110522,6 +110557,89 @@ var prCommand = new Command("pr").description("Create a GitHub pull request").ar
 // src/commands/review.ts
 import { execSync as execSync3 } from "node:child_process";
 var import_lodash9 = __toESM(require_lodash(), 1);
+function parseGitStatus(statusOutput) {
+  const statusLines = statusOutput.split(`
+`).filter((line) => line);
+  const files = [];
+  for (const line of statusLines) {
+    const indexStatus = line[0];
+    const workingTreeStatus = line[1];
+    const filepath = line.slice(3);
+    const statuses = [];
+    if (indexStatus !== " " && indexStatus !== "?") {
+      switch (indexStatus) {
+        case "A":
+          statuses.push("Added (staged)");
+          break;
+        case "M":
+          statuses.push("Modified (staged)");
+          break;
+        case "D":
+          statuses.push("Deleted (staged)");
+          break;
+        case "R":
+          statuses.push("Renamed (staged)");
+          break;
+        case "C":
+          statuses.push("Copied (staged)");
+          break;
+        default:
+          statuses.push("Changed (staged)");
+      }
+    }
+    if (workingTreeStatus !== " ") {
+      switch (workingTreeStatus) {
+        case "M":
+          statuses.push("Modified (unstaged)");
+          break;
+        case "D":
+          statuses.push("Deleted (unstaged)");
+          break;
+        case "?":
+          statuses.push("Untracked");
+          break;
+        default:
+          statuses.push("Changed (unstaged)");
+      }
+    }
+    if (statuses.length > 0) {
+      files.push({ path: filepath, status: statuses.join(", ") });
+    }
+  }
+  return files;
+}
+function parseGitDiffNameStatus(diffOutput) {
+  const lines = diffOutput.split(`
+`).filter((line) => line.trim());
+  return lines.map((line) => {
+    const [status, ...pathParts] = line.split("\t");
+    const path = pathParts.join("\t");
+    let statusDescription;
+    switch (status[0]) {
+      case "A":
+        statusDescription = "Added";
+        break;
+      case "M":
+        statusDescription = "Modified";
+        break;
+      case "D":
+        statusDescription = "Deleted";
+        break;
+      case "R":
+        statusDescription = "Renamed";
+        break;
+      case "C":
+        statusDescription = "Copied";
+        break;
+      case "T":
+        statusDescription = "Type changed";
+        break;
+      default:
+        statusDescription = "Unknown";
+    }
+    return { path, status: statusDescription };
+  });
+}
 var reviewCommand = new Command("review").description("Review a GitHub pull request or local changes").option("--pr <pr>", "The pull request number or URL to review").option("--json", "Output the review in JSON format", false).action(async (options, command) => {
   const parentOptions = command.parent?.opts() ?? {};
   const { providerConfig, config: config6 } = parseOptions(parentOptions);
@@ -110604,12 +110722,21 @@ async function reviewPR(prIdentifier, spinner, sharedAiOptions, isJsonOutput) {
   const commitMessages = prDetails.commits.map((c) => c.messageBody).join(`
 ---
 `);
+  spinner.text = "Getting file changes...";
+  let changedFiles = [];
+  try {
+    const diffNameStatus = execSync3(`git diff --name-status --no-color ${defaultBranch}...HEAD`, { encoding: "utf-8" });
+    changedFiles = parseGitDiffNameStatus(diffNameStatus);
+  } catch (_error) {
+    console.warn("Warning: Could not retrieve file changes list");
+  }
   spinner.text = "Generating review...";
   const result = await reviewDiff(sharedAiOptions, {
     commitRange: `${defaultBranch}...HEAD`,
     pullRequestTitle: prDetails.title,
     pullRequestDescription: prDetails.body,
-    commitMessages
+    commitMessages,
+    changedFiles
   });
   spinner.succeed("Review generated successfully");
   if (isJsonOutput) {
@@ -110619,10 +110746,19 @@ async function reviewPR(prIdentifier, spinner, sharedAiOptions, isJsonOutput) {
   }
 }
 async function reviewLocal(spinner, sharedAiOptions, isJsonOutput) {
-  const hasStagedChanges = execSync3('git diff --staged --quiet || echo "staged"', { encoding: "utf-8" }).trim() === "staged";
+  const gitStatus = execSync3("git status --porcelain=v1", { encoding: "utf-8" }).trim();
+  const statusLines = gitStatus.split(`
+`).filter((line) => line);
+  const hasStagedChanges = statusLines.some((line) => "MARC".includes(line[0]));
+  const hasUnstagedChanges = statusLines.some((line) => "MARCDU".includes(line[1]));
+  const changedFiles = parseGitStatus(gitStatus);
   if (hasStagedChanges) {
     spinner.text = "Generating review for staged changes...";
-    const result2 = await reviewDiff(sharedAiOptions, { staged: true });
+    const stagedFiles = changedFiles.filter((file4) => file4.status.includes("staged"));
+    const result2 = await reviewDiff(sharedAiOptions, {
+      staged: true,
+      changedFiles: stagedFiles
+    });
     spinner.succeed("Review generated successfully");
     if (isJsonOutput) {
       console.log(JSON.stringify(result2, null, 2));
@@ -110631,10 +110767,13 @@ async function reviewLocal(spinner, sharedAiOptions, isJsonOutput) {
     }
     return;
   }
-  const hasUnstagedChanges = execSync3('git diff --quiet || echo "unstaged"', { encoding: "utf-8" }).trim() === "unstaged";
   if (hasUnstagedChanges) {
     spinner.text = "Generating review for unstaged changes...";
-    const result2 = await reviewDiff(sharedAiOptions, { staged: false });
+    const unstagedFiles = changedFiles.filter((file4) => file4.status.includes("unstaged") || file4.status.includes("Untracked"));
+    const result2 = await reviewDiff(sharedAiOptions, {
+      staged: false,
+      changedFiles: unstagedFiles
+    });
     spinner.succeed("Review generated successfully");
     if (isJsonOutput) {
       console.log(JSON.stringify(result2, null, 2));
@@ -110659,9 +110798,18 @@ async function reviewLocal(spinner, sharedAiOptions, isJsonOutput) {
     spinner.succeed(`No changes to review. You are on the default branch ('${defaultBranch}').`);
     process.exit(0);
   }
+  spinner.text = "Getting file changes...";
+  let branchChangedFiles = [];
+  try {
+    const diffNameStatus = execSync3(`git diff --name-status --no-color ${defaultBranch}...${currentBranch}`, { encoding: "utf-8" });
+    branchChangedFiles = parseGitDiffNameStatus(diffNameStatus);
+  } catch (_error) {
+    console.warn("Warning: Could not retrieve file changes list");
+  }
   spinner.text = `Generating review for changes between '${defaultBranch}' and '${currentBranch}'...`;
   const result = await reviewDiff(sharedAiOptions, {
-    commitRange: `${defaultBranch}...${currentBranch}`
+    commitRange: `${defaultBranch}...${currentBranch}`,
+    changedFiles: branchChangedFiles
   });
   spinner.succeed("Review generated successfully");
   if (isJsonOutput) {

package/package.json

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