Augment process.env.PATH at activation instead of per-call env override

- Fixes VSCode's built-in git extension failing to stage git-crypt files
  (clean filter couldn't find git-crypt binary)
- Remove getEnv(), augmentedPath, and EXTRA_PATH_DIRS from git.ts
- Move EXTRA_PATH_DIRS to extension.ts; apply once at activate()

Author: j-256

src/extension.ts

@@ -29,9 +29,19 @@ class GitCryptDecorationProvider implements vscode.FileDecorationProvider {
   }
 }
 
+// Dirs to append to PATH so git-crypt is discoverable by all extensions
+const EXTRA_PATH_DIRS = ['/opt/homebrew/bin', '/usr/local/bin', '/usr/bin'];
+
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
   log.appendLine('Activating git-crypt-vscode...');
 
+  // Augment process PATH before any git operations -- this also fixes the
+  // built-in git extension's child processes (e.g. git add triggering the
+  // git-crypt clean filter)
+  const currentPath = process.env.PATH ?? '';
+  const missing = EXTRA_PATH_DIRS.filter(d => !currentPath.split(':').includes(d));
+  if (missing.length) process.env.PATH = `${currentPath}:${missing.join(':')}`;
+
   const gitCryptAvailable = await isGitCryptAvailable();
   log.appendLine(`git-crypt available: ${gitCryptAvailable}`);
   if (!gitCryptAvailable) {

src/git.ts

@@ -10,28 +10,9 @@ export interface GitResult {
 
 const DEFAULT_TIMEOUT = 5000;
 
-// Extra dirs to search for git-crypt (extension host PATH is often minimal)
-const EXTRA_PATH_DIRS = [
-  '/opt/homebrew/bin',
-  '/usr/local/bin',
-  '/usr/bin',
-];
-
-// Augmented PATH for all child processes
-let augmentedPath: string | undefined;
-
-function getEnv(): NodeJS.ProcessEnv {
-  if (!augmentedPath) {
-    const existing = process.env.PATH ?? '';
-    const dirs = EXTRA_PATH_DIRS.filter(d => !existing.split(':').includes(d));
-    augmentedPath = dirs.length ? `${existing}:${dirs.join(':')}` : existing;
-  }
-  return { ...process.env, PATH: augmentedPath };
-}
-
 export function gitExec(cwd: string, args: string[], timeout = DEFAULT_TIMEOUT): Promise<GitResult> {
   return new Promise(resolve => {
-    execFile('git', args, { cwd, timeout, maxBuffer: 10 * 1024 * 1024, env: getEnv() }, (error, stdout, stderr) => {
+    execFile('git', args, { cwd, timeout, maxBuffer: 10 * 1024 * 1024 }, (error, stdout, stderr) => {
       resolve({
         stdout: stdout ?? '',
         stderr: stderr ?? '',
@@ -43,7 +24,7 @@ export function gitExec(cwd: string, args: string[], timeout = DEFAULT_TIMEOUT):
 
 export async function isGitCryptAvailable(): Promise<boolean> {
   return new Promise(resolve => {
-    execFile('git-crypt', ['--version'], { timeout: 3000, env: getEnv() }, error => {
+    execFile('git-crypt', ['--version'], { timeout: 3000 }, error => {
       resolve(!error);
     });
   });
@@ -71,7 +52,7 @@ export async function getGitCryptFiles(repoRoot: string): Promise<Set<string>> {
     const proc = execFile(
       'git',
       ['check-attr', 'filter', '--stdin'],
-      { cwd: repoRoot, timeout: DEFAULT_TIMEOUT, maxBuffer: 10 * 1024 * 1024, env: getEnv() },
+      { cwd: repoRoot, timeout: DEFAULT_TIMEOUT, maxBuffer: 10 * 1024 * 1024 },
       (error, stdout, stderr) => {
         resolve({
           stdout: stdout ?? '',