@zq-silk/yui 0.8.3 → 0.8.7

package/dist/commands/taskCommands.js

@@ -5,10 +5,11 @@ import { buildRunContextPack, buildRunContextDelta, contextSnapshotDeltaRefIds,
 import { contextSnapshotRef } from "../context/contextSnapshot.js";
 import { CliError, dataError, roleNotFound, runtimeError, taskNotFound, usageError } from "../errors/cliError.js";
 import { createTaskEvent } from "../event/taskEvent.js";
+import { createTaskRecordRetirement, isTaskRecordRetired, taskRecordRetirement } from "../task/taskRecordRetirement.js";
 import { clearMatchingLeaderStallAttention, isRoleRunStalled, RUN_PROGRESS_EVENT, RUN_RECOVERED_EVENT } from "../scheduler/roleRunStall.js";
 import { readCommandText } from "./textInput.js";
 import { assertTaskCompletionPublishedTreeProof } from "./taskCompletionGate.js";
-import { createRoleSessionSet, roleAgentSessionResumeMode, updateTaskRoleProviderRuntime } from "../executor/agentExecutor.js";
+import { createRoleSessionSet, retireTaskRoleSessionsForWorkspace, roleAgentSessionResumeMode, updateTaskRoleProviderRuntime } from "../executor/agentExecutor.js";
 import { currentProviderActivation, transferProviderAuthority } from "../runtime/providerRuntimeIdentity.js";
 import { resolveEffectiveLaunch } from "../executor/effectiveLaunch.js";
 import { defaultTableWidth, renderTable } from "../output/table.js";
@@ -35,7 +36,7 @@ import { mailboxHasWork as workMailboxHasWork, nextPendingBatch } from "../coord
 import { RUNTIME_CLEANUP_REQUIRED_REASON, runtimeLifecycleTarget } from "../runtime/lifecycleReservation.js";
 import { blockingProviderContinuations, projectProviderContinuations } from "../runtime/runtimeContinuationProjection.js";
 import { runtimeObservationFromTaskEvent } from "../runtime/runtimeObservation.js";
-import { activateTask, addTaskProjectBinding, archiveTask, completeTask, createTask, retireTask, reopenTask, updateTaskMetadata } from "../task/task.js";
+import { activateTask, addTaskProjectBinding, archiveTask, completeTask, createTask, retireTask, reopenTask, taskDeliveryPath, updateTaskMetadata } from "../task/task.js";
 import { resolveTaskRecordReference } from "../task/taskRecordReference.js";
 import { TASK_COMPLETION_PUBLISHED_TREE_AUTHORIZED_EVENT } from "../task/publicationReference.js";
 import { projectCompletionReadiness } from "../task/completionReadiness.js";
@@ -44,6 +45,8 @@ import { acquireProjectMaintenanceLocks } from "../repository/projectMaintenance
 import { currentWorkItemCandidate, governingWorkItemCandidate, currentWorkItemExecutionGroup, workItemExecutionGroupById, createWorkItem, attachWorkItemExecutionGroup, updateWorkItemExecutionGroup, retireWorkItem, retryFailedWorkItem, submitWorkItemCandidate, updateWorkItemWriteProjects, updateWorkItemStatus } from "../workItem/workItem.js";
 import { addExecutionLane, createExecutionGroup, resolveExecutionGroup, restartExecutionLane, updateExecutionLane } from "../execution/executionGroup.js";
 import { sameTaskFinalReviewContract, taskFinalReviewConfig, validateTaskFinalReviewContract } from "../review/taskFinalReviewContract.js";
+import { classifyReviewRoundOutcome, isSemanticReviewRound } from "../review/reviewOutcomeClassifier.js";
+import { TASK_FINAL_REVIEW_CONTRACT_REBOUND_EVENT, createTaskFinalReviewContractRebind, resolveRecordedTaskFinalReviewContract, taskFinalReviewContractRebindPayload } from "../review/taskFinalReviewContractRebind.js";
 import { managedWorkspaceKey } from "../worktree/managedWorkspace.js";
 import { hasAgentConfigOptions, parseRoleOptions, patchRoleAgentBinding, roleOptionSpecs, roleProfilePatch } from "./roleConfiguration.js";
 import { hasRoleLaunchContextOptions, validateConfiguredRoleSkills } from "./roleSkillValidation.js";
@@ -52,7 +55,7 @@ import { runTaskContextCommand } from "./taskContextCommand.js";
 import { runTaskNextActionCommand } from "./taskNextActionCommand.js";
 import { runDeliveryGuardPreflight, withGuardWarnings } from "./deliveryGuardPreflight.js";
 import { inspectTaskRoleRuntimeStatuses, renderTaskRoleRuntimeStatus, taskRoleActiveWorkLabel, taskRoleLastRunLabel, taskRoleNativeSessionLabel, taskRoleOpenInputLabel, taskRoleTmuxLabel } from "./taskRoleRuntimeStatus.js";
-import { assertNoOpenInputRequests, openInputRequestCount, runTaskInputCommand } from "./taskInputCommands.js";
+import { assertNoOpenInputRequests, isCurrentGlobalOperator, openInputRequestCount, runTaskInputCommand } from "./taskInputCommands.js";
 import { runGrantCommand } from "./grantCommands.js";
 import { runWorkflowCommand } from "./workflowCommands.js";
 import { taskActor as resolveTaskActor, taskLeaderActionRunId } from "./taskActor.js";
@@ -81,21 +84,17 @@ function legacyWorkItemReviewConfig(config) {
     return config?.trigger === "final" ? null : config;
 }
 function storedTaskFinalReviewContract(store, taskId) {
-    const contracts = store.listWorkItems(taskId)
-        .flatMap((item) => {
-        const candidate = governingWorkItemCandidate(item);
-        return candidate?.taskFinalReviewContract === undefined
-            ? []
-            : [candidate.taskFinalReviewContract];
-    });
-    const first = contracts[0];
-    if (first === undefined)
-        return undefined;
-    validateTaskFinalReviewContract(first);
-    if (contracts.some((contract) => !sameTaskFinalReviewContract(first, contract))) {
-        throw dataError(`Task ${taskId} contains conflicting final-review contracts.`);
+    return storedTaskFinalReviewContractResolution(store, taskId)?.effective;
+}
+function storedTaskFinalReviewContractResolution(store, taskId) {
+    try {
+        return resolveRecordedTaskFinalReviewContract(taskId, store.listWorkItems(taskId), store.listReviewRounds(taskId), store.listEvents(taskId));
+    }
+    catch (error) {
+        throw dataError(error instanceof Error
+            ? error.message
+            : `Task ${taskId} contains conflicting final-review contracts.`);
     }
-    return first;
 }
 /**
  * Resolve one exact Task-local contract before the caller performs any write.
@@ -367,12 +366,14 @@ function taskProjectCommand(args, store, options) {
     return output(`Added Project to ${updated.id}\n`, { task: updated });
 }
 function updateTaskCommand(args, store, options) {
-    const optionNames = new Set(["--title", "--description", "--priority", "--tags", "--due-at"]);
+    const optionNames = new Set([
+        "--title", "--description", "--priority", "--tags", "--due-at", "--delivery"
+    ]);
     const flagOptions = new Set([
         "--clear-description", "--clear-priority", "--clear-tags", "--clear-due-at",
         "--require-integration"
     ]);
-    const usage = "Task update usage: yui task update <id> [--title <text>] [--description <text>|--clear-description] [--priority <low|medium|high|urgent>|--clear-priority] [--tags <comma-separated>|--clear-tags] [--due-at <RFC3339>|--clear-due-at] [--require-integration].";
+    const usage = "Task update usage: yui task update <id> [--title <text>] [--description <text>|--clear-description] [--priority <low|medium|high|urgent>|--clear-priority] [--tags <comma-separated>|--clear-tags] [--due-at <RFC3339>|--clear-due-at] [--delivery <direct|integrated>] [--require-integration].";
     const parsed = parseTail(args, optionNames, usage, flagOptions);
     exactPositionals(parsed.positionals, 1, usage);
     if (parsed.options.size === 0)
@@ -396,19 +397,42 @@ function updateTaskCommand(args, store, options) {
     const tags = parsed.options.has("--tags")
         ? parseTaskTags(requiredOption(parsed.options, "--tags"))
         : undefined;
+    const requestedDelivery = parsed.options.has("--delivery")
+        ? parseTaskDelivery(requiredOption(parsed.options, "--delivery"))
+        : undefined;
+    if (requestedDelivery === "direct" && parsed.options.has("--require-integration")) {
+        throw usageError("--delivery direct conflicts with --require-integration.", usage);
+    }
+    const enableIntegration = requestedDelivery === "integrated"
+        || parsed.options.has("--require-integration");
     const now = clock(options);
     const result = store.transaction((tx) => {
         const current = requireTask(tx, parsed.positionals[0]);
         if (current.status === "archived")
             throw usageError(`Task is archived: ${current.id}.`);
-        if (parsed.options.has("--require-integration") && current.status === "completed") {
+        if ((requestedDelivery !== undefined || parsed.options.has("--require-integration"))
+            && current.projectBindings.length === 0) {
+            throw usageError(`Task ${current.id} has no Project; delivery selection is not applicable.`);
+        }
+        if (requestedDelivery === "direct" && current.requireIntegration === true) {
+            throw usageError(`Task ${current.id} already uses integrated delivery and cannot be downgraded to direct.`);
+        }
+        if (enableIntegration && current.status === "completed") {
             throw usageError(`Task ${current.id} is completed; use task reopen before enabling integration evidence.`);
         }
+        if (enableIntegration && current.requireIntegration !== true) {
+            assertTaskDeliveryPromotionEligible(tx, current, options.directTaskMainSnapshot);
+        }
         if (parsed.options.size === 1
-            && parsed.options.has("--require-integration")
+            && enableIntegration
             && current.requireIntegration === true) {
             return { task: current, integrationState: "already-enabled" };
         }
+        if (parsed.options.size === 1
+            && requestedDelivery === "direct"
+            && taskDeliveryPath(current) === "direct") {
+            return { task: current, integrationState: "already-direct" };
+        }
         const updated = updateTaskMetadata(current, {
             ...(parsed.options.has("--title") ? { title: requiredOption(parsed.options, "--title") } : {}),
             ...(parsed.options.has("--description")
@@ -423,31 +447,93 @@ function updateTaskCommand(args, store, options) {
             ...(dueAt === undefined
                 ? parsed.options.has("--clear-due-at") ? { dueAt: null } : {}
                 : { dueAt }),
-            ...(parsed.options.has("--require-integration") ? { requireIntegration: true } : {})
+            ...(enableIntegration ? { requireIntegration: true } : {})
         }, now);
         tx.saveTask(updated);
         recordTaskEvent(tx, updated.id, "task.updated", {
             status: updated.status,
-            ...(parsed.options.has("--require-integration")
-                ? { completionEvidence: "integration-required" }
-                : {})
+            ...(requestedDelivery === undefined && !parsed.options.has("--require-integration")
+                ? {}
+                : {
+                    completionEvidence: enableIntegration
+                        ? "integration-required"
+                        : "direct",
+                    deliveryPath: taskDeliveryPath(updated)
+                })
         }, now);
         enqueueWork(tx, taskMailbox(updated.id), "task-updated", now, [taskRef(updated.id)]);
         return {
             task: updated,
-            integrationState: parsed.options.has("--require-integration")
+            integrationState: enableIntegration
                 ? "enabled"
-                : "unchanged"
+                : requestedDelivery === "direct"
+                    ? "direct"
+                    : "unchanged"
         };
     });
-    if (result.integrationState !== "already-enabled") {
+    if (result.integrationState !== "already-enabled"
+        && result.integrationState !== "already-direct") {
         notifyMailbox(options.runtime, taskMailbox(result.task.id), result.task.id);
     }
     return result.integrationState === "enabled"
-        ? `Updated task ${result.task.id}\nCompletion evidence enabled: WorkItem, ChangeSet, and committed Integration required\n`
+        ? `Updated task ${result.task.id}\nDelivery: integrated (WorkItem, ChangeSet, and committed Integration required)\n`
         : result.integrationState === "already-enabled"
-            ? `Task ${result.task.id} completion evidence is already enabled\n`
-            : `Updated task ${result.task.id}\n`;
+            ? `Task ${result.task.id} already uses integrated delivery\n`
+            : result.integrationState === "already-direct"
+                ? `Task ${result.task.id} already uses direct delivery\n`
+                : result.integrationState === "direct"
+                    ? `Updated task ${result.task.id}\nDelivery: direct\n`
+                    : `Updated task ${result.task.id}\n`;
+}
+function assertTaskDeliveryPromotionEligible(store, task, snapshot) {
+    const evidence = [
+        ...store.listWorkItems(task.id).map(({ id }) => `WorkItem ${id}`),
+        ...store.listChangeSets(task.id).map(({ id }) => `ChangeSet ${id}`),
+        ...store.listIntegrationAttempts(task.id).map(({ id }) => `IntegrationAttempt ${id}`),
+        ...store.listReviewRounds(task.id).map(({ id }) => `ReviewRound ${id}`)
+    ];
+    if (evidence.length > 0) {
+        throw usageError(`Task ${task.id} cannot promote to integrated delivery after delivery evidence exists: `
+            + `${evidence.join(", ")}. Create an integrated replacement Task or keep the current direct contract.`);
+    }
+    if (task.status !== "draft" && task.status !== "active") {
+        throw usageError(`Task ${task.id} must be Draft or Active to promote delivery; current status is ${task.status}.`);
+    }
+    const workspace = store.getTaskWorkspace(task.id);
+    if (task.status === "draft" && workspace === null)
+        return;
+    if (snapshot === undefined) {
+        throw usageError(`Task ${task.id} delivery promotion requires a CLI-verified clean Task-main snapshot.`);
+    }
+    if (workspace === null
+        || workspace.owner.type !== "task"
+        || workspace.owner.taskId !== task.id) {
+        throw usageError(`Task has no authoritative main workspace: ${task.id}.`);
+    }
+    const snapshotIds = snapshot.schemaVersion === 1 && Array.isArray(snapshot.projects)
+        ? snapshot.projects.map(({ projectId }) => projectId)
+        : [];
+    if (snapshotIds.length !== task.projectBindings.length
+        || new Set(snapshotIds).size !== snapshotIds.length) {
+        throw usageError(`Task-main promotion snapshot does not match bound Projects: ${task.id}.`);
+    }
+    for (const binding of task.projectBindings) {
+        const project = snapshot.projects.find(({ projectId }) => projectId === binding.projectId);
+        const entry = workspace.entries.find(({ projectId }) => projectId === binding.projectId);
+        if (project === undefined
+            || entry === undefined
+            || entry.access !== "write"
+            || project.directory !== entry.directory
+            || project.branch !== entry.branch
+            || project.baseCommit !== entry.baseCommit) {
+            throw usageError(`Task-main promotion snapshot changed before mutation: ${task.id}/${binding.projectId}.`);
+        }
+        if (project.headCommit !== project.baseCommit) {
+            throw usageError(`Task ${task.id} main already advanced for Project ${binding.projectId}; `
+                + "cannot promote without losing ChangeSet provenance. Create an integrated replacement "
+                + "Task or keep the current direct contract.");
+        }
+    }
 }
 /** Compatibility helper for call sites that cannot yet handle foreground enter. */
 export function runTaskOutputCommand(args, store, options = {}) {
@@ -488,13 +574,20 @@ function createTaskCommand(args, store, options) {
     notifyMailbox(options.runtime, taskMailbox(created.task.id), created.task.id);
     return output(`Created Draft task ${created.task.id}: ${created.task.title}\n`
         + `Assigned role: ${created.leader.name}\n`
+        + `Delivery: ${taskDeliveryPath(created.task)}\n`
         + (created.task.requireIntegration
             ? "Completion: WorkItem, ChangeSet, and committed Integration required\n"
-            : "Completion: delivery integration not required\n"), { task: created.task, leader: created.leader });
+            : created.task.projectBindings.length > 0
+                ? "Completion: clean committed Task main required; no WorkItem, ChangeSet, IntegrationAttempt, or managed ReviewRound required\n"
+                : "Completion: no Project delivery evidence required\n"), {
+        task: created.task,
+        leader: created.leader,
+        deliveryPath: taskDeliveryPath(created.task)
+    });
 }
 function parseTaskCreation(args, store) {
-    const usage = "Task create usage: yui task create <title> [--project <project> ...] [--base <project>=<ref> ...] [--require-integration].";
-    const parsed = parseMultiValueTail(args, new Set(), new Set(["--project", "--base"]), usage, new Set(["--require-integration"]));
+    const usage = "Task create usage: yui task create <title> [--project <project> ...] [--base <project>=<ref> ...] [--delivery <direct|integrated>] [--require-integration].";
+    const parsed = parseMultiValueTail(args, new Set(["--delivery"]), new Set(["--project", "--base"]), usage, new Set(["--require-integration"]));
     exactPositionals(parsed.positionals, 1, usage);
     const projectReferences = parsed.multiOptions.get("--project") ?? [];
     const baseOptions = parsed.multiOptions.get("--base") ?? [];
@@ -510,6 +603,16 @@ function parseTaskCreation(args, store) {
     if (new Set(projects.map(({ id }) => id)).size !== projects.length) {
         throw usageError("A Task cannot bind the same Project more than once.");
     }
+    const requestedDelivery = parsed.options.has("--delivery")
+        ? parseTaskDelivery(requiredOption(parsed.options, "--delivery"))
+        : undefined;
+    if ((requestedDelivery !== undefined || parsed.options.has("--require-integration"))
+        && projects.length === 0) {
+        throw usageError("Delivery selection requires at least one --project.", usage);
+    }
+    if (requestedDelivery === "direct" && parsed.options.has("--require-integration")) {
+        throw usageError("--delivery direct conflicts with --require-integration.", usage);
+    }
     const bases = new Map();
     for (const option of baseOptions) {
         const separator = option.indexOf("=");
@@ -540,7 +643,8 @@ function parseTaskCreation(args, store) {
             baseRef: bases.get(project.id) ?? project.developmentBranch
         })),
         defaultProjectIds,
-        requireIntegration: parsed.options.has("--require-integration")
+        requireIntegration: requestedDelivery === "integrated"
+            || parsed.options.has("--require-integration")
     };
 }
 function createTaskAggregate(store, title, metadata, now, defaultProjectIds = []) {
@@ -550,6 +654,7 @@ function createTaskAggregate(store, title, metadata, now, defaultProjectIds = []
     store.saveRole(task.id, leader);
     recordTaskEvent(store, task.id, "task.created", {
         status: task.status,
+        deliveryPath: taskDeliveryPath(task),
         ...(defaultProjectIds.length === 0
             ? {}
             : { defaultProjectIds: defaultProjectIds.join(",") })
@@ -598,11 +703,16 @@ function showTaskCommand(args, store) {
         `Task: ${task.id}`,
         `Title: ${task.title}`,
         `Status: ${task.status}`,
+        `Delivery: ${taskDeliveryPath(task)}`,
         ...(task.description === undefined ? [] : [`Description: ${task.description}`]),
         ...(task.priority === undefined ? [] : [`Priority: ${task.priority}`]),
         ...(task.tags === undefined ? [] : [`Tags: ${task.tags.join(", ")}`]),
         ...(task.dueAt === undefined ? [] : [`Due: ${presentTime(task.dueAt, timeZone)}`]),
-        `Completion evidence: ${task.requireIntegration === true ? "required" : "not required"}`,
+        `Completion evidence: ${task.requireIntegration === true
+            ? "WorkItem, ChangeSet, and committed Integration required"
+            : task.projectBindings.length > 0
+                ? "clean committed Task main required"
+                : "no Project evidence required"}`,
         ...(task.completedAt === undefined ? [] : [`Completed: ${presentTime(task.completedAt, timeZone)}`]),
         ...(task.completedBy === undefined ? [] : [`Completed by: ${task.completedBy}`]),
         ...(task.completionSummary === undefined ? [] : [`Completion summary: ${task.completionSummary}`]),
@@ -631,7 +741,12 @@ function showTaskCommand(args, store) {
         `Created: ${presentTime(task.createdAt, timeZone)}`,
         `Updated: ${presentTime(task.updatedAt, timeZone)}`
     ].join("\n").concat("\n");
-    return output(rendered, { task, counts, hasBrief: brief !== null });
+    return output(rendered, {
+        task,
+        deliveryPath: taskDeliveryPath(task),
+        counts,
+        hasBrief: brief !== null
+    });
 }
 function activateTaskCommand(args, store, options) {
     exactPositionals(args, 1, "Task activate usage: yui task activate <task>.");
@@ -677,14 +792,18 @@ function completeTaskCommand(args, store, options) {
                 task,
                 changed: false,
                 runtimeCleanupTargets: [],
+                completionAdvisories: [],
                 finalReview: undefined,
                 publishedTreeAuthorization: undefined
             };
         }
         const taskFinalContract = preflight.taskFinalReviewContract;
+        const actualTaskCandidate = task.projectBindings.length === 0
+            ? undefined
+            : actualTaskReviewCandidateForMutation(tx, task, options);
         const publishedTreeProof = request.acceptedPublishedTreePublicationId === undefined
             ? undefined
-            : assertTaskCompletionPublishedTreeProof(tx, task, request.acceptedPublishedTreePublicationId, options.completionPublishedTreeProof, actualTaskReviewCandidateForMutation(tx, task, options));
+            : assertTaskCompletionPublishedTreeProof(tx, task, request.acceptedPublishedTreePublicationId, options.completionPublishedTreeProof, actualTaskCandidate);
         const requiresContractHandoff = publishedTreeProof !== undefined
             && taskFinalContract !== undefined;
         if (requiresContractHandoff && actor !== "leader") {
@@ -695,6 +814,7 @@ function completeTaskCommand(args, store, options) {
                 task,
                 changed: false,
                 runtimeCleanupTargets: [],
+                completionAdvisories: [],
                 finalReview: undefined,
                 publishedTreeAuthorization: {
                     event,
@@ -752,6 +872,7 @@ function completeTaskCommand(args, store, options) {
                 task,
                 changed: false,
                 runtimeCleanupTargets: [],
+                completionAdvisories: [],
                 finalReview,
                 resumedPendingFinalReview: pendingFinalReviewIds.has(finalReview.id),
                 terminalizedLeaderRun,
@@ -783,13 +904,29 @@ function completeTaskCommand(args, store, options) {
                 by: actor,
                 projectId: publishedTreeProof.projectId,
                 publicationId: publishedTreeProof.publicationId,
-                reviewRoundId: publishedTreeProof.reviewRoundId,
+                ...(publishedTreeProof.reviewRoundId === undefined
+                    ? {}
+                    : { reviewRoundId: publishedTreeProof.reviewRoundId }),
                 localCommit: publishedTreeProof.localCommit,
                 remoteCommit: publishedTreeProof.remoteCommit,
                 tree: publishedTreeProof.tree
             }, now);
         }
-        recordTaskEvent(tx, task.id, "task.completed", { by: actor, summary }, now);
+        recordTaskEvent(tx, task.id, "task.completed", {
+            by: actor,
+            summary,
+            deliveryPath: taskDeliveryPath(task),
+            ...(actualTaskCandidate === undefined
+                ? {}
+                : {
+                    projectHeads: actualTaskCandidate.projects
+                        .map(({ projectId, commit }) => `${projectId}@${commit}`)
+                        .join(",")
+                }),
+            ...(readiness.advisories.length === 0
+                ? {}
+                : { cleanupAdvisories: String(readiness.advisories.length) })
+        }, now);
         // A terminal Task must never leave a Task-lane signal that can wake it.
         // The durable records remain intact; only the derived mailbox work is
         // discarded at this lifecycle boundary.
@@ -805,6 +942,7 @@ function completeTaskCommand(args, store, options) {
             task: completed,
             changed: true,
             runtimeCleanupTargets,
+            completionAdvisories: readiness.advisories,
             finalReview: undefined,
             resumedPendingFinalReview: false,
             terminalizedLeaderRun,
@@ -841,9 +979,17 @@ function completeTaskCommand(args, store, options) {
             [TERMINALIZED_LEADER_BEFORE_FINAL_REVIEW]: result.terminalizedLeaderRun
         });
     }
-    return output(result.changed
+    const completionOutput = result.changed
         ? `Completed task ${result.task.id}\n`
-        : `Task ${result.task.id} is already completed\n`);
+        : `Task ${result.task.id} is already completed\n`;
+    const advisoryOutput = result.completionAdvisories.length === 0
+        ? ""
+        : `Cleanup advisories (non-blocking; settle before archive):\n`
+            + result.completionAdvisories.map((advisory) => (`- ${advisory.code} (${advisory.ref.kind} ${advisory.ref.id}): ${advisory.fix}`)).join("\n").concat("\n");
+    return output(completionOutput + advisoryOutput, {
+        task: result.task,
+        completionAdvisories: result.completionAdvisories
+    });
 }
 function reopenTaskCommand(args, store, options) {
     exactPositionals(args, 1, "Task reopen usage: yui task reopen <id>.");
@@ -1203,23 +1349,79 @@ function taskMessageCommand(args, store, options) {
         }
         if (messages.length === 0)
             return "No messages found.\n";
+        const retirements = new Map(store.listEvents(task.id).flatMap((event) => {
+            const retirement = taskRecordRetirement(event);
+            return retirement?.recordKind === "message"
+                ? [[retirement.recordId, retirement]]
+                : [];
+        }));
         const timeZone = store.getConfig().timeZone;
         return `${renderTable(`Task messages: ${task.id}`, [
             { header: "Message", minWidth: 7, maxWidth: 18 },
+            { header: "Status", minWidth: 6, maxWidth: 9 },
             { header: "Author", minWidth: 6, maxWidth: 18 },
             { header: "Created", minWidth: 10, maxWidth: 28 },
             { header: "Body", minWidth: 8, maxWidth: 72 }
         ], messages.map((message) => [
             message.id,
+            retirements.has(message.id) ? "retired" : "active",
             taskMessageAuthorLabel(message.author),
             presentTime(message.createdAt, timeZone),
             message.body
         ]), defaultTableWidth())}\n`;
     }
+    if (command === "retire") {
+        return retireMessage(rest, store, options);
+    }
     throw usageError(command === undefined
         ? "Task message command is required."
         : `Unknown command: task message ${command}`);
 }
+function retireMessage(args, store, options) {
+    const usage = "Task message retire usage: yui task message retire <task>/<message> --reason <text>.";
+    const parsed = parseTail(args, new Set(["--reason"]), usage);
+    exactPositionals(parsed.positionals, 1, usage);
+    const reason = requiredOption(parsed.options, "--reason");
+    const reference = taskRecordReference(parsed.positionals[0], "message", "Message reference", options);
+    const now = clock(options);
+    const result = store.transaction((tx) => {
+        const task = requireTask(tx, reference.taskId);
+        assertTaskOpen(task);
+        const actor = taskActor(options, task.id);
+        if (actor === "leader") {
+            throw usageError("Only the user or global Operator may retire a Task Message.");
+        }
+        const message = tx.listMessages(task.id).find(({ id }) => id === reference.localId);
+        if (message === undefined) {
+            throw dataError(`Task Message not found: ${task.id}/${reference.localId}.`);
+        }
+        const events = tx.listEvents(task.id);
+        if (isTaskRecordRetired(events, "message", message.id)) {
+            return { task, message, changed: false };
+        }
+        // Remove an isolated pending wake for this exact directive. A merged batch
+        // is retained because its other signals remain actionable; context and
+        // actionability projections still filter the retired message below.
+        try {
+            settleExactWorkExecution(tx, leaderMailbox(task.id), messageRef(task.id, message.id));
+        }
+        catch {
+            // Merged pending work cannot be split without losing unrelated signals.
+        }
+        tx.saveEvent(task.id, createTaskRecordRetirement({
+            eventId: tx.nextEventId(task.id),
+            taskId: task.id,
+            recordKind: "message",
+            recordId: message.id,
+            reason,
+            retiredBy: actor
+        }, now));
+        return { task, message, changed: true };
+    });
+    if (result.changed)
+        options.runtime?.notifyStateChanged(result.task.id);
+    return `Retired Task Message ${result.task.id}/${result.message.id}\n`;
+}
 /**
  * Issue 05: force-wake escape hatch. Bypasses the actionability digest and
  * enqueues exactly one Leader wakeup with an auditable reason. The reason is
@@ -2514,9 +2716,7 @@ function retireWork(args, store, options) {
         if (task.status !== "active") {
             throw usageError(`Task is not active: ${task.id}/${task.status}.`);
         }
-        if (taskActor(options, task.id) !== "leader") {
-            throw usageError("Only the Task Leader may retire a Work Item.");
-        }
+        const actor = taskActor(options, task.id);
         if (replacementWorkItemId !== undefined) {
             const replacement = requireWorkItem(tx, replacementWorkItemId, options);
             if (replacement.taskId !== task.id) {
@@ -2556,7 +2756,7 @@ function retireWork(args, store, options) {
             }
         }
         const next = retireWorkItem(item, {
-            by: "leader",
+            by: actor,
             summary,
             ...(replacementWorkItemId === undefined ? {} : { replacementWorkItemId })
         }, now);
@@ -2568,8 +2768,16 @@ function retireWork(args, store, options) {
                 ...(replacementWorkItemId === undefined
                     ? {}
                     : { replacementWorkItemId }),
-                ...leaderActionEventPayload(tx, task.id, options)
+                ...(actor === "leader" ? leaderActionEventPayload(tx, task.id, options) : { retiredBy: actor })
             }, now);
+            tx.saveEvent(task.id, createTaskRecordRetirement({
+                eventId: tx.nextEventId(task.id),
+                taskId: task.id,
+                recordKind: "work-item",
+                recordId: next.id,
+                reason: summary,
+                retiredBy: actor
+            }, now));
         }
         return next;
     });
@@ -2678,6 +2886,8 @@ function reviewWork(args, store, options) {
  */
 function taskReviewCommand(args, store, options) {
     const [command, ...rest] = args;
+    if (command === "rebind")
+        return rebindTaskFinalReviewContract(rest, store, options);
     if (command === "request")
         return requestTaskReviewRound(rest, store, options);
     if (command === "force-fresh")
@@ -2692,6 +2902,115 @@ function taskReviewCommand(args, store, options) {
         ? "Task review command is required."
         : `Unknown command: task review ${command}`);
 }
+export function parseTaskFinalReviewContractRebindRequest(args) {
+    const usage = "Task review rebind usage: yui task review rebind <task> "
+        + "--from-control <digest> --to-control <digest> "
+        + "--from-release <release-id> --to-release <release-id>.";
+    const parsed = parseTail(args, new Set(["--from-control", "--to-control", "--from-release", "--to-release"]), usage);
+    exactPositionals(parsed.positionals, 1, usage);
+    return {
+        taskId: parsed.positionals[0],
+        fromControlPlaneDigest: requiredOption(parsed.options, "--from-control"),
+        toControlPlaneDigest: requiredOption(parsed.options, "--to-control"),
+        fromReleaseId: requiredOption(parsed.options, "--from-release"),
+        toReleaseId: requiredOption(parsed.options, "--to-release")
+    };
+}
+function rebindTaskFinalReviewContract(args, store, options) {
+    const request = parseTaskFinalReviewContractRebindRequest(args);
+    const environment = options.environment ?? {};
+    const usage = "Task review rebind usage: yui task review rebind <task> "
+        + "--from-control <digest> --to-control <digest> "
+        + "--from-release <release-id> --to-release <release-id>.";
+    if (!isCurrentGlobalOperator(store, environment)) {
+        throw usageError("Task-final Review contract rebind requires the authenticated global Operator session.", usage);
+    }
+    const proof = options.taskFinalReviewRebindProof;
+    if (proof === undefined
+        || proof.schemaVersion !== 1
+        || proof.taskId !== request.taskId
+        || proof.fromControlPlaneDigest !== request.fromControlPlaneDigest
+        || proof.toControlPlaneDigest !== request.toControlPlaneDigest
+        || proof.fromRelease.releaseId !== request.fromReleaseId
+        || proof.toRelease.releaseId !== request.toReleaseId) {
+        throw usageError("Task-final Review contract rebind proof is missing or does not match the explicit request.", usage);
+    }
+    const now = clock(options);
+    const result = store.transaction((tx) => {
+        const task = requireTask(tx, request.taskId);
+        if (task.status !== "active") {
+            throw usageError(`Task is not active: ${task.id}.`);
+        }
+        if (task.projectBindings.length === 0) {
+            throw usageError(`Task final-review contract requires a Project-backed Task: ${task.id}.`);
+        }
+        if (!isCurrentGlobalOperator(tx, environment)) {
+            throw usageError("Task-final Review contract rebind Operator identity drifted before commit.");
+        }
+        const resolution = storedTaskFinalReviewContractResolution(tx, task.id);
+        if (resolution === undefined) {
+            throw usageError(`Task final-review contract is missing for ${task.id}.`);
+        }
+        const exactExisting = resolution.rebinds.at(-1);
+        if (resolution.effective.controlPlaneDigest === request.toControlPlaneDigest) {
+            if (exactExisting !== undefined
+                && exactExisting.fromContract.controlPlaneDigest === request.fromControlPlaneDigest
+                && exactExisting.toContract.controlPlaneDigest === request.toControlPlaneDigest
+                && exactExisting.fromRelease.releaseId === request.fromReleaseId
+                && exactExisting.toRelease.releaseId === request.toReleaseId
+                && exactExisting.handoverId === proof.handoverId) {
+                return { rebind: exactExisting, changed: false };
+            }
+            throw usageError(`Task final-review contract already targets ${request.toControlPlaneDigest} without the requested proof tuple.`);
+        }
+        if (resolution.effective.controlPlaneDigest !== request.fromControlPlaneDigest) {
+            throw usageError(`Task final-review contract source control-plane digest drifted for ${task.id}.`);
+        }
+        const activeRound = tx.listReviewRounds(task.id).find((round) => ((round.scope ?? "work-item") === "task"
+            && (round.status === "pending" || round.status === "running")));
+        if (activeRound !== undefined) {
+            throw usageError(`Task final-review contract cannot rebind while ReviewRound ${activeRound.id} is ${activeRound.status}.`);
+        }
+        const activeLeaderRun = tx.getActiveAgentRun(task.id, "leader");
+        if (activeLeaderRun !== null) {
+            throw usageError(`Task final-review contract cannot rebind while Leader Run ${activeLeaderRun.id} is active.`);
+        }
+        const leaderSessions = tx.getTaskRoleSessionSet(task.id, "leader");
+        if (leaderSessions !== null) {
+            if (leaderSessions.inFlight !== null) {
+                throw usageError("Task final-review contract cannot rebind while the Leader runtime has unsettled Run state.");
+            }
+            const liveLeaderSession = Object.values(leaderSessions.sessions).find(({ status }) => status !== "stopped" && status !== "broken");
+            if (liveLeaderSession !== undefined) {
+                throw usageError(`Task final-review contract cannot rebind while Leader Session ${liveLeaderSession.agentId} is ${liveLeaderSession.status}.`);
+            }
+            if (Object.keys(leaderSessions.sessions).length > 0
+                || leaderSessions.providerBinding !== null) {
+                tx.saveTaskRoleSessionSet(retireTaskRoleSessionsForWorkspace(leaderSessions, now));
+            }
+        }
+        const rebind = createTaskFinalReviewContractRebind({
+            taskId: task.id,
+            reviewerRoleName: resolution.effective.reviewerRoleName,
+            fromContract: resolution.effective,
+            toControlPlaneDigest: proof.toControlPlaneDigest,
+            fromRelease: proof.fromRelease,
+            toRelease: proof.toRelease,
+            handoverId: proof.handoverId,
+            authorizedBy: `operator:${environment.YUI_AGENT_ID ?? "unknown"}`
+        });
+        const event = recordTaskEventRecord(tx, task.id, TASK_FINAL_REVIEW_CONTRACT_REBOUND_EVENT, taskFinalReviewContractRebindPayload(rebind), now);
+        enqueueWork(tx, leaderMailbox(task.id), wakeReason("review-contract-rebound", event.id), now, [eventRef(task.id, event.id)]);
+        return { rebind, event, changed: true };
+    });
+    if (result.changed) {
+        notifyMailbox(options.runtime, leaderMailbox(request.taskId), request.taskId);
+    }
+    return output(result.changed
+        ? `Rebound Task-final Review contract for ${request.taskId} from `
+            + `${request.fromControlPlaneDigest} to ${request.toControlPlaneDigest}.\n`
+        : `Task-final Review contract rebind is already recorded for ${request.taskId}.\n`, result);
+}
 function resolveReviewExecutionGroup(args, store, options) {
     const usage = "Task review group resolve usage: yui task review group resolve <task>/<review-round> --decision <accept|reject|blocked> --summary <text> [--lane <lane-id> ...].";
     if (args[0] !== "resolve")
@@ -2786,8 +3105,8 @@ function resolveReviewExecutionGroup(args, store, options) {
 /**
  * Issue 06: `yui task review finding` — the cross-Round finding ledger CLI.
  * Findings are extracted automatically from completed Rounds; these commands
- * let the Leader inspect the ledger, disposition each finding, and plan the
- * parallel repair wave.
+ * let the Leader inspect the ledger, disposition each finding, and plan one
+ * convergent repair unit by default. Parallel fan-out is explicit.
  */
 function reviewFindingCommand(args, store, options) {
     const [command, ...rest] = args;
@@ -2858,11 +3177,15 @@ function disposeReviewFindingCommand(args, store, options) {
     return output(`Dispositioned ${result.id} as ${result.disposition}.\n`);
 }
 function planReviewRepairWave(args, store, options) {
-    const usage = "Task review finding repair-wave usage: yui task review finding repair-wave <task> [--create].";
-    const parsed = parseTail(args, new Set(), usage, new Set(["--create"]));
+    const usage = "Task review finding repair-wave usage: yui task review finding repair-wave <task> [--strategy <consolidated|parallel>] [--create].";
+    const parsed = parseTail(args, new Set(["--strategy"]), usage, new Set(["--create"]));
     exactPositionals(parsed.positionals, 1, usage);
     const task = requireTask(store, parsed.positionals[0]);
-    const groups = planRepairGroups(store, task.id);
+    const strategy = parsed.options.get("--strategy") ?? "consolidated";
+    if (strategy !== "consolidated" && strategy !== "parallel") {
+        throw usageError(`Review repair strategy is invalid: ${strategy}.`, usage);
+    }
+    const groups = repairGroupsForStrategy(planRepairGroups(store, task.id), strategy);
     if (groups.length === 0) {
         return output(`No open P1/P2 findings need repair for ${task.id}.\n`);
     }
@@ -2903,7 +3226,7 @@ function planReviewRepairWave(args, store, options) {
         });
         const lines = created.map(({ group, item, changed }) => (`wave ${group.groupKey}: ${item.id} ${changed ? "created" : "already open"} `
             + `(${group.findingIds.join(", ")})`));
-        return output(`Review repair wave for ${task.id} (${groups.length} group(s)):\n${lines.join("\n")}\n`, { groups: created });
+        return output(`Review repair wave for ${task.id} (${strategy}, ${groups.length} group(s)):\n${lines.join("\n")}\n`, { strategy, groups: created });
     }
     const lines = groups.map((group, index) => {
         const findings = group.findings
@@ -2912,7 +3235,24 @@ function planReviewRepairWave(args, store, options) {
         return `wave ${index + 1}: ${findings}`
             + ` (paths: ${group.affectedPaths.join(", ") || "none"}; invariants: ${group.invariants.join(", ")})`;
     });
-    return output(`Repair wave for ${task.id} (${groups.length} group(s), run disjoint groups in parallel):\n${lines.join("\n")}\n`);
+    return output(`Repair wave for ${task.id} (${strategy}, ${groups.length} group(s)):\n${lines.join("\n")}\n`
+        + (strategy === "consolidated"
+            ? "Default: keep all findings in one WorkItem; use --strategy parallel only for proven independent ownership.\n"
+            : "Parallel strategy explicitly selected; each disjoint group may become one WorkItem.\n"));
+}
+function repairGroupsForStrategy(groups, strategy) {
+    if (strategy === "parallel" || groups.length <= 1)
+        return groups;
+    const findings = groups.flatMap(({ findings }) => findings)
+        .sort((left, right) => left.id.localeCompare(right.id, undefined, { numeric: true }));
+    return [{
+            groupKey: findings.map(({ id }) => id).join("+"),
+            findings,
+            findingIds: findings.map(({ id }) => id),
+            affectedPaths: [...new Set(groups.flatMap(({ affectedPaths }) => affectedPaths))].sort(),
+            affectedSymbols: [...new Set(groups.flatMap(({ affectedSymbols }) => affectedSymbols))].sort(),
+            invariants: [...new Set(groups.flatMap(({ invariants }) => invariants))].sort()
+        }];
 }
 function reviewRepairProjectIds(task, affectedPaths) {
     const bindings = task.projectBindings;
@@ -3155,9 +3495,9 @@ function requestTaskReviewRound(args, store, options) {
 const TASK_FINAL_FORCE_FRESH_EVENT = "review.task-final-force-fresh-requested";
 /**
  * Creates a distinct full Task-final ReviewRound only when the exact previous
- * Round failed without producing semantic review evidence. The source Round,
- * Run, findings, workspace, and terminal report remain immutable history; the
- * linking Event is both the audit record and the idempotence key.
+ * terminal Round durably proves that no semantic review was produced. The
+ * source Round, Run, findings, workspace, and terminal report remain immutable
+ * history; the linking Event is both the audit record and the idempotence key.
  */
 function forceFreshTaskReviewRound(args, store, options) {
     const usage = "Task review force-fresh usage: yui task review force-fresh <task>/<review-round>.";
@@ -3206,9 +3546,9 @@ function forceFreshTaskReviewRound(args, store, options) {
             }
             return { round: replacement, source, created: false };
         }
-        const semanticBlocker = forceFreshSemanticBlocker(tx, source);
-        if (semanticBlocker !== null) {
-            throw usageError(`ReviewRound ${source.id} is not eligible for force-fresh: ${semanticBlocker}`);
+        const recovery = classifyForceFreshReviewRecovery(tx, source);
+        if (recovery.kind === "semantic-or-ambiguous") {
+            throw usageError(`ReviewRound ${source.id} is not eligible for force-fresh: ${recovery.reason}`);
         }
         if (source.taskCandidate === undefined) {
             throw dataError(`ReviewRound ${source.id} has no frozen Task candidate.`);
@@ -3275,7 +3615,7 @@ function forceFreshTaskReviewRound(args, store, options) {
             candidateId: created.candidateId,
             reviewerRoleName: created.reviewerRoleName,
             taskCandidate: JSON.stringify(created.taskCandidate),
-            reason: "source-round-failed-without-semantic-review",
+            reason: "source-round-terminal-without-semantic-review",
             leaderActionRunId: taskLeaderActionRunId(tx, task.id, options.environment, options.yuiHome) ?? "leader"
         }, now);
         return { round: created, source, created: true };
@@ -3284,76 +3624,23 @@ function forceFreshTaskReviewRound(args, store, options) {
         ? `Fresh Task-final Review requested as ${result.round.id} after ${result.source.id}\n`
         : `Fresh Task-final Review already requested as ${result.round.id} after ${result.source.id}\n`, { reviewRound: result.round, sourceReviewRound: result.source });
 }
-/** Returns the exact semantic evidence that makes a failed Round ineligible. */
-function forceFreshSemanticBlocker(store, round) {
-    if (round.status !== "failed")
-        return `source status is ${round.status}, not failed.`;
-    if ((round.checks ?? []).length > 0)
-        return "the Round records review checks.";
-    if (round.evidenceCommit !== undefined)
-        return "the Round records a review evidence commit.";
-    if (round.report !== round.summary) {
-        return "the Round stores a report distinct from its failure summary.";
-    }
-    if (runtimeFailureSummaryHasReviewerOutput(round.report ?? "")) {
-        return "the Round stores non-empty Reviewer output in its runtime failure summary.";
-    }
-    if (round.deltaRecheck?.disposition !== undefined
-        || round.deltaRecheck?.reasoning !== undefined) {
-        return "the Round records a semantic delta-recheck disposition.";
-    }
-    const semanticLane = round.executionGroup?.lanes.find((lane) => (lane.status === "yielded"
-        || lane.status === "completed"
-        || lane.result?.report !== undefined
-        || (lane.result?.checks ?? []).length > 0
-        || (lane.result?.findings ?? []).length > 0
-        || (lane.result?.evidence ?? []).length > 0
-        || lane.result?.evidenceCommit !== undefined));
-    if (semanticLane !== undefined) {
-        return `Reviewer Lane ${semanticLane.id} delivered semantic evidence.`;
-    }
-    const yieldedRun = store.listAgentRuns(round.taskId).find((run) => (run.purpose === "review"
-        && run.reviewRoundId === round.id
-        && run.status === "yielded"));
-    if (yieldedRun !== undefined)
-        return `Reviewer Run ${yieldedRun.id} yielded a report.`;
-    const finding = store.listReviewFindings(round.taskId).find((entry) => (entry.firstReviewRoundId === round.id || entry.lastReviewRoundId === round.id));
-    if (finding !== undefined)
-        return `Review finding ${finding.id} references the Round.`;
-    const semanticEvent = store.listEvents(round.taskId).find((event) => (event.type === "review.completed" && event.payload.reviewRoundId === round.id));
-    if (semanticEvent !== undefined)
-        return `Review completion Event ${semanticEvent.id} exists.`;
-    if (looksLikeStructuredReviewReport(round.report ?? "")) {
-        return "the Round stores a structured reviewer report.";
-    }
-    return null;
-}
-function runtimeFailureSummaryHasReviewerOutput(summary) {
-    const match = /(?:^|\n)last_assistant_message:[ \t]*([\s\S]*)$/u.exec(summary);
-    const output = match?.[1];
-    return output !== undefined && output.trim().length > 0;
-}
-function looksLikeStructuredReviewReport(report) {
-    let parsed;
-    try {
-        parsed = JSON.parse(report);
-    }
-    catch {
-        return false;
-    }
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed))
-        return false;
-    const record = parsed;
-    return [
-        "summary",
-        "report",
-        "checks",
-        "findings",
-        "evidence",
-        "evidenceCommit",
-        "deltaDisposition",
-        "deltaReasoning"
-    ].some((key) => Object.hasOwn(record, key));
+/**
+ * Conservatively classifies an immutable Task-final Review as replaceable.
+ * A failed Round keeps the existing no-semantic-evidence behavior. A completed
+ * Round needs stronger, mutually corroborating evidence: an explicit internal
+ * context/workspace failure, its exact yielded Run and receipt, matching Lane
+ * output, and the mechanically emitted empty completion Event.
+ * This is command eligibility only; it never rewrites the source outcome or
+ * changes the global semantic classifier used by the finding ledger.
+ */
+export function classifyForceFreshReviewRecovery(store, round) {
+    const classification = classifyReviewRoundOutcome(round, store);
+    return classification?.kind === "non-semantic"
+        ? { kind: "non-semantic-terminal", reason: classification.reason }
+        : {
+            kind: "semantic-or-ambiguous",
+            reason: classification?.reason ?? `source status is ${round.status}, not terminal.`
+        };
 }
 /**
  * Issue 07: re-validates the CLI-computed delta preflight inside the store
@@ -3369,8 +3656,8 @@ function validateDeltaRecheckRequest(store, taskId, reviewerRoleName, candidate,
     const previous = store.getReviewRound(taskId, preflight.record.previousReviewRoundId);
     if (previous === null
         || (previous.scope ?? "work-item") !== "task"
-        || previous.status !== "completed") {
-        throw usageError(`Delta-recheck previous ReviewRound is not a completed Task-final Review: `
+        || !isSemanticReviewRound(previous, store)) {
+        throw usageError(`Delta-recheck previous ReviewRound is not a semantic completed Task-final Review: `
             + `${preflight.record.previousReviewRoundId}.`);
     }
     if (previous.reviewerRoleName !== reviewerRoleName) {
@@ -3577,10 +3864,64 @@ function taskRunCommand(args, store, options) {
         return yieldRunStatus(rest, store, options);
     if (command === "checkpoint")
         return output(checkpointRun(rest, store, options));
+    if (command === "retire")
+        return retireRun(rest, store, options);
     throw usageError(command === undefined
         ? "Task run command is required."
         : `Unknown command: task run ${command}`);
 }
+function retireRun(args, store, options) {
+    const usage = "Task run retire usage: yui task run retire <task>/<run> --reason <text>.";
+    const parsed = parseTail(args, new Set(["--reason"]), usage);
+    exactPositionals(parsed.positionals, 1, usage);
+    const reason = requiredOption(parsed.options, "--reason");
+    const reference = taskRecordReference(parsed.positionals[0], "agentRun", "Agent Run reference", options);
+    const now = clock(options);
+    const result = store.transaction((tx) => {
+        const task = requireTask(tx, reference.taskId);
+        assertTaskOpen(task);
+        const actor = taskActor(options, task.id);
+        if (actor === "leader") {
+            throw usageError("Only the user or global Operator may retire an Agent Run.");
+        }
+        let run = tx.getAgentRun(task.id, reference.localId);
+        if (run === null)
+            throw dataError(`Agent Run not found: ${task.id}/${reference.localId}.`);
+        const events = tx.listEvents(task.id);
+        if (isTaskRecordRetired(events, "agent-run", run.id)) {
+            return { task, run, changed: false };
+        }
+        if (run.status === "active") {
+            const terminal = terminalizeExactTaskRun(tx, {
+                taskId: task.id,
+                roleName: run.roleName,
+                agentId: run.effective.agentId,
+                runId: run.id,
+                receiptId: agentRunDeliveryReceiptId(run),
+                outcome: { status: "failed", summary: `Agent Run retired: ${reason}` }
+            }, now);
+            if (terminal.disposition !== "applied" || terminal.run === null) {
+                throw usageError(`Agent Run changed during retirement: ${run.id}/${terminal.reason ?? "obsolete"}.`);
+            }
+            run = terminal.run;
+        }
+        tx.saveEvent(task.id, createTaskRecordRetirement({
+            eventId: tx.nextEventId(task.id),
+            taskId: task.id,
+            recordKind: "agent-run",
+            recordId: run.id,
+            reason,
+            retiredBy: actor
+        }, now));
+        return { task, run, changed: true };
+    });
+    if (result.changed)
+        options.runtime?.notifyStateChanged(result.task.id);
+    return output(`Retired Agent Run ${result.task.id}/${result.run.id}\n`, {
+        agentRun: result.run,
+        retired: true
+    });
+}
 function runContextCommand(args, store, options) {
     const [first, ...rest] = args;
     if (first === "expand") {
@@ -3654,6 +3995,7 @@ function listRuns(args, store, options) {
     const runs = store.listAgentRuns(item.taskId).filter((run) => run.workItemId === item.id);
     if (runs.length === 0)
         return "No runs found.\n";
+    const events = store.listEvents(item.taskId);
     return `${renderTable(`Runs: ${item.id}`, [
         { header: "Run", minWidth: 6, maxWidth: 20 },
         { header: "Role", minWidth: 4, maxWidth: 22 },
@@ -3663,6 +4005,7 @@ function listRuns(args, store, options) {
         { header: "Profile", minWidth: 7, maxWidth: 8 },
         { header: "Permission", minWidth: 8, maxWidth: 16 },
         { header: "Status", minWidth: 6, maxWidth: 12 },
+        { header: "History", minWidth: 7, maxWidth: 9 },
         { header: "Summary", minWidth: 8, maxWidth: 58 }
     ], runs.map((run) => [
         run.id,
@@ -3673,6 +4016,7 @@ function listRuns(args, store, options) {
         run.effective.profileAccess,
         run.effective.permission.strategy,
         run.status,
+        isTaskRecordRetired(events, "agent-run", run.id) ? "retired" : "active",
         run.summary ?? "-"
     ]), defaultTableWidth())}\n`;
 }
@@ -3986,7 +4330,7 @@ function retryRun(args, store, options) {
 }
 function actualTaskReviewCandidateForMutation(store, task, options) {
     if (options.actualTaskReviewCandidate === undefined) {
-        throw usageError(`Actual Task Project heads were not verified for final Review: ${task.id}.`);
+        throw usageError(`Actual Task Project heads were not verified for delivery: ${task.id}.`);
     }
     let actual;
     try {
@@ -4202,8 +4546,8 @@ function prepareFinalTaskReview(store, task, now, taskFinalContract, options) {
     // Any Task-final ReviewRound is durable completion evidence/obligation.
     // Once one exists, later changes to the mutable global review config cannot
     // weaken the requirement or change its reviewer. Before the first such
-    // Round, the current global `final` config is still the supported way to
-    // establish the policy and queue that initial Round.
+    // Round, the current global `final` config establishes the initial Round
+    // only for integrated delivery.
     const taskRounds = reviewRoundsByIdentity(store.listReviewRounds(task.id))
         .filter((round) => ((round.scope ?? "work-item") === "task"
         && (taskFinalContract === undefined || sameTaskFinalReviewContract(round.taskFinalReviewContract, taskFinalContract))));
@@ -4214,7 +4558,15 @@ function prepareFinalTaskReview(store, task, now, taskFinalContract, options) {
     }
     else if (establishedRound === undefined) {
         const globalConfig = store.getReviewConfig();
-        config = globalConfig?.trigger === "final" ? globalConfig : null;
+        // Direct delivery is an explicit low-overhead contract. Mutable global
+        // policy must not create a managed Round during direct completion; risk
+        // that warrants one promotes the Task to integrated delivery. Any already-
+        // established Task Round or immutable contract remains authoritative
+        // through the branches above.
+        config = taskDeliveryPath(task) === "integrated"
+            && globalConfig?.trigger === "final"
+            ? globalConfig
+            : null;
     }
     else {
         config = { roleName: establishedRound.reviewerRoleName, trigger: "final" };
@@ -4259,7 +4611,10 @@ function prepareFinalTaskReview(store, task, now, taskFinalContract, options) {
             return escalated;
         }
         else {
-            return latest.status === "completed" ? null : latest;
+            return latest.status === "completed"
+                && classifyReviewRoundOutcome(latest, store)?.kind === "semantic"
+                ? null
+                : latest;
         }
     }
     const anchor = taskFinalContract === undefined
@@ -4672,14 +5027,21 @@ function showRun(args, store, options) {
         const facts = readRunRecoveryFacts(tx, run.taskId, run.id);
         if (facts === null)
             throw usageError(`Agent Run not found: ${run.taskId}/${run.id}.`, usage);
-        return { run, recovery: projectRunRecovery(facts) };
+        const retirement = tx.listEvents(run.taskId)
+            .map(taskRecordRetirement)
+            .find((entry) => entry?.recordKind === "agent-run" && entry.recordId === run.id) ?? null;
+        return { run, recovery: projectRunRecovery(facts), retirement };
     });
     if (asJson) {
         return { kind: "output", output: `${JSON.stringify(data, null, 2)}\n`, data };
     }
-    return { kind: "output", output: renderRunShow(data.run, data.recovery), data };
+    return {
+        kind: "output",
+        output: renderRunShow(data.run, data.recovery, data.retirement),
+        data
+    };
 }
-function renderRunShow(run, recovery) {
+function renderRunShow(run, recovery, retirement) {
     const lines = [
         `Run: ${run.id}`,
         `Task: ${run.taskId}`,
@@ -4687,6 +5049,10 @@ function renderRunShow(run, recovery) {
         `Purpose: ${run.purpose}`,
         `Mode: ${run.mode}`,
         `Status: ${run.status}`,
+        ...(retirement === null ? [] : [
+            `History: retired by ${retirement.retiredBy}`,
+            `Retirement reason: ${retirement.reason}`
+        ]),
         `Effective: ${run.effective.agentId}/${run.effective.adapterId} r${run.effective.sourceDesiredRevision}`,
         `Created: ${run.createdAt}`,
         ...(run.pushedAt === undefined ? [] : [`Pushed: ${run.pushedAt}`]),
@@ -5380,8 +5746,8 @@ export function dispatchPreparedReviewRound(taskId, reviewRoundId, store, option
         let deltaContext = "";
         if (taskScope && round.deltaRecheck !== undefined) {
             const previousRound = tx.getReviewRound(taskId, round.deltaRecheck.previousReviewRoundId);
-            if (previousRound === null || previousRound.status !== "completed") {
-                throw new TaskFinalReviewDispatchDriftError(`Delta-recheck previous ReviewRound is unavailable: ${round.deltaRecheck.previousReviewRoundId}.`);
+            if (previousRound === null || !isSemanticReviewRound(previousRound, tx)) {
+                throw new TaskFinalReviewDispatchDriftError(`Delta-recheck previous semantic ReviewRound is unavailable: ${round.deltaRecheck.previousReviewRoundId}.`);
             }
             const diffByProject = options.deltaRecheckDiff;
             if (diffByProject === undefined) {
@@ -5669,7 +6035,9 @@ function publishedTreeAuthorizationPayload(actor, proof) {
         by: actor,
         projectId: proof.projectId,
         publicationId: proof.publicationId,
-        reviewRoundId: proof.reviewRoundId,
+        ...(proof.reviewRoundId === undefined
+            ? { reviewAnchor: publishedTreeReviewAnchor(proof) }
+            : { reviewRoundId: proof.reviewRoundId }),
         localCommit: proof.localCommit,
         remoteCommit: proof.remoteCommit,
         tree: proof.tree
@@ -5685,7 +6053,8 @@ function matchingPublishedTreeAuthorization(store, proof) {
             && (event.payload.by === "user" || event.payload.by === "operator")
             && event.payload.projectId === proof.projectId
             && event.payload.publicationId === proof.publicationId
-            && event.payload.reviewRoundId === proof.reviewRoundId
+            && (event.payload.reviewAnchor ?? event.payload.reviewRoundId)
+                === publishedTreeReviewAnchor(proof)
             && event.payload.localCommit === proof.localCommit
             && event.payload.remoteCommit === proof.remoteCommit
             && event.payload.tree === proof.tree) {
@@ -5698,10 +6067,15 @@ function requirePublishedTreeAuthorization(store, proof) {
     const authorization = matchingPublishedTreeAuthorization(store, proof);
     if (authorization === undefined) {
         throw usageError(`Published-tree completion requires explicit user or global Operator authorization for `
-            + `${proof.taskId}/${proof.publicationId} at Task-final Review ${proof.reviewRoundId}.`);
+            + `${proof.taskId}/${proof.publicationId} at ${proof.reviewRoundId === undefined
+                ? "the direct Task-main head"
+                : `Task-final Review ${proof.reviewRoundId}`}.`);
     }
     return authorization;
 }
+function publishedTreeReviewAnchor(proof) {
+    return proof.reviewRoundId ?? "direct";
+}
 /** Keeps a free-text run-fact note bounded so an event payload stays compact. */
 function truncateEventNote(note) {
     const normalized = note.trim();
@@ -5822,7 +6196,8 @@ function taskRecordReference(value, kind, label, options) {
 function assertWorkItemDependenciesCompleted(store, item) {
     for (const dependencyId of item.dependsOn) {
         const dependency = store.getWorkItem(item.taskId, dependencyId);
-        if (dependency === null || dependency.status !== "completed") {
+        if (dependency === null
+            || (dependency.status !== "completed" && dependency.status !== "retired")) {
             throw usageError(`Work Item dependency is not completed: ${dependencyId}.`);
         }
     }
@@ -5962,6 +6337,11 @@ function parseTaskPriority(value) {
         return value;
     throw usageError(`Invalid Task priority: ${value}.`);
 }
+function parseTaskDelivery(value) {
+    if (value === "direct" || value === "integrated")
+        return value;
+    throw usageError(`Task delivery is invalid: ${value}. Use direct or integrated.`);
+}
 function parseTaskTags(value) {
     const tags = [...new Set(value.split(",").map((tag) => tag.trim()).filter(Boolean))];
     if (tags.length === 0)