codeep 1.0.22 → 1.0.24

package/dist/config/index.js

@@ -68,14 +68,14 @@ export const config = new Conf({
         agentMaxFixAttempts: 3,
         agentMaxIterations: 100,
         agentMaxDuration: 20, // minutes
-        agentApiTimeout: 90000, // 90 seconds base timeout for agent (dynamically adjusted)
+        agentApiTimeout: 120000, // 120 seconds base timeout for agent (dynamically adjusted)
         protocol: 'openai',
         plan: 'lite',
         language: 'en',
         autoSave: true,
         currentSessionId: '',
         temperature: 0.7,
-        maxTokens: 4096,
+        maxTokens: 8192,
         apiTimeout: 60000,
         rateLimitApi: 30, // 30 requests per minute
         rateLimitCommands: 100, // 100 commands per minute

package/dist/utils/agent.js

@@ -15,46 +15,19 @@ class TimeoutError extends Error {
  * Complex tasks (creating pages, multiple files) need more time
  */
 function calculateDynamicTimeout(prompt, iteration, baseTimeout) {
-    const promptLower = prompt.toLowerCase();
-    // Keywords that indicate complex tasks requiring more time
-    const complexKeywords = [
-        'create', 'build', 'implement', 'generate', 'make', 'develop', 'setup',
-        'website', 'app', 'application', 'page', 'component', 'feature',
-        'kreiraj', 'napravi', 'izgradi', 'generiraj', 'razvij', 'stranica', 'aplikacija'
-    ];
-    // Keywords indicating very large tasks
-    const veryComplexKeywords = [
-        'full', 'complete', 'entire', 'whole', 'multiple', 'all',
-        'cijeli', 'kompletni', 'sve', 'višestruki'
-    ];
+    // Simple approach: just use base timeout with small multiplier for later iterations
+    // Complex calculations were causing more problems than they solved
     let multiplier = 1.0;
-    // Check for complex keywords
-    const hasComplexKeyword = complexKeywords.some(kw => promptLower.includes(kw));
-    if (hasComplexKeyword) {
-        multiplier = 2.0; // Double timeout for complex tasks
+    // Later iterations have larger context, may need slightly more time
+    if (iteration > 3) {
+        multiplier = 1.2;
     }
-    // Check for very complex keywords
-    const hasVeryComplexKeyword = veryComplexKeywords.some(kw => promptLower.includes(kw));
-    if (hasVeryComplexKeyword) {
-        multiplier = 3.0; // Triple timeout for very complex tasks
+    if (iteration > 8) {
+        multiplier = 1.5;
     }
-    // Long prompts usually mean complex tasks
-    if (prompt.length > 200) {
-        multiplier = Math.max(multiplier, 2.0);
-    }
-    if (prompt.length > 500) {
-        multiplier = Math.max(multiplier, 3.0);
-    }
-    // Later iterations might need more time (context is larger)
-    if (iteration > 5) {
-        multiplier *= 1.2;
-    }
-    if (iteration > 10) {
-        multiplier *= 1.3;
-    }
-    // Minimum 60 seconds, maximum 5 minutes for a single API call
+    // Minimum 120 seconds, maximum 5 minutes for a single API call
     const calculatedTimeout = baseTimeout * multiplier;
-    return Math.min(Math.max(calculatedTimeout, 60000), 300000);
+    return Math.min(Math.max(calculatedTimeout, 120000), 300000);
 }
 import { parseToolCalls, executeTool, createActionLog, formatToolDefinitions, getOpenAITools, getAnthropicTools, parseOpenAIToolCalls, parseAnthropicToolCalls } from './tools.js';
 import { config, getApiKey } from '../config/index.js';
@@ -62,7 +35,7 @@ import { getProviderBaseUrl, getProviderAuthHeader, supportsNativeTools } from '
 import { startSession, endSession, undoLastAction, undoAllActions, getCurrentSession, getRecentSessions, formatSession } from './history.js';
 import { runAllVerifications, formatErrorsForAgent, hasVerificationErrors, getVerificationSummary } from './verify.js';
 import { gatherSmartContext, formatSmartContext, extractTargetFile } from './smartContext.js';
-import { planTasks, getNextTask, formatTaskPlan } from './taskPlanner.js';
+import { planTasks, formatTaskPlan } from './taskPlanner.js';
 const DEFAULT_OPTIONS = {
     maxIterations: 100, // Increased for large tasks
     maxDuration: 20 * 60 * 1000, // 20 minutes
@@ -261,10 +234,27 @@ async function agentChat(messages, systemPrompt, onChunk, abortSignal, dynamicTi
             throw new Error(`API error: ${response.status} - ${errorText}`);
         }
         const data = await response.json();
+        // Debug: log raw API response
+        console.error(`[DEBUG] Raw API response:`, JSON.stringify(data, null, 2).substring(0, 1000));
         if (protocol === 'openai') {
             const message = data.choices?.[0]?.message;
             const content = message?.content || '';
-            const toolCalls = parseOpenAIToolCalls(message?.tool_calls || []);
+            const rawToolCalls = message?.tool_calls || [];
+            // Debug: log raw tool calls from API
+            console.error(`[DEBUG] Raw tool_calls from API:`, JSON.stringify(rawToolCalls, null, 2));
+            const toolCalls = parseOpenAIToolCalls(rawToolCalls);
+            // Debug: log parsed tool calls
+            console.error(`[DEBUG] Parsed tool calls:`, JSON.stringify(toolCalls, null, 2));
+            // If no native tool calls, try parsing from content (some models return text-based)
+            if (toolCalls.length === 0 && content) {
+                console.error(`[DEBUG] No native tool calls, checking content for text-based calls...`);
+                console.error(`[DEBUG] Content preview:`, content.substring(0, 500));
+                const textToolCalls = parseToolCalls(content);
+                if (textToolCalls.length > 0) {
+                    console.error(`[DEBUG] Found ${textToolCalls.length} text-based tool calls`);
+                    return { content, toolCalls: textToolCalls, usedNativeTools: false };
+                }
+            }
             if (onChunk && content) {
                 onChunk(content);
             }
@@ -636,83 +626,13 @@ export async function runAgent(prompt, projectContext, options = {}) {
                     toolCalls = textToolCalls;
                 }
             }
-            // If no tool calls, check if agent is really done
+            // If no tool calls, agent is done - simple and clean like Claude Code/Aider
             if (toolCalls.length === 0) {
-                console.error(`[DEBUG] No tool calls at iteration ${iteration}, content length: ${content.length}, actions so far: ${actions.length}`);
-                console.error(`[DEBUG] Response preview:`, content.substring(0, 200));
+                console.error(`[DEBUG] No tool calls at iteration ${iteration}, agent finished`);
                 // Remove <think>...</think> tags from response (some models include thinking)
                 finalResponse = content.replace(/<think>[\s\S]*?<\/think>/gi, '').trim();
-                // CRITICAL: Don't stop prematurely if we haven't done much work yet
-                // Check if prompt contains "create", "build", "make", "implement", "add" etc.
-                const taskKeywords = ['create', 'build', 'make', 'implement', 'add', 'generate', 'write', 'setup', 'develop', 'kreiraj', 'napravi', 'dodaj', 'website', 'app', 'feature'];
-                const promptLowerCase = prompt.toLowerCase();
-                const isCreationTask = taskKeywords.some(kw => promptLowerCase.includes(kw));
-                // Only count actual FILE writes, not directories
-                const hasCreatedFiles = actions.some(a => a.type === 'write');
-                const writeFileCount = actions.filter(a => a.type === 'write').length;
-                const hasMkdir = actions.some(a => a.type === 'mkdir');
-                const isVeryEarlyIteration = iteration <= 5; // Extended to 5 iterations
-                console.error(`[DEBUG] Task check: isCreationTask=${isCreationTask}, hasCreatedFiles=${hasCreatedFiles}, writeFileCount=${writeFileCount}, hasMkdir=${hasMkdir}, iteration=${iteration}`);
-                console.error(`[DEBUG] Actions breakdown:`, actions.map(a => `${a.type}:${a.target}`).join(', '));
-                // STRICT RULE: If it's a creation task, agent MUST create FILES (not just directories)
-                // Creating a directory is not enough - we need actual file content
-                if (isCreationTask && !hasCreatedFiles && iteration <= 10) {
-                    console.error(`[DEBUG] BLOCKING early stop - creation task detected but NO files created yet (iteration ${iteration}, ${actions.length} actions)`);
-                    // Force agent to create files
-                    messages.push({ role: 'assistant', content: finalResponse });
-                    messages.push({
-                        role: 'user',
-                        content: `❌ STOP. You have NOT created any files yet!\n\nYou MUST use write_file and create_directory tools to create the actual files I asked for.\n\nDo NOT respond with explanations. Execute the tools NOW:\n1. Use create_directory if needed\n2. Use write_file to create EACH file\n3. Only after creating ALL files, respond with a summary.`
-                    });
-                    finalResponse = ''; // Reset
-                    continue;
-                }
-                // If creation task but not enough files created, keep pushing
-                if (isCreationTask && writeFileCount < 2 && iteration <= 10) {
-                    console.error(`[DEBUG] BLOCKING early stop - only ${writeFileCount} files created, need more (iteration ${iteration})`);
-                    messages.push({ role: 'assistant', content: finalResponse });
-                    messages.push({
-                        role: 'user',
-                        content: `You've only created ${writeFileCount} file(s). The task requires creating multiple files. Continue creating the remaining files now.`
-                    });
-                    finalResponse = ''; // Reset
-                    continue;
-                }
-                // General safety: very few actions in early iterations
-                if (isVeryEarlyIteration && actions.length < 2) {
-                    console.error(`[DEBUG] BLOCKING early stop - very few actions (iteration ${iteration}, only ${actions.length} actions)`);
-                    messages.push({ role: 'assistant', content: finalResponse });
-                    messages.push({
-                        role: 'user',
-                        content: `Continue working on the task. Use the available tools to complete what I asked for.`
-                    });
-                    finalResponse = ''; // Reset
-                    continue;
-                }
-                // Check if we're using task planning and there are more tasks
-                if (taskPlan && taskPlan.tasks.some(t => t.status === 'pending')) {
-                    const nextTask = getNextTask(taskPlan.tasks);
-                    if (nextTask) {
-                        // Mark previous task as completed
-                        const prevTask = taskPlan.tasks.find(t => t.status === 'in_progress' && t.id !== nextTask.id);
-                        if (prevTask) {
-                            prevTask.status = 'completed';
-                        }
-                        // Move to next task
-                        nextTask.status = 'in_progress';
-                        opts.onTaskUpdate?.(nextTask);
-                        // Build progress summary
-                        const completedTasks = taskPlan.tasks.filter(t => t.status === 'completed');
-                        const progressSummary = completedTasks.map(t => `✓ ${t.id}. ${t.description}`).join('\n');
-                        messages.push({ role: 'assistant', content: finalResponse });
-                        messages.push({
-                            role: 'user',
-                            content: `Good! Task ${prevTask?.id} done.\n\nCompleted:\n${progressSummary}\n\nNEXT TASK (do it now):\n${nextTask.id}. ${nextTask.description}\n\nUse your tools immediately to complete this task. Do NOT ask for permission or confirmation.`
-                        });
-                        finalResponse = ''; // Reset for next task
-                        continue;
-                    }
-                }
+                // Trust the model - if it says it's done, it's done
+                // No forcing, no blocking, no artificial requirements
                 break;
             }
             // Add assistant response to history

package/dist/utils/tools.js

@@ -459,7 +459,9 @@ function validatePath(path, projectRoot) {
  * Execute a tool call
  */
 export function executeTool(toolCall, projectRoot) {
-    const { tool, parameters } = toolCall;
+    // Normalize tool name to handle case variations (WRITE_FILE -> write_file)
+    const tool = normalizeToolName(toolCall.tool);
+    const parameters = toolCall.parameters;
     try {
         switch (tool) {
             case 'read_file': {
@@ -732,6 +734,8 @@ function listDirectory(dir, projectRoot, recursive, prefix = '') {
  * Create action log from tool result
  */
 export function createActionLog(toolCall, result) {
+    // Normalize tool name to handle case variations
+    const normalizedTool = normalizeToolName(toolCall.tool);
     const typeMap = {
         read_file: 'read',
         write_file: 'write',
@@ -749,7 +753,7 @@ export function createActionLog(toolCall, result) {
         toolCall.parameters.url ||
         'unknown';
     return {
-        type: typeMap[toolCall.tool] || 'command',
+        type: typeMap[normalizedTool] || 'command',
         target,
         result: result.success ? 'success' : 'error',
         details: result.success ? result.output.slice(0, 200) : result.error,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeep",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "AI-powered coding assistant built for the terminal. Multiple LLM providers, project-aware context, and a seamless development workflow.",
   "type": "module",
   "main": "dist/index.js",