@askrjs/cli 0.0.24 → 0.0.25

package/dist/add.d.ts

@@ -1,4 +1,4 @@
-import { n as writeFileChanges } from "./file-changes-cmFN-rF8.js";
+import { n as writeFileChanges } from "./file-changes-Va4jkhMm.js";
 //#region src/bin/add.d.ts
 type CliIo = Pick<Console, "error" | "log">;
 type WriteChanges = typeof writeFileChanges;

package/dist/add.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { t as isDirectExecution } from "./is-direct-execution-Cdlr-ZUl.js";
-import { t as writeFileChanges } from "./file-changes-BAFLhEHZ.js";
+import { t as writeFileChanges } from "./file-changes-CsrYAEYu.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 //#region src/bin/add.ts
@@ -365,9 +365,11 @@ async function addPage(parsed, io, writeChanges) {
 		return 1;
 	}
 	const importSpecifier = toImportSpecifier(routesFile, pageFile);
+	let routeFileContent = "";
 	let updatedRoutes = "";
 	try {
-		updatedRoutes = createUpdatedRouteFile(await fs.readFile(routesFile, "utf8"), {
+		routeFileContent = await fs.readFile(routesFile, "utf8");
+		updatedRoutes = createUpdatedRouteFile(routeFileContent, {
 			componentName,
 			importSpecifier,
 			routePath
@@ -387,7 +389,8 @@ async function addPage(parsed, io, writeChanges) {
 			})
 		}, {
 			filePath: routesFile,
-			content: updatedRoutes
+			content: updatedRoutes,
+			expectedContent: routeFileContent
 		}]);
 	} catch (error) {
 		io.error("Failed to write generated page artifacts.");
@@ -437,6 +440,7 @@ async function addAction(parsed, io, writeChanges) {
 			routePath: parsed.routePath,
 			slug
 		});
+		const [registryContent, authorizationContent] = await Promise.all([fs.readFile(registryFile, "utf8"), fs.readFile(authorizationFile, "utf8")]);
 		const actions = await discoverDeclaredActions(projectRoot, {
 			filePath: descriptorFile,
 			content: descriptor
@@ -463,11 +467,13 @@ async function addAction(parsed, io, writeChanges) {
 			},
 			{
 				filePath: registryFile,
-				content: renderServerActionRegistry(actions)
+				content: renderServerActionRegistry(actions),
+				expectedContent: registryContent
 			},
 			{
 				filePath: authorizationFile,
-				content: renderAuthorizationRegistry(actions)
+				content: renderAuthorizationRegistry(actions),
+				expectedContent: authorizationContent
 			}
 		]);
 	} catch (error) {
@@ -501,7 +507,8 @@ async function addDatabase(parsed, io, writeChanges) {
 		return 1;
 	}
 	try {
-		const manifest = JSON.parse(await fs.readFile(manifestFile, "utf8"));
+		const manifestContent = await fs.readFile(manifestFile, "utf8");
+		const manifest = JSON.parse(manifestContent);
 		manifest.dependencies = {
 			...manifest.dependencies,
 			"@askrjs/orm": "0.0.0",
@@ -511,9 +518,12 @@ async function addDatabase(parsed, io, writeChanges) {
 			} : {}
 		};
 		manifest.dependencies = Object.fromEntries(Object.entries(manifest.dependencies).sort(([left], [right]) => left.localeCompare(right)));
-		const currentEnvironment = await fs.readFile(environmentFile, "utf8").catch(() => "");
-		const additions = (parsed.name === "postgres" ? ["DATABASE_URL=postgres://postgres:postgres@localhost:5432/app", "DATABASE_SHADOW_URL=postgres://postgres:postgres@localhost:5432/app_shadow"] : ["DATABASE_PATH=./data/app.sqlite"]).filter((line) => !currentEnvironment.includes(`${line.split("=")[0]}=`));
-		const environment = `${currentEnvironment}${currentEnvironment && !currentEnvironment.endsWith("\n") ? "\n" : ""}${additions.join("\n")}${additions.length ? "\n" : ""}`;
+		const currentEnvironment = await fs.readFile(environmentFile, "utf8").catch((error) => {
+			if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
+			throw error;
+		});
+		const additions = (parsed.name === "postgres" ? ["DATABASE_URL=postgres://postgres:postgres@localhost:5432/app", "DATABASE_SHADOW_URL=postgres://postgres:postgres@localhost:5432/app_shadow"] : ["DATABASE_PATH=./data/app.sqlite"]).filter((line) => !currentEnvironment?.includes(`${line.split("=")[0]}=`));
+		const environment = `${currentEnvironment ?? ""}${currentEnvironment && !currentEnvironment.endsWith("\n") ? "\n" : ""}${additions.join("\n")}${additions.length ? "\n" : ""}`;
 		const driverImport = parsed.name;
 		const definition = [
 			"import { defineDatabase } from '@askrjs/orm';",
@@ -553,11 +563,13 @@ async function addDatabase(parsed, io, writeChanges) {
 			},
 			{
 				filePath: environmentFile,
-				content: environment
+				content: environment,
+				expectedContent: currentEnvironment
 			},
 			{
 				filePath: manifestFile,
-				content: `${JSON.stringify(manifest, null, 2)}\n`
+				content: `${JSON.stringify(manifest, null, 2)}\n`,
+				expectedContent: manifestContent
 			}
 		]);
 	} catch (error) {

package/dist/analyze.d.ts

@@ -1,4 +1,4 @@
-import { t as FileChange } from "./file-changes-cmFN-rF8.js";
+import { t as FileChange } from "./file-changes-Va4jkhMm.js";
 import ts from "typescript";
 //#region src/analyze/types.d.ts
 declare const ANALYZE_SCHEMA_VERSION = 1;

package/dist/analyze.js

@@ -71,7 +71,7 @@ async function runAnalyzeCli(args = process.argv.slice(2), io = console, runtime
 			io.log(helpText.trimEnd());
 			return 0;
 		}
-		const report = await (runtime.analyze ?? (await import("./runner-D2iNzz9g.js")).runAnalysis)({
+		const report = await (runtime.analyze ?? (await import("./runner-CtcqO3cF.js")).runAnalysis)({
 			cwd: parsed.cwd,
 			workspacePatterns: parsed.workspacePatterns,
 			check: parsed.check

package/dist/cli.js

@@ -101,7 +101,7 @@ async function runCli(args = process.argv.slice(2), io = console) {
 		return runAnalyzeCli(args.slice(1), io);
 	}
 	if (command === "check" || command === "doctor" || command === "repair") {
-		const { runGuardrailCli } = await import("./guardrails-BVxzrcBX.js");
+		const { runGuardrailCli } = await import("./guardrails-uLDOExsl.js");
 		return runGuardrailCli(command, args.slice(1), io);
 	}
 	if (command === "generate") {

package/dist/file-changes-CsrYAEYu.js

@@ -0,0 +1,154 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+//#region src/file-changes.ts
+const LOCK_RETRY_MS = 10;
+const LOCK_TIMEOUT_MS = 1e4;
+const ORPHANED_LOCK_AGE_MS = 3e4;
+function isNodeError(error, code) {
+	return error instanceof Error && "code" in error && error.code === code;
+}
+function delay(milliseconds) {
+	return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
+async function ownerIsAlive(lockPath) {
+	try {
+		const owner = JSON.parse(await fs.readFile(path.join(lockPath, "owner.json"), "utf8"));
+		if (!Number.isInteger(owner.pid) || owner.pid <= 0) return void 0;
+		try {
+			process.kill(owner.pid, 0);
+			return true;
+		} catch (error) {
+			if (isNodeError(error, "ESRCH")) return false;
+			return true;
+		}
+	} catch {
+		return;
+	}
+}
+async function removeOrphanedLock(lockPath) {
+	const ownerAlive = await ownerIsAlive(lockPath);
+	if (ownerAlive === true) return false;
+	if (ownerAlive === void 0) {
+		const stat = await fs.stat(lockPath).catch(() => null);
+		if (!stat || Date.now() - stat.mtimeMs < ORPHANED_LOCK_AGE_MS) return false;
+	}
+	await fs.rm(lockPath, {
+		recursive: true,
+		force: true
+	});
+	return true;
+}
+async function acquireFileLock(filePath) {
+	const lockPath = path.join(path.dirname(filePath), `.${path.basename(filePath)}.askr-lock`);
+	const deadline = Date.now() + LOCK_TIMEOUT_MS;
+	while (true) try {
+		await fs.mkdir(lockPath);
+		await fs.writeFile(path.join(lockPath, "owner.json"), `${JSON.stringify({ pid: process.pid })}\n`, { flag: "wx" });
+		return { lockPath };
+	} catch (error) {
+		if (!isNodeError(error, "EEXIST")) {
+			await fs.rm(lockPath, {
+				recursive: true,
+				force: true
+			}).catch(() => void 0);
+			throw error;
+		}
+		if (await removeOrphanedLock(lockPath)) continue;
+		if (Date.now() >= deadline) throw new Error(`Timed out waiting for file transaction lock: ${filePath}`);
+		await delay(LOCK_RETRY_MS);
+	}
+}
+async function releaseFileLocks(locks) {
+	await Promise.all([...locks].reverse().map((lock) => fs.rm(lock.lockPath, {
+		recursive: true,
+		force: true
+	})));
+}
+async function readCurrentContent(filePath) {
+	try {
+		return await fs.readFile(filePath, "utf8");
+	} catch (error) {
+		if (isNodeError(error, "ENOENT")) return null;
+		throw error;
+	}
+}
+function hasExpectedContent(change) {
+	return Object.prototype.hasOwnProperty.call(change, "expectedContent");
+}
+async function remove(paths) {
+	await Promise.all(paths.map((filePath) => fs.rm(filePath, { force: true }).catch(() => void 0)));
+}
+async function restore(changes) {
+	let complete = true;
+	for (const change of [...changes].reverse()) try {
+		if (change.original === null) {
+			await fs.rm(change.filePath, { force: true });
+			continue;
+		}
+		const rollbackPath = path.join(path.dirname(change.filePath), `.${path.basename(change.filePath)}.askr-rollback-${randomUUID()}`);
+		await fs.writeFile(rollbackPath, change.original, {
+			flag: "wx",
+			mode: change.mode
+		});
+		await fs.rename(rollbackPath, change.filePath);
+	} catch {
+		complete = false;
+	}
+	return complete;
+}
+async function writeFileChanges(changes, options = {}) {
+	const ordered = [...changes].sort((left, right) => left.filePath.localeCompare(right.filePath));
+	if (new Set(ordered.map((change) => change.filePath)).size !== ordered.length) throw new Error("File changes contain duplicate target paths.");
+	const replace = options.replace ?? fs.rename;
+	const guarded = ordered.filter(hasExpectedContent);
+	const locks = [];
+	try {
+		for (const change of guarded) {
+			await fs.mkdir(path.dirname(change.filePath), { recursive: true });
+			locks.push(await acquireFileLock(change.filePath));
+		}
+		for (const change of guarded) if (await readCurrentContent(change.filePath) !== change.expectedContent) throw new Error(`File changed before writing: ${change.filePath}`);
+		await writeStagedChanges(ordered, replace);
+	} finally {
+		await releaseFileLocks(locks);
+	}
+}
+async function writeStagedChanges(ordered, replace) {
+	const staged = [];
+	try {
+		for (const change of ordered) {
+			await fs.mkdir(path.dirname(change.filePath), { recursive: true });
+			const stat = await fs.stat(change.filePath).catch(() => null);
+			const original = stat ? await fs.readFile(change.filePath) : null;
+			const temporaryPath = path.join(path.dirname(change.filePath), `.${path.basename(change.filePath)}.askr-change-${randomUUID()}`);
+			const mode = stat?.mode ?? 420;
+			await fs.writeFile(temporaryPath, change.content, {
+				flag: "wx",
+				mode
+			});
+			staged.push({
+				...change,
+				original,
+				mode,
+				temporaryPath
+			});
+		}
+	} catch (error) {
+		await remove(staged.map((change) => change.temporaryPath));
+		throw error;
+	}
+	const replaced = [];
+	try {
+		for (const change of staged) {
+			await replace(change.temporaryPath, change.filePath);
+			replaced.push(change);
+		}
+	} catch {
+		const complete = await restore(replaced);
+		await remove(staged.map((change) => change.temporaryPath));
+		throw new Error(complete ? "File replacement failed; completed changes were rolled back." : "File replacement failed and rollback was incomplete.");
+	}
+}
+//#endregion
+export { writeFileChanges as t };

package/dist/{file-changes-cmFN-rF8.d.ts → file-changes-Va4jkhMm.d.ts}

@@ -2,6 +2,8 @@
 interface FileChange {
   readonly filePath: string;
   readonly content: string;
+  /** Content observed while planning a shared-file edit; `null` means the file was absent. */
+  readonly expectedContent?: string | null;
 }
 interface FileChangeWriterOptions {
   readonly replace?: (temporaryPath: string, filePath: string) => Promise<void>;

package/dist/{guardrails-BVxzrcBX.js → guardrails-uLDOExsl.js}

@@ -98,7 +98,7 @@ async function runGuardrailCli(command, args = process.argv.slice(2), io = conso
 			cwd: parsed.cwd,
 			workspacePatterns: parsed.workspacePatterns
 		};
-		const { runCheck, runDoctor, runRepair } = await import("./runner-N2qHCBar.js");
+		const { runCheck, runDoctor, runRepair } = await import("./runner-D_GIsgIj.js");
 		const report = command === "doctor" ? await runDoctor(options, runtime) : command === "repair" ? await runRepair(options) : await runCheck(options, runtime);
 		if (parsed.json) io.log(JSON.stringify(report));
 		else if (report.command === "doctor") printDoctor(report, io);

package/dist/{runner-D2iNzz9g.js → runner-CtcqO3cF.js}

@@ -1,4 +1,4 @@
-import { t as writeFileChanges } from "./file-changes-BAFLhEHZ.js";
+import { t as writeFileChanges } from "./file-changes-CsrYAEYu.js";
 import { discoverWorkspaceProject } from "./discovery-DUDrZCIC.js";
 import fs from "node:fs/promises";
 import path from "node:path";

package/dist/{runner-N2qHCBar.js → runner-D_GIsgIj.js}

@@ -1,6 +1,6 @@
 import { t as inspectBundledSkills } from "./skills-C72Z3-Cr.js";
 import { discoverWorkspaceProject } from "./discovery-DUDrZCIC.js";
-import { analysisHasBlockingFindings, runAnalysis } from "./runner-D2iNzz9g.js";
+import { analysisHasBlockingFindings, runAnalysis } from "./runner-CtcqO3cF.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { spawn } from "node:child_process";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askrjs/cli",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description": "Unified CLI for the Askr platform",
   "homepage": "https://github.com/askrjs/askr-cli#readme",
   "bugs": {

package/dist/file-changes-BAFLhEHZ.js

@@ -1,66 +0,0 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import { randomUUID } from "node:crypto";
-//#region src/file-changes.ts
-async function remove(paths) {
-	await Promise.all(paths.map((filePath) => fs.rm(filePath, { force: true }).catch(() => void 0)));
-}
-async function restore(changes) {
-	let complete = true;
-	for (const change of [...changes].reverse()) try {
-		if (change.original === null) {
-			await fs.rm(change.filePath, { force: true });
-			continue;
-		}
-		const rollbackPath = path.join(path.dirname(change.filePath), `.${path.basename(change.filePath)}.askr-rollback-${randomUUID()}`);
-		await fs.writeFile(rollbackPath, change.original, {
-			flag: "wx",
-			mode: change.mode
-		});
-		await fs.rename(rollbackPath, change.filePath);
-	} catch {
-		complete = false;
-	}
-	return complete;
-}
-async function writeFileChanges(changes, options = {}) {
-	const ordered = [...changes].sort((left, right) => left.filePath.localeCompare(right.filePath));
-	if (new Set(ordered.map((change) => change.filePath)).size !== ordered.length) throw new Error("File changes contain duplicate target paths.");
-	const replace = options.replace ?? fs.rename;
-	const staged = [];
-	try {
-		for (const change of ordered) {
-			await fs.mkdir(path.dirname(change.filePath), { recursive: true });
-			const stat = await fs.stat(change.filePath).catch(() => null);
-			const original = stat ? await fs.readFile(change.filePath) : null;
-			const temporaryPath = path.join(path.dirname(change.filePath), `.${path.basename(change.filePath)}.askr-change-${randomUUID()}`);
-			const mode = stat?.mode ?? 420;
-			await fs.writeFile(temporaryPath, change.content, {
-				flag: "wx",
-				mode
-			});
-			staged.push({
-				...change,
-				original,
-				mode,
-				temporaryPath
-			});
-		}
-	} catch (error) {
-		await remove(staged.map((change) => change.temporaryPath));
-		throw error;
-	}
-	const replaced = [];
-	try {
-		for (const change of staged) {
-			await replace(change.temporaryPath, change.filePath);
-			replaced.push(change);
-		}
-	} catch {
-		const complete = await restore(replaced);
-		await remove(staged.map((change) => change.temporaryPath));
-		throw new Error(complete ? "File replacement failed; completed changes were rolled back." : "File replacement failed and rollback was incomplete.");
-	}
-}
-//#endregion
-export { writeFileChanges as t };