agent-transport-system 0.3.0 → 0.3.1

package/dist/ats.js

@@ -24,7 +24,7 @@ import wrapAnsi from "wrap-ansi";
 import { Box, Container, Editor, Key, ProcessTerminal, TUI, Text, getEditorKeybindings, matchesKey } from "@mariozechner/pi-tui";
 
 //#region package.json
-var version$1 = "0.3.0";
+var version$1 = "0.3.1";
 var package_default = {
 	name: "agent-transport-system",
 	version: version$1,
@@ -13127,6 +13127,13 @@ function daemonServiceStableLauncherPath(pathInput = {}) {
 function daemonTokenPath(pathInput = {}) {
 	return join(systemDir(pathInput), "daemon-token.json");
 }
+async function restoreDaemonInstallStateSnapshot(snapshot, pathInput = {}) {
+	if (!snapshot) {
+		await rm(daemonStatePath(pathInput), { force: true });
+		return;
+	}
+	await writeDaemonInstallState(snapshot, pathInput);
+}
 function resolveDaemonControlPlaneEndpoint(pathInput = {}) {
 	const runtimeRoot = daemonRuntimeRootPath(pathInput);
 	const suffix = createHash("sha256").update(runtimeRoot).digest("hex").slice(0, 24);
@@ -13306,9 +13313,9 @@ function parseDaemonInstallState(raw) {
 function isDaemonInstallSource(value) {
 	return value === "cli.auto_check" || value === "daemon.command.install";
 }
-async function writeDaemonInstallState(state) {
-	const path = daemonStatePath();
-	await mkdir(systemDir(), { recursive: true });
+async function writeDaemonInstallState(state, pathInput = {}) {
+	const path = daemonStatePath(pathInput);
+	await mkdir(systemDir(pathInput), { recursive: true });
 	const tempPath = `${path}.tmp-${process.pid}-${Date.now()}`;
 	let shouldCleanupTemp = true;
 	try {
@@ -17432,6 +17439,17 @@ async function writeDaemonServiceLauncher() {
 		mode: 448
 	});
 }
+async function restoreDaemonActiveBundleStateSnapshot(snapshot, pathInput = {}) {
+	if (!snapshot) {
+		await rm(daemonServiceActiveBundlePath(pathInput), { force: true });
+		return;
+	}
+	await mkdir(daemonRuntimeStateRootPath(pathInput), { recursive: true });
+	await writeFile(daemonServiceActiveBundlePath(pathInput), `${JSON.stringify(snapshot, null, 2)}\n`, {
+		encoding: "utf8",
+		mode: 384
+	});
+}
 async function cleanupInactiveDaemonServiceBundles(input = {}) {
 	const [active, serviceContract, runtimeLease] = await Promise.all([
 		readDaemonActiveBundleState(),
@@ -29611,6 +29629,7 @@ async function runDaemonServiceFullAlignmentLocked(input) {
 	});
 	const inventoryBefore = input.state.inventoryBefore;
 	if (!inventoryBefore) throw new Error("ATS could not resolve local service inventory for alignment.");
+	const desiredState = resolveAlignmentDesiredState(inventoryBefore);
 	const shouldRestoreBackground = resolveShouldRestoreBackground(inventoryBefore);
 	const commandOptions = await resolveAlignmentCommandOptions({
 		inventory: inventoryBefore,
@@ -29621,9 +29640,16 @@ async function runDaemonServiceFullAlignmentLocked(input) {
 	});
 	const serviceManager = await resolveAlignmentServiceManager(inventoryBefore) ?? null;
 	if (!serviceManager) throw new Error("ATS could not resolve a system service manager for background service alignment.");
+	const restorePoint = {
+		desiredState,
+		previousActiveBundle: inventoryBefore.activeBundle ?? null,
+		previousContract: inventoryBefore.serviceContract ?? null,
+		previousInstallState: inventoryBefore.installStatus.installed ? inventoryBefore.installStatus.state : null
+	};
 	const alignmentContext = {
 		commandOptions,
 		currentContract: inventoryBefore.serviceContract ?? null,
+		desiredState,
 		serviceManager,
 		shouldRestoreBackground
 	};
@@ -29646,8 +29672,7 @@ async function runDaemonServiceFullAlignmentLocked(input) {
 	} catch (error) {
 		try {
 			await restoreDaemonServiceAfterFailedAlignment({
-				commandOptions: alignmentContext.commandOptions,
-				currentContract: alignmentContext.currentContract,
+				restorePoint,
 				serviceManager: alignmentContext.serviceManager,
 				shouldRestoreBackground: alignmentContext.shouldRestoreBackground
 			});
@@ -29689,7 +29714,7 @@ async function executeDaemonServiceFullAlignment(input) {
 		commandOptions: input.alignmentContext.commandOptions,
 		currentContract: input.alignmentContext.currentContract,
 		daemonVersion: input.expectedVersion,
-		desiredState: input.alignmentContext.shouldRestoreBackground ? "background" : "stopped",
+		desiredState: input.alignmentContext.desiredState,
 		preparedBundle,
 		serviceController: input.alignmentContext.serviceManager.controller
 	});
@@ -29722,6 +29747,7 @@ async function executeDaemonServiceFullAlignment(input) {
 		...input.alignmentContext.shouldRestoreBackground ? { intendedMode: "background" } : {}
 	});
 	const verificationError = verifyAlignedInventory({
+		desiredState: input.alignmentContext.desiredState,
 		inventory: inventoryAfter,
 		shouldRestoreBackground: input.alignmentContext.shouldRestoreBackground,
 		target: input.target
@@ -29795,9 +29821,15 @@ async function resolveAlignmentCommandOptions(input) {
 		...typeof heartbeatMs === "number" ? { heartbeatMs } : {}
 	};
 }
+function resolveAlignmentDesiredState(inventory) {
+	if (inventory.serviceContract?.desiredState === "background") return "background";
+	if (inventory.serviceContract?.desiredState === "stopped") return "stopped";
+	if (inventory.serviceManagerStatus?.running) return "background";
+	if (inventory.runtimeStatus.mode !== "background") return "stopped";
+	return inventory.runtimeStatus.status === "running" || inventory.runtimeStatus.status === "stale" || inventory.runtimeStatus.managedBySystemService || inventory.runtimeStatus.autoStart ? "background" : "stopped";
+}
 function resolveShouldRestoreBackground(inventory) {
-	if (inventory.serviceContract?.desiredState === "background") return true;
-	if (inventory.serviceContract?.desiredState === "stopped") return false;
+	if (resolveAlignmentDesiredState(inventory) !== "background") return false;
 	if (inventory.serviceManagerStatus?.running) return true;
 	if (inventory.runtimeStatus.mode !== "background") return false;
 	return inventory.runtimeStatus.status === "running" || inventory.runtimeStatus.status === "stale" || inventory.runtimeStatus.managedBySystemService || inventory.runtimeStatus.autoStart;
@@ -29912,8 +29944,7 @@ function verifyAlignedInventoryContractState(input) {
 	if (!contract) return "Alignment verification failed because the service contract is missing.";
 	if (contract.daemonVersion !== input.target.daemonVersion) return `Alignment verification failed because service contract version is ${contract.daemonVersion} instead of ${input.target.daemonVersion}.`;
 	if (input.inventory.activeBundle && contract.bundleId !== input.inventory.activeBundle.bundleId) return `Alignment verification failed because service contract bundle is ${contract.bundleId} instead of ${input.inventory.activeBundle.bundleId}.`;
-	const expectedDesiredState = input.shouldRestoreBackground ? "background" : "stopped";
-	if (contract.desiredState !== expectedDesiredState) return `Alignment verification failed because service contract desiredState is ${contract.desiredState} instead of ${expectedDesiredState}.`;
+	if (contract.desiredState !== input.desiredState) return `Alignment verification failed because service contract desiredState is ${contract.desiredState} instead of ${input.desiredState}.`;
 	return null;
 }
 function verifyAlignedInventoryBundleState(input) {
@@ -29946,16 +29977,28 @@ async function ensureAlignmentServiceContract(input) {
 		...input.currentContract?.lane ? { lane: input.currentContract.lane } : {}
 	});
 }
-async function restoreDaemonServiceAfterFailedAlignment(input) {
-	const activeBundle = await readDaemonActiveBundleState().catch(() => null);
-	if (activeBundle) await ensureAlignmentServiceContract({
-		commandOptions: input.commandOptions,
-		currentContract: input.currentContract,
-		daemonVersion: activeBundle.daemonVersion ?? input.currentContract?.daemonVersion ?? "unknown",
-		desiredState: input.shouldRestoreBackground ? "background" : "stopped",
-		preparedBundle: activeBundle,
-		serviceController: input.serviceManager.controller
+async function restoreAlignmentServiceContractSnapshot(snapshot) {
+	if (!snapshot) {
+		await clearDaemonServiceContract();
+		return;
+	}
+	await upsertDaemonServiceContract({
+		daemonVersion: snapshot.daemonVersion,
+		bundleId: snapshot.bundleId,
+		desiredState: snapshot.desiredState,
+		serviceController: snapshot.serviceController,
+		autoStart: snapshot.autoStart,
+		gatewayUrl: snapshot.gatewayUrl,
+		profileId: snapshot.profileId,
+		deviceId: snapshot.deviceId,
+		heartbeatMs: snapshot.heartbeatMs,
+		lane: snapshot.lane
 	});
+}
+async function restoreDaemonServiceAfterFailedAlignment(input) {
+	await restoreDaemonInstallStateSnapshot(input.restorePoint.previousInstallState);
+	await restoreDaemonActiveBundleStateSnapshot(input.restorePoint.previousActiveBundle);
+	await restoreAlignmentServiceContractSnapshot(input.restorePoint.previousContract);
 	await installSystemServiceRegistrationForAlignment({ serviceManager: input.serviceManager });
 	if (input.shouldRestoreBackground) {
 		await startDaemonSystemServiceWithAutoRepair({
@@ -37417,9 +37460,11 @@ const loadLedgerState = async (input) => {
 };
 const handleInvalidLedgerState = async (input) => {
 	if (input.invalidStateStrategy !== "backup_and_reset") throw new Error(input.errorCode);
-	const emptyState = createEmptyLedgerState();
+	const resetAtMs = Date.now();
+	const emptyState = createEmptyLedgerState(resetAtMs);
 	await persistLedgerStateAtomic({
 		io: input.io,
+		nowMs: resetAtMs,
 		paths: input.paths,
 		state: emptyState
 	});
@@ -37428,7 +37473,7 @@ const handleInvalidLedgerState = async (input) => {
 const buildScopedStateTempFilePath = (input) => `${input.stateTempFilePath}.${Date.now()}.${Math.random().toString(36).slice(2, 10)}`;
 const persistLedgerStateAtomic = async (input) => {
 	const normalizedState = compactLedgerState({
-		nowMs: Date.now(),
+		nowMs: input.nowMs ?? Date.now(),
 		state: cloneLedgerState$1(input.state)
 	});
 	await input.io.mkdir(input.paths.rootDirPath, { recursive: true });