@zq-silk/yui 0.13.9 → 0.14.0

package/dist/controller/runtimeEventInbox.js

@@ -1,7 +1,6 @@
 import { createHash, randomUUID } from "node:crypto";
 import { closeSync, constants, existsSync, fchmodSync, fsyncSync, linkSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { withUpgradeCoordinationLock } from "../storage/upgradeCoordination.js";
 import { createRuntimeObservation, isRuntimeTokenEvidence } from "../runtime/runtimeObservation.js";
 export const MAX_RUNTIME_TURN_SUMMARY_BYTES = 32 * 1024;
 export const MAX_RUNTIME_EVENT_FILE_BYTES = 16 * 1024 * 1024;
@@ -10,7 +9,7 @@ const INVALID_RUNTIME_EVENT_DIRECTORY = join("runtime", "inbox-invalid");
 const EVENT_ID_PATTERN = /^turn-[a-f0-9]{64}$/;
 /**
  * Durable ingress for facts emitted by native Agent hooks. It deliberately
- * owns no FileTaskStore lock: immutable files are acknowledged only after the
+ * owns no TaskStore lock: immutable files are acknowledged only after the
  * Controller commits their authoritative aggregate effect.
  */
 export class FileRuntimeEventInbox {
@@ -156,24 +155,17 @@ export class FileRuntimeEventInbox {
         return acknowledged;
     }
     publish(event) {
-        // The fence check and the complete durable write share one sibling
-        // coordination lock with upgrade's final inbox scan/copy/two-step switch.
-        // A hook that passed admission before the fence was placed either finishes
-        // under this lock (so its event is copied) or waits and receives an
-        // UpgradeFenceError after the cutover holder releases the lock.
-        return withUpgradeCoordinationLock(this.home, () => {
-            this.hooks.afterAdmission?.();
-            if (event.type === "runtime-observation"
-                && isRuntimeTokenEvidence(event.observation)) {
-                const existing = this.list().find((candidate) => (candidate.type === "runtime-observation"
-                    && candidate.taskId === event.taskId
-                    && candidate.observation.eventId === event.observation.eventId));
-                if (existing !== undefined) {
-                    return { event: existing, created: false };
-                }
+        this.hooks.afterAdmission?.();
+        if (event.type === "runtime-observation"
+            && isRuntimeTokenEvidence(event.observation)) {
+            const existing = this.list().find((candidate) => (candidate.type === "runtime-observation"
+                && candidate.taskId === event.taskId
+                && candidate.observation.eventId === event.observation.eventId));
+            if (existing !== undefined) {
+                return { event: existing, created: false };
             }
-            return this.publishUnlocked(event);
-        });
+        }
+        return this.publishUnlocked(event);
     }
     publishUnlocked(event) {
         const content = `${JSON.stringify(event)}\n`;
@@ -285,8 +277,8 @@ function runtimeEventId(type, input) {
         provider.adapterId,
         provider.launchId ?? null,
         provider.nativeSessionId,
-        "turnId" in provider ? provider.turnId : null,
-        provider.runId ?? null
+        provider.nativeTurnId,
+        provider.turnId ?? null
     ];
     return `turn-${createHash("sha256").update(JSON.stringify(common)).digest("hex")}`;
 }
@@ -305,10 +297,10 @@ function normalizeNativeTurnCompletedInput(input) {
             ? {}
             : { launchId: requireIdentityText(input.launchId, "Launch id") }),
         nativeSessionId: requireIdentityText(input.nativeSessionId, "Native session id"),
-        turnId: requireIdentityText(input.turnId, "Turn id"),
-        ...(input.runId === undefined
+        nativeTurnId: requireIdentityText(input.nativeTurnId, "Provider native Turn id"),
+        ...(input.turnId === undefined
             ? {}
-            : { runId: requireIdentityText(input.runId, "Run id") }),
+            : { turnId: requireIdentityText(input.turnId, "Turn id") }),
         ...(input.title === undefined
             ? {}
             : { title: requireIdentityText(input.title, "Session title") }),
@@ -393,16 +385,16 @@ function parseNativeTurnCompletedEvent(value) {
     const expected = scope === "task"
         ? [
             "schemaVersion", "id", "type", "receivedAt", "scope", "taskId",
-            "roleName", "agentId", "adapterId", "nativeSessionId", "turnId", "summary",
+            "roleName", "agentId", "adapterId", "nativeSessionId", "nativeTurnId", "summary",
             ...(value.launchId === undefined ? [] : ["launchId"]),
-            ...(value.runId === undefined ? [] : ["runId"]),
+            ...(value.turnId === undefined ? [] : ["turnId"]),
             ...(value.title === undefined ? [] : ["title"])
         ]
         : [
             "schemaVersion", "id", "type", "receivedAt", "scope",
-            "roleName", "agentId", "adapterId", "nativeSessionId", "turnId", "summary",
+            "roleName", "agentId", "adapterId", "nativeSessionId", "nativeTurnId", "summary",
             ...(value.launchId === undefined ? [] : ["launchId"]),
-            ...(value.runId === undefined ? [] : ["runId"]),
+            ...(value.turnId === undefined ? [] : ["turnId"]),
             ...(value.title === undefined ? [] : ["title"])
         ];
     if ((scope !== "task" && scope !== "global")
@@ -418,8 +410,8 @@ function parseNativeTurnCompletedEvent(value) {
         adapterId: value.adapterId,
         ...(value.launchId === undefined ? {} : { launchId: value.launchId }),
         nativeSessionId: value.nativeSessionId,
-        turnId: value.turnId,
-        ...(value.runId === undefined ? {} : { runId: value.runId }),
+        nativeTurnId: value.nativeTurnId,
+        ...(value.turnId === undefined ? {} : { turnId: value.turnId }),
         ...(value.title === undefined ? {} : { title: value.title }),
         summary: value.summary
     });
@@ -483,7 +475,7 @@ function hasSameIdentity(left, right) {
         && (!("nativeSessionId" in left)
             || !("nativeSessionId" in right)
             || left.nativeSessionId === right.nativeSessionId)
-        && (!("runId" in left) || !("runId" in right) || left.runId === right.runId)
+        && (!("turnId" in left) || !("turnId" in right) || left.turnId === right.turnId)
         && (!("turnId" in left) || !("turnId" in right) || left.turnId === right.turnId)
         && (!("jobId" in left) || !("jobId" in right) || left.jobId === right.jobId);
 }

package/dist/controller/runtimeEventProcessor.js

@@ -167,7 +167,7 @@ export class FileRuntimeEventProcessor {
                                 adapterId: this.drivers.require(fence.driverId).adapterId,
                                 launchId: fence.launchId,
                                 nativeSessionId: fence.nativeSessionId,
-                                ...(fence.runId === undefined ? {} : { runId: fence.runId })
+                                ...(fence.turnId === undefined ? {} : { turnId: fence.turnId })
                             });
                         }
                     }
@@ -179,7 +179,7 @@ export class FileRuntimeEventProcessor {
                             adapterId: event.adapterId,
                             ...(event.launchId === undefined ? {} : { launchId: event.launchId }),
                             nativeSessionId: event.nativeSessionId,
-                            ...(event.runId === undefined ? {} : { runId: event.runId })
+                            ...(event.turnId === undefined ? {} : { turnId: event.turnId })
                         });
                     }
                 }
@@ -213,8 +213,8 @@ export class FileRuntimeEventProcessor {
                 adapterId: event.adapterId,
                 ...(event.launchId === undefined ? {} : { launchId: event.launchId }),
                 nativeSessionId: event.nativeSessionId,
-                turnId: event.turnId,
-                ...(event.runId === undefined ? {} : { runId: event.runId }),
+                nativeTurnId: event.nativeTurnId,
+                ...(event.turnId === undefined ? {} : { turnId: event.turnId }),
                 summary: event.summary
             };
             if (task === null)
@@ -244,7 +244,7 @@ export class FileRuntimeEventProcessor {
             adapterId: event.adapterId,
             ...(event.launchId === undefined ? {} : { launchId: event.launchId }),
             nativeSessionId: event.nativeSessionId,
-            turnId: event.turnId,
+            nativeTurnId: event.nativeTurnId,
             ...(event.title === undefined ? {} : { title: event.title }),
             summary: event.summary
         };
@@ -267,7 +267,7 @@ export class FileRuntimeEventProcessor {
                 taskId: event.taskId,
                 roleName: fence.roleName,
                 agentId: fence.agentId,
-                ...(fence.runId === undefined ? {} : { runId: fence.runId }),
+                ...(fence.turnId === undefined ? {} : { turnId: fence.turnId }),
                 launchId: fence.launchId,
                 nativeSessionId: fence.nativeSessionId,
                 reason
@@ -284,7 +284,7 @@ export class FileRuntimeEventProcessor {
             taskId: event.taskId,
             roleName: event.roleName,
             agentId: event.agentId,
-            ...(event.runId === undefined ? {} : { runId: event.runId }),
+            ...(event.turnId === undefined ? {} : { turnId: event.turnId }),
             ...(event.launchId === undefined ? {} : { launchId: event.launchId }),
             nativeSessionId: event.nativeSessionId,
             reason
@@ -418,7 +418,7 @@ function progressStreamKey(event) {
         fence.driverId,
         fence.launchId,
         fence.nativeSessionId ?? null,
-        fence.runId ?? null,
+        fence.turnId ?? null,
         payload.activity,
         isRuntimeTokenEvidence(event.observation) ? "usage" : "signal"
     ]);
@@ -644,7 +644,7 @@ export class AsyncRuntimeEventProcessor {
                 adapterId: this.drivers.require(fence.driverId).adapterId,
                 launchId: fence.launchId,
                 nativeSessionId: fence.nativeSessionId,
-                ...(fence.runId === undefined ? {} : { runId: fence.runId })
+                ...(fence.turnId === undefined ? {} : { turnId: fence.turnId })
             });
         }
         return outcome;
@@ -660,8 +660,8 @@ export class AsyncRuntimeEventProcessor {
                 adapterId: event.adapterId,
                 ...(event.launchId === undefined ? {} : { launchId: event.launchId }),
                 nativeSessionId: event.nativeSessionId,
-                turnId: event.turnId,
-                ...(event.runId === undefined ? {} : { runId: event.runId }),
+                nativeTurnId: event.nativeTurnId,
+                ...(event.turnId === undefined ? {} : { turnId: event.turnId }),
                 summary: event.summary
             };
             if (task === null)
@@ -689,7 +689,7 @@ export class AsyncRuntimeEventProcessor {
                 adapterId: event.adapterId,
                 ...(event.launchId === undefined ? {} : { launchId: event.launchId }),
                 nativeSessionId: event.nativeSessionId,
-                ...(event.runId === undefined ? {} : { runId: event.runId })
+                ...(event.turnId === undefined ? {} : { turnId: event.turnId })
             });
             return "applied";
         }
@@ -700,7 +700,7 @@ export class AsyncRuntimeEventProcessor {
             adapterId: event.adapterId,
             ...(event.launchId === undefined ? {} : { launchId: event.launchId }),
             nativeSessionId: event.nativeSessionId,
-            turnId: event.turnId,
+            nativeTurnId: event.nativeTurnId,
             ...(event.title === undefined ? {} : { title: event.title }),
             summary: event.summary
         };
@@ -723,7 +723,7 @@ export class AsyncRuntimeEventProcessor {
                 taskId: event.taskId,
                 roleName: fence.roleName,
                 agentId: fence.agentId,
-                ...(fence.runId === undefined ? {} : { runId: fence.runId }),
+                ...(fence.turnId === undefined ? {} : { turnId: fence.turnId }),
                 launchId: fence.launchId,
                 nativeSessionId: fence.nativeSessionId,
                 reason
@@ -736,7 +736,7 @@ export class AsyncRuntimeEventProcessor {
             taskId: event.taskId,
             roleName: event.roleName,
             agentId: event.agentId,
-            ...(event.runId === undefined ? {} : { runId: event.runId }),
+            ...(event.turnId === undefined ? {} : { turnId: event.turnId }),
             ...(event.launchId === undefined ? {} : { launchId: event.launchId }),
             nativeSessionId: event.nativeSessionId,
             reason

package/dist/controller/{runtimeHookRunFence.js → runtimeHookTurnFence.js}

@@ -1,17 +1,18 @@
-import { openCompatibleFileTaskStore } from "../storage/compatibleTaskStore.js";
+import { openCurrentTaskStore } from "../storage/currentTaskStore.js";
 import { hasRuntimeCleanupObligation, isRuntimeLaunchReservation, runtimeLifecycleTarget } from "../runtime/lifecycleReservation.js";
 import { nativeSessionIdForLaunch } from "../runtime/preallocatedNativeSession.js";
 import { runtimeObservationFromTaskEvent } from "../runtime/runtimeObservation.js";
 import { YUI_CONTROL_PLANE_DESCRIPTOR, YUI_TASK_RUNTIME_DESCRIPTOR, assertExactTaskRuntimeEnvironment, exactControlPlaneDigest, parseExactControlPlaneDescriptor, refreshReusedTaskRuntimeDescriptorSource } from "../runtime/exactControlPlane.js";
-import { agentRunDeliveryReceiptId } from "../run/agentRun.js";
+import { formatTurnReceiptId } from "../task/taskRecordReference.js";
+import { managedProviderTurnId } from "../runtime/providerRuntimeIdentity.js";
 /**
  * Resolves turn identity from the current durable in-flight fence. The one
  * exception is a Driver-declared startup Session Hook, which can arrive before
- * Session projection and is fenced by the exact Run-bound launch reservation.
+ * Session projection and is fenced by the exact Turn-bound launch reservation.
  * Preallocated identities are additionally checked against Yui's deterministic
  * launch identity. The immutable event is revalidated by the inbox fold.
  */
-export function resolveRuntimeHookRunFence(environment, adapterId, payloadNativeSessionId, options = {}) {
+export function resolveRuntimeHookTurnFence(environment, adapterId, payloadNativeSessionId, options = {}) {
     if (environment.YUI_SESSION_SCOPE !== "task") {
         throw new Error("Runtime observation Hook requires a Task session scope.");
     }
@@ -34,12 +35,12 @@ export function resolveRuntimeHookRunFence(environment, adapterId, payloadNative
         && nativeSessionId !== requireIdentity(expectedNativeSessionId, "YUI native session id")) {
         throw new Error("Runtime observation Hook native Session does not match its launch envelope.");
     }
-    const store = openCompatibleFileTaskStore(home);
+    const store = openCurrentTaskStore(home);
     const task = store.getTask(taskId);
     if (task === null
-        || task.status !== "active"
-        || task.executionGate.state !== "enabled") {
-        throw new Error("Runtime observation Hook Task is not current and active.");
+        || (!(task.status === "active" && task.executionGate.state === "enabled")
+            && !(task.status === "completed" && (options.terminal === true || options.sessionOnly === true)))) {
+        throw new Error("Runtime observation Hook Task does not accept this lifecycle boundary.");
     }
     const role = store.getRole(taskId, roleName);
     if (role === null || role.activeAgentId !== agentId) {
@@ -49,20 +50,38 @@ export function resolveRuntimeHookRunFence(environment, adapterId, payloadNative
     if (sessions !== null && sessions.activeAgentId !== agentId) {
         throw new Error("Runtime observation Hook Session Agent is not current.");
     }
-    const inFlight = sessions?.inFlight;
     const session = sessions?.sessions[agentId];
-    const roleMailbox = store.getWorkMailbox({ kind: "role", taskId, roleName });
-    const roleInputDelivery = roleMailbox?.inputDelivery;
-    const roleExecution = roleMailbox?.processing?.executionRef;
-    const activationReceiptId = roleInputDelivery?.executionRef?.type === "run"
-        && roleInputDelivery.executionRef.taskId === taskId
-        && roleInputDelivery.executionRef.id === inFlight?.runId
-        ? roleInputDelivery.attemptId
-        : roleExecution?.type === "run"
-            && roleExecution.taskId === taskId
-            && roleExecution.id === inFlight?.runId
-            ? roleMailbox.processing.batchId
-            : inFlight?.receiptId;
+    const activeTurn = store.getActiveTurn(taskId, roleName);
+    const providerTurn = sessions?.providerBinding?.turn;
+    const directProviderTurn = providerTurn !== null
+        && providerTurn !== undefined
+        && providerTurn.turnId === undefined
+        && ((options.attemptId !== undefined && providerTurn.attemptId === options.attemptId)
+            || (options.nativeTurnId !== undefined && providerTurn.nativeTurnId === options.nativeTurnId));
+    const sessionOnlyObservation = options.sessionOnly === true && activeTurn === null;
+    if (directProviderTurn || sessionOnlyObservation) {
+        if (session === undefined
+            || session.adapterId !== adapterId
+            || session.launchId !== launchId
+            || session.nativeSessionId !== nativeSessionId
+            || session.effective.workspace.root !== workspace) {
+            throw new Error("Runtime observation Hook Session does not match durable state.");
+        }
+        return {
+            taskId,
+            roleName,
+            agentId,
+            launchId,
+            ...(directProviderTurn ? { receiptId: providerTurn.attemptId } : {}),
+            nativeSessionId,
+            workspace
+        };
+    }
+    const activationReceiptId = providerTurn !== null
+        && providerTurn !== undefined
+        && managedProviderTurnId(providerTurn) === activeTurn?.id
+        ? providerTurn.attemptId
+        : activeTurn === null ? undefined : formatTurnReceiptId(taskId, activeTurn.id);
     const acceptedTurn = options.nativeTurnId === undefined
         ? null
         : acceptedTurnBinding(store.listEvents(taskId), {
@@ -87,21 +106,21 @@ export function resolveRuntimeHookRunFence(environment, adapterId, payloadNative
     }));
     const exactReservation = isRuntimeLaunchReservation(mailbox?.processing, launchId)
         && !hasRuntimeCleanupObligation(mailbox);
-    const startupRunId = options.startupSession === undefined
+    const startupTurnId = options.startupSession === undefined
         ? undefined
-        : requireIdentity(runtime?.runId
-            ?? environment.YUI_RUN_ID, "Run id");
-    const startupReservation = startupRunId !== undefined
+        : requireIdentity(runtime?.turnId
+            ?? environment.YUI_TURN_ID, "Turn id");
+    const startupReservation = startupTurnId !== undefined
         && exactReservation
         && !hasRuntimeCleanupObligation(mailbox);
-    const startupRun = startupRunId === undefined
+    const startupTurn = startupTurnId === undefined
         ? null
-        : store.getAgentRun(taskId, startupRunId);
+        : store.getTurn(taskId, startupTurnId);
     const replacementStartup = options.startupSession !== undefined
         && session !== undefined
         && sessions !== null
         && startupReservation
-        && startupRun?.mode === "new"
+        && startupTurn?.mode === "new"
         && session.status === "ended";
     const preallocatedStartup = options.startupSession === "preallocated"
         && expectedNativeSessionId !== undefined
@@ -112,44 +131,31 @@ export function resolveRuntimeHookRunFence(environment, adapterId, payloadNative
         && expectedNativeSessionId === undefined
         && (session === undefined || replacementStartup)
         && startupReservation;
-    const terminalRunId = options.terminal === true && acceptedBinding === null
-        ? requireIdentity(environment.YUI_RUN_ID ?? runtime?.runId, "Run id")
+    const terminalTurnId = options.terminal === true && acceptedBinding === null
+        ? requireIdentity(environment.YUI_TURN_ID ?? runtime?.turnId, "Turn id")
         : undefined;
-    const terminalRun = acceptedBinding !== null
-        ? store.getAgentRun(taskId, acceptedBinding.fence.runId)
-        : terminalRunId === undefined
+    const terminalTurn = acceptedBinding !== null
+        ? store.getTurn(taskId, acceptedBinding.fence.turnId)
+        : terminalTurnId === undefined
             ? null
-            : store.getAgentRun(taskId, terminalRunId);
-    const exactTerminal = terminalRun !== null
-        && terminalRun.status !== "active"
-        && terminalRun.roleName === roleName
-        && terminalRun.effective.agentId === agentId
-        && terminalRun.effective.adapterId === adapterId
-        && session !== undefined
-        && (acceptedBinding !== null || inFlight === null || inFlight === undefined);
-    if ((inFlight === null || inFlight === undefined)
+            : store.getTurn(taskId, terminalTurnId);
+    const exactTerminal = terminalTurn !== null
+        && terminalTurn.status !== "active"
+        && terminalTurn.roleName === roleName
+        && terminalTurn.effective.agentId === agentId
+        && terminalTurn.effective.adapterId === adapterId
+        && session !== undefined;
+    if (activeTurn === null
         && !preallocatedStartup
         && !discoveredStartup
         && !exactTerminal
         && acceptedBinding === null) {
-        throw new Error("Runtime observation Hook has no matching durable in-flight Run.");
-    }
-    if (acceptedBinding === null
-        && inFlight !== null && inFlight !== undefined && inFlight.agentId !== agentId) {
-        throw new Error("Runtime observation Hook has no matching durable in-flight Run.");
-    }
-    if ((preallocatedStartup || discoveredStartup)
-        && inFlight !== null
-        && inFlight !== undefined
-        && (inFlight.runId !== startupRunId
-            || startupRun === null
-            || inFlight.receiptId !== agentRunDeliveryReceiptId(startupRun))) {
-        throw new Error("Runtime observation Hook has no matching durable in-flight Run.");
+        throw new Error("Runtime observation Hook has no matching durable in-flight Turn.");
     }
-    const runId = acceptedBinding?.fence.runId
-        ?? inFlight?.runId
-        ?? startupRunId
-        ?? terminalRunId;
+    const turnId = acceptedBinding?.fence.turnId
+        ?? activeTurn?.id
+        ?? startupTurnId
+        ?? terminalTurnId;
     let effectiveRuntime = runtime;
     let effectiveLaunchId = acceptedBinding?.fence.launchId ?? launchId;
     const sessionLaunchId = session?.launchId;
@@ -160,35 +166,35 @@ export function resolveRuntimeHookRunFence(environment, adapterId, payloadNative
         && sessionLaunchId !== undefined
         && typeof runtimeSource === "string"
         && !runtimeSource.trimStart().startsWith("{")
-        && (runtime.runId !== runId
+        && (runtime.turnId !== turnId
             || runtime.launchId !== sessionLaunchId
             || runtime.nativeSessionId !== session.nativeSessionId)) {
         // A reused native pane keeps its original descriptor source. Advance only
         // that Hook-owned source to the current durable generation before the
         // volatile fence; the Controller no longer scans history to keep it fresh.
         effectiveRuntime = refreshReusedTaskRuntimeDescriptorSource(runtimeSource, home, store, {
-            runId,
+            turnId,
             launchId: sessionLaunchId,
             nativeSessionId: session.nativeSessionId
         });
         effectiveLaunchId = effectiveRuntime.launchId;
     }
     if (acceptedBinding === null
-        && effectiveRuntime?.runId !== undefined && effectiveRuntime.runId !== runId) {
-        throw new Error("Runtime observation Hook Run does not match its current descriptor.");
+        && effectiveRuntime?.turnId !== undefined && effectiveRuntime.turnId !== turnId) {
+        throw new Error("Runtime observation Hook Turn does not match its current descriptor.");
     }
-    const run = acceptedBinding !== null || exactTerminal
-        ? terminalRun
-        : store.getActiveAgentRun(taskId, roleName);
-    if (run === null
-        || run.id !== runId
-        || (acceptedBinding === null && !exactTerminal && run.status !== "active")
-        || run.effective.agentId !== agentId
-        || run.effective.adapterId !== adapterId) {
-        throw new Error("Runtime observation Hook Run does not match durable active state.");
+    const turn = acceptedBinding !== null || exactTerminal
+        ? terminalTurn
+        : store.getActiveTurn(taskId, roleName);
+    if (turn === null
+        || turn.id !== turnId
+        || (acceptedBinding === null && !exactTerminal && turn.status !== "active")
+        || turn.effective.agentId !== agentId
+        || turn.effective.adapterId !== adapterId) {
+        throw new Error("Runtime observation Hook Turn does not match durable active state.");
     }
-    if (run.effective.workspace.root !== workspace) {
-        throw new Error("Runtime observation Hook workspace does not match the durable Run snapshot.");
+    if (turn.effective.workspace.root !== workspace) {
+        throw new Error("Runtime observation Hook workspace does not match the durable Turn snapshot.");
     }
     if (session !== undefined && acceptedBinding === null && !replacementStartup) {
         if (session.adapterId !== adapterId
@@ -208,7 +214,7 @@ export function resolveRuntimeHookRunFence(environment, adapterId, payloadNative
         roleName,
         agentId,
         launchId: effectiveLaunchId,
-        runId,
+        turnId,
         ...(acceptedBinding?.fence.receiptId === undefined
             ? activationReceiptId === undefined ? {} : { receiptId: activationReceiptId }
             : { receiptId: acceptedBinding.fence.receiptId }),
@@ -227,7 +233,7 @@ function knownContinuationBinding(events, expected) {
         && observation.fence.nativeSessionId === expected.nativeSessionId
         && observation.fence.continuationId === expected.continuationId
         && observation.fence.continuationGeneration === expected.continuationGeneration
-        && observation.fence.runId !== undefined)
+        && observation.fence.turnId !== undefined)
         .sort((left, right) => (left.receivedAt.localeCompare(right.receivedAt)
         || (left.sequence ?? -1) - (right.sequence ?? -1)
         || (left.ordinal ?? -1) - (right.ordinal ?? -1)
@@ -235,10 +241,10 @@ function knownContinuationBinding(events, expected) {
     const binding = matches.at(-1) ?? null;
     if (binding === null)
         return null;
-    if (matches.some((candidate) => candidate.fence.runId !== binding.fence.runId
+    if (matches.some((candidate) => candidate.fence.turnId !== binding.fence.turnId
         || candidate.fence.launchId !== binding.fence.launchId
         || candidate.fence.receiptId !== binding.fence.receiptId)) {
-        throw new Error("Runtime observation Hook continuation has conflicting durable Run bindings.");
+        throw new Error("Runtime observation Hook continuation has conflicting durable Turn bindings.");
     }
     return binding;
 }
@@ -252,7 +258,7 @@ function acceptedTurnBinding(events, expected) {
         && observation.fence.agentId === expected.agentId
         && observation.fence.nativeSessionId === expected.nativeSessionId
         && observation.fence.nativeTurnId === expected.nativeTurnId
-        && observation.fence.runId !== undefined)
+        && observation.fence.turnId !== undefined)
         .sort((left, right) => (left.receivedAt.localeCompare(right.receivedAt)
         || (left.sequence ?? -1) - (right.sequence ?? -1)
         || (left.ordinal ?? -1) - (right.ordinal ?? -1)
@@ -260,10 +266,10 @@ function acceptedTurnBinding(events, expected) {
     const binding = matches.at(-1) ?? null;
     if (binding === null)
         return null;
-    if (matches.some((candidate) => candidate.fence.runId !== binding.fence.runId
+    if (matches.some((candidate) => candidate.fence.turnId !== binding.fence.turnId
         || candidate.fence.launchId !== binding.fence.launchId
         || candidate.fence.receiptId !== binding.fence.receiptId)) {
-        throw new Error("Runtime observation Hook native Turn has conflicting durable Run bindings.");
+        throw new Error("Runtime observation Hook native Turn has conflicting durable Turn bindings.");
     }
     return binding;
 }

package/dist/controller/runtimeLaunchCoordinator.js

@@ -188,7 +188,7 @@ export class RuntimeLaunchCoordinator {
                     ...(runtimeIsolation === undefined
                         ? {}
                         : { runtimeIsolation: runtimeIsolation.descriptor }),
-                    ...(request.runId === undefined ? {} : { runId: request.runId }),
+                    ...(request.turnId === undefined ? {} : { turnId: request.turnId }),
                     ...(request.environment === undefined
                         ? {}
                         : { environment: request.environment })
@@ -204,7 +204,7 @@ export class RuntimeLaunchCoordinator {
                     ...(runtimeIsolation === undefined
                         ? {}
                         : { runtimeIsolation: runtimeIsolation.descriptor }),
-                    ...(request.runId === undefined ? {} : { runId: request.runId }),
+                    ...(request.turnId === undefined ? {} : { turnId: request.turnId }),
                     ...(request.environment === undefined
                         ? {}
                         : { environment: request.environment }),
@@ -409,7 +409,7 @@ function validateRuntimeLaunchPreflight(preflight, request, launchId) {
                 && preflight.owner.taskId === request.owner.taskId));
     if (preflight.launchId !== launchId
         || !ownerMatches
-        || preflight.runId !== request.runId
+        || preflight.turnId !== request.turnId
         || preflight.agentId !== request.agentId
         || preflight.adapterId !== request.adapterId
         || !effectiveLaunchSnapshotsCompatible(preflight.effective, request.effective)

package/dist/controller/runtimeObservationHook.js

@@ -3,13 +3,13 @@ import { builtinAgentDriverRegistry } from "../runtime/builtinAgentDrivers.js";
 import { normalizeAgentDriverHookClassification } from "../runtime/agentDriver.js";
 import { mapAgentDriverHooks } from "../runtime/agentDriverObservation.js";
 import { runtimeLifecycleSignalKey } from "../runtime/lifecycleReservation.js";
-import { formatAgentRunReceiptId } from "../task/taskRecordReference.js";
+import { formatTurnReceiptId } from "../task/taskRecordReference.js";
 import { FileRuntimeEventInbox, MAX_RUNTIME_EVENT_FILE_BYTES } from "./runtimeEventInbox.js";
-import { resolveRuntimeHookRunFence } from "./runtimeHookRunFence.js";
+import { resolveRuntimeHookTurnFence } from "./runtimeHookTurnFence.js";
 /**
  * Single hidden ingress for every structured CLI Driver Hook. Native event
  * names and payload shapes terminate here; the durable inbox contains only a
- * provider-independent RuntimeObservation with an exact generation/Run fence.
+ * provider-independent RuntimeObservation with an exact generation/Turn fence.
  */
 export async function runRuntimeObservationHookCommand(stdinJson, environment = process.env, call = callController, now = new Date(), dependencies = {}) {
     if (environment.YUI_SESSION_SCOPE === "global") {
@@ -55,7 +55,7 @@ async function runGlobalRuntimeTurnHook(stdinJson, environment, call, now, depen
         adapterId: "claude",
         launchId: requireIdentity(environment.YUI_LAUNCH_ID, "Launch id"),
         nativeSessionId,
-        turnId: optionalIdentity(driver.runtime.nativeTurnId(nativeHook)) ?? occurrenceId,
+        nativeTurnId: optionalIdentity(driver.runtime.nativeTurnId(nativeHook)) ?? occurrenceId,
         ...(environment.YUI_SESSION_TITLE === undefined
             ? {}
             : { title: requireIdentity(environment.YUI_SESSION_TITLE, "Session title") }),
@@ -84,7 +84,7 @@ export function parseRuntimeObservationHook(stdinJson, environment, now = new Da
     const nativeSessionId = requireIdentity(driver.runtime.nativeSessionId(nativeHook), "Agent Driver native Session id");
     const nativeTurnId = optionalIdentity(driver.runtime.nativeTurnId(nativeHook));
     const classification = normalizeAgentDriverHookClassification(driver.runtime.classifyHook(nativeHook));
-    const fence = (dependencies.resolveRunFence ?? resolveRuntimeHookRunFence)(environment, driver.adapterId, nativeSessionId, {
+    const fence = (dependencies.resolveTurnFence ?? resolveRuntimeHookTurnFence)(environment, driver.adapterId, nativeSessionId, {
         ...(classification.startupSession === undefined
             ? {}
             : { startupSession: classification.startupSession }),
@@ -95,6 +95,9 @@ export function parseRuntimeObservationHook(stdinJson, environment, now = new Da
         }),
         ...(nativeTurnId === undefined ? {} : { nativeTurnId })
     });
+    if (fence.turnId === undefined) {
+        throw new Error("Agent Driver Hook requires a managed Turn.");
+    }
     const driverInput = {
         driver,
         hookEventName,
@@ -107,7 +110,7 @@ export function parseRuntimeObservationHook(stdinJson, environment, now = new Da
         fence: {
             taskId: fence.taskId,
             roleName: fence.roleName,
-            runId: fence.runId,
+            turnId: fence.turnId,
             agentId: fence.agentId,
             driverId,
             launchId: fence.launchId,
@@ -115,8 +118,8 @@ export function parseRuntimeObservationHook(stdinJson, environment, now = new Da
             conversationId: fence.nativeSessionId,
             activationId: fence.launchId,
             nativeSessionId: fence.nativeSessionId,
-            nativeTurnId: nativeTurnId ?? fence.runId,
-            receiptId: fence.receiptId ?? formatAgentRunReceiptId(fence.taskId, fence.runId)
+            nativeTurnId: nativeTurnId ?? fence.turnId,
+            receiptId: fence.receiptId ?? formatTurnReceiptId(fence.taskId, fence.turnId)
         },
         payload
     };