@zq-silk/yui 0.13.9 → 0.14.0

package/dist/cli.js

@@ -4,7 +4,6 @@ import { readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
-import { isDeepStrictEqual } from "node:util";
 import { renderCommandHelp } from "./cli/helpRenderer.js";
 import { describeCommandTree, findCommandNode } from "./cli/commandCatalog.js";
 import { routeInvocation } from "./cli/invocationRouter.js";
@@ -37,10 +36,9 @@ import { runResourcesCommand } from "./commands/resourcesCommands.js";
 import { applyOperatorSessionControl, runOperatorCommand } from "./commands/operatorCommands.js";
 import { runProjectCommand } from "./commands/projectCommands.js";
 import { runProfileCommand } from "./commands/profileCommands.js";
-import { dispatchPreparedReviewRound, failPendingReviewRound, preserveReviewRoundWorkspace, parseTaskCompletionRequest, parseTaskFinalReviewContractRebindRequest, preflightTaskCompletion, runTaskCommand, normalizedExecutionLanePlan, resolvedExecutionStageRetryGroup, validateTaskArchiveRequest } from "./commands/taskCommands.js";
+import { dispatchPreparedReviewRound, failPendingReviewRound, preserveReviewRoundWorkspace, parseTaskCompletionRequest, preflightTaskCompletion, runTaskCommand, normalizedExecutionLanePlan, resolvedExecutionStageRetryGroup, validateTaskArchiveRequest } from "./commands/taskCommands.js";
 import { taskActor } from "./commands/taskActor.js";
 import { parseTaskExecutionStartRequest, parseTaskExecutionStopRequest, finalizeStoppedTaskExecution, startTaskExecutionCommand, stopTaskExecutionCommand } from "./commands/taskExecutionCommands.js";
-import { isCurrentGlobalOperator } from "./commands/taskInputCommands.js";
 import { runTaskIntegrationCommand } from "./commands/taskIntegrationCommands.js";
 import { runTaskChangeSetCommand } from "./commands/taskChangeSetCommands.js";
 import { runTaskOverlapCommand } from "./commands/taskOverlapCommands.js";
@@ -74,7 +72,7 @@ import { FileTaskWorkspacePreparer } from "./repository/taskWorkspacePreparer.js
 import { inspectStorageSchema } from "./storage/storageSchema.js";
 import { collectRuntimeBuildIdentity, collectStorageIdentity, countDroppedInboxEvents, createProductionRuntimeIdentityPorts, evaluateStorageHealth, resolveStatusIdentityEnabled } from "./observability/runtimeIdentity.js";
 import { resolveYuiHome } from "./storage/taskStore.js";
-import { openCompatibleFileTaskStore, validateCompatibleFileTaskStore } from "./storage/compatibleTaskStore.js";
+import { openCurrentTaskStore, validateCurrentTaskStore } from "./storage/currentTaskStore.js";
 import { resolveTaskRecordReference } from "./task/taskRecordReference.js";
 import { runSetupCommand, validateSetupInvocation } from "./setup/setupCommand.js";
 import { NodeCommandExecutor } from "./tmux/commandExecutor.js";
@@ -90,7 +88,7 @@ import { YUI_CONTROL_PLANE_DESCRIPTOR, YUI_TASK_RUNTIME_DESCRIPTOR, assertCompat
 import { readSessionBootstrapManifest, refreshManagedSessionCliWrappers } from "./context/sessionBootstrapManifest.js";
 import { builtinAgentDriverRegistry } from "./runtime/builtinAgentDrivers.js";
 import { createTaskFinalReviewContract, extractTaskFinalReviewRequest } from "./review/taskFinalReviewContract.js";
-import { prepareTaskFinalReviewContractRebindProof, resolveRecordedTaskFinalReviewContract } from "./review/taskFinalReviewContractRebind.js";
+import { resolveRecordedTaskFinalReviewContract } from "./review/taskFinalReviewContractResolution.js";
 import { assessDeltaRecheck } from "./review/deltaRecheck.js";
 import { isAcceptedTaskReviewBaseline } from "./review/reviewAcceptance.js";
 import { NodeGitWorkspace } from "./repository/gitWorkspace.js";
@@ -262,7 +260,7 @@ export async function main() {
         // detached per-Home Controller even when setup began with no Controller;
         // read-only commands and failed setup still remain non-starting paths.
         await ensureFileTaskController(home, { environment: process.env });
-        const refresh = await refreshRunningFileTaskControllerEnvironment(home, openCompatibleFileTaskStore(home), process.env);
+        const refresh = await refreshRunningFileTaskControllerEnvironment(home, openCurrentTaskStore(home), process.env);
         emit(withControllerRefreshWarning(output, refresh, "Agent environment"));
         return;
     }
@@ -300,46 +298,10 @@ export async function main() {
         return;
     }
     if (args[0] === "upgrade") {
-        // Mirror doctor/controller: needs a Home but self-manages the schema check,
-        // because upgrade must run against a non-current Home.
-        const externallyQuiesced = process.env.YUI_UPDATE_EXTERNALLY_QUIESCED === "1";
-        const ownsHandover = args.length === 1 && !externallyQuiesced;
-        const externalFenceOwner = externallyQuiesced
-            ? process.env.YUI_UPDATE_HANDOVER_OWNER_PID
-            : undefined;
-        const externalUpgradeFenceOwnerPid = externalFenceOwner === undefined
-            ? undefined
-            : Number(externalFenceOwner);
-        if (externalUpgradeFenceOwnerPid !== undefined
-            && (!Number.isSafeInteger(externalUpgradeFenceOwnerPid)
-                || externalUpgradeFenceOwnerPid < 1)) {
-            throw runtimeError("Update storage-fence owner PID is invalid.");
-        }
-        const handover = ownsHandover ? acquireHandoverLock(home) : undefined;
-        try {
-            const result = await runUpgradeCommand(args.slice(1), home, externallyQuiesced
-                ? {
-                    controllerLifecycle: "externally-quiesced",
-                    ...(externalUpgradeFenceOwnerPid === undefined
-                        ? {}
-                        : { externalUpgradeFenceOwnerPid })
-                }
-                : {});
-            // Public execute upgrades leave the Home operational even when no
-            // Controller existed before the command. Dry-run and the staged updater's
-            // externally-quiesced preflight must remain read-only/lifecycle-neutral.
-            if (ownsHandover && result.exitCode === 0) {
-                await ensureFileTaskController(home, {
-                    environment: process.env,
-                    handoverOwnerPid: process.pid
-                });
-            }
-            process.exitCode = result.exitCode;
-            emit(result.output, false, result.data);
-        }
-        finally {
-            handover?.release();
-        }
+        // Admission diagnostic only: never quiesces, repairs, or switches storage.
+        const result = await runUpgradeCommand(args.slice(1), home);
+        process.exitCode = result.exitCode;
+        emit(result.output, false, result.data);
         return;
     }
     if (args[0] === "internal") {
@@ -349,7 +311,7 @@ export async function main() {
                 throw usageError("Managed Session CLI refresh may be run only by the user or global Operator.");
             }
             const result = refreshManagedSessionCliWrappers(home, currentInvocationControlPlane(home));
-            emit(`Refreshed ${result.refreshed} legacy Session CLI wrapper(s); `
+            emit(`Refreshed ${result.refreshed} managed Session CLI wrapper(s); `
                 + `${result.current} already current, ${result.skipped} skipped.`, false, result);
             return;
         }
@@ -382,7 +344,7 @@ export async function main() {
     }
     if (args[0] === "session" && args[1] === "reconcile") {
         const options = parseSessionReconcileOptions(args.slice(2));
-        const store = openCompatibleFileTaskStore(home);
+        const store = openCurrentTaskStore(home);
         const tmux = new TmuxManager(resolveTmuxBin(store.getConfig().tmuxBin), new NodeCommandExecutor(), {
             yuiHome: home,
             historyLimit: resolveTmuxHistoryLimit(store.getConfig().tmuxHistoryLimit)
@@ -428,21 +390,9 @@ export async function main() {
             return;
         }
         if (method === "identity" && args.length === 2) {
-            // Issue 02: the stable, read-only runtime identity receipt. It survives
-            // a Controller stop and answers build ID, package digest, backend, and
-            // worker state without a socket round-trip. When no receipt exists yet
-            // (a Controller that predates this feature), fall back to the
-            // authenticated socket identity so the command stays useful during
-            // rollout step 1.
-            let receipt = null;
-            try {
-                receipt = readRuntimeIdentity(home);
-            }
-            catch {
-                // A corrupt or stale receipt (for example one written by an older
-                // Controller that predates the launch-identity fields) falls back to
-                // the live socket identity, which always carries the exact argv.
-            }
+            // The receipt survives a Controller stop. If it has never been written,
+            // ask the authenticated live Controller for the same current identity.
+            const receipt = readRuntimeIdentity(home);
             if (receipt !== null) {
                 emit("", false, receipt);
                 return;
@@ -506,9 +456,7 @@ export async function main() {
                     inventoryRssBytes: snapshot.summary.rssBytes
                 });
                 emit(`${renderControllerResourceStatus(snapshot, options.verbose)}\n\n${identitySection}`, false, { ...snapshot, identity: { build, storage, runtime, mismatch } });
-                // Exit 5 only on hard contradictions (fail). A needs-repair state
-                // (pseudo-layout-7) is degraded but still readable via the file store,
-                // so it exits 0 with a DEGRADED health line and a precise repair action.
+                // The exact current storage contract fails closed on contradictions.
                 if (evaluateStorageHealth(storage).status === "fail")
                     process.exitCode = 5;
                 return;
@@ -554,7 +502,7 @@ export async function main() {
             throw usageError("Controller usage: yui controller status [--all] [--verbose] | "
                 + "cleanup [--all] | stop | restart.");
         }
-        validateCompatibleFileTaskStore(home);
+        validateCurrentTaskStore(home);
         const controllerMethod = method;
         const updateHandoverOwner = process.env.YUI_UPDATE_HANDOVER_OWNER_PID;
         // A pre-fix updater cannot pass the owner environment variable to the
@@ -583,7 +531,7 @@ export async function main() {
     }
     if (args[0] === "resources") {
         await assertFileTaskControllerStorageCompatible(home);
-        const resourcesStore = openCompatibleFileTaskStore(home);
+        const resourcesStore = openCurrentTaskStore(home);
         const result = await runResourcesCommand(args.slice(1), resourcesStore);
         emit(result.output, false, result.data);
         return;
@@ -596,7 +544,7 @@ export async function main() {
     const store = verifiedStore !== undefined
         && resolve(verifiedStore.rootDirectory()) === resolve(home)
         ? verifiedStore
-        : openCompatibleFileTaskStore(home);
+        : openCurrentTaskStore(home);
     const catalogs = new AgentConfigurationCatalogService(home, {
         environment: process.env
     });
@@ -894,9 +842,7 @@ export async function main() {
             emit(result.output, false, result.data);
             return;
         }
-        if (resolved[1] === "rebuild"
-            || resolved[1] === "history"
-            || resolved[1] === "replace") {
+        if (resolved[1] === "replace") {
             const result = await runTaskWorkspaceCommand(resolved.slice(1), store, workspacePreparer);
             emit(result.output, false, result.data);
             return;
@@ -1077,7 +1023,7 @@ export async function main() {
             const task = item === null ? null : store.getTask(item.taskId);
             // A rejected Candidate starts a new execution iteration. Release every
             // terminal Lane Role runtime before preparing the new Lane workspaces;
-            // durable Runs, Groups, Candidates, and workspace owners remain intact.
+            // durable Turns, Groups, Candidates, and workspace owners remain intact.
             if (item?.status === "failed"
                 && currentWorkItemExecutionGroup(item)?.resolution !== undefined) {
                 await workspaceCoordinator.cleanupWorkItemRuntime(item.taskId, item.id);
@@ -1088,12 +1034,13 @@ export async function main() {
             if (item !== null && task !== null) {
                 await workspacePreparer.prepareTaskWorkspace(task.id);
             }
-            // Every Project-backed WorkItem needs its own Develop owner before a
-            // Lane can be prepared. The physical preparer creates the symlink view
-            // and stores the exact WorkItem owner before dispatch creates the Run.
+            // A Project-backed Worker WorkItem gets an isolated Develop owner before
+            // its Lane is prepared. A Leader-owned WorkItem intentionally executes
+            // in the Task main worktree and must not enter this isolation path.
             if (item !== null
                 && task !== null
                 && task.projectBindings.length > 0
+                && item.assignee !== "leader"
                 && store.getWorkItemWorkspace(task.id, item.id) === null) {
                 await workspaceCoordinator.isolateWorkItem(item.taskId, item.id);
             }
@@ -1173,58 +1120,12 @@ export async function main() {
                 }
             }
         }
-        let taskFinalReviewRebindProof;
-        let taskFinalReviewRebindRequest;
-        let releaseTaskFinalReviewHandoverLock;
-        if (resolved[1] === "review" && resolved[2] === "rebind") {
-            if (!isCurrentGlobalOperator(store, process.env)) {
-                throw usageError("Task-final Review contract rebind requires the authenticated global Operator session.");
-            }
-            if (exactCurrentControlPlane === undefined) {
-                throw usageError("Task-final Review contract rebind requires the exact current global Session CLI.");
-            }
-            taskFinalReviewRebindRequest = parseTaskFinalReviewContractRebindRequest(resolved.slice(3));
-        }
+        let releaseReviewHandoverLock;
         if ((resolved[1] === "review"
-            && ["request", "force-fresh", "retry", "rebind"].includes(resolved[2] ?? ""))
+            && ["request", "force-fresh", "retry"].includes(resolved[2] ?? ""))
             || resolved[1] === "complete") {
             const handoverLock = acquireHandoverLock(home);
-            releaseTaskFinalReviewHandoverLock = handoverLock.release;
-        }
-        if (taskFinalReviewRebindRequest !== undefined) {
-            const request = taskFinalReviewRebindRequest;
-            try {
-                taskFinalReviewRebindProof = prepareTaskFinalReviewContractRebindProof({
-                    home,
-                    taskId: request.taskId,
-                    fromControlPlaneDigest: request.fromControlPlaneDigest,
-                    toControlPlaneDigest: request.toControlPlaneDigest,
-                    fromReleaseId: request.fromReleaseId,
-                    toReleaseId: request.toReleaseId,
-                    currentControlPlane: exactCurrentControlPlane.descriptor
-                });
-                const workItems = store.listWorkItems(request.taskId);
-                const reviewRounds = store.listReviewRounds(request.taskId);
-                const resolution = resolveRecordedTaskFinalReviewContract(request.taskId, workItems, reviewRounds, store.listEvents(request.taskId));
-                const activeRound = reviewRounds.find((round) => ((round.scope ?? "work-item") === "task"
-                    && (round.status === "pending" || round.status === "running")));
-                // An exact replay is a true no-op, even when the target Leader is live.
-                // Invalid/stale source tuples also reach the command unchanged so its
-                // transactional diagnosis cannot stop a healthy target runtime.
-                if (resolution?.effective.controlPlaneDigest === request.fromControlPlaneDigest
-                    && activeRound === undefined) {
-                    // The contract event and wake must never target a Provider
-                    // Conversation launched by the source release. Active Runs fail
-                    // closed; otherwise stop and retire that runtime under the handover
-                    // lock before the transactional event+wake commit.
-                    await workspaceCoordinator.cleanupTaskRoleRuntime(request.taskId, "leader");
-                }
-            }
-            catch (error) {
-                releaseTaskFinalReviewHandoverLock();
-                releaseTaskFinalReviewHandoverLock = undefined;
-                throw error;
-            }
+            releaseReviewHandoverLock = handoverLock.release;
         }
         let candidateMaterialization;
         let candidateMaterializationCommitted = false;
@@ -1242,11 +1143,6 @@ export async function main() {
             const directTaskMainSnapshot = await directTaskMainSnapshotForTaskCommand(resolved, store, workspacePreparer, process.env, taskFinalReviewContract);
             const actualTaskReviewCandidate = await actualTaskReviewCandidateForTaskCommand(resolved, store, workspacePreparer, process.env);
             const deltaRecheckPreflight = await deltaRecheckPreflightForTaskCommand(resolved.slice(1), store, actualTaskReviewCandidate);
-            const reviewWorkspaceResult = await reviewWorkspaceResultForTaskCommand(resolved, store, workspacePreparer, process.env);
-            const executionLaneGitSnapshot = await executionLaneGitSnapshotForTaskCommand(resolved, store, workspacePreparer, process.env);
-            const laneSnapshotPreflight = executionLaneGitSnapshot === undefined
-                ? undefined
-                : executionLaneGitSnapshot;
             // Physical preparation may precede the durable write, but Task status,
             // workspace identity/cwd, and ManagedWorkspace ownership are adopted by
             // one transaction. A failed attempt therefore leaves the Task Draft and
@@ -1266,9 +1162,6 @@ export async function main() {
                 ...(taskFinalReviewContract === undefined
                     ? {}
                     : { taskFinalReviewContract }),
-                ...(taskFinalReviewRebindProof === undefined
-                    ? {}
-                    : { taskFinalReviewRebindProof }),
                 ...(completionSummary === undefined ? {} : { completionSummary }),
                 ...(completionPublishedTreeProof === undefined
                     ? {}
@@ -1288,8 +1181,6 @@ export async function main() {
                 ...(deltaRecheckPreflight === undefined
                     ? {}
                     : { deltaRecheckPreflight }),
-                ...(reviewWorkspaceResult === undefined ? {} : { reviewWorkspaceResult }),
-                ...(laneSnapshotPreflight === undefined ? {} : { executionLaneGitSnapshot: laneSnapshotPreflight }),
                 ...(taskRetirementProof === undefined ? {} : { taskRetirementProof })
             });
             // The dispatch transaction has now adopted (or rejected) the prepared
@@ -1311,11 +1202,11 @@ export async function main() {
                 let reviewData;
                 const resumesReviewDispatch = (resolved[1] === "review" && resolved[2] === "request")
                     || (resolved[1] === "work" && resolved[2] === "review")
-                    || (resolved[1] === "run" && resolved[2] === "retry");
+                    || (resolved[1] === "turn" && resolved[2] === "retry");
                 const reviewDispatchNeeded = requestedRound?.status === "pending"
                     || (requestedRound?.status === "running"
                         && resumesReviewDispatch
-                        && persistedRequestedRound?.executionGroup?.lanes.some((lane) => (lane.status === "pending" && lane.runId === undefined)) === true);
+                        && persistedRequestedRound?.executionGroup?.lanes.some((lane) => (lane.status === "pending" && lane.turnId === undefined)) === true);
                 if (reviewDispatchNeeded) {
                     try {
                         const workspace = requestedRound.status === "running"
@@ -1367,7 +1258,7 @@ export async function main() {
                                     kind: "started",
                                     reviewerRoleName: requestedRound.reviewerRoleName,
                                     reviewRoundId: requestedRound.id,
-                                    runId: run.id
+                                    turnId: run.id
                                 },
                             reviewRound: store.getReviewRound(requestedRound.taskId, requestedRound.id),
                             ...(run === null ? {} : { reviewRun: run }),
@@ -1408,7 +1299,7 @@ export async function main() {
                     : { command: result.data, ...reviewData });
                 return;
             }
-            if (jsonOutput) {
+            if (jsonOutput && result.kind !== "session-stop") {
                 throw usageError("Task Role view/takeover requires an interactive terminal.");
             }
             if (result.kind === "session-stop") {
@@ -1527,9 +1418,9 @@ export async function main() {
             throw error;
         }
         finally {
-            if (releaseTaskFinalReviewHandoverLock !== undefined) {
-                releaseTaskFinalReviewHandoverLock();
-                releaseTaskFinalReviewHandoverLock = undefined;
+            if (releaseReviewHandoverLock !== undefined) {
+                releaseReviewHandoverLock();
+                releaseReviewHandoverLock = undefined;
             }
         }
     }
@@ -1555,7 +1446,7 @@ export async function main() {
         }));
         return;
     }
-    throw usageError(`Command is not connected to the restored FileTaskStore framework yet: ${resolved[0]}.`, renderCommandHelp(invocation.node, VERSION));
+    throw usageError(`Command is not connected to the current TaskStore command routing: ${resolved[0]}.`, renderCommandHelp(invocation.node, VERSION));
 }
 function explicitReleaseActivationDriver() {
     if (args.length !== 3
@@ -1575,11 +1466,11 @@ async function preflightManagedTaskControlPlane() {
     }
     const serializedControl = process.env[YUI_CONTROL_PLANE_DESCRIPTOR];
     const serializedRuntime = process.env[YUI_TASK_RUNTIME_DESCRIPTOR];
-    const exactRuntime = serializedControl !== undefined || serializedRuntime !== undefined;
-    if (process.env.YUI_SESSION_SCOPE === "task" && !exactRuntime) {
+    const exactAgentRuntime = serializedControl !== undefined || serializedRuntime !== undefined;
+    if (process.env.YUI_SESSION_SCOPE === "task" && !exactAgentRuntime) {
         throw new Error("Exact control-plane invocation requires both frozen descriptors in a managed Task runtime.");
     }
-    if (!exactRuntime) {
+    if (!exactAgentRuntime) {
         if (exactControlInvocation.digest !== undefined
             || process.env.YUI_SESSION_SCOPE === "global") {
             return await preflightManagedGlobalControlPlane(exactControlInvocation.digest);
@@ -1637,9 +1528,9 @@ async function preflightManagedTaskControlPlane() {
         && process.env.YUI_DRIVER_ID !== undefined
         ? builtinAgentDriverRegistry().require(process.env.YUI_DRIVER_ID)
         : undefined;
-    const verifiedStore = openCompatibleFileTaskStore(control.yuiHome);
+    const verifiedStore = openCurrentTaskStore(control.yuiHome);
     // Runtime Hooks have their own event-aware fence, including the valid case
-    // where a Provider terminal arrives after its Yui Run has yielded and a
+    // where a Provider terminal arrives after its Yui Turn has completed and a
     // later wake is pending. Ordinary managed commands still require the exact
     // current mutable runtime before routing.
     if (runtimeDriverCallback === undefined) {
@@ -1659,7 +1550,7 @@ async function preflightManagedTaskControlPlane() {
     if (request.taskId !== runtime.taskId) {
         throw new Error(`Task final-review contract Task id mismatch: expected ${runtime.taskId}, found ${request.taskId}.`);
     }
-    const recordedContract = resolveRecordedTaskFinalReviewContract(runtime.taskId, verifiedStore.listWorkItems(runtime.taskId), verifiedStore.listReviewRounds(runtime.taskId), verifiedStore.listEvents(runtime.taskId))?.effective;
+    const recordedContract = resolveRecordedTaskFinalReviewContract(runtime.taskId, verifiedStore.listWorkItems(runtime.taskId), verifiedStore.listReviewRounds(runtime.taskId))?.effective;
     if (recordedContract !== undefined
         && recordedContract.reviewerRoleName !== request.reviewerRoleName) {
         throw new Error(`Task final-review Reviewer mismatch: expected ${recordedContract.reviewerRoleName}, `
@@ -1728,7 +1619,7 @@ async function preflightManagedGlobalControlPlane(digest) {
     return {
         contract: undefined,
         controlPlane: { digest: commandDigest, descriptor: commandControl },
-        verifiedStore: openCompatibleFileTaskStore(home)
+        verifiedStore: openCurrentTaskStore(home)
     };
 }
 function currentInvocationControlPlane(home) {
@@ -1789,7 +1680,7 @@ function cliTaskRecordReference(value, kind, environment) {
     try {
         return resolveTaskRecordReference(value, {
             kind,
-            label: kind === "agentRun" ? "Agent Run reference" : "ReviewRound reference",
+            label: kind === "turn" ? "Turn reference" : "ReviewRound reference",
             ...(environment.YUI_TASK_ID === undefined
                 ? {}
                 : { contextTaskId: environment.YUI_TASK_ID })
@@ -1802,7 +1693,7 @@ function cliTaskRecordReference(value, kind, environment) {
 async function candidateSnapshotForTaskCommand(args, store, preparer, environment, taskFinalReviewContract) {
     if (args[0] !== "task")
         return undefined;
-    const reviewableCandidateCommand = (args[1] === "run" && args[2] === "yield" && args[3] !== undefined) || (args[1] === "work" && args[2] === "update"
+    const reviewableCandidateCommand = (args[1] === "work" && args[2] === "update"
         && args[3] !== undefined && args[4] === "done") || (args[1] === "work" && args[2] === "group" && args[3] === "resolve"
         && args[4] !== undefined);
     // Explicit Task-final review requests must remain independent of the
@@ -1813,36 +1704,6 @@ async function candidateSnapshotForTaskCommand(args, store, preparer, environmen
         || (groupResolve && args.includes("--decision") && args[args.indexOf("--decision") + 1] !== "accept")) {
         return undefined;
     }
-    if (args[1] === "run" && args[2] === "yield" && args[3] !== undefined) {
-        const reference = cliTaskRecordReference(args[3], "agentRun", environment);
-        const run = store.getAgentRun(reference.taskId, reference.localId);
-        if (run === null || run.purpose !== "execution" || run.workItemId === undefined) {
-            return undefined;
-        }
-        if (run.workspace === undefined) {
-            // Gitless execution has no workspace or Git snapshot to capture. The
-            // command layer still records the yielded Lane/Candidate evidence.
-            return undefined;
-        }
-        // Group-backed Runs yield Lane evidence first; the Leader's later group
-        // resolution performs the one Candidate snapshot after selected Lane
-        // outputs have been materialized into the WorkItem workspace.
-        if (run.executionGroupId !== undefined || run.workspace.owner.type === "execution-lane") {
-            const item = store.getWorkItem(run.taskId, run.workItemId);
-            const group = item === null || run.executionGroupId === undefined
-                ? undefined
-                : workItemExecutionGroupById(item, run.executionGroupId);
-            const fixedSingleLane = group?.strategy.mode === "fixed"
-                && group.strategy.count === 1
-                && group.lanes.length === 1
-                && group.stage === undefined
-                && run.workspace.owner.type === "work-item";
-            if (fixedSingleLane)
-                return preparer.snapshotCandidateWorkspace(run.workspace);
-            return undefined;
-        }
-        return preparer.snapshotCandidateWorkspace(run.workspace);
-    }
     if (args[1] === "work" && args[2] === "update"
         && args[3] !== undefined && args[4] === "done") {
         const reference = cliWorkItemReference(args[3], environment);
@@ -1890,7 +1751,7 @@ async function candidateMaterializationForTaskCommand(args, store, preparer, env
     const selected = args.flatMap((value, index) => value === "--lane" && args[index + 1] !== undefined ? [args[index + 1]] : []);
     const materializedLaneIds = selected.length === 0
         ? group.lanes
-            .filter((lane) => lane.status === "yielded" || lane.status === "completed")
+            .filter((lane) => lane.status === "completed")
             .map(({ id }) => id)
         : selected;
     if (group.stage?.convergence !== undefined
@@ -1907,7 +1768,7 @@ async function candidateMaterializationForTaskCommand(args, store, preparer, env
 }
 async function prepareExecutionLaneWorkspacesForCommand(args, store, preparer, environment) {
     const isDispatch = args[0] === "task" && args[1] === "work" && args[2] === "dispatch" && args[3] !== undefined;
-    const isRetry = args[0] === "task" && args[1] === "run" && args[2] === "retry" && args[3] !== undefined;
+    const isRetry = args[0] === "task" && args[1] === "turn" && args[2] === "retry" && args[3] !== undefined;
     if (!isDispatch && !isRetry)
         return undefined;
     const itemRef = isDispatch
@@ -1915,15 +1776,15 @@ async function prepareExecutionLaneWorkspacesForCommand(args, store, preparer, e
         : null;
     const item = itemRef === null
         ? (() => {
-            const runRef = cliTaskRecordReference(args[3], "agentRun", environment);
-            const run = store.getAgentRun(runRef.taskId, runRef.localId);
+            const runRef = cliTaskRecordReference(args[3], "turn", environment);
+            const run = store.getTurn(runRef.taskId, runRef.localId);
             return run?.workItemId === undefined ? null : store.getWorkItem(run.taskId, run.workItemId);
         })()
         : store.getWorkItem(itemRef.taskId, itemRef.localId);
     if (item === null)
         return undefined;
     const retryRun = isRetry
-        ? store.getAgentRun(item.taskId, cliTaskRecordReference(args[3], "agentRun", environment).localId)
+        ? store.getTurn(item.taskId, cliTaskRecordReference(args[3], "turn", environment).localId)
         : null;
     const currentGroup = currentWorkItemExecutionGroup(item);
     const group = retryRun?.executionGroupId === undefined
@@ -1946,7 +1807,7 @@ async function prepareExecutionLaneWorkspacesForCommand(args, store, preparer, e
         throw usageError(`Invalid execution strategy: ${value}.`);
     })();
     const retryLaneId = isRetry
-        ? store.getAgentRun(item.taskId, cliTaskRecordReference(args[3], "agentRun", environment).localId)?.executionLaneId
+        ? store.getTurn(item.taskId, cliTaskRecordReference(args[3], "turn", environment).localId)?.executionLaneId
         : undefined;
     const plan = normalizedExecutionLanePlan({
         assignee: item.assignee ?? "",
@@ -1957,7 +1818,7 @@ async function prepareExecutionLaneWorkspacesForCommand(args, store, preparer, e
             ? resolvedExecutionStageRetryGroup(currentGroup)
             : undefined,
         status: item.status,
-        nextGroupId: `execution-group-${store.peekNextAgentRunId(item.taskId)}`,
+        nextGroupId: `execution-group-${store.peekNextTurnId(item.taskId)}`,
         retryLaneId,
         phase: isRetry ? "retry" : "dispatch"
     });
@@ -1978,7 +1839,7 @@ async function prepareExecutionLaneWorkspacesForCommand(args, store, preparer, e
     const needsIsolation = adaptive || laneCount > 1 || (group?.lanes.length ?? 0) > 1;
     if (!needsIsolation)
         return undefined;
-    const groupId = group?.id ?? `execution-group-${store.peekNextAgentRunId(item.taskId)}`;
+    const groupId = group?.id ?? `execution-group-${store.peekNextTurnId(item.taskId)}`;
     const laneIds = plan.laneIds;
     // A new Group's Lanes are not yet durable, so their worktrees would be
     // unadopted between preparation and the dispatch transaction. Hold ONE
@@ -2121,11 +1982,11 @@ async function actualTaskReviewCandidateForTaskCommand(args, store, preparer, en
             taskId = reference.taskId;
         }
     }
-    else if (args[1] === "run"
+    else if (args[1] === "turn"
         && (args[2] === "retry" || args[2] === "settle")
         && args[3] !== undefined) {
-        const reference = cliTaskRecordReference(args[3], "agentRun", environment);
-        const run = store.getAgentRun(reference.taskId, reference.localId);
+        const reference = cliTaskRecordReference(args[3], "turn", environment);
+        const run = store.getTurn(reference.taskId, reference.localId);
         const round = run?.reviewRoundId === undefined
             ? null
             : store.getReviewRound(reference.taskId, run.reviewRoundId);
@@ -2232,52 +2093,6 @@ async function deltaRecheckPreflightForTaskCommand(args, store, actualTaskReview
     }
     return assessment.preflight;
 }
-async function reviewWorkspaceResultForTaskCommand(args, store, preparer, environment) {
-    if (args[0] !== "task" || args[1] !== "run" || args[2] !== "yield"
-        || args[3] === undefined)
-        return undefined;
-    const reference = cliTaskRecordReference(args[3], "agentRun", environment);
-    const run = store.getAgentRun(reference.taskId, reference.localId);
-    if (run === null || run.purpose !== "review" || run.reviewRoundId === undefined) {
-        return undefined;
-    }
-    return preparer.snapshotReviewRunResult(reference.taskId, run);
-}
-async function executionLaneGitSnapshotForTaskCommand(args, store, preparer, environment) {
-    if (args[0] !== "task" || args[1] !== "run" || args[2] !== "yield"
-        || args[3] === undefined)
-        return undefined;
-    const reference = cliTaskRecordReference(args[3], "agentRun", environment);
-    const run = store.getAgentRun(reference.taskId, reference.localId);
-    if (run === null || run.executionGroupId === undefined
-        || run.executionLaneId === undefined
-        // Review output has a distinct evidence contract: diagnostic work may
-        // remain uncommitted, and snapshotReviewRunResult validates its exact
-        // ReviewRound/Lane owner. It must not also pass the Develop Candidate
-        // snapshot preflight, which requires a clean committed worktree.
-        || run.purpose === "review") {
-        return undefined;
-    }
-    if (run.workspace === undefined)
-        return null;
-    const stored = store.getManagedWorkspace(run.workspace.owner);
-    if (stored === null || !isDeepStrictEqual(stored, run.workspace)) {
-        throw usageError(`Execution Lane managed workspace changed before yield: ${run.id}.`);
-    }
-    // A Gitless fixed(1) Lane runs from the durable Task-owned empty view. It
-    // has no writable Project boundary, so there is no Lane Git snapshot to
-    // freeze; keep the normal Candidate path metadata-only.
-    if (run.workspace.owner.type === "task" && run.workspace.entries.length === 0) {
-        return null;
-    }
-    try {
-        return (await preparer.snapshotExecutionLaneWorkspace(run.workspace)) ?? null;
-    }
-    catch (error) {
-        throw usageError(`Execution Lane Git snapshot preflight failed for ${run.id}: `
-            + `${error instanceof Error ? error.message : String(error)}`);
-    }
-}
 function reviewRoundFromCommandData(data) {
     if (typeof data !== "object" || data === null || !("reviewRound" in data))
         return undefined;
@@ -2421,7 +2236,7 @@ async function completionCommand(home, node) {
     if (args.length > (shell === undefined ? 2 : 3)) {
         throw usageError("Completion usage: yui config completion [bash|zsh|fish]");
     }
-    const store = openCompatibleFileTaskStore(home);
+    const store = openCurrentTaskStore(home);
     const ioHandle = terminalIo();
     try {
         const manager = new FileCompletionManager(store, process.env, resolveCliIdentity(process.env));
@@ -2583,7 +2398,7 @@ function selectionCall(store, catalogs, method, params) {
                 : store.listInputRequests(taskId);
             return params.all === true ? requests : requests.filter((request) => request.status === "open");
         }
-        case "task.run.list": return callOptional(reader, "listAgentRuns", [params.taskId]);
+        case "task.turn.list": return callOptional(reader, "listTurns", [params.taskId]);
         case "task.decision.list": return callOptional(reader, "listDecisions", [params.taskId]);
         case "task.milestone.list": return presentSelectionTimes(callOptional(reader, "listMilestones", [params.taskId]), store);
         case "task.event.list": return presentSelectionTimes(callOptional(reader, "listEvents", [params.taskId]), store);
@@ -2612,7 +2427,7 @@ function callOptional(reader, method, args = []) {
     return operation === undefined ? [] : Reflect.apply(operation, reader, args);
 }
 function readableStore(home) {
-    return openCompatibleFileTaskStore(home);
+    return openCurrentTaskStore(home);
 }
 function completionSelectionPorts(home) {
     if (inspectStorageSchema(home).status === "uninitialized") {