@rulvar/cli 1.81.1 → 1.82.0

package/dist/index.js

@@ -690,58 +690,74 @@ function createWorker(engine, options) {
 			await releaseQuietly(lease);
 		}
 	}
-	async function sweep() {
-		if (stopping || sweeping) return 0;
-		sweeping = true;
-		try {
-			let picked = 0;
-			const metas = options.retention === void 0 ? await store.listRuns({ statuses: [...CANDIDATE_STATUSES] }) : await store.listRuns();
-			const candidateIds = new Set(metas.filter((meta) => CANDIDATE_STATUSES.has(meta.status)).map((meta) => meta.runId));
-			for (const runId of [...suspendedAt.keys()]) if (!candidateIds.has(runId)) suspendedAt.delete(runId);
-			for (const runId of [...poisoned.keys()]) if (!candidateIds.has(runId)) poisoned.delete(runId);
-			for (const meta of metas) {
-				if (active.size >= concurrency) break;
-				if (!CANDIDATE_STATUSES.has(meta.status)) {
-					if (options.retention !== void 0 && !active.has(meta.runId)) await applyRetention(meta).catch((thrown) => {
-						reportError(meta.runId, thrown);
-					});
+	/** The sweep in flight, so stop() can wait it out before snapshotting. */
+	let sweepInFlight;
+	async function sweepBody() {
+		let picked = 0;
+		const metas = options.retention === void 0 ? await store.listRuns({ statuses: [...CANDIDATE_STATUSES] }) : await store.listRuns();
+		const candidateIds = new Set(metas.filter((meta) => CANDIDATE_STATUSES.has(meta.status)).map((meta) => meta.runId));
+		for (const runId of [...suspendedAt.keys()]) if (!candidateIds.has(runId)) suspendedAt.delete(runId);
+		for (const runId of [...poisoned.keys()]) if (!candidateIds.has(runId)) poisoned.delete(runId);
+		for (const meta of metas) {
+			if (stopping) break;
+			if (!CANDIDATE_STATUSES.has(meta.status)) {
+				if (options.retention !== void 0 && !active.has(meta.runId)) await applyRetention(meta).catch((thrown) => {
+					reportError(meta.runId, thrown);
+				});
+				continue;
+			}
+			if (active.size >= concurrency) {
+				if (options.retention === void 0) break;
+				continue;
+			}
+			if (active.has(meta.runId)) continue;
+			if (poisoned.has(meta.runId)) {
+				if (poisoned.get(meta.runId) === meta.genesis) continue;
+				poisoned.delete(meta.runId);
+			}
+			let lease;
+			try {
+				lease = await store.acquire(meta.runId, owner);
+			} catch (thrown) {
+				if (thrown instanceof LeaseHeldError) continue;
+				throw thrown;
+			}
+			try {
+				const entries = (await store.load(meta.runId)).map((raw) => normalizeEntry(raw));
+				scanJournalCompatibility(meta.runId, entries, registry);
+				const cached = suspendedAt.get(meta.runId);
+				if (meta.status === "suspended" && cached !== void 0 && cached.length === entries.length && cached.genesis === meta.genesis) {
+					await releaseQuietly(lease);
 					continue;
 				}
-				if (active.has(meta.runId)) continue;
-				if (poisoned.has(meta.runId)) {
-					if (poisoned.get(meta.runId) === meta.genesis) continue;
-					poisoned.delete(meta.runId);
-				}
-				let lease;
-				try {
-					lease = await store.acquire(meta.runId, owner);
-				} catch (thrown) {
-					if (thrown instanceof LeaseHeldError) continue;
-					throw thrown;
-				}
-				try {
-					const entries = (await store.load(meta.runId)).map((raw) => normalizeEntry(raw));
-					scanJournalCompatibility(meta.runId, entries, registry);
-					const cached = suspendedAt.get(meta.runId);
-					if (meta.status === "suspended" && cached !== void 0 && cached.length === entries.length && cached.genesis === meta.genesis) {
-						await releaseQuietly(lease);
-						continue;
-					}
-					picked += 1;
-					drive(meta.runId, meta, lease);
-				} catch (thrown) {
+				if (stopping) {
 					await releaseQuietly(lease);
-					if (thrown instanceof JournalCompatibilityError || thrown instanceof ConfigError) {
-						poisoned.set(meta.runId, meta.genesis);
-						reportError(meta.runId, thrown);
-						continue;
-					}
+					break;
+				}
+				picked += 1;
+				drive(meta.runId, meta, lease);
+			} catch (thrown) {
+				await releaseQuietly(lease);
+				if (thrown instanceof JournalCompatibilityError || thrown instanceof ConfigError) {
+					poisoned.set(meta.runId, meta.genesis);
 					reportError(meta.runId, thrown);
+					continue;
 				}
+				reportError(meta.runId, thrown);
 			}
-			return picked;
+		}
+		return picked;
+	}
+	async function sweep() {
+		if (stopping || sweeping) return 0;
+		sweeping = true;
+		const work = sweepBody();
+		sweepInFlight = work.then(() => void 0, () => void 0);
+		try {
+			return await work;
 		} finally {
 			sweeping = false;
+			sweepInFlight = void 0;
 		}
 	}
 	return {
@@ -759,6 +775,8 @@ function createWorker(engine, options) {
 				clearInterval(pollTimer);
 				pollTimer = void 0;
 			}
+			const inFlight = sweepInFlight;
+			if (inFlight !== void 0) await inFlight;
 			const held = [...active.values()];
 			await Promise.all(held.map(async (run) => {
 				await run.cancel("worker stopping");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/cli",
-  "version": "1.81.1",
+  "version": "1.82.0",
   "description": "Rulvar shell: run/resume/runs/inspect/plan/kb commands, TUI progress, createServer, createWorker, OTel exporter.",
   "type": "module",
   "license": "Apache-2.0",
@@ -22,17 +22,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@rulvar/core": "1.81.1"
+    "@rulvar/core": "1.82.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.0",
     "tsdown": "^0.22.3",
     "typescript": "~6.0.3",
-    "@rulvar/testing": "1.81.1",
-    "@rulvar/store-sqlite": "1.81.1",
-    "@rulvar/plan": "1.81.1",
-    "@rulvar/evals": "1.81.1",
-    "@rulvar/planner": "1.81.1"
+    "@rulvar/store-sqlite": "1.82.0",
+    "@rulvar/testing": "1.82.0",
+    "@rulvar/planner": "1.82.0",
+    "@rulvar/evals": "1.82.0",
+    "@rulvar/plan": "1.82.0"
   },
   "bin": {
     "rulvar": "./dist/cli.js"