genesis-compiler 1.5.0 → 1.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genesis-compiler",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "type": "module",
   "description": "An agent-independent prompt, multi-language code-index, cleanup, and verification companion with project agent guidance.",
   "repository": {

package/src/index/git.js

@@ -2,30 +2,52 @@ import { realpath } from 'node:fs/promises';
 import path from 'node:path';
 
 import { fail } from './errors.js';
-import { runGitText } from './process.js';
+import { runGit } from './process.js';
 
 /** Resolve the caller's working directory and the one Git repository that contains it. */
 export async function gitContext(projectRoot = process.cwd()) {
   let root;
   try { root = await realpath(path.resolve(projectRoot)); } catch (error) {
-    fail('GIT_REPOSITORY_REQUIRED', `Project root does not exist: ${projectRoot}.`, {
-      cause: error.code || error.message,
+    fail('GIT_PROJECT_ROOT_UNAVAILABLE', `Cannot resolve project root: ${projectRoot}. ${error.message}`, {
+      stage: 'resolve-project-root',
+      projectRoot,
+      cause: error.code,
     });
   }
-  let repositoryRoot;
+  let discovery;
   try {
-    repositoryRoot = await realpath(path.resolve(await runGitText(root, ['rev-parse', '--show-toplevel'])));
+    discovery = await runGit(root, ['rev-parse', '--show-toplevel'], { env: { LC_ALL: 'C' } });
   } catch (error) {
+    const details = { ...error.details, stage: 'discover-worktree', projectRoot: root };
     if (/detected dubious ownership/iu.test(error?.details?.stderr || '')) {
-      fail('GIT_REPOSITORY_UNTRUSTED', `Git rejected ownership of the project worktree: ${projectRoot}. The caller must explicitly trust this shared repository.`, {
-        cause: error.code,
-      });
+      fail('GIT_REPOSITORY_UNTRUSTED', `Git rejected ownership of the project worktree: ${projectRoot}. The caller must explicitly trust this shared repository.`, details);
+    }
+    if (error?.details?.status === 128 && /^fatal: (?:not a git repository|this operation must be run in a work tree)/mu.test(error.details.stderr || '')) {
+      fail('GIT_REPOSITORY_REQUIRED', `Project root is not inside a Git worktree: ${projectRoot}.`, details);
     }
-    fail('GIT_REPOSITORY_REQUIRED', `Project root is not inside a Git worktree: ${projectRoot}.`);
+    error.details = details;
+    throw error;
+  }
+  // Git terminates this path with one newline; whitespace can belong to the path.
+  const reportedRoot = discovery.stdout.toString('utf8').replace(/\n$/u, '');
+  if (!path.isAbsolute(reportedRoot)) {
+    fail('GIT_WORKTREE_PATH_INVALID', 'Git returned an empty or non-absolute worktree path.', {
+      stage: 'resolve-worktree', projectRoot: root, reportedRoot,
+    });
+  }
+  let repositoryRoot;
+  try {
+    repositoryRoot = await realpath(reportedRoot);
+  } catch (error) {
+    fail('GIT_WORKTREE_PATH_UNAVAILABLE', `Cannot resolve the worktree reported by Git: ${reportedRoot}. ${error.message}`, {
+      stage: 'resolve-worktree', projectRoot: root, reportedRoot, cause: error.code,
+    });
   }
   const relative = path.relative(repositoryRoot, root);
   if (relative === '..' || relative.startsWith(`..${path.sep}`)) {
-    fail('GIT_REPOSITORY_REQUIRED', `Project root is outside its reported Git worktree: ${projectRoot}.`);
+    fail('GIT_WORKTREE_PATH_INVALID', `Project root is outside its reported Git worktree: ${projectRoot}.`, {
+      stage: 'resolve-worktree', projectRoot: root, reportedRoot,
+    });
   }
   return { workingDirectory: root, repositoryRoot };
 }