@polka-codes/cli 0.9.58 → 0.9.60

package/dist/index.js

@@ -35579,7 +35579,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.9.58";
+var version = "0.9.60";
 
 // src/commands/code.ts
 import { readFile as readFile3 } from "node:fs/promises";
@@ -48181,7 +48181,8 @@ config(en_default());
 var providerModelSchema = exports_external.object({
   provider: exports_external.string().optional(),
   model: exports_external.string().optional(),
-  parameters: exports_external.record(exports_external.string(), exports_external.any()).optional()
+  parameters: exports_external.record(exports_external.string(), exports_external.any()).optional(),
+  budget: exports_external.number().positive().optional()
 });
 var configSchema = exports_external.object({
   prices: exports_external.record(exports_external.string(), exports_external.record(exports_external.string(), exports_external.object({
@@ -48210,9 +48211,7 @@ var configSchema = exports_external.object({
     command: exports_external.string(),
     description: exports_external.string()
   }))).optional(),
-  commands: exports_external.object({
-    default: providerModelSchema.optional()
-  }).catchall(providerModelSchema).optional(),
+  commands: exports_external.record(exports_external.string(), providerModelSchema).optional(),
   rules: exports_external.array(exports_external.string()).optional().or(exports_external.string()).optional(),
   excludeFiles: exports_external.array(exports_external.string()).optional()
 }).strict();
@@ -77708,7 +77707,9 @@ class ApiProviderConfig {
     this.commands = config4.commands;
   }
   getConfigForCommand(command) {
-    const { provider: provider3, model, parameters } = this.commands?.[command] ?? this.commands?.default ?? {};
+    const commandConfig = this.commands?.[command];
+    const defaultConfig = this.commands?.default;
+    const { provider: provider3, model, parameters, budget } = { ...defaultConfig, ...commandConfig };
     const finalProvider = provider3 ?? this.defaultProvider;
     if (!finalProvider) {
       return;
@@ -77728,7 +77729,8 @@ class ApiProviderConfig {
       project,
       keyFile,
       baseUrl,
-      parameters: finalParameters
+      parameters: finalParameters,
+      budget
     };
   }
 }
@@ -77737,7 +77739,7 @@ class ApiProviderConfig {
 function addSharedOptions(command) {
   return command.option("-c --config <paths>", "Path to config file(s)", (value, prev) => prev.concat(value), []).option("--api-provider <provider>", "API provider").option("--model <model>", "Model ID").option("--api-key <key>", "API key").option("--max-messages <iterations>", "Maximum number of messages to send.", Number.parseInt).option("--budget <budget>", "Budget for the AI service.", Number.parseFloat).option("-v --verbose", "Enable verbose output. Use -v for level 1, -vv for level 2", (_value, prev) => (prev ?? 0) + 1).option("-d --base-dir <path>", "Base directory to run commands in").option("--file <path...>", "File to include in the task").option("--silent", "Enable silent mode").option("-y, --yes", "Skip interactive prompts", false);
 }
-function parseOptions(options, { cwdArg } = {}, home = os2.homedir(), env2 = getEnv()) {
+function parseOptions(options, { cwdArg, commandName } = {}, home = os2.homedir(), env2 = getEnv()) {
   let cwd = cwdArg;
   if (options.baseDir) {
     process.chdir(options.baseDir);
@@ -77773,13 +77775,18 @@ function parseOptions(options, { cwdArg } = {}, home = os2.homedir(), env2 = get
     defaultProvider,
     ...config4
   });
+  const commandConfig = commandName ? providerConfig.getConfigForCommand(commandName) : undefined;
   const verbose = options.silent ? -1 : options.verbose ?? 0;
+  const commandSpecificConfig = commandName ? config4.commands?.[commandName] : undefined;
+  const defaultCommandConfig = config4.commands?.default;
+  const mergedCommandConfig = { ...defaultCommandConfig, ...commandSpecificConfig };
   return {
     maxMessageCount: options.maxMessageCount ?? config4.maxMessageCount ?? 100,
-    budget: options.budget ?? (env2.POLKA_BUDGET ? Number.parseFloat(env2.POLKA_BUDGET) : undefined) ?? config4.budget ?? 10,
+    budget: options.budget ?? mergedCommandConfig.budget ?? (env2.POLKA_BUDGET ? Number.parseFloat(env2.POLKA_BUDGET) : undefined) ?? config4.budget ?? 10,
     verbose,
     config: config4,
     providerConfig,
+    commandConfig,
     file: options.file
   };
 }
@@ -78531,6 +78538,8 @@ async function generateText(input2, context) {
   for (let i = 0;i < retryCount; i++) {
     const abortController = new AbortController;
     let timeout = setTimeout(() => abortController.abort(), requestTimeoutSeconds * 1000);
+    const lastOutputs = [];
+    let repetitionDetected = false;
     const usageMeterOnFinishHandler = context.parameters.usageMeter.onFinishHandler(model);
     try {
       const stream = streamText({
@@ -78543,6 +78552,20 @@ async function generateText(input2, context) {
           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
@@ -78571,6 +78594,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) {
@@ -80233,7 +80261,7 @@ async function runCode(task, _options, command) {
   if (stdin) {
     taskInput = stdin;
   }
-  const { file: files } = parseOptions(command.opts());
+  const { file: files } = parseOptions(command.opts(), { commandName: "code" });
   const fileContents = [];
   if (files) {
     for (const file2 of files) {
@@ -80372,7 +80400,7 @@ ${input2.context}
 Commit message:
 ${commitMessage}`);
       await tools2.createCommit({ message: commitMessage });
-      return;
+      return commitMessage;
     }
   }
   context.logger.warn("Failed to generate commit message.", result);
@@ -80653,7 +80681,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...
 `);
@@ -80683,6 +80711,7 @@ ${result.plan}`);
           if (feedback.trim() === "") {
             logger.info(`High-level plan approved.
 `);
+            await saveUsageSnapshot();
             return { plan: result.plan, branchName: result.branchName };
           }
           break;
@@ -80820,13 +80849,14 @@ async function runPreflightChecks(epicContext, context) {
 }
 async function performReviewAndFixCycle(iterationCount, taskItem, highLevelPlan, context) {
   const { logger, step, tools: tools2 } = context;
+  const commitMessages = [];
   for (let i = 0;i < MAX_REVIEW_RETRIES; i++) {
     const diffResult = await tools2.executeCommand({ command: "git", args: ["diff", "--name-status", "HEAD~1", "HEAD"] });
     const changedFiles = parseGitDiffNameStatus(diffResult.stdout).filter(({ path }) => path !== ".epic.yml");
     if (changedFiles.length === 0) {
       logger.info(`No files were changed. Skipping review.
 `);
-      return { passed: true };
+      return { passed: true, commitMessages: [] };
     }
     logger.info(`
 Review iteration ${i + 1}/${MAX_REVIEW_RETRIES}`);
@@ -80857,7 +80887,7 @@ ${formatReviewToolInput(changeInfo)}`;
     if (!reviewResult || !reviewResult.specificReviews || reviewResult.specificReviews.length === 0) {
       logger.info(`Review passed. No issues found.
 `);
-      return { passed: true };
+      return { passed: true, commitMessages };
     }
     logger.warn(`Warning: Review found ${reviewResult.specificReviews.length} issue(s). Attempting to fix...
 `);
@@ -80888,17 +80918,22 @@ ${reviewSummary}`;
       }, context);
     });
     await step(`commit-fix-${iterationCount}-${i}`, async () => {
-      await tools2.executeCommand({ command: "git", args: ["add", "."] });
-      await tools2.executeCommand({ command: "git", args: ["commit", "--amend", "--no-edit"] });
+      const commitMessage = await commitWorkflow({
+        all: true,
+        context: reviewSummary
+      }, context);
+      if (commitMessage) {
+        commitMessages.push(commitMessage);
+      }
     });
     if (i === MAX_REVIEW_RETRIES - 1) {
       logger.error(`
 Max retries (${MAX_REVIEW_RETRIES}) reached. Moving to the next task, but issues might remain.
 `);
-      return { passed: false };
+      return { passed: false, commitMessages };
     }
   }
-  return { passed: false };
+  return { passed: false, commitMessages };
 }
 async function findNextTask(tools2) {
   const openRootTasks = await tools2.listTodoItems({ status: "open" });
@@ -80914,7 +80949,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...
@@ -80957,7 +80992,8 @@ Focus only on this item, but use the plan for context.`;
       await tools2.executeCommand({ command: "git", args: ["commit", "-m", commitMessage] });
     });
     commitMessages.push(commitMessage);
-    const { passed: reviewPassed } = await performReviewAndFixCycle(iterationCount, nextTask, highLevelPlan, context);
+    const { passed: reviewPassed, commitMessages: fixCommitMessages } = await performReviewAndFixCycle(iterationCount, nextTask, highLevelPlan, context);
+    commitMessages.push(...fixCommitMessages);
     const taskElapsed = Date.now() - taskStartTime;
     const taskElapsedTime = formatElapsedTime(taskElapsed);
     if (reviewPassed) {
@@ -80980,6 +81016,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!
 `);
@@ -81091,7 +81128,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.");
@@ -81110,7 +81147,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;
@@ -81136,8 +81173,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",
@@ -81596,26 +81634,26 @@ 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);
-    }
+      await saveEpicContext({
+        ...epicContext,
+        ...context
+      });
+    },
+    saveUsageSnapshot
   };
-  let usageMeter;
   await runWorkflow(epicWorkflow, workflowInput, {
     commandName: "epic",
     command,
@@ -81688,9 +81726,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",
@@ -81701,7 +81752,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.58",
+  "version": "0.9.60",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",