@xenonbyte/da-vinci-workflow 0.2.7 → 0.2.9

package/lib/worktree-preflight.js

@@ -1,25 +1,39 @@
 const fs = require("fs");
 const path = require("path");
-const { spawnSync } = require("child_process");
+const childProcess = require("child_process");
 const { STATUS } = require("./workflow-contract");
 
-function runGit(projectRoot, args) {
-  return spawnSync("git", args, {
+const DEFAULT_GIT_TIMEOUT_MS = 30 * 1000;
+
+function resolveGitTimeoutMs(options = {}) {
+  const candidate = Number(options.gitTimeoutMs);
+  if (Number.isFinite(candidate) && candidate > 0) {
+    return candidate;
+  }
+  return DEFAULT_GIT_TIMEOUT_MS;
+}
+
+function runGit(projectRoot, args, options = {}) {
+  return childProcess.spawnSync("git", args, {
     cwd: projectRoot,
     encoding: "utf8",
-    maxBuffer: 8 * 1024 * 1024
+    maxBuffer: 8 * 1024 * 1024,
+    timeout: resolveGitTimeoutMs(options)
   });
 }
 
-function checkIgnoredDirectory(projectRoot, directoryPath) {
+function checkIgnoredDirectory(projectRoot, directoryPath, options = {}) {
   const relativePath = path.relative(projectRoot, directoryPath) || path.basename(directoryPath);
-  const result = runGit(projectRoot, ["check-ignore", relativePath]);
+  const result = runGit(projectRoot, ["check-ignore", relativePath], options);
   if (result.error) {
+    const timeoutMs = resolveGitTimeoutMs(options);
+    const timeoutSuffix =
+      result.error.code === "ETIMEDOUT" ? ` after ${timeoutMs}ms` : "";
     return {
       directory: directoryPath,
       relativePath,
       ignored: false,
-      error: `failed to execute git check-ignore: ${result.error.message || "unknown error"}`
+      error: `failed to execute git check-ignore${timeoutSuffix}: ${result.error.message || "unknown error"}`
     };
   }
   if (result.status === 0) {
@@ -72,7 +86,8 @@ function runWorktreePreflight(projectPathInput, options = {}) {
   const candidateDirs = [".worktrees", "worktrees"]
     .map((name) => path.join(projectRoot, name))
     .filter((candidate) => fs.existsSync(candidate));
-  const gitStatus = runGit(projectRoot, ["status", "--porcelain"]);
+  const gitTimeoutMs = resolveGitTimeoutMs(options);
+  const gitStatus = runGit(projectRoot, ["status", "--porcelain"], options);
   const gitStatusSummary = {
     healthy: false,
     exitCode: Number.isFinite(gitStatus.status) ? gitStatus.status : null,
@@ -80,9 +95,14 @@ function runWorktreePreflight(projectPathInput, options = {}) {
   };
   const dirtyEntries = [];
   if (gitStatus.error) {
-    gitStatusSummary.message = `failed to execute git status: ${gitStatus.error.message || "unknown error"}`;
+    const timedOut = gitStatus.error.code === "ETIMEDOUT";
+    gitStatusSummary.message = timedOut
+      ? `git status timed out after ${gitTimeoutMs}ms`
+      : `failed to execute git status: ${gitStatus.error.message || "unknown error"}`;
     findings.warnings.push(
-      "Unable to execute `git status`; worktree-isolation preflight cannot be trusted in the current environment."
+      timedOut
+        ? `git status timed out after ${gitTimeoutMs}ms; worktree-isolation preflight cannot be trusted in the current environment.`
+        : "Unable to execute `git status`; worktree-isolation preflight cannot be trusted in the current environment."
     );
   } else if (gitStatus.status !== 0) {
     const stderr = String(gitStatus.stderr || "").trim();
@@ -113,7 +133,7 @@ function runWorktreePreflight(projectPathInput, options = {}) {
       );
     } else {
       for (const candidate of candidateDirs) {
-        const check = checkIgnoredDirectory(projectRoot, candidate);
+        const check = checkIgnoredDirectory(projectRoot, candidate, options);
         ignoreChecks.push(check);
         if (check.error) {
           findings.warnings.push(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xenonbyte/da-vinci-workflow",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Requirement-to-design-to-code workflow skill for Codex, Claude, and Gemini",
   "bin": {
     "da-vinci": "bin/da-vinci.js",