witnora 0.20.10 → 0.20.11

package/dist/cli.js

@@ -40,8 +40,8 @@ import { runOnboard } from "./onboard.js";
 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, stopCurrentGatewayOwners, uninstallCurrentGatewayService } from "./gateway-service.js";
+import { awaitManagedCustomerGateway, configureManagedWorkflowHarness, doctorCustomerGateway, initializeCustomerGateway, isGatewayDoctorReady, readManagedCustomerGatewayLogs, renderGatewayDoctor, renderManagedGatewayStatus, runCustomerGateway, startManagedCustomerGateway, statusManagedCustomerGateway, stopManagedCustomerGateway, superviseManagedCustomerGateway, } from "./gateway.js";
+import { installCurrentGatewayService, restartCurrentGatewayOwners, stopCurrentGatewayOwners, uninstallCurrentGatewayService } from "./gateway-service.js";
 import { runCustomerGatewayCommand } from "./gateway-exec.js";
 import { verifyEvidencePacketV02 } from "./evidence-v02.js";
 process.on("uncaughtException", reportFatalError);
@@ -234,7 +234,11 @@ else if (command === "gateway") {
         process.stdout.write(`${await readManagedCustomerGatewayLogs({ repository: readFlag("--repo") ?? process.cwd(), dir: readFlag("--dir"), lines })}\n`);
     }
     else if (action === "restart") {
-        const result = await restartManagedCustomerGateway({ repository: readFlag("--repo") ?? process.cwd(), dir: readFlag("--dir") });
+        const repository = readFlag("--repo") ?? process.cwd();
+        const dir = readFlag("--dir");
+        const configHome = readFlag("--config-home");
+        const serviceOptions = { repository, gatewayDirectory: dir, cliEntry: fileURLToPath(import.meta.url), configHome };
+        const result = await restartCurrentGatewayOwners(serviceOptions, () => stopManagedCustomerGateway({ repository, dir, configHome }), () => awaitManagedCustomerGateway({ repository, dir, configHome }));
         process.stdout.write(readBoolFlag("--json") ? `${JSON.stringify(result, null, 2)}\n` : renderManagedGatewayStatus(result));
     }
     else if (action === "repair") {

package/dist/gateway-service.js

@@ -12,9 +12,11 @@ export async function installGatewayService(input) {
     // before replacing the definition so onboarding never leaves two owners
     // racing for the same localhost port.
     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);
+        if (!input.existingOwnerStopped) {
+            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)
@@ -40,6 +42,7 @@ export async function installCurrentGatewayService(options) {
         run: options.run ?? runCommand,
         sleep: options.sleep,
         removeFile: options.removeFile,
+        existingOwnerStopped: options.existingOwnerStopped,
     });
 }
 export async function uninstallCurrentGatewayService(options) {
@@ -69,6 +72,11 @@ export async function restartCurrentGatewayService(options) {
     await run(plan.start.command, plan.start.args);
     return plan;
 }
+export async function restartCurrentGatewayOwners(options, stopManagedGateway, awaitManagedGateway) {
+    await stopCurrentGatewayOwners(options, stopManagedGateway);
+    await restartCurrentGatewayService({ ...options, existingOwnerStopped: true });
+    return awaitManagedGateway();
+}
 export async function stopCurrentGatewayService(options) {
     const plan = createGatewayServicePlan(currentPlanInput(options));
     await (options.run ?? runCommand)(plan.stop.command, plan.stop.args).catch(() => undefined);

package/dist/gateway.js

@@ -1424,12 +1424,19 @@ export async function stopManagedCustomerGateway(options = {}) {
     const after = await statusManagedCustomerGateway(options);
     return { ...after, stopped: !after.healthy };
 }
-export async function restartManagedCustomerGateway(options = {}) {
-    const status = await statusManagedCustomerGateway(options);
-    if (status.state === "RUNNING_EXTERNAL")
-        throw new Error("The Gateway is running outside Witnora process management. Stop that foreground process before requesting a managed restart.");
-    await stopManagedCustomerGateway(options);
-    return startManagedCustomerGateway(options);
+export async function awaitManagedCustomerGateway(options = {}) {
+    const sleep = options.sleep ?? wait;
+    const deadline = Date.now() + (options.timeoutMs ?? 12_000);
+    let status = await statusManagedCustomerGateway(options);
+    while (Date.now() < deadline) {
+        if (status.state === "RUNNING_MANAGED")
+            return { ...status, started: true };
+        if (status.state === "RUNNING_EXTERNAL" || status.state === "CONFLICT")
+            throw new Error(status.detail);
+        await sleep(120);
+        status = await statusManagedCustomerGateway(options);
+    }
+    throw new Error(`The operating-system Gateway supervisor did not restore a healthy managed process before the startup deadline. ${status.detail}`);
 }
 export async function superviseManagedCustomerGateway(options = {}) {
     const inspect = options.inspect ?? (() => statusManagedCustomerGateway({ repository: options.repository, dir: options.dir }));

package/package.json

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