@polka-codes/cli 0.4.4 → 0.4.5

package/README.md

@@ -77,12 +77,11 @@ rules: |
 
 ### AI Configuration
 
-The default API provider is Ollama with 'maryasov/qwen2.5-coder-cline:7b' model.
-
-Supported providers (in recommended order):
+Supported providers
 1. DeepSeek / `deepseek` (recommended)
 2. Anthropic / `anthropic` (Sonnet 3.5 recommended)
-3. Ollama / `ollama`
+3. OpenRouter / `openrouter`
+4. Ollama / `ollama`
 
 Configure the AI service by creating a `.env` file in your project root:
 

package/dist/index.js

@@ -24629,7 +24629,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.4.4";
+var version = "0.4.5";
 
 // ../../node_modules/@anthropic-ai/sdk/version.mjs
 var VERSION = "0.36.2";
@@ -32890,17 +32890,169 @@ class OllamaService extends AiServiceBase {
   }
 }
 
+// ../core/src/AiService/OpenRouterService.ts
+class OpenRouterService extends AiServiceBase {
+  #client;
+  #apiKey;
+  model;
+  constructor(options) {
+    super();
+    if (!options.model) {
+      throw new Error("OpenRouter requires a model");
+    }
+    if (!options.apiKey) {
+      throw new Error("OpenRouter requires an API key");
+    }
+    this.#apiKey = options.apiKey;
+    this.#client = new openai_default({
+      baseURL: "https://openrouter.ai/api/v1",
+      apiKey: options.apiKey,
+      defaultHeaders: {
+        "HTTP-Referer": "https://polka.codes",
+        "X-Title": "Polka Codes"
+      }
+    });
+    this.model = {
+      id: options.model,
+      info: {}
+    };
+  }
+  async* send(systemPrompt, messages) {
+    const openAiMessages = [
+      { role: "system", content: systemPrompt },
+      ...convertToOpenAiMessages(messages)
+    ];
+    switch (this.model.id) {
+      case "anthropic/claude-3.5-sonnet":
+      case "anthropic/claude-3.5-sonnet:beta":
+      case "anthropic/claude-3.5-sonnet-20240620":
+      case "anthropic/claude-3.5-sonnet-20240620:beta":
+      case "anthropic/claude-3-5-haiku":
+      case "anthropic/claude-3-5-haiku:beta":
+      case "anthropic/claude-3-5-haiku-20241022":
+      case "anthropic/claude-3-5-haiku-20241022:beta":
+      case "anthropic/claude-3-haiku":
+      case "anthropic/claude-3-haiku:beta":
+      case "anthropic/claude-3-opus":
+      case "anthropic/claude-3-opus:beta": {
+        openAiMessages[0] = {
+          role: "system",
+          content: [
+            {
+              type: "text",
+              text: systemPrompt,
+              cache_control: { type: "ephemeral" }
+            }
+          ]
+        };
+        const lastTwoUserMessages = openAiMessages.filter((msg) => msg.role === "user").slice(-2);
+        for (const msg of lastTwoUserMessages) {
+          if (typeof msg.content === "string") {
+            msg.content = [{ type: "text", text: msg.content }];
+          }
+          if (Array.isArray(msg.content)) {
+            let lastTextPart = msg.content.filter((part) => part.type === "text").pop();
+            if (!lastTextPart) {
+              lastTextPart = { type: "text", text: "..." };
+              msg.content.push(lastTextPart);
+            }
+            lastTextPart.cache_control = { type: "ephemeral" };
+          }
+        }
+        break;
+      }
+      default:
+        break;
+    }
+    let maxTokens;
+    switch (this.model.id) {
+      case "anthropic/claude-3.5-sonnet":
+      case "anthropic/claude-3.5-sonnet:beta":
+      case "anthropic/claude-3.5-sonnet-20240620":
+      case "anthropic/claude-3.5-sonnet-20240620:beta":
+      case "anthropic/claude-3-5-haiku":
+      case "anthropic/claude-3-5-haiku:beta":
+      case "anthropic/claude-3-5-haiku-20241022":
+      case "anthropic/claude-3-5-haiku-20241022:beta":
+        maxTokens = 8192;
+        break;
+    }
+    let shouldApplyMiddleOutTransform = !this.model.info.supportsPromptCache;
+    if (this.model.id === "deepseek/deepseek-chat") {
+      shouldApplyMiddleOutTransform = true;
+    }
+    const stream = await this.#client.chat.completions.create({
+      model: this.model.id,
+      max_completion_tokens: maxTokens,
+      messages: openAiMessages,
+      temperature: 0,
+      stream: true,
+      transforms: shouldApplyMiddleOutTransform ? ["middle-out"] : undefined,
+      include_reasoning: true
+    });
+    let genId;
+    for await (const chunk of stream) {
+      if ("error" in chunk) {
+        const error = chunk.error;
+        console.error(`OpenRouter API Error: ${error?.code} - ${error?.message}`);
+        throw new Error(`OpenRouter API Error ${error?.code}: ${error?.message}`);
+      }
+      if (!genId && chunk.id) {
+        genId = chunk.id;
+      }
+      const delta = chunk.choices[0]?.delta;
+      if (delta?.reasoning) {
+        yield {
+          type: "reasoning",
+          text: delta.reasoning
+        };
+      }
+      if (delta?.content) {
+        yield {
+          type: "text",
+          text: delta.content
+        };
+      }
+    }
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    const controller = new AbortController;
+    const timeout = setTimeout(() => controller.abort(), 5000);
+    try {
+      const response = await fetch(`https://openrouter.ai/api/v1/generation?id=${genId}`, {
+        headers: {
+          Authorization: `Bearer ${this.#apiKey}`
+        },
+        signal: controller.signal
+      });
+      const responseBody = await response.json();
+      const generation = responseBody.data;
+      yield {
+        type: "usage",
+        inputTokens: generation?.native_tokens_prompt || 0,
+        outputTokens: generation?.native_tokens_completion || 0,
+        totalCost: generation?.total_cost || 0
+      };
+    } catch (error) {
+      console.error("Error fetching OpenRouter generation details:", error);
+    } finally {
+      clearTimeout(timeout);
+    }
+  }
+}
+
 // ../core/src/AiService/index.ts
 var AiServiceProvider;
 ((AiServiceProvider2) => {
   AiServiceProvider2["Anthropic"] = "anthropic";
   AiServiceProvider2["Ollama"] = "ollama";
   AiServiceProvider2["DeepSeek"] = "deepseek";
+  AiServiceProvider2["OpenRouter"] = "openrouter";
 })(AiServiceProvider ||= {});
 var defaultModels = {
   ["anthropic" /* Anthropic */]: "claude-3-5-sonnet-20241022",
   ["ollama" /* Ollama */]: "maryasov/qwen2.5-coder-cline:7b",
-  ["deepseek" /* DeepSeek */]: "deepseek-chat"
+  ["deepseek" /* DeepSeek */]: "deepseek-chat",
+  ["openrouter" /* OpenRouter */]: "anthropic/claude-3.5-sonnet"
 };
 var createService = (provider, options) => {
   switch (provider) {
@@ -32910,6 +33062,8 @@ var createService = (provider, options) => {
       return new OllamaService(options);
     case "deepseek" /* DeepSeek */:
       return new DeepSeekService(options);
+    case "openrouter" /* OpenRouter */:
+      return new OpenRouterService(options);
   }
 };
 // ../core/src/tool.ts
@@ -33191,6 +33345,9 @@ ${agents}`;
     callback = () => {
     }
   }) {
+    if (maxIterations < 1) {
+      throw new Error("Max iterations must be greater than 0");
+    }
     const taskInfo = {
       options: {
         maxIterations
@@ -33430,6 +33587,9 @@ var getStringArray = (args, name, defaultValue) => {
     }
     return defaultValue;
   }
+  if (ret === "") {
+    return [];
+  }
   return ret.split(",");
 };
 var getBoolean = (args, name, defaultValue) => {
@@ -34392,19 +34552,24 @@ class MultiAgent {
   get model() {
     return this.#activeAgent?.model;
   }
-  async#startTask(agentName, task, context, callback) {
+  async#startTask(agentName, task, context, maxIterations, callback) {
     this.#activeAgent = await this.#config.createAgent(agentName);
     const [exitReason, info] = await this.#activeAgent.startTask({
       task,
       context,
+      maxIterations,
       callback
     });
     if (typeof exitReason === "string") {
       return [exitReason, info];
     }
     if (exitReason.type === "HandOver") {
+      const remainIteration = maxIterations - Math.floor(info.messages.length / 2);
+      if (remainIteration < 1) {
+        return ["MaxIterations", info];
+      }
       const context2 = await this.#config.getContext(agentName, exitReason.context, exitReason.files);
-      const [exitReason2, info2] = await this.#startTask(exitReason.agentName, exitReason.task, context2, callback);
+      const [exitReason2, info2] = await this.#startTask(exitReason.agentName, exitReason.task, context2, remainIteration, callback);
       info2.inputTokens += info.inputTokens;
       info2.outputTokens += info.outputTokens;
       info2.cacheWriteTokens += info.cacheWriteTokens;
@@ -34418,7 +34583,8 @@ class MultiAgent {
     if (this.#activeAgent) {
       throw new Error("An active agent already exists");
     }
-    return this.#startTask(options.agentName, options.task, options.context, options.callback);
+    const maxIterations = options.maxIterations ?? 50;
+    return this.#startTask(options.agentName, options.task, options.context, maxIterations, options.callback);
   }
   async continueTask(userMessage, taskInfo, callback = () => {
   }) {
@@ -34490,6 +34656,8 @@ ${output}`);
 
 // ../core/src/AiTool/generateGithubPullRequestDetails.ts
 var prompt2 = `
+# Generate Github Pull Request Details
+
 You are given:
 - A branch name in <tool_input_branch_name>.
 - An optional context message in <tool_input_context> (which may or may not be present).
@@ -34502,10 +34670,30 @@ Your task:
 3. Produce a single GitHub Pull Request title.
 4. Produce a Pull Request description that explains the changes.
 
+Use the following template for the Pull Request description:
+
+---
+**Context (if provided)**:
+- Acknowledge any guiding concerns or instructions.
+
+**Summary of Changes**:
+- Provide a concise list or overview of what changed.
+
+**Highlights of Changed Code**:
+- Mention only the specific sections or functionalities updated, without showing full surrounding context.
+
+**Additional Information (if needed)**:
+- Testing steps (if applicable).
+- Any notes or caveats.
+
+---
+
 Output format:
 <tool_output>
   <tool_output_pr_title>YOUR PR TITLE HERE</tool_output_pr_title>
-  <tool_output_pr_description>YOUR PR DESCRIPTION HERE</tool_output_pr_description>
+  <tool_output_pr_description>
+    YOUR PR DESCRIPTION HERE
+  </tool_output_pr_description>
 </tool_output>
 
 Below is an **example** of the input and output:
@@ -34527,7 +34715,7 @@ diff --git a/order_service.py b/order_service.py
 - if is_valid_order(order):
 -     process_order(order)
 + validate_and_process(order)
-  </tool_input_commit_diff>
+</tool_input_commit_diff>
 </tool_input>
 
 Example Output:
@@ -34541,8 +34729,7 @@ to use the new validate_and_process method for improved maintainability.
 
 ---
 
-Use the above format whenever you receive \`<tool_input>\` that may include a branch name, an optional context, aggregated commit messages in a single tag, and a combined diff in a single tag. Provide your final output strictly in \`<tool_output>\` with \`<tool_output_pr_title>\` and \`<tool_output_pr_description>\`.
-Only highlight the changed code and avoid including the context around the changes in the description.
+Use the above format whenever you receive <tool_input> that may include a branch name, an optional context, aggregated commit messages in a single tag, and a combined diff in a single tag. Provide your final output strictly in <tool_output> with <tool_output_pr_title> and <tool_output_pr_description>. Only highlight the changed code and avoid including the context around the changes in the description.
 `;
 var generateGithubPullRequestDetails_default = {
   name: "generateGithubPullRequestDetails",
@@ -41257,6 +41444,9 @@ async function configPrompt(existingConfig) {
     case "deepseek" /* DeepSeek */:
       model = deepSeekDefaultModelId;
       break;
+    case "openrouter" /* OpenRouter */:
+      model = await esm_default3({ message: "Enter Model ID (Visit https://openrouter.ai/models for available models):" });
+      break;
   }
   let apiKey;
   if (provider2 !== "ollama" /* Ollama */) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "license": "AGPL-3.0",
   "type": "module",
   "bin": {