@zq-silk/yui 0.13.10 → 0.14.1

package/dist/coordination/workMailboxQueue.js

@@ -28,9 +28,9 @@ export function completeWorkExecution(store, target, executionRef) {
 /**
  * Completes a mailbox execution or fails the surrounding transaction.
  *
- * A terminal Run and its processing mailbox batch are one consistency
+ * A terminal Turn and its processing mailbox batch are one consistency
  * boundary. Silently accepting a missing or mismatched batch would leave
- * durable work stuck in `processing` after the Run has already ended.
+ * durable work stuck in `processing` after the Turn has already ended.
  */
 export function requireCompleteWorkExecution(store, target, executionRef) {
     const mailbox = store.getWorkMailbox(target);
@@ -49,7 +49,7 @@ export function requireCompleteWorkExecution(store, target, executionRef) {
         + `${executionRef.type}/${executionRef.id}.`);
 }
 /**
- * Settles the exact Run delivery boundary, including the short window before
+ * Settles the exact Turn delivery boundary, including the short window before
  * the scheduler has claimed its single pending dispatch. A merged pending
  * batch is never discarded because its signal-to-ref mapping is no longer
  * recoverable.
@@ -68,10 +68,9 @@ export function settleExactWorkExecution(store, target, executionRef) {
             + `${executionRef.type}/${executionRef.id}.`);
     }
     const pending = matching[0];
-    const pendingKey = mailbox.pending.normal === pending ? "normal" : "userCorrection";
-    if (mailbox.pending[pendingKey] !== pending)
+    if (mailbox.pending !== pending)
         return "absent";
-    store.saveWorkMailbox(consumePendingBatch(mailbox, pendingKey === "normal" ? "normal" : "user-correction"));
+    store.saveWorkMailbox(consumePendingBatch(mailbox));
     return "pending";
 }
 function timestamp(value) {

package/dist/core/controllerClient.js

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { lstat, readFile } from "node:fs/promises";
 import { createConnection } from "node:net";
-import { basename, dirname, isAbsolute, join, resolve } from "node:path";
+import { join } from "node:path";
 import { CONTROLLER_DISCOVERY_PATH, FILE_TASK_CONTROLLER_PROTOCOL_VERSION, MAX_CONTROLLER_MESSAGE_BYTES, ControllerProtocolError, encodeControllerRequest, parseControllerDiscovery, parseControllerResponse } from "./protocol.js";
 import { isControllerSocketPathForHome } from "./controllerEndpoint.js";
 import { readHomeFilesystemId } from "./homeFilesystemIdentity.js";
@@ -91,36 +91,6 @@ export async function callController(home, method, params = {}, options = {}) {
     }
     return exchange(discovery.socketPath, requestLine, id, timeoutMs);
 }
-/**
- * One-generation transition used only by the documented `controller restart`
- * upgrade path from the last released protocol (v3). Ordinary calls never
- * accept or dispatch through this legacy shape.
- */
-export async function stopPreviousFileTaskController(home, timeoutMs) {
-    if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 1) {
-        throw new TypeError("Controller timeout must be a positive integer.");
-    }
-    const discovery = await readPreviousControllerDiscovery(home);
-    const homeFilesystemId = readHomeFilesystemId(home);
-    if (inspectLiveControllerProcess(discovery.pid, homeFilesystemId, discovery.processStartIdentity) === undefined)
-        throw invalidDiscovery();
-    const id = randomUUID();
-    const requestLine = `${JSON.stringify({
-        id,
-        token: discovery.token,
-        method: "controller.stop",
-        params: { expectedPid: discovery.pid }
-    })}\n`;
-    const deadline = Date.now() + timeoutMs;
-    await exchange(discovery.socketPath, requestLine, id, timeoutMs);
-    while (inspectLiveControllerProcess(discovery.pid, homeFilesystemId, discovery.processStartIdentity) !== undefined) {
-        if (Date.now() >= deadline) {
-            throw new ControllerClientError("CONTROLLER_TIMEOUT", `Previous Controller did not stop within ${timeoutMs} ms.`);
-        }
-        await new Promise((resolve) => setTimeout(resolve, 20));
-    }
-    return Object.freeze({ pid: discovery.pid });
-}
 /**
  * Explicit restart recovery for an exact Controller whose discovery record
  * was lost. The signal is fenced by same UID, controller entrypoint, physical
@@ -154,66 +124,6 @@ export async function stopOrphanedFileTaskController(home, timeoutMs) {
     }
     return Object.freeze({ pid: candidate.pid });
 }
-async function readPreviousControllerDiscovery(home) {
-    const discoveryPath = join(home, CONTROLLER_DISCOVERY_PATH);
-    try {
-        const metadata = await lstat(discoveryPath);
-        const uid = typeof process.getuid === "function" ? process.getuid() : undefined;
-        if (!metadata.isFile()
-            || (metadata.mode & 0o077) !== 0
-            || metadata.size > 4_096
-            || (uid !== undefined && metadata.uid !== uid))
-            throw invalidDiscovery();
-        const value = JSON.parse(await readFile(discoveryPath, "utf8"));
-        if (typeof value !== "object"
-            || value === null
-            || Array.isArray(value)
-            || !hasExactStringKeys(value, [
-                "pid",
-                "processStartIdentity",
-                "socketPath",
-                "token"
-            ]))
-            throw invalidDiscovery();
-        const record = value;
-        if (!Number.isSafeInteger(record.pid)
-            || record.pid < 1
-            || typeof record.processStartIdentity !== "string"
-            || !/^[0-9]{1,32}$/u.test(record.processStartIdentity)
-            || typeof record.socketPath !== "string"
-            || !isPreviousControllerSocketPath(record.socketPath)
-            || typeof record.token !== "string"
-            || !/^[a-f0-9]{64}$/u.test(record.token))
-            throw invalidDiscovery();
-        return Object.freeze({
-            pid: record.pid,
-            processStartIdentity: record.processStartIdentity,
-            socketPath: record.socketPath,
-            token: record.token
-        });
-    }
-    catch (error) {
-        if (error instanceof ControllerClientError)
-            throw error;
-        if (isNodeError(error) && error.code === "ENOENT") {
-            throw new ControllerClientError("CONTROLLER_NOT_RUNNING", "Controller is not running.");
-        }
-        throw invalidDiscovery();
-    }
-}
-function hasExactStringKeys(value, expected) {
-    const keys = Reflect.ownKeys(value);
-    return keys.length === expected.length
-        && keys.every((key) => typeof key === "string")
-        && expected.every((key) => Object.hasOwn(value, key));
-}
-function isPreviousControllerSocketPath(candidate) {
-    if (!isAbsolute(candidate) || resolve(candidate) !== candidate)
-        return false;
-    const uid = typeof process.getuid === "function" ? process.getuid() : 0;
-    return basename(dirname(candidate)) === `yui-${uid}`
-        && /^[a-f0-9]{24}\.sock$/u.test(basename(candidate));
-}
 function exchange(socketPath, requestLine, expectedId, timeoutMs) {
     return new Promise((resolve, reject) => {
         const socket = createConnection(socketPath);

package/dist/core/controllerServer.js

@@ -9,7 +9,7 @@ import { controllerSocketPath } from "./controllerEndpoint.js";
 import { readHomeFilesystemId } from "./homeFilesystemIdentity.js";
 import { findLiveControllerProcessForHome } from "./controllerProcessIdentity.js";
 import { validateHomeId } from "../repository/homeIdentity.js";
-import { readCompatibleHomeIdentity } from "../storage/compatibleTaskStore.js";
+import { readCurrentHomeIdentity } from "../storage/currentTaskStore.js";
 import { YUI_VERSION, yuiVersionIdentity } from "../version.js";
 import { resolveStoreWorkerEnabledForHome } from "../storage/storeRpc.js";
 import { resolveTaskStoreBackendForHome } from "../storage/sqliteStore.js";
@@ -36,7 +36,7 @@ export async function startControllerServer(home, dispatcher, beforeDiscoveryRem
 }
 async function startControllerServerLocked(home, dispatcher, beforeDiscoveryRemoval, options = {}) {
     const discoveryPath = join(home, CONTROLLER_DISCOVERY_PATH);
-    const homeId = validateHomeId(readCompatibleHomeIdentity(home).homeId);
+    const homeId = validateHomeId(readCurrentHomeIdentity(home).homeId);
     const homeFilesystemId = readHomeFilesystemId(home);
     await assertExistingDiscoveryReplaceable(discoveryPath);
     if (findLiveControllerProcessForHome(homeFilesystemId) !== undefined) {
@@ -62,10 +62,7 @@ async function startControllerServerLocked(home, dispatcher, beforeDiscoveryRemo
     const release = options.release === undefined
         ? detectRunningRelease(fileURLToPath(import.meta.url))
         : options.release;
-    // Issue 01: the Home decides the backend. The receipt reports the truthful
-    // Home-decided backend (SQLite for a layout-7 Home with yui.db, file store
-    // for older layouts) instead of deriving it from YUI_STORE_BACKEND, which is
-    // reserved for tests and explicit recovery commands.
+    // The receipt reports the one current SQLite backend.
     const storageBackend = options.storageBackend
         ?? resolveTaskStoreBackendForHome(home, process.env);
     const workerEnabled = options.workerEnabled