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

package/dist/extensions/server.mjs

@@ -1,5 +1,5 @@
-import { C as READ_TIMEOUT_MS, E as runGit, S as NETWORK_TIMEOUT_MS, T as createWorktreeGit, a as GIT_WORKTREE_LIFECYCLE_EVENT, c as isWorktreeLifecycleEvent, d as registryFile, f as readJson, g as invalidRequest, h as PoGitExpectedError, i as GIT_SESSION_CHANGED_EVENT, l as credentialsFile, m as HubUnavailableError, n as createWorktreeRegistry, o as createWorktreeMessageInbox, p as writeJsonAtomic, r as validRefName, s as isSessionChangedEvent, t as createWorktreeOperations, u as poGitRoot, w as REBASE_TIMEOUT_MS } from "../worktreeOperations-BqLLypS5.mjs";
-import fs from "node:fs";
+import { C as READ_TIMEOUT_MS, E as runGit, S as NETWORK_TIMEOUT_MS, T as createWorktreeGit, a as GIT_WORKTREE_LIFECYCLE_EVENT, c as isWorktreeLifecycleEvent, d as registryFile, f as readJson, g as invalidRequest, h as PoGitExpectedError, i as GIT_SESSION_CHANGED_EVENT, l as credentialsFile, m as HubUnavailableError, n as createWorktreeRegistry, o as createWorktreeMessageInbox, p as writeJsonAtomic, r as validRefName, s as isSessionChangedEvent, t as createWorktreeOperations, u as poGitRoot, w as REBASE_TIMEOUT_MS } from "../worktreeOperations-CP2lYxrI.mjs";
+import fs from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
 import { composeServerProviderOverrides, defineServerPlugin, packageResourcePath, readPackageResource } from "@agimon-ai/po-core/serverPlugin";
@@ -646,11 +646,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 = path.join(root, relPath);
 	let stat;
 	try {
-		stat = fs.lstatSync(absolute);
+		stat = await fs.lstat(absolute);
 	} catch {
 		return;
 	}
@@ -659,7 +659,7 @@ function untrackedLines(root, relPath) {
 		binary: false
 	};
 	if (!stat.isFile() || stat.size > MAX_FILE_BYTES) return void 0;
-	const content = fs.readFileSync(absolute);
+	const content = await fs.readFile(absolute);
 	if (content.subarray(0, BINARY_PROBE_BYTES).includes(0)) return {
 		lines: 0,
 		binary: true
@@ -782,8 +782,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",
@@ -791,18 +791,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 && fs.existsSync(path.resolve(root, gitPath)));
+			]);
+			const rebasing = (await Promise.all([rebaseMerge, rebaseApply].map(async (gitPath) => gitPath === void 0 ? false : fs.access(path.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) {
@@ -847,7 +849,7 @@ function createBranchDiff() {
 			if (entry === void 0) throw new Error("That path is not in this review.");
 			if (entry.status === "untracked") {
 				const absolute = path.join(review.root, entry.path);
-				const stat = fs.lstatSync(absolute);
+				const stat = await fs.lstat(absolute);
 				if (stat.isSymbolicLink()) return {
 					path: entry.path,
 					hunks: [{
@@ -855,7 +857,7 @@ function createBranchDiff() {
 						rows: [{
 							marker: "+",
 							line: 1,
-							content: fs.readlinkSync(absolute)
+							content: await fs.readlink(absolute)
 						}]
 					}]
 				};
@@ -864,7 +866,7 @@ function createBranchDiff() {
 					hunks: [],
 					tooLarge: true
 				};
-				const content = fs.readFileSync(absolute);
+				const content = await fs.readFile(absolute);
 				if (content.subarray(0, BINARY_PROBE_BYTES).includes(0)) return {
 					path: entry.path,
 					hunks: [],
@@ -981,9 +983,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 fs.realpathSync(workspaceRoot);
+		return await fs.realpath(workspaceRoot);
 	} catch {
 		return path.resolve(workspaceRoot);
 	}
@@ -1032,7 +1034,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 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") {
@@ -1042,7 +1044,7 @@ function parseGitAuthSave(request, current, homeDir) {
 		if (!keyPath.startsWith("/") && !keyPath.startsWith("~/")) throw invalidRequest("The key path is not absolute.", "Give the key as an absolute path or one under ~/.");
 		let isFile = false;
 		try {
-			isFile = fs.statSync(expandHome(keyPath, homeDir)).isFile();
+			isFile = (await fs.stat(expandHome(keyPath, homeDir))).isFile();
 		} catch {
 			isFile = false;
 		}
@@ -1077,16 +1079,16 @@ function parseGitAuthSave(request, current, homeDir) {
 	throw 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 ((fs.statSync(target).mode & LOOSE_BITS) !== 0) fs.chmodSync(target, mode);
+		if (((await fs.stat(target)).mode & LOOSE_BITS) !== 0) await fs.chmod(target, mode);
 	} catch {}
 }
 function createGitAuthStore(homeDir = os.homedir()) {
 	const file = credentialsFile(homeDir);
-	const readFile = () => {
-		tighten(file, OWNER_ONLY_FILE);
-		const raw = readJson(file);
+	const readFile = async () => {
+		await tighten(file, OWNER_ONLY_FILE);
+		const raw = await 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);
@@ -1097,28 +1099,28 @@ function createGitAuthStore(homeDir = os.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 = poGitRoot(homeDir);
-			fs.mkdirSync(root, {
+			await fs.mkdir(root, {
 				recursive: true,
 				mode: OWNER_ONLY_DIRECTORY
 			});
-			fs.chmodSync(root, OWNER_ONLY_DIRECTORY);
+			await fs.chmod(root, OWNER_ONLY_DIRECTORY);
 			const workspaces = { ...current.workspaces };
 			if (next.method === "none") delete workspaces[key];
 			else workspaces[key] = next;
-			writeJsonAtomic(file, {
+			await writeJsonAtomic(file, {
 				version: 1,
 				workspaces
 			});
-			fs.chmodSync(file, OWNER_ONLY_FILE);
+			await fs.chmod(file, OWNER_ONLY_FILE);
 			return publicView(next);
 		}
 	};
@@ -1364,9 +1366,9 @@ var route_server_default = 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 PoGitExpectedError && error.code === "invalid_request") {
 					const text = error.message.replace(/^\[[a-z_]+\] /u, "").replace("\nRecovery: ", " ");
@@ -1390,7 +1392,7 @@ var route_server_default = defineRoute({
 			if (request.method !== "GET") return Response.json({ error: "Use GET." }, { status: 405 });
 			let recordedBaseRef;
 			try {
-				recordedBaseRef = createWorktreeRegistry(registryFile(cwd, homeDir)).list().find((record) => record.sessionId === context.sessionId)?.baseRef;
+				recordedBaseRef = (await createWorktreeRegistry(await registryFile(cwd, homeDir)).list()).find((record) => record.sessionId === context.sessionId)?.baseRef;
 			} catch {
 				recordedBaseRef = void 0;
 			}
@@ -1590,7 +1592,7 @@ async function rebasing(root) {
 			"--git-path",
 			name
 		]);
-		if (gitPath !== void 0 && fs.existsSync(path.resolve(root, gitPath))) return true;
+		if (gitPath !== void 0 && await fs.access(path.resolve(root, gitPath)).then(() => true, () => false)) return true;
 	}
 	return false;
 }
@@ -1823,9 +1825,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 createWorktreeRegistry(registryFile(scope.cwd, homeDir)).list().find((record) => record.sessionId === scope.sessionId)?.baseRef;
+					return (await createWorktreeRegistry(await registryFile(scope.cwd, homeDir)).list()).find((record) => record.sessionId === scope.sessionId)?.baseRef;
 				} catch {
 					return;
 				}
@@ -1858,8 +1860,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"})`);
@@ -1868,12 +1869,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);
@@ -1971,9 +1972,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 createWorktreeRegistry(registryFile(scope.cwd, deps.homeDir)).list().flatMap((record) => {
+		return (await createWorktreeRegistry(await 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);
@@ -2091,10 +2092,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
@@ -2106,7 +2110,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
@@ -2146,15 +2150,15 @@ function createWorktreesChannel(options = {}) {
 				sessionAdded(scope) {
 					newGeneration(scope.sessionId);
 					publish(scope, false);
-					const unsubscribe = host.directEvents.subscribe(GIT_WORKTREE_LIFECYCLE_EVENT, scope.sessionId, (payload) => {
+					const unsubscribe = host.directEvents.subscribe(GIT_WORKTREE_LIFECYCLE_EVENT, scope.sessionId, async (payload) => {
 						if (!isWorktreeLifecycleEvent(payload)) return;
 						let sameRepository = false;
 						try {
-							sameRepository = registryFile(scope.cwd, options.homeDir) === registryFile(payload.repositoryRoot, options.homeDir);
+							sameRepository = await registryFile(scope.cwd, options.homeDir) === await registryFile(payload.repositoryRoot, options.homeDir);
 						} catch {
 							sameRepository = false;
 						}
-						if (sameRepository) publish(scope, false);
+						if (sameRepository) await publish(scope, false);
 					});
 					subscriptions.set(scope.sessionId, unsubscribe);
 				},