@vtxmacro/cli 2026.8.55 → 2026.8.56

package/bin/vtx.js

@@ -47,7 +47,7 @@ var init_agent_cli_release = __esm({
   "agent-cli-release.json"() {
     agent_cli_release_default = {
       package_name: "@vtxmacro/cli",
-      package_version: "2026.8.55",
+      package_version: "2026.8.56",
       codex_package_name: "@openai/codex",
       codex_version: "0.147.0",
       copilot_sdk_package_name: "@github/copilot-sdk",
@@ -35280,7 +35280,7 @@ import { createWriteStream, readFileSync } from "node:fs";
 import { access as access3, chmod as chmod3, mkdir as mkdir3, readFile as readFile5, rm as rm6, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import { dirname as dirname5, join as join7, resolve as resolve4 } from "node:path";
-var SERVICE_NAME, SYSTEMD_UNIT, LAUNCHD_LABEL, SERVICE_COOPERATIVE_STOP_SECONDS, INFERENCE_HOST_SERVICE_DRAIN_COMMAND, inferenceHostServiceChildEnvironment, isWindowsSubsystemForLinux, inferenceHostServiceManifestPath, inferenceHostServiceDesiredPath, inferenceHostServiceLogPath, inferenceHostServiceRuntimePath, xmlEscape, plistEscape, systemdQuote, defaultRunCommand, managerName, assertRuntimeEnvironment, withoutConcurrencyLimit, assertServicePath, manifestGeneration, assertWorker, assertManifest, assertServiceRuntimeState, assertDesiredState, readInferenceHostServiceManifest, readManifestAcrossAtomicReplacement, readInferenceHostServiceRuntime, readRuntimeAcrossAtomicReplacement, readInferenceHostServiceDesired, readDesiredAcrossAtomicReplacement, writeDesired, runtimeEnvironment, serviceArguments, windowsOwnedCommandLine, vbScriptString, windowsServiceLauncher, windowsTaskXml, systemdUnit, launchAgentPlist, sameWorker, sameServiceDefinition, sameWorkerSet, InferenceHostServiceManager, appendServiceLog, spawnInferenceHostServiceChild, runInferenceHostServiceSupervisor;
+var SERVICE_NAME, SYSTEMD_UNIT, LAUNCHD_LABEL, SERVICE_COOPERATIVE_STOP_SECONDS, SERVICE_UPDATE_STARTUP_SECONDS, INFERENCE_HOST_SERVICE_DRAIN_COMMAND, inferenceHostServiceChildEnvironment, isWindowsSubsystemForLinux, inferenceHostServiceManifestPath, inferenceHostServiceDesiredPath, inferenceHostServiceLogPath, inferenceHostServiceRuntimePath, xmlEscape, plistEscape, systemdQuote, defaultRunCommand, managerName, assertRuntimeEnvironment, withoutConcurrencyLimit, assertServicePath, manifestGeneration, assertWorker, assertManifest, assertServiceRuntimeState, assertDesiredState, readInferenceHostServiceManifest, readManifestAcrossAtomicReplacement, readInferenceHostServiceRuntime, readRuntimeAcrossAtomicReplacement, readInferenceHostServiceDesired, readDesiredAcrossAtomicReplacement, writeDesired, runtimeEnvironment, serviceBootstrapArguments, windowsOwnedCommandLine, vbScriptString, windowsServiceLauncher, windowsTaskXml, systemdUnit, launchAgentPlist, sameWorker, sameServiceDefinition, sameWorkerSet, InferenceHostServiceManager, appendServiceLog, spawnInferenceHostServiceChild, runInferenceHostServiceSupervisor;
 var init_service = __esm({
   "lib/inference-host/service.ts"() {
     "use strict";
@@ -35290,6 +35290,7 @@ var init_service = __esm({
     SYSTEMD_UNIT = "vtx-inference-host.service";
     LAUNCHD_LABEL = "com.vtxmacro.inference-host";
     SERVICE_COOPERATIVE_STOP_SECONDS = 75;
+    SERVICE_UPDATE_STARTUP_SECONDS = 600;
     INFERENCE_HOST_SERVICE_DRAIN_COMMAND = "vtx-inference-host-service-drain-v1";
     inferenceHostServiceChildEnvironment = (runtimeEnvironment2, inheritedEnvironment = process.env) => {
       const environment = { ...inheritedEnvironment };
@@ -35594,13 +35595,12 @@ var init_service = __esm({
       }
       return result2;
     };
-    serviceArguments = (script, manifestPath) => [
-      script,
-      "inference-host",
-      "service",
-      "run-internal",
+    serviceBootstrapArguments = (bootstrapScript, manifestPath, lockPath) => [
+      bootstrapScript,
       "--service-manifest",
-      manifestPath
+      manifestPath,
+      "--service-lock",
+      lockPath
     ];
     windowsOwnedCommandLine = (values) => {
       if (values.some((value) => value.includes('"') || value.includes("\0"))) {
@@ -35679,6 +35679,9 @@ WantedBy=default.target
         this.home = dependencies.homedir ?? homedir2();
         this.executable = resolve4(dependencies.executable ?? process.execPath);
         this.script = resolve4(dependencies.script ?? process.argv[1] ?? "");
+        this.bootstrapScript = resolve4(
+          dependencies.bootstrapScript ?? join7(dirname5(this.script), "vtx-service-bootstrap.js")
+        );
         this.username = dependencies.username ?? ([process.env.USERDOMAIN, process.env.USERNAME].filter(Boolean).join("\\") || process.env.USER || "");
         this.windowsDirectory = (dependencies.windowsDirectory ?? process.env.SystemRoot ?? process.env.WINDIR ?? "C:\\Windows").replace(/[\\/]+$/u, "");
         this.runCommand = dependencies.runCommand ?? defaultRunCommand;
@@ -35710,6 +35713,21 @@ WantedBy=default.target
       runtimePath() {
         return inferenceHostServiceRuntimePath(this.config);
       }
+      serviceBootstrapPath() {
+        return `${this.config.supervisorStatePath}.service-bootstrap.js`;
+      }
+      serviceReleasePath() {
+        return `${this.config.supervisorStatePath}.service-release.json`;
+      }
+      serviceReleaseRejectionPath() {
+        return `${this.config.supervisorStatePath}.service-release-rejection.json`;
+      }
+      serviceReleasesPath() {
+        return `${this.config.supervisorStatePath}.service-releases`;
+      }
+      serviceBootstrapLockPath() {
+        return `${this.config.supervisorProcessLockPath}.service-bootstrap`;
+      }
       controlLockPath() {
         return `${this.config.supervisorProcessLockPath}.service-control`;
       }
@@ -35754,6 +35772,18 @@ WantedBy=default.target
       windowsLauncherPath() {
         return `${this.config.supervisorStatePath}.service-launcher.vbs`;
       }
+      async hasBootstrapDefinition() {
+        try {
+          await access3(this.serviceBootstrapPath());
+          const definition = await readFile5(
+            this.platform === "win32" ? this.windowsLauncherPath() : this.definitionPath(),
+            "utf8"
+          );
+          return definition.includes(this.serviceBootstrapPath());
+        } catch {
+          return false;
+        }
+      }
       async managerCommand(action) {
         const definition = this.definitionPath();
         if (this.platform === "win32") {
@@ -35875,13 +35905,23 @@ ${result2.stderr}`)) {
         );
       }
       async registerManifestUnlocked(manifest, desiredRunning, targetInstanceName) {
-        const args = serviceArguments(manifest.script, this.manifestPath());
+        await access3(this.bootstrapScript);
+        const args = serviceBootstrapArguments(
+          this.serviceBootstrapPath(),
+          this.manifestPath(),
+          this.serviceBootstrapLockPath()
+        );
         const definition = this.platform === "win32" ? windowsTaskXml(this.windowsLauncherPath(), this.windowsDirectory, this.username) : this.platform === "darwin" ? launchAgentPlist(manifest.executable, args, manifest.log_path) : systemdUnit(manifest.executable, args);
         let managerInstallAttempted = false;
         try {
           await writeAtomicInferencePrivateFile(this.manifestPath(), `${JSON.stringify(manifest, null, 2)}
 `);
           await writeDesired(this.desiredPath(), desiredRunning, this.now());
+          await writeAtomicInferencePrivateFile(
+            this.serviceBootstrapPath(),
+            await readFile5(this.bootstrapScript, "utf8")
+          );
+          await chmod3(this.serviceBootstrapPath(), 448);
           await mkdir3(dirname5(this.definitionPath()), { recursive: true, mode: 448 });
           if (this.platform === "win32") {
             await writeAtomicInferencePrivateFile(
@@ -35911,7 +35951,11 @@ ${started.stderr}`)) {
             }
             await this.waitForManagerActive();
             if (this.confirmInitialReadiness) {
-              await this.waitForManifestApplied(manifest, targetInstanceName);
+              await this.waitForManifestApplied(
+                manifest,
+                targetInstanceName,
+                Math.max(this.reconcileWaitAttempts, SERVICE_UPDATE_STARTUP_SECONDS * 4)
+              );
             }
           }
           return await this.status();
@@ -35938,6 +35982,7 @@ ${cleanup.stderr}`)) {
           await rm6(this.manifestPath(), { force: true }).catch(() => void 0);
           await rm6(this.desiredPath(), { force: true }).catch(() => void 0);
           await rm6(this.runtimePath(), { force: true }).catch(() => void 0);
+          await rm6(this.serviceBootstrapPath(), { force: true }).catch(() => void 0);
           if (this.platform === "linux") {
             await this.runCommand("systemctl", ["--user", "daemon-reload"]).catch(() => void 0);
           }
@@ -35947,10 +35992,11 @@ ${cleanup.stderr}`)) {
       async replaceManifestUnlocked(next, desiredRunning, targetInstanceName) {
         const previous = await readInferenceHostServiceManifest(this.manifestPath());
         const previousDesired = previous ? await readInferenceHostServiceDesired(this.desiredPath()) : false;
-        if (previous && sameServiceDefinition(previous, next) && sameWorkerSet(previous, next) && previousDesired === desiredRunning) {
+        const hasBootstrapDefinition = previous ? await this.hasBootstrapDefinition() : false;
+        if (previous && sameServiceDefinition(previous, next) && sameWorkerSet(previous, next) && previousDesired === desiredRunning && hasBootstrapDefinition) {
           return await this.status();
         }
-        if (previous && previousDesired && desiredRunning && sameServiceDefinition(previous, next)) {
+        if (previous && previousDesired && desiredRunning && sameServiceDefinition(previous, next) && hasBootstrapDefinition) {
           const current = await this.status();
           const runtime = await readRuntimeAcrossAtomicReplacement(this.runtimePath()).catch(() => null);
           if (current.manager_active && runtime?.manifest_generation === previous.generation) {
@@ -36070,6 +36116,7 @@ ${cleanup.stderr}`)) {
         }
         await access3(this.executable);
         await access3(this.script);
+        await access3(this.bootstrapScript);
         const maxConcurrency = options.maxConcurrency ?? null;
         const workers = [
           ...existing?.workers.filter((worker) => worker.instance_name !== this.config.instanceName) ?? [],
@@ -36195,25 +36242,34 @@ ${result2.stderr}`)) {
         const restoreOnFailure = await readInferenceHostServiceDesired(this.desiredPath());
         await writeDesired(this.desiredPath(), false, this.now());
         try {
-          const serviceLockPath = `${this.config.supervisorProcessLockPath}.service`;
+          const serviceLockPaths = [
+            `${this.config.supervisorProcessLockPath}.service`,
+            this.serviceBootstrapLockPath()
+          ];
           let serviceReleased = false;
           for (let attempt = 0; attempt < this.stopWaitAttempts; attempt += 1) {
-            try {
-              const probe = await this.acquireProcessLock(serviceLockPath);
-              await probe.release();
+            let allReleased = true;
+            for (const serviceLockPath of serviceLockPaths) {
+              try {
+                const probe = await this.acquireProcessLock(serviceLockPath);
+                await probe.release();
+              } catch (error48) {
+                if (error48 instanceof Error && error48.message.includes("Another inference host process already owns")) {
+                  allReleased = false;
+                  break;
+                }
+                throw error48;
+              }
+            }
+            if (allReleased) {
               serviceReleased = true;
               break;
-            } catch (error48) {
-              if (error48 instanceof Error && error48.message.includes("Another inference host process already owns")) {
-                await this.sleep(250);
-                continue;
-              }
-              throw error48;
             }
+            await this.sleep(250);
           }
           if (!serviceReleased) {
             throw new Error(
-              `Inference-host workers did not stop cooperatively within ${SERVICE_COOPERATIVE_STOP_SECONDS} seconds; refusing forced termination while cleanup may be pending.`
+              `Inference-host updater or workers did not stop cooperatively within ${SERVICE_COOPERATIVE_STOP_SECONDS} seconds; refusing forced termination while cleanup may be pending.`
             );
           }
           const result2 = await this.managerCommand("stop");
@@ -36329,6 +36385,10 @@ ${result2.stderr}`)) {
         await rm6(this.manifestPath(), { force: true });
         await rm6(this.desiredPath(), { force: true });
         await rm6(this.runtimePath(), { force: true });
+        await rm6(this.serviceBootstrapPath(), { force: true });
+        await rm6(this.serviceReleasePath(), { force: true });
+        await rm6(this.serviceReleaseRejectionPath(), { force: true });
+        await rm6(this.serviceReleasesPath(), { recursive: true, force: true });
         return {
           installed: false,
           desired_running: false,
@@ -36461,8 +36521,11 @@ ${result2.stderr}`)) {
       });
     };
     runInferenceHostServiceSupervisor = async (manifestPath, options = {}) => {
-      const initialManifest = await readInferenceHostServiceManifest(manifestPath);
-      if (!initialManifest) throw new Error("Inference-host service manifest is missing.");
+      const storedInitialManifest = await readInferenceHostServiceManifest(manifestPath);
+      if (!storedInitialManifest) throw new Error("Inference-host service manifest is missing.");
+      const serviceScript = options.serviceScript ? resolve4(options.serviceScript) : null;
+      const withServiceScript = (manifest) => serviceScript ? { ...manifest, script: serviceScript } : manifest;
+      const initialManifest = withServiceScript(storedInitialManifest);
       const desiredPath = manifestPath.replace(/\.service\.json$/u, ".service-desired.json");
       const runtimePath = manifestPath.replace(/\.service\.json$/u, ".service-runtime.json");
       const signal = options.signal ?? new AbortController().signal;
@@ -36659,15 +36722,17 @@ ${result2.stderr}`)) {
       try {
         while (!signal.aborted) {
           while (!signal.aborted && await readDesiredAcrossAtomicReplacement(desiredPath)) {
-            const next = await readManifestAcrossAtomicReplacement(manifestPath);
-            if (!next) throw new Error("Inference-host service manifest is missing.");
+            const storedNext = await readManifestAcrossAtomicReplacement(manifestPath);
+            if (!storedNext) throw new Error("Inference-host service manifest is missing.");
+            const next = withServiceScript(storedNext);
             if (next.generation !== appliedManifest.generation && next.generation !== rejectedManifestGeneration) await reconcile(next);
             await sleep4(250);
           }
           await drainWorkers();
           if (signal.aborted || !await readDesiredAcrossAtomicReplacement(desiredPath)) break;
-          const restored = await readManifestAcrossAtomicReplacement(manifestPath);
-          if (!restored) throw new Error("Inference-host service manifest is missing.");
+          const storedRestored = await readManifestAcrossAtomicReplacement(manifestPath);
+          if (!storedRestored) throw new Error("Inference-host service manifest is missing.");
+          const restored = withServiceScript(storedRestored);
           await reconcile(restored);
           await appendServiceLog(restored.log_path, "service_desired_state_restored", {
             manifest_generation: restored.generation,
@@ -39406,7 +39471,8 @@ Waiting for approval...
           await (dependencies.runServiceSupervisor ?? runInferenceHostServiceSupervisor)(
             parsed.serviceManifestPath,
             {
-              signal: cancellation.signal
+              signal: cancellation.signal,
+              serviceScript: resolve5(process.argv[1] ?? "")
             }
           );
           return { exitCode: 0, stdout: "", stderr: "" };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtxmacro/cli",
-  "version": "2026.8.55",
+  "version": "2026.8.56",
   "description": "VTX Macro CLI, MCP server, and durable external inference host.",
   "type": "module",
   "license": "UNLICENSED",