@zq-silk/yui 0.15.7 → 0.15.8

package/dist/controller/runtimeEventInbox.js

@@ -3,7 +3,7 @@ import { isDeepStrictEqual } from "node:util";
 import { closeSync, constants, existsSync, fchmodSync, fsyncSync, linkSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { createRuntimeObservation, isRuntimeTokenEvidence } from "../runtime/runtimeObservation.js";
-import { boundedTurnFailureDiagnostic, transportAgentResult } from "../domain/agentResultTransport.js";
+import { boundedRunFailureDiagnostic, transportAgentResult } from "../domain/agentResultTransport.js";
 export const MAX_RUNTIME_EVENT_FILE_BYTES = 16 * 1024 * 1024;
 const RUNTIME_EVENT_DIRECTORY = join("runtime", "inbox");
 const INVALID_RUNTIME_EVENT_DIRECTORY = join("runtime", "inbox-invalid");
@@ -40,7 +40,7 @@ export class FileRuntimeEventInbox {
         });
         return this.publish(event);
     }
-    enqueueTurnTerminal(input) {
+    enqueueRunTerminal(input) {
         const normalized = normalizeNativeTurnTerminalInput(input);
         return this.publish(Object.freeze({
             schemaVersion: 1,
@@ -111,7 +111,7 @@ export class FileRuntimeEventInbox {
         catch {
             throw invalidEvent(`Runtime event JSON is invalid: ${id}`);
         }
-        const event = parseRuntimeEvent(value);
+        const event = parseRuntimeEvent(decodeInboxV1(value));
         if (event.id !== id || runtimeEventId(event.type, event) !== id) {
             throw invalidEvent(`Runtime event identity is invalid: ${id}`);
         }
@@ -169,7 +169,7 @@ export class FileRuntimeEventInbox {
         return this.publishUnlocked(event);
     }
     publishUnlocked(event) {
-        const content = `${JSON.stringify(event)}\n`;
+        const content = `${JSON.stringify(encodeInboxV1(event))}\n`;
         if (Buffer.byteLength(content, "utf8") > MAX_RUNTIME_EVENT_FILE_BYTES) {
             throw new RuntimeEventInboxError("RUNTIME_EVENT_TOO_LARGE", "Runtime event exceeds the durable inbox limit.");
         }
@@ -276,10 +276,9 @@ function runtimeEventId(type, input) {
         provider.roleName,
         provider.agentId,
         provider.adapterId,
-        provider.runtimeGenerationId ?? null,
         provider.nativeSessionId,
         provider.nativeTurnId,
-        provider.turnId ?? null
+        provider.runId ?? null
     ];
     return `turn-${createHash("sha256").update(JSON.stringify(common)).digest("hex")}`;
 }
@@ -289,7 +288,7 @@ function normalizeNativeTurnTerminalInput(input) {
         throw invalidEvent();
     if (!["completed", "failed", "cancelled"].includes(input.providerStatus))
         throw invalidEvent();
-    const outcome = normalizeRuntimeTurnTerminalOutcome(input.outcome);
+    const outcome = normalizeRuntimeRunTerminalOutcome(input.outcome);
     if (outcome.status === "completed" && input.providerStatus !== "completed") {
         throw invalidEvent("Only a completed Provider Turn may carry a completed Agent result.");
     }
@@ -298,14 +297,11 @@ function normalizeNativeTurnTerminalInput(input) {
         roleName: requireIdentityText(input.roleName, "Role name"),
         agentId: requireIdentityText(input.agentId, "Agent id"),
         adapterId: input.adapterId,
-        ...(input.runtimeGenerationId === undefined
-            ? {}
-            : { runtimeGenerationId: requireIdentityText(input.runtimeGenerationId, "Runtime generation id") }),
         nativeSessionId: requireIdentityText(input.nativeSessionId, "Native session id"),
         nativeTurnId: requireIdentityText(input.nativeTurnId, "Provider native Turn id"),
-        ...(input.turnId === undefined
+        ...(input.runId === undefined
             ? {}
-            : { turnId: requireIdentityText(input.turnId, "Turn id") }),
+            : { runId: requireIdentityText(input.runId, "AgentRun id") }),
         ...(input.title === undefined
             ? {}
             : { title: requireIdentityText(input.title, "Session title") }),
@@ -318,9 +314,9 @@ function normalizeNativeTurnTerminalInput(input) {
         ? { ...common, taskId: requireIdentityText(input.taskId, "Task id") }
         : common;
 }
-function normalizeRuntimeTurnTerminalOutcome(input) {
+function normalizeRuntimeRunTerminalOutcome(input) {
     if (!isObject(input)) {
-        throw invalidEvent("Runtime Turn terminal outcome is invalid.");
+        throw invalidEvent("Runtime AgentRun terminal outcome is invalid.");
     }
     if (input.status === "completed")
         return transportAgentResult(input.output);
@@ -336,14 +332,52 @@ function normalizeRuntimeTurnTerminalOutcome(input) {
             "cancelled"
         ]
             .includes(input.failureReason)) {
-        throw invalidEvent("Runtime Turn failure outcome is invalid.");
+        throw invalidEvent("Runtime AgentRun failure outcome is invalid.");
     }
     return {
         status: "failed",
-        diagnostic: boundedTurnFailureDiagnostic(input.diagnostic),
-        failureReason: input.failureReason
+        diagnostic: boundedRunFailureDiagnostic(input.diagnostic),
+        failureReason: input.failureReason,
+        ...(typeof input.output === "string" && transportAgentResult(input.output).status === "completed"
+            ? { output: input.output } : {})
     };
 }
+/** The already deployed inbox v1 is a transport envelope, not a second domain
+ * schema. Keep its wire keys and opaque ids stable so pre-upgrade pending
+ * facts remain readable atomically. Public/in-process values use runId.
+ * Retire this codec only with a new inbox protocol after all v1 producers
+ * and pending files have drained; do not introduce dual domain-store reads.
+ */
+function inboxReference(value, encode) {
+    const from = encode ? "runId" : "turnId";
+    const to = encode ? "turnId" : "runId";
+    if (Object.hasOwn(value, to))
+        throw invalidEvent("Inbox v1 reference uses the wrong wire shape.");
+    const { [from]: id, ...rest } = value;
+    return id === undefined ? rest : { ...rest, [to]: id };
+}
+function inboxEnvelope(value, encode) {
+    if (!isObject(value))
+        throw invalidEvent();
+    if (value.type === "native-turn-terminal")
+        return inboxReference(value, encode);
+    if (value.type !== "runtime-observation")
+        return value;
+    if (!isObject(value.observation) || !isObject(value.observation.fence))
+        throw invalidEvent();
+    const observation = value.observation;
+    let payload = observation.payload;
+    if (isObject(payload?.failure)) {
+        const from = encode ? "runTerminal" : "turnTerminal";
+        const to = encode ? "turnTerminal" : "runTerminal";
+        const { [from]: terminal, ...failure } = payload.failure;
+        payload = { ...payload, failure: terminal === undefined ? failure : { ...failure, [to]: terminal } };
+    }
+    return { ...value, observation: { ...observation, payload,
+            fence: inboxReference(observation.fence, encode) } };
+}
+function encodeInboxV1(value) { return inboxEnvelope(value, true); }
+function decodeInboxV1(value) { return inboxEnvelope(value, false); }
 function normalizeDurableJobTerminalInput(input) {
     if (input.scope !== "task")
         throw invalidEvent();
@@ -418,16 +452,14 @@ function parseNativeTurnTerminalEvent(value) {
             "schemaVersion", "id", "type", "receivedAt", "scope", "taskId",
             "roleName", "agentId", "adapterId", "nativeSessionId", "nativeTurnId",
             "providerStatus", "outcome",
-            ...(value.runtimeGenerationId === undefined ? [] : ["runtimeGenerationId"]),
-            ...(value.turnId === undefined ? [] : ["turnId"]),
+            ...(value.runId === undefined ? [] : ["runId"]),
             ...(value.title === undefined ? [] : ["title"])
         ]
         : [
             "schemaVersion", "id", "type", "receivedAt", "scope",
             "roleName", "agentId", "adapterId", "nativeSessionId", "nativeTurnId",
             "providerStatus", "outcome",
-            ...(value.runtimeGenerationId === undefined ? [] : ["runtimeGenerationId"]),
-            ...(value.turnId === undefined ? [] : ["turnId"]),
+            ...(value.runId === undefined ? [] : ["runId"]),
             ...(value.title === undefined ? [] : ["title"])
         ];
     if ((scope !== "task" && scope !== "global")
@@ -441,10 +473,9 @@ function parseNativeTurnTerminalEvent(value) {
         roleName: value.roleName,
         agentId: value.agentId,
         adapterId: value.adapterId,
-        ...(value.runtimeGenerationId === undefined ? {} : { runtimeGenerationId: value.runtimeGenerationId }),
         nativeSessionId: value.nativeSessionId,
         nativeTurnId: value.nativeTurnId,
-        ...(value.turnId === undefined ? {} : { turnId: value.turnId }),
+        ...(value.runId === undefined ? {} : { runId: value.runId }),
         ...(value.title === undefined ? {} : { title: value.title }),
         providerStatus: value.providerStatus,
         outcome: value.outcome
@@ -503,11 +534,10 @@ function hasSameIdentity(left, right) {
         && (!("roleName" in left) || !("roleName" in right) || left.roleName === right.roleName)
         && (!("agentId" in left) || !("agentId" in right) || left.agentId === right.agentId)
         && (!("adapterId" in left) || !("adapterId" in right) || left.adapterId === right.adapterId)
-        && (!("runtimeGenerationId" in left) || !("runtimeGenerationId" in right) || left.runtimeGenerationId === right.runtimeGenerationId)
         && (!("nativeSessionId" in left)
             || !("nativeSessionId" in right)
             || left.nativeSessionId === right.nativeSessionId)
-        && (!("turnId" in left) || !("turnId" in right) || left.turnId === right.turnId)
+        && (!("runId" in left) || !("runId" in right) || left.runId === right.runId)
         && (!("jobId" in left) || !("jobId" in right) || left.jobId === right.jobId);
 }
 function compareRuntimeEvents(left, right) {

package/dist/controller/runtimeEventProcessor.js

@@ -189,10 +189,9 @@ export class FileRuntimeEventProcessor {
                 roleName: event.roleName,
                 agentId: event.agentId,
                 adapterId: event.adapterId,
-                ...(event.runtimeGenerationId === undefined ? {} : { runtimeGenerationId: event.runtimeGenerationId }),
                 nativeSessionId: event.nativeSessionId,
                 nativeTurnId: event.nativeTurnId,
-                ...(event.turnId === undefined ? {} : { turnId: event.turnId }),
+                ...(event.runId === undefined ? {} : { runId: event.runId }),
                 providerStatus: event.providerStatus,
                 outcome: event.outcome
             };
@@ -202,15 +201,15 @@ export class FileRuntimeEventProcessor {
                 this.recordObsolete(event, task.status === "archived" ? "task-archived" : "task-retired", now);
                 return "obsolete";
             }
-            const disposition = this.observer.classifyRuntimeTurnTerminal?.(input) ?? "apply";
+            const disposition = this.observer.classifyRuntimeRunTerminal?.(input) ?? "apply";
             if (disposition === "deferred")
                 return disposition;
             if (disposition === "obsolete") {
                 this.recordObsolete(event, "identity-mismatch-or-terminal", now);
                 return disposition;
             }
-            const observed = this.observer.observeRuntimeTurnTerminal(input, now);
-            if (isObsoleteRuntimeTurnObservation(observed)) {
+            const observed = this.observer.observeRuntimeRunTerminal(input, now);
+            if (isObsoleteRuntimeRunObservation(observed)) {
                 this.recordObsolete(event, "runtime-cleanup-or-stopped-session", now);
                 return "obsolete";
             }
@@ -221,15 +220,14 @@ export class FileRuntimeEventProcessor {
             roleName: event.roleName,
             agentId: event.agentId,
             adapterId: event.adapterId,
-            ...(event.runtimeGenerationId === undefined ? {} : { runtimeGenerationId: event.runtimeGenerationId }),
             nativeSessionId: event.nativeSessionId,
             nativeTurnId: event.nativeTurnId,
             ...(event.title === undefined ? {} : { title: event.title }),
             providerStatus: event.providerStatus,
             outcome: event.outcome
         };
-        if (this.observer.classifyGlobalRuntimeTurnTerminal?.(input) !== "obsolete") {
-            this.observer.observeGlobalRuntimeTurnTerminal(input, now);
+        if (this.observer.classifyGlobalRuntimeRunTerminal?.(input) !== "obsolete") {
+            this.observer.observeGlobalRuntimeRunTerminal(input, now);
             return "applied";
         }
         return "obsolete";
@@ -247,8 +245,7 @@ export class FileRuntimeEventProcessor {
                 taskId: event.taskId,
                 roleName: fence.roleName,
                 agentId: fence.agentId,
-                ...(fence.turnId === undefined ? {} : { turnId: fence.turnId }),
-                runtimeGenerationId: fence.runtimeGenerationId,
+                ...(fence.runId === undefined ? {} : { runId: fence.runId }),
                 nativeSessionId: fence.nativeSessionId,
                 reason
             }, now);
@@ -264,8 +261,7 @@ export class FileRuntimeEventProcessor {
             taskId: event.taskId,
             roleName: event.roleName,
             agentId: event.agentId,
-            ...(event.turnId === undefined ? {} : { turnId: event.turnId }),
-            ...(event.runtimeGenerationId === undefined ? {} : { runtimeGenerationId: event.runtimeGenerationId }),
+            ...(event.runId === undefined ? {} : { runId: event.runId }),
             nativeSessionId: event.nativeSessionId,
             reason
         }, now);
@@ -396,9 +392,8 @@ function progressStreamKey(event) {
         fence.roleName,
         fence.agentId,
         fence.driverId,
-        fence.runtimeGenerationId,
         fence.nativeSessionId ?? null,
-        fence.turnId ?? null,
+        fence.runId ?? null,
         payload.activity,
         isRuntimeTokenEvidence(event.observation) ? "usage" : "signal"
     ]);
@@ -432,7 +427,7 @@ function positiveInteger(value, fallback) {
     }
     return resolved;
 }
-function isObsoleteRuntimeTurnObservation(value) {
+function isObsoleteRuntimeRunObservation(value) {
     return typeof value === "object"
         && value !== null
         && value.disposition === "obsolete";
@@ -516,10 +511,10 @@ export function createAsyncRuntimeObserver(invoke) {
     return {
         getTask: (taskId) => call("getTask", [taskId]),
         observeRuntimeObservation: (input, now) => withNow("observeRuntimeObservation", input, now),
-        observeRuntimeTurnTerminal: (input, now) => withNow("observeRuntimeTurnTerminal", input, now),
-        observeGlobalRuntimeTurnTerminal: (input, now) => withNow("observeGlobalRuntimeTurnTerminal", input, now),
-        classifyRuntimeTurnTerminal: (input) => call("classifyRuntimeTurnTerminal", [input]),
-        classifyGlobalRuntimeTurnTerminal: (input) => call("classifyGlobalRuntimeTurnTerminal", [input]),
+        observeRuntimeRunTerminal: (input, now) => withNow("observeRuntimeRunTerminal", input, now),
+        observeGlobalRuntimeRunTerminal: (input, now) => withNow("observeGlobalRuntimeRunTerminal", input, now),
+        classifyRuntimeRunTerminal: (input) => call("classifyRuntimeRunTerminal", [input]),
+        classifyGlobalRuntimeRunTerminal: (input) => call("classifyGlobalRuntimeRunTerminal", [input]),
         observeObsoleteRuntimeEvent: (input, now) => withNow("observeObsoleteRuntimeEvent", input, now)
     };
 }
@@ -632,10 +627,9 @@ export class AsyncRuntimeEventProcessor {
                 roleName: event.roleName,
                 agentId: event.agentId,
                 adapterId: event.adapterId,
-                ...(event.runtimeGenerationId === undefined ? {} : { runtimeGenerationId: event.runtimeGenerationId }),
                 nativeSessionId: event.nativeSessionId,
                 nativeTurnId: event.nativeTurnId,
-                ...(event.turnId === undefined ? {} : { turnId: event.turnId }),
+                ...(event.runId === undefined ? {} : { runId: event.runId }),
                 providerStatus: event.providerStatus,
                 outcome: event.outcome
             };
@@ -645,15 +639,15 @@ export class AsyncRuntimeEventProcessor {
                 await this.recordObsolete(event, task.status === "archived" ? "task-archived" : "task-retired", now);
                 return "obsolete";
             }
-            const disposition = (await this.observer.classifyRuntimeTurnTerminal?.(input)) ?? "apply";
+            const disposition = (await this.observer.classifyRuntimeRunTerminal?.(input)) ?? "apply";
             if (disposition === "deferred")
                 return disposition;
             if (disposition === "obsolete") {
                 await this.recordObsolete(event, "identity-mismatch-or-terminal", now);
                 return disposition;
             }
-            const observed = await this.observer.observeRuntimeTurnTerminal(input, now);
-            if (isObsoleteRuntimeTurnObservation(observed)) {
+            const observed = await this.observer.observeRuntimeRunTerminal(input, now);
+            if (isObsoleteRuntimeRunObservation(observed)) {
                 await this.recordObsolete(event, "runtime-cleanup-or-stopped-session", now);
                 return "obsolete";
             }
@@ -664,15 +658,14 @@ export class AsyncRuntimeEventProcessor {
             roleName: event.roleName,
             agentId: event.agentId,
             adapterId: event.adapterId,
-            ...(event.runtimeGenerationId === undefined ? {} : { runtimeGenerationId: event.runtimeGenerationId }),
             nativeSessionId: event.nativeSessionId,
             nativeTurnId: event.nativeTurnId,
             ...(event.title === undefined ? {} : { title: event.title }),
             providerStatus: event.providerStatus,
             outcome: event.outcome
         };
-        if ((await this.observer.classifyGlobalRuntimeTurnTerminal?.(input)) !== "obsolete") {
-            await this.observer.observeGlobalRuntimeTurnTerminal(input, now);
+        if ((await this.observer.classifyGlobalRuntimeRunTerminal?.(input)) !== "obsolete") {
+            await this.observer.observeGlobalRuntimeRunTerminal(input, now);
             return "applied";
         }
         return "obsolete";
@@ -690,8 +683,7 @@ export class AsyncRuntimeEventProcessor {
                 taskId: event.taskId,
                 roleName: fence.roleName,
                 agentId: fence.agentId,
-                ...(fence.turnId === undefined ? {} : { turnId: fence.turnId }),
-                runtimeGenerationId: fence.runtimeGenerationId,
+                ...(fence.runId === undefined ? {} : { runId: fence.runId }),
                 nativeSessionId: fence.nativeSessionId,
                 reason
             }, now);
@@ -703,8 +695,7 @@ export class AsyncRuntimeEventProcessor {
             taskId: event.taskId,
             roleName: event.roleName,
             agentId: event.agentId,
-            ...(event.turnId === undefined ? {} : { turnId: event.turnId }),
-            ...(event.runtimeGenerationId === undefined ? {} : { runtimeGenerationId: event.runtimeGenerationId }),
+            ...(event.runId === undefined ? {} : { runId: event.runId }),
             nativeSessionId: event.nativeSessionId,
             reason
         }, now);