@agimon-ai/po-git 0.0.0-alpha.44 → 0.0.0-alpha.46

package/dist/extensions/server.cjs

@@ -2,9 +2,9 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_worktreeOperations = require("../worktreeOperations-CU0iV2h-.cjs");
-let node_fs = require("node:fs");
-node_fs = require_worktreeOperations.__toESM(node_fs, 1);
+const require_worktreeOperations = require("../worktreeOperations-C1ygq-Na.cjs");
+let node_fs_promises = require("node:fs/promises");
+node_fs_promises = require_worktreeOperations.__toESM(node_fs_promises, 1);
 let node_path = require("node:path");
 node_path = require_worktreeOperations.__toESM(node_path, 1);
 let node_os = require("node:os");
@@ -653,11 +653,11 @@ const NAME_STATUS = {
 	T: "modified"
 };
 /** Line count of a small regular file, or undefined when it is binary, large, or not a regular file. */
-function untrackedLines(root, relPath) {
+async function untrackedLines(root, relPath) {
 	const absolute = node_path.default.join(root, relPath);
 	let stat;
 	try {
-		stat = node_fs.default.lstatSync(absolute);
+		stat = await node_fs_promises.default.lstat(absolute);
 	} catch {
 		return;
 	}
@@ -666,7 +666,7 @@ function untrackedLines(root, relPath) {
 		binary: false
 	};
 	if (!stat.isFile() || stat.size > MAX_FILE_BYTES) return void 0;
-	const content = node_fs.default.readFileSync(absolute);
+	const content = await node_fs_promises.default.readFile(absolute);
 	if (content.subarray(0, BINARY_PROBE_BYTES).includes(0)) return {
 		lines: 0,
 		binary: true
@@ -789,8 +789,8 @@ function createBranchDiff() {
 				"--exclude-standard",
 				"-z"
 			]));
-			untracked.forEach((relPath, index) => {
-				const counted = index < MAX_UNTRACKED_COUNTED ? untrackedLines(root, relPath) : void 0;
+			for (const [index, relPath] of untracked.entries()) {
+				const counted = index < MAX_UNTRACKED_COUNTED ? await untrackedLines(root, relPath) : void 0;
 				entries.push({
 					path: relPath,
 					status: "untracked",
@@ -798,18 +798,20 @@ function createBranchDiff() {
 					removed: 0,
 					...counted?.binary ? { binary: true } : {}
 				});
-			});
+			}
 			entries.sort((left, right) => left.path.localeCompare(right.path));
 			const conflicts = [...unmerged];
-			const rebasing = [await readLine$1(root, [
+			const rebaseMerge = await readLine$1(root, [
 				"rev-parse",
 				"--git-path",
 				"rebase-merge"
-			]), await readLine$1(root, [
+			]);
+			const rebaseApply = await readLine$1(root, [
 				"rev-parse",
 				"--git-path",
 				"rebase-apply"
-			])].some((gitPath) => gitPath !== void 0 && node_fs.default.existsSync(node_path.default.resolve(root, gitPath)));
+			]);
+			const rebasing = (await Promise.all([rebaseMerge, rebaseApply].map(async (gitPath) => gitPath === void 0 ? false : node_fs_promises.default.access(node_path.default.resolve(root, gitPath)).then(() => true, () => false)))).some(Boolean);
 			const upstreamRef = branch === void 0 ? void 0 : await upstreamOf(root, branch);
 			let upstream;
 			if (upstreamRef !== void 0) {
@@ -854,7 +856,7 @@ function createBranchDiff() {
 			if (entry === void 0) throw new Error("That path is not in this review.");
 			if (entry.status === "untracked") {
 				const absolute = node_path.default.join(review.root, entry.path);
-				const stat = node_fs.default.lstatSync(absolute);
+				const stat = await node_fs_promises.default.lstat(absolute);
 				if (stat.isSymbolicLink()) return {
 					path: entry.path,
 					hunks: [{
@@ -862,7 +864,7 @@ function createBranchDiff() {
 						rows: [{
 							marker: "+",
 							line: 1,
-							content: node_fs.default.readlinkSync(absolute)
+							content: await node_fs_promises.default.readlink(absolute)
 						}]
 					}]
 				};
@@ -871,7 +873,7 @@ function createBranchDiff() {
 					hunks: [],
 					tooLarge: true
 				};
-				const content = node_fs.default.readFileSync(absolute);
+				const content = await node_fs_promises.default.readFile(absolute);
 				if (content.subarray(0, BINARY_PROBE_BYTES).includes(0)) return {
 					path: entry.path,
 					hunks: [],
@@ -988,9 +990,9 @@ function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 /** The workspace key: the canonical root, so a symlinked path and its target share one entry. */
-function workspaceKey(workspaceRoot) {
+async function workspaceKey(workspaceRoot) {
 	try {
-		return node_fs.default.realpathSync(workspaceRoot);
+		return await node_fs_promises.default.realpath(workspaceRoot);
 	} catch {
 		return node_path.default.resolve(workspaceRoot);
 	}
@@ -1039,7 +1041,7 @@ function publicView(config) {
 * the saved one, and only for the same host: a token never follows a host it
 * was not entered for.
 */
-function parseGitAuthSave(request, current, homeDir) {
+async function parseGitAuthSave(request, current, homeDir) {
 	if (!isRecord(request)) throw require_worktreeOperations.invalidRequest("The git auth request is not an object.", "Send method none, ssh or https.");
 	if (request.method === "none") return { method: "none" };
 	if (request.method === "ssh") {
@@ -1049,7 +1051,7 @@ function parseGitAuthSave(request, current, homeDir) {
 		if (!keyPath.startsWith("/") && !keyPath.startsWith("~/")) throw require_worktreeOperations.invalidRequest("The key path is not absolute.", "Give the key as an absolute path or one under ~/.");
 		let isFile = false;
 		try {
-			isFile = node_fs.default.statSync(expandHome(keyPath, homeDir)).isFile();
+			isFile = (await node_fs_promises.default.stat(expandHome(keyPath, homeDir))).isFile();
 		} catch {
 			isFile = false;
 		}
@@ -1084,16 +1086,16 @@ function parseGitAuthSave(request, current, homeDir) {
 	throw require_worktreeOperations.invalidRequest("The git auth method is unknown.", "Send method none, ssh or https.");
 }
 /** Tightens a file or folder something left readable by group or others. */
-function tighten(target, mode) {
+async function tighten(target, mode) {
 	try {
-		if ((node_fs.default.statSync(target).mode & LOOSE_BITS) !== 0) node_fs.default.chmodSync(target, mode);
+		if (((await node_fs_promises.default.stat(target)).mode & LOOSE_BITS) !== 0) await node_fs_promises.default.chmod(target, mode);
 	} catch {}
 }
 function createGitAuthStore(homeDir = node_os.default.homedir()) {
 	const file = require_worktreeOperations.credentialsFile(homeDir);
-	const readFile = () => {
-		tighten(file, OWNER_ONLY_FILE);
-		const raw = require_worktreeOperations.readJson(file);
+	const readFile = async () => {
+		await tighten(file, OWNER_ONLY_FILE);
+		const raw = await require_worktreeOperations.readJson(file);
 		const workspaces = {};
 		if (isRecord(raw) && raw.version === 1 && isRecord(raw.workspaces)) for (const [key, value] of Object.entries(raw.workspaces)) {
 			const config = parseConfig(value);
@@ -1104,28 +1106,28 @@ function createGitAuthStore(homeDir = node_os.default.homedir()) {
 			workspaces
 		};
 	};
-	const read = (workspaceRoot) => readFile().workspaces[workspaceKey(workspaceRoot)] ?? { method: "none" };
+	const read = async (workspaceRoot) => (await readFile()).workspaces[await workspaceKey(workspaceRoot)] ?? { method: "none" };
 	return {
 		read,
-		view: (workspaceRoot) => publicView(read(workspaceRoot)),
-		save(workspaceRoot, request) {
-			const key = workspaceKey(workspaceRoot);
-			const current = readFile();
-			const next = parseGitAuthSave(request, current.workspaces[key] ?? { method: "none" }, homeDir);
+		view: async (workspaceRoot) => publicView(await read(workspaceRoot)),
+		async save(workspaceRoot, request) {
+			const key = await workspaceKey(workspaceRoot);
+			const current = await readFile();
+			const next = await parseGitAuthSave(request, current.workspaces[key] ?? { method: "none" }, homeDir);
 			const root = require_worktreeOperations.poGitRoot(homeDir);
-			node_fs.default.mkdirSync(root, {
+			await node_fs_promises.default.mkdir(root, {
 				recursive: true,
 				mode: OWNER_ONLY_DIRECTORY
 			});
-			node_fs.default.chmodSync(root, OWNER_ONLY_DIRECTORY);
+			await node_fs_promises.default.chmod(root, OWNER_ONLY_DIRECTORY);
 			const workspaces = { ...current.workspaces };
 			if (next.method === "none") delete workspaces[key];
 			else workspaces[key] = next;
-			require_worktreeOperations.writeJsonAtomic(file, {
+			await require_worktreeOperations.writeJsonAtomic(file, {
 				version: 1,
 				workspaces
 			});
-			node_fs.default.chmodSync(file, OWNER_ONLY_FILE);
+			await node_fs_promises.default.chmod(file, OWNER_ONLY_FILE);
 			return publicView(next);
 		}
 	};
@@ -1371,9 +1373,9 @@ var route_server_default = (0, _agimon_ai_po_core_extensionFile.defineRoute)({
 			if (request.method !== "GET" && request.method !== "PUT") return Response.json({ error: "Use GET or PUT." }, { status: 405 });
 			const root = rootOf(url);
 			if (root instanceof Response) return root;
-			if (request.method === "GET") return Response.json(gitAuth.view(root));
+			if (request.method === "GET") return Response.json(await gitAuth.view(root));
 			try {
-				return Response.json(gitAuth.save(root, await request.json().catch(() => void 0)));
+				return Response.json(await gitAuth.save(root, await request.json().catch(() => void 0)));
 			} catch (error) {
 				if (error instanceof require_worktreeOperations.PoGitExpectedError && error.code === "invalid_request") {
 					const text = error.message.replace(/^\[[a-z_]+\] /u, "").replace("\nRecovery: ", " ");
@@ -1397,7 +1399,7 @@ var route_server_default = (0, _agimon_ai_po_core_extensionFile.defineRoute)({
 			if (request.method !== "GET") return Response.json({ error: "Use GET." }, { status: 405 });
 			let recordedBaseRef;
 			try {
-				recordedBaseRef = require_worktreeOperations.createWorktreeRegistry(require_worktreeOperations.registryFile(cwd, homeDir)).list().find((record) => record.sessionId === context.sessionId)?.baseRef;
+				recordedBaseRef = (await require_worktreeOperations.createWorktreeRegistry(await require_worktreeOperations.registryFile(cwd, homeDir)).list()).find((record) => record.sessionId === context.sessionId)?.baseRef;
 			} catch {
 				recordedBaseRef = void 0;
 			}
@@ -1597,7 +1599,7 @@ async function rebasing(root) {
 			"--git-path",
 			name
 		]);
-		if (gitPath !== void 0 && node_fs.default.existsSync(node_path.default.resolve(root, gitPath))) return true;
+		if (gitPath !== void 0 && await node_fs_promises.default.access(node_path.default.resolve(root, gitPath)).then(() => true, () => false)) return true;
 	}
 	return false;
 }
@@ -1830,9 +1832,9 @@ function createGitChangesChannel(options = {}) {
 			const rerun = /* @__PURE__ */ new Set();
 			const busy = /* @__PURE__ */ new Set();
 			/** The base the session's own worktree was created from, when it has one. */
-			const recordedBaseRef = (scope) => {
+			const recordedBaseRef = async (scope) => {
 				try {
-					return require_worktreeOperations.createWorktreeRegistry(require_worktreeOperations.registryFile(scope.cwd, homeDir)).list().find((record) => record.sessionId === scope.sessionId)?.baseRef;
+					return (await require_worktreeOperations.createWorktreeRegistry(await require_worktreeOperations.registryFile(scope.cwd, homeDir)).list()).find((record) => record.sessionId === scope.sessionId)?.baseRef;
 				} catch {
 					return;
 				}
@@ -1865,8 +1867,7 @@ function createGitChangesChannel(options = {}) {
 					return;
 				}
 				inFlight.add(sessionId);
-				const base = recordedBaseRef(scope);
-				diff.review(scope.cwd, base === void 0 ? {} : { recordedBaseRef: base }).then((review) => {
+				recordedBaseRef(scope).then((base) => diff.review(scope.cwd, base === void 0 ? {} : { recordedBaseRef: base })).then((review) => {
 					if (scopes.has(sessionId)) update(sessionId, { changes: review?.changes });
 				}).catch((error) => {
 					host.onNotice(`git diff refresh failed for ${sessionId} (${error instanceof Error ? error.name : "unknown"})`);
@@ -1875,12 +1876,12 @@ function createGitChangesChannel(options = {}) {
 					if (rerun.delete(sessionId)) refresh(sessionId);
 				});
 			};
-			const run = (scope, command) => {
+			const run = async (scope, command) => {
 				const workspaceRoot = scope.sessionContext?.workspaceRoot ?? scope.cwd;
-				const base = recordedBaseRef(scope);
+				const base = await recordedBaseRef(scope);
 				const context = {
 					cwd: scope.cwd,
-					auth: auth.read(workspaceRoot),
+					auth: await auth.read(workspaceRoot),
 					...base === void 0 ? {} : { recordedBaseRef: base }
 				};
 				if (command.action === "pull") return sync.pull(context);
@@ -1978,9 +1979,9 @@ function payloadOf(state) {
 	};
 }
 /** Worktrees visible to this session, using the hub's live session table for ownership. */
-function viewsFor(scope, deps) {
+async function viewsFor(scope, deps) {
 	try {
-		return require_worktreeOperations.createWorktreeRegistry(require_worktreeOperations.registryFile(scope.cwd, deps.homeDir)).list().flatMap((record) => {
+		return (await require_worktreeOperations.createWorktreeRegistry(await require_worktreeOperations.registryFile(scope.cwd, deps.homeDir)).list()).flatMap((record) => {
 			if (record.parentSessionId === void 0 && record.sessionId !== scope.sessionId) return [];
 			const owned = record.parentSessionId === void 0 || record.parentSessionId === scope.sessionId;
 			const unowned = !owned && !deps.sessionService.isLive(record.parentSessionId);
@@ -2098,10 +2099,13 @@ function createWorktreesChannel(options = {}) {
 				return generation;
 			};
 			/** Republishes a session, skipping a frame that would say nothing new. */
-			const publish = (scope, force) => {
+			const publish = async (scope, force) => {
+				const generation = generations.get(scope.sessionId);
+				const worktreeViews = await viewsFor(scope, views);
+				if (generation === void 0 || generations.get(scope.sessionId) !== generation) return;
 				const previous = latest.get(scope.sessionId);
 				const next = {
-					worktrees: viewsFor(scope, views),
+					worktrees: worktreeViews,
 					pending: previous?.pending,
 					error: previous?.error,
 					errorTarget: previous?.errorTarget
@@ -2113,7 +2117,7 @@ function createWorktreesChannel(options = {}) {
 			const mark = (scope, pending, error, errorTarget) => {
 				const previous = latest.get(scope.sessionId);
 				latest.set(scope.sessionId, {
-					worktrees: previous?.worktrees ?? viewsFor(scope, views),
+					worktrees: previous?.worktrees ?? [],
 					pending,
 					error,
 					errorTarget
@@ -2153,15 +2157,15 @@ function createWorktreesChannel(options = {}) {
 				sessionAdded(scope) {
 					newGeneration(scope.sessionId);
 					publish(scope, false);
-					const unsubscribe = host.directEvents.subscribe(require_worktreeOperations.GIT_WORKTREE_LIFECYCLE_EVENT, scope.sessionId, (payload) => {
+					const unsubscribe = host.directEvents.subscribe(require_worktreeOperations.GIT_WORKTREE_LIFECYCLE_EVENT, scope.sessionId, async (payload) => {
 						if (!require_worktreeOperations.isWorktreeLifecycleEvent(payload)) return;
 						let sameRepository = false;
 						try {
-							sameRepository = require_worktreeOperations.registryFile(scope.cwd, options.homeDir) === require_worktreeOperations.registryFile(payload.repositoryRoot, options.homeDir);
+							sameRepository = await require_worktreeOperations.registryFile(scope.cwd, options.homeDir) === await require_worktreeOperations.registryFile(payload.repositoryRoot, options.homeDir);
 						} catch {
 							sameRepository = false;
 						}
-						if (sameRepository) publish(scope, false);
+						if (sameRepository) await publish(scope, false);
 					});
 					subscriptions.set(scope.sessionId, unsubscribe);
 				},