@polka-codes/cli 0.9.4 → 0.9.6

package/dist/index.js

@@ -39731,7 +39731,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.9.4";
+var version = "0.9.6";
 
 // ../../node_modules/@inquirer/core/dist/esm/lib/key.js
 var isUpKey = (key) => key.name === "up" || key.name === "k" || key.ctrl && key.name === "p";
@@ -52567,7 +52567,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: [
       {
@@ -52588,8 +52598,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>
@@ -52618,7 +52628,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: [
       {
@@ -52644,10 +52664,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 {
@@ -52655,7 +52675,7 @@ var handler8 = async (provider, args) => {
       if (isEmpty) {
         resp.push(`<read_file_file_content path="${path}" is_empty="true" />`);
       } else {
-        resp.push(`<read_file_file_conten path="${path}">${fileContent}</read_file_file_content>`);
+        resp.push(`<read_file_file_content path="${path}">${fileContent}</read_file_file_content>`);
       }
     }
   }
@@ -52955,9 +52975,16 @@ var handler11 = async (provider, args) => {
       message: "Not possible to replace in file. Abort."
     };
   }
+  const parsed = toolInfo11.parameters.safeParse(args);
+  if (!parsed.success) {
+    return {
+      type: "Invalid" /* Invalid */,
+      message: `Invalid arguments for replace_in_file: ${parsed.error.message}`
+    };
+  }
+  const { path, diff } = parsed.data;
   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 */,
@@ -53034,8 +53061,15 @@ var handler12 = async (provider, args) => {
       message: "Not possible to search files. Abort."
     };
   }
+  const parsed = toolInfo12.parameters.safeParse(args);
+  if (!parsed.success) {
+    return {
+      type: "Invalid" /* Invalid */,
+      message: `Invalid arguments for search_files: ${parsed.error.message}`
+    };
+  }
+  const { path, regex, filePattern } = parsed.data;
   try {
-    const { path, regex, filePattern } = toolInfo12.parameters.parse(args);
     const files = await provider.searchFiles(path, regex, filePattern ?? "*");
     return {
       type: "Reply" /* Reply */,
@@ -53050,8 +53084,8 @@ ${files.join(`
     };
   } catch (error40) {
     return {
-      type: "Invalid" /* Invalid */,
-      message: `Invalid arguments for search_files: ${error40}`
+      type: "Error" /* Error */,
+      message: `Error searching files: ${error40}`
     };
   }
 };
@@ -76695,6 +76729,7 @@ ${instance.prompt}`;
         resetTimeout();
         const streamTextOptions = {
           model: this.ai,
+          temperature: 0,
           messages,
           providerOptions: this.config.parameters?.providerOptions,
           onChunk: async ({ chunk }) => {
@@ -76763,6 +76798,14 @@ ${instance.prompt}`;
     }
     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;
@@ -77428,52 +77471,39 @@ class CoderAgent extends AgentBase {
       usageMeter: options.usageMeter ?? new UsageMeter
     });
   }
-  async onBeforeInvokeTool(name17, _args) {
-    if (name17 !== attemptCompletion_default.name) {
-      return;
-    }
+  async#runScript(scriptName, shouldReplyWithError) {
     const executeCommand = this.config.provider.executeCommand;
     if (!executeCommand) {
       return;
     }
-    const format = this.config.scripts?.format;
-    const formatCommand = typeof format === "string" ? format : format?.command;
-    if (formatCommand) {
-      try {
-        await executeCommand(formatCommand, false);
-      } catch (error81) {
-        console.warn(`Failed to format code using command: ${formatCommand}`, error81);
-      }
-    }
-    const check3 = this.config.scripts?.check;
-    const checkCommand = typeof check3 === "string" ? check3 : check3?.command;
-    if (checkCommand) {
+    const script = this.config.scripts?.[scriptName];
+    const command = typeof script === "string" ? script : script?.command;
+    if (command) {
       try {
-        const { exitCode, stdout, stderr } = await executeCommand(checkCommand, false);
-        if (exitCode !== 0) {
+        const { exitCode, stdout, stderr } = await executeCommand(command, false);
+        if (exitCode !== 0 && shouldReplyWithError) {
           return {
             type: "Reply" /* Reply */,
-            message: responsePrompts.commandResult(checkCommand, exitCode, stdout, stderr)
+            message: responsePrompts.commandResult(command, exitCode, stdout, stderr)
           };
         }
       } catch (error81) {
-        console.warn(`Failed to check code using command: ${checkCommand}`, error81);
+        console.warn(`Failed to run ${scriptName} using command: ${command}`, error81);
       }
     }
-    const test = this.config.scripts?.test;
-    const testCommand = typeof test === "string" ? test : test?.command;
-    if (testCommand) {
-      try {
-        const { exitCode, stdout, stderr } = await executeCommand(testCommand, false);
-        if (exitCode !== 0) {
-          return {
-            type: "Reply" /* Reply */,
-            message: responsePrompts.commandResult(testCommand, exitCode, stdout, stderr)
-          };
-        }
-      } catch (error81) {
-        console.warn(`Failed to test code using command: ${testCommand}`, error81);
-      }
+  }
+  async onBeforeInvokeTool(name17, _args) {
+    if (name17 !== attemptCompletion_default.name) {
+      return;
+    }
+    await this.#runScript("format", false);
+    const checkResult = await this.#runScript("check", true);
+    if (checkResult) {
+      return checkResult;
+    }
+    const testResult = await this.#runScript("test", true);
+    if (testResult) {
+      return testResult;
     }
   }
 }
@@ -77981,10 +78011,18 @@ Example Output:
 <tool_output>
 <tool_output_pr_title>Refactor Order Validation and Remove Debug Logs</tool_output_pr_title>
 <tool_output_pr_description>
-closes #123
+Closes #123
+
+**Context**:
+- Implementing changes for issue #123 - Focus on clean code and maintainability
 
-This PR removes unnecessary debug print statements and updates order validation
-to use the new validate_and_process method for improved maintainability.
+**Summary of Changes**:
+- Refactored order validation logic to use a new \`validate_and_process\` method.
+- Removed debug print statements from \`user_service.py\`.
+
+**Highlights of Changed Code**:
+- \`order_service.py\`: Replaced direct call to \`process_order\` with \`validate_and_process\`.
+- \`user_service.py\`: Removed \`print("Debug info")\`.
 </tool_output_pr_description>
 </tool_output>
 
@@ -78285,6 +78323,7 @@ ${output}`,
 var executeTool = async (definition, ai, params, usageMeter) => {
   const resp = await generateText({
     model: ai,
+    temperature: 0,
     system: definition.prompt,
     messages: [
       {
@@ -86328,21 +86367,6 @@ var OpenRouterChatLanguageModel = class {
             return;
           }
           const delta = choice.delta;
-          if (delta.content != null) {
-            if (!textStarted) {
-              textId = openrouterResponseId || generateId2();
-              controller.enqueue({
-                type: "text-start",
-                id: textId
-              });
-              textStarted = true;
-            }
-            controller.enqueue({
-              type: "text-delta",
-              delta: delta.content,
-              id: textId || generateId2()
-            });
-          }
           const emitReasoningChunk = (chunkText) => {
             if (!reasoningStarted) {
               reasoningId = openrouterResponseId || generateId2();
@@ -86358,9 +86382,6 @@ var OpenRouterChatLanguageModel = class {
               id: reasoningId || generateId2()
             });
           };
-          if (delta.reasoning != null) {
-            emitReasoningChunk(delta.reasoning);
-          }
           if (delta.reasoning_details && delta.reasoning_details.length > 0) {
             for (const detail of delta.reasoning_details) {
               switch (detail.type) {
@@ -86387,6 +86408,23 @@ var OpenRouterChatLanguageModel = class {
                 }
               }
             }
+          } else if (delta.reasoning != null) {
+            emitReasoningChunk(delta.reasoning);
+          }
+          if (delta.content != null) {
+            if (!textStarted) {
+              textId = openrouterResponseId || generateId2();
+              controller.enqueue({
+                type: "text-start",
+                id: textId
+              });
+              textStarted = true;
+            }
+            controller.enqueue({
+              type: "text-delta",
+              delta: delta.content,
+              id: textId || generateId2()
+            });
           }
           if (delta.tool_calls != null) {
             for (const toolCallDelta of delta.tool_calls) {
@@ -86486,7 +86524,7 @@ var OpenRouterChatLanguageModel = class {
           var _a16;
           if (finishReason === "tool-calls") {
             for (const toolCall of toolCalls) {
-              if (!toolCall.sent) {
+              if (toolCall && !toolCall.sent) {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: (_a16 = toolCall.id) != null ? _a16 : generateId2(),
@@ -103830,11 +103868,12 @@ var getModel = (config5, debugLogging = false) => {
               console.log("<- Stream chunk:", text2.replace(/\n/g, "\\n"));
             }
             if (TRACING_FILE) {
-              appendFileSync(TRACING_FILE, JSON.stringify({
+              appendFileSync(TRACING_FILE, `${JSON.stringify({
                 type: "response-chunk",
                 timestamp: new Date().toISOString(),
                 chunk: text2
-              }, null, 2));
+              }, null, 2)}
+`);
             }
           }
         }
@@ -103851,13 +103890,14 @@ var getModel = (config5, debugLogging = false) => {
       console.dir(responseBody, { depth: null });
     }
     if (TRACING_FILE) {
-      appendFileSync(TRACING_FILE, JSON.stringify({
+      appendFileSync(TRACING_FILE, `${JSON.stringify({
         type: "response",
         timestamp: new Date().toISOString(),
         status: res.status,
         headers: Object.fromEntries(res.headers.entries()),
         body: responseBody
-      }, null, 2));
+      }, null, 2)}
+`);
     }
     return new Response(full, {
       headers: res.headers,
@@ -108270,13 +108310,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 = [
@@ -108289,7 +108332,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));
@@ -108385,8 +108428,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 {
@@ -108414,8 +108457,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) => {
@@ -109239,6 +109282,9 @@ function getProviderOptions(provider3, modelId, thinkingBudgetTokens, supportThi
       };
       break;
     case "openrouter" /* OpenRouter */:
+      if (modelId.startsWith("anthropic/")) {
+        break;
+      }
       providerOptions.openrouter = {
         reasoning: {
           max_tokens: thinkingBudgetTokens
@@ -110730,6 +110776,7 @@ async function reviewPR(prIdentifier, spinner, sharedAiOptions, isJsonOutput) {
   } catch (_error) {
     console.warn("Warning: Could not retrieve file changes list");
   }
+  printChangedFiles(changedFiles, spinner, isJsonOutput);
   spinner.text = "Generating review...";
   const result = await reviewDiff(sharedAiOptions, {
     commitRange: `${defaultBranch}...HEAD`,
@@ -110755,6 +110802,7 @@ async function reviewLocal(spinner, sharedAiOptions, isJsonOutput) {
   if (hasStagedChanges) {
     spinner.text = "Generating review for staged changes...";
     const stagedFiles = changedFiles.filter((file4) => file4.status.includes("staged"));
+    printChangedFiles(stagedFiles, spinner, isJsonOutput);
     const result2 = await reviewDiff(sharedAiOptions, {
       staged: true,
       changedFiles: stagedFiles
@@ -110770,6 +110818,7 @@ async function reviewLocal(spinner, sharedAiOptions, isJsonOutput) {
   if (hasUnstagedChanges) {
     spinner.text = "Generating review for unstaged changes...";
     const unstagedFiles = changedFiles.filter((file4) => file4.status.includes("unstaged") || file4.status.includes("Untracked"));
+    printChangedFiles(unstagedFiles, spinner, isJsonOutput);
     const result2 = await reviewDiff(sharedAiOptions, {
       staged: false,
       changedFiles: unstagedFiles
@@ -110806,6 +110855,7 @@ async function reviewLocal(spinner, sharedAiOptions, isJsonOutput) {
   } catch (_error) {
     console.warn("Warning: Could not retrieve file changes list");
   }
+  printChangedFiles(branchChangedFiles, spinner, isJsonOutput);
   spinner.text = `Generating review for changes between '${defaultBranch}' and '${currentBranch}'...`;
   const result = await reviewDiff(sharedAiOptions, {
     commitRange: `${defaultBranch}...${currentBranch}`,
@@ -110837,6 +110887,20 @@ ${item.review}
   }
   return formatted;
 }
+function printChangedFiles(changedFiles, spinner, isJsonOutput) {
+  if (changedFiles.length === 0) {
+    return;
+  }
+  spinner.stop();
+  const stream = isJsonOutput ? process.stderr : process.stdout;
+  const log = (message) => stream.write(`${message}
+`);
+  log("Changed files:");
+  for (const file4 of changedFiles) {
+    log(`- ${file4.status}: ${file4.path}`);
+  }
+  spinner.start();
+}
 
 // src/commands/task.ts
 var readStdin = async (timeoutMs = 30000) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",
@@ -24,9 +24,9 @@
     "@ai-sdk/provider": "2.0.0-beta.1",
     "@ai-sdk/provider-utils": "3.0.0-beta.5",
     "@inquirer/prompts": "^7.2.3",
-    "@openrouter/ai-sdk-provider": "^1.0.0-beta.3",
-    "@polka-codes/cli-shared": "0.9.1",
-    "@polka-codes/core": "0.9.1",
+    "@openrouter/ai-sdk-provider": "^1.0.0-beta.6",
+    "@polka-codes/cli-shared": "0.9.4",
+    "@polka-codes/core": "0.9.4",
     "ai": "5.0.0-beta.24",
     "commander": "^13.0.0",
     "dotenv": "^16.4.7",