@co0ontty/wand 3.1.1 → 4.0.0

package/dist/git-utils.d.ts

@@ -1,7 +1,11 @@
 export interface RunGitOptions {
     timeout?: number;
     maxBuffer?: number;
+    env?: NodeJS.ProcessEnv;
+    signal?: AbortSignal;
 }
 export declare function runGit(args: string[], cwd: string, opts?: RunGitOptions): string;
 export declare function runGitRaw(args: string[], cwd: string, opts?: RunGitOptions): string;
+export declare function runGitAsync(args: string[], cwd: string, opts?: RunGitOptions): Promise<string>;
+export declare function runGitRawAsync(args: string[], cwd: string, opts?: RunGitOptions): Promise<string>;
 export declare function getGitErrorMessage(error: unknown): string;

package/dist/git-utils.js

@@ -1,20 +1,69 @@
-import { execFileSync } from "node:child_process";
-export function runGit(args, cwd, opts = {}) {
-    return execFileSync("git", args, {
+import { execFile, execFileSync, } from "node:child_process";
+const DEFAULT_GIT_TIMEOUT_MS = 30_000;
+const DEFAULT_GIT_MAX_BUFFER = 10 * 1024 * 1024;
+function positiveInteger(value, fallback) {
+    return typeof value === "number" && Number.isFinite(value) && value > 0
+        ? Math.floor(value)
+        : fallback;
+}
+function gitEnvironment(opts) {
+    return {
+        ...process.env,
+        ...(opts.env ?? {}),
+        GIT_TERMINAL_PROMPT: "0",
+        GIT_ASKPASS: "true",
+        GCM_INTERACTIVE: "never",
+        SSH_ASKPASS_REQUIRE: "never",
+        GIT_EDITOR: "true",
+        GIT_SEQUENCE_EDITOR: "true",
+        GIT_MERGE_AUTOEDIT: "no",
+        GIT_PAGER: "cat",
+        PAGER: "cat",
+    };
+}
+function gitExecOptions(cwd, opts) {
+    return {
         cwd,
         encoding: "utf8",
         stdio: ["ignore", "pipe", "pipe"],
-        timeout: opts.timeout,
-        maxBuffer: opts.maxBuffer,
-    }).trim();
+        timeout: positiveInteger(opts.timeout, DEFAULT_GIT_TIMEOUT_MS),
+        maxBuffer: positiveInteger(opts.maxBuffer, DEFAULT_GIT_MAX_BUFFER),
+        windowsHide: true,
+        env: gitEnvironment(opts),
+    };
 }
-export function runGitRaw(args, cwd, opts = {}) {
-    return execFileSync("git", args, {
+function gitExecAsyncOptions(cwd, opts) {
+    return {
         cwd,
         encoding: "utf8",
-        stdio: ["ignore", "pipe", "pipe"],
-        timeout: opts.timeout,
-        maxBuffer: opts.maxBuffer,
+        timeout: positiveInteger(opts.timeout, DEFAULT_GIT_TIMEOUT_MS),
+        maxBuffer: positiveInteger(opts.maxBuffer, DEFAULT_GIT_MAX_BUFFER),
+        windowsHide: true,
+        env: gitEnvironment(opts),
+        signal: opts.signal,
+    };
+}
+export function runGit(args, cwd, opts = {}) {
+    return execFileSync("git", args, gitExecOptions(cwd, opts)).trim();
+}
+export function runGitRaw(args, cwd, opts = {}) {
+    return execFileSync("git", args, gitExecOptions(cwd, opts));
+}
+export async function runGitAsync(args, cwd, opts = {}) {
+    return (await runGitRawAsync(args, cwd, opts)).trim();
+}
+export function runGitRawAsync(args, cwd, opts = {}) {
+    return new Promise((resolve, reject) => {
+        execFile("git", args, gitExecAsyncOptions(cwd, opts), (error, stdout, stderr) => {
+            if (error) {
+                const commandError = error;
+                commandError.stdout = typeof stdout === "string" ? stdout : "";
+                commandError.stderr = typeof stderr === "string" ? stderr : "";
+                reject(commandError);
+                return;
+            }
+            resolve(stdout);
+        });
     });
 }
 export function getGitErrorMessage(error) {

package/dist/git-worktree.d.ts

@@ -10,6 +10,8 @@ interface WorktreeSetupResult {
 }
 interface WorktreeOperationOptions {
     worktree: NonNullable<SessionSnapshot["worktree"]>;
+    /** Primarily exposed for bounded request handling and deterministic tests. */
+    gitTimeoutMs?: number;
 }
 interface WorktreeMergeOptions extends WorktreeOperationOptions {
     targetBranch?: string;
@@ -19,10 +21,15 @@ export declare class WorktreeMergeError extends Error {
     readonly result?: Partial<WorktreeMergeResult> | undefined;
     constructor(code: string, message: string, result?: Partial<WorktreeMergeResult> | undefined);
 }
-export declare function getDefaultBaseBranch(repoRoot: string): string;
+export declare function getDefaultBaseBranch(repoRoot: string, timeoutMs?: number): string;
 export declare function getWorktreeMergeErrorCode(error: unknown): string | undefined;
 export declare function checkSessionWorktreeMergeability(options: WorktreeMergeOptions): WorktreeMergeCheckResult;
 export declare function cleanupSessionWorktree(options: WorktreeOperationOptions): boolean;
 export declare function mergeSessionWorktree(options: WorktreeMergeOptions): WorktreeMergeResult;
+/** Async HTTP-facing worktree check; commands remain deliberately serial. */
+export declare function checkSessionWorktreeMergeabilityAsync(options: WorktreeMergeOptions): Promise<WorktreeMergeCheckResult>;
+export declare function cleanupSessionWorktreeAsync(options: WorktreeOperationOptions): Promise<boolean>;
+/** Async HTTP-facing merge with serial, non-cancellable rollback. */
+export declare function mergeSessionWorktreeAsync(options: WorktreeMergeOptions): Promise<WorktreeMergeResult>;
 export declare function prepareSessionWorktree(options: WorktreeSetupOptions): WorktreeSetupResult;
 export {};