@brainervirus/workit-core 2.3.0 → 2.5.0

package/src/git/rev.ts

@@ -130,8 +130,8 @@ child.on("exit", (code) => {
 
 const WATCHDOG_TIMEOUT_EXIT = 124;
 
-/** A network git call under the process-group watchdog (see WATCHDOG). */
-const gitNetwork = (cwd: string, args: string[], timeoutMs: number): GitRun => {
+/** A network git call (push, fetch, ls-remote) under the process-group watchdog (see WATCHDOG). */
+export const gitNetwork = (cwd: string, args: string[], timeoutMs: number): GitRun => {
   const invocation = networkGitInvocation(cwd, args, timeoutMs);
   const result = spawnSync(process.execPath, ["-e", WATCHDOG], {
     cwd,
@@ -351,11 +351,25 @@ export function remoteTip(
   branch: string,
   options: { timeoutMs?: number } = {},
 ): RemoteTipResult {
-  if (!safeArg(remote) || !safeArg(branch))
+  if (!safeArg(branch))
     return { ok: false, code: "invalid_input", error: "remote and branch must not start with -" };
+  return remoteRefTip(cwd, remote, `refs/heads/${branch}`, options);
+}
+
+/**
+ * The commit a full remote ref points at (`refs/heads/x`, `refs/tags/v1`); an
+ * annotated tag resolves to the commit it peels to. Same contract as remoteTip.
+ */
+export function remoteRefTip(
+  cwd: string,
+  remote: string,
+  ref: string,
+  options: { timeoutMs?: number } = {},
+): RemoteTipResult {
+  if (!safeArg(remote) || !safeArg(ref))
+    return { ok: false, code: "invalid_input", error: "remote and ref must not start with -" };
   const timeoutMs = options.timeoutMs ?? GIT_TIMEOUTS.network;
-  const ref = `refs/heads/${branch}`;
-  const listed = gitNetwork(cwd, ["ls-remote", remote, ref], timeoutMs);
+  const listed = gitNetwork(cwd, ["ls-remote", remote, ref, `${ref}^{}`], timeoutMs);
   if (!listed.ok)
     return {
       ok: false,
@@ -364,11 +378,109 @@ export function remoteTip(
         ? `git ls-remote ${redactRemote(remote)} timed out after ${timeoutMs} ms`
         : `git ls-remote ${redactRemote(remote)} failed (unreachable or not authorized)`,
     };
+  let direct: string | null = null;
   for (const row of listed.stdout.split(/\r?\n/u)) {
     const [sha, name] = row.split(/\s+/u);
-    if (name === ref && sha) return { ok: true, sha };
+    if (!sha) continue;
+    if (name === `${ref}^{}`) return { ok: true, sha };
+    if (name === ref) direct = sha;
   }
-  return { ok: true, sha: null };
+  return { ok: true, sha: direct };
+}
+
+export type FetchResult =
+  | { ok: true }
+  | { ok: false; code: "invalid_input" | "unavailable" | "busy"; error: string };
+
+/**
+ * `git fetch --no-tags --no-recurse-submodules --no-write-fetch-head
+ * <remote> <refspec…>` under the watchdog (no prompts, bounded). Pass bare
+ * object ids (no `:dst`) for a pure read: the objects arrive, no ref moves.
+ * Contention on a repository lock is `busy`.
+ */
+export function fetchRefs(
+  cwd: string,
+  remote: string,
+  refspecs: readonly string[],
+  options: { timeoutMs?: number } = {},
+): FetchResult {
+  if (
+    !safeArg(remote) ||
+    refspecs.length === 0 ||
+    !refspecs.every((spec) => safeArg(spec.replace(/^\+/u, "")))
+  )
+    return { ok: false, code: "invalid_input", error: "remote and refspecs must not start with -" };
+  const timeoutMs = options.timeoutMs ?? GIT_TIMEOUTS.network;
+  const fetched = gitNetwork(
+    cwd,
+    [
+      "fetch",
+      "--no-tags",
+      "--no-recurse-submodules",
+      "--no-write-fetch-head",
+      "--quiet",
+      remote,
+      ...refspecs,
+    ],
+    timeoutMs,
+  );
+  if (fetched.ok) return { ok: true };
+  if (/\.lock'?:? File exists|unable to lock|another git process/iu.test(fetched.stderr))
+    return {
+      ok: false,
+      code: "busy",
+      error: `git fetch ${redactRemote(remote)}: the repository is locked by another git process`,
+    };
+  return {
+    ok: false,
+    code: "unavailable",
+    error: fetched.timedOut
+      ? `git fetch ${redactRemote(remote)} timed out after ${timeoutMs} ms`
+      : `git fetch ${redactRemote(remote)} failed (unreachable, not authorized, or ref missing)`,
+  };
+}
+
+/** The configured remote names. */
+export function remoteNames(cwd: string): string[] {
+  return (git(cwd, ["remote"]).stdout ?? "")
+    .split(/\r?\n/u)
+    .map((value) => value.trim())
+    .filter(Boolean);
+}
+
+/** The absolute git common dir (shared by every worktree), or null outside a repository. */
+export function gitCommonDir(cwd: string): string | null {
+  return line(git(cwd, ["rev-parse", "--path-format=absolute", "--git-common-dir"]));
+}
+
+/** True when `rev` names a commit present in the local object store. */
+export function hasCommit(cwd: string, rev: string): boolean {
+  if (!safeArg(rev)) return false;
+  return git(cwd, ["cat-file", "-e", `${rev}^{commit}`]).ok;
+}
+
+/** The commit a local ref (e.g. refs/remotes/origin/main) points at, or null. */
+export function resolveRef(cwd: string, ref: string): string | null {
+  if (!safeArg(ref)) return null;
+  return line(git(cwd, ["rev-parse", "--verify", "-q", `${ref}^{commit}`]));
+}
+
+/**
+ * Commits `head` lacks from `base` (behind) and has on top of it (ahead), and
+ * whether `base` is already an ancestor of `head`. Null when either side
+ * does not resolve locally.
+ */
+export function aheadBehind(
+  cwd: string,
+  base: string,
+  head: string,
+): { ahead: number; behind: number; upToDate: boolean } | null {
+  if (!safeArg(base) || !safeArg(head)) return null;
+  const counted = line(git(cwd, ["rev-list", "--left-right", "--count", `${base}...${head}`]));
+  const match = counted ? /^(\d+)\s+(\d+)$/u.exec(counted) : null;
+  if (!match) return null;
+  const upToDate = git(cwd, ["merge-base", "--is-ancestor", base, head]).ok;
+  return { behind: Number(match[1]), ahead: Number(match[2]), upToDate };
 }
 
 const config = (cwd: string, key: string): string | null =>
@@ -386,10 +498,7 @@ export function currentBranch(cwd: string): string | null {
  */
 export function pushRemoteName(cwd: string, branch?: string | null): string | null {
   const name = branch ?? currentBranch(cwd);
-  const remotes = (git(cwd, ["remote"]).stdout ?? "")
-    .split(/\r?\n/u)
-    .map((value) => value.trim())
-    .filter(Boolean);
+  const remotes = remoteNames(cwd);
   const candidates = [
     name ? config(cwd, `branch.${name}.pushRemote`) : null,
     config(cwd, "remote.pushDefault"),

package/src/ledger.ts

@@ -62,7 +62,7 @@ export type VerdictSurface = (typeof VERDICT_SURFACES)[number];
 export type Observer = "agent_asserted" | "workit_cli";
 
 /** Row types written by the CLI's own PR verbs (S10/S11); the only PR→branch source. */
-export const PR_ROW_TYPES: ReadonlySet<string> = new Set(["pr.created", "pr.status"]);
+export const PR_ROW_TYPES: ReadonlySet<string> = new Set(["pr.created", "pr.status", "pr.merged"]);
 
 /** Who wrote a row. Unverified: the environment says so (D18). */
 export type LedgerActor = { host: string; session: string | null; agentId: string | null };
@@ -1156,6 +1156,22 @@ export function summarizeRow(row: ReadRow): RowSummary {
     case "handoff":
       summary = `next: ${text("next")}${text("note") ? ` (note: ${text("note")})` : ""}`;
       break;
+    case "commit.recorded":
+      summary = `${(row.head ?? "?").slice(0, 12)} ${text("subject")}${row.actor.session ? "" : " (no session)"}`;
+      break;
+    case "push.verified":
+    case "push.noop":
+      summary = `${text("remote")} ${(str(row.previous) ?? "(new)").slice(0, 12)} -> ${(row.head ?? "?").slice(0, 12)}${row.forced === true ? " (force-with-lease)" : ""}`;
+      break;
+    case "pr.created":
+      summary = `#${row.pr ?? "?"} -> ${text("base")} at ${(row.head ?? "?").slice(0, 12)}${row.created === false ? " (existing)" : ""}`;
+      break;
+    case "pr.merged":
+      summary = `#${row.pr ?? "?"} ${text("method")} at ${(row.head ?? "?").slice(0, 12)}${text("mergeSha") ? ` -> ${text("mergeSha").slice(0, 12)}` : ""}`;
+      break;
+    case "delivery.verified":
+      summary = `${text("expect")} delivered at ${(row.head ?? "?").slice(0, 12)}`;
+      break;
     default:
       summary = text("what") || text("name") || row.type;
   }