@zq-silk/yui 0.6.2 → 0.6.4

package/dist/controller/runtime.js

@@ -8,7 +8,7 @@ import { hasRuntimeCleanupObligation, runtimeLifecycleSignalKey, runtimeLifecycl
 import { agentProcessReadinessProbe, ExecutorRegistry } from "../executor/executorRegistry.js";
 import { activeLiveRoleAgentSession, roleAgentSessionResumeMode } from "../executor/agentExecutor.js";
 import { effectiveLaunchSnapshotsCompatible, effectiveLaunchSnapshotsCompatibleForTaskMain, resolveEffectiveLaunch } from "../executor/effectiveLaunch.js";
-import { isTaskOwnedWorkspace } from "../worktree/managedWorkspace.js";
+import { isTaskOwnedWorkspace, managedWorkspaceIdentity, sameManagedWorkspaceIdentity } from "../worktree/managedWorkspace.js";
 import { FileRoleLaunchPlanner } from "../executor/fileRoleLaunchPlanner.js";
 import { openCompatibleFileTaskStore } from "../storage/compatibleTaskStore.js";
 import { SqliteTaskStore } from "../storage/sqliteStore.js";
@@ -23,6 +23,7 @@ import { openSchedulerTelemetry } from "../telemetry/telemetryWiring.js";
 import { createFileArtifactPort, createLinuxProcessPort, DurableJobSupervisor } from "./jobSupervisor.js";
 import { createDurableJobControl } from "./jobControl.js";
 import { FileRuntimeEventInbox } from "./runtimeEventInbox.js";
+import { AgentRuntimeObserver } from "./agentRuntimeObserver.js";
 import { AsyncRuntimeEventProcessor, FileRuntimeEventProcessor, createAsyncRuntimeObserver } from "./runtimeEventProcessor.js";
 import { RuntimeLaunchCoordinator } from "./runtimeLaunchCoordinator.js";
 import { ephemeralDomainFromEnvironment, recordEphemeralTmuxTarget } from "./domainIdentity.js";
@@ -399,6 +400,8 @@ export async function startFileTaskControllerRuntime(home, options = {}) {
                         refreshAppliedTaskRuntimeDescriptor(store, planner, input);
                     }
                 })),
+        runtimeObserver: options.runtimeObserver
+            ?? new AgentRuntimeObserver(store, runtimeEventInbox),
         domainIdentity,
         ...(options.configuration !== undefined
             ? { configuration: options.configuration }
@@ -638,7 +641,8 @@ function assertRuntimeLaunchRequestCurrent(store, request) {
     if (request.owner.scope === "task" && request.managedWorkspace !== undefined) {
         const expectedWorkspace = activeRun?.workspace
             ?? currentDesiredManagedWorkspace(store, request.owner.taskId, request.owner.roleName);
-        if (!isDeepStrictEqual(expectedWorkspace, request.managedWorkspace)) {
+        if (expectedWorkspace === undefined
+            || !sameManagedWorkspaceIdentity(expectedWorkspace, request.managedWorkspace)) {
             throw new Error(`Managed workspace launch state changed: ${request.owner.roleName}.`);
         }
     }
@@ -694,7 +698,9 @@ function runtimeLaunchFingerprint(store, request) {
     return createHash("sha256").update(JSON.stringify([
         request.owner,
         request.effective,
-        request.managedWorkspace,
+        request.managedWorkspace === undefined
+            ? undefined
+            : managedWorkspaceIdentity(request.managedWorkspace),
         request.runtimePolicy,
         agent
     ])).digest("hex");

package/dist/controller/runtimeEventInbox.js

@@ -2,8 +2,8 @@ import { createHash, randomUUID } from "node:crypto";
 import { closeSync, constants, existsSync, fchmodSync, fsyncSync, linkSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { withUpgradeCoordinationLock } from "../storage/upgradeCoordination.js";
+import { createRuntimeObservation } from "../runtime/runtimeObservation.js";
 export const MAX_RUNTIME_TURN_SUMMARY_BYTES = 32 * 1024;
-export const MAX_CLAUDE_HOOK_TEXT_BYTES = 4 * 1024 * 1024;
 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");
@@ -24,6 +24,22 @@ export class FileRuntimeEventInbox {
         this.hooks = hooks;
         this.directory = join(home, RUNTIME_EVENT_DIRECTORY);
     }
+    enqueueObservation(input) {
+        const observation = createRuntimeObservation(input);
+        const scope = observation.fence.taskId === undefined ? "global" : "task";
+        const event = Object.freeze({
+            schemaVersion: 1,
+            id: runtimeEventId("runtime-observation", { observation }),
+            type: "runtime-observation",
+            receivedAt: observation.receivedAt,
+            scope,
+            ...(observation.fence.taskId === undefined
+                ? {}
+                : { taskId: observation.fence.taskId }),
+            observation
+        });
+        return this.publish(event);
+    }
     enqueueTurnCompleted(input) {
         const normalized = normalizeCodexInput(input);
         return this.publish(Object.freeze({
@@ -34,46 +50,6 @@ export class FileRuntimeEventInbox {
             ...normalized
         }));
     }
-    enqueueClaudeStopFailure(input) {
-        const normalized = normalizeClaudeStopFailureInput(input);
-        return this.publish(Object.freeze({
-            schemaVersion: 1,
-            id: runtimeEventId("claude-stop-failure", normalized),
-            type: "claude-stop-failure",
-            receivedAt: this.now().toISOString(),
-            ...normalized
-        }));
-    }
-    enqueueSessionLifecycle(input) {
-        const normalized = normalizeSessionLifecycleInput(input);
-        return this.publish(Object.freeze({
-            schemaVersion: 1,
-            id: runtimeEventId("native-session-lifecycle", normalized),
-            type: "native-session-lifecycle",
-            receivedAt: this.now().toISOString(),
-            ...normalized
-        }));
-    }
-    enqueuePromptAccepted(input) {
-        const normalized = normalizePromptAcceptedInput(input);
-        return this.publish(Object.freeze({
-            schemaVersion: 1,
-            id: runtimeEventId("native-prompt-accepted", normalized),
-            type: "native-prompt-accepted",
-            receivedAt: this.now().toISOString(),
-            ...normalized
-        }));
-    }
-    enqueueProviderProgress(input) {
-        const normalized = normalizeProviderProgressInput(input);
-        return this.publishProgress(Object.freeze({
-            schemaVersion: 1,
-            id: runtimeEventId("native-turn-progress", normalized),
-            type: "native-turn-progress",
-            receivedAt: this.now().toISOString(),
-            ...normalized
-        }));
-    }
     enqueueDurableJobTerminal(input) {
         const normalized = normalizeDurableJobTerminalInput(input);
         return this.publish(Object.freeze({
@@ -179,19 +155,6 @@ export class FileRuntimeEventInbox {
         }
         return acknowledged;
     }
-    publishProgress(event) {
-        return withUpgradeCoordinationLock(this.home, () => {
-            this.hooks.afterAdmission?.();
-            const result = this.publishUnlocked(event);
-            if (!result.created)
-                return result;
-            const superseded = this.supersededProgressIds(event);
-            if (superseded.length === 0)
-                return result;
-            this.acknowledgeMany(superseded);
-            return { ...result, coalescedEventCount: superseded.length };
-        });
-    }
     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.
@@ -243,35 +206,6 @@ export class FileRuntimeEventInbox {
             rmSync(temporary, { force: true });
         }
     }
-    supersededProgressIds(event) {
-        const events = this.list();
-        const segment = semanticSegment(events, event);
-        const candidates = events.filter((candidate) => (candidate.type === "native-turn-progress"
-            && sameProgressStream(candidate, event)
-            && compareRuntimeEvents(candidate, segment.before) > 0
-            && (segment.after === undefined || compareRuntimeEvents(candidate, segment.after) < 0)));
-        let latestReceivedAt = "";
-        let greatestSequence;
-        for (const candidate of candidates) {
-            const receivedAtOrder = candidate.receivedAt.localeCompare(latestReceivedAt);
-            if (receivedAtOrder > 0) {
-                latestReceivedAt = candidate.receivedAt;
-                greatestSequence = candidate.sequence;
-            }
-            else if (receivedAtOrder === 0
-                && candidate.sequence !== undefined
-                && (greatestSequence === undefined || candidate.sequence > greatestSequence)) {
-                greatestSequence = candidate.sequence;
-            }
-        }
-        return candidates.flatMap((candidate) => (candidate.receivedAt.localeCompare(latestReceivedAt) < 0
-            || (candidate.receivedAt === latestReceivedAt
-                && candidate.sequence !== undefined
-                && greatestSequence !== undefined
-                && candidate.sequence < greatestSequence)
-            ? [candidate.id]
-            : []));
-    }
     eventPath(id) {
         return join(this.directory, `${id}.json`);
     }
@@ -300,6 +234,14 @@ export class RuntimeEventInboxError extends Error {
     }
 }
 function runtimeEventId(type, input) {
+    if (type === "runtime-observation") {
+        const observation = input.observation;
+        return `turn-${createHash("sha256").update(JSON.stringify([
+            1,
+            type,
+            observation
+        ])).digest("hex")}`;
+    }
     if (type === "durable-job-terminal") {
         const job = input;
         return `turn-${createHash("sha256").update(JSON.stringify([
@@ -312,8 +254,6 @@ function runtimeEventId(type, input) {
             job.outcome
         ])).digest("hex")}`;
     }
-    // The durable-job-terminal branch returned above; narrow the union so
-    // provider-only identity fields are accessible without `in` guards.
     const provider = input;
     const common = [
         1,
@@ -326,11 +266,7 @@ function runtimeEventId(type, input) {
         provider.launchId ?? null,
         provider.nativeSessionId,
         "turnId" in provider ? provider.turnId : null,
-        provider.runId ?? null,
-        "progressId" in provider ? provider.progressId : null,
-        "sequence" in provider ? provider.sequence ?? null : null,
-        "sessionSource" in provider ? provider.sessionSource ?? null : null,
-        "receiptId" in provider ? provider.receiptId ?? null : null
+        provider.runId ?? null
     ];
     return `turn-${createHash("sha256").update(JSON.stringify(common)).digest("hex")}`;
 }
@@ -364,93 +300,6 @@ function normalizeCodexInput(input) {
         ? { ...common, taskId: requireIdentityText(input.taskId, "Task id") }
         : common;
 }
-function normalizeClaudeEnvelope(input) {
-    if (input.scope !== "task" || input.adapterId !== "claude")
-        throw invalidEvent();
-    return {
-        scope: "task",
-        taskId: requireIdentityText(input.taskId, "Task id"),
-        roleName: requireIdentityText(input.roleName, "Role name"),
-        agentId: requireIdentityText(input.agentId, "Agent id"),
-        adapterId: "claude",
-        launchId: requireIdentityText(input.launchId, "Launch id"),
-        nativeSessionId: requireIdentityText(input.nativeSessionId, "Native session id"),
-        runId: requireIdentityText(input.runId, "Run id")
-    };
-}
-function normalizeClaudeStopFailureInput(input) {
-    return {
-        ...normalizeClaudeEnvelope(input),
-        error: requireLongText(input.error, "Claude failure error"),
-        ...(input.errorDetails === undefined
-            ? {}
-            : { errorDetails: requireLongText(input.errorDetails, "Claude failure details") }),
-        ...(input.lastAssistantMessage === undefined
-            ? {}
-            : {
-                lastAssistantMessage: requireLongText(input.lastAssistantMessage, "Claude failure last assistant message")
-            })
-    };
-}
-function normalizeSessionLifecycleInput(input) {
-    if (input.scope !== "task")
-        throw invalidEvent();
-    if (input.adapterId !== "codex" && input.adapterId !== "claude")
-        throw invalidEvent();
-    return {
-        scope: "task",
-        taskId: requireIdentityText(input.taskId, "Task id"),
-        roleName: requireIdentityText(input.roleName, "Role name"),
-        agentId: requireIdentityText(input.agentId, "Agent id"),
-        adapterId: input.adapterId,
-        launchId: requireIdentityText(input.launchId, "Launch id"),
-        nativeSessionId: requireIdentityText(input.nativeSessionId, "Native session id"),
-        ...(input.runId === undefined
-            ? {}
-            : { runId: requireIdentityText(input.runId, "Run id") }),
-        ...(input.sessionSource === undefined
-            ? {}
-            : { sessionSource: requireIdentityText(input.sessionSource, "Session source") })
-    };
-}
-function normalizePromptAcceptedInput(input) {
-    if (input.scope !== "task")
-        throw invalidEvent();
-    if (input.adapterId !== "codex" && input.adapterId !== "claude")
-        throw invalidEvent();
-    return {
-        scope: "task",
-        taskId: requireIdentityText(input.taskId, "Task id"),
-        roleName: requireIdentityText(input.roleName, "Role name"),
-        agentId: requireIdentityText(input.agentId, "Agent id"),
-        adapterId: input.adapterId,
-        launchId: requireIdentityText(input.launchId, "Launch id"),
-        nativeSessionId: requireIdentityText(input.nativeSessionId, "Native session id"),
-        runId: requireIdentityText(input.runId, "Run id"),
-        receiptId: requireIdentityText(input.receiptId, "Receipt id")
-    };
-}
-function normalizeProviderProgressInput(input) {
-    if (input.scope !== "task")
-        throw invalidEvent();
-    if (input.adapterId !== "codex" && input.adapterId !== "claude")
-        throw invalidEvent();
-    if (input.sequence !== undefined && !Number.isSafeInteger(input.sequence)) {
-        throw invalidEvent();
-    }
-    return {
-        scope: "task",
-        taskId: requireIdentityText(input.taskId, "Task id"),
-        roleName: requireIdentityText(input.roleName, "Role name"),
-        agentId: requireIdentityText(input.agentId, "Agent id"),
-        adapterId: input.adapterId,
-        launchId: requireIdentityText(input.launchId, "Launch id"),
-        nativeSessionId: requireIdentityText(input.nativeSessionId, "Native session id"),
-        runId: requireIdentityText(input.runId, "Run id"),
-        progressId: requireIdentityText(input.progressId, "Provider progress id"),
-        ...(input.sequence === undefined ? {} : { sequence: input.sequence })
-    };
-}
 function normalizeDurableJobTerminalInput(input) {
     if (input.scope !== "task")
         throw invalidEvent();
@@ -472,64 +321,34 @@ function parseRuntimeEvent(value) {
     if (!isObject(value))
         throw invalidEvent();
     switch (value.type) {
+        case "runtime-observation": return parseRuntimeObservationEvent(value);
         case "native-turn-completed": return parseCodexEvent(value);
-        case "claude-stop-failure": return parseClaudeStopFailureEvent(value);
-        case "native-session-lifecycle": return parseSessionLifecycleEvent(value);
-        case "native-prompt-accepted": return parsePromptAcceptedEvent(value);
-        case "native-turn-progress": return parseProviderProgressEvent(value);
         case "durable-job-terminal": return parseDurableJobTerminalEvent(value);
         default: throw invalidEvent();
     }
 }
-function parseSessionLifecycleEvent(value) {
-    const expected = [
-        "schemaVersion", "id", "type", "receivedAt", "scope", "taskId", "roleName",
-        "agentId", "adapterId", "launchId", "nativeSessionId",
-        ...(value.runId === undefined ? [] : ["runId"]),
-        ...(value.sessionSource === undefined ? [] : ["sessionSource"])
-    ];
-    if (value.schemaVersion !== 1 || !hasExactKeys(value, expected))
-        throw invalidEvent();
-    const normalized = normalizeSessionLifecycleInput(value);
-    return Object.freeze({
-        schemaVersion: 1,
-        id: requireIdentityText(value.id, "Event id"),
-        type: "native-session-lifecycle",
-        receivedAt: requireTimestamp(value.receivedAt),
-        ...normalized
-    });
-}
-function parsePromptAcceptedEvent(value) {
+function parseRuntimeObservationEvent(value) {
     const expected = [
-        "schemaVersion", "id", "type", "receivedAt", "scope", "taskId", "roleName",
-        "agentId", "adapterId", "launchId", "nativeSessionId", "runId", "receiptId"
+        "schemaVersion", "id", "type", "receivedAt", "scope", "observation",
+        ...(value.taskId === undefined ? [] : ["taskId"])
     ];
     if (value.schemaVersion !== 1 || !hasExactKeys(value, expected))
         throw invalidEvent();
-    const normalized = normalizePromptAcceptedInput(value);
-    return Object.freeze({
-        schemaVersion: 1,
-        id: requireIdentityText(value.id, "Event id"),
-        type: "native-prompt-accepted",
-        receivedAt: requireTimestamp(value.receivedAt),
-        ...normalized
-    });
-}
-function parseProviderProgressEvent(value) {
-    const expected = [
-        "schemaVersion", "id", "type", "receivedAt", "scope", "taskId", "roleName",
-        "agentId", "adapterId", "launchId", "nativeSessionId", "runId", "progressId",
-        ...(value.sequence === undefined ? [] : ["sequence"])
-    ];
-    if (value.schemaVersion !== 1 || !hasExactKeys(value, expected))
-        throw invalidEvent();
-    const normalized = normalizeProviderProgressInput(value);
+    const observation = createRuntimeObservation(value.observation);
+    const scope = observation.fence.taskId === undefined ? "global" : "task";
+    if (value.scope !== scope
+        || (scope === "task" && value.taskId !== observation.fence.taskId)
+        || value.receivedAt !== observation.receivedAt) {
+        throw invalidEvent("Runtime observation envelope does not match its canonical fence.");
+    }
     return Object.freeze({
         schemaVersion: 1,
         id: requireIdentityText(value.id, "Event id"),
-        type: "native-turn-progress",
-        receivedAt: requireTimestamp(value.receivedAt),
-        ...normalized
+        type: "runtime-observation",
+        receivedAt: observation.receivedAt,
+        scope,
+        ...(scope === "task" ? { taskId: observation.fence.taskId } : {}),
+        observation
     });
 }
 function parseDurableJobTerminalEvent(value) {
@@ -591,24 +410,6 @@ function parseCodexEvent(value) {
         ...normalized
     });
 }
-function parseClaudeStopFailureEvent(value) {
-    const expected = [
-        "schemaVersion", "id", "type", "receivedAt", "scope", "taskId", "roleName",
-        "agentId", "adapterId", "launchId", "nativeSessionId", "runId", "error",
-        ...(value.errorDetails === undefined ? [] : ["errorDetails"]),
-        ...(value.lastAssistantMessage === undefined ? [] : ["lastAssistantMessage"])
-    ];
-    if (value.schemaVersion !== 1 || !hasExactKeys(value, expected))
-        throw invalidEvent();
-    const normalized = normalizeClaudeStopFailureInput(value);
-    return Object.freeze({
-        schemaVersion: 1,
-        id: requireIdentityText(value.id, "Event id"),
-        type: "claude-stop-failure",
-        receivedAt: requireTimestamp(value.receivedAt),
-        ...normalized
-    });
-}
 function requireIdentityText(value, label) {
     if (typeof value !== "string" || value.includes("\0"))
         throw invalidEvent();
@@ -618,15 +419,6 @@ function requireIdentityText(value, label) {
     }
     return text;
 }
-function requireLongText(value, label) {
-    if (typeof value !== "string" || value.includes("\0") || value.trim().length === 0) {
-        throw invalidEvent(`${label} is required.`);
-    }
-    if (Buffer.byteLength(value, "utf8") > MAX_CLAUDE_HOOK_TEXT_BYTES) {
-        throw new RuntimeEventInboxError("RUNTIME_EVENT_TOO_LARGE", `${label} exceeds the durable inbox limit.`);
-    }
-    return value;
-}
 function requireTimestamp(value) {
     const timestamp = requireIdentityText(value, "Received at");
     if (!Number.isFinite(Date.parse(timestamp)))
@@ -672,57 +464,19 @@ function hasSameIdentity(left, 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)
-        && (!("progressId" in left)
-            || !("progressId" in right)
-            || left.progressId === right.progressId)
-        && (!("sequence" in left) || !("sequence" in right) || left.sequence === right.sequence)
         && (!("jobId" in left) || !("jobId" in right) || left.jobId === right.jobId);
 }
 function compareRuntimeEvents(left, right) {
-    return left.receivedAt.localeCompare(right.receivedAt)
-        || left.id.localeCompare(right.id);
-}
-/** Chooses one latest fact inside an already-isolated exact progress stream. */
-export function compareRuntimeProgressRecency(left, right) {
     const receivedAt = left.receivedAt.localeCompare(right.receivedAt);
     if (receivedAt !== 0)
         return receivedAt;
-    if (left.sequence !== undefined
-        && right.sequence !== undefined
-        && left.sequence !== right.sequence) {
-        return left.sequence - right.sequence;
-    }
-    // A content-derived event id is identity, not arrival evidence. Without two
-    // comparable provider sequences, same-timestamp facts remain incomparable.
-    return 0;
-}
-function semanticSegment(events, current) {
-    let before = {
-        receivedAt: "",
-        id: ""
-    };
-    let after;
-    for (const event of events) {
-        if (event.type === "native-turn-progress")
-            continue;
-        const order = compareRuntimeEvents(event, current);
-        if (order < 0 && compareRuntimeEvents(event, before) > 0) {
-            before = event;
-        }
-        else if (order > 0 && (after === undefined || compareRuntimeEvents(event, after) < 0)) {
-            after = event;
-        }
-    }
-    return { before, ...(after === undefined ? {} : { after }) };
-}
-function sameProgressStream(left, right) {
-    return left.taskId === right.taskId
-        && left.roleName === right.roleName
-        && left.agentId === right.agentId
-        && left.adapterId === right.adapterId
-        && left.launchId === right.launchId
-        && left.nativeSessionId === right.nativeSessionId
-        && left.runId === right.runId;
+    const sequence = (left.observation?.sequence ?? -1) - (right.observation?.sequence ?? -1);
+    if (sequence !== 0)
+        return sequence;
+    const ordinal = (left.observation?.ordinal ?? -1) - (right.observation?.ordinal ?? -1);
+    if (ordinal !== 0)
+        return ordinal;
+    return left.id.localeCompare(right.id);
 }
 function hasExactKeys(value, expected) {
     const actual = Object.keys(value).sort();