@polpo-ai/core 0.15.143 → 0.16.0

package/dist/approval-manager.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-manager.test.js","sourceRoot":"","sources":["../src/approval-manager.test.ts"],"names":[],"mappings":"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"}

package/dist/assessment-orchestrator.d.ts

@@ -1,3 +1,4 @@
+import type { ApprovalManager } from "./approval-manager.js";
 /**
  * AssessmentOrchestrator — handles the full assessment pipeline:
  * result collection → question detection → assessment → auto-correction → judge → fix/retry/fail.
@@ -8,6 +9,7 @@
  */
 import type { OrchestratorContext } from "./orchestrator-context.js";
 import type { Task, TaskResult, ModelConfig } from "./types.js";
+import { type TaskExecutionReference } from "./task-execution.js";
 /**
  * Optional ports for runtime-specific operations that cannot go through
  * OrchestratorContext (to avoid modifying the shared interface).
@@ -46,8 +48,16 @@ export interface AssessmentPorts {
  */
 export declare class AssessmentOrchestrator {
     private ctx;
+    private approvals?;
+    setApprovalManager(manager: ApprovalManager | undefined): void;
     private ports;
+    private execution?;
     constructor(ctx: OrchestratorContext, ports?: AssessmentPorts);
+    private readTask;
+    private executionStore;
+    private patchTask;
+    private transitionTask;
+    private requeueTask;
     private orchestratorModel;
     /**
      * Build a rich ReviewContext from all available data sources:
@@ -67,7 +77,8 @@ export declare class AssessmentOrchestrator {
     private getConfidence;
     /** Check if any failed checks correspond to estimated expectations. */
     private hasEstimatedFailures;
-    handleResult(taskId: string, result: TaskResult): Promise<void>;
+    handleResult(taskId: string, result: TaskResult, execution?: TaskExecutionReference): Promise<void>;
+    private handleExecutionResult;
     /**
      * LLM-classify a potential question, then either resolve+rerun or proceed to assessment.
      */

package/dist/assessment-orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assessment-orchestrator.d.ts","sourceRoot":"","sources":["../src/assessment-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAoD,WAAW,EAAE,MAAM,YAAY,CAAC;AAWlH;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,sEAAsE;IACtE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,iFAAiF;IACjF,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC1F,kDAAkD;IAClD,QAAQ,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC1C,+DAA+D;IAC/D,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACjG,sFAAsF;IACtF,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,KAAK,OAAO,CAAC;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3H;AAED;;;GAGG;AACH,qBAAa,sBAAsB;IAGrB,OAAO,CAAC,GAAG;IAFvB,OAAO,CAAC,KAAK,CAAkB;gBAEX,GAAG,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,eAAe;IAIrE,OAAO,CAAC,iBAAiB;IAOzB;;;;;;OAMG;YACW,kBAAkB;IAmChC;;;;OAIG;YACW,gBAAgB;IA2B9B,wEAAwE;IACxE,OAAO,CAAC,aAAa;IAKrB,uEAAuE;IACvE,OAAO,CAAC,oBAAoB;IAKtB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCrE;;OAEG;YACW,sBAAsB;IAwBpC;;OAEG;YACW,eAAe;IAyC7B;;;OAGG;YACW,oBAAoB;IAkDlC;;;OAGG;YACW,sBAAsB;IA8BpC;;OAEG;YACW,mBAAmB;IAgCjC;;OAEG;YACW,iBAAiB;IA+F/B;;;;;OAKG;YACW,0BAA0B;IA+GxC;;0EAEsE;IACtE,OAAO,CAAC,cAAc;IAoBtB;;;;;OAKG;YACW,iBAAiB;IAmG/B,mFAAmF;IACnF,OAAO,CAAC,SAAS;IAoBjB;;;OAGG;YACW,UAAU;IAsDxB,kEAAkE;IAC5D,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAsGlF"}
+{"version":3,"file":"assessment-orchestrator.d.ts","sourceRoot":"","sources":["../src/assessment-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAoD,WAAW,EAAE,MAAM,YAAY,CAAC;AAKlH,OAAO,EACL,KAAK,sBAAsB,EAA2B,MAAM,qBAAqB,CAAC;AAYpF;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,sEAAsE;IACtE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,iFAAiF;IACjF,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC1F,kDAAkD;IAClD,QAAQ,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC1C,+DAA+D;IAC/D,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACjG,sFAAsF;IACtF,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,KAAK,OAAO,CAAC;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3H;AAED;;;GAGG;AACH,qBAAa,sBAAsB;IAMrB,OAAO,CAAC,GAAG;IALvB,OAAO,CAAC,SAAS,CAAC,CAAkB;IACpC,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAC9D,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAyB;gBAEvB,GAAG,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,eAAe;YAIvD,QAAQ;IAWtB,OAAO,CAAC,cAAc;YAKR,SAAS;YAKT,cAAc;YAMd,WAAW;IAezB,OAAO,CAAC,iBAAiB;IAOzB;;;;;;OAMG;YACW,kBAAkB;IAoChC;;;;OAIG;YACW,gBAAgB;IAsC9B,wEAAwE;IACxE,OAAO,CAAC,aAAa;IAKrB,uEAAuE;IACvE,OAAO,CAAC,oBAAoB;IAKtB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;YAiB3F,qBAAqB;IAuCnC;;OAEG;YACW,sBAAsB;IAyBpC;;OAEG;YACW,eAAe;IAkC7B;;;OAGG;YACW,oBAAoB;IAkDlC;;;OAGG;YACW,sBAAsB;IA8BpC;;OAEG;YACW,mBAAmB;IAiCjC;;OAEG;YACW,iBAAiB;IAiG/B;;;;;OAKG;YACW,0BAA0B;IAgHxC;;0EAEsE;IACtE,OAAO,CAAC,cAAc;IAoBtB;;;;;OAKG;YACW,iBAAiB;IAsG/B,mFAAmF;IACnF,OAAO,CAAC,SAAS;IAqBjB;;;OAGG;YACW,UAAU;IA8CxB,kEAAkE;IAC5D,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAyGlF"}

package/dist/assessment-orchestrator.js

@@ -1,27 +1,68 @@
-/**
- * AssessmentOrchestrator — handles the full assessment pipeline:
- * result collection → question detection → assessment → auto-correction → judge → fix/retry/fail.
- *
- * Pure core version — ZERO Node.js imports.
- * All runtime-specific behavior is injected via OrchestratorContext ports
- * and the optional AssessmentPorts interface.
- */
 import { resolveMissionStore, resolveMissionForTask } from "./mission-store.js";
 import { setAssessment } from "./types.js";
 import { buildFixPrompt, buildRetryPrompt, buildSideEffectFixPrompt, buildSideEffectRetryPrompt, buildJudgePrompt } from "./assessment-prompts.js";
 import { looksLikeQuestion, classifyAsQuestion } from "./question-detector.js";
 import { resolveConfiguredModelSelection } from "./model-profiles.js";
+import { isTaskExecutionStore, normalizeTaskExecutionReference, taskExecutionReference, TaskExecutionError } from "./task-execution.js";
+function isExecutionConflict(error) {
+    return error instanceof TaskExecutionError && error.code === "task_execution_conflict";
+}
 /**
  * Handles the full assessment pipeline: result collection → question detection →
  * assessment → auto-correction → judge → fix/retry/fail.
  */
 export class AssessmentOrchestrator {
     ctx;
+    approvals;
+    setApprovalManager(manager) { this.approvals = manager; }
     ports;
+    execution;
     constructor(ctx, ports) {
         this.ctx = ctx;
         this.ports = ports ?? {};
     }
+    async readTask(taskId) {
+        const task = await this.ctx.taskStore.getTask(taskId);
+        if (this.execution) {
+            const current = task && taskExecutionReference(task);
+            if (!current || current.taskId !== this.execution.taskId || current.revision !== this.execution.revision || current.runId !== this.execution.runId) {
+                throw new TaskExecutionError("task_execution_conflict", "Assessment execution changed");
+            }
+        }
+        return task;
+    }
+    executionStore() {
+        if (!isTaskExecutionStore(this.ctx.taskStore))
+            throw new TaskExecutionError("task_execution_unsupported", "Assessment requires execution persistence");
+        return this.ctx.taskStore;
+    }
+    async patchTask(taskId, updates) {
+        if (!this.execution)
+            return this.ctx.taskStore.updateTask(taskId, updates);
+        return (await this.executionStore().mutateTaskExecution(this.execution, { type: "patch", updates })).task;
+    }
+    async transitionTask(taskId, status, updates) {
+        if (this.execution)
+            return (await this.executionStore().mutateTaskExecution(this.execution, { type: "transition", status, updates })).task;
+        const task = await this.ctx.taskStore.transition(taskId, status);
+        return updates ? this.ctx.taskStore.updateTask(taskId, updates) : task;
+    }
+    async requeueTask(taskId, countRetry, reason, updates) {
+        if (this.execution) {
+            // Publish the next attempt and its complete input together. Once the
+            // revision changes, this assessor must never write through its old scope.
+            await this.executionStore().mutateTaskExecution(this.execution, { type: "requeue", countRetry, reason, updates });
+        }
+        else {
+            if (countRetry) {
+                await this.ctx.taskStore.transition(taskId, "failed");
+                await this.ctx.taskStore.transition(taskId, "pending");
+            }
+            else
+                await this.ctx.taskStore.unsafeSetStatus(taskId, "pending", reason);
+            await this.ctx.taskStore.updateTask(taskId, updates);
+        }
+    }
     orchestratorModel() {
         const selection = this.ctx.config.settings.orchestratorModel;
         return selection
@@ -36,7 +77,7 @@ export class AssessmentOrchestrator {
      * - Task outcomes
      */
     async buildReviewContext(taskId, task, result) {
-        const run = await this.ctx.runStore.getRunByTaskId(taskId);
+        const run = await (this.execution?.runId ? this.ctx.runStore.getRun(this.execution.runId) : this.ctx.runStore.getRunByTaskId(taskId));
         const activity = run?.activity;
         const outcomes = run?.outcomes ?? task.outcomes;
         // Build execution summary from JSONL transcript log (via ctx ports)
@@ -52,7 +93,10 @@ export class AssessmentOrchestrator {
                 }
             }
         }
-        catch { /* best effort — don't fail assessment if log parsing fails */ }
+        catch (error) {
+            if (isExecutionConflict(error))
+                throw error; /* best effort — don't fail assessment if log parsing fails */
+        }
         return {
             taskTitle: task.title,
             taskDescription: task.originalDescription ?? task.description,
@@ -74,8 +118,14 @@ export class AssessmentOrchestrator {
      * Returns true if the task transitioned to done, false if a hook blocked it.
      */
     async transitionToDone(taskId, task, result) {
+        // The assessment has persisted result/phase since the original Task read.
+        // Re-read while preserving this invocation's captured execution reference.
+        const authoritative = await this.readTask(taskId);
+        if (!authoritative)
+            throw new TaskExecutionError("task_execution_conflict", "Assessment Task disappeared");
+        task = structuredClone(authoritative);
         const hookResult = await this.ctx.hooks.runBefore("task:complete", {
-            taskId, task, result,
+            taskId, task, result: structuredClone(authoritative.result ?? result),
         });
         if (hookResult.cancelled) {
             this.ctx.emitter.emit("log", {
@@ -84,14 +134,22 @@ export class AssessmentOrchestrator {
             });
             return false;
         }
+        // Completion hooks can veto, but cannot replace the persisted assessment
+        // or principal. Consent, the done Task and after-hooks expose one output.
+        task = structuredClone(authoritative);
+        result = structuredClone(authoritative.result ?? result);
+        if (!this.approvals && this.ctx.config.settings.approvalGates?.some(gate => gate.hook === "task:complete")) {
+            throw new TaskExecutionError("task_execution_unsupported", "Task approval coordinator is required");
+        }
+        if (this.approvals && !await this.approvals.checkTask("task:complete", authoritative, { task, result }))
+            return false;
+        await this.transitionTask(taskId, "done", { phase: undefined });
         this.ctx.emitter.emit("task:transition", {
             taskId,
             from: task.status,
             to: "done",
             task: { ...task, status: "done" },
         });
-        await this.ctx.taskStore.transition(taskId, "done");
-        await this.ctx.taskStore.updateTask(taskId, { phase: undefined });
         // Fire after:task:complete (async, fire-and-forget)
         this.ctx.hooks.runAfter("task:complete", { taskId, task, result }).catch(() => { });
         return true;
@@ -107,10 +165,32 @@ export class AssessmentOrchestrator {
         const failedTypes = new Set(assessment.checks.filter(c => !c.passed).map(c => c.type));
         return task.expectations.some(e => failedTypes.has(e.type) && this.getConfidence(e) === "estimated");
     }
-    async handleResult(taskId, result) {
-        const task = await this.ctx.taskStore.getTask(taskId);
+    async handleResult(taskId, result, execution) {
+        // A separate scope per invocation keeps concurrent assessors from sharing
+        // mutable attempt identity across their asynchronous work.
+        const scope = new AssessmentOrchestrator(this.ctx, this.ports);
+        scope.setApprovalManager(this.approvals);
+        if (execution) {
+            scope.execution = normalizeTaskExecutionReference(execution);
+            if (execution.taskId !== taskId)
+                throw new TaskExecutionError("task_execution_invalid", "Result Task does not match execution");
+        }
+        try {
+            await scope.handleExecutionResult(taskId, result);
+        }
+        catch (error) {
+            if (!isExecutionConflict(error))
+                throw error;
+            // The old Run remains collectable history; the newer attempt is untouched.
+        }
+    }
+    async handleExecutionResult(taskId, result) {
+        const task = await this.readTask(taskId);
         if (!task)
             return;
+        if (!this.execution && (task.activeRunId !== undefined || task.executionRevision !== undefined)) {
+            throw new TaskExecutionError("task_execution_invalid", "Task result requires its execution reference");
+        }
         // Skip if already terminal
         if (task.status === "done" || task.status === "failed")
             return;
@@ -123,15 +203,14 @@ export class AssessmentOrchestrator {
         });
         // Ensure we're in review state
         if (task.status === "in_progress") {
-            await this.ctx.taskStore.transition(taskId, "review");
-            await this.ctx.taskStore.updateTask(taskId, { phase: "review" });
+            await this.transitionTask(taskId, "review", { phase: "review" });
         }
         // Question detection: intercept before assessment
         const maxQRounds = this.ctx.config.settings.maxQuestionRounds ?? 2;
         const questionRounds = task.questionRounds ?? 0;
         if (result.exitCode === 0 && questionRounds < maxQRounds) {
             // Get activity from RunStore for richer heuristic
-            const run = await this.ctx.runStore.getRunByTaskId(taskId);
+            const run = await (this.execution?.runId ? this.ctx.runStore.getRun(this.execution.runId) : this.ctx.runStore.getRunByTaskId(taskId));
             const activity = run?.activity;
             if (looksLikeQuestion(result, activity)) {
                 await this.handlePossibleQuestion(taskId, task, result);
@@ -162,7 +241,9 @@ export class AssessmentOrchestrator {
                 await this.proceedToAssessment(taskId, task, result);
             }
         }
-        catch {
+        catch (error) {
+            if (isExecutionConflict(error))
+                throw error;
             // Classification failed → proceed normally
             await this.proceedToAssessment(taskId, task, result);
         }
@@ -178,26 +259,23 @@ export class AssessmentOrchestrator {
             : this.generateAnswerInline(task, question);
         try {
             const answer = await answerPromise;
-            this.ctx.emitter.emit("task:answered", { taskId, question, answer });
-            const current = await this.ctx.taskStore.getTask(taskId);
+            const current = await this.readTask(taskId);
             if (!current)
                 return;
-            // Save original description before first Q&A
-            if (!current.originalDescription) {
-                await this.ctx.taskStore.updateTask(taskId, { originalDescription: current.description });
-            }
-            // Clear old outcomes before re-run — the agent will produce fresh ones.
-            await this.ctx.taskStore.updateTask(taskId, { outcomes: [] });
             // Append Q&A to description and re-run (no retry burn)
             const qaBlock = `\n\n[Polpo Clarification]\nQ: ${question}\nA: ${answer}`;
-            await this.ctx.taskStore.unsafeSetStatus(taskId, "pending", "Q&A re-run — no retry burn");
-            await this.ctx.taskStore.updateTask(taskId, {
+            await this.requeueTask(taskId, false, "Q&A re-run — no retry burn", {
+                originalDescription: current.originalDescription ?? current.description,
+                outcomes: [],
                 phase: "execution",
                 description: current.description + qaBlock,
                 questionRounds: (current.questionRounds ?? 0) + 1,
             });
+            this.ctx.emitter.emit("task:answered", { taskId, question, answer });
         }
-        catch {
+        catch (error) {
+            if (isExecutionConflict(error))
+                throw error;
             // Answer generation failed → proceed to assessment normally
             await this.proceedToAssessment(taskId, task, result);
         }
@@ -271,7 +349,9 @@ export class AssessmentOrchestrator {
             try {
                 hookResult = await this.ctx.hooks.runBefore("assessment:run", { taskId, task });
             }
-            catch {
+            catch (error) {
+                if (isExecutionConflict(error))
+                    throw error;
                 // Hook failures must not detach or suppress the assessment lifecycle.
             }
             if (hookResult?.cancelled) {
@@ -279,7 +359,7 @@ export class AssessmentOrchestrator {
                     level: "info",
                     message: `[${taskId}] Assessment blocked by hook: ${hookResult.cancelReason ?? "no reason"}`,
                 });
-                await this.ctx.taskStore.updateTask(taskId, { result });
+                await this.patchTask(taskId, { result });
                 if (result.exitCode === 0) {
                     await this.transitionToDone(taskId, task, result);
                 }
@@ -291,7 +371,7 @@ export class AssessmentOrchestrator {
             await this.runAssessmentFlow(taskId, task, result);
         }
         else {
-            await this.ctx.taskStore.updateTask(taskId, { result });
+            await this.patchTask(taskId, { result });
             if (result.exitCode === 0) {
                 await this.transitionToDone(taskId, task, result);
             }
@@ -319,7 +399,7 @@ export class AssessmentOrchestrator {
         try {
             const assessment = await this.runAssessmentWithRetry(task, this.ctx.agentWorkDir, progressCb, reviewContext, checkProgressCb);
             setAssessment(result, assessment, "initial");
-            await this.ctx.taskStore.updateTask(taskId, { result });
+            await this.patchTask(taskId, { result });
             if (assessment.passed && result.exitCode === 0) {
                 this.ctx.emitter.emit("assessment:complete", {
                     taskId,
@@ -341,7 +421,7 @@ export class AssessmentOrchestrator {
                     message: exitMsg,
                     details: result.stderr || undefined,
                 });
-                await this.ctx.taskStore.updateTask(taskId, { result });
+                await this.patchTask(taskId, { result });
                 this.ctx.emitter.emit("assessment:complete", {
                     taskId,
                     passed: false,
@@ -376,7 +456,9 @@ export class AssessmentOrchestrator {
                             if (!judged)
                                 await this.fixOrRetry(taskId, task, result);
                         }
-                        catch {
+                        catch (error) {
+                            if (isExecutionConflict(error))
+                                throw error;
                             await this.fixOrRetry(taskId, task, result);
                         }
                     }
@@ -390,9 +472,11 @@ export class AssessmentOrchestrator {
             }
         }
         catch (err) {
+            if (isExecutionConflict(err))
+                throw err;
             const message = err instanceof Error ? err.message : String(err);
             this.ctx.emitter.emit("log", { level: "error", message: `[${taskId}] Assessment error: ${message}` });
-            await this.ctx.taskStore.updateTask(taskId, { result });
+            await this.patchTask(taskId, { result });
             await this.retryOrFail(taskId, task, result);
         }
     }
@@ -423,7 +507,7 @@ export class AssessmentOrchestrator {
         if (!fileExists || !baseName)
             return false;
         // Gather agent's actual file list from activity
-        const run = await this.ctx.runStore.getRunByTaskId(taskId);
+        const run = await (this.execution?.runId ? this.ctx.runStore.getRun(this.execution.runId) : this.ctx.runStore.getRunByTaskId(taskId));
         const activity = run?.activity;
         const agentFiles = [
             ...(activity?.filesCreated ?? []),
@@ -476,10 +560,10 @@ export class AssessmentOrchestrator {
         for (const [idx, paths] of corrections) {
             newExpectations[idx] = { ...newExpectations[idx], paths };
         }
-        await this.ctx.taskStore.updateTask(taskId, { expectations: newExpectations });
+        await this.patchTask(taskId, { expectations: newExpectations });
         this.ctx.emitter.emit("assessment:corrected", { taskId, corrections: corrections.size });
         // Re-assess with corrected expectations
-        const current = await this.ctx.taskStore.getTask(taskId);
+        const current = await this.readTask(taskId);
         if (!current)
             return false;
         try {
@@ -487,7 +571,7 @@ export class AssessmentOrchestrator {
             const reCtx = await this.buildReviewContext(taskId, task, result);
             const newAssessment = await this.ctx.assessFn(current, this.ctx.agentWorkDir, progressCb, reCtx, this.ctx.config.settings.reasoning);
             setAssessment(result, newAssessment, "auto-correct");
-            await this.ctx.taskStore.updateTask(taskId, { result });
+            await this.patchTask(taskId, { result });
             if (newAssessment.passed) {
                 this.ctx.emitter.emit("assessment:complete", {
                     taskId,
@@ -499,7 +583,9 @@ export class AssessmentOrchestrator {
                 return this.transitionToDone(taskId, task, result);
             }
         }
-        catch { /* re-assessment failed */
+        catch (error) {
+            if (isExecutionConflict(error))
+                throw error; /* re-assessment failed */
         }
         return false;
     }
@@ -549,14 +635,16 @@ export class AssessmentOrchestrator {
         if (!this.ctx.queryLLM)
             return false;
         // Gather context
-        const run = await this.ctx.runStore.getRunByTaskId(taskId);
+        const run = await (this.execution?.runId ? this.ctx.runStore.getRun(this.execution.runId) : this.ctx.runStore.getRunByTaskId(taskId));
         const activity = run?.activity;
         const prompt = buildJudgePrompt(task, result, assessment, failedChecks, activity);
         let response;
         try {
             response = (await this.ctx.queryLLM(prompt, this.orchestratorModel())).text;
         }
-        catch { /* LLM query failed */
+        catch (error) {
+            if (isExecutionConflict(error))
+                throw error; /* LLM query failed */
             return false;
         }
         // Parse LLM verdict
@@ -567,7 +655,9 @@ export class AssessmentOrchestrator {
             if (!verdict.corrections || !Array.isArray(verdict.corrections))
                 return false;
         }
-        catch { /* malformed JSON response */
+        catch (error) {
+            if (isExecutionConflict(error))
+                throw error; /* malformed JSON response */
             return false;
         }
         // Apply corrections only if LLM found at least one fixable expectation
@@ -600,10 +690,10 @@ export class AssessmentOrchestrator {
         }
         if (correctionCount === 0)
             return false;
-        await this.ctx.taskStore.updateTask(taskId, { expectations: newExpectations });
+        await this.patchTask(taskId, { expectations: newExpectations });
         this.ctx.emitter.emit("assessment:corrected", { taskId, corrections: correctionCount });
         // Re-assess with corrected expectations
-        const current = await this.ctx.taskStore.getTask(taskId);
+        const current = await this.readTask(taskId);
         if (!current)
             return false;
         try {
@@ -611,7 +701,7 @@ export class AssessmentOrchestrator {
             const judgeCtx = await this.buildReviewContext(taskId, task, result);
             const newAssessment = await this.ctx.assessFn(current, this.ctx.agentWorkDir, progressCb, judgeCtx, this.ctx.config.settings.reasoning);
             setAssessment(result, newAssessment, "judge");
-            await this.ctx.taskStore.updateTask(taskId, { result });
+            await this.patchTask(taskId, { result });
             if (newAssessment.passed) {
                 this.ctx.emitter.emit("assessment:complete", {
                     taskId,
@@ -623,7 +713,9 @@ export class AssessmentOrchestrator {
                 return this.transitionToDone(taskId, task, result);
             }
         }
-        catch { /* re-assessment failed */
+        catch (error) {
+            if (isExecutionConflict(error))
+                throw error; /* re-assessment failed */
         }
         return false;
     }
@@ -649,7 +741,10 @@ export class AssessmentOrchestrator {
                 }
             }
         }
-        catch { /* permission error or missing dir */ }
+        catch (error) {
+            if (isExecutionConflict(error))
+                throw error; /* permission error or missing dir */
+        }
         return null;
     }
     /**
@@ -657,7 +752,7 @@ export class AssessmentOrchestrator {
      * without burning a full retry. After maxFixAttempts, fall back to full retry.
      */
     async fixOrRetry(taskId, _task, result) {
-        const current = await this.ctx.taskStore.getTask(taskId);
+        const current = await this.readTask(taskId);
         if (!current)
             return;
         // Side-effects guard: block automatic fix/retry for tasks with irreversible actions.
@@ -669,37 +764,31 @@ export class AssessmentOrchestrator {
             this.ctx.emitter.emit("log", { level: "warn", message: `[${taskId}] ${reason}` });
             // Preserve original description and prepare fix prompt for when approval comes
             if (!current.originalDescription) {
-                await this.ctx.taskStore.updateTask(taskId, { originalDescription: current.description });
+                await this.patchTask(taskId, { originalDescription: current.description });
             }
-            await this.ctx.taskStore.updateTask(taskId, {
+            await this.patchTask(taskId, {
                 description: buildSideEffectFixPrompt(current, result),
                 phase: "fix",
             });
-            await this.ctx.taskStore.transition(taskId, "awaiting_approval");
+            await this.transitionTask(taskId, "awaiting_approval");
             return;
         }
         const maxFix = this.ctx.config.settings.maxFixAttempts ?? 2;
         const fixAttempts = (current.fixAttempts ?? 0) + 1;
         if (fixAttempts <= maxFix) {
-            // Save original description before first fix/retry
-            if (!current.originalDescription) {
-                await this.ctx.taskStore.updateTask(taskId, { originalDescription: current.description });
-            }
-            this.ctx.emitter.emit("task:fix", { taskId, attempt: fixAttempts, maxFix });
-            // Clear old outcomes — the agent will produce fresh ones on re-execution.
-            await this.ctx.taskStore.updateTask(taskId, { outcomes: [] });
-            // unsafeSetStatus bypasses retry increment (fix attempts are NOT real failures)
-            await this.ctx.taskStore.unsafeSetStatus(taskId, "pending", "fix phase — no retry burn");
-            await this.ctx.taskStore.updateTask(taskId, {
+            await this.requeueTask(taskId, false, "fix phase — no retry burn", {
+                originalDescription: current.originalDescription ?? current.description,
+                outcomes: [],
                 phase: "fix",
                 fixAttempts,
                 description: buildFixPrompt(current, result),
             });
+            this.ctx.emitter.emit("task:fix", { taskId, attempt: fixAttempts, maxFix });
         }
         else {
             // Fix attempts exhausted → full retry (burns 1 retry)
             this.ctx.emitter.emit("log", { level: "warn", message: `[${taskId}] Fix attempts exhausted (${maxFix}), falling back to full retry` });
-            await this.ctx.taskStore.updateTask(taskId, {
+            await this.patchTask(taskId, {
                 phase: "execution",
                 fixAttempts: 0,
             });
@@ -708,7 +797,20 @@ export class AssessmentOrchestrator {
     }
     /** @internal — exposed for test access via Orchestrator facade */
     async retryOrFail(taskId, _task, result) {
-        const current = await this.ctx.taskStore.getTask(taskId);
+        if (!this.execution && isTaskExecutionStore(this.ctx.taskStore)) {
+            const scope = new AssessmentOrchestrator(this.ctx, this.ports);
+            scope.setApprovalManager(this.approvals);
+            scope.execution = taskExecutionReference(_task);
+            try {
+                await scope.retryOrFail(taskId, _task, result);
+            }
+            catch (error) {
+                if (!isExecutionConflict(error))
+                    throw error;
+            }
+            return;
+        }
+        const current = await this.readTask(taskId);
         if (!current)
             return;
         // Side-effects guard: block automatic retry for tasks with irreversible actions.
@@ -718,13 +820,13 @@ export class AssessmentOrchestrator {
             this.ctx.emitter.emit("log", { level: "warn", message: `[${taskId}] ${reason}` });
             // Preserve original description and prepare retry prompt for when approval comes
             if (!current.originalDescription) {
-                await this.ctx.taskStore.updateTask(taskId, { originalDescription: current.description });
+                await this.patchTask(taskId, { originalDescription: current.description });
             }
-            await this.ctx.taskStore.updateTask(taskId, {
+            await this.patchTask(taskId, {
                 description: buildSideEffectRetryPrompt(current, result),
                 phase: "execution",
             });
-            await this.ctx.taskStore.transition(taskId, "awaiting_approval");
+            await this.transitionTask(taskId, "awaiting_approval");
             return;
         }
         // Don't retry tasks from cancelled missions — resolve via missionId (direct FK) first
@@ -732,7 +834,7 @@ export class AssessmentOrchestrator {
             const mission = await resolveMissionForTask(resolveMissionStore(this.ctx), current);
             if (mission && mission.status === "cancelled") {
                 this.ctx.emitter.emit("log", { level: "debug", message: `[${taskId}] Skipping retry — mission cancelled` });
-                await this.ctx.taskStore.transition(taskId, "failed");
+                await this.transitionTask(taskId, "failed");
                 return;
             }
         }
@@ -741,7 +843,7 @@ export class AssessmentOrchestrator {
             const nextAttempt = current.retries + 1;
             // Save original description before first retry
             if (!current.originalDescription) {
-                await this.ctx.taskStore.updateTask(taskId, { originalDescription: current.description });
+                await this.patchTask(taskId, { originalDescription: current.description });
             }
             // Check if we should escalate to a different agent
             // fallbackAgent resolution: explicit policy > agent.reportsTo (org chart)
@@ -757,18 +859,14 @@ export class AssessmentOrchestrator {
                     }
                 }
             }
-            this.ctx.emitter.emit("task:retry", { taskId, attempt: nextAttempt, maxRetries: current.maxRetries });
-            // Clear old outcomes — the agent will produce fresh ones on re-execution.
-            // Without this, outcomes accumulate across retries and all get re-sent via notifications.
-            await this.ctx.taskStore.updateTask(taskId, { outcomes: [] });
-            await this.ctx.taskStore.transition(taskId, "failed");
-            await this.ctx.taskStore.transition(taskId, "pending");
-            await this.ctx.taskStore.updateTask(taskId, {
+            await this.requeueTask(taskId, true, "Assessment retry", {
+                outcomes: [],
                 description: buildRetryPrompt(current, result),
                 assignTo,
                 phase: "execution",
                 fixAttempts: 0,
             });
+            this.ctx.emitter.emit("task:retry", { taskId, attempt: nextAttempt, maxRetries: current.maxRetries });
         }
         else {
             this.ctx.emitter.emit("task:maxRetries", { taskId });
@@ -787,8 +885,7 @@ export class AssessmentOrchestrator {
                     });
                     return; // Escalation manager (or other hook) is handling this
                 }
-                await this.ctx.taskStore.transition(taskId, "failed");
-                await this.ctx.taskStore.updateTask(taskId, { phase: undefined });
+                await this.transitionTask(taskId, "failed", { phase: undefined });
                 // Fire after:task:fail
                 this.ctx.hooks.runAfter("task:fail", {
                     taskId,
@@ -797,10 +894,11 @@ export class AssessmentOrchestrator {
                     reason: "maxRetries",
                 }).catch(() => { });
             }
-            catch {
+            catch (error) {
+                if (isExecutionConflict(error))
+                    throw error;
                 // Hook failed — fail the task normally
-                await this.ctx.taskStore.transition(taskId, "failed");
-                await this.ctx.taskStore.updateTask(taskId, { phase: undefined });
+                await this.transitionTask(taskId, "failed", { phase: undefined });
             }
         }
     }