@polka-codes/cli 0.9.57 → 0.9.59

package/dist/index.js

@@ -35579,7 +35579,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.9.57";
+var version = "0.9.59";
 
 // src/commands/code.ts
 import { readFile as readFile3 } from "node:fs/promises";
@@ -78530,7 +78530,9 @@ async function generateText(input2, context) {
   const messages = applyCacheControl(input2.messages.map(fromJsonModelMessage), model.provider, model.modelId);
   for (let i = 0;i < retryCount; i++) {
     const abortController = new AbortController;
-    const timeout = setTimeout(() => abortController.abort(), requestTimeoutSeconds * 1000);
+    let timeout = setTimeout(() => abortController.abort(), requestTimeoutSeconds * 1000);
+    const lastOutputs = [];
+    let repetitionDetected = false;
     const usageMeterOnFinishHandler = context.parameters.usageMeter.onFinishHandler(model);
     try {
       const stream = streamText({
@@ -78539,8 +78541,24 @@ async function generateText(input2, context) {
         messages,
         tools: input2.tools,
         async onChunk({ chunk }) {
+          clearTimeout(timeout);
+          timeout = setTimeout(() => abortController.abort(), requestTimeoutSeconds * 1000);
           switch (chunk.type) {
             case "text-delta":
+              lastOutputs.push(chunk.text);
+              if (lastOutputs.length > 20) {
+                lastOutputs.shift();
+              }
+              if (lastOutputs.length === 20) {
+                const firstHalf = lastOutputs.slice(0, 10).join("");
+                const secondHalf = lastOutputs.slice(10).join("");
+                if (firstHalf === secondHalf) {
+                  if (firstHalf.length > 20) {
+                    repetitionDetected = true;
+                    abortController.abort();
+                  }
+                }
+              }
               agentCallback?.({
                 kind: "Text" /* Text */,
                 newText: chunk.text
@@ -78569,6 +78587,11 @@ async function generateText(input2, context) {
       return resp.messages;
     } catch (error46) {
       if (error46.name === "AbortError") {
+        if (repetitionDetected) {
+          console.warn("Repetition detected, retrying...");
+          continue;
+        }
+        console.warn(`Request timed out after ${requestTimeoutSeconds} seconds, retrying...`);
         continue;
       }
       if ("response" in error46) {
@@ -79656,47 +79679,35 @@ ${createJsonResponseInstruction({
 }
 \`\`\`
 `;
-function formatReviewToolInput(params) {
-  const parts = [];
-  if (params.pullRequestTitle) {
-    parts.push(`<pr_title>
-${params.pullRequestTitle}
-</pr_title>`);
-  }
-  if (params.pullRequestDescription) {
-    parts.push(`<pr_description>
-${params.pullRequestDescription}
-</pr_description>`);
-  }
-  if (params.commitMessages) {
-    parts.push(`<commit_messages>
-${params.commitMessages}
-</commit_messages>`);
-  }
-  if (params.context) {
-    parts.push(`<user_context>
-${params.context}
-</user_context>`);
-  }
-  if (params.changedFiles && params.changedFiles.length > 0) {
-    const fileList = params.changedFiles.map((file2) => `${file2.status}: ${file2.path}`).join(`
-`);
-    parts.push(`<file_status>
-${fileList}
-</file_status>`);
+function formatContext(tag, value) {
+  if (!value) {
+    return;
   }
-  let instructions = "";
+  return `<${tag}>
+${value}
+</${tag}>`;
+}
+function getReviewInstructions(params) {
   if (params.commitRange) {
-    instructions = `Review the pull request. Use the gitDiff tool with commit range '${params.commitRange}', contextLines: 5, and includeLineNumbers: true to inspect the actual code changes. The diff will include line number annotations to help you report accurate line numbers. File status information is already provided above.`;
-  } else if (params.staged) {
-    instructions = "Review the staged changes. Use the gitDiff tool with staged: true, contextLines: 5, and includeLineNumbers: true to inspect the actual code changes. The diff will include line number annotations to help you report accurate line numbers. File status information is already provided above.";
-  } else {
-    instructions = "Review the unstaged changes. Use the gitDiff tool with contextLines: 5, and includeLineNumbers: true to inspect the actual code changes. The diff will include line number annotations to help you report accurate line numbers. File status information is already provided above.";
+    return `Review the pull request. Use the gitDiff tool with commit range '${params.commitRange}' to inspect the actual code changes.`;
   }
-  parts.push(`<review_instructions>
-${instructions}
-</review_instructions>`);
-  return parts.join(`
+  if (params.staged) {
+    return "Review the staged changes. Use the gitDiff tool with staged: true to inspect the actual code changes.";
+  }
+  return "Review the unstaged changes. Use the gitDiff tool to inspect the actual code changes.";
+}
+function formatReviewToolInput(params) {
+  const fileList = params.changedFiles && params.changedFiles.length > 0 ? params.changedFiles.map((file2) => `${file2.status}: ${file2.path}`).join(`
+`) : undefined;
+  const parts = [
+    formatContext("pr_title", params.pullRequestTitle),
+    formatContext("pr_description", params.pullRequestDescription),
+    formatContext("commit_messages", params.commitMessages),
+    formatContext("user_context", params.context),
+    formatContext("file_status", fileList),
+    formatContext("review_instructions", getReviewInstructions(params))
+  ];
+  return parts.filter(Boolean).join(`
 `);
 }
 // src/workflows/fix.workflow.ts
@@ -80663,7 +80674,7 @@ ${defaultContext}`;
     outputSchema: EpicPlanSchema
   }, context);
 }
-async function createAndApprovePlan(task, context) {
+async function createAndApprovePlan(task, context, saveUsageSnapshot) {
   const { logger, step, tools: tools2 } = context;
   logger.info(`Phase 2: Creating high-level plan...
 `);
@@ -80693,6 +80704,7 @@ ${result.plan}`);
           if (feedback.trim() === "") {
             logger.info(`High-level plan approved.
 `);
+            await saveUsageSnapshot();
             return { plan: result.plan, branchName: result.branchName };
           }
           break;
@@ -80924,7 +80936,7 @@ async function findNextTask(tools2) {
     currentTask = subTasks[0];
   }
 }
-async function runImplementationLoop(context, highLevelPlan) {
+async function runImplementationLoop(context, highLevelPlan, saveUsageSnapshot) {
   const { logger, step, tools: tools2 } = context;
   const commitMessages = [];
   logger.info(`Phase 5: Iterative Implementation Loop...
@@ -80990,6 +81002,7 @@ Focus only on this item, but use the plan for context.`;
     }
     logger.info(`
 Progress: ${progressMessage}`);
+    await saveUsageSnapshot();
     if (!nextTaskItem) {
       logger.info(`All tasks complete!
 `);
@@ -81101,7 +81114,7 @@ Max retries (${MAX_REVIEW_RETRIES}) reached for final review. Issues might remai
 }
 var epicWorkflow = async (input2, context) => {
   const { logger, tools: tools2 } = context;
-  const { task, saveEpicContext } = input2;
+  const { task, saveEpicContext, saveUsageSnapshot } = input2;
   const workflowStartTime = Date.now();
   if (!task || task.trim() === "") {
     logger.error("Error: Task cannot be empty. Please provide a valid task description.");
@@ -81120,7 +81133,7 @@ var epicWorkflow = async (input2, context) => {
         logger.error("Error: Task is missing in epic context. Exiting.");
         return;
       }
-      const planResult = await createAndApprovePlan(input2.task, context);
+      const planResult = await createAndApprovePlan(input2.task, context, saveUsageSnapshot);
       if (!planResult)
         return;
       input2.plan = planResult.plan;
@@ -81146,8 +81159,9 @@ var epicWorkflow = async (input2, context) => {
     if (todos.length === 0) {
       await addTodoItemsFromPlan(input2.plan, context);
     }
-    const commitMessages = await runImplementationLoop(context, input2.plan);
+    const commitMessages = await runImplementationLoop(context, input2.plan, saveUsageSnapshot);
     await performFinalReviewAndFix(context, input2.plan, input2.baseBranch ?? undefined);
+    await saveUsageSnapshot();
     await tools2.executeCommand({ command: "git", args: ["rm", "-f", ".epic.yml"] });
     const statusResult = await tools2.executeCommand({
       command: "git",
@@ -81606,26 +81620,23 @@ async function runEpic(task2, _options, command) {
     }
     epicContext.task = taskInput;
   }
-  let usageAppended = false;
+  let usageMeter;
+  const saveUsageSnapshot = async () => {
+    if (usageMeter) {
+      const currentUsage = usageMeter.usage;
+      if (!epicContext.usages) {
+        epicContext.usages = [];
+      }
+      epicContext.usages.push({ ...currentUsage, timestamp: Date.now() });
+    }
+  };
   const workflowInput = {
     ...epicContext,
     async saveEpicContext(context) {
-      if (usageMeter) {
-        const currentUsage = usageMeter.usage;
-        if (!context.usages) {
-          context.usages = [];
-        }
-        if (!usageAppended) {
-          context.usages.push({ ...currentUsage, timestamp: Date.now() });
-          usageAppended = true;
-        } else {
-          context.usages[context.usages.length - 1] = { ...currentUsage, timestamp: Date.now() };
-        }
-      }
       await saveEpicContext(context);
-    }
+    },
+    saveUsageSnapshot
   };
-  let usageMeter;
   await runWorkflow(epicWorkflow, workflowInput, {
     commandName: "epic",
     command,
@@ -81698,9 +81709,22 @@ async function runMeta(task2, command) {
     }
     epicContext.task = taskInput;
   }
+  let usageMeter;
+  const saveUsageSnapshot = async () => {
+    if (usageMeter) {
+      const currentUsage = usageMeter.usage;
+      if (!epicContext.usages) {
+        epicContext.usages = [];
+      }
+      epicContext.usages.push({ ...currentUsage, timestamp: Date.now() });
+    }
+  };
   const workflowInput = {
     ...epicContext,
-    saveEpicContext
+    async saveEpicContext(context) {
+      await saveEpicContext(context);
+    },
+    saveUsageSnapshot
   };
   await runWorkflow(metaWorkflow, workflowInput, {
     commandName: "meta",
@@ -81711,7 +81735,10 @@ async function runMeta(task2, command) {
       ...opt,
       todoItemStore: new EpicTodoItemStore(workflowInput),
       memoryStore: new EpicMemoryStore(workflowInput)
-    })
+    }),
+    onUsageMeterCreated: (meter) => {
+      usageMeter = meter;
+    }
   });
 }
 

package/package.json

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