@qelos/aidev 0.7.3 → 0.7.5

package/dist/commands/run.js

@@ -45,6 +45,7 @@ exports.formatSubtaskId = formatSubtaskId;
 exports.subtaskDepth = subtaskDepth;
 exports.formatSubtaskList = formatSubtaskList;
 exports.runCommand = runCommand;
+exports.isAidevComment = isAidevComment;
 exports.hasHumanReply = hasHumanReply;
 exports.hasTriggerWord = hasTriggerWord;
 exports.checkNeedsClarification = checkNeedsClarification;
@@ -59,6 +60,7 @@ exports.buildNonCodePrompt = buildNonCodePrompt;
 exports.buildNonCodeCompletionComment = buildNonCodeCompletionComment;
 exports.hasAidevComment = hasAidevComment;
 exports.filterAutomatedComments = filterAutomatedComments;
+exports.hasHumanComment = hasHumanComment;
 exports.parseReplyDirectives = parseReplyDirectives;
 exports.buildReviewPrompt = buildReviewPrompt;
 exports.buildReviewCompletionComment = buildReviewCompletionComment;
@@ -309,14 +311,14 @@ async function processTask(task, filter, config, provider, runners, screenAvaila
         const comments = await provider.getComments(task.id);
         const trigger = hasTriggerWord(comments, config.triggerWord);
         if (isPending) {
-            const reply = hasHumanReply(comments, config.commentPrefix);
-            if (!reply && !trigger) {
-                logger_1.logger.info(`[${task.id}] "${task.name}" skipped — pending task has no human reply or trigger word ("${config.triggerWord}")`);
+            const hasHumanFollowUp = hasHumanComment(comments, config.commentPrefix);
+            if (!hasHumanFollowUp && !trigger) {
+                logger_1.logger.info(`[${task.id}] "${task.name}" skipped — pending task has no human comment or trigger word ("${config.triggerWord}")`);
                 return 'skipped';
             }
             logger_1.logger.info(trigger
                 ? `Trigger word "${config.triggerWord}" found — re-processing pending task`
-                : 'Pending task has a human reply — proceeding');
+                : 'Pending task has a human comment — proceeding');
         }
         else {
             if (!trigger) {
@@ -351,11 +353,33 @@ async function processTask(task, filter, config, provider, runners, screenAvaila
     }
     return 'processed';
 }
+function isAidevComment(text, commentPrefix = '[aidev]') {
+    return text.trimStart().startsWith(commentPrefix);
+}
+/**
+ * True when someone other than aidev spoke after an aidev message: there is a non-aidev
+ * comment that has at least one earlier [aidev]-prefixed comment in the thread.
+ * Ignores trailing aidev-only noise after the human (e.g. another bot post or sync).
+ */
 function hasHumanReply(comments, commentPrefix = '[aidev]') {
-    if (comments.length < 2)
+    if (comments.length === 0)
+        return false;
+    let lastNonAidevIndex = -1;
+    for (let i = comments.length - 1; i >= 0; i--) {
+        if (!isAidevComment(comments[i].text, commentPrefix)) {
+            lastNonAidevIndex = i;
+            break;
+        }
+    }
+    if (lastNonAidevIndex === -1) {
         return false;
-    const lastComment = comments[comments.length - 1];
-    return !lastComment.text.includes(commentPrefix);
+    }
+    for (let j = lastNonAidevIndex - 1; j >= 0; j--) {
+        if (isAidevComment(comments[j].text, commentPrefix)) {
+            return true;
+        }
+    }
+    return false;
 }
 /**
  * Returns true if the last comment contains the trigger word.
@@ -403,16 +427,16 @@ async function checkNeedsClarification(task, config, provider, runners) {
         logger_1.logger.warn('No AI runner available — skipping clarification check');
         return null;
     }
-    const clarificationPrompt = `You are a senior software developer reviewing a task.
-Determine if the following task has enough information to implement without further clarification.
-
-Task name: ${task.name}
-Task description: ${task.description || '(no description)'}
-
-Respond with valid JSON only:
-{
-  "clear": true|false,
-  "question": "question to ask if not clear, or null"
+    const clarificationPrompt = `You are a senior software developer reviewing a task.
+Determine if the following task has enough information to implement without further clarification.
+
+Task name: ${task.name}
+Task description: ${task.description || '(no description)'}
+
+Respond with valid JSON only:
+{
+  "clear": true|false,
+  "question": "question to ask if not clear, or null"
 }`;
     for (const runner of availableRunners) {
         const result = await runner.run(clarificationPrompt);
@@ -440,30 +464,30 @@ Respond with valid JSON only:
     return null;
 }
 function buildConflictResolutionPrompt(task, conflictFiles, context) {
-    return `You are resolving merge conflicts in a software development task branch.
-
-The task branch has fallen behind the base branch and has merge conflicts that need to be resolved.
-
-## Task context (DO NOT break this — the task must still work after conflict resolution)
-
-Task: ${task.name}
-
-Description:
-${task.description || '(no description provided)'}
-${context}
-
-## Merge conflicts
-
-The following files have merge conflicts with conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...):
-${conflictFiles.map((f) => `- ${f}`).join('\n')}
-
-## Instructions
-
-1. Open each conflicting file and resolve the conflict markers
-2. Keep BOTH the task's changes AND the base branch updates where possible
-3. If the base branch changed something the task also changed, prefer the task's intent but make sure it works with the new base branch code
-4. Remove all conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...)
-5. Make sure the code compiles and is consistent after resolution
+    return `You are resolving merge conflicts in a software development task branch.
+
+The task branch has fallen behind the base branch and has merge conflicts that need to be resolved.
+
+## Task context (DO NOT break this — the task must still work after conflict resolution)
+
+Task: ${task.name}
+
+Description:
+${task.description || '(no description provided)'}
+${context}
+
+## Merge conflicts
+
+The following files have merge conflicts with conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...):
+${conflictFiles.map((f) => `- ${f}`).join('\n')}
+
+## Instructions
+
+1. Open each conflicting file and resolve the conflict markers
+2. Keep BOTH the task's changes AND the base branch updates where possible
+3. If the base branch changed something the task also changed, prefer the task's intent but make sure it works with the new base branch code
+4. Remove all conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...)
+5. Make sure the code compiles and is consistent after resolution
 6. Do NOT make any changes beyond what is needed to resolve the conflicts`;
 }
 async function resolveConflictsWithAI(task, config, provider, runners, context, hooks, vm, branchName) {
@@ -731,14 +755,14 @@ async function implementTask(task, branchName, branchExists, config, provider, r
     logger_1.logger.success(`Task implemented: branch ${branchName} pushed`);
 }
 function buildImplementPrompt(task, context) {
-    return `You are implementing a software development task. Make the necessary code changes to complete the task described below.
-
-Task: ${task.name}
-
-Description:
-${task.description || '(no description provided)'}
-${context}
-
+    return `You are implementing a software development task. Make the necessary code changes to complete the task described below.
+
+Task: ${task.name}
+
+Description:
+${task.description || '(no description provided)'}
+${context}
+
 Please implement the required changes. Focus on correctness and follow the existing code style in the project.`;
 }
 async function analyzeAndPlan(task, context, runners) {
@@ -747,28 +771,28 @@ async function analyzeAndPlan(task, context, runners) {
         logger_1.logger.error('No AI runner available for task analysis');
         return null;
     }
-    const analysisPrompt = `You are a senior software architect breaking down a development task into smaller, sequential implementation steps.
-
-Task name: ${task.name}
-
-Description:
-${task.description || '(no description provided)'}
-${context}
-
-Analyze this task and break it into smaller, independently implementable sub-tasks that should be executed sequentially. Each sub-task should be a coherent unit of work that can be committed separately.
-
-Respond with valid JSON only — no markdown fences, no extra text:
-{
-  "instructions": "Detailed implementation instructions in markdown covering the full task — architecture decisions, key files to modify, edge cases to handle, testing approach",
-  "subtasks": [
-    {
-      "id": 1,
-      "title": "Short title for the sub-task",
-      "description": "Detailed description of what to implement in this step, including specific files and functions to change"
-    }
-  ]
-}
-
+    const analysisPrompt = `You are a senior software architect breaking down a development task into smaller, sequential implementation steps.
+
+Task name: ${task.name}
+
+Description:
+${task.description || '(no description provided)'}
+${context}
+
+Analyze this task and break it into smaller, independently implementable sub-tasks that should be executed sequentially. Each sub-task should be a coherent unit of work that can be committed separately.
+
+Respond with valid JSON only — no markdown fences, no extra text:
+{
+  "instructions": "Detailed implementation instructions in markdown covering the full task — architecture decisions, key files to modify, edge cases to handle, testing approach",
+  "subtasks": [
+    {
+      "id": 1,
+      "title": "Short title for the sub-task",
+      "description": "Detailed description of what to implement in this step, including specific files and functions to change"
+    }
+  ]
+}
+
 Keep sub-tasks focused: 2-6 sub-tasks is ideal. Order them by dependency (foundation first).`;
     logger_1.logger.info('Analyzing task and creating implementation plan...');
     const result = await runner.run(analysisPrompt);
@@ -820,31 +844,31 @@ async function splitFailedSubtask(parentTask, plan, failedSubtask, runners) {
     const diagnostics = failedSubtask.lastError && failedSubtask.lastError !== '__git__'
         ? failedSubtask.lastError
         : '(no diagnostics captured)';
-    const splitPrompt = `You are a senior software architect helping recover a stalled implementation step by splitting it into exactly two smaller, sequential sub-tasks.
-
-Overall task: ${parentTask.name}
-${parentTask.description ? `\nTask description:\n${parentTask.description}\n` : ''}
-## Surrounding plan
-${siblings || '(no sibling sub-tasks)'}
-
-## Failed sub-task
-ID: ${formatSubtaskId(failedSubtask.id)}
-Title: ${failedSubtask.title}
-Description: ${failedSubtask.description}
-
-## Previous failure diagnostics
-${diagnostics}
-
-Split the failed sub-task above into exactly two smaller, independently implementable sub-tasks that together achieve the original goal. Each new sub-task should be a coherent unit of work that can be committed separately, ordered by dependency (foundation first). Take the diagnostics into account so the split actually addresses what broke.
-
-Respond with valid JSON only — no markdown fences, no extra text:
-{
-  "subtasks": [
-    { "title": "Short title for the first new sub-task", "description": "Detailed description of what to implement in this step" },
-    { "title": "Short title for the second new sub-task", "description": "Detailed description of what to implement in this step" }
-  ]
-}
-
+    const splitPrompt = `You are a senior software architect helping recover a stalled implementation step by splitting it into exactly two smaller, sequential sub-tasks.
+
+Overall task: ${parentTask.name}
+${parentTask.description ? `\nTask description:\n${parentTask.description}\n` : ''}
+## Surrounding plan
+${siblings || '(no sibling sub-tasks)'}
+
+## Failed sub-task
+ID: ${formatSubtaskId(failedSubtask.id)}
+Title: ${failedSubtask.title}
+Description: ${failedSubtask.description}
+
+## Previous failure diagnostics
+${diagnostics}
+
+Split the failed sub-task above into exactly two smaller, independently implementable sub-tasks that together achieve the original goal. Each new sub-task should be a coherent unit of work that can be committed separately, ordered by dependency (foundation first). Take the diagnostics into account so the split actually addresses what broke.
+
+Respond with valid JSON only — no markdown fences, no extra text:
+{
+  "subtasks": [
+    { "title": "Short title for the first new sub-task", "description": "Detailed description of what to implement in this step" },
+    { "title": "Short title for the second new sub-task", "description": "Detailed description of what to implement in this step" }
+  ]
+}
+
 Exactly two entries — no more, no fewer.`;
     logger_1.logger.info(`Splitting failed sub-task ${formatSubtaskId(failedSubtask.id)} into two smaller steps...`);
     const result = await runner.run(splitPrompt);
@@ -899,20 +923,20 @@ async function executeSubTask(subtask, task, plan, config, runners, reviewContex
     const retrySection = previousError && previousError !== '__git__'
         ? `\n## Previous attempt failure diagnostics\nThis step failed on a previous attempt. Diagnostics below — please take them into account and avoid repeating the same failure.\n\n${previousError}\n`
         : '';
-    const prompt = `You are implementing step ${subtask.id} of a multi-step task.
-
-Overall task: ${task.name}
-${task.description ? `\nTask description:\n${task.description}` : ''}
-
-## Full implementation instructions
-${instructions}
-${reviewContext || ''}${retrySection}
-## Progress
-${completedSteps || '(no steps completed yet)'}
-
-## Current step: ${subtask.id}. ${subtask.title}
-${subtask.description}
-
+    const prompt = `You are implementing step ${subtask.id} of a multi-step task.
+
+Overall task: ${task.name}
+${task.description ? `\nTask description:\n${task.description}` : ''}
+
+## Full implementation instructions
+${instructions}
+${reviewContext || ''}${retrySection}
+## Progress
+${completedSteps || '(no steps completed yet)'}
+
+## Current step: ${subtask.id}. ${subtask.title}
+${subtask.description}
+
 Implement ONLY this step. Focus on correctness and follow the existing code style.`;
     let implemented = false;
     let previousNotes = '';
@@ -1199,29 +1223,29 @@ function buildCompletionComment(branch, prUrl, config) {
 function buildNonCodePrompt(task, context) {
     const hasComments = context.trim().length > 0;
     if (hasComments) {
-        return `Task: ${task.name}
-
-Original description:
-${task.description || '(no description provided)'}
-${context}
-
-⚠️ CRITICAL: This is a FOLLOW-UP request. The conversation above contains new comments from the user.
-YOUR PRIMARY TASK is to address the LATEST comment at the bottom of the conversation - this is the user's current request.
-The latest comment may:
-- Ask for something completely different from the original task
-- Request modifications to what was already done
-- Add new requirements
-
-DO NOT repeat what was already done. DO NOT re-execute the original task unless explicitly asked.
-Focus ENTIRELY on addressing the latest comment as your main instruction.
-
+        return `Task: ${task.name}
+
+Original description:
+${task.description || '(no description provided)'}
+${context}
+
+⚠️ CRITICAL: This is a FOLLOW-UP request. The conversation above contains new comments from the user.
+YOUR PRIMARY TASK is to address the LATEST comment at the bottom of the conversation - this is the user's current request.
+The latest comment may:
+- Ask for something completely different from the original task
+- Request modifications to what was already done
+- Add new requirements
+
+DO NOT repeat what was already done. DO NOT re-execute the original task unless explicitly asked.
+Focus ENTIRELY on addressing the latest comment as your main instruction.
+
 Please provide a clear, detailed response to the LATEST comment. Your response will be posted as a comment on the task ticket, so write it as a direct answer or explanation addressed to the person who wrote the latest comment.`;
     }
-    return `Task: ${task.name}
-
-Description:
-${task.description || '(no description provided)'}
-
+    return `Task: ${task.name}
+
+Description:
+${task.description || '(no description provided)'}
+
 Please provide a clear, detailed response to this task. Your response will be posted as a comment on the task ticket, so write it as a direct answer or explanation addressed to the person who created the task.`;
 }
 function buildNonCodeCompletionComment(config, agentResponse) {
@@ -1252,10 +1276,13 @@ function buildNonCodeCompletionComment(config, agentResponse) {
     return lines.join('\n');
 }
 function hasAidevComment(comments, commentPrefix = '[aidev]') {
-    return comments.some((c) => c.text.includes(commentPrefix));
+    return comments.some((c) => isAidevComment(c.text, commentPrefix));
 }
 function filterAutomatedComments(comments, commentPrefix = '[aidev]') {
-    return comments.filter((c) => !c.text.includes(commentPrefix));
+    return comments.filter((c) => !isAidevComment(c.text, commentPrefix));
+}
+function hasHumanComment(comments, commentPrefix = '[aidev]') {
+    return comments.some((c) => !isAidevComment(c.text, commentPrefix));
 }
 async function buildConversationContext(taskId, comments, config, runners) {
     const humanComments = filterAutomatedComments(comments, config.commentPrefix);
@@ -1288,14 +1315,14 @@ async function processNonCodeTask(task, filter, config, provider, runners, scree
         const trigger = hasTriggerWord(comments, config.triggerWord);
         const hasHumanFollowUp = hasHumanReply(comments, config.commentPrefix);
         if (isPending) {
-            const reply = hasHumanReply(comments, config.commentPrefix);
-            if (!reply && !trigger) {
-                logger_1.logger.info(`[${task.id}] "${task.name}" skipped — pending with no human reply or trigger word ("${config.triggerWord}")`);
+            const hasHumanCommentForPending = hasHumanComment(comments, config.commentPrefix);
+            if (!hasHumanCommentForPending && !trigger) {
+                logger_1.logger.info(`[${task.id}] "${task.name}" skipped — pending with no human comment or trigger word ("${config.triggerWord}")`);
                 return 'skipped';
             }
             logger_1.logger.info(trigger
                 ? `Trigger word "${config.triggerWord}" found — re-processing non-code task`
-                : 'Pending non-code task has a human reply — proceeding');
+                : 'Pending non-code task has a human comment — proceeding');
         }
         else {
             // For already processed tasks, check if there's a human follow-up or trigger word
@@ -1531,22 +1558,22 @@ async function implementReviewTask(task, branchName, config, provider, runners,
     logger_1.logger.success(`Review comments addressed for: ${task.name}`);
 }
 function buildReviewPrompt(task, threads) {
-    let prompt = `You are addressing code review comments on a pull request for a software development task.
-
-Task: ${task.name}
-
-Description:
-${task.description || '(no description provided)'}
-
-## Unresolved Code Review Threads
-
-The following review threads need to be addressed. For each thread, either:
-- Fix the code as requested (make the changes directly in the files)
-- Or, if it's a discussion/question that doesn't require code changes, output a REPLY block:
-  <!-- AIDEV-REPLY thread_id -->Your reply here<!-- /AIDEV-REPLY -->
-
-Replace "thread_id" with the actual thread ID shown below.
-
+    let prompt = `You are addressing code review comments on a pull request for a software development task.
+
+Task: ${task.name}
+
+Description:
+${task.description || '(no description provided)'}
+
+## Unresolved Code Review Threads
+
+The following review threads need to be addressed. For each thread, either:
+- Fix the code as requested (make the changes directly in the files)
+- Or, if it's a discussion/question that doesn't require code changes, output a REPLY block:
+  <!-- AIDEV-REPLY thread_id -->Your reply here<!-- /AIDEV-REPLY -->
+
+Replace "thread_id" with the actual thread ID shown below.
+
 `;
     for (const thread of threads) {
         const location = thread.line
@@ -1558,12 +1585,12 @@ Replace "thread_id" with the actual thread ID shown below.
         }
         prompt += '\n';
     }
-    prompt += `## Instructions
-
-1. Read each review thread carefully
-2. For code change requests: make the fix directly in the relevant file(s)
-3. For questions or discussions: output a REPLY block with a clear, helpful response
-4. You may handle multiple threads — some with code fixes, others with replies
+    prompt += `## Instructions
+
+1. Read each review thread carefully
+2. For code change requests: make the fix directly in the relevant file(s)
+3. For questions or discussions: output a REPLY block with a clear, helpful response
+4. You may handle multiple threads — some with code fixes, others with replies
 5. Focus on correctness and follow the existing code style`;
     return prompt;
 }