witnora 0.20.2 → 0.20.3

package/dist/cli.js

@@ -41,7 +41,7 @@ import { inspectRepository } from "./onboard.js";
 import { renderReleaseEvaluation, runReleaseEvaluation } from "./release-evaluation.js";
 import { runPrivateCapabilityDiscovery } from "./private-discovery.js";
 import { configureManagedWorkflowHarness, doctorCustomerGateway, initializeCustomerGateway, isGatewayDoctorReady, readManagedCustomerGatewayLogs, renderGatewayDoctor, renderManagedGatewayStatus, restartManagedCustomerGateway, runCustomerGateway, startManagedCustomerGateway, statusManagedCustomerGateway, stopManagedCustomerGateway, superviseManagedCustomerGateway, } from "./gateway.js";
-import { installCurrentGatewayService, restartCurrentGatewayService, uninstallCurrentGatewayService } from "./gateway-service.js";
+import { installCurrentGatewayService, uninstallCurrentGatewayService } from "./gateway-service.js";
 import { verifyEvidencePacketV02 } from "./evidence-v02.js";
 process.on("uncaughtException", reportFatalError);
 process.on("unhandledRejection", reportFatalError);
@@ -238,7 +238,6 @@ else if (command === "gateway") {
         const repository = readFlag("--repo") ?? process.cwd();
         const dir = readFlag("--dir");
         const service = await installCurrentGatewayService({ repository, gatewayDirectory: dir, cliEntry: fileURLToPath(import.meta.url) });
-        await restartCurrentGatewayService({ repository, gatewayDirectory: dir, cliEntry: fileURLToPath(import.meta.url) });
         const result = await startManagedCustomerGateway({ repository, dir });
         const doctor = await doctorCustomerGateway({ repository, dir });
         if (!isGatewayDoctorReady(doctor))
@@ -263,7 +262,7 @@ else if (command === "gateway") {
             throw new Error("Use witnora gateway service install|uninstall.");
     }
     else if (action === "supervise") {
-        await superviseManagedCustomerGateway({ repository: readFlag("--repo") ?? process.cwd(), dir: readFlag("--dir"), configHome: readFlag("--config-home"), output: (message) => process.stdout.write(message) });
+        await superviseManagedCustomerGateway({ repository: readFlag("--repo") ?? process.cwd(), dir: readFlag("--dir"), configHome: readFlag("--config-home"), serviceLeasePath: readFlag("--service-lease"), serviceGeneration: readFlag("--service-generation"), output: (message) => process.stdout.write(message) });
     }
     else if (action === "stop") {
         const result = await stopManagedCustomerGateway({ repository: readFlag("--repo") ?? process.cwd(), dir: readFlag("--dir") });

package/dist/gateway-service.js

@@ -1,17 +1,22 @@
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { execFile } from "node:child_process";
 import { mkdir, rm, writeFile } from "node:fs/promises";
 import { homedir, userInfo } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { promisify } from "node:util";
 const execFileAsync = promisify(execFile);
+const WINDOWS_PARENT_EXIT_GRACE_MS = 500;
 export async function installGatewayService(input) {
     const plan = createGatewayServicePlan(input);
     // A prior task can still be supervising an older generated Gateway. End it
     // before replacing the definition so onboarding never leaves two owners
     // racing for the same localhost port.
-    if (plan.kind === "WINDOWS_TASK")
+    if (plan.kind === "WINDOWS_TASK") {
         await input.run(plan.stop.command, plan.stop.args).catch(() => undefined);
+        await (input.removeFile ?? removeFile)(plan.serviceLease.path);
+        await (input.sleep ?? wait)(WINDOWS_PARENT_EXIT_GRACE_MS);
+        await input.writeDefinition(plan.serviceLease.path, `${plan.serviceLease.generation}\n`);
+    }
     if (plan.launcher)
         await input.writeDefinition(plan.launcher.path, plan.launcher.definition);
     await input.writeDefinition(plan.definitionPath, plan.definition);
@@ -23,31 +28,42 @@ export async function installGatewayService(input) {
     return { installed: true, plan };
 }
 export async function installCurrentGatewayService(options) {
-    const planInput = currentPlanInput(options);
+    const planInput = currentPlanInput(options, randomUUID());
     return installGatewayService({ ...planInput,
         writeDefinition: async (path, value) => {
             await mkdir(dirname(path), { recursive: true });
-            const contents = planInput.platform === "win32"
+            const contents = planInput.platform === "win32" && !path.endsWith(".lease")
                 ? Buffer.concat([Buffer.from([0xff, 0xfe]), Buffer.from(value, "utf16le")])
                 : Buffer.from(value, "utf8");
             await writeFile(path, contents, { mode: 0o600 });
         },
         run: options.run ?? runCommand,
+        sleep: options.sleep,
+        removeFile: options.removeFile,
     });
 }
 export async function uninstallCurrentGatewayService(options) {
     const plan = createGatewayServicePlan(currentPlanInput(options));
     const run = options.run ?? runCommand;
+    if (plan.kind === "WINDOWS_TASK") {
+        await run(plan.stop.command, plan.stop.args).catch(() => undefined);
+        await (options.removeFile ?? removeFile)(plan.serviceLease.path);
+        await (options.sleep ?? wait)(WINDOWS_PARENT_EXIT_GRACE_MS);
+    }
     await run(plan.uninstall.command, plan.uninstall.args);
     if (plan.kind === "SYSTEMD_USER")
         await run("systemctl", ["--user", "daemon-reload"]);
     await rm(plan.definitionPath, { force: true });
     if (plan.launcher)
         await rm(plan.launcher.path, { force: true });
+    if (plan.serviceLease)
+        await rm(plan.serviceLease.path, { force: true });
     return { uninstalled: true, plan };
 }
 export async function restartCurrentGatewayService(options) {
     const plan = createGatewayServicePlan(currentPlanInput(options));
+    if (plan.kind === "WINDOWS_TASK")
+        return (await installCurrentGatewayService(options)).plan;
     const run = options.run ?? runCommand;
     await run(plan.stop.command, plan.stop.args).catch(() => undefined);
     await run(plan.start.command, plan.start.args);
@@ -56,6 +72,10 @@ export async function restartCurrentGatewayService(options) {
 export async function stopCurrentGatewayService(options) {
     const plan = createGatewayServicePlan(currentPlanInput(options));
     await (options.run ?? runCommand)(plan.stop.command, plan.stop.args).catch(() => undefined);
+    if (plan.kind === "WINDOWS_TASK") {
+        await (options.removeFile ?? removeFile)(plan.serviceLease.path);
+        await (options.sleep ?? wait)(WINDOWS_PARENT_EXIT_GRACE_MS);
+    }
     return plan;
 }
 export function createGatewayServicePlan(input) {
@@ -64,8 +84,12 @@ export function createGatewayServicePlan(input) {
     const superviseArgs = [input.cliEntry, "gateway", "supervise", "--repo", input.repository, "--dir", input.gatewayDirectory];
     if (input.configHome)
         superviseArgs.push("--config-home", input.configHome);
-    if (input.platform === "win32")
-        return windowsPlan(input, id, superviseArgs);
+    if (input.platform === "win32") {
+        const leasePath = `${input.serviceHome}\\${id}.lease`;
+        const generation = input.serviceGeneration ?? "manual-service-generation";
+        superviseArgs.push("--service-lease", leasePath, "--service-generation", generation);
+        return { ...windowsPlan(input, id, superviseArgs), serviceLease: { path: leasePath, generation } };
+    }
     if (input.platform === "darwin")
         return launchdPlan(input, id, superviseArgs);
     if (input.platform === "linux")
@@ -96,7 +120,7 @@ function windowsPlan(input, id, args) {
         stop: { command: "schtasks.exe", args: ["/End", "/TN", id] },
         uninstall: { command: "schtasks.exe", args: ["/Delete", "/TN", id, "/F"] } };
 }
-function currentPlanInput(options) {
+function currentPlanInput(options, serviceGeneration) {
     const platform = options.platform ?? process.platform;
     if (platform !== "win32" && platform !== "linux" && platform !== "darwin")
         throw new Error(`Gateway service installation is not supported on ${platform}.`);
@@ -104,9 +128,15 @@ function currentPlanInput(options) {
     const env = options.env ?? process.env;
     const serviceHome = platform === "win32" ? join(env.LOCALAPPDATA ?? join(homedir(), "AppData", "Local"), "Witnora", "services")
         : platform === "darwin" ? join(homedir(), "Library", "LaunchAgents") : join(homedir(), ".config", "systemd", "user");
-    return { platform, repository, gatewayDirectory: resolve(repository, options.gatewayDirectory ?? ".witnora/gateway"), cliEntry: resolve(options.cliEntry), nodeExecutable: options.nodeExecutable ?? process.execPath, serviceHome, userId: platform === "win32" ? `${env.USERDOMAIN ? `${env.USERDOMAIN}\\` : ""}${env.USERNAME ?? userInfo().username}` : userInfo().username, configHome: options.configHome ?? env.WITNORA_CONFIG_HOME };
+    return { platform, repository, gatewayDirectory: resolve(repository, options.gatewayDirectory ?? ".witnora/gateway"), cliEntry: resolve(options.cliEntry), nodeExecutable: options.nodeExecutable ?? process.execPath, serviceHome, userId: platform === "win32" ? `${env.USERDOMAIN ? `${env.USERDOMAIN}\\` : ""}${env.USERNAME ?? userInfo().username}` : userInfo().username, configHome: options.configHome ?? env.WITNORA_CONFIG_HOME, serviceGeneration };
 }
 async function runCommand(command, args) { await execFileAsync(command, args, { windowsHide: true }); }
+function wait(milliseconds) {
+    return new Promise((resolveWait) => setTimeout(resolveWait, milliseconds));
+}
+async function removeFile(path) {
+    await rm(path, { force: true });
+}
 function systemdPlan(input, id, args) {
     const unit = `${id}.service`;
     const definitionPath = `${input.serviceHome}/${unit}`;

package/dist/gateway.js

@@ -3,7 +3,7 @@ import { spawn } from "node:child_process";
 import { closeSync, openSync } from "node:fs";
 import { access, chmod, mkdir, readFile, realpath, rename, rm, writeFile } from "node:fs/promises";
 import { createServer as createNetServer } from "node:net";
-import { basename, dirname, join, relative, resolve } from "node:path";
+import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { loadConnection } from "./credentials.js";
 import { authorizeProjectConnection } from "./device-authorization.js";
@@ -1014,9 +1014,7 @@ async function startManagedLocalEvaluator(directory, config, evaluatorKit) {
     if (!repositoryRelative || repositoryRelative.startsWith("..") || resolve(repository, repositoryRelative) !== modulePath) {
         throw new Error("Managed evaluator module escaped the Agent repository.");
     }
-    const [realRepository, realModulePath] = await Promise.all([realpath(repository), realpath(modulePath)]);
-    const realRelative = relative(realRepository, realModulePath);
-    if (!realRelative || realRelative.startsWith("..") || resolve(realRepository, realRelative) !== realModulePath) {
+    if (!await isRealPathContained(repository, modulePath)) {
         throw new Error("Managed evaluator module symlink escaped the Agent repository.");
     }
     const source = await readFile(modulePath);
@@ -1392,20 +1390,47 @@ export async function restartManagedCustomerGateway(options = {}) {
 export async function superviseManagedCustomerGateway(options = {}) {
     const inspect = options.inspect ?? (() => statusManagedCustomerGateway({ repository: options.repository, dir: options.dir }));
     const start = options.start ?? (() => startManagedCustomerGateway({ repository: options.repository, dir: options.dir, configHome: options.configHome }));
+    const stop = options.stop ?? (() => stopManagedCustomerGateway({ repository: options.repository, dir: options.dir, configHome: options.configHome }));
     const sleep = options.sleep ?? wait;
     const maxCycles = options.maxCycles ?? Number.POSITIVE_INFINITY;
+    if (Boolean(options.serviceLeasePath) !== Boolean(options.serviceGeneration)) {
+        throw new Error("A service-owned Gateway supervisor requires both its lease path and generation.");
+    }
+    const readServiceLease = options.readServiceLease ?? ((path) => readFile(path, "utf8"));
+    const leaseRevoked = async () => {
+        if (!options.serviceLeasePath || !options.serviceGeneration)
+            return false;
+        try {
+            return (await readServiceLease(options.serviceLeasePath)).trim() !== options.serviceGeneration;
+        }
+        catch {
+            return true;
+        }
+    };
+    const stopForRevokedLease = async () => {
+        if (!await leaseRevoked())
+            return false;
+        await stop();
+        return true;
+    };
     let recoveries = 0;
     for (let cycle = 0; cycle < maxCycles; cycle += 1) {
+        if (await stopForRevokedLease())
+            return;
         const status = await inspect();
+        if (await stopForRevokedLease())
+            return;
         if (status.state === "CONFLICT")
             throw new Error(status.detail);
         if (status.state === "STOPPED" || status.state === "STALE") {
             await start();
             recoveries += 1;
             options.output?.(`Recovered customer-owned Gateway (${recoveries}).\n`);
+            if (await stopForRevokedLease())
+                return;
         }
         if (cycle + 1 < maxCycles)
-            await sleep(options.intervalMs ?? 5_000);
+            await sleep(options.intervalMs ?? (options.serviceLeasePath ? 250 : 5_000));
     }
 }
 export async function readManagedCustomerGatewayLogs(options = {}) {
@@ -1744,9 +1769,7 @@ export async function activateManagedWorkflowHarness(options) {
     if (!moduleRelativeToRepository || moduleRelativeToRepository.startsWith("..") || resolve(repository, moduleRelativeToRepository) !== absoluteModulePath) {
         throw new Error("The customer Assurance Harness module must remain inside the Agent repository.");
     }
-    const [realRepository, realModulePath] = await Promise.all([realpath(repository), realpath(absoluteModulePath).catch(() => absoluteModulePath)]);
-    const realRelative = relative(realRepository, realModulePath);
-    if (realRelative.startsWith("..") || resolve(realRepository, realRelative) !== realModulePath) {
+    if (!await isRealPathContained(repository, absoluteModulePath)) {
         throw new Error("The customer Assurance Harness module symlink must remain inside the Agent repository.");
     }
     const source = await readFile(absoluteModulePath, "utf8").catch((error) => {
@@ -1795,6 +1818,25 @@ export async function activateManagedWorkflowHarness(options) {
     }
     return { state: "READY_TO_START", path, modulePath: evaluatorModulePath, config, created, changed };
 }
+export async function isRealPathContained(repository, candidate, resolveRealPath = realpath) {
+    const canonicalExistingPath = async (path) => {
+        const resolvedPath = await resolveRealPath(path);
+        const resolvedParent = await resolveRealPath(dirname(resolvedPath));
+        return join(resolvedParent, basename(resolvedPath));
+    };
+    const realRepository = await canonicalExistingPath(repository);
+    let realCandidate;
+    try {
+        realCandidate = await canonicalExistingPath(candidate);
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
+        realCandidate = join(await canonicalExistingPath(dirname(candidate)), basename(candidate));
+    }
+    const realRelative = relative(realRepository, realCandidate);
+    return realRelative === "" || (realRelative !== ".." && !realRelative.startsWith(`..${sep}`) && !isAbsolute(realRelative));
+}
 function isExactGeneratedHarnessUpgrade(current, next, previousGeneratedModuleSha256) {
     if (!previousGeneratedModuleSha256 || current.evaluatorModuleSha256 !== previousGeneratedModuleSha256 || current.evaluatorContractSha256 !== previousGeneratedModuleSha256)
         return false;

package/dist/onboard.js

@@ -378,13 +378,13 @@ async function runActionTransportTest(options) {
     const binding = await loadCustomerMcpActionBinding({ repository: options.repository });
     const checkedAt = new Date().toISOString();
     const passed = options.transport === "http"
-        ? {
+        ? await verifyHttpActionConnection(binding, options.fetch).then((endpoint) => ({
             state: "PASSED",
             transport: "http",
             checkedAt,
             actionId: binding.action.id,
-            endpoint: `${binding.baseUrl}${binding.action.path}`,
-        }
+            endpoint,
+        }))
         : await import("./mcp.js").then(async ({ testWitnoraMcpConnection }) => {
             const result = await testWitnoraMcpConnection({ repository: options.repository, fetch: options.fetch });
             return {
@@ -420,6 +420,24 @@ async function runActionTransportTest(options) {
     options.generatedFiles.push(receiptPath);
     return { ...passed, receiptPath };
 }
+async function verifyHttpActionConnection(binding, requestFetch) {
+    const endpoint = `${binding.baseUrl}${binding.action.path}`;
+    const response = await requestFetch(endpoint, {
+        method: "POST",
+        headers: {
+            authorization: `Bearer ${binding.actionToken}`,
+            "content-type": "application/json",
+            "idempotency-key": `witnora-transport-test-${binding.action.id}`,
+        },
+        body: "{}",
+        signal: AbortSignal.timeout(5_000),
+    });
+    const body = await response.json().catch(() => ({}));
+    if (response.status !== 400 || body.error !== "resourceId is required and must use URL-safe identifier characters.") {
+        throw new Error(`HTTP Action connection test failed closed (${response.status}). The exact customer-owned endpoint, Action binding, or action-scoped token is unavailable.`);
+    }
+    return endpoint;
+}
 async function waitForInstalledGatewayService(options) {
     const pause = options.sleep ?? ((milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds)));
     const deadline = Date.now() + (options.timeoutMs ?? 12_000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "witnora",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "description": "Independent assurance for covered agent action paths across models and frameworks.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",