@agentconnect.md/daemon 1.0.0-rc.205 → 1.0.0-rc.207

package/dist/index.js

@@ -14072,12 +14072,18 @@ const UNSAFE_OPTS = { unsafe: {
 	allowUnsafeCredentialHelper: true,
 	allowUnsafeConfigEnvCount: true
 } };
-/** simple-git bound to a cwd with the credential-helper opt-in. */
-function gitFor(cwd) {
-	return cwd ? simpleGit({
-		baseDir: cwd,
+/**
+* simple-git bound to a cwd with the credential-helper opt-in. An `abort`
+* signal KILLS the spawned git child (abort-plugin) — pair budget timeouts
+* with it, or the abandoned child keeps running and holds .git locks
+* (index.lock) into the next session's pull.
+*/
+function gitFor(cwd, abort) {
+	return simpleGit({
+		...cwd ? { baseDir: cwd } : {},
+		...abort ? { abort } : {},
 		...UNSAFE_OPTS
-	}) : simpleGit(UNSAFE_OPTS);
+	});
 }
 const HOST_ENV_STRIP = /* @__PURE__ */ new Set([
 	"EDITOR",
@@ -14215,6 +14221,31 @@ async function preWarmGitCred(agentId, reason) {
 	if (!preWarm) return;
 	await preWarm(agentId, reason);
 }
+const MIN_GIT = [2, 32];
+/** `git version 2.39.5 (Apple Git-154)` → [2, 39]; null when unparseable. */
+function parseGitVersion(raw) {
+	const m = /git version (\d+)\.(\d+)/.exec(raw);
+	return m ? [Number(m[1]), Number(m[2])] : null;
+}
+/**
+* Boot-time probe (fire-and-forget): a host below the floor would otherwise
+* only show up as a mysterious credential prompt / auth failure deep inside an
+* agent session — say it once, at startup, in plain words.
+*/
+function probeGitVersion(warn) {
+	execFile("git", ["--version"], { timeout: 5e3 }, (err, stdout) => {
+		if (err) {
+			warn("git probe: `git --version` failed — git workspaces will not work on this host");
+			return;
+		}
+		const v = parseGitVersion(String(stdout));
+		if (!v) return;
+		const [major, minor] = v;
+		if (major > MIN_GIT[0] || major === MIN_GIT[0] && minor >= MIN_GIT[1]) return;
+		const cloneToo = major < 2 || major === 2 && minor < 31;
+		warn(`git ${major}.${minor} found but github-app workspaces need git >= ${MIN_GIT[0]}.${MIN_GIT[1]}: this git silently ignores the session credential channel (GIT_CONFIG_GLOBAL)` + (cloneToo ? " and clone-time injection (GIT_CONFIG_COUNT, needs >= 2.31) will fail" : ""));
+	});
+}
 //#endregion
 //#region src/workspace/workspace-manager.ts
 const PULL_TIMEOUT_MS$1 = 4500;
@@ -14236,12 +14267,16 @@ async function prepareWorkspace(agent) {
 	}
 	if (agent.workspace.pullOnNewSession) {
 		if (usesGithubApp(agent)) await preWarmGitCred(agent.id, "pull").catch(() => void 0);
+		const abort = new AbortController();
+		const timer = setTimeout(() => abort.abort(), PULL_TIMEOUT_MS$1);
 		try {
-			await Promise.race([gitFor(cwd).env({
+			await gitFor(cwd, abort.signal).env({
 				...gitEnvBase(),
 				GIT_TERMINAL_PROMPT: "0"
-			}).pull(["--ff-only"]), new Promise((_, rej) => setTimeout(() => rej(/* @__PURE__ */ new Error("pull timeout")), PULL_TIMEOUT_MS$1))]);
-		} catch {}
+			}).pull(["--ff-only"]);
+		} catch {} finally {
+			clearTimeout(timer);
+		}
 	}
 	return cwd;
 }
@@ -101300,6 +101335,7 @@ var Daemon = class Daemon {
 			warn: (m) => this.log.warn(m)
 		});
 		this.gitCredServer.start();
+		probeGitVersion((m) => this.log.warn(m));
 		if (!cfg.daemonId && !cpKeyOnboarding) {
 			cfg.daemonId = randomUUID();
 			persistDaemonId(root, cfg.daemonId);