@saadnvd1/agent-os 0.3.465 → 0.3.467

package/lib/tasks/project-ref.ts

@@ -7,12 +7,10 @@
 import fs from "fs";
 import os from "os";
 import path from "path";
-import { execFile } from "child_process";
-import { promisify } from "util";
 import { createProject, getAllProjects } from "../projects";
 import { isRemoteHost } from "../hosts";
 import type { Project } from "../db";
-import { run } from "./gh";
+import { git, gitOk } from "../git-exec";
 import { expandHome } from "./session";
 
 export interface ProjectRef {
@@ -23,8 +21,6 @@ export interface ProjectRef {
   remote: string | null;
 }
 
-const execFileAsync = promisify(execFile);
-
 /** A ref as another machine sent it: its shape, before anything reads it. */
 export function isProjectRef(v: unknown): v is ProjectRef {
   const r = v as ProjectRef | null;
@@ -65,9 +61,7 @@ export function repoIdentity(remote: string | null): string | null {
 }
 
 export async function originOf(dir: string): Promise<string | null> {
-  const url = await run("git", ["remote", "get-url", "origin"], dir).catch(
-    () => ""
-  );
+  const url = await git(dir, ["remote", "get-url", "origin"]).catch(() => "");
   return url.trim() || null;
 }
 
@@ -122,7 +116,9 @@ export async function ensureProject(ref: ProjectRef): Promise<Project> {
     if (!ref.remote || !REMOTE_URL.test(ref.remote))
       throw new Error(`${ref.name} isn't here and has no remote to clone`);
     fs.mkdirSync(path.dirname(dir), { recursive: true });
-    await run("git", ["clone", "--", ref.remote, dir], os.homedir(), 600000);
+    await git(os.homedir(), ["clone", "--", ref.remote, dir], {
+      timeout: 600000,
+    });
   }
   return createProject({
     name: ref.name || path.basename(dir),
@@ -148,18 +144,15 @@ export async function whyNotHere(ref: ProjectRef): Promise<string | null> {
   const remote = withoutCredentials(ref.remote);
   if (!remote || !REMOTE_URL.test(remote))
     return "Not there, and no remote to clone";
-  try {
-    await execFileAsync("git", ["ls-remote", "--heads", "--", remote], {
-      cwd: os.homedir(),
+  const reachable = await gitOk(
+    os.homedir(),
+    ["ls-remote", "--heads", "--", remote],
+    {
       timeout: 15000,
       env: {
-        ...process.env,
-        GIT_TERMINAL_PROMPT: "0",
         GIT_SSH_COMMAND: process.env.GIT_SSH_COMMAND ?? "ssh -o BatchMode=yes",
       },
-    });
-    return null;
-  } catch {
-    return "Can't clone it there";
-  }
+    }
+  );
+  return reachable ? null : "Can't clone it there";
 }

package/lib/tasks/session.ts

@@ -3,7 +3,8 @@ import os from "os";
 import { db, queries, type Session } from "../db";
 import { isBranchName } from "../git";
 import { getProject } from "../projects";
-import { findPRStrict, run } from "./gh";
+import { findPRStrict } from "./gh";
+import { currentBranch, git } from "../git-exec";
 import { lookupPR } from "./pr-poll";
 import type { TaskPR } from "./state";
 
@@ -43,15 +44,14 @@ async function worktreeBranch(session: Session): Promise<string | null> {
   const dir = localWorktree(session);
   if (!dir) return null;
   try {
-    const out = await run("git", ["branch", "--show-current"], dir, 5000);
-    return out.trim() || null;
+    return (await currentBranch(dir, { timeout: 5000 })) || null;
   } catch {
     return null;
   }
 }
 
 const hasRef = (dir: string, ref: string) =>
-  run("git", ["rev-parse", "--verify", "--quiet", ref], dir, 5000).then(
+  git(dir, ["rev-parse", "--verify", "--quiet", ref], { timeout: 5000 }).then(
     () => true,
     // Exit 1 is "no such branch"; a timeout or a lock isn't an answer.
     (e: { code?: unknown }) => e?.code !== 1
@@ -94,7 +94,7 @@ function moveBranch(session: Session, branch: string): void {
 
 // git merge-base --is-ancestor: exit 0 yes, 1 no, anything else can't say.
 const isAncestor = (dir: string, sha: string, ref: string) =>
-  run("git", ["merge-base", "--is-ancestor", sha, ref], dir, 5000).then(
+  git(dir, ["merge-base", "--is-ancestor", sha, ref], { timeout: 5000 }).then(
     () => true as const,
     (e: { code?: unknown }) => (e?.code === 1 ? (false as const) : null)
   );

package/lib/worktree-hooks.ts

@@ -16,17 +16,13 @@
  * own git directory, so it goes when the worktree does.
  */
 
-import { execFile } from "child_process";
-import { promisify } from "util";
 import fs from "fs";
 import os from "os";
 import path from "path";
+import { git as runGit } from "./git-exec";
 
-const execFileAsync = promisify(execFile);
-
-const git = async (cwd: string, args: string[]) =>
-  (await execFileAsync("git", ["-C", cwd, ...args], { timeout: 10_000 }))
-    .stdout;
+const git = (cwd: string, args: string[]) =>
+  runGit(cwd, args, { timeout: 10_000 });
 
 // The lines that are attribution, as an extended regex for `grep -iE`. The
 // same rule as lib/tasks/code-review.ts's ATTRIBUTION for PR bodies; a test

package/lib/worktree-placed.ts

@@ -12,12 +12,10 @@
  */
 
 import { createHash } from "crypto";
-import { execFile } from "child_process";
-import { promisify } from "util";
 import fs from "fs";
 import path from "path";
+import { git } from "./git-exec";
 
-const execFileAsync = promisify(execFile);
 const MANIFEST = "agentos-placed.json";
 // A copied folder bigger than this isn't recorded, so it keeps blocking.
 const MAX_FILES = 2000;
@@ -27,13 +25,8 @@ export interface Placed {
   files: Record<string, { size: number; sha: string }>;
 }
 
-async function gitText(cwd: string, args: string[]): Promise<string> {
-  const { stdout } = await execFileAsync("git", ["-C", cwd, ...args], {
-    timeout: 30000,
-    maxBuffer: 16 * 1024 * 1024,
-  });
-  return stdout;
-}
+const gitText = (cwd: string, args: string[]) =>
+  git(cwd, args, { timeout: 30000 });
 
 const manifestPath = async (worktree: string) =>
   path.join(

package/lib/worktrees.ts

@@ -2,8 +2,6 @@
  * Git Worktree management for isolated feature development
  */
 
-import { execFile } from "child_process";
-import { promisify } from "util";
 import * as path from "path";
 import * as fs from "fs";
 import * as os from "os";
@@ -15,11 +13,10 @@ import {
   generateBranchName,
 } from "./git";
 import { installWorktreeHooks } from "./worktree-hooks";
-
-const execFileAsync = promisify(execFile);
+import { gitResult, isGitError, worktreeList } from "./git-exec";
 
 const git = (cwd: string, args: string[], timeout: number) =>
-  execFileAsync("git", ["-C", cwd, ...args], { timeout });
+  gitResult(cwd, args, { timeout });
 
 /**
  * The main checkout a worktree belongs to, or "" when it can't be read.
@@ -200,10 +197,7 @@ export function worktreeAddTimeout(
   return Math.min(MAX_ADD_TIMEOUT_MS, Math.round(ADD_TIMEOUT_MS * scale));
 }
 
-const isTimeout = (error: unknown) =>
-  !!error &&
-  typeof error === "object" &&
-  (error as { killed?: boolean }).killed === true;
+const isTimeout = (error: unknown) => isGitError(error) && error.timedOut;
 
 function describeAddError(error: unknown, timeout: number): Error {
   if (isTimeout(error))
@@ -406,40 +400,8 @@ export async function listWorktrees(projectPath: string): Promise<
     head: string;
   }>
 > {
-  const resolvedProjectPath = resolvePath(projectPath);
-
   try {
-    const { stdout } = await git(
-      resolvedProjectPath,
-      ["worktree", "list", "--porcelain"],
-      10000
-    );
-
-    const worktrees: Array<{ path: string; branch: string; head: string }> = [];
-    const entries = stdout.split("\n\n").filter(Boolean);
-
-    for (const entry of entries) {
-      const lines = entry.split("\n");
-      let worktreePath = "";
-      let branch = "";
-      let head = "";
-
-      for (const line of lines) {
-        if (line.startsWith("worktree ")) {
-          worktreePath = line.slice(9);
-        } else if (line.startsWith("branch ")) {
-          branch = line.slice(7).replace("refs/heads/", "");
-        } else if (line.startsWith("HEAD ")) {
-          head = line.slice(5);
-        }
-      }
-
-      if (worktreePath) {
-        worktrees.push({ path: worktreePath, branch, head });
-      }
-    }
-
-    return worktrees;
+    return await worktreeList(resolvePath(projectPath), { timeout: 10000 });
   } catch {
     return [];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.465",
+  "version": "0.3.467",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"