@qelos/aidev 0.2.13 → 0.3.0

package/dist/commands/run.js

@@ -219,7 +219,7 @@ 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);
+            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}")`);
                 return 'skipped';
@@ -236,18 +236,18 @@ async function processTask(task, filter, config, provider, runners, screenAvaila
             logger_1.logger.info(`Trigger word "${config.triggerWord}" found — re-processing task`);
         }
         if (!screenAvailable) {
-            await notifySleeping(task, provider);
+            await notifySleeping(task, provider, config.commentPrefix);
             return 'skipped';
         }
     }
     else {
         if (!screenAvailable) {
-            await notifySleeping(task, provider);
+            await notifySleeping(task, provider, config.commentPrefix);
             return 'skipped';
         }
         const clarification = await checkNeedsClarification(task, config, provider, runners);
         if (clarification) {
-            await provider.postComment(task.id, `[aidev] ${clarification}`);
+            await provider.postComment(task.id, `${config.commentPrefix} ${clarification}`);
             await provider.updateStatus(task.id, getPendingStatus(config));
             logger_1.logger.info(`Posted clarification question, set status to ${getPendingStatus(config)}`);
             return 'skipped';
@@ -261,11 +261,11 @@ async function processTask(task, filter, config, provider, runners, screenAvaila
     }
     return 'processed';
 }
-function hasHumanReply(comments) {
+function hasHumanReply(comments, commentPrefix = '[aidev]') {
     if (comments.length < 2)
         return false;
     const lastComment = comments[comments.length - 1];
-    return !lastComment.text.includes('[aidev]');
+    return !lastComment.text.includes(commentPrefix);
 }
 /**
  * Returns true if the last comment contains the trigger word.
@@ -282,7 +282,7 @@ function hasTriggerWord(comments, triggerWord) {
         return true;
     return false;
 }
-async function notifySleeping(task, provider) {
+async function notifySleeping(task, provider, commentPrefix) {
     try {
         const comments = await provider.getComments(task.id);
         const lastComment = comments.length > 0 ? comments[comments.length - 1] : null;
@@ -295,7 +295,7 @@ async function notifySleeping(task, provider) {
         // If we can't check comments, still attempt to post
     }
     try {
-        await provider.postComment(task.id, `[aidev] Cannot work on this task — the ${SLEEPING_MARKER} or the screen is locked. ` +
+        await provider.postComment(task.id, `${commentPrefix} Cannot work on this task — the ${SLEEPING_MARKER} or the screen is locked. ` +
             'AI agents require an active display session to operate. Please wake the machine and unlock the screen so I can continue.');
         logger_1.logger.info(`[${task.id}] Posted sleep notification`);
     }
@@ -313,16 +313,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);
@@ -350,30 +350,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, branchName) {
@@ -396,7 +396,7 @@ async function resolveConflictsWithAI(task, config, provider, runners, context,
     logger_1.logger.warn(`Branch has conflicts with ${config.githubBaseBranch} in ${check.conflictFiles.length} file(s): ` +
         check.conflictFiles.join(', '));
     try {
-        await provider.postComment(task.id, `[aidev] Branch \`${branchName}\` has merge conflicts with \`${config.githubBaseBranch}\` ` +
+        await provider.postComment(task.id, `${config.commentPrefix} Branch \`${branchName}\` has merge conflicts with \`${config.githubBaseBranch}\` ` +
             `in ${check.conflictFiles.length} file(s). Attempting automatic resolution...`);
     }
     catch { /* ignore */ }
@@ -425,7 +425,7 @@ async function resolveConflictsWithAI(task, config, provider, runners, context,
             logger_1.logger.error('All AI runners failed to resolve merge conflicts');
             git.abortMerge();
             try {
-                await provider.postComment(task.id, '[aidev] Failed to automatically resolve merge conflicts. Manual intervention needed to rebase/merge the branch.');
+                await provider.postComment(task.id, `${config.commentPrefix} Failed to automatically resolve merge conflicts. Manual intervention needed to rebase/merge the branch.`);
             }
             catch { /* ignore */ }
             return false;
@@ -440,7 +440,7 @@ async function resolveConflictsWithAI(task, config, provider, runners, context,
         }
         logger_1.logger.success('Merge conflicts resolved successfully');
         try {
-            await provider.postComment(task.id, '[aidev] Merge conflicts resolved automatically.');
+            await provider.postComment(task.id, `${config.commentPrefix} Merge conflicts resolved automatically.`);
         }
         catch { /* ignore */ }
     }
@@ -494,7 +494,7 @@ async function implementTask(task, branchName, branchExists, config, provider, r
     try {
         await provider.updateStatus(task.id, 'in progress');
         const verb = branchExists ? 'Continuing' : 'Starting';
-        await provider.postComment(task.id, `[aidev] ${verb} implementation on branch \`${branchName}\``);
+        await provider.postComment(task.id, `${config.commentPrefix} ${verb} implementation on branch \`${branchName}\``);
     }
     catch (err) {
         logger_1.logger.warn(`Could not update task status: ${err}`);
@@ -502,7 +502,7 @@ async function implementTask(task, branchName, branchExists, config, provider, r
     if (branchExists) {
         if (!git.fetchAndCheckoutBranch(config.gitRemote, branchName)) {
             logger_1.logger.error(`Failed to checkout existing branch ${branchName}`);
-            await provider.postComment(task.id, '[aidev] Failed to checkout existing branch. Manual intervention needed.');
+            await provider.postComment(task.id, `${config.commentPrefix} Failed to checkout existing branch. Manual intervention needed.`);
             return;
         }
         logger_1.logger.info(`Continuing on existing branch: ${branchName}`);
@@ -510,14 +510,14 @@ async function implementTask(task, branchName, branchExists, config, provider, r
     else {
         if (!git.createBranchFromRemote(config.gitRemote, config.githubBaseBranch, branchName)) {
             logger_1.logger.error(`Failed to create branch ${branchName} from ${config.gitRemote}/${config.githubBaseBranch}`);
-            await provider.postComment(task.id, '[aidev] Failed to prepare git branch. Manual intervention needed.');
+            await provider.postComment(task.id, `${config.commentPrefix} Failed to prepare git branch. Manual intervention needed.`);
             return;
         }
     }
     let context = '';
     try {
         const comments = await provider.getComments(task.id);
-        const humanComments = filterAutomatedComments(comments);
+        const humanComments = filterAutomatedComments(comments, config.commentPrefix);
         if (humanComments.length > 0) {
             context = '\n\nConversation context:\n' + humanComments.map((c) => `${c.author}: ${c.text}`).join('\n');
         }
@@ -555,6 +555,11 @@ async function implementTask(task, branchName, branchExists, config, provider, r
             implemented = true;
             break;
         }
+        if (result.success && !git.hasChanges() && git.hasCommitsAhead(config.gitRemote, config.githubBaseBranch)) {
+            logger_1.logger.info(`${runner.name} produced no new file changes, but branch already has commits ahead of ${config.githubBaseBranch}`);
+            implemented = true;
+            break;
+        }
         if (!result.success) {
             logger_1.logger.warn(`${runner.name} failed — trying next runner`);
             previousNotes = `Previous runner (${runner.name}) output:\n${result.output}\nErrors:\n${result.error}`;
@@ -567,20 +572,22 @@ async function implementTask(task, branchName, branchExists, config, provider, r
     if (!implemented) {
         logger_1.logger.error('All AI runners failed or produced no changes');
         const diagnostics = (0, diagnostics_1.collectAndLogDiagnostics)();
-        await provider.postComment(task.id, `[aidev] All AI runners failed. Manual implementation needed.\n\n${diagnostics}`);
+        await provider.postComment(task.id, `${config.commentPrefix} All AI runners failed. Manual implementation needed.\n\n${diagnostics}`);
         if (!branchExists) {
             git.deleteBranch(branchName);
         }
         return;
     }
-    // Commit and push
-    if (!git.addAll() || !git.commit(`[aidev] Implement: ${task.name}\n\nTask: ${task.url}`, branchName)) {
-        logger_1.logger.error('Failed to commit changes');
-        return;
-    }
-    if (!git.push(config.gitRemote, branchName)) {
-        logger_1.logger.error('Failed to push branch');
-        return;
+    // Commit and push (only if there are new changes to commit)
+    if (git.hasChanges()) {
+        if (!git.addAll() || !git.commit(`${config.commentPrefix} Implement: ${task.name}\n\nTask: ${task.url}`, branchName)) {
+            logger_1.logger.error('Failed to commit changes');
+            return;
+        }
+        if (!git.push(config.gitRemote, branchName)) {
+            logger_1.logger.error('Failed to push branch');
+            return;
+        }
     }
     if (reviewThreads.length > 0) {
         resolveHandledThreads(reviewThreads);
@@ -598,14 +605,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) {
@@ -614,28 +621,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);
@@ -682,20 +689,20 @@ async function executeSubTask(subtask, task, plan, config, runners, reviewContex
         .filter((s) => s.status === 'done')
         .map((s) => `  - [done] ${s.id}. ${s.title}`)
         .join('\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 || ''}
-## 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 || ''}
+## 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 = '';
@@ -724,7 +731,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
     try {
         await provider.updateStatus(task.id, 'in progress');
         const verb = branchExists ? 'Continuing' : 'Starting';
-        await provider.postComment(task.id, `[aidev] ${verb} implementation on branch \`${branchName}\` (thinking mode — will analyze and break into sub-tasks)`);
+        await provider.postComment(task.id, `${config.commentPrefix} ${verb} implementation on branch \`${branchName}\` (thinking mode — will analyze and break into sub-tasks)`);
     }
     catch (err) {
         logger_1.logger.warn(`Could not update task status: ${err}`);
@@ -732,7 +739,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
     if (branchExists) {
         if (!git.fetchAndCheckoutBranch(config.gitRemote, branchName)) {
             logger_1.logger.error(`Failed to checkout existing branch ${branchName}`);
-            await provider.postComment(task.id, '[aidev] Failed to checkout existing branch. Manual intervention needed.');
+            await provider.postComment(task.id, `${config.commentPrefix} Failed to checkout existing branch. Manual intervention needed.`);
             return;
         }
         logger_1.logger.info(`Continuing on existing branch: ${branchName}`);
@@ -740,14 +747,14 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
     else {
         if (!git.createBranchFromRemote(config.gitRemote, config.githubBaseBranch, branchName)) {
             logger_1.logger.error(`Failed to create branch ${branchName} from ${config.gitRemote}/${config.githubBaseBranch}`);
-            await provider.postComment(task.id, '[aidev] Failed to prepare git branch. Manual intervention needed.');
+            await provider.postComment(task.id, `${config.commentPrefix} Failed to prepare git branch. Manual intervention needed.`);
             return;
         }
     }
     let context = '';
     try {
         const comments = await provider.getComments(task.id);
-        const humanComments = filterAutomatedComments(comments);
+        const humanComments = filterAutomatedComments(comments, config.commentPrefix);
         if (humanComments.length > 0) {
             context = '\n\nConversation context:\n' + humanComments.map((c) => `${c.author}: ${c.text}`).join('\n');
         }
@@ -780,7 +787,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
         plan = await analyzeAndPlan(task, context, runners);
         if (!plan) {
             logger_1.logger.error('Failed to create implementation plan');
-            await provider.postComment(task.id, '[aidev] Failed to analyze and break down the task. Manual implementation needed.');
+            await provider.postComment(task.id, `${config.commentPrefix} Failed to analyze and break down the task. Manual implementation needed.`);
             cleanupThinkingFiles(task.id);
             if (!branchExists)
                 git.deleteBranch(branchName);
@@ -788,7 +795,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
         }
         logger_1.logger.info(`Task broken into ${plan.subtasks.length} sub-tasks`);
         try {
-            await provider.postComment(task.id, `[aidev] Task analyzed and broken into ${plan.subtasks.length} sub-tasks:\n\n${formatSubtaskList(plan)}`);
+            await provider.postComment(task.id, `${config.commentPrefix} Task analyzed and broken into ${plan.subtasks.length} sub-tasks:\n\n${formatSubtaskList(plan)}`);
         }
         catch (err) {
             logger_1.logger.warn(`Failed to post breakdown comment: ${err}`);
@@ -811,12 +818,12 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
             logger_1.logger.error(`  Step ${subtask.id} failed: ${subtask.title}`);
             const diagnostics = (0, diagnostics_1.collectAndLogDiagnostics)();
             try {
-                await provider.postComment(task.id, `[aidev] Step ${subtask.id} failed: ${subtask.title}\n\n${formatSubtaskList(plan)}\n\n${diagnostics}`);
+                await provider.postComment(task.id, `${config.commentPrefix} Step ${subtask.id} failed: ${subtask.title}\n\n${formatSubtaskList(plan)}\n\n${diagnostics}`);
             }
             catch { /* ignore */ }
             break;
         }
-        if (!git.addAll() || !git.commit(`[aidev] Step ${subtask.id}: ${subtask.title}\n\nTask: ${task.url}`, branchName)) {
+        if (!git.addAll() || !git.commit(`${config.commentPrefix} Step ${subtask.id}: ${subtask.title}\n\nTask: ${task.url}`, branchName)) {
             subtask.status = 'failed';
             writeTaskPlan(plan);
             allSucceeded = false;
@@ -834,7 +841,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
         writeTaskPlan(plan);
         logger_1.logger.success(`  Step ${subtask.id} complete: ${subtask.title}`);
         try {
-            await provider.postComment(task.id, `[aidev] Step ${subtask.id} complete: ${subtask.title}\n\n${formatSubtaskList(plan)}`);
+            await provider.postComment(task.id, `${config.commentPrefix} Step ${subtask.id} complete: ${subtask.title}\n\n${formatSubtaskList(plan)}`);
         }
         catch { /* ignore */ }
     }
@@ -843,7 +850,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
         logger_1.logger.error('Thinking task did not complete all sub-tasks');
         try {
             const diagnostics = (0, diagnostics_1.collectAndLogDiagnostics)();
-            await provider.postComment(task.id, `[aidev] Thinking task did not complete all sub-tasks. Manual intervention needed.\n\n${diagnostics}`);
+            await provider.postComment(task.id, `${config.commentPrefix} Thinking task did not complete all sub-tasks. Manual intervention needed.\n\n${diagnostics}`);
         }
         catch { /* ignore */ }
         return;
@@ -883,7 +890,7 @@ function buildPRUrl(config, branch) {
 }
 function buildCompletionComment(branch, prUrl, config) {
     const lines = [
-        `[aidev] Implementation complete!`,
+        `${config.commentPrefix} Implementation complete!`,
         ``,
         `Branch: \`${branch}\``,
     ];
@@ -894,19 +901,32 @@ function buildCompletionComment(branch, prUrl, config) {
     return lines.join('\n');
 }
 function buildNonCodePrompt(task, context) {
-    return `You are handling a non-code task. This task does NOT require code changes — it requires a thoughtful, verbal response.
-
-Task: ${task.name}
-
-Description:
-${task.description || '(no description provided)'}
-${context}
-
+    const hasComments = context.trim().length > 0;
+    if (hasComments) {
+        return `You are handling a non-code task. This task does NOT require code changes — it requires a thoughtful, verbal response.
+
+Task: ${task.name}
+
+Original description:
+${task.description || '(no description provided)'}
+${context}
+
+IMPORTANT: The conversation above contains follow-up comments. Focus on the LATEST comment as the primary request to address — it may refine, override, or follow up on the original description. Use the original description and earlier comments only as background context.
+
+Please provide a clear, detailed response. 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 `You are handling a non-code task. This task does NOT require code changes — it requires a thoughtful, verbal response.
+
+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) {
     const lines = [
-        `[aidev] Non-code task complete!`,
+        `${config.commentPrefix} Non-code task complete!`,
     ];
     if (agentResponse) {
         lines.push(``, `---`, ``, agentResponse);
@@ -914,11 +934,11 @@ function buildNonCodeCompletionComment(config, agentResponse) {
     lines.push(``, `Status set to: ${getInReviewStatus(config)}`);
     return lines.join('\n');
 }
-function hasAidevComment(comments) {
-    return comments.some((c) => c.text.includes('[aidev]'));
+function hasAidevComment(comments, commentPrefix = '[aidev]') {
+    return comments.some((c) => c.text.includes(commentPrefix));
 }
-function filterAutomatedComments(comments) {
-    return comments.filter((c) => !c.text.includes('[aidev]'));
+function filterAutomatedComments(comments, commentPrefix = '[aidev]') {
+    return comments.filter((c) => !c.text.includes(commentPrefix));
 }
 async function processNonCodeTask(task, filter, config, provider, runners, screenAvailable) {
     const pendingStatus = getPendingStatus(config);
@@ -931,11 +951,11 @@ async function processNonCodeTask(task, filter, config, provider, runners, scree
         return 'skipped';
     }
     const comments = await provider.getComments(task.id);
-    const wasProcessed = hasAidevComment(comments);
+    const wasProcessed = hasAidevComment(comments, config.commentPrefix);
     if (isPending || wasProcessed) {
         const trigger = hasTriggerWord(comments, config.triggerWord);
         if (isPending) {
-            const reply = hasHumanReply(comments);
+            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}")`);
                 return 'skipped';
@@ -952,18 +972,18 @@ async function processNonCodeTask(task, filter, config, provider, runners, scree
             logger_1.logger.info(`Trigger word "${config.triggerWord}" found — re-processing non-code task`);
         }
         if (!screenAvailable) {
-            await notifySleeping(task, provider);
+            await notifySleeping(task, provider, config.commentPrefix);
             return 'skipped';
         }
     }
     else {
         if (!screenAvailable) {
-            await notifySleeping(task, provider);
+            await notifySleeping(task, provider, config.commentPrefix);
             return 'skipped';
         }
         const clarification = await checkNeedsClarification(task, config, provider, runners);
         if (clarification) {
-            await provider.postComment(task.id, `[aidev] ${clarification}`);
+            await provider.postComment(task.id, `${config.commentPrefix} ${clarification}`);
             await provider.updateStatus(task.id, getPendingStatus(config));
             logger_1.logger.info(`Posted clarification question, set status to ${getPendingStatus(config)}`);
             return 'skipped';
@@ -976,7 +996,7 @@ async function implementNonCodeTask(task, config, provider, runners) {
     logger_1.logger.info(`Implementing non-code task: ${task.name}`);
     try {
         await provider.updateStatus(task.id, 'in progress');
-        await provider.postComment(task.id, `[aidev] Starting non-code task execution`);
+        await provider.postComment(task.id, `${config.commentPrefix} Starting non-code task execution`);
     }
     catch (err) {
         logger_1.logger.warn(`Could not update task status: ${err}`);
@@ -984,7 +1004,7 @@ async function implementNonCodeTask(task, config, provider, runners) {
     let context = '';
     try {
         const comments = await provider.getComments(task.id);
-        const humanComments = filterAutomatedComments(comments);
+        const humanComments = filterAutomatedComments(comments, config.commentPrefix);
         if (humanComments.length > 0) {
             context = '\n\nConversation context:\n' + humanComments.map((c) => `${c.author}: ${c.text}`).join('\n');
         }
@@ -1014,7 +1034,7 @@ async function implementNonCodeTask(task, config, provider, runners) {
     if (!implemented) {
         logger_1.logger.error('All AI runners failed');
         const diagnostics = (0, diagnostics_1.collectAndLogDiagnostics)();
-        await provider.postComment(task.id, `[aidev] All AI runners failed. Manual intervention needed.\n\n${diagnostics}`);
+        await provider.postComment(task.id, `${config.commentPrefix} All AI runners failed. Manual intervention needed.\n\n${diagnostics}`);
         return;
     }
     try {