@mcoda/core 0.1.8 → 0.1.11

package/dist/services/execution/TaskSelectionService.js

@@ -1,10 +1,17 @@
 import { WorkspaceRepository } from "@mcoda/db";
-const DEFAULT_IMPLEMENTATION_STATUSES = ["not_started", "in_progress"];
+import { normalizeReviewStatuses } from "@mcoda/shared";
+const DEFAULT_IMPLEMENTATION_STATUSES = ["not_started", "in_progress", "changes_requested"];
 const DONE_DEPENDENCY_STATUSES = new Set(["completed", "cancelled"]);
 const normalizeStatusList = (statuses) => {
     if (!statuses || statuses.length === 0)
         return DEFAULT_IMPLEMENTATION_STATUSES;
-    return Array.from(new Set(statuses.map((s) => s.toLowerCase().trim()).filter(Boolean)));
+    const normalized = Array.from(new Set(statuses.map((s) => s.toLowerCase().trim()).filter(Boolean))).filter((status) => status !== "blocked");
+    return normalizeReviewStatuses(normalized);
+};
+const normalizeTypeList = (types) => {
+    if (!types || types.length === 0)
+        return [];
+    return Array.from(new Set(types.map((type) => type.toLowerCase().trim()).filter(Boolean)));
 };
 const parseAcceptanceCriteria = (raw) => {
     if (!raw)
@@ -14,6 +21,67 @@ const parseAcceptanceCriteria = (raw) => {
         .map((line) => line.trim())
         .filter(Boolean);
 };
+const DOD_HEADER = /(definition of done|dod)\b/i;
+const SECTION_HEADER = /^(?:\*+\s*)?(?:\*\*)?\s*(objective|context|inputs|implementation plan|testing|dependencies|risks|references|related documentation|acceptance criteria)\b/i;
+const extractTaskDodCriteria = (description) => {
+    if (!description)
+        return [];
+    const lines = description.split(/\r?\n/);
+    let startIndex = -1;
+    for (let i = 0; i < lines.length; i += 1) {
+        const line = lines[i].trim();
+        if (!line)
+            continue;
+        if (DOD_HEADER.test(line)) {
+            startIndex = i;
+            break;
+        }
+    }
+    if (startIndex === -1)
+        return [];
+    const results = [];
+    const addInline = (line) => {
+        const parts = line.split(":");
+        if (parts.length < 2)
+            return;
+        const tail = parts.slice(1).join(":").trim();
+        if (!tail)
+            return;
+        tail
+            .split(/\s*;\s*/)
+            .map((item) => item.trim())
+            .filter(Boolean)
+            .forEach((item) => results.push(item));
+    };
+    const isBullet = (line) => /^[-*]\s+/.test(line);
+    const isHeading = (line) => SECTION_HEADER.test(line) ||
+        (/^\*+\s*\*\*.+\*\*\s*:?\s*$/.test(line) && !DOD_HEADER.test(line)) ||
+        (/^[A-Z][A-Za-z0-9 &/]{2,}:\s*$/.test(line) && !DOD_HEADER.test(line));
+    const headerLine = lines[startIndex].trim();
+    addInline(headerLine);
+    for (let i = startIndex + 1; i < lines.length; i += 1) {
+        const rawLine = lines[i];
+        const line = rawLine.trim();
+        if (!line) {
+            if (results.length)
+                break;
+            continue;
+        }
+        if (!isBullet(line) && isHeading(line))
+            break;
+        if (isBullet(line)) {
+            results.push(line.replace(/^[-*]\s+/, "").trim());
+            continue;
+        }
+        if (results.length) {
+            results[results.length - 1] = `${results[results.length - 1]} ${line}`.trim();
+        }
+        else {
+            results.push(line);
+        }
+    }
+    return Array.from(new Set(results.filter(Boolean)));
+};
 export class TaskSelectionService {
     constructor(workspace, workspaceRepo) {
         this.workspace = workspace;
@@ -32,6 +100,8 @@ export class TaskSelectionService {
         return this.workspaceRepo.getProjectByKey(projectKey);
     }
     buildTaskFromRow(row) {
+        const taskDod = extractTaskDodCriteria(row.task_description ?? "");
+        const storyAcceptance = parseAcceptanceCriteria(row.story_acceptance);
         return {
             id: row.task_id,
             projectId: row.project_id,
@@ -58,7 +128,7 @@ export class TaskSelectionService {
             epicTitle: row.epic_title ?? undefined,
             storyTitle: row.story_title ?? undefined,
             storyDescription: row.story_description ?? undefined,
-            acceptanceCriteria: parseAcceptanceCriteria(row.story_acceptance),
+            acceptanceCriteria: taskDod.length ? taskDod : storyAcceptance,
         };
     }
     async loadTasks(filters) {
@@ -175,10 +245,10 @@ export class TaskSelectionService {
         const ordered = [];
         while (queue.length) {
             queue.sort((a, b) => {
-                const pa = a.task.priority ?? Number.NEGATIVE_INFINITY;
-                const pb = b.task.priority ?? Number.NEGATIVE_INFINITY;
+                const pa = a.task.priority ?? Number.POSITIVE_INFINITY;
+                const pb = b.task.priority ?? Number.POSITIVE_INFINITY;
                 if (pa !== pb)
-                    return pb - pa;
+                    return pa - pb;
                 const spa = a.task.storyPoints ?? Number.POSITIVE_INFINITY;
                 const spb = b.task.storyPoints ?? Number.POSITIVE_INFINITY;
                 if (spa !== spb)
@@ -217,28 +287,66 @@ export class TaskSelectionService {
         if (filters.projectKey && !project) {
             throw new Error(`Unknown project key: ${filters.projectKey}`);
         }
-        const effectiveStatuses = normalizeStatusList(filters.statusFilter);
-        const allowBlocked = effectiveStatuses.includes("blocked");
-        const tasks = await this.loadTasks({ ...filters, project });
-        const filteredTasks = tasks.filter((task) => effectiveStatuses.includes(task.task_status.toLowerCase()));
-        const candidateIds = filteredTasks.map((t) => t.task_id);
+        const dedupedTaskKeys = filters.taskKeys?.length
+            ? Array.from(new Set(filters.taskKeys.map((key) => key.trim()).filter(Boolean)))
+            : undefined;
+        const ignoreStatusFilter = Boolean(filters.ignoreStatusFilter);
+        const effectiveStatuses = ignoreStatusFilter ? [] : normalizeStatusList(filters.statusFilter);
+        const includeTypes = normalizeTypeList(filters.includeTypes);
+        const excludeTypes = normalizeTypeList(filters.excludeTypes);
+        const tasks = await this.loadTasks({ ...filters, project, taskKeys: dedupedTaskKeys });
+        const filteredTasks = tasks.filter((task) => {
+            if (!ignoreStatusFilter && !effectiveStatuses.includes(task.task_status.toLowerCase()))
+                return false;
+            const type = task.task_type?.toLowerCase().trim() ?? "";
+            if (includeTypes.length > 0 && !includeTypes.includes(type))
+                return false;
+            if (excludeTypes.length > 0 && type && excludeTypes.includes(type))
+                return false;
+            return true;
+        });
+        const dedupeWarnings = [];
+        const selectionWarnings = [];
+        if (!ignoreStatusFilter) {
+            const requestedBlocked = filters.statusFilter?.some((status) => status.toLowerCase().trim() === "blocked") ?? false;
+            const requestedLegacyReview = filters.statusFilter?.some((status) => status.toLowerCase().trim() === "ready_to_review") ?? false;
+            if (requestedBlocked) {
+                selectionWarnings.push("Status 'blocked' is no longer supported; ignoring it in selection.");
+            }
+            if (requestedLegacyReview) {
+                selectionWarnings.push("Status 'ready_to_review' is deprecated; use 'ready_to_code_review' instead.");
+            }
+        }
+        const seenKeys = new Set();
+        const dedupedTasks = [];
+        for (const row of filteredTasks) {
+            const key = row.task_key;
+            if (seenKeys.has(key)) {
+                dedupeWarnings.push(`Duplicate task key detected in selection: ${key}.`);
+                continue;
+            }
+            seenKeys.add(key);
+            dedupedTasks.push(row);
+        }
+        const candidateIds = dedupedTasks.map((t) => t.task_id);
         const deps = await this.loadDependencies(candidateIds);
         const taskMap = new Map();
-        for (const row of filteredTasks) {
+        for (const row of dedupedTasks) {
             const task = this.buildTaskFromRow(row);
             taskMap.set(task.id, {
                 task,
                 dependencies: { ids: [], keys: [], blocking: [] },
             });
         }
-        const blocked = [];
         const eligible = [];
+        const skippedDependencies = [];
+        const ignoreDependencies = filters.ignoreDependencies === true;
         for (const [taskId, entry] of taskMap.entries()) {
             const depRows = deps.get(taskId) ?? [];
             const ids = [];
             const keys = [];
             const blocking = [];
-            let blockedReason;
+            let dependencyNotReady = false;
             for (const dep of depRows) {
                 ids.push(dep.dependsOnTaskId);
                 if (dep.dependsOnKey)
@@ -249,33 +357,41 @@ export class TaskSelectionService {
                     ? DONE_DEPENDENCY_STATUSES.has(status ?? "")
                     : true;
                 if (!clear) {
-                    blockedReason = "dependency_not_ready";
+                    if (!ignoreDependencies)
+                        dependencyNotReady = true;
                     blocking.push(dep.dependsOnTaskId);
                 }
                 else if (!status && !depInSelection) {
-                    // unknown status but dependency referenced; treat as blocked unless explicitly ignored
-                    blockedReason = "dependency_not_ready";
+                    // unknown status but dependency referenced; treat as not ready unless explicitly ignored
+                    if (!ignoreDependencies)
+                        dependencyNotReady = true;
                     blocking.push(dep.dependsOnTaskId);
                 }
             }
             entry.dependencies = { ids, keys, blocking };
-            if (blockedReason && !(allowBlocked || (filters.taskKeys ?? []).includes(entry.task.key))) {
-                entry.blockedReason = blockedReason;
-                blocked.push(entry);
-            }
-            else {
-                entry.blockedReason = blockedReason;
-                eligible.push(entry);
+            if (dependencyNotReady && !ignoreDependencies) {
+                skippedDependencies.push(entry.task.key);
+                continue;
             }
+            eligible.push(entry);
+        }
+        const { ordered, warnings: topoWarnings } = this.topologicalOrder(eligible, deps);
+        if (skippedDependencies.length > 0) {
+            selectionWarnings.push(`Skipped ${skippedDependencies.length} task(s) due to dependencies not ready.`);
         }
-        const { ordered, warnings } = this.topologicalOrder(eligible, deps);
+        const combinedWarnings = [...dedupeWarnings, ...selectionWarnings, ...topoWarnings];
         const limited = typeof filters.limit === "number" && filters.limit > 0 ? ordered.slice(0, filters.limit) : ordered;
         return {
             project: project ?? undefined,
-            filters: { ...filters, effectiveStatuses },
+            filters: {
+                ...filters,
+                taskKeys: dedupedTaskKeys ?? filters.taskKeys,
+                effectiveStatuses,
+                includeTypes: includeTypes.length ? includeTypes : undefined,
+                excludeTypes: excludeTypes.length ? excludeTypes : undefined,
+            },
             ordered: limited,
-            blocked,
-            warnings,
+            warnings: combinedWarnings,
         };
     }
 }

package/dist/services/execution/TaskStateService.d.ts

@@ -1,19 +1,32 @@
 import { WorkspaceRepository, TaskRow } from "@mcoda/db";
+export type TaskStatusEventContext = {
+    commandName?: string | null;
+    jobId?: string | null;
+    taskRunId?: string | null;
+    agentId?: string | null;
+    metadata?: Record<string, unknown> | null;
+    timestamp?: string | null;
+};
 export declare class TaskStateService {
     private workspaceRepo;
     constructor(workspaceRepo: WorkspaceRepository);
-    transitionToInProgress(task: TaskRow): Promise<void>;
-    markReadyToReview(task: TaskRow, metadataPatch?: Record<string, unknown>): Promise<void>;
-    markReadyToQa(task: TaskRow, metadataPatch?: Record<string, unknown>): Promise<void>;
-    markCompleted(task: TaskRow, metadataPatch?: Record<string, unknown>): Promise<void>;
-    returnToInProgress(task: TaskRow, metadataPatch?: Record<string, unknown>): Promise<void>;
-    markBlocked(task: TaskRow, reason: string): Promise<void>;
+    private recordStatusEvent;
+    transitionToInProgress(task: TaskRow, context?: TaskStatusEventContext): Promise<void>;
+    markNotStarted(task: TaskRow, metadataPatch?: Record<string, unknown>, context?: TaskStatusEventContext): Promise<void>;
+    markReadyToReview(task: TaskRow, metadataPatch?: Record<string, unknown>, context?: TaskStatusEventContext): Promise<void>;
+    markReadyToQa(task: TaskRow, metadataPatch?: Record<string, unknown>, context?: TaskStatusEventContext): Promise<void>;
+    markCompleted(task: TaskRow, metadataPatch?: Record<string, unknown>, context?: TaskStatusEventContext): Promise<void>;
+    returnToInProgress(task: TaskRow, metadataPatch?: Record<string, unknown>, context?: TaskStatusEventContext): Promise<void>;
+    markChangesRequested(task: TaskRow, metadataPatch?: Record<string, unknown>, context?: TaskStatusEventContext): Promise<void>;
+    markFailed(task: TaskRow, reason: string, context?: TaskStatusEventContext): Promise<void>;
     recordReviewMetadata(task: TaskRow, metadata: {
         decision: string;
         agentId?: string | null;
         modelName?: string | null;
         jobId?: string | null;
         reviewId?: string | null;
+        diffEmpty?: boolean;
+        changedPaths?: string[];
     }): Promise<void>;
 }
 //# sourceMappingURL=TaskStateService.d.ts.map

package/dist/services/execution/TaskStateService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskStateService.d.ts","sourceRoot":"","sources":["../../../src/services/execution/TaskStateService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQzD,qBAAa,gBAAgB;IACf,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,mBAAmB;IAEhD,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpD,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxF,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpF,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpF,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzF,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzD,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;CAW9K"}
+{"version":3,"file":"TaskStateService.d.ts","sourceRoot":"","sources":["../../../src/services/execution/TaskStateService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUzD,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,qBAAa,gBAAgB;IACf,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,mBAAmB;YAExC,iBAAiB;IAoBzB,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtF,cAAc,CAClB,IAAI,EAAE,OAAO,EACb,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,IAAI,CAAC;IAYV,iBAAiB,CACrB,IAAI,EAAE,OAAO,EACb,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,IAAI,CAAC;IAYV,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtH,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBtH,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3H,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsD7H,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB1F,oBAAoB,CACxB,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE;QACR,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;KACzB;CAgBJ"}

package/dist/services/execution/TaskStateService.js

@@ -1,3 +1,4 @@
+import { READY_TO_CODE_REVIEW } from "@mcoda/shared";
 const mergeMetadata = (existing, patch) => {
     if (patch === undefined)
         return existing;
@@ -9,41 +10,151 @@ export class TaskStateService {
     constructor(workspaceRepo) {
         this.workspaceRepo = workspaceRepo;
     }
-    async transitionToInProgress(task) {
+    async recordStatusEvent(task, fromStatus, toStatus, context) {
+        if (fromStatus === toStatus)
+            return;
+        await this.workspaceRepo.recordTaskStatusEvent({
+            taskId: task.id,
+            fromStatus: fromStatus ?? null,
+            toStatus,
+            timestamp: context?.timestamp ?? new Date().toISOString(),
+            commandName: context?.commandName ?? null,
+            jobId: context?.jobId ?? null,
+            taskRunId: context?.taskRunId ?? null,
+            agentId: context?.agentId ?? null,
+            metadata: context?.metadata ?? undefined,
+        });
+    }
+    async transitionToInProgress(task, context) {
         if (task.status === "in_progress")
             return;
+        const fromStatus = task.status;
         await this.workspaceRepo.updateTask(task.id, { status: "in_progress" });
+        await this.recordStatusEvent(task, fromStatus, "in_progress", context);
+        task.status = "in_progress";
+    }
+    async markNotStarted(task, metadataPatch, context) {
+        const fromStatus = task.status;
+        const mergedMetadata = mergeMetadata(task.metadata, metadataPatch ?? undefined);
+        await this.workspaceRepo.updateTask(task.id, {
+            status: "not_started",
+            metadata: mergedMetadata ?? undefined,
+        });
+        await this.recordStatusEvent(task, fromStatus, "not_started", context);
+        task.status = "not_started";
+        task.metadata = mergedMetadata ?? undefined;
     }
-    async markReadyToReview(task, metadataPatch) {
+    async markReadyToReview(task, metadataPatch, context) {
+        const fromStatus = task.status;
+        const mergedMetadata = mergeMetadata(task.metadata, metadataPatch ?? undefined);
         await this.workspaceRepo.updateTask(task.id, {
-            status: "ready_to_review",
-            metadata: mergeMetadata(task.metadata, metadataPatch ?? undefined) ?? undefined,
+            status: READY_TO_CODE_REVIEW,
+            metadata: mergedMetadata ?? undefined,
         });
+        await this.recordStatusEvent(task, fromStatus, READY_TO_CODE_REVIEW, context);
+        task.status = READY_TO_CODE_REVIEW;
+        task.metadata = mergedMetadata ?? undefined;
     }
-    async markReadyToQa(task, metadataPatch) {
+    async markReadyToQa(task, metadataPatch, context) {
+        const fromStatus = task.status;
+        const mergedMetadata = mergeMetadata(task.metadata, metadataPatch ?? undefined);
         await this.workspaceRepo.updateTask(task.id, {
             status: "ready_to_qa",
-            metadata: mergeMetadata(task.metadata, metadataPatch ?? undefined) ?? undefined,
+            metadata: mergedMetadata ?? undefined,
         });
+        await this.recordStatusEvent(task, fromStatus, "ready_to_qa", context);
+        task.status = "ready_to_qa";
+        task.metadata = mergedMetadata ?? undefined;
     }
-    async markCompleted(task, metadataPatch) {
+    async markCompleted(task, metadataPatch, context) {
+        const fromStatus = task.status;
+        const mergedMetadata = mergeMetadata(task.metadata, {
+            ...(metadataPatch ?? {}),
+            last_completed_at: new Date().toISOString(),
+            ...(metadataPatch?.revert_event_pending === undefined ? { revert_event_pending: false } : {}),
+        });
         await this.workspaceRepo.updateTask(task.id, {
             status: "completed",
-            metadata: mergeMetadata(task.metadata, metadataPatch ?? undefined) ?? undefined,
+            metadata: mergedMetadata ?? undefined,
         });
+        await this.recordStatusEvent(task, fromStatus, "completed", context);
+        task.status = "completed";
+        task.metadata = mergedMetadata ?? undefined;
     }
-    async returnToInProgress(task, metadataPatch) {
+    async returnToInProgress(task, metadataPatch, context) {
+        const fromStatus = task.status;
+        const mergedMetadata = mergeMetadata(task.metadata, metadataPatch ?? undefined);
         await this.workspaceRepo.updateTask(task.id, {
             status: "in_progress",
-            metadata: mergeMetadata(task.metadata, metadataPatch ?? undefined) ?? undefined,
+            metadata: mergedMetadata ?? undefined,
+        });
+        await this.recordStatusEvent(task, fromStatus, "in_progress", context);
+        task.status = "in_progress";
+        task.metadata = mergedMetadata ?? undefined;
+    }
+    async markChangesRequested(task, metadataPatch, context) {
+        const fromStatus = task.status;
+        const isRevert = fromStatus === "completed";
+        const baseMetadata = task.metadata ?? {};
+        const currentRevertCount = typeof baseMetadata.revert_event_count === "number" && Number.isFinite(baseMetadata.revert_event_count)
+            ? baseMetadata.revert_event_count
+            : 0;
+        const reasonFromPatch = typeof metadataPatch?.revert_reason === "string" ? metadataPatch.revert_reason : undefined;
+        const reasonFromContext = typeof context?.metadata?.revert_reason === "string"
+            ? String(context.metadata.revert_reason)
+            : typeof context?.metadata?.reason === "string"
+                ? String(context.metadata.reason)
+                : undefined;
+        const revertReason = reasonFromPatch ?? reasonFromContext;
+        const revertEvent = isRevert
+            ? {
+                from_status: fromStatus,
+                to_status: "changes_requested",
+                timestamp: context?.timestamp ?? new Date().toISOString(),
+                reason: revertReason ?? "changes requested after completion",
+            }
+            : undefined;
+        const mergedMetadata = mergeMetadata(task.metadata, {
+            ...(metadataPatch ?? {}),
+            ...(isRevert
+                ? {
+                    revert_event_pending: true,
+                    revert_event_count: currentRevertCount + 1,
+                    last_revert_event: revertEvent,
+                }
+                : {}),
+        });
+        await this.workspaceRepo.updateTask(task.id, {
+            status: "changes_requested",
+            metadata: mergedMetadata ?? undefined,
         });
+        const eventContext = isRevert
+            ? {
+                ...(context ?? {}),
+                metadata: mergeMetadata(context?.metadata ?? undefined, {
+                    revert_event: true,
+                    revert_reason: revertReason ?? "changes requested after completion",
+                }),
+            }
+            : context;
+        await this.recordStatusEvent(task, fromStatus, "changes_requested", eventContext);
+        task.status = "changes_requested";
+        task.metadata = mergedMetadata ?? undefined;
     }
-    async markBlocked(task, reason) {
-        const metadata = mergeMetadata(task.metadata, { blocked_reason: reason }) ?? { blocked_reason: reason };
+    async markFailed(task, reason, context) {
+        const fromStatus = task.status;
+        const metadata = mergeMetadata(task.metadata, { failed_reason: reason }) ?? {
+            failed_reason: reason,
+        };
         await this.workspaceRepo.updateTask(task.id, {
-            status: "blocked",
+            status: "failed",
             metadata,
         });
+        const eventMetadata = mergeMetadata(context?.metadata ?? undefined, { failed_reason: reason }) ?? { failed_reason: reason };
+        const eventContext = context ? { ...context, metadata: eventMetadata } : { metadata: eventMetadata };
+        await this.recordStatusEvent(task, fromStatus, "failed", eventContext);
+        task.status = "failed";
+        task.metadata = metadata;
     }
     async recordReviewMetadata(task, metadata) {
         const patch = mergeMetadata(task.metadata, {
@@ -53,6 +164,10 @@ export class TaskStateService {
             last_review_job_id: metadata.jobId ?? null,
             last_review_id: metadata.reviewId ?? null,
             last_reviewed_at: new Date().toISOString(),
+            ...(metadata.diffEmpty !== undefined ? { last_review_diff_empty: metadata.diffEmpty } : {}),
+            ...(Array.isArray(metadata.changedPaths) && metadata.changedPaths.length
+                ? { last_review_changed_paths: metadata.changedPaths }
+                : {}),
         });
         await this.workspaceRepo.updateTask(task.id, { metadata: patch ?? undefined });
     }

package/dist/services/execution/WorkOnTasksService.d.ts

@@ -6,18 +6,28 @@ import { JobService } from "../jobs/JobService.js";
 import { TaskSelectionService, TaskSelectionFilters, TaskSelectionPlan } from "./TaskSelectionService.js";
 import { TaskStateService } from "./TaskStateService.js";
 import { RoutingService } from "../agents/RoutingService.js";
+import { AgentRatingService } from "../agents/AgentRatingService.js";
 export interface WorkOnTasksRequest extends TaskSelectionFilters {
     workspace: WorkspaceResolution;
     noCommit?: boolean;
     dryRun?: boolean;
     agentName?: string;
     agentStream?: boolean;
+    rateAgents?: boolean;
     baseBranch?: string;
+    autoMerge?: boolean;
+    autoPush?: boolean;
+    workRunner?: string;
+    useCodali?: boolean;
+    agentAdapterOverride?: string;
     onAgentChunk?: (chunk: string) => void;
+    abortSignal?: AbortSignal;
+    maxAgentSeconds?: number;
+    allowFileOverwrite?: boolean;
 }
 export interface TaskExecutionResult {
     taskKey: string;
-    status: "succeeded" | "blocked" | "failed" | "skipped";
+    status: "succeeded" | "failed" | "skipped";
     notes?: string;
     branch?: string;
 }
@@ -36,6 +46,7 @@ export declare class WorkOnTasksService {
     private taskLogSeq;
     private vcs;
     private routingService;
+    private ratingService?;
     private readPromptFiles;
     constructor(workspace: WorkspaceResolution, deps: {
         agentService: AgentService;
@@ -47,21 +58,35 @@ export declare class WorkOnTasksService {
         repo: GlobalRepository;
         vcsClient?: VcsClient;
         routingService: RoutingService;
+        ratingService?: AgentRatingService;
     });
     private loadPrompts;
     private ensureMcoda;
     private writeWorkCheckpoint;
+    private persistPatchArtifact;
     private checkpoint;
     static create(workspace: WorkspaceResolution): Promise<WorkOnTasksService>;
     close(): Promise<void>;
+    setDocdexAvailability(available: boolean, reason?: string): void;
     private resolveAgent;
+    private ensureWorkAgent;
+    private ensureRatingService;
+    private resolveTaskComplexity;
     private nextLogSeq;
     private logTask;
     private recordTokenUsage;
     private updateTaskPhase;
     private gatherDocContext;
+    private parseCommentBody;
+    private buildCommentBacklog;
+    private buildWorkLog;
+    private loadCommentContext;
+    private loadWorkLog;
+    private countCommentBacklogFailures;
+    private applyCommentResolutions;
     private buildPrompt;
     private checkoutBaseBranch;
+    private buildCommitEnv;
     private commitPendingChanges;
     private ensureBranches;
     private formatGitError;
@@ -70,10 +95,16 @@ export declare class WorkOnTasksService {
     private isRemotePermissionError;
     private isCommitHookFailure;
     private isGpgSignFailure;
+    private isDirtyCheckoutError;
     private pushWithRecovery;
     private validateScope;
+    private buildStructuredFileBlocks;
+    private applyStructuredActions;
     private applyPatches;
     private applyFileBlocks;
+    private usesCliBrowserTools;
+    private ensureCypressChromium;
+    private applyChromiumForTests;
     private runTests;
     workOnTasks(request: WorkOnTasksRequest): Promise<WorkOnTasksResult>;
 }

package/dist/services/execution/WorkOnTasksService.d.ts.map

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