@qelos/aidev 0.3.0 → 0.4.0

package/dist/commands/run.d.ts

@@ -1,6 +1,7 @@
 import { Config, Task, Comment } from '../types';
 import { TaskProvider } from '../providers';
 import { AIRunner } from '../ai';
+import { AidevHooks, HookVM } from '../hooks';
 export declare const DEFAULT_TRIGGER_WORD = "aidev-continue";
 export declare function getPendingStatus(config: Config): string;
 export declare function getOpenStatus(config: Config): string;
@@ -19,7 +20,7 @@ export interface ThinkingTaskPlan {
 }
 export declare function getRunSkipReason(status: string, filter: RunFilter, pendingStatus: string, openStatus?: string): string | null;
 export declare function sortTasksByPriority(tasks: Task[]): Task[];
-export declare function runCommand(filter: RunFilter, config: Config, provider: TaskProvider, runners: AIRunner[], nonCodeProvider?: TaskProvider): Promise<void>;
+export declare function runCommand(filter: RunFilter, config: Config, provider: TaskProvider, runners: AIRunner[], nonCodeProvider?: TaskProvider, hooks?: AidevHooks, vm?: HookVM): Promise<void>;
 export declare function hasHumanReply(comments: Comment[], commentPrefix?: string): boolean;
 /**
  * Returns true if the last comment contains the trigger word.

package/dist/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}

package/dist/commands/run.js

@@ -60,6 +60,7 @@ const git = __importStar(require("../git"));
 const github_1 = require("../github");
 const diagnostics_1 = require("../diagnostics");
 const lockfile_1 = require("../lockfile");
+const hooks_1 = require("../hooks");
 const SKIP_STATUSES = new Set(['closed', 'done', 'cancelled', 'complete']);
 const NO_PRIORITY = Number.MAX_SAFE_INTEGER;
 const SLEEPING_MARKER = 'machine appears to be asleep';
@@ -72,6 +73,8 @@ function getPendingStatus(config) {
         return config.linearPendingStatus;
     if (p === 'notion')
         return config.notionPendingStatus;
+    if (p === 'trello')
+        return config.trelloPendingStatus;
     return config.clickupPendingStatus;
 }
 function getOpenStatus(config) {
@@ -80,6 +83,8 @@ function getOpenStatus(config) {
         return 'open';
     if (p === 'linear')
         return 'open';
+    if (p === 'trello')
+        return config.trelloOpenStatus || 'open';
     return config.clickupOpenStatus || 'open';
 }
 function getInReviewStatus(config) {
@@ -90,6 +95,8 @@ function getInReviewStatus(config) {
         return config.linearInReviewStatus;
     if (p === 'notion')
         return config.notionInReviewStatus;
+    if (p === 'trello')
+        return config.trelloInReviewStatus;
     return config.clickupInReviewStatus;
 }
 function getRunSkipReason(status, filter, pendingStatus, openStatus = 'open') {
@@ -160,7 +167,7 @@ function formatSubtaskList(plan) {
         .map((s) => `${icons[s.status]} **${s.id}.** ${s.title} — _${s.status}_`)
         .join('\n');
 }
-async function runCommand(filter, config, provider, runners, nonCodeProvider) {
+async function runCommand(filter, config, provider, runners, nonCodeProvider, hooks = {}, vm) {
     const cwd = process.cwd();
     if (!(0, lockfile_1.acquireLock)(cwd)) {
         const pid = (0, lockfile_1.readLock)(cwd);
@@ -176,10 +183,15 @@ async function runCommand(filter, config, provider, runners, nonCodeProvider) {
         logger_1.logger.info(`Fetching tasks (filter: ${filter})...`);
         const tasks = sortTasksByPriority(await provider.fetchTasks());
         logger_1.logger.info(`Found ${tasks.length} tagged task(s)`);
+        // beforeRun hook
+        if (vm) {
+            const runCtx = { config, filter, taskCount: tasks.length };
+            await (0, hooks_1.executeHook)(hooks, 'beforeRun', runCtx, vm);
+        }
         let processed = 0;
         let skipped = 0;
         for (const task of tasks) {
-            const result = await processTask(task, filter, config, provider, runners, screenAvailable);
+            const result = await processTask(task, filter, config, provider, runners, screenAvailable, hooks, vm);
             if (result === 'processed')
                 processed++;
             else
@@ -190,20 +202,27 @@ async function runCommand(filter, config, provider, runners, nonCodeProvider) {
             const nonCodeTasks = sortTasksByPriority(await nonCodeProvider.fetchTasks());
             logger_1.logger.info(`Found ${nonCodeTasks.length} non-code task(s)`);
             for (const task of nonCodeTasks) {
-                const result = await processNonCodeTask(task, filter, config, nonCodeProvider, runners, screenAvailable);
+                const result = await processNonCodeTask(task, filter, config, nonCodeProvider, runners, screenAvailable, hooks, vm);
                 if (result === 'processed')
                     processed++;
                 else
                     skipped++;
             }
         }
+        // afterRun hook
+        if (vm) {
+            const afterCtx = {
+                config, filter, taskCount: tasks.length, processed, skipped,
+            };
+            await (0, hooks_1.executeHook)(hooks, 'afterRun', afterCtx, vm);
+        }
         logger_1.logger.success(`Done. Processed: ${processed}, Skipped: ${skipped}`);
     }
     finally {
         (0, lockfile_1.releaseLock)(cwd);
     }
 }
-async function processTask(task, filter, config, provider, runners, screenAvailable) {
+async function processTask(task, filter, config, provider, runners, screenAvailable, hooks = {}, vm) {
     const pendingStatus = getPendingStatus(config);
     const openStatus = getOpenStatus(config);
     const isPending = task.status.toLowerCase() === pendingStatus.toLowerCase();
@@ -254,10 +273,10 @@ async function processTask(task, filter, config, provider, runners, screenAvaila
         }
     }
     if (isThinkingTask(task, config)) {
-        await implementThinkingTask(task, branchName, branchExists, config, provider, runners);
+        await implementThinkingTask(task, branchName, branchExists, config, provider, runners, hooks, vm);
     }
     else {
-        await implementTask(task, branchName, branchExists, config, provider, runners);
+        await implementTask(task, branchName, branchExists, config, provider, runners, hooks, vm);
     }
     return 'processed';
 }
@@ -313,16 +332,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,33 +369,33 @@ 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) {
+async function resolveConflictsWithAI(task, config, provider, runners, context, hooks, vm, branchName) {
     const check = git.checkConflictsWithBase(config.gitRemote, config.githubBaseBranch);
     if (check.behindCommits === 0) {
         logger_1.logger.debug('Branch is up to date with base — no merge needed');
@@ -401,7 +420,13 @@ async function resolveConflictsWithAI(task, config, provider, runners, context,
     }
     catch { /* ignore */ }
     if (!git.mergeBaseBranch(config.gitRemote, config.githubBaseBranch)) {
-        const prompt = buildConflictResolutionPrompt(task, check.conflictFiles, context);
+        let prompt = buildConflictResolutionPrompt(task, check.conflictFiles, context);
+        // beforeResolveConflicts hook
+        if (vm) {
+            const conflictCtx = { task, config, branchName, conflictFiles: check.conflictFiles, prompt };
+            const modified = await (0, hooks_1.executeHook)(hooks, 'beforeResolveConflicts', conflictCtx, vm);
+            prompt = modified.prompt;
+        }
         let resolved = false;
         let previousNotes = '';
         for (const runner of runners) {
@@ -423,7 +448,22 @@ async function resolveConflictsWithAI(task, config, provider, runners, context,
         }
         if (!resolved) {
             logger_1.logger.error('All AI runners failed to resolve merge conflicts');
-            git.abortMerge();
+            try {
+                if (vm) {
+                    const afterFailCtx = {
+                        task,
+                        config,
+                        branchName,
+                        conflictFiles: check.conflictFiles,
+                        prompt,
+                        resolved: false,
+                    };
+                    await (0, hooks_1.executeHook)(hooks, 'afterResolveConflicts', afterFailCtx, vm);
+                }
+            }
+            finally {
+                git.abortMerge();
+            }
             try {
                 await provider.postComment(task.id, `${config.commentPrefix} Failed to automatically resolve merge conflicts. Manual intervention needed to rebase/merge the branch.`);
             }
@@ -439,6 +479,13 @@ async function resolveConflictsWithAI(task, config, provider, runners, context,
             logger_1.logger.warn('Failed to push conflict resolution — continuing anyway');
         }
         logger_1.logger.success('Merge conflicts resolved successfully');
+        // afterResolveConflicts hook
+        if (vm) {
+            const afterCtx = {
+                task, config, branchName, conflictFiles: check.conflictFiles, prompt, resolved: true,
+            };
+            await (0, hooks_1.executeHook)(hooks, 'afterResolveConflicts', afterCtx, vm);
+        }
         try {
             await provider.postComment(task.id, `${config.commentPrefix} Merge conflicts resolved automatically.`);
         }
@@ -489,7 +536,7 @@ function resolveHandledThreads(threads) {
         logger_1.logger.info(`Resolved ${resolved}/${threads.length} review thread(s) on GitHub`);
     }
 }
-async function implementTask(task, branchName, branchExists, config, provider, runners) {
+async function implementTask(task, branchName, branchExists, config, provider, runners, hooks = {}, vm) {
     logger_1.logger.info(`Implementing task: ${task.name}`);
     try {
         await provider.updateStatus(task.id, 'in progress');
@@ -526,7 +573,7 @@ async function implementTask(task, branchName, branchExists, config, provider, r
         // ignore
     }
     if (branchExists) {
-        const conflictsOk = await resolveConflictsWithAI(task, config, provider, runners, context, branchName);
+        const conflictsOk = await resolveConflictsWithAI(task, config, provider, runners, context, hooks, vm, branchName);
         if (!conflictsOk) {
             logger_1.logger.error('Cannot proceed — merge conflicts could not be resolved');
             return;
@@ -540,7 +587,13 @@ async function implementTask(task, branchName, branchExists, config, provider, r
         logger_1.logger.info(`Found ${reviewThreads.length} unresolved review comment(s) to address`);
         context += formatReviewComments(reviewThreads);
     }
-    const implementPrompt = buildImplementPrompt(task, context);
+    let implementPrompt = buildImplementPrompt(task, context);
+    // beforeEachTask hook — may modify context (e.g. improve the prompt)
+    if (vm) {
+        const taskCtx = { task, config, branchName, prompt: implementPrompt };
+        const modified = await (0, hooks_1.executeHook)(hooks, 'beforeEachTask', taskCtx, vm);
+        implementPrompt = modified.prompt;
+    }
     // Run AI runners in order with fallback
     let implemented = false;
     let previousNotes = '';
@@ -602,17 +655,22 @@ async function implementTask(task, branchName, branchExists, config, provider, r
     catch (err) {
         logger_1.logger.warn(`Branch pushed but failed to update task: ${err instanceof Error ? err.message : err}`);
     }
+    // afterEachTask hook
+    if (vm) {
+        const afterCtx = { task, config, branchName, prompt: implementPrompt, success: true };
+        await (0, hooks_1.executeHook)(hooks, 'afterEachTask', afterCtx, vm);
+    }
     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) {
@@ -621,28 +679,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);
@@ -689,20 +747,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 = '';
@@ -726,7 +784,7 @@ Implement ONLY this step. Focus on correctness and follow the existing code styl
     }
     return implemented;
 }
-async function implementThinkingTask(task, branchName, branchExists, config, provider, runners) {
+async function implementThinkingTask(task, branchName, branchExists, config, provider, runners, hooks = {}, vm) {
     logger_1.logger.info(`Implementing thinking task: ${task.name}`);
     try {
         await provider.updateStatus(task.id, 'in progress');
@@ -761,7 +819,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
     }
     catch { /* ignore */ }
     if (branchExists) {
-        const conflictsOk = await resolveConflictsWithAI(task, config, provider, runners, context, branchName);
+        const conflictsOk = await resolveConflictsWithAI(task, config, provider, runners, context, hooks, vm, branchName);
         if (!conflictsOk) {
             logger_1.logger.error('Cannot proceed — merge conflicts could not be resolved');
             return;
@@ -801,6 +859,32 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
             logger_1.logger.warn(`Failed to post breakdown comment: ${err}`);
         }
     }
+    // beforeThinkingTask hook — may adjust subtask titles/descriptions before execution
+    if (vm) {
+        const thinkCtx = {
+            task,
+            config,
+            branchName,
+            subtasks: plan.subtasks.map((s) => ({
+                id: s.id,
+                title: s.title,
+                description: s.description,
+                status: s.status,
+            })),
+        };
+        const modified = await (0, hooks_1.executeHook)(hooks, 'beforeThinkingTask', thinkCtx, vm);
+        const prevById = new Map(plan.subtasks.map((s) => [s.id, s]));
+        plan.subtasks = modified.subtasks.map((s) => {
+            const prev = prevById.get(s.id);
+            return {
+                id: s.id,
+                title: s.title,
+                description: s.description,
+                status: (prev?.status ?? s.status),
+            };
+        });
+        writeTaskPlan(plan);
+    }
     let allSucceeded = true;
     for (const subtask of plan.subtasks) {
         if (subtask.status === 'done') {
@@ -867,6 +951,13 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
     catch (err) {
         logger_1.logger.warn(`Branch pushed but failed to update task: ${err instanceof Error ? err.message : err}`);
     }
+    // afterThinkingTask hook
+    if (vm) {
+        const afterCtx = {
+            task, config, branchName, subtasks: plan.subtasks.map((s) => ({ ...s })), success: true,
+        };
+        await (0, hooks_1.executeHook)(hooks, 'afterThinkingTask', afterCtx, vm);
+    }
     logger_1.logger.success(`Thinking task implemented: branch ${branchName} pushed`);
 }
 /**
@@ -903,25 +994,29 @@ function buildCompletionComment(branch, prUrl, config) {
 function buildNonCodePrompt(task, 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)'}
-
+        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)'}
+
 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) {
@@ -929,7 +1024,24 @@ function buildNonCodeCompletionComment(config, agentResponse) {
         `${config.commentPrefix} Non-code task complete!`,
     ];
     if (agentResponse) {
-        lines.push(``, `---`, ``, agentResponse);
+        // Filter out instructional text like "Here's text you can paste as the **task ticket comment**"
+        // and extract only the actual content
+        let cleanedResponse = agentResponse;
+        // Look for the content after the first "---" separator, as the actual content usually follows
+        const separatorIndex = agentResponse.indexOf('---');
+        if (separatorIndex !== -1) {
+            const afterSeparator = agentResponse.substring(separatorIndex + 3).trim();
+            // Look for the start of actual content (skip any remaining instructional text)
+            const lines = afterSeparator.split('\n');
+            const contentStartIndex = lines.findIndex(line => line.trim() &&
+                !line.toLowerCase().includes('here\'s text you can paste') &&
+                !line.toLowerCase().includes('task ticket comment') &&
+                !line.toLowerCase().includes('addresses your latest ask'));
+            if (contentStartIndex !== -1) {
+                cleanedResponse = lines.slice(contentStartIndex).join('\n').trim();
+            }
+        }
+        lines.push(``, `---`, ``, cleanedResponse);
     }
     lines.push(``, `Status set to: ${getInReviewStatus(config)}`);
     return lines.join('\n');
@@ -940,7 +1052,7 @@ function hasAidevComment(comments, commentPrefix = '[aidev]') {
 function filterAutomatedComments(comments, commentPrefix = '[aidev]') {
     return comments.filter((c) => !c.text.includes(commentPrefix));
 }
-async function processNonCodeTask(task, filter, config, provider, runners, screenAvailable) {
+async function processNonCodeTask(task, filter, config, provider, runners, screenAvailable, hooks = {}, vm) {
     const pendingStatus = getPendingStatus(config);
     const openStatus = getOpenStatus(config);
     const isPending = task.status.toLowerCase() === pendingStatus.toLowerCase();
@@ -954,6 +1066,7 @@ async function processNonCodeTask(task, filter, config, provider, runners, scree
     const wasProcessed = hasAidevComment(comments, config.commentPrefix);
     if (isPending || wasProcessed) {
         const trigger = hasTriggerWord(comments, config.triggerWord);
+        const hasHumanFollowUp = hasHumanReply(comments, config.commentPrefix);
         if (isPending) {
             const reply = hasHumanReply(comments, config.commentPrefix);
             if (!reply && !trigger) {
@@ -965,11 +1078,14 @@ async function processNonCodeTask(task, filter, config, provider, runners, scree
                 : 'Pending non-code task has a human reply — proceeding');
         }
         else {
-            if (!trigger) {
-                logger_1.logger.info(`[${task.id}] "${task.name}" skipped — already processed, no trigger word`);
+            // For already processed tasks, check if there's a human follow-up or trigger word
+            if (!trigger && !hasHumanFollowUp) {
+                logger_1.logger.info(`[${task.id}] "${task.name}" skipped — already processed, no trigger word or human follow-up`);
                 return 'skipped';
             }
-            logger_1.logger.info(`Trigger word "${config.triggerWord}" found — re-processing non-code task`);
+            logger_1.logger.info(trigger
+                ? `Trigger word "${config.triggerWord}" found — re-processing non-code task`
+                : 'Human follow-up comment found — processing non-code task');
         }
         if (!screenAvailable) {
             await notifySleeping(task, provider, config.commentPrefix);
@@ -989,10 +1105,10 @@ async function processNonCodeTask(task, filter, config, provider, runners, scree
             return 'skipped';
         }
     }
-    await implementNonCodeTask(task, config, provider, runners);
+    await implementNonCodeTask(task, config, provider, runners, hooks, vm);
     return 'processed';
 }
-async function implementNonCodeTask(task, config, provider, runners) {
+async function implementNonCodeTask(task, config, provider, runners, hooks = {}, vm) {
     logger_1.logger.info(`Implementing non-code task: ${task.name}`);
     try {
         await provider.updateStatus(task.id, 'in progress');
@@ -1012,7 +1128,13 @@ async function implementNonCodeTask(task, config, provider, runners) {
     catch {
         // ignore
     }
-    const nonCodePrompt = buildNonCodePrompt(task, context);
+    let nonCodePrompt = buildNonCodePrompt(task, context);
+    // beforeNonCodeTask hook
+    if (vm) {
+        const ncCtx = { task, config, prompt: nonCodePrompt };
+        const modified = await (0, hooks_1.executeHook)(hooks, 'beforeNonCodeTask', ncCtx, vm);
+        nonCodePrompt = modified.prompt;
+    }
     let implemented = false;
     let agentOutput = '';
     let previousNotes = '';
@@ -1045,6 +1167,13 @@ async function implementNonCodeTask(task, config, provider, runners) {
     catch (err) {
         logger_1.logger.warn(`Failed to update task: ${err instanceof Error ? err.message : err}`);
     }
+    // afterNonCodeTask hook
+    if (vm) {
+        const afterCtx = {
+            task, config, prompt: nonCodePrompt, success: true, output: agentOutput,
+        };
+        await (0, hooks_1.executeHook)(hooks, 'afterNonCodeTask', afterCtx, vm);
+    }
     logger_1.logger.success(`Non-code task complete: ${task.name}`);
 }
 //# sourceMappingURL=run.js.map